From 49fac1c7329140f0b9c6799a7483675e54001a73 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sun, 11 Jul 2021 11:57:33 +0800
Subject: [PATCH] 配置优化
---
zq-erp/src/main/resources/application-xcshop.yml | 26 +++++
/dev/null | 107 ---------------------
zq-erp/src/main/resources/application-mdprd.yml | 26 +++++
zq-erp/src/main/resources/application-test.yml | 27 +++++
zq-erp/src/main/resources/application-dev.yml | 8
zq-erp/src/main/java/com/matrix/system/common/init/InitWebContainer.java | 3
zq-erp/src/main/resources/application.yml | 29 +++++
zq-erp/src/main/resources/application-prd.yml | 27 +++++
8 files changed, 137 insertions(+), 116 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/common/init/InitWebContainer.java b/zq-erp/src/main/java/com/matrix/system/common/init/InitWebContainer.java
index 9f5acfc..0d06c03 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/init/InitWebContainer.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/init/InitWebContainer.java
@@ -68,10 +68,9 @@
//初始化公司
initParams();
LogUtil.info("\r\n\r\n**********************************************\r\n"
- + "* =========== Matrix启动成功 ===========\r\n"
+ + "* =========== Matrix启动成功 ===========\r\n"
+ "* DEBUG模式:" + debug+"*\r\n"
+ "* 语言环境:" + Locale.getDefault().getLanguage()+"\r\n"
-
+ "**********************************************\r\n");
}
diff --git a/zq-erp/src/main/resources/application-dev.yml b/zq-erp/src/main/resources/application-dev.yml
index e48fa91..2d99deb 100644
--- a/zq-erp/src/main/resources/application-dev.yml
+++ b/zq-erp/src/main/resources/application-dev.yml
@@ -2,7 +2,8 @@
debug: true
#环境标识
evn: dev
-
+server:
+ port: 8080
#数据库
spring:
datasource:
@@ -18,8 +19,7 @@
swagger:
enable: true
-#mq 队列开关
-useRabbit: false
+
#微信支付调试开关
wx_pay_debug_onoff: false
@@ -33,7 +33,7 @@
signName: 肽妍
#异常快捷链接
-showExcptionUrl: http://test.hive.jyymatrix.cc/showException
+showExcptionUrl: http://localhost:8080/showException
#日志文件地址
log_path: D:/zqerp/log
diff --git a/zq-erp/src/main/resources/application-mdprd.yml b/zq-erp/src/main/resources/application-mdprd.yml
new file mode 100644
index 0000000..a1045c4
--- /dev/null
+++ b/zq-erp/src/main/resources/application-mdprd.yml
@@ -0,0 +1,26 @@
+#调试模式
+debug: false
+#环境标识
+evn: mdprd
+server:
+ port: 8080
+#数据库
+spring:
+ datasource:
+ url: jdbc:mysql://47.111.134.136/db_meidu_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
+ username: meidu_data
+ password: meidu_4321#&@
+#文件上传配置
+static_resource_url: http://resource.mydoline.com/uploadFile/
+file_storage_path: /mnt/static/uploadeFile/
+#异常快捷链接
+showExcptionUrl: http://hive.mydoline.com/showException
+#日志文件地址
+log_path: /mnt/md-hive/log
+
+#sagger文档
+swagger:
+ enable: false
+
+
+
diff --git a/zq-erp/src/main/resources/application-prd.yml b/zq-erp/src/main/resources/application-prd.yml
new file mode 100644
index 0000000..1a45bf2
--- /dev/null
+++ b/zq-erp/src/main/resources/application-prd.yml
@@ -0,0 +1,27 @@
+#调试模式
+debug: false
+#环境标识
+evn: prd
+server:
+ port: 8080
+#数据库
+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
+ username: hive
+ password: hive123!@#
+#文件上传配置
+static_resource_url: https://filehive2.jyymatrix.cc/uploadeFile/
+file_storage_path: /mnt/hive/static/uploadeFile/
+#异常快捷链接
+showExcptionUrl: http://erp.hive.jyymatrix.cc/showException
+#日志文件地址
+log_path: /mnt/hive/log
+
+
+#sagger文档
+swagger:
+ enable: false
+
+
+
diff --git a/zq-erp/src/main/resources/application-test.yml b/zq-erp/src/main/resources/application-test.yml
new file mode 100644
index 0000000..8864209
--- /dev/null
+++ b/zq-erp/src/main/resources/application-test.yml
@@ -0,0 +1,27 @@
+#调试模式
+debug: false
+#环境标识
+evn: test
+server:
+ port: 8080
+#数据库
+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://testfile.hive.jyymatrix.cc/
+file_storage_path: /mnt/upload/
+#异常快捷链接
+showExcptionUrl: http://test.hive.jyymatrix.cc/showException
+#日志文件地址
+log_path: /mnt/hive/log-test
+
+
+#sagger文档
+swagger:
+ enable: true
+
+
+
diff --git a/zq-erp/src/main/resources/application-xcshop.yml b/zq-erp/src/main/resources/application-xcshop.yml
new file mode 100644
index 0000000..f104a04
--- /dev/null
+++ b/zq-erp/src/main/resources/application-xcshop.yml
@@ -0,0 +1,26 @@
+#调试模式
+debug: false
+#环境标识
+evn: xcshop
+server:
+ port: 8080
+#数据库
+spring:
+ datasource:
+ url: jdbc:mysql://124.70.222.34/xc_shop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
+ username: xc_shop
+ password: xc_shop123!@#
+#文件上传配置
+static_resource_url: http://xcshop.csxuncong.com/uploadfile/
+file_storage_path: /mnt/xcshop/uploadfile/
+#异常快捷链接
+showExcptionUrl: http://xcshop.csxuncong.com/showException
+#日志文件地址
+log_path: /mnt/xcshop/log
+
+#sagger文档
+swagger:
+ enable: false
+
+
+
diff --git a/zq-erp/src/main/resources/application.yml b/zq-erp/src/main/resources/application.yml
index 6ae02e0..77871da 100644
--- a/zq-erp/src/main/resources/application.yml
+++ b/zq-erp/src/main/resources/application.yml
@@ -1,4 +1,6 @@
-
+# Tomcat
+server:
+ port: 8080
spring:
application:
# 应用名称
@@ -27,7 +29,12 @@
thymeleaf:
cache: false
prefix: classpath:/templates/views/
-
+logging:
+ level:
+ org:
+ springframework:
+ boot:
+ autoconfigure: ERROR
#swagger接口文档配置
swagger:
enable: true
@@ -84,8 +91,24 @@
login_accountNe: N4617160
login_password: J7FAoehPkv63e3
login_passwordNe: rb1cxLitRB83e0
- request_url: http://smssh1.253.com
+ request_url: http://smssh1.253.com、
+#快递鸟物流接口
+logistics:
+ appKey: f1cf9777-26fb-4e3f-a14d-896075e6384e
+ eBusinessID: 1530881
+ requestType: 1002
+ url: http://api.kdniao.com/Ebusiness/EbusinessOrderHandle.aspx
+
+#微信支付调试开关
+wx_pay_debug_onoff: false
+#阿里云短信配置
+ali:
+ sms:
+ accessKeyId: LTAI4FrjY9R9iDfC6YQTHfne
+ accessKeySecret: eSvQslpHpDSGlI9Hxm4y5MynNgLbCp
+ regionId: cn-hangzhou
+ signName: 肽妍
#公共业务参数配置
qrcodeBackgroundImgPath: /mnt/xcshop/webresource/static/xcxresource/bj1.png
diff --git a/zq-erp/src/main/resources/config/dev/application.properties b/zq-erp/src/main/resources/config/dev/application.properties
deleted file mode 100644
index f25f95d..0000000
--- a/zq-erp/src/main/resources/config/dev/application.properties
+++ /dev/null
@@ -1,50 +0,0 @@
-evn=dev
-server.port=808
-spring.datasource.username=root
-spring.datasource.password=123
-spring.datasource.url=jdbc:mysql://127.0.0.1:3306/zq_erp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
-spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
-spring.datasource.initialSize=3
-spring.datasource.minIdle=3
-spring.datasource.maxActive=20
-spring.datasource.maxWait=60000
-spring.datasource.timeBetweenEvictionRunsMillis=60000
-spring.datasource.minEvictableIdleTimeMillis=300000
-spring.datasource.validationQuery=SELECT 1 FROM DUAL
-spring.datasource.testWhileIdle=true
-spring.datasource.testOnBorrow=true
-spring.datasource.testOnReturn=true
-spring.datasource.filters=stat,wall,log4j
-spring.datasource.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
-spring.thymeleaf.prefix: classpath:/templates/views/
-spring.thymeleaf.cache=false
-mybatis.config-location=classpath:mybatis/mybatis-config.xml
-mybatis.mapper-locations=classpath*:mybatis/mapper/*/*.xml
-#设置全局时间返回格式 第三行设置为true表示返回时间戳
-#spring.jackson.date-format=yyyy-MM-dd
-#spring.jackson.time-zone=GMT+8
-#spring.jackson.serialization.write-dates-as-timestamps=true
-#文件上传时的大小限制 单位M
-spring.servlet.multipart.max-file-size=30MB
-spring.servlet.multipart.max-request-size=30MB
-#--------------------------------------
-
-#异步任务框架
-useAsync=false
-#开启清理长期未处理任务
-async.useExceptionHandler=true
-
-
-#rabbitMQ配置
-rabbitmq.host=47.111.134.136
-rabbitmq.port=15672
-rabbitmq.username=hivequeue
-rabbitmq.password=hivequeueadmin
-useRabbit=false
-#指定消费者确认方式 当为manual时手动确认 不配置表示自动确认
-#spring.rabbitmq.listener.simple.acknowledge-mode=manual
-
-server.session.timeout=120
-#定时任务
-scheduling.enabled=true
-swagger.enable=false
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/config/dev/config.json b/zq-erp/src/main/resources/config/dev/config.json
deleted file mode 100644
index 1b5f059..0000000
--- a/zq-erp/src/main/resources/config/dev/config.json
+++ /dev/null
@@ -1,94 +0,0 @@
-/* 前后端通信相关的配置,注释只允许使用多行方式 */
-{
- /* 上传图片配置项 */
- "imageActionName": "uploadimage", /* 执行上传图片的action名称 */
- "imageFieldName": "upfile", /* 提交的图片表单名称 */
- "imageMaxSize": 2048000, /* 上传大小限制，单位B */
- "imageAllowFiles": [".png", ".jpg", ".jpeg", ".gif", ".bmp"], /* 上传图片格式显示 */
- "imageCompressEnable": true, /* 是否压缩图片,默认是true */
- "imageCompressBorder": 1600, /* 图片压缩最长边限制 */
- "imageInsertAlign": "none", /* 插入的图片浮动方式 */
- "imageUrlPrefix": "http://resource.hive.jyymatrix.cc/uploadeFile", /* 图片访问路径前缀 */
- "imagePathFormat": "/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
- /* {filename} 会替换成原文件名,配置这项需要注意中文乱码问题 */
- /* {rand:6} 会替换成随机数,后面的数字是随机数的位数 */
- /* {time} 会替换成时间戳 */
- /* {yyyy} 会替换成四位年份 */
- /* {yy} 会替换成两位年份 */
- /* {mm} 会替换成两位月份 */
- /* {dd} 会替换成两位日期 */
- /* {hh} 会替换成两位小时 */
- /* {ii} 会替换成两位分钟 */
- /* {ss} 会替换成两位秒 */
- /* 非法字符 \ : * ? " < > | */
- /* 具请体看线上文档: fex.baidu.com/ueditor/#use-format_upload_filename */
-
- /* 涂鸦图片上传配置项 */
- "scrawlActionName": "uploadscrawl", /* 执行上传涂鸦的action名称 */
- "scrawlFieldName": "upfile", /* 提交的图片表单名称 */
- "scrawlPathFormat": "/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
- "scrawlMaxSize": 2048000, /* 上传大小限制，单位B */
- "scrawlUrlPrefix": "http://resource.hive.jyymatrix.cc/uploadeFile", /* 图片访问路径前缀 */
- "scrawlInsertAlign": "none",
-
- /* 截图工具上传 */
- "snapscreenActionName": "uploadimage", /* 执行上传截图的action名称 */
- "snapscreenPathFormat": "/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
- "snapscreenUrlPrefix": "http://resource.hive.jyymatrix.cc/uploadeFile", /* 图片访问路径前缀 */
- "snapscreenInsertAlign": "none", /* 插入的图片浮动方式 */
-
- /* 抓取远程图片配置 */
- "catcherLocalDomain": ["127.0.0.1", "localhost", "img.baidu.com"],
- "catcherActionName": "catchimage", /* 执行抓取远程图片的action名称 */
- "catcherFieldName": "source", /* 提交的图片列表表单名称 */
- "catcherPathFormat": "/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
- "catcherUrlPrefix": "http://resource.hive.jyymatrix.cc/uploadeFile", /* 图片访问路径前缀 */
- "catcherMaxSize": 2048000, /* 上传大小限制，单位B */
- "catcherAllowFiles": [".png", ".jpg", ".jpeg", ".gif", ".bmp"], /* 抓取图片格式显示 */
-
- /* 上传视频配置 */
- "videoActionName": "uploadvideo", /* 执行上传视频的action名称 */
- "videoFieldName": "upfile", /* 提交的视频表单名称 */
- "videoPathFormat": "/ueditor/jsp/upload/video/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
- "videoUrlPrefix": "http://127.0.0.1:1088/uploadeFile/", /* 视频访问路径前缀 */
- "videoMaxSize": 102400000, /* 上传大小限制，单位B，默认100MB */
- "videoAllowFiles": [
- ".flv", ".swf", ".mkv", ".avi", ".rm", ".rmvb", ".mpeg", ".mpg",
- ".ogg", ".ogv", ".mov", ".wmv", ".mp4", ".webm", ".mp3", ".wav", ".mid"], /* 上传视频格式显示 */
-
- /* 上传文件配置 */
- "fileActionName": "uploadfile", /* controller里,执行上传视频的action名称 */
- "fileFieldName": "upfile", /* 提交的文件表单名称 */
- "filePathFormat": "/ueditor/jsp/upload/file/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
- "fileUrlPrefix": "http://127.0.0.1:1088/uploadeFile/", /* 文件访问路径前缀 */
- "fileMaxSize": 51200000, /* 上传大小限制，单位B，默认50MB */
- "fileAllowFiles": [
- ".png", ".jpg", ".jpeg", ".gif", ".bmp",
- ".flv", ".swf", ".mkv", ".avi", ".rm", ".rmvb", ".mpeg", ".mpg",
- ".ogg", ".ogv", ".mov", ".wmv", ".mp4", ".webm", ".mp3", ".wav", ".mid",
- ".rar", ".zip", ".tar", ".gz", ".7z", ".bz2", ".cab", ".iso",
- ".doc", ".docx", ".xls", ".xlsx", ".ppt", ".pptx", ".pdf", ".txt", ".md", ".xml"
- ], /* 上传文件格式显示 */
-
- /* 列出指定目录下的图片 */
- "imageManagerActionName": "listimage", /* 执行图片管理的action名称 */
- "imageManagerListPath": "http://127.0.0.1:1088/uploadeFile/", /* 指定要列出图片的目录 */
- "imageManagerListSize": 20, /* 每次列出文件数量 */
- "imageManagerUrlPrefix": "", /* 图片访问路径前缀 */
- "imageManagerInsertAlign": "none", /* 插入的图片浮动方式 */
- "imageManagerAllowFiles": [".png", ".jpg", ".jpeg", ".gif", ".bmp"], /* 列出的文件类型 */
-
- /* 列出指定目录下的文件 */
- "fileManagerActionName": "listfile", /* 执行文件管理的action名称 */
- "fileManagerListPath": "http://127.0.0.1:1088/uploadeFile/", /* 指定要列出文件的目录 */
- "fileManagerUrlPrefix": "", /* 文件访问路径前缀 */
- "fileManagerListSize": 20, /* 每次列出文件数量 */
- "fileManagerAllowFiles": [
- ".png", ".jpg", ".jpeg", ".gif", ".bmp",
- ".flv", ".swf", ".mkv", ".avi", ".rm", ".rmvb", ".mpeg", ".mpg",
- ".ogg", ".ogv", ".mov", ".wmv", ".mp4", ".webm", ".mp3", ".wav", ".mid",
- ".rar", ".zip", ".tar", ".gz", ".7z", ".bz2", ".cab", ".iso",
- ".doc", ".docx", ".xls", ".xlsx", ".ppt", ".pptx", ".pdf", ".txt", ".md", ".xml"
- ] /* 列出的文件类型 */
-
-}
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/config/dev/system.properties b/zq-erp/src/main/resources/config/dev/system.properties
deleted file mode 100644
index 088c4a6..0000000
--- a/zq-erp/src/main/resources/config/dev/system.properties
+++ /dev/null
@@ -1,104 +0,0 @@
-#是否启用debug模式
-debug=true
-# 日志文件保存地址
-log_path=/Users/jiangyouyao/logs/zqerp
-
-# 系统语言环境 zh中文，us英文
-system_language=zh
-
-# 错误密码允许输入的次数，大于五次后账号锁定,0表示不锁账号
-error_password_times=5
-# 默认密码
-default_password=123
-
-#nginx静态资源访问地址
-static_resource_url=https://filehive2.jyymatrix.cc/uploadeFile/
-#文件保存地址
-file_storage_path=/mnt/hive/static/uploadeFile/
-#文件上传大小字节为单位 10MB
-maxUploadSize=10485760
-
-#Matser\u7684ip\u5730\u5740
-redis.hostname=120.27.238.55
-#\u7AEF\u53E3\u53F7
-redis.port=6379
-#\u5982\u679C\u6709\u5BC6\u7801
-redis.password=xcong123
-#\u5BA2\u6237\u7AEF\u8D85\u65F6\u65F6\u95F4\u5355\u4F4D\u662F\u6BEB\u79D2 \u9ED8\u8BA4\u662F2000
-redis.timeout=10000
-redis.database=7
-redis_time_out=1800000
-cookie_time_out=36000
-
-#APP登录公钥
-login_public_key=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCWvK6UWCtSp/8qnTqyUfO0wbg4CuxOe7IeiDSAmATfHnWqBPnbZ73qQ4A90vGowB7mp5XnmBvgTwfXtDh08yd4btlHwSD3ShbRyGfGfV8lc47ZTLiJH0xuuN2iHfnfj8zQ5kcqijeotggo2rF8Uu7KSR3HxVyN9mO22C6p1r5wVQIDAQAB
-#APP登录秘钥
-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==
-
-#是否启用异常上报
-is_open_exception_report=true
-showExcptionUrl=http://erp.hive.jyymatrix.cc/showException
-
-#异常上报地址
-exception_center_url =http://geek.xc.jyymatrix.cc/addException
-#项目编号
-projNo=78
-#项目负责人
-owner=姜友瑶
-
-#日志文件清理阈值 单位：MB
-log_max=20
-#日志清理天数
-log_clear_day=5
-
-
-
-
-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
-
-#公众号
-gzh_appid=wx57e6335559bdbda6
-gzh_secret=ecb408af170e3890e6544290cad33760
-
-
-
-#微信支付调试开关
-wx_pay_debug_onoff = false
-
-#快递鸟用户id
-logistics.eBusinessID=1530881
-#快递鸟密钥
-logistics.appKey=f1cf9777-26fb-4e3f-a14d-896075e6384e
-#快递鸟接口地址
-logistics.url=http://api.kdniao.com/Ebusiness/EbusinessOrderHandle.aspx
-#快递鸟接口指令
-logistics.requestType=1002
-
-
-
-
-#发送短信配置
-crm.request_url = http://192.168.1.248
-sms.request_url = http://smssh1.253.com
-sms.login_account = M7315130
-sms.login_password = J7FAoehPkv63e3
-sms.login_accountNe = N4617160
-sms.login_passwordNe = rb1cxLitRB83e0
-
-#接入统一登录平台配置
-platform_app_code = wx_shop
-platform_secret_key = b21e309f07964e4fae5b156d74b5d66z
-#platform_verity_url = http://localhost:8080/platform/getUserInfo
-platform_verity_url = http://stg1-xcerp-ca.xc.jyymatrix.cc/platform/getUserInfo
-
-#微信支付回调地址
-pay_notify_url = https://xcxhive2.jyymatrix.cc/wxCommon/wxpayCallback
-
-qrcodeBackgroundImgPath=/mnt/xcshop/webresource/static/xcxresource/bj1.png
-qrcodeFrontImgPath=/mnt/xcshop/webresource/static/xcxresource/qj2.png
-
-#hive仓库地址
-hive.service=http://localhost:8082/meidu-crm/
-
diff --git a/zq-erp/src/main/resources/config/lhx/application.properties b/zq-erp/src/main/resources/config/lhx/application.properties
deleted file mode 100644
index 44b584e..0000000
--- a/zq-erp/src/main/resources/config/lhx/application.properties
+++ /dev/null
@@ -1,59 +0,0 @@
-evn=lhx
-server.port=8080
-
-
-#线上测试环境
-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.type=com.alibaba.druid.pool.DruidDataSource
-spring.datasource.initialSize=3
-spring.datasource.minIdle=3
-spring.datasource.maxActive=20
-spring.datasource.maxWait=60000
-spring.datasource.timeBetweenEvictionRunsMillis=60000
-spring.datasource.minEvictableIdleTimeMillis=300000
-spring.datasource.validationQuery=SELECT 1 FROM DUAL
-spring.datasource.testWhileIdle=true
-spring.datasource.testOnBorrow=true
-spring.datasource.testOnReturn=true
-spring.datasource.filters=stat,wall,log4j
-spring.datasource.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
-spring.thymeleaf.prefix: classpath:/templates/views/
-spring.thymeleaf.cache=false
-mybatis.config-location=classpath:mybatis/mybatis-config.xml
-mybatis.mapper-locations=classpath*:mybatis/mapper/*/*.xml
-#设置全局时间返回格式 第三行设置为true表示返回时间戳
-#spring.jackson.date-format=yyyy-MM-dd
-#spring.jackson.time-zone=GMT+8
-#spring.jackson.serialization.write-dates-as-timestamps=true
-#文件上传时的大小限制 单位M
-spring.servlet.multipart.max-file-size=100MB
-spring.servlet.multipart.max-request-size=100MB
-#--------------------------------------
-
-
-#rabbitMQ配置
-rabbitmq.host=120.27.238.55
-rabbitmq.port=5672
-rabbitmq.username=ct_rabbit
-rabbitmq.password=123456
-
-server.session.timeout=120
-
-ali.sms.accessKeyId=LTAI4FrjY9R9iDfC6YQTHfne
-ali.sms.accessKeySecret=eSvQslpHpDSGlI9Hxm4y5MynNgLbCp
-ali.sms.regionId=cn-hangzhou
-ali.sms.signName=\u80bd\u598d
-
-#hour
-activities.groupBuy.limit=24
-#minute
-groupBuy.pay.timeLimit=30
-#定时任务
-scheduling.enabled=true
-
-swagger.enable=true
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/config/lhx/config.json b/zq-erp/src/main/resources/config/lhx/config.json
deleted file mode 100644
index 1b5f059..0000000
--- a/zq-erp/src/main/resources/config/lhx/config.json
+++ /dev/null
@@ -1,94 +0,0 @@
-/* 前后端通信相关的配置,注释只允许使用多行方式 */
-{
- /* 上传图片配置项 */
- "imageActionName": "uploadimage", /* 执行上传图片的action名称 */
- "imageFieldName": "upfile", /* 提交的图片表单名称 */
- "imageMaxSize": 2048000, /* 上传大小限制，单位B */
- "imageAllowFiles": [".png", ".jpg", ".jpeg", ".gif", ".bmp"], /* 上传图片格式显示 */
- "imageCompressEnable": true, /* 是否压缩图片,默认是true */
- "imageCompressBorder": 1600, /* 图片压缩最长边限制 */
- "imageInsertAlign": "none", /* 插入的图片浮动方式 */
- "imageUrlPrefix": "http://resource.hive.jyymatrix.cc/uploadeFile", /* 图片访问路径前缀 */
- "imagePathFormat": "/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
- /* {filename} 会替换成原文件名,配置这项需要注意中文乱码问题 */
- /* {rand:6} 会替换成随机数,后面的数字是随机数的位数 */
- /* {time} 会替换成时间戳 */
- /* {yyyy} 会替换成四位年份 */
- /* {yy} 会替换成两位年份 */
- /* {mm} 会替换成两位月份 */
- /* {dd} 会替换成两位日期 */
- /* {hh} 会替换成两位小时 */
- /* {ii} 会替换成两位分钟 */
- /* {ss} 会替换成两位秒 */
- /* 非法字符 \ : * ? " < > | */
- /* 具请体看线上文档: fex.baidu.com/ueditor/#use-format_upload_filename */
-
- /* 涂鸦图片上传配置项 */
- "scrawlActionName": "uploadscrawl", /* 执行上传涂鸦的action名称 */
- "scrawlFieldName": "upfile", /* 提交的图片表单名称 */
- "scrawlPathFormat": "/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
- "scrawlMaxSize": 2048000, /* 上传大小限制，单位B */
- "scrawlUrlPrefix": "http://resource.hive.jyymatrix.cc/uploadeFile", /* 图片访问路径前缀 */
- "scrawlInsertAlign": "none",
-
- /* 截图工具上传 */
- "snapscreenActionName": "uploadimage", /* 执行上传截图的action名称 */
- "snapscreenPathFormat": "/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
- "snapscreenUrlPrefix": "http://resource.hive.jyymatrix.cc/uploadeFile", /* 图片访问路径前缀 */
- "snapscreenInsertAlign": "none", /* 插入的图片浮动方式 */
-
- /* 抓取远程图片配置 */
- "catcherLocalDomain": ["127.0.0.1", "localhost", "img.baidu.com"],
- "catcherActionName": "catchimage", /* 执行抓取远程图片的action名称 */
- "catcherFieldName": "source", /* 提交的图片列表表单名称 */
- "catcherPathFormat": "/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
- "catcherUrlPrefix": "http://resource.hive.jyymatrix.cc/uploadeFile", /* 图片访问路径前缀 */
- "catcherMaxSize": 2048000, /* 上传大小限制，单位B */
- "catcherAllowFiles": [".png", ".jpg", ".jpeg", ".gif", ".bmp"], /* 抓取图片格式显示 */
-
- /* 上传视频配置 */
- "videoActionName": "uploadvideo", /* 执行上传视频的action名称 */
- "videoFieldName": "upfile", /* 提交的视频表单名称 */
- "videoPathFormat": "/ueditor/jsp/upload/video/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
- "videoUrlPrefix": "http://127.0.0.1:1088/uploadeFile/", /* 视频访问路径前缀 */
- "videoMaxSize": 102400000, /* 上传大小限制，单位B，默认100MB */
- "videoAllowFiles": [
- ".flv", ".swf", ".mkv", ".avi", ".rm", ".rmvb", ".mpeg", ".mpg",
- ".ogg", ".ogv", ".mov", ".wmv", ".mp4", ".webm", ".mp3", ".wav", ".mid"], /* 上传视频格式显示 */
-
- /* 上传文件配置 */
- "fileActionName": "uploadfile", /* controller里,执行上传视频的action名称 */
- "fileFieldName": "upfile", /* 提交的文件表单名称 */
- "filePathFormat": "/ueditor/jsp/upload/file/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
- "fileUrlPrefix": "http://127.0.0.1:1088/uploadeFile/", /* 文件访问路径前缀 */
- "fileMaxSize": 51200000, /* 上传大小限制，单位B，默认50MB */
- "fileAllowFiles": [
- ".png", ".jpg", ".jpeg", ".gif", ".bmp",
- ".flv", ".swf", ".mkv", ".avi", ".rm", ".rmvb", ".mpeg", ".mpg",
- ".ogg", ".ogv", ".mov", ".wmv", ".mp4", ".webm", ".mp3", ".wav", ".mid",
- ".rar", ".zip", ".tar", ".gz", ".7z", ".bz2", ".cab", ".iso",
- ".doc", ".docx", ".xls", ".xlsx", ".ppt", ".pptx", ".pdf", ".txt", ".md", ".xml"
- ], /* 上传文件格式显示 */
-
- /* 列出指定目录下的图片 */
- "imageManagerActionName": "listimage", /* 执行图片管理的action名称 */
- "imageManagerListPath": "http://127.0.0.1:1088/uploadeFile/", /* 指定要列出图片的目录 */
- "imageManagerListSize": 20, /* 每次列出文件数量 */
- "imageManagerUrlPrefix": "", /* 图片访问路径前缀 */
- "imageManagerInsertAlign": "none", /* 插入的图片浮动方式 */
- "imageManagerAllowFiles": [".png", ".jpg", ".jpeg", ".gif", ".bmp"], /* 列出的文件类型 */
-
- /* 列出指定目录下的文件 */
- "fileManagerActionName": "listfile", /* 执行文件管理的action名称 */
- "fileManagerListPath": "http://127.0.0.1:1088/uploadeFile/", /* 指定要列出文件的目录 */
- "fileManagerUrlPrefix": "", /* 文件访问路径前缀 */
- "fileManagerListSize": 20, /* 每次列出文件数量 */
- "fileManagerAllowFiles": [
- ".png", ".jpg", ".jpeg", ".gif", ".bmp",
- ".flv", ".swf", ".mkv", ".avi", ".rm", ".rmvb", ".mpeg", ".mpg",
- ".ogg", ".ogv", ".mov", ".wmv", ".mp4", ".webm", ".mp3", ".wav", ".mid",
- ".rar", ".zip", ".tar", ".gz", ".7z", ".bz2", ".cab", ".iso",
- ".doc", ".docx", ".xls", ".xlsx", ".ppt", ".pptx", ".pdf", ".txt", ".md", ".xml"
- ] /* 列出的文件类型 */
-
-}
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/config/lhx/system.properties b/zq-erp/src/main/resources/config/lhx/system.properties
deleted file mode 100644
index d51c554..0000000
--- a/zq-erp/src/main/resources/config/lhx/system.properties
+++ /dev/null
@@ -1,107 +0,0 @@
-#是否启用debug模式
-debug=false
-# 日志文件保存地址
-log_path=/home/javaweb/hive/log
-
-# 系统语言环境 zh中文，us英文
-system_language=zh
-
-# 错误密码允许输入的次数，大于五次后账号锁定,0表示不锁账号
-error_password_times=5
-# 默认密码
-default_password=123
-
-#nginx静态资源访问地址
-static_resource_url=http://120.27.238.55:8000/hive/static/uploadeFile/
-#文件保存地址
-file_storage_path=/home/javaweb/webresource/hive/static/uploadeFile/
-#文件上传大小字节为单位 10MB
-maxUploadSize=10485760
-
-#Matser\u7684ip\u5730\u5740
-redis.hostname=120.27.238.55
-#\u7AEF\u53E3\u53F7
-redis.port=6379
-#\u5982\u679C\u6709\u5BC6\u7801
-redis.password=xcong123
-#\u5BA2\u6237\u7AEF\u8D85\u65F6\u65F6\u95F4\u5355\u4F4D\u662F\u6BEB\u79D2 \u9ED8\u8BA4\u662F2000
-redis.timeout=10000
-redis.database=2
-redis_time_out=1800000
-
-
-cookie_time_out=36000
-
-#APP登录公钥
-login_public_key=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCWvK6UWCtSp/8qnTqyUfO0wbg4CuxOe7IeiDSAmATfHnWqBPnbZ73qQ4A90vGowB7mp5XnmBvgTwfXtDh08yd4btlHwSD3ShbRyGfGfV8lc47ZTLiJH0xuuN2iHfnfj8zQ5kcqijeotggo2rF8Uu7KSR3HxVyN9mO22C6p1r5wVQIDAQAB
-#APP登录秘钥
-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==
-
-#是否启用异常上报
-is_open_exception_report=true
-showExcptionUrl=http://erp.hive.jyymatrix.cc/showException
-
-#异常上报地址
-exception_center_url =http://geek.xc.jyymatrix.cc/addException
-#项目编号
-projNo=78
-#项目负责人
-owner=姜友瑶
-
-#日志文件清理阈值 单位：MB
-log_max=20
-#日志清理天数
-log_clear_day=5
-
-
-
-
-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
-
-#微信支付调试开关
-wx_pay_debug_onoff = false
-
-#快递鸟用户id
-logistics.eBusinessID=1530881
-#快递鸟密钥
-logistics.appKey=f1cf9777-26fb-4e3f-a14d-896075e6384e
-#快递鸟接口地址
-logistics.url=http://api.kdniao.com/Ebusiness/EbusinessOrderHandle.aspx
-#快递鸟接口指令
-logistics.requestType=1002
-
-#丰桥顾客编码
-sf.logistics.clientCode=XCZHYF
-#丰桥校验码
-sf.logistics.checkword=zqcjA2A5m6MIGa6mImMcnpKQ9ipYlbUW
-#丰桥接口地址
-sf.logistics.url=https://bsp-oisp.sf-express.com/bsp-oisp/sfexpressService
-
-#发送短信配置
-crm.request_url = http://192.168.1.248
-sms.request_url = http://smssh1.253.com
-sms.login_account = M7315130
-sms.login_password = J7FAoehPkv63e3
-sms.login_accountNe = N4617160
-sms.login_passwordNe = rb1cxLitRB83e0
-
-#接入统一登录平台配置
-platform_app_code = wx_shop
-platform_secret_key = b21e309f07964e4fae5b156d74b5d66z
-#platform_verity_url = http://localhost:8080/platform/getUserInfo
-platform_verity_url = http://stg1-xcerp-ca.xc.jyymatrix.cc/platform/getUserInfo
-
-#微信支付回调地址
-pay_notify_url = https://xcxhive2.jyymatrix.cc/wxCommon/wxpayCallback
-
-
-qrcodeBackgroundImgPath=/mnt/xcshop/webresource/static/xcxresource/bj1.png
-qrcodeFrontImgPath=/mnt/xcshop/webresource/static/xcxresource/qj2.png
-
-#hive仓库地址
-hive.service=http://erp.hive.jyymatrix.cc/meidu-crm/
-
-gzh_appid=wx57e6335559bdbda6
-gzh_secret=ecb408af170e3890e6544290cad33760
--
Gitblit v1.9.1