From a9e3948c9b9af14a373dacb1cb7babdbe9fd0b07 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 16 七月 2021 14:20:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/controller/BaseController.java | 48 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 36 insertions(+), 12 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/controller/BaseController.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/controller/BaseController.java
index 8639fc0..077347e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/controller/BaseController.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/controller/BaseController.java
@@ -14,9 +14,9 @@
import org.springframework.util.ObjectUtils;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
-import sun.security.krb5.internal.crypto.Aes256;
import javax.servlet.http.HttpServletRequest;
+
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -35,9 +35,10 @@
/**
* 获取登录对象信息
+ *
* @return 对象userid
*/
- public Long getUserId(){
+ public Long getUserId() {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
Long userId = loginUserInfo.getUserId();
return userId;
@@ -45,35 +46,38 @@
/**
* 获取登录对象所在社区id
+ *
* @return 社区id
*/
- public Long getCommunityId(){
+ public Long getCommunityId() {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
Long communityId = loginUserInfo.getCommunityId();
- if (null==communityId||0==communityId) {
- throw new ServiceException("用户未绑定社区");
+ if (null == communityId || 0 == communityId) {
+ throw new ServiceException("用户未绑定社区");
}
return communityId;
}
/**
* 获取登录对象所在小区
+ *
* @return 小区id
*/
- public Long getAreaId(){
+ public Long getAreaId() {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
Long areaId = loginUserInfo.getAreaId();
- if (null==areaId||0==areaId) {
- throw new ServiceException("用户未绑定社区");
+ if (null == areaId || 0 == areaId) {
+ throw new ServiceException("用户未绑定社区");
}
return areaId;
}
/**
* 获取登录token
+ *
* @return token
*/
- public String getToken(){
+ public String getToken() {
HttpServletRequest request = this.getRequest();
String header = request.getHeader(TokenConstant.TOKEN_LOGOUT);
return header;
@@ -81,10 +85,11 @@
/**
* 获取登录对象所有信息
+ *
* @return 所有信息
*/
@SneakyThrows
- public LoginUserInfoVO getLoginUserInfo(){
+ public LoginUserInfoVO getLoginUserInfo() {
HttpServletRequest request = this.getRequest();
String userInfo = request.getHeader(TokenConstant.TOKEN_USERINFO);
boolean empty = ObjectUtils.isEmpty(userInfo);
@@ -96,8 +101,27 @@
// log.info("bytes【{}】",bytes);
byte[] decrypt = AES.decrypt(bytes, Constants.AES_KEY);
// log.info("decrypt【{}】",decrypt);
- userInfo=new String(decrypt);
- LoginUserInfoVO loginUserInfoVO= JSONObject.parseObject(userInfo,LoginUserInfoVO.class);
+ userInfo = new String(decrypt);
+ LoginUserInfoVO loginUserInfoVO = JSONObject.parseObject(userInfo, LoginUserInfoVO.class);
+ return loginUserInfoVO;
+ }
+
+ @SneakyThrows
+ public LoginUserInfoVO getLoginUserInfoSureNoLogin() {
+ HttpServletRequest request = this.getRequest();
+ String userInfo = request.getHeader(TokenConstant.TOKEN_USERINFO);
+ boolean empty = ObjectUtils.isEmpty(userInfo);
+ if (empty) {
+ return null;
+// throw new UnAuthenticationException("获取登录人信息失败");
+ }
+// log.info("userInfo【{}】",userInfo);
+ byte[] bytes = AES.parseHexStr2Byte(userInfo);
+// log.info("bytes【{}】",bytes);
+ byte[] decrypt = AES.decrypt(bytes, Constants.AES_KEY);
+// log.info("decrypt【{}】",decrypt);
+ userInfo = new String(decrypt);
+ LoginUserInfoVO loginUserInfoVO = JSONObject.parseObject(userInfo, LoginUserInfoVO.class);
return loginUserInfoVO;
}
--
Gitblit v1.7.1