jyy
2021-07-11 49fac1c7329140f0b9c6799a7483675e54001a73
配置优化
4 files added
6 files deleted
3 files modified
654 ■■■■ changed files
zq-erp/src/main/java/com/matrix/system/common/init/InitWebContainer.java 3 ●●●● patch | view | raw | blame | history
zq-erp/src/main/resources/application-dev.yml 8 ●●●● patch | view | raw | blame | history
zq-erp/src/main/resources/application-mdprd.yml 26 ●●●●● patch | view | raw | blame | history
zq-erp/src/main/resources/application-prd.yml 27 ●●●●● patch | view | raw | blame | history
zq-erp/src/main/resources/application-test.yml 27 ●●●●● patch | view | raw | blame | history
zq-erp/src/main/resources/application-xcshop.yml 26 ●●●●● patch | view | raw | blame | history
zq-erp/src/main/resources/application.yml 29 ●●●● patch | view | raw | blame | history
zq-erp/src/main/resources/config/dev/application.properties 50 ●●●●● patch | view | raw | blame | history
zq-erp/src/main/resources/config/dev/config.json 94 ●●●●● patch | view | raw | blame | history
zq-erp/src/main/resources/config/dev/system.properties 104 ●●●●● patch | view | raw | blame | history
zq-erp/src/main/resources/config/lhx/application.properties 59 ●●●●● patch | view | raw | blame | history
zq-erp/src/main/resources/config/lhx/config.json 94 ●●●●● patch | view | raw | blame | history
zq-erp/src/main/resources/config/lhx/system.properties 107 ●●●●● patch | view | raw | blame | history
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");
    }
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
zq-erp/src/main/resources/application-mdprd.yml
New file
@@ -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
zq-erp/src/main/resources/application-prd.yml
New file
@@ -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
zq-erp/src/main/resources/application-test.yml
New file
@@ -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
zq-erp/src/main/resources/application-xcshop.yml
New file
@@ -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
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
zq-erp/src/main/resources/config/dev/application.properties
File was deleted
zq-erp/src/main/resources/config/dev/config.json
File was deleted
zq-erp/src/main/resources/config/dev/system.properties
File was deleted
zq-erp/src/main/resources/config/lhx/application.properties
File was deleted
zq-erp/src/main/resources/config/lhx/config.json
File was deleted
zq-erp/src/main/resources/config/lhx/system.properties
File was deleted