优化目录

README.md

@@ -83,7 +83,7 @@ kill 158644
 #### 2) 分页
 页码从1开始，分页使用 PageHelper 插件，
 Service 写法参考：
-com.backendsys.service.System.SysUserServiceImpl.queryUser
+com.backendsys.service.v1.System.SysUserServiceImpl.queryUser
 ```spring
 public Map<String, Object> queryUser(Integer pageNum, Integer pageSize, SysUserDTO sysUserDTO) {
     // 分页查询
@@ -145,7 +145,7 @@ Long user_count = (Long) sysUserRole.get("user_count");
 ```
 或
 ```
-<resultMap id="resultMapUserRoleDetail" type="com.backendsys.entity.System.SysUserRoleDTO">
+<resultMap id="resultMapUserRoleDetail" type="com.backendsys.entity.v1.System.SysUserRoleDTO">
   <collection property="modules" javaType="java.util.List" ofType="java.util.LinkedHashMap" select="queryModulesByRoleId" column="id">
 ..
 <select id="queryUserRoleDetail" resultMap="resultMapUserRoleDetail">

src/main/java/com/backendsys/config/Security/ApplicationConfig.java

@@ -1,6 +1,5 @@
 package com.backendsys.config.Security;
 
-import com.backendsys.entity.System.SysUserDTO;
 import com.backendsys.mapper.System.SysUserMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Bean;
@@ -16,8 +15,6 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 
-import java.util.Map;
-
 @Configuration
 @RequiredArgsConstructor
 public class ApplicationConfig {

src/main/java/com/backendsys/controller/api/Ai/AiChatController.java → src/main/java/com/backendsys/controller/v1/Ai/AiChatController.java

@@ -1,13 +1,13 @@
-package com.backendsys.controller.api.Ai;
+package com.backendsys.controller.v1.Ai;
 
 import com.backendsys.aspect.HttpRequestAspect;
 
 import com.backendsys.entity.PageDTO;
 import com.backendsys.utils.response.Result;
 
-import com.backendsys.entity.Ai.AiChatDTO;
+import com.backendsys.entity.v1.Ai.AiChatDTO;
 import com.backendsys.mapper.Ai.AiChatHistoryMapper;
-import com.backendsys.service.Ai.AiChatService;
+import com.backendsys.service.v1.Ai.AiChatService;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;

src/main/java/com/backendsys/controller/api/Ai/AiChatHistoryController.java → src/main/java/com/backendsys/controller/v1/Ai/AiChatHistoryController.java

@@ -1,10 +1,10 @@
-package com.backendsys.controller.api.Ai;
+package com.backendsys.controller.v1.Ai;
 
 import com.backendsys.aspect.HttpRequestAspect;
 import com.backendsys.aspect.QueryNullCheck;
-import com.backendsys.entity.Ai.AiChatHistoryDTO;
+import com.backendsys.entity.v1.Ai.AiChatHistoryDTO;
 import com.backendsys.entity.PageDTO;
-import com.backendsys.service.Ai.AiChatHistoryService;
+import com.backendsys.service.v1.Ai.AiChatHistoryService;
 import com.backendsys.utils.response.Result;
 
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/backendsys/controller/api/Ai/AiGenerateVideoController.java → src/main/java/com/backendsys/controller/v1/Ai/AiGenerateVideoController.java

@@ -1,9 +1,9 @@
-package com.backendsys.controller.api.Ai;
+package com.backendsys.controller.v1.Ai;
 
 import com.backendsys.aspect.HttpRequestAspect;
-import com.backendsys.entity.Ai.AiGenerateVideoDTO;
+import com.backendsys.entity.v1.Ai.AiGenerateVideoDTO;
 import com.backendsys.entity.PageDTO;
-import com.backendsys.service.Ai.AiGenerateVideoService;
+import com.backendsys.service.v1.Ai.AiGenerateVideoService;
 import com.backendsys.utils.response.Result;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;

src/main/java/com/backendsys/controller/api/Ai/AiivhAssetController.java → src/main/java/com/backendsys/controller/v1/Ai/AiivhAssetController.java

@@ -1,14 +1,14 @@
-package com.backendsys.controller.api.Ai;
+package com.backendsys.controller.v1.Ai;
 
 import com.backendsys.aspect.HttpRequestAspect;
-import com.backendsys.entity.Ai.Aiivh.*;
+import com.backendsys.entity.v1.Ai.Aiivh.*;
 import com.backendsys.entity.PageDTO;
 import com.backendsys.mapper.Ai.Aiivh.AiivhTimbreEmotionalCategoryMapper;
-import com.backendsys.service.Ai.AiPersonTimbreService;
-import com.backendsys.service.Ai.Aiivh.AiivhAnchorService;
-import com.backendsys.service.Ai.Aiivh.AiivhAssetService;
-import com.backendsys.service.SDKService.SDKTencent.SDKTencentAiService;
-import com.backendsys.service.SDKService.SDKTencent.SDKTencentCOSService;
+import com.backendsys.service.v1.Ai.AiPersonTimbreService;
+import com.backendsys.service.v1.Ai.Aiivh.AiivhAnchorService;
+import com.backendsys.service.v1.Ai.Aiivh.AiivhAssetService;
+import com.backendsys.service.v1.SDKService.SDKTencent.SDKTencentAiService;
+import com.backendsys.service.v1.SDKService.SDKTencent.SDKTencentCOSService;
 import com.backendsys.utils.response.Result;
 import com.backendsys.utils.response.ResultEnum;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/backendsys/controller/api/Ai/AiivhMakeBroadcastAudioTaskController.java → src/main/java/com/backendsys/controller/v1/Ai/AiivhMakeBroadcastAudioTaskController.java

@@ -1,9 +1,9 @@
-package com.backendsys.controller.api.Ai;
+package com.backendsys.controller.v1.Ai;
 
 import com.backendsys.aspect.HttpRequestAspect;
-import com.backendsys.entity.Ai.Aiivh.AiivhMakeBroadcastAudioTask.AiivhMakeBroadcastAudioTaskDTO;
+import com.backendsys.entity.v1.Ai.Aiivh.AiivhMakeBroadcastAudioTask.AiivhMakeBroadcastAudioTaskDTO;
 import com.backendsys.entity.PageDTO;
-import com.backendsys.service.Ai.Aiivh.AiivhMakeBroadcastAudioTaskService;
+import com.backendsys.service.v1.Ai.Aiivh.AiivhMakeBroadcastAudioTaskService;
 import com.backendsys.utils.response.Result;
 import com.backendsys.utils.response.ResultEnum;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/backendsys/controller/api/Ai/AiivhMakeBroadcastTaskController.java → src/main/java/com/backendsys/controller/v1/Ai/AiivhMakeBroadcastTaskController.java

@@ -1,10 +1,10 @@
-package com.backendsys.controller.api.Ai;
+package com.backendsys.controller.v1.Ai;
 
 import com.backendsys.aspect.HttpRequestAspect;
-import com.backendsys.entity.Ai.Aiivh.AiivhMakeBroadcastTask.AiivhMakeBroadcastTaskCallbackDTO;
-import com.backendsys.entity.Ai.Aiivh.AiivhMakeBroadcastTask.AiivhMakeBroadcastTaskDTO;
+import com.backendsys.entity.v1.Ai.Aiivh.AiivhMakeBroadcastTask.AiivhMakeBroadcastTaskCallbackDTO;
+import com.backendsys.entity.v1.Ai.Aiivh.AiivhMakeBroadcastTask.AiivhMakeBroadcastTaskDTO;
 import com.backendsys.entity.PageDTO;
-import com.backendsys.service.Ai.Aiivh.AiivhMakeBroadcastTaskService;
+import com.backendsys.service.v1.Ai.Aiivh.AiivhMakeBroadcastTaskService;
 import com.backendsys.utils.response.Result;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;

src/main/java/com/backendsys/controller/api/Ai/AiivhMakeVirtualmanTaskController.java → src/main/java/com/backendsys/controller/v1/Ai/AiivhMakeVirtualmanTaskController.java

@@ -1,21 +1,21 @@
-package com.backendsys.controller.api.Ai;
+package com.backendsys.controller.v1.Ai;
 
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.backendsys.aspect.HttpRequestAspect;
-import com.backendsys.entity.Ai.Aiivh.AiPersonDTO;
-import com.backendsys.entity.Ai.Aiivh.AiPersonTimbreCustomDTO;
-import com.backendsys.entity.Ai.Aiivh.AiivhAnchorDTO;
+import com.backendsys.entity.v1.Ai.Aiivh.AiPersonDTO;
+import com.backendsys.entity.v1.Ai.Aiivh.AiPersonTimbreCustomDTO;
+import com.backendsys.entity.v1.Ai.Aiivh.AiivhAnchorDTO;
 import com.backendsys.entity.PageDTO;
-import com.backendsys.entity.Tencent.TencentCustomserviceConfirmDTO;
-import com.backendsys.entity.Tencent.TencentCustomserviceConfirmPlayloadDTO;
-import com.backendsys.entity.Tencent.TencentCustomserviceDTO;
-import com.backendsys.entity.Tencent.VirtualmanLaunchDTO;
-import com.backendsys.service.Ai.Aiivh.AiivhMakeVirtualmanTaskService;
-
-import com.backendsys.service.SDKService.SDKTencent.SDKTencentAiService;
-import com.backendsys.service.SDKService.SDKTencent.SDKTencentAiTimbreService;
-import com.backendsys.service.SDKService.SDKTencent.SDKTencentAiVirtualmanService;
+import com.backendsys.entity.v1.Tencent.TencentCustomserviceConfirmDTO;
+import com.backendsys.entity.v1.Tencent.TencentCustomserviceConfirmPlayloadDTO;
+import com.backendsys.entity.v1.Tencent.TencentCustomserviceDTO;
+import com.backendsys.entity.v1.Tencent.VirtualmanLaunchDTO;
+import com.backendsys.service.v1.Ai.Aiivh.AiivhMakeVirtualmanTaskService;
+
+import com.backendsys.service.v1.SDKService.SDKTencent.SDKTencentAiService;
+import com.backendsys.service.v1.SDKService.SDKTencent.SDKTencentAiTimbreService;
+import com.backendsys.service.v1.SDKService.SDKTencent.SDKTencentAiVirtualmanService;
 import com.backendsys.utils.response.Result;
 import com.backendsys.utils.response.ResultEnum;
 import jakarta.validation.constraints.NotEmpty;

src/main/java/com/backendsys/controller/api/Ai/AiivhQuotaController.java → src/main/java/com/backendsys/controller/v1/Ai/AiivhQuotaController.java

@@ -1,14 +1,14 @@
-package com.backendsys.controller.api.Ai;
+package com.backendsys.controller.v1.Ai;
 
 import com.backendsys.aspect.HttpRequestAspect;
-import com.backendsys.entity.Ai.Aiivh.AiivhQuotaDTO;
-import com.backendsys.entity.Ai.Aiivh.AiivhQuotaHistoryDTO;
-import com.backendsys.entity.Ai.Aiivh.AiivhQuotaOrderDTO;
+import com.backendsys.entity.v1.Ai.Aiivh.AiivhQuotaDTO;
+import com.backendsys.entity.v1.Ai.Aiivh.AiivhQuotaHistoryDTO;
+import com.backendsys.entity.v1.Ai.Aiivh.AiivhQuotaOrderDTO;
 import com.backendsys.entity.PageDTO;
-import com.backendsys.entity.System.SysResourcePointsDTO;
-import com.backendsys.service.Ai.Aiivh.AiivhQuotaHistoryService;
-import com.backendsys.service.Ai.Aiivh.AiivhQuotaOrderService;
-import com.backendsys.service.Ai.Aiivh.AiivhQuotaService;
+import com.backendsys.entity.v1.System.SysResourcePointsDTO;
+import com.backendsys.service.v1.Ai.Aiivh.AiivhQuotaHistoryService;
+import com.backendsys.service.v1.Ai.Aiivh.AiivhQuotaOrderService;
+import com.backendsys.service.v1.Ai.Aiivh.AiivhQuotaService;
 import com.backendsys.utils.response.Result;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;

src/main/java/com/backendsys/controller/api/Ai/AiznController.java → src/main/java/com/backendsys/controller/v1/Ai/AiznController.java

@@ -1,4 +1,4 @@
-package com.backendsys.controller.api.Ai;
+package com.backendsys.controller.v1.Ai;
 
 import com.backendsys.exception.CustomException;
 import com.fzzixun.openapi.sdk.client.OpenClient;

src/main/java/com/backendsys/controller/api/Ai/AiznGoodController.java → src/main/java/com/backendsys/controller/v1/Ai/AiznGoodController.java

@@ -1,9 +1,9 @@
-package com.backendsys.controller.api.Ai;
+package com.backendsys.controller.v1.Ai;
 
-import com.backendsys.entity.Ai.Aizn.AiznGood.AiznGoodCompoundTask.AiznGoodCompoundTaskDTO;
-import com.backendsys.entity.Ai.Aizn.AiznGood.AiznGoodReplaceTask.AiznGoodReplaceTaskDTO;
-import com.backendsys.service.Ai.Aizn.AiznGoodService;
-import com.backendsys.service.Ai.Aizn.AiznImageTaskService;
+import com.backendsys.entity.v1.Ai.Aizn.AiznGood.AiznGoodCompoundTask.AiznGoodCompoundTaskDTO;
+import com.backendsys.entity.v1.Ai.Aizn.AiznGood.AiznGoodReplaceTask.AiznGoodReplaceTaskDTO;
+import com.backendsys.service.v1.Ai.Aizn.AiznGoodService;
+import com.backendsys.service.v1.Ai.Aizn.AiznImageTaskService;
 import com.backendsys.utils.response.Result;
 import jakarta.validation.constraints.NotEmpty;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/backendsys/controller/api/Ai/AiznImageIncantaionController.java → src/main/java/com/backendsys/controller/v1/Ai/AiznImageIncantaionController.java

@@ -1,9 +1,7 @@
-package com.backendsys.controller.api.Ai;
+package com.backendsys.controller.v1.Ai;
 
-import com.backendsys.entity.Ai.Aizn.AiznImageIncantationDTO;
-import com.backendsys.entity.Ai.Aizn.AiznImageTaskVO;
-import com.backendsys.entity.PageDTO;
-import com.backendsys.service.Ai.Aizn.AiznImageIncantationService;
+import com.backendsys.entity.v1.Ai.Aizn.AiznImageIncantationDTO;
+import com.backendsys.service.v1.Ai.Aizn.AiznImageIncantationService;
 import com.backendsys.utils.response.Result;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;

src/main/java/com/backendsys/controller/api/Ai/AiznImageTaskController.java → src/main/java/com/backendsys/controller/v1/Ai/AiznImageTaskController.java

@@ -1,20 +1,15 @@
-package com.backendsys.controller.api.Ai;
+package com.backendsys.controller.v1.Ai;
 
-import cn.hutool.core.util.StrUtil;
 import com.backendsys.aspect.HttpRequestAspect;
-import com.backendsys.entity.Ai.Aizn.AiznImageTaskVO;
+import com.backendsys.entity.v1.Ai.Aizn.AiznImageTaskVO;
 import com.backendsys.entity.PageDTO;
-import com.backendsys.service.Ai.Aizn.AiznImageTaskService;
+import com.backendsys.service.v1.Ai.Aizn.AiznImageTaskService;
 import com.backendsys.utils.response.Result;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
 @Validated
 @RestController
 public class AiznImageTaskController {

src/main/java/com/backendsys/controller/api/Ai/AiznModelController.java → src/main/java/com/backendsys/controller/v1/Ai/AiznModelController.java

@@ -1,17 +1,15 @@
-package com.backendsys.controller.api.Ai;
-
-import com.backendsys.entity.Ai.Aizn.AiznImageStyleDTO;
-import com.backendsys.entity.Ai.Aizn.AiznIntelligentClipTaskDTO;
-import com.backendsys.entity.Ai.Aizn.AiznInteractClipTask.AiznInteractClipTaskDTO;
-import com.backendsys.entity.Ai.Aizn.AiznModel.AiznModelTaskDTO;
-import com.backendsys.entity.System.SysResourcePointsDTO;
-import com.backendsys.entity.Tencent.TencentCos.UploadOriginDTO;
-import com.backendsys.entity.Tencent.TencentCos.UploadOriginResp;
+package com.backendsys.controller.v1.Ai;
+
+import com.backendsys.entity.v1.Ai.Aizn.AiznImageStyleDTO;
+import com.backendsys.entity.v1.Ai.Aizn.AiznIntelligentClipTaskDTO;
+import com.backendsys.entity.v1.Ai.Aizn.AiznInteractClipTask.AiznInteractClipTaskDTO;
+import com.backendsys.entity.v1.Ai.Aizn.AiznModel.AiznModelTaskDTO;
+import com.backendsys.entity.v1.System.SysResourcePointsDTO;
 import com.backendsys.exception.CustomException;
 import com.backendsys.mapper.System.SysResourcePointsMapper;
-import com.backendsys.service.Ai.Aizn.AiznImageTaskService;
-import com.backendsys.service.Ai.Aizn.AiznModelService;
-import com.backendsys.service.SDKService.SDKTencent.SDKTencentCOSService;
+import com.backendsys.service.v1.Ai.Aizn.AiznImageTaskService;
+import com.backendsys.service.v1.Ai.Aizn.AiznModelService;
+import com.backendsys.service.v1.SDKService.SDKTencent.SDKTencentCOSService;
 import com.backendsys.utils.response.Result;
 import jakarta.validation.constraints.NotEmpty;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,10 +18,6 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.List;
-import java.util.Map;
 
 @Validated
 @RestController

src/main/java/com/backendsys/controller/api/Ali/AliDashscopeController.java → src/main/java/com/backendsys/controller/v1/Ali/AliDashscopeController.java

@@ -1,11 +1,11 @@
-package com.backendsys.controller.api.Ali;
-
-import com.backendsys.entity.Ali.AliDashscopeBackgroundDTO;
-import com.backendsys.entity.Ali.AliDashscopeBackgroundInputDTO;
-import com.backendsys.entity.Ali.AliDashscopeBackgroundParametersDTO;
-import com.backendsys.entity.Ali.AliDashscopeTaskDTO;
-import com.backendsys.service.Ali.AliDashscopeService;
-import com.backendsys.service.Ali.AliDashscopeTaskService;
+package com.backendsys.controller.v1.Ali;
+
+import com.backendsys.entity.v1.Ali.AliDashscopeBackgroundDTO;
+import com.backendsys.entity.v1.Ali.AliDashscopeBackgroundInputDTO;
+import com.backendsys.entity.v1.Ali.AliDashscopeBackgroundParametersDTO;
+import com.backendsys.entity.v1.Ali.AliDashscopeTaskDTO;
+import com.backendsys.service.v1.Ali.AliDashscopeService;
+import com.backendsys.service.v1.Ali.AliDashscopeTaskService;
 import com.backendsys.utils.ResourceUtil;
 import com.backendsys.utils.response.Result;
 import com.backendsys.utils.response.ResultEnum;

src/main/java/com/backendsys/controller/api/Ali/AliDashscopeTaskController.java → src/main/java/com/backendsys/controller/v1/Ali/AliDashscopeTaskController.java

@@ -1,15 +1,8 @@
-package com.backendsys.controller.api.Ali;
-
-import com.backendsys.aspect.QueryNullCheck;
-import com.backendsys.aspect.QueryNullCheckAspect;
-import com.backendsys.entity.Ali.AliDashscopeBackgroundDTO;
-import com.backendsys.entity.Ali.AliDashscopeBackgroundInputDTO;
-import com.backendsys.entity.Ali.AliDashscopeBackgroundParametersDTO;
-import com.backendsys.entity.Ali.AliDashscopeTaskDTO;
+package com.backendsys.controller.v1.Ali;
+
+import com.backendsys.entity.v1.Ali.AliDashscopeTaskDTO;
 import com.backendsys.entity.PageDTO;
-import com.backendsys.service.Ali.AliDashscopeService;
-import com.backendsys.service.Ali.AliDashscopeTaskService;
-import com.backendsys.utils.ResourceUtil;
+import com.backendsys.service.v1.Ali.AliDashscopeTaskService;
 import com.backendsys.utils.response.Result;
 import com.backendsys.utils.response.ResultEnum;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/backendsys/controller/api/B2c/B2cGoodBrandController.java → src/main/java/com/backendsys/controller/v1/B2c/B2cGoodBrandController.java

@@ -1,10 +1,10 @@
-package com.backendsys.controller.api.B2c;
+package com.backendsys.controller.v1.B2c;
 
 import com.backendsys.aspect.QueryNullCheck;
 import com.backendsys.aspect.QueryNullCheckAspect;
-import com.backendsys.entity.B2c.B2cGoodBrandDTO;
+import com.backendsys.entity.v1.B2c.B2cGoodBrandDTO;
 import com.backendsys.entity.PageDTO;
-import com.backendsys.service.B2c.B2cGoodBrandService;
+import com.backendsys.service.v1.B2c.B2cGoodBrandService;
 import com.backendsys.utils.response.Result;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;

src/main/java/com/backendsys/controller/api/B2c/B2cGoodCategoryController.java → src/main/java/com/backendsys/controller/v1/B2c/B2cGoodCategoryController.java

@@ -1,10 +1,10 @@
-package com.backendsys.controller.api.B2c;
+package com.backendsys.controller.v1.B2c;
 
 import com.backendsys.aspect.QueryNullCheck;
 import com.backendsys.aspect.QueryNullCheckAspect;
-import com.backendsys.entity.B2c.B2cGoodCategoryDTO;
+import com.backendsys.entity.v1.B2c.B2cGoodCategoryDTO;
 import com.backendsys.entity.PageDTO;
-import com.backendsys.service.B2c.B2cGoodCategoryService;
+import com.backendsys.service.v1.B2c.B2cGoodCategoryService;
 import com.backendsys.utils.response.Result;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;

src/main/java/com/backendsys/controller/api/B2c/B2cGoodController.java → src/main/java/com/backendsys/controller/v1/B2c/B2cGoodController.java

@@ -1,10 +1,10 @@
-package com.backendsys.controller.api.B2c;
+package com.backendsys.controller.v1.B2c;
 
 import com.backendsys.aspect.QueryNullCheck;
 import com.backendsys.aspect.QueryNullCheckAspect;
-import com.backendsys.entity.B2c.B2cGoodDTO;
+import com.backendsys.entity.v1.B2c.B2cGoodDTO;
 import com.backendsys.entity.PageDTO;
-import com.backendsys.service.B2c.B2cGoodService;
+import com.backendsys.service.v1.B2c.B2cGoodService;
 import com.backendsys.utils.response.Result;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;

src/main/java/com/backendsys/controller/api/B2c/B2cGoodSpecController.java → src/main/java/com/backendsys/controller/v1/B2c/B2cGoodSpecController.java

@@ -1,11 +1,10 @@
-package com.backendsys.controller.api.B2c;
+package com.backendsys.controller.v1.B2c;
 
 import com.backendsys.aspect.QueryNullCheck;
 import com.backendsys.aspect.QueryNullCheckAspect;
-import com.backendsys.entity.B2c.B2cGoodSpecDTO;
-import com.backendsys.entity.B2c.B2cGoodSpecSkuDTO;
+import com.backendsys.entity.v1.B2c.B2cGoodSpecDTO;
 import com.backendsys.entity.PageDTO;
-import com.backendsys.service.B2c.B2cGoodSpecService;
+import com.backendsys.service.v1.B2c.B2cGoodSpecService;
 import com.backendsys.utils.response.Result;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;

src/main/java/com/backendsys/controller/api/B2c/B2cGoodSpecSkuController.java → src/main/java/com/backendsys/controller/v1/B2c/B2cGoodSpecSkuController.java

@@ -1,10 +1,10 @@
-package com.backendsys.controller.api.B2c;
+package com.backendsys.controller.v1.B2c;
 
 import com.backendsys.aspect.QueryNullCheck;
 import com.backendsys.aspect.QueryNullCheckAspect;
-import com.backendsys.entity.B2c.B2cGoodSpecSkuDTO;
+import com.backendsys.entity.v1.B2c.B2cGoodSpecSkuDTO;
 import com.backendsys.entity.PageDTO;
-import com.backendsys.service.B2c.B2cGoodSpecSkuService;
+import com.backendsys.service.v1.B2c.B2cGoodSpecSkuService;
 import com.backendsys.utils.response.Result;
 import com.backendsys.utils.response.ResultEnum;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/backendsys/controller/api/B2c/B2cGoodUnitController.java → src/main/java/com/backendsys/controller/v1/B2c/B2cGoodUnitController.java

@@ -1,10 +1,10 @@
-package com.backendsys.controller.api.B2c;
+package com.backendsys.controller.v1.B2c;
 
 import com.backendsys.aspect.QueryNullCheck;
 import com.backendsys.aspect.QueryNullCheckAspect;
-import com.backendsys.entity.B2c.B2cGoodUnitDTO;
+import com.backendsys.entity.v1.B2c.B2cGoodUnitDTO;
 import com.backendsys.entity.PageDTO;
-import com.backendsys.service.B2c.B2cGoodUnitService;
+import com.backendsys.service.v1.B2c.B2cGoodUnitService;
 import com.backendsys.utils.response.Result;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;

src/main/java/com/backendsys/controller/api/B2c/B2cMemberController.java → src/main/java/com/backendsys/controller/v1/B2c/B2cMemberController.java

@@ -1,11 +1,10 @@
-package com.backendsys.controller.api.B2c;
+package com.backendsys.controller.v1.B2c;
 
 import com.backendsys.aspect.QueryNullCheck;
 import com.backendsys.aspect.QueryNullCheckAspect;
-import com.backendsys.entity.B2c.B2cMemberDTO;
+import com.backendsys.entity.v1.B2c.B2cMemberDTO;
 import com.backendsys.entity.PageDTO;
-import com.backendsys.entity.System.SysUserDTO;
-import com.backendsys.service.B2c.B2cMemberService;
+import com.backendsys.service.v1.B2c.B2cMemberService;
 import com.backendsys.utils.response.Result;
 import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/backendsys/controller/api/B2c/B2cOrderController.java → src/main/java/com/backendsys/controller/v1/B2c/B2cOrderController.java

@@ -1,23 +1,18 @@
-package com.backendsys.controller.api.B2c;
+package com.backendsys.controller.v1.B2c;
 
 import com.backendsys.aspect.HttpRequestAspect;
 import com.backendsys.aspect.QueryNullCheck;
 import com.backendsys.aspect.QueryNullCheckAspect;
-import com.backendsys.config.Security.service.TokenService;
-import com.backendsys.entity.B2c.B2cOrderDTO;
-import com.backendsys.entity.B2c.B2cShoppingCartDTO;
+import com.backendsys.entity.v1.B2c.B2cOrderDTO;
 import com.backendsys.entity.PageDTO;
-import com.backendsys.mapper.B2c.B2cMemberMapper;
-import com.backendsys.service.B2c.B2cGoodSpecSkuService;
-import com.backendsys.service.B2c.B2cMemberService;
-import com.backendsys.service.B2c.B2cOrderService;
-import com.backendsys.service.B2c.B2cShoppingCartService;
+import com.backendsys.service.v1.B2c.B2cGoodSpecSkuService;
+import com.backendsys.service.v1.B2c.B2cMemberService;
+import com.backendsys.service.v1.B2c.B2cOrderService;
+import com.backendsys.service.v1.B2c.B2cShoppingCartService;
 import com.backendsys.utils.CommonUtil;
 import com.backendsys.utils.response.Result;
 
 import com.backendsys.utils.response.ResultEnum;
-import io.jsonwebtoken.Claims;
-import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -32,7 +27,6 @@ import java.util.*;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.type.TypeReference;
 
 /**
  * 订单

src/main/java/com/backendsys/controller/api/B2c/B2cShoppingCartController.java → src/main/java/com/backendsys/controller/v1/B2c/B2cShoppingCartController.java

@@ -1,10 +1,9 @@
-package com.backendsys.controller.api.B2c;
+package com.backendsys.controller.v1.B2c;
 
 import com.backendsys.aspect.HttpRequestAspect;
-import com.backendsys.entity.B2c.B2cShoppingCartDTO;
-import com.backendsys.entity.PageDTO;
-import com.backendsys.service.B2c.B2cGoodSpecSkuService;
-import com.backendsys.service.B2c.B2cShoppingCartService;
+import com.backendsys.entity.v1.B2c.B2cShoppingCartDTO;
+import com.backendsys.service.v1.B2c.B2cGoodSpecSkuService;
+import com.backendsys.service.v1.B2c.B2cShoppingCartService;
 import com.backendsys.utils.response.Result;
 import com.backendsys.utils.response.ResultEnum;
 import jakarta.servlet.http.HttpServletRequest;

src/main/java/com/backendsys/controller/api/Cms/CmsArticleCategoryController.java → src/main/java/com/backendsys/controller/v1/Cms/CmsArticleCategoryController.java

@@ -1,10 +1,9 @@
-package com.backendsys.controller.api.Cms;
+package com.backendsys.controller.v1.Cms;
 
 import com.backendsys.aspect.QueryNullCheck;
 import com.backendsys.aspect.QueryNullCheckAspect;
-import com.backendsys.entity.Cms.CmsArticleCategoryDTO;
-import com.backendsys.entity.Cms.CmsArticleDTO;
-import com.backendsys.service.Cms.CmsArticleCategoryService;
+import com.backendsys.entity.v1.Cms.CmsArticleCategoryDTO;
+import com.backendsys.service.v1.Cms.CmsArticleCategoryService;
 import com.backendsys.entity.PageDTO;
 import com.backendsys.utils.response.Result;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,8 +11,6 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Map;
-
 /**
  * 资讯分类
  */

src/main/java/com/backendsys/controller/api/Cms/CmsArticleController.java → src/main/java/com/backendsys/controller/v1/Cms/CmsArticleController.java

@@ -1,14 +1,11 @@
-package com.backendsys.controller.api.Cms;
+package com.backendsys.controller.v1.Cms;
 
 import com.backendsys.aspect.HttpRequestAspect;
-import com.backendsys.aspect.QueryNullCheck;
-import com.backendsys.aspect.QueryNullCheckAspect;
-import com.backendsys.entity.Cms.CmsArticleDTO;
+import com.backendsys.entity.v1.Cms.CmsArticleDTO;
 import com.backendsys.entity.PageDTO;
-import com.backendsys.service.Cms.CmsArticleService;
+import com.backendsys.service.v1.Cms.CmsArticleService;
 import com.backendsys.utils.response.Result;
 import com.backendsys.utils.response.ResultEnum;
-import jakarta.validation.constraints.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;

src/main/java/com/backendsys/controller/api/Cms/CmsBannerController.java → src/main/java/com/backendsys/controller/v1/Cms/CmsBannerController.java

@@ -1,11 +1,10 @@
-package com.backendsys.controller.api.Cms;
+package com.backendsys.controller.v1.Cms;
 
 import com.backendsys.aspect.QueryNullCheck;
 import com.backendsys.aspect.QueryNullCheckAspect;
-import com.backendsys.entity.B2c.B2cGoodDTO;
-import com.backendsys.entity.Cms.CmsBannerDTO;
+import com.backendsys.entity.v1.Cms.CmsBannerDTO;
 import com.backendsys.entity.PageDTO;
-import com.backendsys.service.Cms.CmsBannerService;
+import com.backendsys.service.v1.Cms.CmsBannerService;
 import com.backendsys.utils.response.Result;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;

src/main/java/com/backendsys/controller/api/Cms/CmsPageController.java → src/main/java/com/backendsys/controller/v1/Cms/CmsPageController.java

@@ -1,15 +1,10 @@
-package com.backendsys.controller.api.Cms;
+package com.backendsys.controller.v1.Cms;
 
-import com.backendsys.aspect.HttpRequestAspect;
-import com.backendsys.aspect.QueryNullCheck;
-import com.backendsys.aspect.QueryNullCheckAspect;
-import com.backendsys.entity.Cms.CmsPageDTO;
-import com.backendsys.entity.Cms.CmsPageDTO;
+import com.backendsys.entity.v1.Cms.CmsPageDTO;
 import com.backendsys.entity.PageDTO;
-import com.backendsys.service.Cms.CmsPageService;
+import com.backendsys.service.v1.Cms.CmsPageService;
 import com.backendsys.utils.response.Result;
 import com.backendsys.utils.response.ResultEnum;
-import jakarta.validation.constraints.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;

src/main/java/com/backendsys/controller/api/Cms/CmsSiteInfoController.java → src/main/java/com/backendsys/controller/v1/Cms/CmsSiteInfoController.java

@@ -1,8 +1,7 @@
-package com.backendsys.controller.api.Cms;
+package com.backendsys.controller.v1.Cms;
 
-import com.backendsys.aspect.QueryNullCheck;
-import com.backendsys.entity.Cms.CmsSiteInfoDTO;
-import com.backendsys.service.Cms.CmsSiteInfoService;
+import com.backendsys.entity.v1.Cms.CmsSiteInfoDTO;
+import com.backendsys.service.v1.Cms.CmsSiteInfoService;
 import com.backendsys.utils.response.Result;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;