From 4351e71d782741143a98f86f6648acd16689165f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 27 May 2022 19:48:02 +0800
Subject: [PATCH] Merge branch 'developer' into hive2.0
---
zq-erp/src/main/resources/config/application-alpha.properties | 45 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 36 insertions(+), 9 deletions(-)
diff --git a/zq-erp/src/main/resources/config/application-alpha.properties b/zq-erp/src/main/resources/config/application-alpha.properties
index 9ebe364..89d9d11 100644
--- a/zq-erp/src/main/resources/config/application-alpha.properties
+++ b/zq-erp/src/main/resources/config/application-alpha.properties
@@ -3,9 +3,9 @@
#线上测试环境
-spring.datasource.username=ct_test
-spring.datasource.password=123456
-spring.datasource.url=jdbc:mysql://120.27.238.55:3306/hive_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
+spring.datasource.username=db_alpha
+spring.datasource.password=Alpha!qaz@wsx
+spring.datasource.url=jdbc:mysql://124.70.222.34/db_alpha?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
@@ -37,10 +37,11 @@
#rabbitMQ配置
-rabbitmq.host=120.27.238.55
+rabbitmq.host=47.111.134.136
rabbitmq.port=5672
-rabbitmq.username=ct_rabbit
-rabbitmq.password=123456
+rabbitmq.username=hivequeue
+rabbitmq.password=hivequeueadmin
+useRabbit=true
server.session.timeout=120
@@ -61,7 +62,7 @@
#是否启用debug模式
debug=false
# 日志文件保存地址
-log_path=/home/javaweb/hive/log
+log_path=/mnt/hive/log
# 系统语言环境 zh中文，us英文
system_language=zh
@@ -72,9 +73,9 @@
default_password=123
#nginx静态资源访问地址
-static_resource_url=http://120.27.238.55:8000/hive/static/uploadeFile/
+static_resource_url=https://hive.file.csxuncong.com/uploadeFile/alpha/
#文件保存地址
-file_storage_path=/home/javaweb/webresource/hive/static/uploadeFile/
+file_storage_path=/mnt/hive/static/uploadeFile/alpha/
#文件上传大小字节为单位 10MB
maxUploadSize=10485760
@@ -119,6 +120,8 @@
wechar_login_url =https://api.weixin.qq.com/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code
xcx_appid =wx3836ab3c1490ff29
xcx_secret =39a3687ec5b2666ed68e7c8b83b26b47
+xcx_manager_appid=wx0d5655a6443807d3
+xcx_manager_secret=b04e675224437c4f17c3068b6c2377b6
#微信支付调试开关
wx_pay_debug_onoff = false
@@ -165,3 +168,27 @@
gzh_appid=wx57e6335559bdbda6
gzh_secret=ecb408af170e3890e6544290cad33760
+
+
+
+#百度编辑器，覆盖默认配置
+ueditor.imageUrlPrefix=https://hive.file.csxuncong.com/uploadeFile/alpha
+ueditor.imagePathFormat=/image/{yyyy}{mm}{dd}/{time}{rand:6}
+
+ueditor.scrawlPathFormat=/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}
+ueditor.scrawlUrlPrefix=https://hive.file.csxuncong.com/uploadeFile/alpha
+
+ueditor.snapscreenPathFormat=/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}
+ueditor.snapscreenUrlPrefix=https://hive.file.csxuncong.com/uploadeFile/alpha
+
+ueditor.catcherPathFormat=/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}
+ueditor.catcherUrlPrefix=https://hive.file.csxuncong.com/uploadeFile/alpha
+
+ueditor.videoPathFormat=/ueditor/jsp/upload/video/{yyyy}{mm}{dd}/{time}{rand:6}
+ueditor.videoUrlPrefix=http://127.0.0.1:1088/uploadeFile/
+
+ueditor.filePathFormat=/ueditor/jsp/upload/file/{yyyy}{mm}{dd}/{time}{rand:6}
+ueditor.fileUrlPrefix=http://127.0.0.1:1088/uploadeFile/
+
+ueditor.imageManagerListPath=http://127.0.0.1:1088/uploadeFile/
+ueditor.fileManagerListPath=http://127.0.0.1:1088/uploadeFile/
\ No newline at end of file
--
Gitblit v1.9.1