From 74570c3c6b01ef869824030ad110e6b930fa5e08 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期日, 26 九月 2021 16:43:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_bak' into test_bak
---
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/api/LoginApi.java | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 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 64c3c9d..dde5cd0 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
@@ -3,7 +3,11 @@
import javax.annotation.Resource;
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;
@@ -197,4 +201,30 @@
return R.ok(loginReturnVO);
}
+ /**
+ * 一键报警APP登录
+ * @param account 账号
+ * @param password 密码
+ * @return 登录结果
+ */
+ @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 登录结果
+ */
+ @PostMapping("/loginMerchantBackStage")
+ public R loginMerchantBackStage(@RequestParam("account") String account, @RequestParam("password") String password) {
+ LoginReturnVO loginReturnVO = loginService.loginMerchantBackStage(account, password);
+ return R.ok(loginReturnVO);
+ }
}
--
Gitblit v1.7.1