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/common/src/main/java/com/panzhihua/common/service/auth/TokenService.java | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/auth/TokenService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/auth/TokenService.java
index 9c1efb0..4de0aec 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/auth/TokenService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/auth/TokenService.java
@@ -112,4 +112,25 @@
*/
@PostMapping("/loginCgBackage")
R loginCgBackage(@RequestParam("account") String account, @RequestParam("password") String password);
+
+ /**
+ * 一键报警APP登录
+ * @param account 账号
+ * @param password 密码
+ * @return 登录结果
+ */
+ @PostMapping("/loginAlarmApp")
+ R loginAlarmApp(@RequestParam("account") String account, @RequestParam("password") String password);
+
+ /**
+ * 便民服务商家后台登录
+ *
+ * @param account
+ * 账户
+ * @param password
+ * 密码
+ * @return 登录结果
+ */
+ @PostMapping("/loginMerchantBackStage")
+ R loginMerchantBackStage(@RequestParam("account") String account, @RequestParam("password") String password);
}
--
Gitblit v1.7.1