From f7c7b8d6dc649e83f923b645f5990bd766a44625 Mon Sep 17 00:00:00 2001 From: gaoxq <376340421@qq.com> Date: Thu, 1 Jan 2026 12:48:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BE=85=E5=8A=9E=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeesite/modules/app/utils/IpUtils.java | 3 +- .../resources/config/application-prod.yml | 38 ++++++++++++++++--- .../src/main/resources/config/application.yml | 23 ++++------- .../core/layouts/default/footer/index.vue | 3 -- 4 files changed, 41 insertions(+), 26 deletions(-) diff --git a/web-api/src/main/java/com/jeesite/modules/app/utils/IpUtils.java b/web-api/src/main/java/com/jeesite/modules/app/utils/IpUtils.java index 436d7501..a1e25783 100644 --- a/web-api/src/main/java/com/jeesite/modules/app/utils/IpUtils.java +++ b/web-api/src/main/java/com/jeesite/modules/app/utils/IpUtils.java @@ -136,7 +136,6 @@ public class IpUtils { public static String getServerHttp() { - return "http://" + getLocalIp() + ":" + Global.getProperty("server.port") + FileUtils.path("/" - + Global.getProperty("server.servlet.context-path")); + return "http://" + getLocalIp() + ":" + Global.getProperty("server.port") + FileUtils.path(Global.getProperty("server.servlet.context-path")); } } diff --git a/web-api/src/main/resources/config/application-prod.yml b/web-api/src/main/resources/config/application-prod.yml index 6bcbf6b1..c06c1ecc 100644 --- a/web-api/src/main/resources/config/application-prod.yml +++ b/web-api/src/main/resources/config/application-prod.yml @@ -1,15 +1,32 @@ +#======================================# +#========== Project settings ==========# +#======================================# -# 使用环境配置,只需 JVM 参数里加:-Dspring.profiles.active=prod +# 产品或项目名称、软件开发公司名称 +productName: My-Worker +companyName: mini +#======================================# +#========== Server settings ===========# +#======================================# server: - port: 8980 servlet: - context-path: /js + context-path: ~ +vue: + ctxPath: + replaceText: /vuePath +vuePath: /worker + +shiro: + defaultPath: ${vuePath}/login + +#======================================# +#========= Database settings ==========# +#======================================# # 数据库连接 -jdbc: - +jdbc: # Mysql 数据库配置 type: mysql driver: com.mysql.cj.jdbc.Driver @@ -20,7 +37,6 @@ jdbc: # 数据库连接池配置 pool: - # 初始化连接数 init: 1 # 最小连接数 @@ -39,3 +55,13 @@ mybatis: mapper: refresh: enabled: false + + +#======================================# +#======== FileUpload settings =========# +#======================================# +# 文件上传 +file: + enabled: true + baseDir: /ogsapp/files + maxFileSize: '500*1024*1024' \ No newline at end of file diff --git a/web-api/src/main/resources/config/application.yml b/web-api/src/main/resources/config/application.yml index 95f8f269..168969de 100644 --- a/web-api/src/main/resources/config/application.yml +++ b/web-api/src/main/resources/config/application.yml @@ -4,7 +4,7 @@ # 产品或项目名称、软件开发公司名称 productName: My-Worker -companyName: me +companyName: mini # 产品版本、版权年份 productVersion: V5.14 @@ -23,7 +23,7 @@ apiMode: true server: port: 8980 servlet: - context-path: ~ + context-path: /js register-default-servlet: false tomcat: uri-encoding: UTF-8 @@ -49,11 +49,6 @@ server: # 当 Nginx 为 https,tomcat 为 http 时,设置该选项为 true schemeHttps: false -vue: - ctxPath: - replaceText: /vuePath - -vuePath: /worker #======================================# #========= Database settings ==========# #======================================# @@ -410,16 +405,14 @@ state: # Shiro 相关 shiro: - - defaultPath: ${vuePath}/login # 主页路径 -# defaultPath: ${shiro.loginUrl} -# -# # 登录相关设置 -# loginUrl: ${adminPath}/login -# logoutUrl: ${shiro.loginUrl} -# successUrl: ${adminPath}/index + defaultPath: ${shiro.loginUrl} + + # 登录相关设置 + loginUrl: ${adminPath}/login + logoutUrl: ${shiro.loginUrl} + successUrl: ${adminPath}/index # # Apereo CAS 相关配置(标准版) # casServerUrl: http://127.0.0.1:8981/cas diff --git a/web-vue/packages/core/layouts/default/footer/index.vue b/web-vue/packages/core/layouts/default/footer/index.vue index 6191177c..f9b23605 100644 --- a/web-vue/packages/core/layouts/default/footer/index.vue +++ b/web-vue/packages/core/layouts/default/footer/index.vue @@ -41,9 +41,6 @@ getShowLayoutFooter, prefixCls, t, - DOC_URL, - GITHUB_URL, - SITE_URL, openWindow, footerRef, };