From 8c6026959d3006bbf9dce3f3c9311e70a02b80c1 Mon Sep 17 00:00:00 2001 From: 935090232@qq.com <ak473600000> Date: Thu, 24 Feb 2022 23:29:18 +0800 Subject: [PATCH] Merge branch 'developer' --- zq-erp/src/main/resources/config/application.properties | 131 ++++++++++++++++++++++++++++--------------- 1 files changed, 86 insertions(+), 45 deletions(-) diff --git a/zq-erp/src/main/resources/config/application.properties b/zq-erp/src/main/resources/config/application.properties index ee23831..955cd26 100644 --- a/zq-erp/src/main/resources/config/application.properties +++ b/zq-erp/src/main/resources/config/application.properties @@ -1,35 +1,7 @@ + +spring.profiles.active=local evn=dev 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.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=xc_shop -#spring.datasource.password=xc_shop123!@# -#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 - - -#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/db_meidu_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8 - - -#spring.datasource.username=root -#spring.datasource.password=root -#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/md_test_local?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 @@ -47,28 +19,14 @@ spring.thymeleaf.prefix: classpath:/templates/views/ spring.thymeleaf.cache=false #设置全局时间返回格式 第三行设置为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=47.111.134.136 -#rabbitmq.port=5672 -#rabbitmq.username=hivequeue -#rabbitmq.password=hivequeueadmin -useRabbit=false -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 @@ -89,3 +47,86 @@ mybatis-plus.global-config.db-config.id-type=auto mybatis-plus.config-location=classpath:mybatis/mybatis-config.xml mybatis-plus.mapper-locations=classpath*:mybatis/mapper/**/*.xml + + +#是否启用debug模式 +debug=true +# 日志文件保存地址 +log_path=/Users/jiangyouyao/logs/zqerp + +# 系统语言环境 zh中文，us英文 +system_language=zh + +# 错误密码允许输入的次数，大于五次后账号锁定,0表示不锁账号 +error_password_times=5 +# 默认密码 +default_password=123 + + + + + +wechar_login_url =https://api.weixin.qq.com/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code + +xcx_manager_appid=wx2948b3b914a9722e +xcx_manager_secret=1685dfd99a43e213ed8be07870b898ba + +#公众号 +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/ + + + +#是否启用异常上报 +is_open_exception_report=false +showExcptionUrl=http://test.hive.jyymatrix.cc/showException + + + + + + + + + + -- Gitblit v1.9.1