系统优化

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-security.version>1.0.0-RELEASE</framework-security.version>
     </properties>
@@ -46,11 +45,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>

src/main/java/com/chelvc/cloud/admin/controller/AuthorizeController.java

@@ -7,7 +7,7 @@ import com.chelvc.cloud.user.client.AuthorizeClient;
 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;

src/main/java/com/chelvc/cloud/admin/controller/CarouselImagesController.java

@@ -9,7 +9,7 @@ import com.chelvc.cloud.vehicle.client.param.CarouselImagesModifyParam;
 import com.chelvc.cloud.vehicle.client.param.CarouselImagesPagingParam;
 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;

src/main/java/com/chelvc/cloud/admin/controller/CategoryController.java

@@ -11,7 +11,7 @@ import com.chelvc.cloud.vehicle.client.param.CategoryModifyParam;
 import com.chelvc.cloud.vehicle.client.param.CategoryPagingParam;
 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;

src/main/java/com/chelvc/cloud/admin/controller/CommissionConfigController.java

@@ -9,7 +9,7 @@ import com.chelvc.cloud.vehicle.client.param.CommissionConfigModifyParam;
 import com.chelvc.cloud.vehicle.client.param.CommissionConfigPagingParam;
 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;

src/main/java/com/chelvc/cloud/admin/controller/CouponController.java

@@ -9,7 +9,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.validation.annotation.Validated;

src/main/java/com/chelvc/cloud/admin/controller/DynamicCommentController.java

@@ -6,7 +6,7 @@ import com.chelvc.cloud.vehicle.client.param.ExamineDynamicParam;
 import com.chelvc.cloud.vehicle.client.param.QueryAdminDynamicParam;
 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;

src/main/java/com/chelvc/cloud/admin/controller/DynamicContentController.java

@@ -9,7 +9,7 @@ import com.chelvc.cloud.vehicle.client.param.ExamineDynamicParam;
 import com.chelvc.cloud.vehicle.client.param.QueryAdminDynamicParam;
 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;

src/main/java/com/chelvc/cloud/admin/controller/EmployeeController.java

@@ -12,7 +12,7 @@ import com.chelvc.cloud.user.client.param.EmployeeModifyParam;
 import com.chelvc.cloud.user.client.param.EmployeePagingParam;
 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;

src/main/java/com/chelvc/cloud/admin/controller/FeedbackController.java

@@ -10,7 +10,7 @@ import com.chelvc.cloud.vehicle.client.dto.FeedBackDTO;
 import com.chelvc.cloud.vehicle.client.param.FeedBackPagingParam;
 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;

src/main/java/com/chelvc/cloud/admin/controller/FileController.java

@@ -6,7 +6,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;

src/main/java/com/chelvc/cloud/admin/controller/GoodsController.java

@@ -11,7 +11,7 @@ import com.chelvc.cloud.vehicle.client.param.GoodsModifyParam;
 import com.chelvc.cloud.vehicle.client.param.GoodsPagingParam;
 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;

src/main/java/com/chelvc/cloud/admin/controller/HelpCategoryController.java

@@ -10,7 +10,7 @@ import com.chelvc.cloud.vehicle.client.param.HelpCategoryModifyParam;
 import com.chelvc.cloud.vehicle.client.param.HelpCategoryPagingParam;
 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;

src/main/java/com/chelvc/cloud/admin/controller/HelpController.java

@@ -9,7 +9,7 @@ import com.chelvc.cloud.vehicle.client.param.HelpModifyParam;
 import com.chelvc.cloud.vehicle.client.param.HelpPagingParam;
 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;

src/main/java/com/chelvc/cloud/admin/controller/InviteUserController.java

@@ -9,7 +9,7 @@ import com.chelvc.cloud.vehicle.client.param.TeamInvitePageParam;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
 import com.chelvc.framework.base.context.SessionContextHolder;
 import com.chelvc.framework.common.util.StringUtils;
-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;

src/main/java/com/chelvc/cloud/admin/controller/LoginController.java

@@ -7,7 +7,7 @@ import com.chelvc.cloud.user.client.dto.LoginDTO;
 import com.chelvc.cloud.user.client.param.LoginPagingParam;
 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;

src/main/java/com/chelvc/cloud/admin/controller/MenuController.java

@@ -9,7 +9,7 @@ import com.chelvc.cloud.user.client.dto.MenuDTO;
 import com.chelvc.cloud.user.client.param.MenuModifyParam;
 import com.chelvc.cloud.user.client.param.MenuQueryParam;
 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;

src/main/java/com/chelvc/cloud/admin/controller/MerchantAuthController.java

@@ -9,7 +9,7 @@ import com.chelvc.cloud.vehicle.client.param.MerchantAuthModifyParam;
 import com.chelvc.cloud.vehicle.client.param.MerchantAuthPagingParam;
 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;

src/main/java/com/chelvc/cloud/admin/controller/MerchantController.java

@@ -18,7 +18,7 @@ import com.chelvc.cloud.vehicle.client.param.MerchantRankParam;
 import com.chelvc.cloud.vehicle.client.param.ReportModifyParam;
 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;

src/main/java/com/chelvc/cloud/admin/controller/NoticeController.java

@@ -9,7 +9,7 @@ import com.chelvc.cloud.vehicle.client.param.NoticeModifyParam;
 import com.chelvc.cloud.vehicle.client.param.NoticePagingParam;
 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;

src/main/java/com/chelvc/cloud/admin/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;

src/main/java/com/chelvc/cloud/admin/controller/OrderController.java

@@ -10,7 +10,7 @@ import com.chelvc.cloud.vehicle.client.dto.OmsOrderDetailDTO;
 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;

src/main/java/com/chelvc/cloud/admin/controller/ProfitRatioConfigController.java

@@ -11,7 +11,7 @@ import com.chelvc.cloud.vehicle.client.param.QueryProfitRatioConfigParam;
 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;

src/main/java/com/chelvc/cloud/admin/controller/ProfitRatioController.java

@@ -7,7 +7,7 @@ import com.chelvc.cloud.vehicle.client.param.QueryPlatformProfitRatioParam;
 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;

src/main/java/com/chelvc/cloud/admin/controller/RankAwardConfigController.java

@@ -11,7 +11,7 @@ import com.chelvc.cloud.vehicle.client.param.QueryRankAwardConfigParam;
 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;

src/main/java/com/chelvc/cloud/admin/controller/RankAwardRecordController.java

@@ -8,7 +8,7 @@ import com.chelvc.cloud.vehicle.client.param.HandRankAwardParam;
 import com.chelvc.cloud.vehicle.client.param.QueryRankAwardRecordParam;
 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;

src/main/java/com/chelvc/cloud/admin/controller/ReservationController.java

@@ -9,7 +9,7 @@ import com.chelvc.cloud.vehicle.client.dto.ReservationDTO;
 import com.chelvc.cloud.vehicle.client.param.ReservationPagingParam;
 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;

src/main/java/com/chelvc/cloud/admin/controller/RoleController.java

@@ -12,7 +12,7 @@ import com.chelvc.cloud.user.client.param.RolePagingParam;
 import com.chelvc.cloud.vehicle.client.param.MenuModifyParam;
 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;

src/main/java/com/chelvc/cloud/admin/controller/UserController.java

@@ -14,7 +14,7 @@ import com.chelvc.cloud.vehicle.client.param.ReportModifyParam;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
 import com.chelvc.framework.common.model.Pagination;
 import com.chelvc.framework.common.util.ObjectUtils;
-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;

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:

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:

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:

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: