From 8d493a008ce655963f0363b116d5b55e02eff3d6 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期三, 16 十一月 2022 09:45:13 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into zigonggao_dev
---
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/LoginService.java | 61 ++++++++++++++++++++++++++----
1 files changed, 52 insertions(+), 9 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 60dbd24..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);
/**
* 小程序用户登出
@@ -37,7 +38,7 @@
* 密码
* @return 登录结果
*/
- LoginReturnVO loginAppletsBackStage(String account, String password);
+ LoginReturnVO loginAppletsBackStage(String account, String password,String appid);
/**
* 社区后台登录
@@ -48,7 +49,7 @@
* 密码
* @return 登录结果
*/
- LoginReturnVO loginCommunityBackage(String account, String password);
+ LoginReturnVO loginCommunityBackage(String account, String password,String appid);
/**
* 商家后台登录
@@ -59,7 +60,7 @@
* 密码
* @return 登录结果
*/
- LoginReturnVO loginShopBackStage(String account, String password);
+ LoginReturnVO loginShopBackStage(String account, String password,String appid);
/**
* 大数据统计平台（区、街道、社区三层登陆接口）
@@ -72,7 +73,7 @@
* @return 登录结果
* @date 2021-5-13 10:56
*/
- LoginReturnVO loginBigDataBackStage(String account, String password);
+ LoginReturnVO loginBigDataBackStage(String account, String password,String appid);
/**
* 网格综治APP登录
@@ -83,7 +84,7 @@
* 密码
* @return 登录结果
*/
- LoginReturnsVO loginGridApp(String account, String password);
+ LoginReturnsVO loginGridApp(String account, String password,String appid);
/**
* 网格综治后台登录
@@ -94,7 +95,7 @@
* 密码
* @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,5 +114,47 @@
* 密码
* @return 登录结果
*/
- LoginReturnsVO loginAlarmApp(String account, String password);
+ LoginReturnsVO loginAlarmApp(String account, String password,String appid);
+
+ /**
+ * 便民服务商家后台登录
+ * @param account 账户
+ * @param password 密码
+ * @return 登录结果
+ */
+ LoginReturnVO loginMerchantBackStage(String account, String password,String appid);
+
+ /**
+ * 西区大屏登录
+ * @param account 账号
+ * @param password 密码
+ * @return 登录结果
+ */
+ LoginReturnVO loginXQDP(String account, String password,String appid);
+
+ /**
+ * 微商业街用户登录
+ * @param account 账户
+ * @param password 密码
+ * @return 登录结果
+ */
+ LoginReturnVO loginMcsUser(String account, String password,String appid);
+ /**
+ * 天府通办
+ * @param account 账户
+ * @param password 密码
+ * @return 登录结果
+ */
+ LoginReturnVO tfLogin(String account, String password,String appid);
+
+ /**
+ * 电动车商城后台用户登录
+ *
+ * @param account
+ * 账户
+ * @param password
+ * 密码
+ * @return 登录结果
+ */
+ LoginReturnVO loginBatteryUser(String account, String password,String appid);
}
--
Gitblit v1.7.1