From 62477148a6adee03f948f8342c72b70e2e412596 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期六, 26 十一月 2022 10:05:03 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/LoginService.java |   46 +++++++++++++++++++++++++++-------------------
 1 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/LoginService.java b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/LoginService.java
index 50506f1..4551207 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/LoginService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/LoginService.java
@@ -2,6 +2,7 @@
 
 import com.panzhihua.common.model.vos.LoginReturnVO;
 import com.panzhihua.common.model.vos.LoginReturnsVO;
+import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -18,7 +19,7 @@
      *            微信标识
      * @return jwt
      */
-    LoginReturnVO loginApplets(String openId);
+    LoginReturnVO loginApplets(String openId,String appId);
 
     /**
      * 小程序用户登出
@@ -30,40 +31,40 @@
 
     /**
      * 小程序后台登录
-     *
+     * 
      * @param account
      *            账户
      * @param password
      *            密码
      * @return 登录结果
      */
-    LoginReturnVO loginAppletsBackStage(String account, String password);
+    LoginReturnVO loginAppletsBackStage(String account, String password,String appid);
 
     /**
      * 社区后台登录
-     *
+     * 
      * @param account
      *            账户
      * @param password
      *            密码
      * @return 登录结果
      */
-    LoginReturnVO loginCommunityBackage(String account, String password);
+    LoginReturnVO loginCommunityBackage(String account, String password,String appid);
 
     /**
      * 商家后台登录
-     *
+     * 
      * @param account
      *            账户
      * @param password
      *            密码
      * @return 登录结果
      */
-    LoginReturnVO loginShopBackStage(String account, String password);
+    LoginReturnVO loginShopBackStage(String account, String password,String appid);
 
     /**
      * 大数据统计平台（区、街道、社区三层登陆接口）
-     *
+     * 
      * @param account
      *            账户
      * @param password
@@ -72,29 +73,29 @@
      * @return 登录结果
      * @date 2021-5-13 10:56
      */
-    LoginReturnVO loginBigDataBackStage(String account, String password);
+    LoginReturnVO loginBigDataBackStage(String account, String password,String appid);
 
     /**
      * 网格综治APP登录
-     *
+     * 
      * @param account
      *            账户
      * @param password
      *            密码
      * @return 登录结果
      */
-    LoginReturnsVO loginGridApp(String account, String password);
+    LoginReturnsVO loginGridApp(String account, String password,String appid);
 
     /**
      * 网格综治后台登录
-     *
+     * 
      * @param account
      *            账户
      * @param password
      *            密码
      * @return 登录结果
      */
-    LoginReturnVO loginGridBackstage(String account, String password);
+    LoginReturnVO loginGridBackstage(String account, String password,String appid);
 
     /**
      * 城管后台登录
@@ -102,7 +103,7 @@
      * @param password  密码
      * @return  登录结果
      */
-    LoginReturnVO loginCgBackage(String account, String password);
+    LoginReturnVO loginCgBackage(String account, String password,String appid);
 
     /**
      * 一键报警APP登录
@@ -113,7 +114,7 @@
      *            密码
      * @return 登录结果
      */
-    LoginReturnsVO loginAlarmApp(String account, String password);
+    LoginReturnsVO loginAlarmApp(String account, String password,String appid);
 
     /**
      * 便民服务商家后台登录
@@ -121,7 +122,7 @@
      * @param password 密码
      * @return 登录结果
      */
-    LoginReturnVO loginMerchantBackStage(String account, String password);
+    LoginReturnVO loginMerchantBackStage(String account, String password,String appid);
 
     /**
      * 西区大屏登录
@@ -129,7 +130,7 @@
      * @param password  密码
      * @return  登录结果
      */
-    LoginReturnVO loginXQDP(String account, String password);
+    LoginReturnVO loginXQDP(String account, String password,String appid);
 
     /**
      * 微商业街用户登录
@@ -137,7 +138,14 @@
      * @param password 密码
      * @return 登录结果
      */
-    LoginReturnVO loginMcsUser(String account, String password);
+    LoginReturnVO loginMcsUser(String account, String password,String appid);
+    /**
+     * 天府通办
+     * @param account 账户
+     * @param password 密码
+     * @return 登录结果
+     */
+    LoginReturnVO tfLogin(String account, String password,String appid);
 
     /**
      * 电动车商城后台用户登录
@@ -148,5 +156,5 @@
      *            密码
      * @return 登录结果
      */
-    LoginReturnVO loginBatteryUser(String account, String password);
+    LoginReturnVO loginBatteryUser(String account, String password,String appid);
 }

--
Gitblit v1.7.1