From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/LoginService.java | 55 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 39 insertions(+), 16 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 29e5bca..ed18241 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
@@ -1,7 +1,7 @@
package com.panzhihua.auth.service;
import com.panzhihua.common.model.vos.LoginReturnVO;
-import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.LoginReturnsVO;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -14,7 +14,8 @@
/**
* 微信小程序登录
*
- * @param openId 微信标识
+ * @param openId
+ * 微信标识
* @return jwt
*/
LoginReturnVO loginApplets(String openId);
@@ -22,35 +23,51 @@
/**
* 小程序用户登出
*
- * @param token 登录用户token
+ * @param token
+ * 登录用户token
*/
void logoutApplets(String token);
+
/**
* 小程序后台登录
- * @param account 账户
- * @param password 密码
+ *
+ * @param account
+ * 账户
+ * @param password
+ * 密码
* @return 登录结果
*/
LoginReturnVO loginAppletsBackStage(String account, String password);
+
/**
* 社区后台登录
- * @param account 账户
- * @param password 密码
+ *
+ * @param account
+ * 账户
+ * @param password
+ * 密码
* @return 登录结果
*/
LoginReturnVO loginCommunityBackage(String account, String password);
/**
* 商家后台登录
- * @param account 账户
- * @param password 密码
+ *
+ * @param account
+ * 账户
+ * @param password
+ * 密码
* @return 登录结果
*/
LoginReturnVO loginShopBackStage(String account, String password);
+
/**
* 大数据统计平台（区、街道、社区三层登陆接口）
- * @param account 账户
- * @param password 密码
+ *
+ * @param account
+ * 账户
+ * @param password
+ * 密码
* @author manailin
* @return 登录结果
* @date 2021-5-13 10:56
@@ -59,16 +76,22 @@
/**
* 网格综治APP登录
- * @param account 账户
- * @param password 密码
+ *
+ * @param account
+ * 账户
+ * @param password
+ * 密码
* @return 登录结果
*/
- LoginReturnVO loginGridApp(String account, String password);
+ LoginReturnsVO loginGridApp(String account, String password);
/**
* 网格综治后台登录
- * @param account 账户
- * @param password 密码
+ *
+ * @param account
+ * 账户
+ * @param password
+ * 密码
* @return 登录结果
*/
LoginReturnVO loginGridBackstage(String account, String password);
--
Gitblit v1.7.1