瀏覽代碼

系统优化

woody 8 月之前
父節點
當前提交
b7cc0a9850
共有 43 個文件被更改,包括 54 次插入64 次删除
  1. 0 6
      pom.xml
  2. 1 1
      src/main/java/com/chelvc/cloud/maintain/controller/AssessController.java
  3. 1 1
      src/main/java/com/chelvc/cloud/maintain/controller/AssetController.java
  4. 1 1
      src/main/java/com/chelvc/cloud/maintain/controller/AttentionController.java
  5. 1 1
      src/main/java/com/chelvc/cloud/maintain/controller/AuthorizeController.java
  6. 1 1
      src/main/java/com/chelvc/cloud/maintain/controller/CartItemController.java
  7. 1 1
      src/main/java/com/chelvc/cloud/maintain/controller/CategoryController.java
  8. 1 1
      src/main/java/com/chelvc/cloud/maintain/controller/CommentController.java
  9. 1 1
      src/main/java/com/chelvc/cloud/maintain/controller/CommissionConfigController.java
  10. 1 1
      src/main/java/com/chelvc/cloud/maintain/controller/CommonController.java
  11. 1 1
      src/main/java/com/chelvc/cloud/maintain/controller/CouponController.java
  12. 1 1
      src/main/java/com/chelvc/cloud/maintain/controller/CurrencyRecordController.java
  13. 1 1
      src/main/java/com/chelvc/cloud/maintain/controller/DynamicCommentController.java
  14. 1 1
      src/main/java/com/chelvc/cloud/maintain/controller/DynamicContentController.java
  15. 1 1
      src/main/java/com/chelvc/cloud/maintain/controller/DynamicEvaluateRecordController.java
  16. 1 1
      src/main/java/com/chelvc/cloud/maintain/controller/FavoriteController.java
  17. 1 1
      src/main/java/com/chelvc/cloud/maintain/controller/FeedbackController.java
  18. 1 1
      src/main/java/com/chelvc/cloud/maintain/controller/FeedbackReplyController.java
  19. 1 1
      src/main/java/com/chelvc/cloud/maintain/controller/FileController.java
  20. 1 1
      src/main/java/com/chelvc/cloud/maintain/controller/GoodsController.java
  21. 1 1
      src/main/java/com/chelvc/cloud/maintain/controller/HelpCategoryController.java
  22. 1 1
      src/main/java/com/chelvc/cloud/maintain/controller/HotMerchantController.java
  23. 1 1
      src/main/java/com/chelvc/cloud/maintain/controller/IncomeRecordController.java
  24. 1 1
      src/main/java/com/chelvc/cloud/maintain/controller/IndexController.java
  25. 1 1
      src/main/java/com/chelvc/cloud/maintain/controller/InformController.java
  26. 1 1
      src/main/java/com/chelvc/cloud/maintain/controller/MerchantAuthController.java
  27. 1 1
      src/main/java/com/chelvc/cloud/maintain/controller/MerchantController.java
  28. 1 1
      src/main/java/com/chelvc/cloud/maintain/controller/NoticeController.java
  29. 1 1
      src/main/java/com/chelvc/cloud/maintain/controller/OmsOrderController.java
  30. 1 1
      src/main/java/com/chelvc/cloud/maintain/controller/OmsOrderReturnApplyController.java
  31. 1 1
      src/main/java/com/chelvc/cloud/maintain/controller/OrderController.java
  32. 1 1
      src/main/java/com/chelvc/cloud/maintain/controller/ReservationController.java
  33. 1 1
      src/main/java/com/chelvc/cloud/maintain/controller/UserController.java
  34. 1 1
      src/main/java/com/chelvc/cloud/maintain/controller/UserCouponController.java
  35. 1 1
      src/main/java/com/chelvc/cloud/maintain/controller/UserInviteController.java
  36. 1 1
      src/main/java/com/chelvc/cloud/maintain/controller/UserReceiveAddressController.java
  37. 1 1
      src/main/java/com/chelvc/cloud/maintain/vo/CouponVO.java
  38. 1 1
      src/main/java/com/chelvc/cloud/maintain/vo/PersonalVO.java
  39. 1 1
      src/main/java/com/chelvc/cloud/maintain/vo/UserVO.java
  40. 4 5
      src/main/resources/application-dev.yml
  41. 4 5
      src/main/resources/application-pre.yml
  42. 4 5
      src/main/resources/application-prod.yml
  43. 4 5
      src/main/resources/application-test.yml

