From 9e33b5c894811de43c7e6befe714a740b0c782ad Mon Sep 17 00:00:00 2001 From: thinkgem Date: Wed, 15 Oct 2025 21:13:38 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E8=BF=B7=E4=BD=A0=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=B8=80=E4=BA=9B=E4=BE=9D=E8=B5=96=EF=BC=8C?= =?UTF-8?q?=E7=BC=A9=E5=87=8F=E6=89=93=E5=8C=85=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../interceptor/LogInterceptorConfig.java | 15 ++--- .../MobileViewInterceptorConfig.java | 1 - .../modules/file/web/UserfilesController.java | 2 +- .../modules/sys/web/TagsController.java | 14 ++--- .../main/resources/config/jeesite-core.yml | 4 ++ web-mini/pom.xml | 59 +++++++++++++++++++ .../src/main/resources/config/application.yml | 46 +++------------ 7 files changed, 85 insertions(+), 56 deletions(-) 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 ed36cfc6..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 @@ -4,16 +4,14 @@ */ package com.jeesite.modules.config.interceptor; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.servlet.config.annotation.EnableWebMvc; -import org.springframework.web.servlet.config.annotation.InterceptorRegistration; -import org.springframework.web.servlet.config.annotation.InterceptorRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; - import com.jeesite.common.config.Global; import com.jeesite.common.lang.StringUtils; import com.jeesite.modules.sys.interceptor.LogInterceptor; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.InterceptorRegistration; +import org.springframework.web.servlet.config.annotation.InterceptorRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; /** * 后台管理日志记录拦截器 @@ -21,8 +19,7 @@ import com.jeesite.modules.sys.interceptor.LogInterceptor; * @version 2018年1月10日 */ @Configuration(proxyBeanMethods = false) -@ConditionalOnProperty(name="web.interceptor.log.enabled", havingValue="true", matchIfMissing=true) -@EnableWebMvc +@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/config/interceptor/MobileViewInterceptorConfig.java b/modules/core/src/main/java/com/jeesite/modules/config/interceptor/MobileViewInterceptorConfig.java index 65eedef9..c1d90023 100644 --- a/modules/core/src/main/java/com/jeesite/modules/config/interceptor/MobileViewInterceptorConfig.java +++ b/modules/core/src/main/java/com/jeesite/modules/config/interceptor/MobileViewInterceptorConfig.java @@ -22,7 +22,6 @@ import com.jeesite.modules.sys.interceptor.MobileInterceptor; */ @Configuration(proxyBeanMethods = false) @ConditionalOnProperty(name="web.interceptor.mobile.enabled", havingValue="true", matchIfMissing=false) -@EnableWebMvc public class MobileViewInterceptorConfig 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 6d99dde0..149a5271 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) @ApiIgnore 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 2826c0c8..d0ed7e2b 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 @@ -4,26 +4,24 @@ */ package com.jeesite.modules.sys.web; -import javax.servlet.http.HttpServletRequest; - +import com.jeesite.common.web.BaseController; +import com.jeesite.common.web.http.ServletUtils; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.RequestMapping; - -import com.jeesite.common.web.BaseController; -import com.jeesite.common.web.http.ServletUtils; - import springfox.documentation.annotations.ApiIgnore; +import javax.servlet.http.HttpServletRequest; + /** * 公共标签Controller * @author ThinkGem - * @version 2017-5-7 + * @version 2020-5-7 */ @Controller @RequestMapping(value = "tags") -@ConditionalOnProperty(name="web.core.enabled", havingValue="true", matchIfMissing=true) +@ConditionalOnProperty(name={"config.enabled","web.core.enabled"}, havingValue="true", matchIfMissing=true) @ApiIgnore 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 273e9744..2e749365 100644 --- a/modules/core/src/main/resources/config/jeesite-core.yml +++ b/modules/core/src/main/resources/config/jeesite-core.yml @@ -198,6 +198,10 @@ page: # 每页最大条数，防止分页过大导致系统缓慢或内存溢出 maxPageSize: 999 +# 基础配置（参数、模块、字典） +config: + enabled: true + # 用户相关 user: enabled: true diff --git a/web-mini/pom.xml b/web-mini/pom.xml index adb806ad..43cb5941 100644 --- a/web-mini/pom.xml +++ b/web-mini/pom.xml @@ -43,7 +43,66 @@ 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 + + + org.springframework.boot spring-boot-starter-tomcat diff --git a/web-mini/src/main/resources/config/application.yml b/web-mini/src/main/resources/config/application.yml index ae903edb..f6ac18d8 100644 --- a/web-mini/src/main/resources/config/application.yml +++ b/web-mini/src/main/resources/config/application.yml @@ -27,19 +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-connections: 8192 -# # 连接数满后的排队个数 -# accept-count: 100 -# # 线程数最大和最小个数 -# threads: -# max: 200 -# min-spare: 10 # 当 Nginx 为 https，tomcat 为 http 时，设置该选项为 true schemeHttps: false @@ -48,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 @@ -72,6 +59,10 @@ jdbc: # 最大连接数 maxActive: 20 + # JTA事务 + jta: + enabled: false + #======================================# #========== Framework settings ========# #======================================# @@ -95,10 +86,6 @@ spring: mvc: pathmatch: matching-strategy: ANT_PATH_MATCHER - - # JTA事务 - jta: - enabled: false # 缓存配置 cache: @@ -126,7 +113,7 @@ adminPath: /a # 前端基础路径 frontPath: /f -# 配置相关功能（参数、模块、字典） +# 基础配置（参数、模块、字典） config: enabled: false @@ -151,29 +138,14 @@ gen: state: enabled: true -# Web 相关 +# 核心功能 Controller 开关 web: - - # MVC拦截器（访问日志和手机视图） - interceptor: - log: - enabled: false - mobile: - enabled: false - - # 核心模块的Web功能开启 core: enabled: false - # 在线API文档工具 - swagger: - enabled: false - - # 文件上传 file: enabled: false - isFileStreamDown: false # 消息提醒中心 msg: