From 0a4aee700a60c4b28248f3d1a7f4f91376b68492 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 01 八月 2022 14:46:47 +0800
Subject: [PATCH] Merge branch 'haucheng_panzhihua' into shuangzheng2

---
 springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/api/LoginApi.java |   49 +++++++++++++++++++++++++------------------------
 1 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/api/LoginApi.java b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/api/LoginApi.java
index f9d9d5f..90097a9 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/api/LoginApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/api/LoginApi.java
@@ -2,6 +2,7 @@
 
 import javax.annotation.Resource;
 
+import com.panzhihua.common.controller.BaseController;
 import com.panzhihua.common.interfaces.OperLog;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -29,7 +30,7 @@
  **/
 @RestController
 @RequestMapping("/")
-public class LoginApi {
+public class LoginApi extends BaseController {
     @Resource
     private LoginService loginService;
 
@@ -42,8 +43,8 @@
      */
     @OperLog(operModul = "小程序登录")
     @PostMapping("/loginApplets")
-    public R loginApplets(@RequestParam("openId") String openId) {
-        LoginReturnVO loginReturnVO = loginService.loginApplets(openId);
+    public R loginApplets(@RequestParam("openId") String openId,@RequestParam("appid")String appid) {
+        LoginReturnVO loginReturnVO = loginService.loginApplets(openId,appid);
         return R.ok(loginReturnVO);
     }
 
@@ -72,8 +73,8 @@
      */
     @OperLog(operModul = "运营后台登录")
     @PostMapping("/loginAppletsBackStage")
-    public R loginAppletsBackStage(@RequestParam("account") String account, @RequestParam("password") String password) {
-        LoginReturnVO loginReturnVO = loginService.loginAppletsBackStage(account, password);
+    public R loginAppletsBackStage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
+        LoginReturnVO loginReturnVO = loginService.loginAppletsBackStage(account, password,appid);
         return R.ok(loginReturnVO);
     }
 
@@ -94,7 +95,7 @@
         if (ObjectUtils.isEmpty(account) || ObjectUtils.isEmpty(password)) {
             return R.fail("账户密码不能为空");
         }
-        LoginReturnVO loginReturnVO = loginService.loginBigDataBackStage(account, password);
+        LoginReturnVO loginReturnVO = loginService.loginBigDataBackStage(account, password,this.getAppId());
         return R.ok(loginReturnVO);
     }
 
@@ -109,8 +110,8 @@
      */
     @OperLog(operModul = "社区后台登录")
     @PostMapping("/loginCommunityBackage")
-    public R loginCommunityBackage(@RequestParam("account") String account, @RequestParam("password") String password) {
-        LoginReturnVO loginReturnVO = loginService.loginCommunityBackage(account, password);
+    public R loginCommunityBackage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
+        LoginReturnVO loginReturnVO = loginService.loginCommunityBackage(account, password,appid);
         return R.ok(loginReturnVO);
     }
 
@@ -161,8 +162,8 @@
      */
     @OperLog(operModul = "商家后台登录")
     @PostMapping("/loginShopBackStage")
-    public R loginShopBackStage(@RequestParam("account") String account, @RequestParam("password") String password) {
-        LoginReturnVO loginReturnVO = loginService.loginShopBackStage(account, password);
+    public R loginShopBackStage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
+        LoginReturnVO loginReturnVO = loginService.loginShopBackStage(account, password,appid);
         return R.ok(loginReturnVO);
     }
 
@@ -177,8 +178,8 @@
      */
     @OperLog(operModul = "网格综治app登录")
     @PostMapping("/loginGridApp")
-    public R loginGridApp(@RequestParam("account") String account, @RequestParam("password") String password) {
-        LoginReturnsVO loginReturnVO = loginService.loginGridApp(account, password);
+    public R loginGridApp(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
+        LoginReturnsVO loginReturnVO = loginService.loginGridApp(account, password,appid);
         return R.ok(loginReturnVO);
     }
 
@@ -193,8 +194,8 @@
      */
     @OperLog(operModul = "网格综治后台登录")
     @PostMapping("/loginGridBackstage")
-    public R loginGridBackstage(@RequestParam("account") String account, @RequestParam("password") String password) {
-        LoginReturnVO loginReturnVO = loginService.loginGridBackstage(account, password);
+    public R loginGridBackstage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
+        LoginReturnVO loginReturnVO = loginService.loginGridBackstage(account, password,appid);
         return R.ok(loginReturnVO);
     }
 
@@ -206,8 +207,8 @@
      */
     @OperLog(operModul = "城管后台登录")
     @PostMapping("/loginCgBackage")
-    public R loginCgBackage(@RequestParam("account") String account, @RequestParam("password") String password) {
-        LoginReturnVO loginReturnVO = loginService.loginCgBackage(account, password);
+    public R loginCgBackage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
+        LoginReturnVO loginReturnVO = loginService.loginCgBackage(account, password,appid);
         return R.ok(loginReturnVO);
     }
 
@@ -219,8 +220,8 @@
      */
     @OperLog(operModul = "一键报警APP登录 ")
     @PostMapping("/loginAlarmApp")
-    public R loginAlarmApp(@RequestParam("account") String account, @RequestParam("password") String password) {
-        LoginReturnsVO loginReturnVO = loginService.loginAlarmApp(account, password);
+    public R loginAlarmApp(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
+        LoginReturnsVO loginReturnVO = loginService.loginAlarmApp(account, password,appid);
         return R.ok(loginReturnVO);
     }
 
@@ -235,8 +236,8 @@
      */
     @OperLog(operModul = "便民服务商家后台登录 ")
     @PostMapping("/loginMerchantBackStage")
-    public R loginMerchantBackStage(@RequestParam("account") String account, @RequestParam("password") String password) {
-        LoginReturnVO loginReturnVO = loginService.loginMerchantBackStage(account, password);
+    public R loginMerchantBackStage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
+        LoginReturnVO loginReturnVO = loginService.loginMerchantBackStage(account, password,appid);
         return R.ok(loginReturnVO);
     }
 
@@ -248,8 +249,8 @@
      */
     @OperLog(operModul = "西区大屏登录")
     @PostMapping("/loginXQDP")
-    public R loginXQDP(@RequestParam("account") String account, @RequestParam("password") String password) {
-        LoginReturnVO loginReturnVO = loginService.loginXQDP(account, password);
+    public R loginXQDP(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
+        LoginReturnVO loginReturnVO = loginService.loginXQDP(account, password,appid);
         return R.ok(loginReturnVO);
     }
 
@@ -264,8 +265,8 @@
      */
     @PostMapping("/loginMcsUser")
     @OperLog(operModul = "微商业街用户登录")
-    public R loginMcsUser(@RequestParam("account") String account, @RequestParam("password") String password) {
-        LoginReturnVO loginReturnVO = loginService.loginMcsUser(account, password);
+    public R loginMcsUser(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
+        LoginReturnVO loginReturnVO = loginService.loginMcsUser(account, password,appid);
         return R.ok(loginReturnVO);
     }
 }

--
Gitblit v1.7.1