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/common/src/main/java/com/panzhihua/common/service/auth/TokenService.java |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/auth/TokenService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/auth/TokenService.java
index 8aea73b..9e88493 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/auth/TokenService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/auth/TokenService.java
@@ -22,7 +22,7 @@
      * @return 登录结果
      */
     @PostMapping("/loginApplets")
-    R loginApplets(@RequestParam("openId") String openId);
+    R loginApplets(@RequestParam("openId") String openId,@RequestParam("appid")String appid);
 
     /**
      * 用户登出
@@ -44,7 +44,7 @@
      * @return 登录结果
      */
     @PostMapping("/loginCommunityBackage")
-    R loginCommunityBackage(@RequestParam("account") String account, @RequestParam("password") String password);
+    R loginCommunityBackage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid);
 
     /**
      * 小程序后台登录
@@ -56,7 +56,7 @@
      * @return 登录结果
      */
     @PostMapping("/loginAppletsBackStage")
-    R loginAppletsBackStage(@RequestParam("account") String account, @RequestParam("password") String password);
+    R loginAppletsBackStage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid);
 
     /**
      * 认证中心刷新token
@@ -78,7 +78,7 @@
      * @return 登录结果
      */
     @PostMapping("/loginShopBackStage")
-    R loginShopBackStage(@RequestParam("account") String account, @RequestParam("password") String password);
+    R loginShopBackStage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid);
 
     /**
      * 网格综治APP登录
@@ -90,7 +90,7 @@
      * @return 登录结果
      */
     @PostMapping("/loginGridApp")
-    R loginGridApp(@RequestParam("account") String account, @RequestParam("password") String password);
+    R loginGridApp(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid);
 
     /**
      * 网格综治后台登录
@@ -102,7 +102,7 @@
      * @return 登录结果
      */
     @PostMapping("/loginGridBackstage")
-    R loginGridBackstage(@RequestParam("account") String account, @RequestParam("password") String password);
+    R loginGridBackstage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid);
 
     /**
      * 城管后台登录
@@ -111,7 +111,7 @@
      * @return  登录结果
      */
     @PostMapping("/loginCgBackage")
-    R loginCgBackage(@RequestParam("account") String account, @RequestParam("password") String password);
+    R loginCgBackage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid);
 
     /**
      * 一键报警APP登录
@@ -120,7 +120,7 @@
      * @return  登录结果
      */
     @PostMapping("/loginAlarmApp")
-    R loginAlarmApp(@RequestParam("account") String account, @RequestParam("password") String password);
+    R loginAlarmApp(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid);
 
     /**
      * 便民服务商家后台登录
@@ -132,7 +132,7 @@
      * @return 登录结果
      */
     @PostMapping("/loginMerchantBackStage")
-    R loginMerchantBackStage(@RequestParam("account") String account, @RequestParam("password") String password);
+    R loginMerchantBackStage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid);
 
     /**
      * 西区大屏登录
@@ -141,7 +141,7 @@
      * @return  登录结果
      */
     @PostMapping("/loginXQDP")
-    R loginXQDP(@RequestParam("account") String account, @RequestParam("password") String password);
+    R loginXQDP(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid);
 
     /**
      * 微商业街用户登录
@@ -153,5 +153,5 @@
      * @return 登录结果
      */
     @PostMapping("/loginMcsUser")
-    R loginMcsUser(@RequestParam("account") String account, @RequestParam("password") String password);
+    R loginMcsUser(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid);
 }

--
Gitblit v1.7.1