From ff17cee3be7d429104233d4bb172867eb4f701b3 Mon Sep 17 00:00:00 2001 From: 935090232@qq.com <ak473600000> Date: Sun, 17 Jan 2021 19:56:33 +0800 Subject: [PATCH] 消息提醒 --- zq-erp/src/main/resources/config/xcx/system.properties | 47 +++++++++++------------ zq-erp/src/main/resources/config/test/application.properties | 2 zq-erp/src/main/resources/config/xcx/application.properties | 40 ++++++++++++------- 3 files changed, 48 insertions(+), 41 deletions(-) diff --git a/zq-erp/src/main/resources/config/test/application.properties b/zq-erp/src/main/resources/config/test/application.properties index b5a6726..38b0e1e 100644 --- a/zq-erp/src/main/resources/config/test/application.properties +++ b/zq-erp/src/main/resources/config/test/application.properties @@ -1,4 +1,4 @@ -evn=tyytest +evn=test server.port=8080 diff --git a/zq-erp/src/main/resources/config/xcx/application.properties b/zq-erp/src/main/resources/config/xcx/application.properties index 20b3119..db72327 100644 --- a/zq-erp/src/main/resources/config/xcx/application.properties +++ b/zq-erp/src/main/resources/config/xcx/application.properties @@ -1,8 +1,17 @@ -evn=xcx +evn=xcxtest server.port=8080 -spring.datasource.username=chuhuan -spring.datasource.password=chuhuan -spring.datasource.url=jdbc:mysql://119.3.52.84:3306/hive_plus?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8 + + +#线上测试环境 + +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 @@ -25,21 +34,18 @@ #spring.jackson.time-zone=GMT+8 #spring.jackson.serialization.write-dates-as-timestamps=true #文件上传时的大小限制 单位M -spring.servlet.multipart.max-file-size=300MB -spring.servlet.multipart.max-request-size=300MB +spring.servlet.multipart.max-file-size=100MB +spring.servlet.multipart.max-request-size=100MB #-------------------------------------- - #rabbitMQ配置 -rabbitmq.host=127.0.0.1 +rabbitmq.host=47.111.134.136 rabbitmq.port=5672 rabbitmq.username=hivequeue rabbitmq.password=hivequeueadmin -useRabbit=true +useRabbit=false -#指定消费者确认方式 当为manual时手动确认 不配置表示自动确认 -#spring.rabbitmq.listener.simple.acknowledge-mode=manual server.session.timeout=120 ali.sms.accessKeyId=LTAI4FrjY9R9iDfC6YQTHfne @@ -47,12 +53,16 @@ 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=false \ No newline at end of file +#定时任务 +scheduling.enabled=false + +swagger.enable=false +swagger.security.username=admin +swagger.security.password=admin + + diff --git a/zq-erp/src/main/resources/config/xcx/system.properties b/zq-erp/src/main/resources/config/xcx/system.properties index ebc6e32..12737b4 100644 --- a/zq-erp/src/main/resources/config/xcx/system.properties +++ b/zq-erp/src/main/resources/config/xcx/system.properties @@ -1,7 +1,7 @@ #是否启用debug模式 debug=false # 日志文件保存地址 -log_path=/mnt/hive/log +log_path=/mnt/hive/log-test # 系统语言环境 zh中文，us英文 system_language=zh @@ -12,11 +12,12 @@ default_password=123 #nginx静态资源访问地址 -static_resource_url=https://filehive2.jyymatrix.cc/uploadeFile/ +static_resource_url=http://hwfile.jyymatrix.cc/ #文件保存地址 -file_storage_path=/mnt/hive/static/uploadeFile/ +file_storage_path=/mnt/sdc/webresource/ #文件上传大小字节为单位 10MB maxUploadSize=10485760 + #Matser\u7684ip\u5730\u5740 redis.hostname=118.31.227.147 @@ -28,8 +29,6 @@ redis.timeout=10000 redis.database=1 redis_time_out=1800000 - - cookie_time_out=36000 #APP登录公钥 @@ -37,16 +36,6 @@ #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 @@ -57,8 +46,10 @@ 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_appid =wx5cc58f796224af61 +xcx_secret =facea088aae414e5c2ee86b459887721 +gzh_appid=wx57e6335559bdbda6 +gzh_secret=ecb408af170e3890e6544290cad33760 #微信支付调试开关 wx_pay_debug_onoff = false @@ -72,12 +63,8 @@ #快递鸟接口指令 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 @@ -96,9 +83,19 @@ #微信支付回调地址 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/ \ No newline at end of file +hive.service=http://localhost:8082/meidu-crm/ + + + +#是否启用异常上报 +is_open_exception_report=true +showExcptionUrl=http://erp.hive.jyymatrix.cc/showException + + +#异常信息查询接口 +showExcptionUrl=http://erp.hive.jyymatrix.cc/showException + -- Gitblit v1.9.1