From 70406a52ed3bd31fb72793dea750793ca216193a Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 23 八月 2021 19:34:10 +0800
Subject: [PATCH] Merge branch 'test' into 'master'

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/controller/BaseController.java |   56 ++++++++++++++++++++++++++++----------------------------
 1 files changed, 28 insertions(+), 28 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 6299e69..81ce29e 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
@@ -1,22 +1,21 @@
 package com.panzhihua.common.controller;
 
-import com.alibaba.fastjson.JSONObject;
-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;
-import io.swagger.models.auth.In;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
+import javax.servlet.http.HttpServletRequest;
+
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
-import javax.servlet.http.HttpServletRequest;
+import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.constants.TokenConstant;
+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;
 
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -26,11 +25,20 @@
  **/
 @Slf4j
 public class BaseController {
+    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);
+    }
+
     /**
      * 获取request对象
      */
     public HttpServletRequest getRequest() {
-        return ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+        return ((ServletRequestAttributes)RequestContextHolder.getRequestAttributes()).getRequest();
     }
 
     /**
@@ -111,11 +119,11 @@
         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);
+        // log.info("decrypt【{}】",decrypt);
         userInfo = new String(decrypt);
         LoginUserInfoVO loginUserInfoVO = JSONObject.parseObject(userInfo, LoginUserInfoVO.class);
         return loginUserInfoVO;
@@ -128,24 +136,16 @@
         boolean empty = ObjectUtils.isEmpty(userInfo);
         if (empty) {
             return null;
-//            throw new UnAuthenticationException("获取登录人信息失败");
+            // 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);
+        // 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