perf: 优化API 版本控制

3 years ago · c7608cfc77
parent 5a6bc4892c
commit c7608cfc77
27 changed files with 28 additions and 30 deletions
--- a/db-file/opsli-boot.sql
+++ b/db-file/opsli-boot.sql
--- a/opsli-modulars/opsli-modulars-generator/src/main/java/org/opsli/modulars/generator/logs/web/GenLogsRestController.java
+++ b/opsli-modulars/opsli-modulars-generator/src/main/java/org/opsli/modulars/generator/logs/web/GenLogsRestController.java
@ -40,7 +40,7 @@ import javax.servlet.http.HttpServletResponse;
 */
@Api(tags = GenLogsApi.TITLE)
@Slf4j
-@ApiRestController("/generator/logs/{ver}")
+@ApiRestController("/{ver}/generator/logs")
 public class GenLogsRestController extends BaseRestController<GenLogs, GenLogsModel, IGenLogsService>
        implements GenLogsApi {
--- a/opsli-modulars/opsli-modulars-generator/src/main/java/org/opsli/modulars/generator/table/web/GenTableRestController.java
+++ b/opsli-modulars/opsli-modulars-generator/src/main/java/org/opsli/modulars/generator/table/web/GenTableRestController.java
@ -57,7 +57,7 @@ import java.util.Map;
 */
@Api(tags = TableApi.TITLE)
@Slf4j
-@ApiRestController("/generator/table/{ver}")
+@ApiRestController("/{ver}/generator/table")
 public class GenTableRestController extends BaseRestController<GenTable, GenTableModel, IGenTableService>
        implements TableApi {
--- a/opsli-modulars/opsli-modulars-generator/src/main/java/org/opsli/modulars/generator/template/web/GenTemplateDetailRestController.java
+++ b/opsli-modulars/opsli-modulars-generator/src/main/java/org/opsli/modulars/generator/template/web/GenTemplateDetailRestController.java
@ -54,7 +54,7 @@ import org.opsli.modulars.generator.template.service.IGenTemplateDetailService;
 */
@Api(tags = GenTemplateDetailRestApi.TITLE)
@Slf4j
-@ApiRestController("/generator/template/detail/{ver}")
+@ApiRestController("/{ver}/generator/template/detail")
 public class GenTemplateDetailRestController extends BaseRestController<GenTemplateDetail, GenTemplateDetailModel, IGenTemplateDetailService>
    implements GenTemplateDetailRestApi {
--- a/opsli-modulars/opsli-modulars-generator/src/main/java/org/opsli/modulars/generator/template/web/GenTemplateRestController.java
+++ b/opsli-modulars/opsli-modulars-generator/src/main/java/org/opsli/modulars/generator/template/web/GenTemplateRestController.java
@ -53,7 +53,7 @@ import org.opsli.modulars.generator.template.service.IGenTemplateService;
 */
@Api(tags = GenTemplateRestApi.TITLE)
@Slf4j
-@ApiRestController("/generator/template/{ver}")
+@ApiRestController("/{ver}/generator/template/")
 public class GenTemplateRestController extends BaseRestController<GenTemplate, GenTemplateModel, IGenTemplateService>
    implements GenTemplateRestApi {
--- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/area/web/SysAreaRestController.java
+++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/area/web/SysAreaRestController.java
@ -71,7 +71,7 @@ import java.util.Set;
 */
@Api(tags = SysAreaRestApi.TITLE)
@Slf4j
-@ApiRestController("/system/area/{ver}")
+@ApiRestController("/{ver}/system/area")
 public class SysAreaRestController extends BaseRestController<SysArea, SysAreaModel, ISysAreaService>
    implements SysAreaRestApi {
--- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/dict/web/DictDetailRestController.java
+++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/dict/web/DictDetailRestController.java
@ -56,7 +56,7 @@ import java.util.List;
 */
@Api(tags = DictDetailApi.TITLE)
@Slf4j
-@ApiRestController("/system/dict/detail/{ver}")
+@ApiRestController("/{ver}/system/dict/detail")
 public class DictDetailRestController extends BaseRestController<SysDictDetail, DictDetailModel, IDictDetailService>
        implements DictDetailApi {
--- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/dict/web/DictRestController.java
+++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/dict/web/DictRestController.java
@ -59,7 +59,7 @@ import java.util.List;
 */
@Api(tags = DictApi.TITLE)
@Slf4j
-@ApiRestController("/system/dict/{ver}")
+@ApiRestController("/{ver}/system/dict")
 public class DictRestController extends BaseRestController<SysDict, DictModel, IDictService>
        implements DictApi {
--- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/logs/web/LogsRestController.java
+++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/logs/web/LogsRestController.java
@ -42,7 +42,7 @@ import javax.servlet.http.HttpServletRequest;
 */
@Api(tags = LogsApi.TITLE)
@Slf4j
-@ApiRestController("/system/logs/{ver}")
+@ApiRestController("/{ver}/system/logs")
 public class LogsRestController extends BaseRestController<SysLogs, LogsModel, ILogsService>
        implements LogsApi {
--- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/menu/web/MenuRestController.java
+++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/menu/web/MenuRestController.java
@ -73,7 +73,7 @@ import java.util.Map;
 */
@Api(tags = MenuApi.TITLE)
@Slf4j
-@ApiRestController("/system/menu/{ver}")
+@ApiRestController("/{ver}/system/menu")
 public class MenuRestController extends BaseRestController<SysMenu, MenuModel, IMenuService>
        implements MenuApi {
--- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/monitor/web/MonitorController.java
+++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/monitor/web/MonitorController.java
@ -35,7 +35,7 @@ import java.util.Map;
 */
@Api(tags = "系统监控")
@Slf4j
-@ApiRestController("/system/monitor/{ver}")
+@ApiRestController("/{ver}/system/monitor")
 public class MonitorController {
    /**
--- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/options/web/SysOptionsRestController.java
+++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/options/web/SysOptionsRestController.java
@ -60,7 +60,7 @@ import java.util.Map;
 */
@Api(tags = OptionsApi.TITLE)
@Slf4j
-@ApiRestController("/system/options/{ver}")
+@ApiRestController("/{ver}/system/options")
 public class SysOptionsRestController extends BaseRestController<SysOptions, OptionsModel, ISysOptionsService>
    implements OptionsApi {
--- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/org/web/SysOrgRestController.java
+++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/org/web/SysOrgRestController.java
@ -73,7 +73,7 @@ import java.util.Set;
 */
@Api(tags = SysOrgRestApi.TITLE)
@Slf4j
-@ApiRestController("/system/org/{ver}")
+@ApiRestController("/{ver}/system/org")
 public class SysOrgRestController extends BaseRestController<SysOrg, SysOrgModel, ISysOrgService>
    implements SysOrgRestApi {
--- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/web/RoleMenuRefRestController.java
+++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/web/RoleMenuRefRestController.java
@ -48,7 +48,7 @@ import java.util.stream.Collectors;
 */
@Api(tags = RoleMenuRefApi.TITLE)
@Slf4j
-@ApiRestController("/system/role/perms/{ver}")
+@ApiRestController("/{ver}/system/role/perms")
 public class RoleMenuRefRestController implements RoleMenuRefApi {
    /** 配置类 */
--- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/web/RoleRestController.java
+++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/web/RoleRestController.java
@ -49,7 +49,7 @@ import java.lang.reflect.Method;
 */
@Api(tags = "角色管理")
@Slf4j
-@ApiRestController("/system/role/{ver}")
+@ApiRestController("/{ver}/system/role")
 public class RoleRestController extends BaseRestController<SysRole, RoleModel, IRoleService>
        implements RoleApi {
--- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/tenant/web/TenantRestController.java
+++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/tenant/web/TenantRestController.java
@ -52,7 +52,7 @@ import java.lang.reflect.Method;
 */
@Api(tags = TenantApi.TITLE)
@Slf4j
-@ApiRestController("/system/tenant/{ver}")
+@ApiRestController("/{ver}/system/tenant")
 public class TenantRestController extends BaseRestController<SysTenant, TenantModel, ITenantService>
        implements TenantApi {
--- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/web/UserOrgRefRestController.java
+++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/web/UserOrgRefRestController.java
@ -54,7 +54,7 @@ import java.util.List;
 */
@Api(tags = UserOrgRefApi.TITLE)
@Slf4j
-@ApiRestController("/system/user/org/{ver}")
+@ApiRestController("/{ver}/system/user/org")
 public class UserOrgRefRestController implements UserOrgRefApi {
    /** 配置类 */
--- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/web/UserRestController.java
+++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/web/UserRestController.java
@ -82,7 +82,7 @@ import java.util.List;
 */
@Api(tags = UserApi.TITLE)
@Slf4j
-@ApiRestController("/system/user/{ver}")
+@ApiRestController("/{ver}/system/user")
 public class UserRestController extends BaseRestController<SysUser, UserModel, IUserService>
        implements UserApi {
--- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/web/UserRoleRefRestController.java
+++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/web/UserRoleRefRestController.java
@ -50,7 +50,7 @@ import java.util.List;
 */
@Api(tags = UserRoleRefApi.TITLE)
@Slf4j
-@ApiRestController("/system/user/roles/{ver}")
+@ApiRestController("/{ver}/system/user/roles")
 public class UserRoleRefRestController implements UserRoleRefApi {
    /** 配置类 */
--- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/tools/api/ApiController.java
+++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/tools/api/ApiController.java
@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 * @date 2021年10月27日12:50:00
 */
@Api(tags = "API-测试版本控制")
-@ApiRestController("/tools/api/{ver}")
+@ApiRestController("/{ver}/tools/api")
 public class ApiController {
    @ApiOperation(value = "测试正常接口", notes = "测试正常接口")
--- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/tools/email/web/EmailRestController.java
+++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/tools/email/web/EmailRestController.java
@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 */
@Api(tags = "邮件类")
@Slf4j
-@ApiRestController("/tools/email/{ver}")
+@ApiRestController("/{ver}/tools/email")
 public class EmailRestController {
    @Autowired
--- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/tools/oss/web/OssRestController.java
+++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/tools/oss/web/OssRestController.java
@ -13,7 +13,7 @@ import org.opsli.common.annotation.ApiRestController;
 */
@Api(tags = "文件管理类")
@Slf4j
-@ApiRestController("/tools/oss/{ver}")
+@ApiRestController("/{ver}/tools/oss")
 public class OssRestController {
--- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/tools/searchhis/web/SearchHisRestController.java
+++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/tools/searchhis/web/SearchHisRestController.java
@ -36,7 +36,7 @@ import java.util.Set;
 */
@Api(tags = "搜索历史记录")
@Slf4j
-@ApiRestController("/tools/searchhis/{ver}")
+@ApiRestController("/{ver}/tools/searchhis")
 public class SearchHisRestController {
    /**
--- a/opsli-modulars/opsli-modulars-test/src/main/java/org/opsli/modulars/gentest/carinfo/web/TestCarRestController.java
+++ b/opsli-modulars/opsli-modulars-test/src/main/java/org/opsli/modulars/gentest/carinfo/web/TestCarRestController.java
@ -47,7 +47,7 @@ import org.opsli.api.web.gentest.carinfo.TestCarRestApi;
 */
@Api(tags = TestCarRestApi.TITLE)
@Slf4j
-@ApiRestController("/gentest/carinfo/{ver}")
+@ApiRestController("/{ver}/gentest/carinfo")
 public class TestCarRestController extends BaseRestController<TestCar, TestCarModel, ITestCarService>
    implements TestCarRestApi {
--- a/opsli-modulars/opsli-modulars-test/src/main/java/org/opsli/modulars/gentest/user/web/TestUserRestController.java
+++ b/opsli-modulars/opsli-modulars-test/src/main/java/org/opsli/modulars/gentest/user/web/TestUserRestController.java
@ -48,7 +48,7 @@ import java.lang.reflect.Method;
 */
@Api(tags = TestUserRestApi.TITLE)
@Slf4j
-@ApiRestController("/gentest/user/{ver}")
+@ApiRestController("/{ver}/gentest/user")
 public class TestUserRestController extends BaseRestController<TestUser, TestUserModel, ITestUserService>
    implements TestUserRestApi {
--- a/opsli-modulars/opsli-modulars-test/src/main/java/org/opsli/modulars/test/web/TestRestController.java
+++ b/opsli-modulars/opsli-modulars-test/src/main/java/org/opsli/modulars/test/web/TestRestController.java
@ -32,7 +32,7 @@ import java.lang.reflect.Method;
 */
@Api(tags = "测试类")
@Slf4j
-@ApiRestController("/test/{ver}")
+@ApiRestController("/{ver}/test")
 public class TestRestController extends BaseRestController<TestEntity, TestModel, ITestService>
        implements TestRestApi {
--- a/opsli-starter/src/main/resources/application.yaml
+++ b/opsli-starter/src/main/resources/application.yaml
@ -153,8 +153,8 @@ opsli:
    url-patterns: "/*"
    # 排除过滤URL
    url-exclusion:
-      - "/api/generator/template/v1/insertAndDetail"
+      - "/api/v1/generator/template/insertAndDetail"
-      - "/api/generator/template/v1/updateAndDetail"
+      - "/api/v1/generator/template/updateAndDetail"
      - "/static/files/"
      - "/doc.html"