From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj

---
 springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/LoginServiceImpl.java |  121 +++++++++++++++++++++++-----------------
 1 files changed, 69 insertions(+), 52 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/LoginServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/LoginServiceImpl.java
index c3baf9c..64d49df 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/LoginServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/LoginServiceImpl.java
@@ -1,12 +1,9 @@
 package com.panzhihua.auth.service.impl;
 
-import com.panzhihua.auth.service.LoginService;
-import com.panzhihua.common.constants.TokenConstant;
-import com.panzhihua.common.model.vos.LoginReturnVO;
-import com.panzhihua.common.model.vos.LoginReturnsVO;
-import com.panzhihua.common.utlis.JWTTokenUtil;
-import com.panzhihua.common.constants.UserConstants;
-import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import java.util.concurrent.TimeUnit;
+
+import javax.annotation.Resource;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.data.redis.core.ValueOperations;
@@ -15,8 +12,13 @@
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
-import java.util.concurrent.TimeUnit;
+import com.panzhihua.auth.service.LoginService;
+import com.panzhihua.common.constants.TokenConstant;
+import com.panzhihua.common.constants.UserConstants;
+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.utlis.JWTTokenUtil;
 
 /**
  * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -34,18 +36,19 @@
     /**
      * 微信小程序登录
      *
-     * @param openId 微信标识
+     * @param openId
+     *            微信标识
      * @return jwt
      */
     @Override
     public LoginReturnVO loginApplets(String openId) {
         Authentication authentication = null;
         authentication = authenticationManager
-                .authenticate(new UsernamePasswordAuthenticationToken(openId+"_1", UserConstants.PASSWORD));
-        LoginUserInfoVO loginUser = (LoginUserInfoVO) authentication.getPrincipal();
+            .authenticate(new UsernamePasswordAuthenticationToken(openId + "_1", UserConstants.PASSWORD));
+        LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
         String token = JWTTokenUtil.generateToken(loginUser);
         String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
-        LoginReturnVO loginReturnVO=new LoginReturnVO();
+        LoginReturnVO loginReturnVO = new LoginReturnVO();
         loginReturnVO.setToken(token);
         loginReturnVO.setRefreshToken(refeshToken);
         return loginReturnVO;
@@ -54,31 +57,34 @@
     /**
      * 小程序用户登出
      *
-     * @param token 登录用户token
+     * @param token
+     *            登录用户token
      */
     @Override
     public void logoutApplets(String token) {
         ValueOperations<String, String> valueOperations = redisTemplate.opsForValue();
-        token= token.replaceAll(TokenConstant.TOKEN_PRE,"");
-        valueOperations.set(UserConstants.LOGOUT_TOKEN+token,token, TokenConstant.EXPIRETIME, TimeUnit.MINUTES);
+        token = token.replaceAll(TokenConstant.TOKEN_PRE, "");
+        valueOperations.set(UserConstants.LOGOUT_TOKEN + token, token, TokenConstant.EXPIRETIME, TimeUnit.MINUTES);
     }
 
     /**
      * 运营后台登录
      *
-     * @param account  账户
-     * @param password 密码
+     * @param account
+     *            账户
+     * @param password
+     *            密码
      * @return 登录结果
      */
     @Override
     public LoginReturnVO loginAppletsBackStage(String account, String password) {
         Authentication authentication = null;
-        authentication = authenticationManager
-                .authenticate(new UsernamePasswordAuthenticationToken(account+"_2", password));
-        LoginUserInfoVO loginUser = (LoginUserInfoVO) authentication.getPrincipal();
+        authentication =
+            authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_2", password));
+        LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
         String token = JWTTokenUtil.generateToken(loginUser);
         String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
-        LoginReturnVO loginReturnVO=new LoginReturnVO();
+        LoginReturnVO loginReturnVO = new LoginReturnVO();
         loginReturnVO.setToken(token);
         loginReturnVO.setRefreshToken(refeshToken);
         return loginReturnVO;
@@ -87,19 +93,21 @@
     /**
      * 社区后台登录
      *
-     * @param account  账户
-     * @param password 密码
+     * @param account
+     *            账户
+     * @param password
+     *            密码
      * @return 登录结果
      */
     @Override
     public LoginReturnVO loginCommunityBackage(String account, String password) {
         Authentication authentication = null;
-        authentication = authenticationManager
-                .authenticate(new UsernamePasswordAuthenticationToken(account+"_3", password));
-        LoginUserInfoVO loginUser = (LoginUserInfoVO) authentication.getPrincipal();
+        authentication =
+            authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_3", password));
+        LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
         String token = JWTTokenUtil.generateToken(loginUser);
         String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
-        LoginReturnVO loginReturnVO=new LoginReturnVO();
+        LoginReturnVO loginReturnVO = new LoginReturnVO();
         loginReturnVO.setToken(token);
         loginReturnVO.setRefreshToken(refeshToken);
         return loginReturnVO;
@@ -108,19 +116,21 @@
     /**
      * 商家后台登录
      *
-     * @param account  账户
-     * @param password 密码
+     * @param account
+     *            账户
+     * @param password
+     *            密码
      * @return 登录结果
      */
     @Override
     public LoginReturnVO loginShopBackStage(String account, String password) {
         Authentication authentication = null;
-        authentication = authenticationManager
-                .authenticate(new UsernamePasswordAuthenticationToken(account+"_5", password));
-        LoginUserInfoVO loginUser = (LoginUserInfoVO) authentication.getPrincipal();
+        authentication =
+            authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_5", password));
+        LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
         String token = JWTTokenUtil.generateToken(loginUser);
         String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
-        LoginReturnVO loginReturnVO=new LoginReturnVO();
+        LoginReturnVO loginReturnVO = new LoginReturnVO();
         loginReturnVO.setToken(token);
         loginReturnVO.setRefreshToken(refeshToken);
         return loginReturnVO;
@@ -128,8 +138,11 @@
 
     /**
      * 大数据统计平台(区、街道、社区三层登陆接口)
-     * @param account 账户
-     * @param password 密码
+     * 
+     * @param account
+     *            账户
+     * @param password
+     *            密码
      * @author manailin
      * @return 登录结果
      * @date 2021-5-13 10:56
@@ -137,12 +150,12 @@
     @Override
     public LoginReturnVO loginBigDataBackStage(String account, String password) {
         Authentication authentication = null;
-        authentication = authenticationManager
-                .authenticate(new UsernamePasswordAuthenticationToken(account+"_8", password));
-        LoginUserInfoVO loginUser = (LoginUserInfoVO) authentication.getPrincipal();
+        authentication =
+            authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_8", password));
+        LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
         String token = JWTTokenUtil.generateToken(loginUser);
         String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
-        LoginReturnVO loginReturnVO=new LoginReturnVO();
+        LoginReturnVO loginReturnVO = new LoginReturnVO();
         loginReturnVO.setToken(token);
         loginReturnVO.setRefreshToken(refeshToken);
         return loginReturnVO;
@@ -151,19 +164,21 @@
     /**
      * 商家后台登录
      *
-     * @param account  账户
-     * @param password 密码
+     * @param account
+     *            账户
+     * @param password
+     *            密码
      * @return 登录结果
      */
     @Override
     public LoginReturnsVO loginGridApp(String account, String password) {
         Authentication authentication = null;
-        authentication = authenticationManager
-                .authenticate(new UsernamePasswordAuthenticationToken(account+"_6", password));
-        LoginUserInfoVO loginUser = (LoginUserInfoVO) authentication.getPrincipal();
+        authentication =
+            authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_6", password));
+        LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
         String token = JWTTokenUtil.generateToken(loginUser);
         String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
-        LoginReturnsVO loginReturnVO=new LoginReturnsVO();
+        LoginReturnsVO loginReturnVO = new LoginReturnsVO();
         loginReturnVO.setToken(token);
         loginReturnVO.setRefreshToken(refeshToken);
         loginReturnVO.setUserId(loginUser.getUserId());
@@ -173,19 +188,21 @@
     /**
      * 商家后台登录
      *
-     * @param account  账户
-     * @param password 密码
+     * @param account
+     *            账户
+     * @param password
+     *            密码
      * @return 登录结果
      */
     @Override
     public LoginReturnVO loginGridBackstage(String account, String password) {
         Authentication authentication = null;
-        authentication = authenticationManager
-                .authenticate(new UsernamePasswordAuthenticationToken(account+"_7", password));
-        LoginUserInfoVO loginUser = (LoginUserInfoVO) authentication.getPrincipal();
+        authentication =
+            authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_7", password));
+        LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
         String token = JWTTokenUtil.generateToken(loginUser);
         String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
-        LoginReturnVO loginReturnVO=new LoginReturnVO();
+        LoginReturnVO loginReturnVO = new LoginReturnVO();
         loginReturnVO.setToken(token);
         loginReturnVO.setRefreshToken(refeshToken);
         return loginReturnVO;

--
Gitblit v1.7.1