From 3a0d64f3e937695e00e1c91b508892c6272f7603 Mon Sep 17 00:00:00 2001 From: 杜洪波 <1074825718@qq.com> Date: 星期五, 01 八月 2025 18:05:04 +0800 Subject: [PATCH] Merge branch 'dev' of http://nonxin.cn:8090/r/product/product-server-web/V2.0.0 into dev --- src/main/resources/application-dev.properties | 6 +++--- src/main/resources/application-prod.properties | 2 ++ src/main/resources/systemBackup.properties | 29 +++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 764fc1b..06f0340 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -77,9 +77,9 @@ #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 +#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://127.0.0.1:3306/product_db_v3.0.0?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.user=root @@ -319,5 +319,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 diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties index 3218424..815ec17 100644 --- a/src/main/resources/application-prod.properties +++ b/src/main/resources/application-prod.properties @@ -282,3 +282,5 @@ web.server.url= #\u662F\u5426\u542F\u7528\u5F3A\u5236\u9A8C\u8BC1\u767B\u5F55APP\u7684mac mobile.mac.valid.isEnable=false + +allow.get.paths=/api/fileManager/upgrade-download/v1,/api/fileManager/get-file-content/v1,/api/mobile/app/version-check/v2 \ No newline at end of file diff --git a/src/main/resources/systemBackup.properties b/src/main/resources/systemBackup.properties new file mode 100644 index 0000000..030f581 --- /dev/null +++ b/src/main/resources/systemBackup.properties @@ -0,0 +1,29 @@ +# \u6253\u5305\u6587\u4EF6\u5B58\u653E\u76EE\u5F55\u548C\u6587\u4EF6\u5168\u8DEF\u5F84 +ZIPFILE_ROOT=D:/product-server/backup/ +#ZIPFILE_BACKUP=D:\\product-server\\backup\\20250424154400.zip + +# \u6570\u636E\u5E93\u6587\u4EF6\u5B58\u653E\u76EE\u5F55\u548C\u6587\u4EF6\u5168\u8DEF\u5F84 +DATABASE_ROOT=D:/product-server/backup/database +#DATABASE_BACKUP=D:\\product-server\\backup\\database\\20250424154400.sql + +# \u6587\u6863\u6587\u4EF6\u5B58\u653E\u76EE\u5F55\u548C\u6587\u4EF6\u5168\u8DEF\u5F84 +DOCUMENT_ROOT=D:/product-server/backup/document +#DOCUMENT_BACKUP=D:\\product-server\\backup\\document\\20250424 + +# \u5907\u4EFD\u6570\u636E\u5E93\u8FDE\u63A5\u914D\u7F6E +DATABASE_HOST=127.0.0.1 +DATABASE_PORT=3307 +DATABASE_NAME=product_db_v3.0.0 +DATABASE_USER=root +DATABASE_PWD=123456 +DATABASE_PATH= + +# \u5907\u4EFD\u670D\u52A1\u5668SFTP\u670D\u52A1\u5668\u914D\u7F6E +UPLOAD_SFTP_SYSTEM=windows +UPLOAD_SFTP_HOST=192.168.0.200 +UPLOAD_SFTP_PORT=22 +UPLOAD_SFTP_USER=administrator +UPLOAD_SFTP_PWD=huangNiChong395201 + +# \u5907\u4EFD\u670D\u52A1\u5668\u7684\u5907\u4EFD\u76EE\u5F55 +UPLOAD_BACKUP_DIR=/D:/product-server/backup/ \ No newline at end of file -- Gitblit v1.9.2