From 3a8e1524dcf0eeb610d38123d5f0a3ef838379cd Mon Sep 17 00:00:00 2001
From: linzhijie <19970921lzj>
Date: 星期一, 12 四月 2021 15:44:53 +0800
Subject: [PATCH] Merge branch '20210406-maqv2' into 20210412-youhua
---
src/main/resources/application-sand.yml | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/application-sand.yml b/src/main/resources/application-sand.yml
index 1592d84..1bc0760 100644
--- a/src/main/resources/application-sand.yml
+++ b/src/main/resources/application-sand.yml
@@ -26,7 +26,7 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
- url: jdbc:mysql://120.24.39.179:3306/ots-sand?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://127.0.0.1:3306/ots-sand?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: TAI@2019#Zjun
# 浠庡簱鏁版嵁婧�
@@ -85,4 +85,8 @@
# 杩滅▼娉板浗璁＄畻鏈嶅姟
ATSTai:
host: 127.0.0.1
- port: 9123
\ No newline at end of file
+ port: 9123
+jasypt:
+ encryptor:
+ password: 5ciqxnka5s02w9qu
+ algorithm: PBEWithMD5AndDES
\ No newline at end of file
--
Gitblit v1.9.1