diff --git a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/autoconfigure/conf/ShiroConfig.java b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/autoconfigure/conf/ShiroConfig.java index 995a8b13..947a30fd 100644 --- a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/autoconfigure/conf/ShiroConfig.java +++ b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/autoconfigure/conf/ShiroConfig.java @@ -88,9 +88,9 @@ public class ShiroConfig { } // 登录接口拦截 - filterMap.put("/sys/login", "anon"); - filterMap.put("/sys/publicKey", "anon"); - filterMap.put("/sys/slipCount", "anon"); + filterMap.put("/system/login", "anon"); + filterMap.put("/system/publicKey", "anon"); + filterMap.put("/system/slipCount", "anon"); filterMap.put("/captcha*", "anon"); // 导出Excel\模版 不做自动拦截 手动拦截 diff --git 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 index dee42758..9d31e0cc 100644 --- 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 @@ -73,7 +73,7 @@ import java.util.Set; */ @Api(tags = SysAreaRestApi.TITLE) @Slf4j -@ApiRestController("/sys/area") +@ApiRestController("/system/area") public class SysAreaRestController extends BaseRestController implements SysAreaRestApi { diff --git 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 index 31b9c933..efee3ca0 100644 --- 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 @@ -58,7 +58,7 @@ import java.util.List; */ @Api(tags = DictDetailApi.TITLE) @Slf4j -@ApiRestController("/sys/dict/detail") +@ApiRestController("/system/dict/detail") public class DictDetailRestController extends BaseRestController implements DictDetailApi { diff --git 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 index e2235b6f..2c3691e2 100644 --- 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 @@ -60,7 +60,7 @@ import java.util.List; */ @Api(tags = DictApi.TITLE) @Slf4j -@ApiRestController("/sys/dict") +@ApiRestController("/system/dict") public class DictRestController extends BaseRestController implements DictApi { diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/login/web/LoginRestController.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/login/web/LoginRestController.java index 8098b0d6..4c3dbcc8 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/login/web/LoginRestController.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/login/web/LoginRestController.java @@ -73,7 +73,7 @@ public class LoginRestController { @Limiter @InterfaceCrypto(responseEncrypt = false) @ApiOperation(value = "登录", notes = "登录") - @PostMapping("/sys/login") + @PostMapping("/system/login") public ResultVo login(@RequestBody LoginForm form, HttpServletRequest request){ // 非空验证 @@ -154,7 +154,7 @@ public class LoginRestController { */ @Limiter @ApiOperation(value = "登出", notes = "登出") - @PostMapping("/sys/logout") + @PostMapping("/system/logout") public ResultVo logout() { String token = TokenThreadLocal.get(); // 登出失败,没有授权Token @@ -170,7 +170,7 @@ public class LoginRestController { */ @Limiter @ApiOperation(value = "获得当前登录失败次数", notes = "获得当前登录失败次数") - @GetMapping("/sys/slipCount") + @GetMapping("/system/slipCount") public ResultVo slipCount(String username){ // 获得当前失败次数 long slipCount = UserTokenUtil.getSlipCount(username); @@ -201,7 +201,7 @@ public class LoginRestController { */ @Limiter @ApiOperation(value = "获得公钥", notes = "获得公钥") - @GetMapping("/sys/publicKey") + @GetMapping("/system/publicKey") public ResultVo getPublicKey(){ // 获得公钥 diff --git 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 index a739b093..4dbb2afd 100644 --- 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 @@ -43,7 +43,7 @@ import javax.servlet.http.HttpServletRequest; */ @Api(tags = LogsApi.TITLE) @Slf4j -@ApiRestController("/sys/logs") +@ApiRestController("/system/logs") public class LogsRestController extends BaseRestController implements LogsApi { diff --git 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 index 2a503ec4..a359d81e 100644 --- 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 @@ -78,7 +78,7 @@ import java.util.Set; */ @Api(tags = MenuApi.TITLE) @Slf4j -@ApiRestController("/sys/menu") +@ApiRestController("/system/menu") public class MenuRestController extends BaseRestController implements MenuApi { diff --git 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 index d2892b48..df49c2e7 100644 --- 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 @@ -34,7 +34,7 @@ import java.util.Map; */ @Api(tags = "系统监控") @Slf4j -@ApiRestController("/sys/monitor") +@ApiRestController("/system/monitor") public class MonitorController { /** diff --git 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 index 1d13e933..3f14fef9 100644 --- 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("/sys/options") +@ApiRestController("/system/options") public class SysOptionsRestController extends BaseRestController implements OptionsApi { diff --git 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 index bf949a48..69cbd56c 100644 --- 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 @@ -65,7 +65,7 @@ import java.util.Set; */ @Api(tags = SysOrgRestApi.TITLE) @Slf4j -@ApiRestController("/sys/org") +@ApiRestController("/system/org") public class SysOrgRestController extends BaseRestController implements SysOrgRestApi { diff --git 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 index cb133765..897265df 100644 --- 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 @@ -51,7 +51,7 @@ import java.util.stream.Collectors; */ @Api(tags = RoleMenuRefApi.TITLE) @Slf4j -@ApiRestController("/sys/role/perms") +@ApiRestController("/system/role/perms") public class RoleMenuRefRestController implements RoleMenuRefApi { /** 内置数据 */ diff --git 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 index b57b0357..dde40e2b 100644 --- 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 @@ -58,7 +58,7 @@ import java.util.List; */ @Api(tags = "角色管理") @Slf4j -@ApiRestController("/sys/role") +@ApiRestController("/system/role") public class RoleRestController extends BaseRestController implements RoleApi { diff --git 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 index 71a65d56..181afddc 100644 --- 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 @@ -56,7 +56,7 @@ import java.lang.reflect.Method; */ @Api(tags = TenantApi.TITLE) @Slf4j -@ApiRestController("/sys/tenant") +@ApiRestController("/system/tenant") public class TenantRestController extends BaseRestController implements TenantApi { diff --git 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 index 5518d724..fdc17455 100644 --- 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 @@ -42,7 +42,7 @@ import org.springframework.beans.factory.annotation.Autowired; */ @Api(tags = UserOrgRefApi.TITLE) @Slf4j -@ApiRestController("/sys/user/org") +@ApiRestController("/system/user/org") public class UserOrgRefRestController implements UserOrgRefApi { /** 配置类 */ diff --git 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 index c75ba4e4..f6c578e7 100644 --- 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 @@ -83,7 +83,7 @@ import java.util.Map; */ @Api(tags = UserApi.TITLE) @Slf4j -@ApiRestController("/sys/user") +@ApiRestController("/system/user") public class UserRestController extends BaseRestController implements UserApi { diff --git 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 index 93f78878..e39aac36 100644 --- 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 @@ -42,7 +42,7 @@ import org.springframework.beans.factory.annotation.Autowired; */ @Api(tags = UserRoleRefApi.TITLE) @Slf4j -@ApiRestController("/sys/user/roles") +@ApiRestController("/system/user/roles") public class UserRoleRefRestController implements UserRoleRefApi { /** 配置类 */ diff --git a/opsli-modulars/opsli-modulars-system/src/test/java/LimiterTest.java b/opsli-modulars/opsli-modulars-system/src/test/java/LimiterTest.java index 2adad150..df0bebdb 100644 --- a/opsli-modulars/opsli-modulars-system/src/test/java/LimiterTest.java +++ b/opsli-modulars/opsli-modulars-system/src/test/java/LimiterTest.java @@ -20,7 +20,7 @@ public class LimiterTest { AsyncProcessQueueReFuse.execute(()->{ Map map = Maps.newHashMap(); map.put("username","demo"); - String ret = HttpUtil.get("http://127.0.0.1:8080/opsli-boot/sys/slipCount", map); + String ret = HttpUtil.get("http://127.0.0.1:8080/opsli-boot/system/slipCount", map); System.out.println(ret); }); }