From ebae0c1137ba96d38e5b2323577129d2c9ff2e6e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 22 五月 2025 09:45:59 +0800
Subject: [PATCH] 1、优化配置文件； 2、优化ID生成器代码； 3、修改注释； 4、修改权限初始化时算法； 5、导出Excel文件功能归为一个新类； 6、工站数据库存入验空修改；
---
pms-parent/pms-global/src/main/resources/application-global.yml | 105 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 70 insertions(+), 35 deletions(-)
diff --git a/pms-parent/pms-global/src/main/resources/application-global.yml b/pms-parent/pms-global/src/main/resources/application-global.yml
index bf9e58b..2f85bd2 100644
--- a/pms-parent/pms-global/src/main/resources/application-global.yml
+++ b/pms-parent/pms-global/src/main/resources/application-global.yml
@@ -1,9 +1,22 @@
+pmsGl:
+ #鏈満寮�鍙戠幆澧冿細8.130.75.203:63306
+ #浜戞湇鍔�203锛� 127.0.0.1:63306
+ mySqlSvUrl: 127.0.0.1:63306
+ #鏈満寮�鍙戠幆澧冿細E:/java/nginx-1.24.0/html/webfiles/
+ #浜戞湇鍔�203锛� D:/apps/pms/nginx-1.24.0/html/webfiles/
+ webFileAbsolutePath: D:/apps/pms/nginx-1.24.0/html/webfiles/
+ #杈撳嚭sql鏃ュ織寮�鍏筹紝鎺у埗PrintSqlInterceptor鎷︽埅鍣ㄦ槸鍚﹀姞杞�
+ showSqlLog: true
+ #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse锛屽紑鍙戦樁娈典笉杩涜鐧诲綍楠岃瘉鍙婃潈闄愰獙璇�
+ isDev: false
spring:
servlet:
multipart:
# 鍓嶇涓婁紶鏂囦欢锛岄檺鍒跺崟涓枃浠剁殑澶у皬鍜岄檺鍒舵墍鏈夋枃浠剁殑澶у皬
- max-file-size: 1MB
- max-request-size: 10MB
+ max-file-size: 500MB
+ max-request-size: 5000MB
+ main:
+ allow-circular-references: true
logging:
charset:
console: UTF-8
@@ -33,26 +46,38 @@
#type-aliases-package: com.dy.pmsGlobal.daoBa
configuration:
#log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #鏃惰�岃緭鍑烘棩蹇楋紝鏃惰�屼笉杈撳嚭鏃ュ織
- log-impl: org.apache.ibatis.logging.log4j2.Log4j2Impl
+ #log-impl: org.apache.ibatis.logging.log4j2.Log4j2Impl 涓嶅啀搴旂敤锛屾敼涓篜rintSqlInterceptor鎷︽埅鍣ㄨ緭鍑簊ql鏃ュ織锛屼笅闈rint-sql椤归厤缃�
+ print-sql: ${pmsGl.showSqlLog} # 杈撳嚭sql鏃ュ織寮�鍏筹紝鎺у埗PrintSqlInterceptor鎷︽埅鍣ㄦ槸鍚﹀姞杞�
#寮�鍚┘宄皍Name鑷姩鏄犲皠鍒皍_name
#2023-10-24缁忓疄楠岋紝涓嬮潰閰嶇疆true鎴杅alse锛岄兘鑳戒粠u_name鏄犲皠鍒皍Name
#map-underscore-to-camel-case: true
lazyLoadingEnabled: true # 寮�鍚欢鏃跺姞杞藉紑鍏�
aggressiveLazyLoading: false # 灏嗙Н鏋佸姞杞芥敼涓烘秷鏋佸姞杞斤紙鍗虫寜闇�鍔犺浇锛夛紝榛樿鍊兼槸false
lazy-load-trigger-methods: "" # 闃绘尅涓嶇浉骞茬殑鎿嶄綔瑙﹀彂锛屽疄鐜版噿鍔犺浇
- cache-enabled: true #鎵撳紑鍏ㄥ眬缂撳瓨寮�鍏筹紙浜岀骇鐜锛夛紝榛樿鍊兼槸true
+ cache-enabled: true #鎵撳紑鍏ㄥ眬缂撳瓨寮�鍏筹紙浜岀骇鐜锛夛紝榛樿鍊兼槸true+
#default-enum-type-handler: com.dy.common.mybatis.envm.EnumCodeTypeHandler
+dingtalk:
+ robot:
+ url: https://oapi.dingtalk.com/robot/send
+ access-token: 5004482dce6b24d0e1e655b8e4376a6418cfcebce17ff792d0e68cbb63d6eb5b
+ secret: SEC985ad412f35ece68bb239cad88b6fba59b19461dd8d067e80fafa1270d6ab465
+ at-all: true
+#涓嶈繘琛寀serToken杩囨护鐨刄RL锛孈ConfigurationProperties瑕佹眰tokennofilter涓墍鏈夊瓧姣嶉兘灏忓啓
+tokennofilter:
+ urls:
+ - /sso/sso
pms:
global:
- dev: true #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse锛屽紑鍙戦樁娈典笉杩涜鐧诲綍楠岃瘉鍙婃潈闄愰獙璇�
- ssoUserExpireAfterAccess: 60 #sso鐧诲綍鍚庯紝鐢ㄦ埛鍦ㄤ竴瀹氭椂闂达紙ssoUserExpireAfterAccess锛夛紙鍒嗛挓锛夊唴鏈闂郴缁燂紝绯荤粺娓呴櫎缂撳瓨淇℃伅锛屼娇鐢ㄩ噸鏂扮櫥褰曠郴缁�
+ dev: ${pmsGl.isDev} #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse锛屽紑鍙戦樁娈典笉杩涜鐧诲綍楠岃瘉鍙婃潈闄愰獙璇�
+ ssoUserExpireAfterAccess: 60 #sso鐧诲綍鍚庯紝鐢ㄦ埛鍦ㄤ竴瀹氭椂闂达紙ssoUserExpireAfterAccess锛夛紙鍒嗛挓锛夊唴鏈闂郴缁燂紝绯荤粺娓呴櫎缂撳瓨淇℃伅锛屼娇鍏堕噸鏂扮櫥褰曠郴缁�
ssoCacheSizeInit: 10 #sso缂撳瓨鍒濆瀹归噺
ssoCacheSizeMax: 10000 #sso缂撳瓨鏈�澶у閲忥紝鍗虫敮鎸乻soCacheSizeMax涓敤鎴峰悓鏃剁櫥褰�
nginx:
webPort: 8000
sso:
- checkUrl: http://127.0.0.1:12344/sso/sso/ssoCheck
+ checkUrl: http://127.0.0.1:12344/sso/sso/ssoPowerCheck
+ curUserUrl: http://127.0.0.1:12344/sso/sso/ssoCurUser
webPort: 12344
idSuffix: 1
base:
@@ -61,13 +86,21 @@
platform:
webPort: 12346
idSuffix: 3
- product:
+ production:
webPort: 12347
idSuffix: 4
other:
webPort: 12348
idSuffix: 5
-
+ station:
+ webPort: 12349
+ idSuffix: 6
+ report:
+ webPort: 12350
+ idSuffix: 7
+ wechat:
+ webPort: 12351
+ idSuffix: 8
file:
idSuffix: 99
file1:
@@ -97,114 +130,116 @@
#web鍒嗗竷寮忔枃浠剁郴缁�
dy:
+ webFileAbsolutePath: ${pmsGl.webFileAbsolutePath}
photoZipWidth: 400 #缂╃暐鍥惧昂瀵�
webFile:
fmUrl: http://127.0.0.1:${pms.other.webPort}/other # fm鐨剋eb涓婁笅鏂� URL
+ supportedFileTypes: docx,xlsx,doc,xls,pdf #鏀寔鐨勬枃妗ｏ紙闈炲獟浣撴枃浠讹紝濡傜収鐗囥�佸綍闊炽�佸綍鍍忥級鏂囦欢绫诲瀷
sv1:
id: dyFile1
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pmsGl.webFileAbsolutePath}
relativePath: webFile1
hashStart: 0
hashEnd: 5461
- restUrl: http://127.0.0.1:${pms.file1.webPort}/file #file鏄笂涓嬫枃
- webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/ #nginx鏈嶅姟璺緞
- webDownloadUrl: http://127.0.0.1:${pms.file1.webPort}/file/download/down
+ restUrl: http://127.0.0.1:${pms.file1.webPort}/file #file鏄笂涓嬫枃,ip涓哄眬鍩熺綉ip鎴栨湰鍦癐P
+ webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+ webDownloadPath: http://127.0.0.1:${pms.file1.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
sv2:
id: dyFile2
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pmsGl.webFileAbsolutePath}
relativePath: webFile2
hashStart: 5462
hashEnd: 10923
restUrl: http://127.0.0.1:${pms.file2.webPort}/file
webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
- webDownloadUrl: http://127.0.0.1:${pms.file2.webPort}/file/download/down
+ webDownloadPath: http://127.0.0.1:${pms.file2.webPort}/file/download/down?id=
sv3:
id: dyFile3
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pmsGl.webFileAbsolutePath}
relativePath: webFile3
hashStart: 10924
hashEnd: 16385
restUrl: http://127.0.0.1:${pms.file3.webPort}/file
webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
- webDownloadUrl: http://127.0.0.1:${pms.file3.webPort}/file/download/down
+ webDownloadPath: http://127.0.0.1:${pms.file3.webPort}/file/download/down?id=
sv4:
id: dyFile4
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pmsGl.webFileAbsolutePath}
relativePath: webFile4
hashStart: 16386
hashEnd: 21847
restUrl: http://127.0.0.1:${pms.file4.webPort}/file
webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
- webDownloadUrl: http://127.0.0.1:${pms.file4.webPort}/file/download/down
+ webDownloadPath: http://127.0.0.1:${pms.file4.webPort}/file/download/down?id=
sv5:
id: dyFile5
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pmsGl.webFileAbsolutePath}
relativePath: webFile5
hashStart: 21848
hashEnd: 27309
restUrl: http://127.0.0.1:${pms.file5.webPort}/file
webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
- webDownloadUrl: http://127.0.0.1:${pms.file5.webPort}/file/download/down
+ webDownloadPath: http://127.0.0.1:${pms.file5.webPort}/file/download/down?id=
sv6:
id: dyFile6
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pmsGl.webFileAbsolutePath}
relativePath: webFile6
hashStart: 27310
hashEnd: 32767
restUrl: http://127.0.0.1:${pms.file6.webPort}/file
webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
- webDownloadUrl: http://127.0.0.1:${pms.file6.webPort}/file/download/down
+ webDownloadPath: http://127.0.0.1:${pms.file6.webPort}/file/download/down?id=
sv7:
id: dyFile7
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pmsGl.webFileAbsolutePath}
relativePath: webFile7
hashStart: 32768
hashEnd: 38229
restUrl: http://127.0.0.1:${pms.file7.webPort}/file
webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
- webDownloadUrl: http://127.0.0.1:${pms.file7.webPort}/file/download/down
+ webDownloadPath: http://127.0.0.1:${pms.file7.webPort}/file/download/down?id=
sv8:
id: dyFile8
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pmsGl.webFileAbsolutePath}
relativePath: webFile8
hashStart: 38230
hashEnd: 43691
restUrl: http://127.0.0.1:${pms.file8.webPort}/file
webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
- webDownloadUrl: http://127.0.0.1:${pms.file8.webPort}/file/download/down
+ webDownloadPath: http://127.0.0.1:${pms.file8.webPort}/file/download/down?id=
sv9:
id: dyFile9
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pmsGl.webFileAbsolutePath}
relativePath: webFile9
hashStart: 43692
hashEnd: 49153
restUrl: http://127.0.0.1:${pms.file9.webPort}/file
webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
- webDownloadUrl: http://127.0.0.1:${pms.file9.webPort}/file/download/down
+ webDownloadPath: http://127.0.0.1:${pms.file9.webPort}/file/download/down?id=
sv10:
id: dyFile10
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pmsGl.webFileAbsolutePath}
relativePath: webFile10
hashStart: 49154
hashEnd: 54615
restUrl: http://127.0.0.1:${pms.file10.webPort}/file
webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
- webDownloadUrl: http://127.0.0.1:${pms.file10.webPort}/file/download/down
+ webDownloadPath: http://127.0.0.1:${pms.file10.webPort}/file/download/down?id=
sv11:
id: dyFile11
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pmsGl.webFileAbsolutePath}
relativePath: webFile11
hashStart: 54616
hashEnd: 60077
restUrl: http://127.0.0.1:${pms.file11.webPort}/file
webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
- webDownloadUrl: http://127.0.0.1:${pms.file11.webPort}/file/download/down
+ webDownloadPath: http://127.0.0.1:${pms.file11.webPort}/file/download/down?id=
sv12:
id: dyFile12
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pmsGl.webFileAbsolutePath}
relativePath: webFile12
hashStart: 60078
hashEnd: 65535
restUrl: http://127.0.0.1:${pms.file12.webPort}/file
webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
- webDownloadUrl: http://127.0.0.1:${pms.file12.webPort}/file/download/down
+ webDownloadPath: http://127.0.0.1:${pms.file12.webPort}/file/download/down?id=
--
Gitblit v1.8.0