+ 0 - 6
pom.xml

@@ -20,7 +20,6 @@
         <vehicle-client.version>1.0.0-SNAPSHOT</vehicle-client.version>
         <framework-sms.version>1.0.0-RELEASE</framework-sms.version>
         <framework-redis.version>1.0.0-RELEASE</framework-redis.version>
-        <framework-oauth.version>1.0.0-RELEASE</framework-oauth.version>
         <framework-upload.version>1.0.0-RELEASE</framework-upload.version>
         <framework-location.version>1.0.0-RELEASE</framework-location.version>
         <framework-security.version>1.0.0-RELEASE</framework-security.version>
@@ -47,11 +46,6 @@
             <artifactId>framework-redis</artifactId>
             <version>${framework-redis.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.chelvc.framework</groupId>
-            <artifactId>framework-oauth</artifactId>
-            <version>${framework-oauth.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.chelvc.framework</groupId>
             <artifactId>framework-upload</artifactId>

+ 1 - 1
src/main/java/com/chelvc/cloud/maintain/controller/AssessController.java

@@ -13,7 +13,7 @@ import com.chelvc.cloud.vehicle.client.param.AssessQueryParam;
 import com.chelvc.cloud.vehicle.client.param.AssessRecoverModifyParam;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
 import com.chelvc.framework.base.context.SessionContextHolder;
-import com.chelvc.framework.oauth.annotation.Authorize;
+import com.chelvc.framework.security.annotation.Authorize;
 import com.chelvc.framework.redis.config.RedisConfigurer;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

+ 1 - 1
src/main/java/com/chelvc/cloud/maintain/controller/AssetController.java

@@ -3,7 +3,7 @@ package com.chelvc.cloud.maintain.controller;
 import com.chelvc.cloud.vehicle.client.AssetClient;
 import com.chelvc.cloud.vehicle.client.dto.MerchantAssetDTO;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
-import com.chelvc.framework.oauth.annotation.Authorize;
+import com.chelvc.framework.security.annotation.Authorize;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

+ 1 - 1
src/main/java/com/chelvc/cloud/maintain/controller/AttentionController.java

@@ -7,7 +7,7 @@ import com.chelvc.cloud.vehicle.client.param.QueryAttentionParam;
 import com.chelvc.framework.base.context.SessionContextHolder;
 import com.chelvc.framework.common.model.Pagination;
 import com.chelvc.framework.common.model.Paging;
-import com.chelvc.framework.oauth.annotation.Authorize;
+import com.chelvc.framework.security.annotation.Authorize;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;

+ 1 - 1
src/main/java/com/chelvc/cloud/maintain/controller/AuthorizeController.java

@@ -8,7 +8,7 @@ import com.chelvc.cloud.user.client.UserClient;
 import com.chelvc.cloud.user.client.model.Authorization;
 import com.chelvc.cloud.user.client.param.AuthorizeParam;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
-import com.chelvc.framework.oauth.annotation.Authorize;
+import com.chelvc.framework.security.annotation.Authorize;
 import com.chelvc.framework.sms.CaptchaSmsHandler;
 import com.chelvc.framework.sms.SmsSession;
 import lombok.RequiredArgsConstructor;

+ 1 - 1
src/main/java/com/chelvc/cloud/maintain/controller/CartItemController.java

@@ -10,7 +10,7 @@ import com.chelvc.cloud.vehicle.client.dto.MerchantCartItemDTO;
 import com.chelvc.cloud.vehicle.client.dto.OmsCartItemDTO;
 import com.chelvc.cloud.vehicle.client.param.OmsCartItemModifyParam;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
-import com.chelvc.framework.oauth.annotation.Authorize;
+import com.chelvc.framework.security.annotation.Authorize;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;

+ 1 - 1
src/main/java/com/chelvc/cloud/maintain/controller/CategoryController.java

@@ -9,7 +9,7 @@ import com.chelvc.cloud.vehicle.client.CategoryClient;
 import com.chelvc.cloud.vehicle.client.dto.CategoryDTO;
 import com.chelvc.cloud.vehicle.client.param.CategoryListParam;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
-import com.chelvc.framework.oauth.annotation.Authorize;
+import com.chelvc.framework.security.annotation.Authorize;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;

+ 1 - 1
src/main/java/com/chelvc/cloud/maintain/controller/CommentController.java

@@ -11,7 +11,7 @@ import com.chelvc.cloud.vehicle.client.param.AddGoodsCommentParam;
 import com.chelvc.cloud.vehicle.client.param.CommentQueryParam;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
 import com.chelvc.framework.base.context.SessionContextHolder;
-import com.chelvc.framework.oauth.annotation.Authorize;
+import com.chelvc.framework.security.annotation.Authorize;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;

+ 1 - 1
src/main/java/com/chelvc/cloud/maintain/controller/CommissionConfigController.java

@@ -2,7 +2,7 @@ package com.chelvc.cloud.maintain.controller;
 
 import com.chelvc.cloud.vehicle.client.CommissionConfigClient;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
-import com.chelvc.framework.oauth.annotation.Authorize;
+import com.chelvc.framework.security.annotation.Authorize;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;

+ 1 - 1
src/main/java/com/chelvc/cloud/maintain/controller/CommonController.java

@@ -4,7 +4,7 @@ import java.util.List;
 
 import com.chelvc.cloud.vehicle.client.CommonClient;
 import com.chelvc.cloud.vehicle.client.dto.RegionDTO;
-import com.chelvc.framework.oauth.annotation.Authorize;
+import com.chelvc.framework.security.annotation.Authorize;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;

+ 1 - 1
src/main/java/com/chelvc/cloud/maintain/controller/CouponController.java

@@ -14,7 +14,7 @@ import com.chelvc.cloud.vehicle.client.param.CouponModifyParam;
 import com.chelvc.cloud.vehicle.client.param.CouponPagingParam;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
 import com.chelvc.framework.common.model.Pagination;
-import com.chelvc.framework.oauth.annotation.Authorize;
+import com.chelvc.framework.security.annotation.Authorize;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;

+ 1 - 1
src/main/java/com/chelvc/cloud/maintain/controller/CurrencyRecordController.java

@@ -7,7 +7,7 @@ import com.chelvc.cloud.vehicle.client.CurrencyRecordClient;
 import com.chelvc.cloud.vehicle.client.dto.CurrencyRecordDTO;
 import com.chelvc.cloud.vehicle.client.dto.EarningsDTO;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
-import com.chelvc.framework.oauth.annotation.Authorize;
+import com.chelvc.framework.security.annotation.Authorize;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;

+ 1 - 1
src/main/java/com/chelvc/cloud/maintain/controller/DynamicCommentController.java

@@ -7,7 +7,7 @@ import com.chelvc.cloud.vehicle.client.param.QueryDynamicCommentParam;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
 import com.chelvc.framework.base.context.SessionContextHolder;
 import com.chelvc.framework.common.model.Pagination;
-import com.chelvc.framework.oauth.annotation.Authorize;
+import com.chelvc.framework.security.annotation.Authorize;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;

+ 1 - 1
src/main/java/com/chelvc/cloud/maintain/controller/DynamicContentController.java

@@ -10,7 +10,7 @@ import com.chelvc.cloud.vehicle.client.param.QueryDynamicContentParam;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
 import com.chelvc.framework.base.context.SessionContextHolder;
 import com.chelvc.framework.common.model.Pagination;
-import com.chelvc.framework.oauth.annotation.Authorize;
+import com.chelvc.framework.security.annotation.Authorize;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;

+ 1 - 1
src/main/java/com/chelvc/cloud/maintain/controller/DynamicEvaluateRecordController.java

@@ -4,7 +4,7 @@ import com.chelvc.cloud.vehicle.client.DynamicEvaluateRecordClient;
 import com.chelvc.cloud.vehicle.client.param.AddDynamicEvaluateRecordParam;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
 import com.chelvc.framework.base.context.SessionContextHolder;
-import com.chelvc.framework.oauth.annotation.Authorize;
+import com.chelvc.framework.security.annotation.Authorize;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;

+ 1 - 1
src/main/java/com/chelvc/cloud/maintain/controller/FavoriteController.java

@@ -16,7 +16,7 @@ import com.chelvc.cloud.vehicle.client.param.FavoritePagingParam;
 import com.chelvc.cloud.vehicle.client.param.FavoriteQueryParam;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
 import com.chelvc.framework.common.model.Pagination;
-import com.chelvc.framework.oauth.annotation.Authorize;
+import com.chelvc.framework.security.annotation.Authorize;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;

+ 1 - 1
src/main/java/com/chelvc/cloud/maintain/controller/FeedbackController.java

@@ -9,7 +9,7 @@ import com.chelvc.cloud.vehicle.client.FeedbackClient;
 import com.chelvc.cloud.vehicle.client.dto.FeedBackDTO;
 import com.chelvc.cloud.vehicle.client.param.FeedBackModifyParam;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
-import com.chelvc.framework.oauth.annotation.Authorize;
+import com.chelvc.framework.security.annotation.Authorize;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;

+ 1 - 1
src/main/java/com/chelvc/cloud/maintain/controller/FeedbackReplyController.java

@@ -6,7 +6,7 @@ import javax.validation.constraints.Min;
 import com.chelvc.cloud.vehicle.client.FeedbackReplyClient;
 import com.chelvc.cloud.vehicle.client.param.FeedBackReplyModifyParam;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
-import com.chelvc.framework.oauth.annotation.Authorize;
+import com.chelvc.framework.security.annotation.Authorize;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;

+ 1 - 1
src/main/java/com/chelvc/cloud/maintain/controller/FileController.java

@@ -9,7 +9,7 @@ import com.chelvc.framework.common.model.Media;
 import com.chelvc.framework.common.util.FileUtils;
 import com.chelvc.framework.common.util.ObjectUtils;
 import com.chelvc.framework.common.util.StringUtils;
-import com.chelvc.framework.oauth.annotation.Authorize;
+import com.chelvc.framework.security.annotation.Authorize;
 import com.chelvc.framework.upload.UploadHandler;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

+ 1 - 1
src/main/java/com/chelvc/cloud/maintain/controller/GoodsController.java

@@ -13,7 +13,7 @@ import com.chelvc.cloud.vehicle.client.dto.GoodsDTO;
 import com.chelvc.cloud.vehicle.client.dto.GoodsDetailDTO;
 import com.chelvc.cloud.vehicle.client.param.GoodsQueryParam;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
-import com.chelvc.framework.oauth.annotation.Authorize;
+import com.chelvc.framework.security.annotation.Authorize;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;

+ 1 - 1
src/main/java/com/chelvc/cloud/maintain/controller/HelpCategoryController.java

@@ -6,7 +6,7 @@ import com.chelvc.cloud.vehicle.client.HelpCategoryClient;
 import com.chelvc.cloud.vehicle.client.dto.HelpCategoryDTO;
 import com.chelvc.cloud.vehicle.client.param.HelpCategoryModifyParam;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
-import com.chelvc.framework.oauth.annotation.Authorize;
+import com.chelvc.framework.security.annotation.Authorize;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;

+ 1 - 1
src/main/java/com/chelvc/cloud/maintain/controller/HotMerchantController.java

@@ -8,7 +8,7 @@ import com.chelvc.cloud.vehicle.client.HotMerchantClient;
 import com.chelvc.cloud.vehicle.client.dto.MerchantDTO;
 import com.chelvc.cloud.vehicle.client.param.LocationQueryParam;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
-import com.chelvc.framework.oauth.annotation.Authorize;
+import com.chelvc.framework.security.annotation.Authorize;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;

+ 1 - 1
src/main/java/com/chelvc/cloud/maintain/controller/IncomeRecordController.java

@@ -5,7 +5,7 @@ import javax.validation.Valid;
 import com.chelvc.cloud.vehicle.client.IncomeRecordClient;
 import com.chelvc.cloud.vehicle.client.param.IncomeRecordModifyParam;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
-import com.chelvc.framework.oauth.annotation.Authorize;
+import com.chelvc.framework.security.annotation.Authorize;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;

+ 1 - 1
src/main/java/com/chelvc/cloud/maintain/controller/IndexController.java

@@ -18,7 +18,7 @@ import com.chelvc.framework.base.context.SessionContextHolder;
 import com.chelvc.framework.common.model.Pagination;
 import com.chelvc.framework.location.Address;
 import com.chelvc.framework.location.LocationHandler;
-import com.chelvc.framework.oauth.annotation.Authorize;
+import com.chelvc.framework.security.annotation.Authorize;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

+ 1 - 1
src/main/java/com/chelvc/cloud/maintain/controller/InformController.java

@@ -8,7 +8,7 @@ import com.chelvc.framework.base.context.SessionContextHolder;
 import com.chelvc.framework.common.exception.ResourceUnavailableException;
 import com.chelvc.framework.common.model.Pagination;
 import com.chelvc.framework.common.model.Paging;
-import com.chelvc.framework.oauth.annotation.Authorize;
+import com.chelvc.framework.security.annotation.Authorize;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;

+ 1 - 1
src/main/java/com/chelvc/cloud/maintain/controller/MerchantAuthController.java

@@ -7,7 +7,7 @@ import com.chelvc.cloud.vehicle.client.MerchantAuthClient;
 import com.chelvc.cloud.vehicle.client.dto.MerchantAuthDTO;
 import com.chelvc.cloud.vehicle.client.param.MerchantAuthModifyParam;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
-import com.chelvc.framework.oauth.annotation.Authorize;
+import com.chelvc.framework.security.annotation.Authorize;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;

+ 1 - 1
src/main/java/com/chelvc/cloud/maintain/controller/MerchantController.java

@@ -24,7 +24,7 @@ import com.chelvc.cloud.vehicle.client.param.QueryMerchantBalanceParam;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
 import com.chelvc.framework.base.context.SessionContextHolder;
 import com.chelvc.framework.common.model.Pagination;
-import com.chelvc.framework.oauth.annotation.Authorize;
+import com.chelvc.framework.security.annotation.Authorize;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;

+ 1 - 1
src/main/java/com/chelvc/cloud/maintain/controller/NoticeController.java

@@ -6,7 +6,7 @@ import javax.validation.Valid;
 import com.chelvc.cloud.vehicle.client.NoticeClient;
 import com.chelvc.cloud.vehicle.client.dto.NoticeDTO;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
-import com.chelvc.framework.oauth.annotation.Authorize;
+import com.chelvc.framework.security.annotation.Authorize;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;

+ 1 - 1
src/main/java/com/chelvc/cloud/maintain/controller/OmsOrderController.java

@@ -15,7 +15,7 @@ import com.chelvc.cloud.vehicle.client.param.OmsOrderModifyParam;
 import com.chelvc.cloud.vehicle.client.param.OrderPagingParam;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
 import com.chelvc.framework.common.model.Pagination;
-import com.chelvc.framework.oauth.annotation.Authorize;
+import com.chelvc.framework.security.annotation.Authorize;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;

+ 1 - 1
src/main/java/com/chelvc/cloud/maintain/controller/OmsOrderReturnApplyController.java

@@ -5,7 +5,7 @@ import com.chelvc.cloud.vehicle.client.param.OrderReturnApplyModifyParam;
 import com.chelvc.cloud.vehicle.client.param.OrderReturnApplyPagingParam;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
 import com.chelvc.framework.common.model.Pagination;
-import com.chelvc.framework.oauth.annotation.Authorize;
+import com.chelvc.framework.security.annotation.Authorize;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;

+ 1 - 1
src/main/java/com/chelvc/cloud/maintain/controller/OrderController.java

@@ -9,7 +9,7 @@ import com.chelvc.cloud.maintain.vo.UserCouponVO;
 import com.chelvc.cloud.vehicle.client.UserCouponClient;
 import com.chelvc.cloud.vehicle.client.param.OrderQueryParam;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
-import com.chelvc.framework.oauth.annotation.Authorize;
+import com.chelvc.framework.security.annotation.Authorize;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;

+ 1 - 1
src/main/java/com/chelvc/cloud/maintain/controller/ReservationController.java

@@ -18,7 +18,7 @@ import com.chelvc.cloud.vehicle.client.param.ReservationPagingParam;
 import com.chelvc.cloud.vehicle.client.param.ReservationQueryParam;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
 import com.chelvc.framework.common.model.Pagination;
-import com.chelvc.framework.oauth.annotation.Authorize;
+import com.chelvc.framework.security.annotation.Authorize;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;

+ 1 - 1
src/main/java/com/chelvc/cloud/maintain/controller/UserController.java

@@ -7,7 +7,7 @@ import com.chelvc.cloud.maintain.vo.PersonalVO;
 import com.chelvc.cloud.user.client.UserClient;
 import com.chelvc.cloud.user.client.param.PersonalModifyParam;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
-import com.chelvc.framework.oauth.annotation.Authorize;
+import com.chelvc.framework.security.annotation.Authorize;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;

+ 1 - 1
src/main/java/com/chelvc/cloud/maintain/controller/UserCouponController.java

@@ -14,7 +14,7 @@ import com.chelvc.cloud.vehicle.client.param.UserCouponPagingParam;
 import com.chelvc.cloud.vehicle.client.param.UserCouponQueryParam;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
 import com.chelvc.framework.common.model.Pagination;
-import com.chelvc.framework.oauth.annotation.Authorize;
+import com.chelvc.framework.security.annotation.Authorize;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;

+ 1 - 1
src/main/java/com/chelvc/cloud/maintain/controller/UserInviteController.java

@@ -8,7 +8,7 @@ import com.chelvc.cloud.vehicle.client.param.TeamInvitePageParam;
 import com.chelvc.cloud.vehicle.client.param.UserInviteParams;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
 import com.chelvc.framework.base.context.SessionContextHolder;
-import com.chelvc.framework.oauth.annotation.Authorize;
+import com.chelvc.framework.security.annotation.Authorize;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;

+ 1 - 1
src/main/java/com/chelvc/cloud/maintain/controller/UserReceiveAddressController.java

@@ -3,7 +3,7 @@ import com.chelvc.cloud.vehicle.client.UserReceiveAddressClient;
 import com.chelvc.cloud.vehicle.client.dto.UserReceiveAddressDTO;
 import com.chelvc.cloud.vehicle.client.param.UserReceiveAddressModifyParam;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
-import com.chelvc.framework.oauth.annotation.Authorize;
+import com.chelvc.framework.security.annotation.Authorize;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;

+ 1 - 1
src/main/java/com/chelvc/cloud/maintain/vo/CouponVO.java

@@ -4,7 +4,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 import com.chelvc.cloud.vehicle.client.constant.CouponType;
-import com.chelvc.framework.common.serializer.JacksonEnumerateSerializer;
+import com.chelvc.framework.common.jackson.JacksonEnumerateSerializer;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import lombok.AllArgsConstructor;
 import lombok.Data;

+ 1 - 1
src/main/java/com/chelvc/cloud/maintain/vo/PersonalVO.java

@@ -4,7 +4,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 import com.chelvc.cloud.user.client.model.Gender;
-import com.chelvc.framework.common.serializer.JacksonEnumerateSerializer;
+import com.chelvc.framework.common.jackson.JacksonEnumerateSerializer;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import lombok.AllArgsConstructor;
 import lombok.Data;

+ 1 - 1
src/main/java/com/chelvc/cloud/maintain/vo/UserVO.java

@@ -3,7 +3,7 @@ package com.chelvc.cloud.maintain.vo;
 import java.io.Serializable;
 
 import com.chelvc.cloud.user.client.model.Gender;
-import com.chelvc.framework.common.serializer.JacksonEnumerateSerializer;
+import com.chelvc.framework.common.jackson.JacksonEnumerateSerializer;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import lombok.AllArgsConstructor;
 import lombok.Data;

+ 4 - 5
src/main/resources/application-dev.yml

@@ -12,9 +12,10 @@ nacos:
   config:
     server-addr: 47.108.128.78:6848
 
-oauth:
-  scoped: true
-  secret: oauth.token.secret@chelvc!@#2023
+security:
+  authorize:
+    scoped: true
+    secret: oauth.token.secret@chelvc!@#2023
 
 upload:
   clients:
@@ -23,8 +24,6 @@ upload:
       channel: DEFAULT
 
 location:
-  caching:
-    enabled: true
   clients:
     - key: VPKBZ-CR3CG-R23QE-QK2IY-LNXKZ-GCB34
       channel: TENCENT

+ 4 - 5
src/main/resources/application-pre.yml

@@ -12,9 +12,10 @@ nacos:
   config:
     server-addr: 127.0.0.1:6848
 
-oauth:
-  scoped: true
-  secret: oauth.token.secret@chelvc!@#2023
+security:
+  authorize:
+    scoped: true
+    secret: oauth.token.secret@chelvc!@#2023
 
 upload:
   clients:
@@ -23,8 +24,6 @@ upload:
       channel: DEFAULT
 
 location:
-  caching:
-    enabled: true
   clients:
     - key: VPKBZ-CR3CG-R23QE-QK2IY-LNXKZ-GCB34
       channel: TENCENT

+ 4 - 5
src/main/resources/application-prod.yml

@@ -12,9 +12,10 @@ nacos:
   config:
     server-addr: 127.0.0.1:6848
 
-oauth:
-  scoped: true
-  secret: oauth.token.secret@chelvc!@#2023
+security:
+  authorize:
+    scoped: true
+    secret: oauth.token.secret@chelvc!@#2023
 
 upload:
   clients:
@@ -23,8 +24,6 @@ upload:
       channel: DEFAULT
 
 location:
-  caching:
-    enabled: true
   clients:
     - key: VPKBZ-CR3CG-R23QE-QK2IY-LNXKZ-GCB34
       channel: TENCENT

+ 4 - 5
src/main/resources/application-test.yml

@@ -12,9 +12,10 @@ nacos:
   config:
     server-addr: 127.0.0.1:6848
 
-oauth:
-  scoped: true
-  secret: oauth.token.secret@chelvc!@#2023
+security:
+  authorize:
+    scoped: true
+    secret: oauth.token.secret@chelvc!@#2023
 
 upload:
   clients:
@@ -23,8 +24,6 @@ upload:
       channel: DEFAULT
 
 location:
-  caching:
-    enabled: true
   clients:
     - key: VPKBZ-CR3CG-R23QE-QK2IY-LNXKZ-GCB34
       channel: TENCENT