diff --git a/modules/core/src/main/java/com/jeesite/modules/state/web/EhCacheController.java b/modules/core/src/main/java/com/jeesite/modules/state/web/EhCacheController.java index 601df075..95aad88c 100644 --- a/modules/core/src/main/java/com/jeesite/modules/state/web/EhCacheController.java +++ b/modules/core/src/main/java/com/jeesite/modules/state/web/EhCacheController.java @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping; @RequestMapping(value="${adminPath}/state/ehcache") public class EhCacheController { - @RequiresPermissions("stste:ehcache") + @RequiresPermissions("sys:stste:ehcache") @RequestMapping(value="") public String index(Model model){ model.addAttribute("message", "正在研发中,敬请期待!"); diff --git a/modules/core/src/main/java/com/jeesite/modules/state/web/ServerStateController.java b/modules/core/src/main/java/com/jeesite/modules/state/web/ServerStateController.java index 8e8d729c..73eb5276 100644 --- a/modules/core/src/main/java/com/jeesite/modules/state/web/ServerStateController.java +++ b/modules/core/src/main/java/com/jeesite/modules/state/web/ServerStateController.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping; @RequestMapping(value="${adminPath}/state/server") public class ServerStateController { - @RequiresPermissions("stste:server") + @RequiresPermissions("sys:stste:server") @RequestMapping(value="") public String index(){ return "modules/state/serverIndex"; diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx index 40c82817..d9507529 100644 Binary files a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx and b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx differ diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml index b2b91205..f27aa9cc 100644 --- a/modules/core/src/main/resources/config/jeesite-core.yml +++ b/modules/core/src/main/resources/config/jeesite-core.yml @@ -235,7 +235,7 @@ shiro: sso: # 如果启用/sso/{username}/{token}单点登录,请修改此安全key并与单点登录系统key一致。 - secretKey: abc + secretKey: ~ # 是否加密单点登录安全Key encryptKey: true @@ -280,7 +280,7 @@ shiro: defaultFilterChainDefinitions: | /static/** = anon /userfiles/** = anon - /druid/** = perms[state:druid] + /druid/** = perms[sys:state:druid] ${adminPath}/login-cas = cas ${adminPath}/login = authc ${adminPath}/logout = logout diff --git a/modules/core/src/main/resources/mybatis/mybatis-config.xml b/modules/core/src/main/resources/mybatis/mybatis-config.xml index d7f50b3f..60fc4722 100644 --- a/modules/core/src/main/resources/mybatis/mybatis-config.xml +++ b/modules/core/src/main/resources/mybatis/mybatis-config.xml @@ -22,7 +22,7 @@ - +