From 39a5520c112081aff9f55ad13c1b4b53e4136a87 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 19 Oct 2022 15:05:43 +0800
Subject: [PATCH] Merge branch 'score_shop'
---
zq-erp/src/main/resources/config/application-taiyan.properties | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/zq-erp/src/main/resources/config/application-taiyan.properties b/zq-erp/src/main/resources/config/application-taiyan.properties
index 0993ed6..aa2144e 100644
--- a/zq-erp/src/main/resources/config/application-taiyan.properties
+++ b/zq-erp/src/main/resources/config/application-taiyan.properties
@@ -1,7 +1,7 @@
#数据库链接
-spring.datasource.username=hive
-spring.datasource.password=hive123!@#
-spring.datasource.url=jdbc:mysql://124.70.222.34/hive_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
+spring.datasource.username=meidu_data
+spring.datasource.password=meidu_4321#&@
+spring.datasource.url=jdbc:mysql://47.111.134.136/hive_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
#是否启用debug模式
@@ -46,17 +46,17 @@
#百度编辑器，覆盖默认配置
-ueditor.imageUrlPrefix=http://resource.hive.jyymatrix.cc/uploadeFile
+ueditor.imageUrlPrefix=http://filehive2.jyymatrix.cc/uploadeFile
ueditor.imagePathFormat=/image/{yyyy}{mm}{dd}/{time}{rand:6}
ueditor.scrawlPathFormat=/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}
-ueditor.scrawlUrlPrefix=http://resource.hive.jyymatrix.cc/uploadeFile
+ueditor.scrawlUrlPrefix=http://filehive2.jyymatrix.cc/uploadeFile
ueditor.snapscreenPathFormat=/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}
-ueditor.snapscreenUrlPrefix=http://resource.hive.jyymatrix.cc/uploadeFile
+ueditor.snapscreenUrlPrefix=http://filehive2.jyymatrix.cc/uploadeFile
ueditor.catcherPathFormat=/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}
-ueditor.catcherUrlPrefix=http://resource.hive.jyymatrix.cc/uploadeFile
+ueditor.catcherUrlPrefix=http://filehive2.jyymatrix.cc/uploadeFile
ueditor.videoPathFormat=/ueditor/jsp/upload/video/{yyyy}{mm}{dd}/{time}{rand:6}
ueditor.videoUrlPrefix=http://127.0.0.1:1088/uploadeFile/
--
Gitblit v1.9.1