From 023471cd0e1423af3f70729a81df0635a5caa4bf Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期一, 17 五月 2021 16:09:28 +0800
Subject: [PATCH] [修改]区域统计平台,登陆功能

---
 springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/api/LoginApi.java |   56 ++++++++++++++++++++++++++++++--------------------------
 1 files changed, 30 insertions(+), 26 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 4080e2f..f4c77aa 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,5 +1,6 @@
 package com.panzhihua.auth.api;
 
+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;
@@ -9,10 +10,7 @@
 import com.panzhihua.common.utlis.JWTTokenUtil;
 import io.jsonwebtoken.Claims;
 import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 
@@ -51,55 +49,60 @@
         loginService.logoutApplets(token);
         return R.ok();
     }
+
     /**
      * 运营后台登录
-     * @param account 账户
+     *
+     * @param account  账户
      * @param password 密码
      * @return 登录结果
      */
     @PostMapping("/loginAppletsBackStage")
-    public R loginAppletsBackStage(@RequestParam("account") String account, @RequestParam("password")String password){
-        LoginReturnVO loginReturnVO =loginService.loginAppletsBackStage(account,password);
+    public R loginAppletsBackStage(@RequestParam("account") String account, @RequestParam("password") String password) {
+        LoginReturnVO loginReturnVO = loginService.loginAppletsBackStage(account, password);
         return R.ok(loginReturnVO);
     }
 
     /**
      * 大数据统计平台(区、街道、社区三层登陆接口)
-     * @param account 账户
-     * @param password 密码
-     * @author manailin
+     *
+     * @param loginBody 账户
      * @return 登录结果
+     * @author manailin
      * @date 2021-5-13 10:56
      */
     @PostMapping("/loginBigDataBackStage")
-    public R loginBigDataBackStage(@RequestParam("account") String account, @RequestParam("password")String password){
-        boolean accountCheck = ObjectUtils.isEmpty(account);
-        boolean passwordCheck = ObjectUtils.isEmpty(password);
-        if (accountCheck||passwordCheck) {
+    public R loginBigDataBackStage(@RequestBody LoginBody loginBody) {
+        String account = loginBody.getAccount();
+        String password = loginBody.getPassword();
+        if (ObjectUtils.isEmpty(account) || ObjectUtils.isEmpty(password)) {
             return R.fail("账户密码不能为空");
         }
-        LoginReturnVO loginReturnVO =loginService.loginBigDataBackStage(account,password);
+        LoginReturnVO loginReturnVO = loginService.loginBigDataBackStage(account, password);
         return R.ok(loginReturnVO);
     }
 
     /**
      * 社区后台登录
-     * @param account 账户
+     *
+     * @param account  账户
      * @param password 密码
      * @return 登录结果
      */
     @PostMapping("/loginCommunityBackage")
-    public R loginCommunityBackage(@RequestParam("account") String account, @RequestParam("password")String password){
-        LoginReturnVO loginReturnVO =loginService.loginCommunityBackage(account,password);
+    public R loginCommunityBackage(@RequestParam("account") String account, @RequestParam("password") String password) {
+        LoginReturnVO loginReturnVO = loginService.loginCommunityBackage(account, password);
         return R.ok(loginReturnVO);
     }
+
     /**
      * 认证中心刷新token
+     *
      * @param refreshToken 用户端保存的刷新token
      * @return 新的token 和刷新token
      */
     @PostMapping("/refreshToken")
-    public R refreshToken(@RequestParam("refreshToken")String refreshToken){
+    public R refreshToken(@RequestParam("refreshToken") String refreshToken) {
         Boolean expired = JWTTokenUtil.isTokenExpired(refreshToken);
         if (expired) {
             throw new TokenException("刷新token已过期");
@@ -110,18 +113,18 @@
             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) {
+        if (empty1 || empty2) {
             throw new TokenException("刷新token校验失败");
         }
-        LoginUserInfoVO loginUserInfoVO=new LoginUserInfoVO();
+        LoginUserInfoVO loginUserInfoVO = new LoginUserInfoVO();
         loginUserInfoVO.setUserId(Long.valueOf(subject));
         loginUserInfoVO.setType(type);
         String token = JWTTokenUtil.generateToken(loginUserInfoVO);
         String refeshToken = JWTTokenUtil.generateRefeshToken(loginUserInfoVO);
-        LoginReturnVO loginReturnVO=new LoginReturnVO();
+        LoginReturnVO loginReturnVO = new LoginReturnVO();
         loginReturnVO.setToken(token);
         loginReturnVO.setRefreshToken(refeshToken);
         return R.ok(loginReturnVO);
@@ -129,13 +132,14 @@
 
     /**
      * 商家后台登录
-     * @param account 账户
+     *
+     * @param account  账户
      * @param password 密码
      * @return 登录结果
      */
     @PostMapping("/loginShopBackStage")
-    public R loginShopBackStage(@RequestParam("account") String account, @RequestParam("password")String password){
-        LoginReturnVO loginReturnVO =loginService.loginShopBackStage(account,password);
+    public R loginShopBackStage(@RequestParam("account") String account, @RequestParam("password") String password) {
+        LoginReturnVO loginReturnVO = loginService.loginShopBackStage(account, password);
         return R.ok(loginReturnVO);
     }
 

--
Gitblit v1.7.1