From 358f63797dc919fffa51b10f9f6c12d9b4cffe15 Mon Sep 17 00:00:00 2001
From: shicf <shi_chongfu@163.com>
Date: 星期五, 20 三月 2026 09:32:59 +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 | 13 +++----------
pom.xml | 9 ++++-----
2 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/pom.xml b/pom.xml
index f2b61b4..45b78ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,11 +46,6 @@
<groupId>com.lx</groupId>
<artifactId>product-server-hr</artifactId>
</dependency>
- <!--璁惧绠＄悊-->
- <dependency>
- <groupId>com.lx</groupId>
- <artifactId>product-server-device</artifactId>
- </dependency>
<!--閫氱敤妯″潡锛坲til)-->
<dependency>
<groupId>com.lx</groupId>
@@ -183,6 +178,10 @@
<groupId>com.lx</groupId>
<artifactId>product-server-integration</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.lx</groupId>
+ <artifactId>product-server-saas</artifactId>
+ </dependency>
<dependency>
<groupId>org.spring</groupId>
<artifactId>spring-server-master</artifactId>
diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties
index d2b98d5..a749842 100644
--- a/src/main/resources/application-dev.properties
+++ b/src/main/resources/application-dev.properties
@@ -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:3310/product_db_v3.0.0?allowPublicKeyRetrieval=true&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-device-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_wh_formal?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.0?allowPublicKeyRetrieval=true&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.52.226: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###############################
--
Gitblit v1.9.2