From 931ea9dcdf62ea348f1811b9faf95d07ab1c1ac8 Mon Sep 17 00:00:00 2001 From: 罗元桥 <2376770955@qq.com> Date: 星期日, 26 九月 2021 14:22:22 +0800 Subject: [PATCH] Merge branch 'test' into 'test_bak' --- springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/api/LoginApi.java | 99 ++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 77 insertions(+), 22 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 59386ca..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 @@ -1,19 +1,24 @@ package com.panzhihua.auth.api; +import javax.annotation.Resource; + +import org.springframework.util.ObjectUtils; +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; import com.panzhihua.common.exceptions.TokenException; -import com.panzhihua.common.exceptions.UnAuthenticationException; import com.panzhihua.common.model.vos.LoginReturnVO; import com.panzhihua.common.model.vos.LoginReturnsVO; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.utlis.JWTTokenUtil; -import io.jsonwebtoken.Claims; -import org.springframework.util.ObjectUtils; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; +import io.jsonwebtoken.Claims; /** * @program: springcloud_k8s_panzhihuazhihuishequ @@ -30,7 +35,8 @@ /** * 小程序登录 * - * @param openId 微信标识 + * @param openId + * 微信标识 * @return jwt */ @PostMapping("/loginApplets") @@ -42,7 +48,8 @@ /** * 用户登出 * - * @param token 登录用户token + * @param token + * 登录用户token * @return 登出结果 */ @PostMapping("/logout") @@ -54,8 +61,10 @@ /** * 运营后台登录 * - * @param account 账户 - * @param password 密码 + * @param account + * 账户 + * @param password + * 密码 * @return 登录结果 */ @PostMapping("/loginAppletsBackStage") @@ -67,7 +76,8 @@ /** * 大数据统计平台(区、街道、社区三层登陆接口) * - * @param loginBody 账户 + * @param loginBody + * 账户 * @return 登录结果 * @author manailin * @date 2021-5-13 10:56 @@ -86,8 +96,10 @@ /** * 社区后台登录 * - * @param account 账户 - * @param password 密码 + * @param account + * 账户 + * @param password + * 密码 * @return 登录结果 */ @PostMapping("/loginCommunityBackage") @@ -99,7 +111,8 @@ /** * 认证中心刷新token * - * @param refreshToken 用户端保存的刷新token + * @param refreshToken + * 用户端保存的刷新token * @return 新的token 和刷新token */ @PostMapping("/refreshToken") @@ -114,7 +127,7 @@ throw new TokenException("刷新token校验失败"); } String subject = claims.getSubject(); - Integer type = (Integer) claims.get("type"); + Integer type = (Integer)claims.get("type"); boolean empty1 = ObjectUtils.isEmpty(subject); boolean empty2 = ObjectUtils.isEmpty(type); if (empty1 || empty2) { @@ -134,8 +147,10 @@ /** * 商家后台登录 * - * @param account 账户 - * @param password 密码 + * @param account + * 账户 + * @param password + * 密码 * @return 登录结果 */ @PostMapping("/loginShopBackStage") @@ -144,12 +159,13 @@ return R.ok(loginReturnVO); } - /** * 网格综治APP登录 * - * @param account 账户 - * @param password 密码 + * @param account + * 账户 + * @param password + * 密码 * @return 登录结果 */ @PostMapping("/loginGridApp") @@ -158,12 +174,13 @@ return R.ok(loginReturnVO); } - /** * 网格综治后台登录 * - * @param account 账户 - * @param password 密码 + * @param account + * 账户 + * @param password + * 密码 * @return 登录结果 */ @PostMapping("/loginGridBackstage") @@ -172,4 +189,42 @@ return R.ok(loginReturnVO); } + /** + * 城管后台登录 + * @param account 账号 + * @param password 密码 + * @return 登录结果 + */ + @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 登录结果 + */ + @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