From 8788a78ad30c1bb9d50d91b10e76d3ae47ed8da2 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 07 六月 2021 09:28:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/controller/BaseController.java |   42 +++++++++++++++++++++++++++++++-----------
 1 files changed, 31 insertions(+), 11 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 1e0e849..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,24 +85,33 @@
 
     /**
      * 获取登录对象所有信息
+     *
      * @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("5730CB290AD203B32D2FA4347CD54A50A684E16D2C7A4544CF352D54D8A763BA6652C323B13BEEE682A5095B8BCC76842225A914253CE84AFB6B58A9D1BE30A7992786E151A933FDEC6EBDCD1928CA68927047770F296F7541268149B34FDFCEF1340CF2266A041484744CB45B216EE8B4D96E243098F9CB3F661ACA7AF356C422BFE9A009FA478DF606A71DA7DBD776527E5120C3F13281BA8FC5587BACD5E403EE069762B5CF060BFA3CF4FD3417F5653CC178D2CA117284D85F442C0FAB076DB6F6D873B5363FAB93EBA9284CC87A5E97243EF4DC73F1ADA57BD9E9AAB2E4972AC3A4615B2DF6F9062BC04428D1B84B6C892A306F191B1D9DDBBB201D2767CE928020489AFC6BCFDC8A74F8C95080F74B4EC64AD1A6354B17A156B95AA9467C7461BD3C3F15F8F65BD7F3272184435D77003738B5B942EEA9603CFF249764718732595EC44DE4ED1BB763F9C88BAFACF5540E689FE84A4702E31D3D1D05BAC25C10F8E0C3948C777478537397BCB67D37066385DFCBDE3F4A53D6BA14481DBCB07E8452ACD2790A76669A9DE6D7080C8CFD9FB774035FCC3AC1C436581144969B7150318024A2E893FE926654E002097EB4735E49F3A9698A405969888A7D88A55A0FA60318C4A1E2D243BEE6D438");
+        byte[] decrypt = AES.decrypt(bytes, Constants.AES_KEY);
+        System.out.println(decrypt);
+        String s = new String(decrypt);
+        System.out.println(s);
+    }
+
 }

--
Gitblit v1.7.1