From f612f136d6e5e1fd0303c37a7a001e87056d1c72 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sun, 11 Jul 2021 11:27:56 +0800
Subject: [PATCH] 配置优化
---
zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java | 6 --
zq-erp/src/main/resources/application-dev.yml | 16 +++++++
zq-erp/src/main/resources/application.yml | 86 ++++++++++++++++++++++--------------------
3 files changed, 61 insertions(+), 47 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java b/zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java
index 08f9c22..b0495fc 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java
@@ -110,11 +110,7 @@
public static final String SAFEPATH = "/su";
public static final String TOKEN_KEY = "token";
- /**
- * 保存在cookie 中的token
- */
- public static final String USER_TOKEN_COOKIE = "token";
- public static final String COOKIE_TIME_OUT = "cookie_time_out";
+
/**
* nginx访问地址
*/
diff --git a/zq-erp/src/main/resources/application-dev.yml b/zq-erp/src/main/resources/application-dev.yml
index 383c270..e48fa91 100644
--- a/zq-erp/src/main/resources/application-dev.yml
+++ b/zq-erp/src/main/resources/application-dev.yml
@@ -1,18 +1,30 @@
+#调试模式
debug: true
+#环境标识
evn: dev
+#数据库
spring:
datasource:
url: jdbc:mysql://120.27.238.55:3306/hive_test_meidu?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
username: ct_test
password: 123456
+#文件上传配置
static_resource_url: http://localhost:1088/
+file_storage_path: D:\test\
+
+#sagger文档
swagger:
enable: true
+
+#mq 队列开关
useRabbit: false
+
+#微信支付调试开关
wx_pay_debug_onoff: false
+#阿里云短信配置
ali:
sms:
accessKeyId: LTAI4FrjY9R9iDfC6YQTHfne
@@ -20,6 +32,8 @@
regionId: cn-hangzhou
signName: 肽妍
+#异常快捷链接
showExcptionUrl: http://test.hive.jyymatrix.cc/showException
-log_path: /Users/jiangyouyao/logs/zqerp
+#日志文件地址
+log_path: D:/zqerp/log
diff --git a/zq-erp/src/main/resources/application.yml b/zq-erp/src/main/resources/application.yml
index c12c86d..6ae02e0 100644
--- a/zq-erp/src/main/resources/application.yml
+++ b/zq-erp/src/main/resources/application.yml
@@ -4,7 +4,7 @@
# 应用名称
name: zqerp
profiles:
- # 环境配置
+ # 环境配置，默认dev
active: dev
datasource:
connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
@@ -28,77 +28,81 @@
cache: false
prefix: classpath:/templates/views/
+#swagger接口文档配置
swagger:
+ enable: true
security:
password: admin
username: admin
+
+# 系统语言环境设置
system_language: zh
-activities:
- groupBuy:
- limit: 24
-
-
-cookie_time_out: 36000
-
-
-default:
- vip:
- photo:
- man: https://filehive2.jyymatrix.cc/uploadeFile/20210125/3642f1d827c44c76832fea106c85e0f89e089c16cbcc4dd0a82bb52b9ac700f4.png
- woman: https://filehive2.jyymatrix.cc/uploadeFile/20210125/db53552e688040afb286686f081e1e68f3fe946f75624598828f01898635152e.png
-default_password: 123
-error_password_times: 5
-
-file_storage_path: D:\test\
-groupBuy:
- pay:
- timeLimit: 30
-
-
+# 是否开启钉钉上报异常通知
is_open_exception_report: false
-log_clear_day: 5
-log_max: 20
+# 登录秘钥
login_private_key: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAJa8rpRYK1Kn/yqdOrJR87TBuDgK7E57sh6INICYBN8edaoE+dtnvepDgD3S8ajAHuanleeYG+BPB9e0OHTzJ3hu2UfBIPdKFtHIZ8Z9XyVzjtlMuIkfTG643aId+d+PzNDmRyqKN6i2CCjasXxS7spJHcfFXI32Y7bYLqnWvnBVAgMBAAECgYBNzQFGq+NgfDllo1WCaG4jI8GTm3+wWoPq4l5G6S/KgYw1vu+/YOJTIZf1UQVOFitc3a6vpIDu25uup+Rj6IS8B4V8NDfc8P+iMNwdIKqqBj8wHu0/SaxYdW1uqlU5+XkJMxsNMgNRRGPSIQhla5OPHtBzIa7t4lmypETMZtXEmQJBAMsa1OIQzAKU05GweCnNNSoqo/nAQLqp8zfbJypxRx24uaCyS7C+KxN+O4FyaYmM9n0X+cgkr+RYHAIa7mg3gccCQQC9/nJvRBum8+4TINnz6QrvTmTlhi8QKW/CiRYpGgmo5PtQYw4BkRQbYO8ktFDM2yeO75XBv09qnGQaivDCeL0DAkEAisFg8LSy+4x7YcvivAQirxUEg2qRjjTvIZjKEBflkuuRfbRxO2Uf/qg9tPjaGwu/lcScc9yEggaj09hcSbyqHwJAN8QLiqUPCL3oTy0BTBpG316/Nq9f+Ppwl0TtgDroQu6S5VFttwACStb02m0imj5pKgcgibHBeaVVrITDjhEqSQJAaCHD/ytTzgtgLoVVyZZxOB272W7PI3mnzL8qQSldx1/QOBs1NmmEZuo7ELFMrfTmlxa1qR4gsq/ImfIdUdXewQ==
login_public_key: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCWvK6UWCtSp/8qnTqyUfO0wbg4CuxOe7IeiDSAmATfHnWqBPnbZ73qQ4A90vGowB7mp5XnmBvgTwfXtDh08yd4btlHwSD3ShbRyGfGfV8lc47ZTLiJH0xuuN2iHfnfj8zQ5kcqijeotggo2rF8Uu7KSR3HxVyN9mO22C6p1r5wVQIDAQAB
-logistics:
- appKey: f1cf9777-26fb-4e3f-a14d-896075e6384e
- eBusinessID: 1530881
- requestType: 1002
- url: http://api.kdniao.com/Ebusiness/EbusinessOrderHandle.aspx
-maxUploadSize: 10485760
+#重置默认密码
+default_password: 123
+#最大登录错误锁定次数
+error_password_times: 5
+
+
+# mybatis-plus 插件配置
mybatis-plus:
+ mapper-locations: classpath*:mybatis/mapper/**/*.xml
config-location: classpath:mybatis/mybatis-config.xml
global-config:
db-config:
id-type: auto
- mapper-locations: classpath*:mybatis/mapper/**/*.xml
-pay_notify_url: https://xcxhive2.jyymatrix.cc/wxCommon/wxpayCallback
-platform_app_code: wx_shop
-platform_secret_key: b21e309f07964e4fae5b156d74b5d66z
-platform_verity_url: http://stg1-xcerp-ca.xc.jyymatrix.cc/platform/getUserInfo
-qrcodeBackgroundImgPath: /mnt/xcshop/webresource/static/xcxresource/bj1.png
-qrcodeFrontImgPath: /mnt/xcshop/webresource/static/xcxresource/qj2.png
+
+# 消息队列配置
rabbitmq:
host: 47.111.134.136
password: hivequeueadmin
port: 5672
username: hivequeue
+
+# redis 缓存配置
redis:
database: 2
hostname: 120.27.238.55
password: xcong123
port: 6379
timeOut: 10000
-redis_time_out: 1800000
+
+
+#定时任务开关
scheduling:
enabled: true
-
+# 云之讯短信配置
sms:
login_account: M7315130
login_accountNe: N4617160
login_password: J7FAoehPkv63e3
login_passwordNe: rb1cxLitRB83e0
- request_url: http://smssh1.253.com
\ No newline at end of file
+ request_url: http://smssh1.253.com
+
+
+#公共业务参数配置
+qrcodeBackgroundImgPath: /mnt/xcshop/webresource/static/xcxresource/bj1.png
+qrcodeFrontImgPath: /mnt/xcshop/webresource/static/xcxresource/qj2.png
+
+
+#默认vip头像
+default:
+ vip:
+ photo:
+ man: https://filehive2.jyymatrix.cc/uploadeFile/20210125/3642f1d827c44c76832fea106c85e0f89e089c16cbcc4dd0a82bb52b9ac700f4.png
+ woman: https://filehive2.jyymatrix.cc/uploadeFile/20210125/db53552e688040afb286686f081e1e68f3fe946f75624598828f01898635152e.png
+
+#拼团参数设置
+groupBuy:
+ pay:
+ timeLimit: 30
+activities:
+ groupBuy:
+ limit: 24
\ No newline at end of file
--
Gitblit v1.9.1