From 53d586646ab1222f0cb7f0313000d1829c889eba Mon Sep 17 00:00:00 2001
From: shichongfu <shi_chongfu@163.com>
Date: 星期六, 20 五月 2023 12:00:13 +0800
Subject: [PATCH] Merge branch 'master' of http://nonxin.cn:8090/r/product/product-server-web/V2.0.0

---
 src/main/resources/application-dev.properties |   16 +++++-----------
 1 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties
index 0fe9f34..de1a8ea 100644
--- a/src/main/resources/application-dev.properties
+++ b/src/main/resources/application-dev.properties
@@ -74,15 +74,7 @@
 data.source.type=mysql
 data.source.driver=com.mysql.jdbc.Driver
 #################local###############################
-#data.source.url=jdbc:mysql://222.209.31.230:9092/ch_kt_mes_apply?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_v2.0.0?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai
-#data.source.url=jdbc:mysql://192.168.0.200:3306/product_db_v2.0.0?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai
-#data.source.url=jdbc:mysql://localhost:3306/product_db_test?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai
-#data.source.url=jdbc:mysql://192.168.0.200:3306/product_db_xn2?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?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai
-#data.source.url=jdbc:mysql://222.209.31.230:9092/product_db_v2.0.0?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai
-#data.source.url=jdbc:mysql://64.145.32.26:3306/product_db_picc?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai
-#data.source.url=jdbc:mysql://222.209.52.59:9092/lx_product_db-dev?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.user=root
 data.source.password=root123
 ##################local###############################
@@ -154,10 +146,12 @@
 # \u53D1\u9001\u90AE\u4EF6\u914D\u7F6E
 spring.mail.host=smtp.qq.com
 spring.mail.port=465
-spring.mail.username=1582208867@qq.com
-spring.mail.password=ygngntoqodmziebb
+spring.mail.username=929633676@qq.com
+spring.mail.password=longxin665348
 #\u521B\u5EFA\u8D26\u53F7\u521D\u59CB\u5BC6\u7801
 initial.pwd=123456
+#\u91CD\u7F6E\u5BC6\u7801\u7684\u65B9\u5F0F(mail=\u5BC6\u7801\u53D1\u9001\u5230\u90AE\u4EF6,default=\u4E0D\u53D1\u9001\u90AE\u4EF6\uFF0C\u9ED8\u8BA4\u521D\u59CB\u5BC6\u7801)
+resetpwd.model=default
 #\u91CD\u7F6E\u5BC6\u7801url
 #\u7BA1\u7406\u5458\u8DF3\u8F6C\u5730\u5740
 resetpwd.lxurl=http://192.168.0.200:3000/#/reset-password

--
Gitblit v1.9.2