修改token获取用户数据

product-common/src/main/java/com/poyee/aspect/UserLoginTokenAspect.java

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.poyee.annotation.NoLogin;
 import com.poyee.annotation.UserLoginToken;
 import com.poyee.exception.BusinessException;
+import com.poyee.res.UserInfo;
 import com.poyee.utils.JwtUtils;
 import com.poyee.utils.ServletUtils;
 import lombok.extern.slf4j.Slf4j;

product-common/src/main/java/com/poyee/utils/ServletUtils.java

@@ -1,5 +1,6 @@
 package com.poyee.utils;
 
+import com.alibaba.fastjson.JSONObject;
 import com.poyee.res.UserInfo;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
@@ -42,12 +43,12 @@ public class ServletUtils {
     /**
      * 获取当前登录用户
      */
-    public static UserInfo getCurrentUser() {
+    public static JSONObject getCurrentUser() {
         HttpServletRequest request = getRequest();
         if (request == null) {
             return null;
         }
-        return (UserInfo) request.getAttribute("currentUser");
+        return (JSONObject) request.getAttribute("currentUser");
     }
 
     /**

product-web/src/main/java/com/poyee/facade/impl/ProductInfoFacade.java

@@ -142,7 +142,7 @@ public class ProductInfoFacade implements IProductInfoFacade {
         validateReviewStatus(productInfo, productReviewReq.getStatus());
         sysDictDataService.validateOptions(ProductConstant.DICT_KEY_PRODUCT_STATUS, StrUtil.toString(productReviewReq.getStatus()));
         productInfo.setStatus(productReviewReq.getStatus());
-        productInfo.setUpdateBy(Objects.nonNull(ServletUtils.getCurrentUser()) ? ServletUtils.getCurrentUser().getUsername() : null);
+        productInfo.setUpdateBy(Objects.nonNull(ServletUtils.getCurrentUser()) ? ServletUtils.getCurrentUser().getString("sub") : null);
         productInfo.setUpdateTime(LocaleTimeZoneUtil.nowUtc());
         return productInfoService.updateById(productInfo);
     }
@@ -212,7 +212,7 @@ public class ProductInfoFacade implements IProductInfoFacade {
                     .recycleFlag(BooleanUtil.isTrue(fastSaleReq.getRecycleFlag()) ? StatusEnum.TRUE.getCode() : StatusEnum.FALSE.getCode())
                     .recycleInventory(fastSaleReq.getRecycleInventory())
                     .saleTime(fastSaleReq.getSaleTime())
-                    .createBy(Objects.nonNull(ServletUtils.getCurrentUser()) ? ServletUtils.getCurrentUser().getUsername() : null)
+                    .createBy(Objects.nonNull(ServletUtils.getCurrentUser()) ? ServletUtils.getCurrentUser().getString("sub") : null)
                     .createTime(LocaleTimeZoneUtil.nowUtc())
                     .build();
             this.productFastSaleService.save(newFastSale);
@@ -223,7 +223,7 @@ public class ProductInfoFacade implements IProductInfoFacade {
             existingFastSale.setRecycleFlag(BooleanUtil.isTrue(fastSaleReq.getRecycleFlag()) ? StatusEnum.TRUE.getCode() : StatusEnum.FALSE.getCode());
             existingFastSale.setRecycleInventory(fastSaleReq.getRecycleInventory());
             existingFastSale.setSaleTime(fastSaleReq.getSaleTime());
-            existingFastSale.setUpdateBy(Objects.nonNull(ServletUtils.getCurrentUser()) ? ServletUtils.getCurrentUser().getUsername() : null);
+            existingFastSale.setUpdateBy(Objects.nonNull(ServletUtils.getCurrentUser()) ? ServletUtils.getCurrentUser().getString("sub") : null);
             existingFastSale.setUpdateTime(LocaleTimeZoneUtil.nowUtc());
             return this.productFastSaleService.updateById(existingFastSale);
         }
@@ -265,7 +265,7 @@ public class ProductInfoFacade implements IProductInfoFacade {
                         .relationCode(productInfoAddReq.getRelationCode())
                         .productProperties(productInfoAddReq.getProductProperties())
                         .sort(productInfoAddReq.getSort())
-                        .createBy(Objects.nonNull(ServletUtils.getCurrentUser()) ? ServletUtils.getCurrentUser().getUsername() : null)
+                        .createBy(Objects.nonNull(ServletUtils.getCurrentUser()) ? ServletUtils.getCurrentUser().getString("sub") : null)
                         .createTime(LocaleTimeZoneUtil.nowUtc())
                         .build();
                 this.productInfoService.save(productInfo);
@@ -280,7 +280,7 @@ public class ProductInfoFacade implements IProductInfoFacade {
                         .productType(productInfoAddReq.getProductType())
                         .label(productInfoAddReq.getLabelKey())
                         .sort(productInfoAddReq.getSort())
-                        .createBy(Objects.nonNull(ServletUtils.getCurrentUser()) ? ServletUtils.getCurrentUser().getUsername() : null)
+                        .createBy(Objects.nonNull(ServletUtils.getCurrentUser()) ? ServletUtils.getCurrentUser().getString("sub") : null)
                         .productProperties(productInfoAddReq.getProductProperties())
                         .productDesc(productInfoAddReq.getProductDesc())
                         .relationCode(productInfoAddReq.getRelationCode())

product-web/src/main/java/com/poyee/facade/impl/ProductItemFacade.java

@@ -90,7 +90,7 @@ public class ProductItemFacade implements IProductItemFacade {
                 .inventory(productItemSearchReq.getInventory())
                 .frozenInventory(0)
                 .sales(0)
-                .publisher(Objects.nonNull(ServletUtils.getCurrentUser()) ? ServletUtils.getCurrentUser().getUsername() : null)
+                .publisher(Objects.nonNull(ServletUtils.getCurrentUser()) ? ServletUtils.getCurrentUser().getString("sub") : null)
                 .createTime(LocaleTimeZoneUtil.nowUtc())
                 .build();
         return this.productItemService.save(productItem);
@@ -118,7 +118,7 @@ public class ProductItemFacade implements IProductItemFacade {
             productItem.setInventory(productItemEditReq.getInventory());
         }
         productItem.setUpdateTime(LocaleTimeZoneUtil.nowUtc());
-        productItem.setUpdateBy(Objects.nonNull(ServletUtils.getCurrentUser()) ? ServletUtils.getCurrentUser().getUsername() : null);
+        productItem.setUpdateBy(Objects.nonNull(ServletUtils.getCurrentUser()) ? ServletUtils.getCurrentUser().getString("sub") : null);
         return this.productItemService.updateById(productItem);
     }
 

product-web/src/main/resources/i18n/messages.properties

@@ -26,3 +26,4 @@ inventory_can_not_be_empty=\u5E93\u5B58\u4E0D\u80FD\u4E3A\u7A7A
 failed_to_call_dictionary_table_api=\u8C03\u7528\u5B57\u5178\u8868\u63A5\u53E3\u5931\u8D25
 failed_to_retrieve_checkList_basic_database_data=\u83B7\u53D6checkList\u57FA\u7840\u5E93\u6570\u636E\u5931\u8D25
 id_cannot_be_empty=ID\u4E0D\u80FD\u4E3A\u7A7A
+not_found_value_for_current_dict=\u5F53\u524D\u5B57\u5178\u6CA1\u6709\u5BF9\u5E94\u7684\u503C

product-web/src/main/resources/i18n/messages_en_US.properties

@@ -25,4 +25,5 @@ price_can_not_be_empty=price can not be empty
 inventory_can_not_be_empty=inventory can not be empty
 failed_to_call_dictionary_table_api=failed to call dictionary table api
 failed_to_retrieve_checkList_basic_database_data=failed to retrieve checkList basic database data
-id_cannot_be_empty=id cannot be empty
+id_cannot_be_empty=id cannot be empty
+not_found_value_for_current_dict=no found value for current dict

product-web/src/main/resources/i18n/messages_zh_TW.properties

@@ -26,3 +26,4 @@ inventory_can_not_be_empty=\u5EAB\u5B58\u4E0D\u80FD\u7232\u7A7A
 failed_to_call_dictionary_table_api=\u8ABF\u7528\u5B57\u5178\u9336\u4ECB\u9762\u5931\u6557
 failed_to_retrieve_checkList_basic_database_data=\u7372\u53D6checkList\u57FA\u790E\u5EAB\u6578\u64DA\u5931\u6557
 id_cannot_be_empty=ID\u4E0D\u80FD\u70BA\u7A7A
+not_found_value_for_current_dict=\u7576\u524D\u5B57\u5178\u6C92\u6709\u5C0D\u61C9\u7684\u503C