From c3811d01d1929a98a0f34f70ca187d82ee312dbb Mon Sep 17 00:00:00 2001 From: manailin <261030956@qq.com> Date: 星期三, 03 十一月 2021 17:26:50 +0800 Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/auth/TokenService.java | 9 +++++++++ 1 files changed, 9 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 5f4175c..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 @@ -114,6 +114,15 @@ 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 -- Gitblit v1.7.1