diff --git a/modules/core/src/main/java/com/jeesite/modules/config/interceptor/LogInterceptorConfig.java b/modules/core/src/main/java/com/jeesite/modules/config/interceptor/LogInterceptorConfig.java
index a5d3e4ef..f074ec3b 100644
--- a/modules/core/src/main/java/com/jeesite/modules/config/interceptor/LogInterceptorConfig.java
+++ b/modules/core/src/main/java/com/jeesite/modules/config/interceptor/LogInterceptorConfig.java
@@ -19,7 +19,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
* @version 2018年1月10日
*/
@Configuration(proxyBeanMethods = false)
-@ConditionalOnProperty(name="web.interceptor.log.enabled", havingValue="true", matchIfMissing=true)
+@ConditionalOnProperty(name="web.interceptor.log.enabled", havingValue="true", matchIfMissing=false)
public class LogInterceptorConfig implements WebMvcConfigurer {
@Override
diff --git a/modules/core/src/main/java/com/jeesite/modules/file/web/UserfilesController.java b/modules/core/src/main/java/com/jeesite/modules/file/web/UserfilesController.java
index 8fbc6e8b..69d5c445 100644
--- a/modules/core/src/main/java/com/jeesite/modules/file/web/UserfilesController.java
+++ b/modules/core/src/main/java/com/jeesite/modules/file/web/UserfilesController.java
@@ -28,7 +28,7 @@ import java.io.IOException;
* @version 2022-09-27
*/
@Controller
-@ConditionalOnProperty(name="file.isFileStreamDown", havingValue="true", matchIfMissing=true)
+@ConditionalOnProperty(name={"file.enabled","file.isFileStreamDown"}, havingValue="true", matchIfMissing=true)
@Hidden
public class UserfilesController extends BaseController {
diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/TagsController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/TagsController.java
index 53990468..a1e5c7e8 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/web/TagsController.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/TagsController.java
@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
*/
@Controller
@RequestMapping(value = "tags")
-@ConditionalOnProperty(name="web.core.enabled", havingValue="true", matchIfMissing=true)
+@ConditionalOnProperty(name={"config.enabled","web.core.enabled"}, havingValue="true", matchIfMissing=true)
@Hidden
public class TagsController extends BaseController {
diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml
index 0eb542cf..e9fda797 100644
--- a/modules/core/src/main/resources/config/jeesite-core.yml
+++ b/modules/core/src/main/resources/config/jeesite-core.yml
@@ -200,6 +200,10 @@ page:
# 每页最大条数,防止分页过大导致系统缓慢或内存溢出
maxPageSize: 999
+# 基础配置(参数、模块、字典)
+config:
+ enabled: true
+
# 用户相关
user:
enabled: true
diff --git a/web-ai/src/main/resources/config/application.yml b/web-ai/src/main/resources/config/application.yml
index 153c1b33..199c64c9 100644
--- a/web-ai/src/main/resources/config/application.yml
+++ b/web-ai/src/main/resources/config/application.yml
@@ -143,11 +143,11 @@ user:
# 国际化管理(专业版)
lang:
- enabled: true
+ enabled: false
# 任务调度(标准版)
job:
- enabled: true
+ enabled: false
# 代码生成
gen:
diff --git a/web-mini/pom.xml b/web-mini/pom.xml
index e464f7db..5c02cff1 100644
--- a/web-mini/pom.xml
+++ b/web-mini/pom.xml
@@ -38,11 +38,73 @@
runtime
-
+
com.jeesite
jeesite-framework
${project.parent.version}
+
+
+ org.quartz-scheduler
+ quartz
+
+
+ com.atomikos
+ transactions-jdbc
+
+
+ com.atomikos
+ transactions-jta
+
+
+ org.springframework.boot
+ spring-boot-starter-data-redis
+
+
+ org.apache.poi
+ poi
+
+
+ org.apache.poi
+ poi-ooxml
+
+
+ org.apache.poi
+ poi-scratchpad
+
+
+ net.sf.jmimemagic
+ jmimemagic
+
+
+ net.coobird
+ thumbnailator
+
+
+ com.google.zxing
+ core
+
+
+ com.google.zxing
+ javase
+
+
+ com.belerweb
+ pinyin4j
+
+
+ com.bladejava
+ blade-patchca
+
+
+ org.bouncycastle
+ bcprov-jdk18on
+
+
+ com.fasterxml.woodstox
+ woodstox-core
+
+
diff --git a/web-mini/src/main/resources/config/application.yml b/web-mini/src/main/resources/config/application.yml
index 5c72a030..122627f1 100644
--- a/web-mini/src/main/resources/config/application.yml
+++ b/web-mini/src/main/resources/config/application.yml
@@ -27,23 +27,9 @@ server:
servlet:
context-path: /js
register-default-servlet: false
-# encoding.enabled: true
tomcat:
uri-encoding: UTF-8
- # 表单请求数据的最大大小
max-http-form-post-size: 20MB
-# # 客户端发送请求参数个数限制
-# max-parameter-count: 10000
-# # 文件上传的表单请求参数个数限制
-# max-part-count: 50
-# # 进程的最大连接数
-# max-connections: 8192
-# # 连接数满后的排队个数
-# accept-count: 100
-# # 线程数最大和最小个数
-# threads:
-# max: 200
-# min-spare: 10
# 当 Nginx 为 https,tomcat 为 http 时,设置该选项为 true
schemeHttps: false
@@ -52,16 +38,13 @@ server:
#========== Database sttings ==========#
#======================================#
-# 数据库连接(默认关闭,如果和 web.core.enabled 同时开启可使用如下功能:
-# 配置参数:http://127.0.0.1:8980/js/a/sys/config/list
-# 模块管理:http://127.0.0.1:8980/js/a/sys/module/list
-# 字典管理:http://127.0.0.1:8980/js/a/sys/dictType/list
+# 数据库连接
jdbc:
-# # Mysql 数据库配置
+ # Mysql 数据库配置
# type: mysql
# driver: com.mysql.cj.jdbc.Driver
-# url: jdbc:mysql://127.0.0.1:3306/jeesite_mini?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai
+# url: jdbc:mysql://127.0.0.1:3306/jeesite_v5?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai
# username: root
# password: 123456
# testSql: SELECT 1
@@ -130,7 +113,7 @@ adminPath: /a
# 前端基础路径
frontPath: /f
-# 配置相关功能(参数、模块、字典)
+# 基础配置(参数、模块、字典)
config:
enabled: false
@@ -155,31 +138,14 @@ gen:
state:
enabled: true
-# Web 相关
+# 核心功能 Controller 开关
web:
-
- # MVC拦截器(访问日志和手机视图)
- interceptor:
- log:
- enabled: false
- mobile:
- enabled: false
-
- # 核心模块的Web功能开启
core:
enabled: false
-
-# 在线API文档
-springdoc:
- api-docs:
- enabled: true
- swagger-ui:
- enabled: true
# 文件上传
file:
enabled: false
- isFileStreamDown: false
# 消息提醒中心
msg: