From f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 13 十月 2022 10:33:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/auth/TokenService.java |   44 +++++++++++++++++++++++++++++++++-----------
 1 files changed, 33 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..e49e536 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
@@ -1,6 +1,7 @@
 package com.panzhihua.common.service.auth;
 
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
@@ -22,7 +23,7 @@
      * @return 登录结果
      */
     @PostMapping("/loginApplets")
-    R loginApplets(@RequestParam("openId") String openId);
+    R loginApplets(@RequestParam("openId") String openId,@RequestParam("appid")String appid);
 
     /**
      * 用户登出
@@ -44,7 +45,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 +57,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 +79,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 +91,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 +103,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 +112,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 +121,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 +133,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 +142,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 +154,26 @@
      * @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);
+
+    /**
+     * 天府通办登录
+     * @param account
+     * @param password
+     * @param appid
+     * @return
+     */
+    @GetMapping("/tfLogin")
+    R tfLogin(@RequestParam("account")String account,@RequestParam("password")String password,@RequestParam("appid")String appid);
+    /**
+     * 电动车商城后台用户登录
+     *
+     * @param account
+     *            账户
+     * @param password
+     *            密码
+     * @return 登录结果
+     */
+    @PostMapping("/loginBatteryUser")
+    R loginBatteryUser(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid);
 }

--
Gitblit v1.7.1