diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/ConfigController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/ConfigController.java index 92cf4f35..85374223 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/ConfigController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/ConfigController.java @@ -34,7 +34,7 @@ import com.jeesite.modules.sys.service.ConfigService; */ @Controller @RequestMapping(value = "${adminPath}/sys/config") -@ConditionalOnProperty(name="web.core.enabled", havingValue="true", matchIfMissing=true) +@ConditionalOnProperty(name={"config.enabled","web.core.enabled"}, havingValue="true", matchIfMissing=true) @Hidden public class ConfigController extends BaseController { diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/DictDataController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/DictDataController.java index ee88847d..7e6b22af 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/DictDataController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/DictDataController.java @@ -40,7 +40,7 @@ import java.util.Map; */ @Controller @RequestMapping(value = "${adminPath}/sys/dictData") -@ConditionalOnProperty(name="web.core.enabled", havingValue="true", matchIfMissing=true) +@ConditionalOnProperty(name={"config.enabled","web.core.enabled"}, havingValue="true", matchIfMissing=true) @Hidden public class DictDataController extends BaseController { diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/DictTypeController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/DictTypeController.java index 24018fc4..f2e81bca 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/DictTypeController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/DictTypeController.java @@ -33,7 +33,7 @@ import java.util.Map; */ @Controller @RequestMapping(value = "${adminPath}/sys/dictType") -@ConditionalOnProperty(name="web.core.enabled", havingValue="true", matchIfMissing=true) +@ConditionalOnProperty(name={"config.enabled","web.core.enabled"}, havingValue="true", matchIfMissing=true) @Hidden public class DictTypeController extends BaseController { diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/ModuleController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/ModuleController.java index 1be1d809..0173a4d9 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/ModuleController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/ModuleController.java @@ -38,7 +38,7 @@ import java.util.List; */ @Controller @RequestMapping(value = "${adminPath}/sys/module") -@ConditionalOnProperty(name="web.core.enabled", havingValue="true", matchIfMissing=true) +@ConditionalOnProperty(name={"config.enabled","web.core.enabled"}, havingValue="true", matchIfMissing=true) @Hidden public class ModuleController extends BaseController { diff --git a/web-mini/src/main/resources/config/application.yml b/web-mini/src/main/resources/config/application.yml index be386a8c..5e7ce2fc 100644 --- a/web-mini/src/main/resources/config/application.yml +++ b/web-mini/src/main/resources/config/application.yml @@ -57,7 +57,7 @@ jdbc: # # Mysql 数据库配置 # type: mysql # driver: com.mysql.cj.jdbc.Driver -# url: jdbc:mysql://127.0.0.1:3306/jeesite_v5?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai +# url: jdbc:mysql://127.0.0.1:3306/jeesite_mini?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai # username: root # password: 123456 # testSql: SELECT 1 @@ -114,7 +114,11 @@ adminPath: /a # 前端基础路径 frontPath: /f -# 用户权限相关 +# 配置相关功能(参数、模块、字典) +config: + enabled: false + +# 用户权限相关(用户、角色、菜单) user: enabled: false