From 14a894812d6a0559579e4e32fd3b2900705ff6a9 Mon Sep 17 00:00:00 2001 From: 6c <420680616@qq.com> Date: 星期五, 20 三月 2026 17:21:13 +0800 Subject: [PATCH] Merge branch 'saas' of http://nonxin.cn:8090/r/product/product-server-web/V2.0.0 into saas --- src/main/resources/application-dev.properties | 24 +++++++++--------------- 1 files changed, 9 insertions(+), 15 deletions(-) diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 764fc1b..a749842 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -1,8 +1,8 @@ #======================================# #=============\u7CFB\u7EDF\u53C2\u6570 \u76F8\u5173\u914D\u7F6E==============# #======================================# -#\u5E73\u53F0\u7C7B\u578B device\u3001lift\u3001OA\u3001sei -system.platform.type=lift +#\u5E73\u53F0\u7C7B\u578B device\u3001lift\u3001oa\u3001project +system.platform.type=oa #\u542F\u7528\u65E5\u5FD7\u6253\u5370 logger.isEnable=true #\u65E5\u5FD7\u6253\u5370\u6307\u5B9A\u63A5\u53E3\uFF0C*\u8868\u793A\u5168\u90E8\u6253\u5370\uFF0C\u7A7A\u8868\u793A\u5168\u90E8\u4E0D\u6253\u5370\uFF0C\u6307\u5B9A\u591A\u4E2A\u63A5\u53E3\u9017\u53F7\u5206\u9694 @@ -14,7 +14,7 @@ #\u662F\u5426\u542F\u7528\u63A5\u53E3\u7B7E\u540D\u8BA4\u8BC1 signature.isEnable=true #\u5728\u542F\u7528\u63A5\u53E3\u7B7E\u540D\u8BA4\u8BC1\u65F6\uFF0C\u6392\u9664\u6307\u5B9A\u63A5\u53E3\u65E0\u9700\u7B7E\u540D\u8BA4\u8BC1 -signature.exclude.path=/api/fileManager/upgrade-download/v1,/api/mobile/app/version-check/v1,/api/mobile/app/version-check/v2,/api/mobile/system/table/list-meta/v1,/api/rsa/getKey/v1,/api/token/refresh/v1,/api/mobile/network/check/v1,/api/system/config/info/v1,/static/**,/api/system-user/avatar/v1/*,/api/office/save-office/v1,/download-mobile-apk/v1 +signature.exclude.path=/api/fileManager/upgrade-download/v1,/api/mobile/app/version-check/v1,/api/mobile/app/version-check/v2,/api/mobile/system/table/list-meta/v1,/api/rsa/getKey/v1,/api/token/refresh/v1,/api/mobile/network/check/v1,/api/system/config/info/v1,/static/**,/api/system-user/avatar/v1/*,/api/office/save-office/v1,/download-mobile-apk/v1,/api/login-auth/sms/code/v1,/api/login-auth/mail/code/v1,/api/login-auth/reset-password-by-phone/v1,/api/login-auth/reset-password-by-mail/v1,/api/administrative-division/get-region-by-parent/v1,/api/tenant-apply/valid-tenant-info/v1,/api/tenant-apply/get-tenant-apply/v1,/api/tenant-apply/save-tenant-apply/v1 #\u7B7E\u540D\u8BA4\u8BC1Key signature.key=299cb5bb4c9040a29c58304c25001d72 #\u63A5\u53E3\u7B7E\u540D\u8BA4\u8BC1\u6709\u6548\u671F\uFF0C\u5355\u4F4D\u79D2,0\u8868\u793A\u4E0D\u9A8C\u8BC1 @@ -25,7 +25,7 @@ #\u63A5\u53E3token\u8FC7\u671F\uFF0C\u5237\u65B0token\u7684\u63A5\u53E3\u4F7F\u7528\u7684Token\u8FC7\u671F\u65F6\u95F4 refresh.token.expiration=12 #token\u9A8C\u8BC1\u3001\u767B\u5F55\u9A8C\u8BC1\uFF0C\u6392\u9664URL,\u9017\u53F7\u5206\u9694 -token.exclude.path=/api/fileManager/upgrade-download/v1,/api/mobile/app/version-check/v2,/api/mobile/app/version-check/v1,/api/mobile/system/table/list-meta/v1,/api/token/refresh/v1,/login,/login/v1,/api/personalcenter/send-updatePwdEmail/v1,/api/language/login-language/v1,/api/lable_internationalization/list_lable_internation/v1,/api/lable_internationalization/list-label-internation-web/v1,/api/personalcenter/check-token/v1,/api/rsa/getKey/v1,/api/mobile/network/check/v1,/api/system/config/info/v1,/api/fileManager/get-static-file,/static/**,/download-mobile-apk/v1 +token.exclude.path=/api/fileManager/upgrade-download/v1,/api/mobile/app/version-check/v2,/api/mobile/app/version-check/v1,/api/mobile/system/table/list-meta/v1,/api/token/refresh/v1,/login,/login/v1,/api/personalcenter/send-updatePwdEmail/v1,/api/language/login-language/v1,/api/lable_internationalization/list_lable_internation/v1,/api/lable_internationalization/list-label-internation-web/v1,/api/personalcenter/check-token/v1,/api/rsa/getKey/v1,/api/mobile/network/check/v1,/api/system/config/info/v1,/api/fileManager/get-static-file,/static/**,/download-mobile-apk/v1,/api/login-auth/sms/code/v1,/api/login-auth/mail/code/v1,,/api/login-auth/reset-password-by-phone/v1,/api/login-auth/reset-password-by-mail/v1,/api/administrative-division/get-region-by-parent/v1,/api/tenant-apply/valid-tenant-info/v1,/api/tenant-apply/get-tenant-apply/v1,/api/tenant-apply/save-tenant-apply/v1 #\u662F\u5426\u542F\u7528\u6570\u636E\u64CD\u4F5C\u6743\u9650\u9A8C\u8BC1! data.handle.valid.isEnable=false #\u662F\u5426\u542F\u7528\u529F\u80FD\u6743\u9650\u9A8C\u8BC1 @@ -74,14 +74,7 @@ data.source.type=mysql data.source.driver=com.mysql.jdbc.Driver #################local############################### -#data.source.url=jdbc:mysql://192.168.0.200:3308/product_db_xn_20240422?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai -#data.source.url=jdbc:mysql://192.168.0.200:3308/product_db_v3.0.0?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai -#data.source.url=jdbc:mysql://192.168.0.200:3308/product_db_lift_v2?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai -data.source.url=jdbc:mysql://127.0.0.1:3306/product_db_xn?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true -#\u4E1C\u8FC5 -#data.source.url=jdbc:mysql://127.0.0.1:3306/product_db_v3.0.1?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true -#data.source.url=jdbc:mysql://222.209.28.149:3005/product_db_lift_v2?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai -#data.source.url=jdbc:mysql://222.209.28.149:3005/product_db_v3.0.0?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai +data.source.url=jdbc:mysql://192.168.0.200:3310/product_db_saas?allowPublicKeyRetrieval=true&autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai data.source.user=root data.source.password=root123 ##################local############################### @@ -183,10 +176,11 @@ message.server.ip=127.0.0.1 #\u6D88\u606F\u670D\u52A1\u5668\u7AEF\u53E3 message.server.port=9998 -#\u6587\u4EF6\u4E0A\u4F20 +#\u6587\u4EF6\u4E0A\u4F20 MRC\u4E13\u7528 source_domain=https://www.baidu.com default_domain=https://lx.blob.core.windows.net -allowed_file_type=doc,docx,xls,xlsx,ppt,pptx,jpg,png,bmp,csv,pdf,txt,dat,wps,wpt,et,eet,p12,jpeg,apk +#\u5141\u8BB8\u4E0A\u4F20\u7684\u6587\u4EF6\u7C7B\u578B +allowed_file_type=doc,docx,xls,xlsx,ppt,pptx,jpg,png,bmp,csv,pdf,txt,dat,wps,wpt,et,eet,p12,jpeg,apk,pm4,app # \u662F\u5426\u9700\u8981\u4E0A\u4F20\u5230\u6587\u4EF6\u670D\u52A1\u5668 upload.server=false # \u662F\u5426\u9700\u8981\u6587\u4EF6\u52A0\u5BC6 @@ -319,5 +313,5 @@ mobile.apk.version=3.0.0 #\u79FB\u52A8\u5173app\u5347\u7EA7\u7684\u5730\u5740\uFF0C\u5982\u679C\u672C\u670D\u52A1\u5668\uFF0C\u914D127.0.0.1 \u6216 localhost\u6CA1\u6709\u914D\u7F6E\uFF0C\u5219\u4F7F\u7528\u672C\u5730www.nonxin.cn:9998 app.upgrade.url=127.0.0.1 - +allow.get.paths=/api/fileManager/upgrade-download/v1,/api/fileManager/get-file-content/v1,/api/mobile/app/version-check/v2,/download-mobile-apk/v1,/api/system-user/avatar/v1,/static/avatar/organization.png,/ws/asset -- Gitblit v1.9.2