From b181787713970d53f8f27daa5ada690bf4097458 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 14 五月 2021 16:50:24 +0800
Subject: [PATCH] bugfixed
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/controller/BaseController.java | 36 ++++++++++++++++++++++++------------
1 files changed, 24 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 7887d6e..464db02 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
@@ -4,6 +4,7 @@
import com.panzhihua.common.constants.Constants;
import com.panzhihua.common.constants.TokenConstant;
import com.panzhihua.common.constants.UserConstants;
+import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.exceptions.UnAuthenticationException;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.utlis.AES;
@@ -13,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
@@ -34,9 +35,10 @@
/**
* 获取登录对象信息
+ *
* @return 对象userid
*/
- public Long getUserId(){
+ public Long getUserId() {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
Long userId = loginUserInfo.getUserId();
return userId;
@@ -44,29 +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("用户未绑定社区");
+ }
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("用户未绑定社区");
+ }
return areaId;
}
/**
* 获取登录token
+ *
* @return token
*/
- public String getToken(){
+ public String getToken() {
HttpServletRequest request = this.getRequest();
String header = request.getHeader(TokenConstant.TOKEN_LOGOUT);
return header;
@@ -74,28 +85,29 @@
/**
* 获取登录对象所有信息
+ *
* @return 所有信息
*/
@SneakyThrows
- public LoginUserInfoVO getLoginUserInfo(){
+ public LoginUserInfoVO getLoginUserInfo() {
HttpServletRequest request = this.getRequest();
String userInfo = request.getHeader(TokenConstant.TOKEN_USERINFO);
boolean empty = ObjectUtils.isEmpty(userInfo);
if (empty) {
throw new UnAuthenticationException("获取登录人信息失败");
}
- log.info("userInfo【{}】",userInfo);
+// log.info("userInfo【{}】",userInfo);
byte[] bytes = AES.parseHexStr2Byte(userInfo);
- log.info("bytes【{}】",bytes);
+// 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);
+// log.info("decrypt【{}】",decrypt);
+ userInfo = new String(decrypt);
+ LoginUserInfoVO loginUserInfoVO = JSONObject.parseObject(userInfo, LoginUserInfoVO.class);
return loginUserInfoVO;
}
public static void main(String[] args) {
- byte[] bytes = AES.parseHexStr2Byte("A5050B4D17DE52A39ECB57C6B160B8285ED8371239D8A6EBB0D2421B8BB6EA12C580D19459D29B97A31F07C8932D275F61F9F440A2A13FA718539CD06190F82036FE692BDE840784A66CD76E2C0360C25F9055DDB2FE33652B1D126B7720280ACC5471B0EF6BD00CFB478A06E1E78CDD6C310C1DE271BDE5348D6899063ADCDD39DE446236809801A14BF47B5468B96128E45DEFCE8365B83D62AA5C3C1570EA16CC51BC228421FFD731016943D7CEEAD36AD8FA055BE628639CE265F524562F99129823989A8D7B8A9B1B202524672E85464E15EB7E6F50C632C085B5602AD4B42E6D645499C5922D3714B6A987E44DA78059D87D5942F9FEFBB1B610C920F89AB76FC32D4C9E945DCDCE2974539BF928B0A2663954849459F8D127D2B50D7BFD5CF2B506785FB515CB9AB106FA9A40F467E75B5148ACE7A8C5E6650E6A3576396F3D08D6D1B90DB0F4CCDE8D4025B86E45CC32CCBB32CC93E2F248DBD9416D957A0C6E0FD4E35DAE29D2E7C1F6EE6213B6BB566159CF248D14680C4F84C051A754D0F1BE100C715030AC4585327D95743DF8B866817E4F7E59868FCEC8AFEB9C4A75C06FC21590E3A46419D7F75CB8A4DD280FF1D138D1E61E3EDE2C41737D0BA21A739C0A5BF8842479F00D4A8919");
+ byte[] bytes = AES.parseHexStr2Byte("5730CB290AD203B32D2FA4347CD54A50A684E16D2C7A4544CF352D54D8A763BA6652C323B13BEEE682A5095B8BCC76842225A914253CE84AFB6B58A9D1BE30A7992786E151A933FDEC6EBDCD1928CA68927047770F296F7541268149B34FDFCEF1340CF2266A041484744CB45B216EE8B4D96E243098F9CB3F661ACA7AF356C422BFE9A009FA478DF606A71DA7DBD776527E5120C3F13281BA8FC5587BACD5E403EE069762B5CF060BFA3CF4FD3417F5653CC178D2CA117284D85F442C0FAB076DB6F6D873B5363FAB93EBA9284CC87A5E97243EF4DC73F1ADA57BD9E9AAB2E4972AC3A4615B2DF6F9062BC04428D1B84B6C892A306F191B1D9DDBBB201D2767CE928020489AFC6BCFDC8A74F8C95080F74B4EC64AD1A6354B17A156B95AA9467C7461BD3C3F15F8F65BD7F3272184435D77003738B5B942EEA9603CFF249764718732595EC44DE4ED1BB763F9C88BAFACF5540E689FE84A4702E31D3D1D05BAC25C10F8E0C3948C777478537397BCB67D37066385DFCBDE3F4A53D6BA14481DBCB07E8452ACD2790A76669A9DE6D7080C8CFD9FB774035FCC3AC1C436581144969B7150318024A2E893FE926654E002097EB4735E49F3A9698A405969888A7D88A55A0FA60318C4A1E2D243BEE6D438");
byte[] decrypt = AES.decrypt(bytes, Constants.AES_KEY);
System.out.println(decrypt);
String s = new String(decrypt);
--
Gitblit v1.7.1