From 284bb7da704a333ef92e32610107e95749a3e0b0 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期三, 13 七月 2022 15:12:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng
---
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/api/LoginApi.java | 85 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 84 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/api/LoginApi.java b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/api/LoginApi.java
index 07ae6b4..f9d9d5f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/api/LoginApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/api/LoginApi.java
@@ -2,8 +2,13 @@
import javax.annotation.Resource;
+import com.panzhihua.common.interfaces.OperLog;
import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
import com.panzhihua.auth.model.dos.LoginBody;
import com.panzhihua.auth.service.LoginService;
@@ -35,6 +40,7 @@
* 微信标识
* @return jwt
*/
+ @OperLog(operModul = "小程序登录")
@PostMapping("/loginApplets")
public R loginApplets(@RequestParam("openId") String openId) {
LoginReturnVO loginReturnVO = loginService.loginApplets(openId);
@@ -48,6 +54,7 @@
* 登录用户token
* @return 登出结果
*/
+ @OperLog(operModul = "用户退出登录")
@PostMapping("/logout")
public R logout(@RequestParam("token") String token) {
loginService.logoutApplets(token);
@@ -63,6 +70,7 @@
* 密码
* @return 登录结果
*/
+ @OperLog(operModul = "运营后台登录")
@PostMapping("/loginAppletsBackStage")
public R loginAppletsBackStage(@RequestParam("account") String account, @RequestParam("password") String password) {
LoginReturnVO loginReturnVO = loginService.loginAppletsBackStage(account, password);
@@ -78,6 +86,7 @@
* @author manailin
* @date 2021-5-13 10:56
*/
+ @OperLog(operModul = "大数据统计平台（区、街道、社区三层登陆接口）")
@PostMapping("/loginBigDataBackStage")
public R loginBigDataBackStage(@RequestBody LoginBody loginBody) {
String account = loginBody.getAccount();
@@ -98,6 +107,7 @@
* 密码
* @return 登录结果
*/
+ @OperLog(operModul = "社区后台登录")
@PostMapping("/loginCommunityBackage")
public R loginCommunityBackage(@RequestParam("account") String account, @RequestParam("password") String password) {
LoginReturnVO loginReturnVO = loginService.loginCommunityBackage(account, password);
@@ -149,6 +159,7 @@
* 密码
* @return 登录结果
*/
+ @OperLog(operModul = "商家后台登录")
@PostMapping("/loginShopBackStage")
public R loginShopBackStage(@RequestParam("account") String account, @RequestParam("password") String password) {
LoginReturnVO loginReturnVO = loginService.loginShopBackStage(account, password);
@@ -164,6 +175,7 @@
* 密码
* @return 登录结果
*/
+ @OperLog(operModul = "网格综治app登录")
@PostMapping("/loginGridApp")
public R loginGridApp(@RequestParam("account") String account, @RequestParam("password") String password) {
LoginReturnsVO loginReturnVO = loginService.loginGridApp(account, password);
@@ -179,10 +191,81 @@
* 密码
* @return 登录结果
*/
+ @OperLog(operModul = "网格综治后台登录")
@PostMapping("/loginGridBackstage")
public R loginGridBackstage(@RequestParam("account") String account, @RequestParam("password") String password) {
LoginReturnVO loginReturnVO = loginService.loginGridBackstage(account, password);
return R.ok(loginReturnVO);
}
+ /**
+ * 城管后台登录
+ * @param account 账号
+ * @param password 密码
+ * @return 登录结果
+ */
+ @OperLog(operModul = "城管后台登录")
+ @PostMapping("/loginCgBackage")
+ public R loginCgBackage(@RequestParam("account") String account, @RequestParam("password") String password) {
+ LoginReturnVO loginReturnVO = loginService.loginCgBackage(account, password);
+ return R.ok(loginReturnVO);
+ }
+
+ /**
+ * 一键报警APP登录
+ * @param account 账号
+ * @param password 密码
+ * @return 登录结果
+ */
+ @OperLog(operModul = "一键报警APP登录 ")
+ @PostMapping("/loginAlarmApp")
+ public R loginAlarmApp(@RequestParam("account") String account, @RequestParam("password") String password) {
+ LoginReturnsVO loginReturnVO = loginService.loginAlarmApp(account, password);
+ return R.ok(loginReturnVO);
+ }
+
+ /**
+ * 便民服务商家后台登录
+ *
+ * @param account
+ * 账户
+ * @param password
+ * 密码
+ * @return 登录结果
+ */
+ @OperLog(operModul = "便民服务商家后台登录 ")
+ @PostMapping("/loginMerchantBackStage")
+ public R loginMerchantBackStage(@RequestParam("account") String account, @RequestParam("password") String password) {
+ LoginReturnVO loginReturnVO = loginService.loginMerchantBackStage(account, password);
+ return R.ok(loginReturnVO);
+ }
+
+ /**
+ * 西区大屏登录
+ * @param account 账号
+ * @param password 密码
+ * @return 登录结果
+ */
+ @OperLog(operModul = "西区大屏登录")
+ @PostMapping("/loginXQDP")
+ public R loginXQDP(@RequestParam("account") String account, @RequestParam("password") String password) {
+ LoginReturnVO loginReturnVO = loginService.loginXQDP(account, password);
+ return R.ok(loginReturnVO);
+ }
+
+ /**
+ * 微商业街用户登录
+ *
+ * @param account
+ * 账户
+ * @param password
+ * 密码
+ * @return 登录结果
+ */
+ @PostMapping("/loginMcsUser")
+ @OperLog(operModul = "微商业街用户登录")
+ public R loginMcsUser(@RequestParam("account") String account, @RequestParam("password") String password) {
+ LoginReturnVO loginReturnVO = loginService.loginMcsUser(account, password);
+ return R.ok(loginReturnVO);
+ }
}
--
Gitblit v1.7.1