From 4a2155f7ebc9410eb2f1a5796e5aaaab18b141f4 Mon Sep 17 00:00:00 2001 From: 18792927508 <1322446236@qq.com> Date: Tue, 27 Feb 2024 18:00:46 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/src/main/resources/application-druid.yml | 3 ++- ruoyi-admin/src/main/resources/application.yml | 11 +++++++---- .../mscase/impl/MsCaseApplicationServiceImpl.java | 7 +++++-- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index a11c80d..4d5b672 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -6,7 +6,8 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://121.40.189.20:3306/mediation_system?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=true&serverTimezone=Asia/Shanghai&useSSL=false +# url: jdbc:mysql://121.40.189.20:3306/mediation_system?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=true&serverTimezone=Asia/Shanghai&useSSL=false + url: jdbc:mysql://121.40.189.20:3306/mediation_system_prod?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=true&serverTimezone=Asia/Shanghai&useSSL=false username: root password: YMzc157# # 从库数据源 diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 2159279..aa0993a 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -17,8 +17,8 @@ ruoyi: # 开发环境配置 server: - # 服务器的HTTP端口，默认为8080 - port: 6001 + # 测试环境6001，开发环境7001 + port: 7001 servlet: # 应用的访问路径 context-path: / @@ -131,8 +131,8 @@ mybatis: mapperLocations: classpath*:mapper/**/*Mapper.xml # 加载全局的配置文件 configLocation: classpath:mybatis/mybatis-config.xml - configuration: - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl +# configuration: +# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # PageHelper分页插件 pagehelper: helperDialect: mysql @@ -188,6 +188,9 @@ imConfig: organizeConfig: # creditCode creditCode: 910000058386410047 +# 引入仲裁系统url配置 +arbitrateConfig: + url: http://121.40.189.20:9001/callArbitrateCaseApplication/generateCaseApplication #jodconverter: # local: # host: 121.40.189.20 diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseApplicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseApplicationServiceImpl.java index 3657033..ea13d31 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseApplicationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseApplicationServiceImpl.java @@ -88,6 +88,9 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService { */ @Value("${organizeConfig.creditCode}") private long creditCode; + + @Value("${arbitrateConfig.url}") + private String arbitrateUrl; @Autowired MsCaseApplicationService caseApplicationService; @Autowired @@ -1334,7 +1337,7 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService { sendContent = "尊敬的用户，您的" + application.getCaseNum() + "的案件，线上调解日期已确定为"+application.getHearDate()+"，请知晓，如非本人操作，请忽略本短信。"; }else { // 线下调解 2077966 尊敬的用户，您的{1}案件，线下调解日期已确定为{2}，请知晓，如非本人操作，请忽略本短信。 - smsFlag = SmsUtils.sendSms(application.getId(), "2075447", phone, new String[]{application.getCaseNum(),application.getHearDate()}); + smsFlag = SmsUtils.sendSms(application.getId(), "2077966", phone, new String[]{application.getCaseNum(),application.getHearDate()}); sendContent = "尊敬的用户，您的" + application.getCaseNum() + "的案件，线下调解日期已确定为"+application.getHearDate()+"，请知晓，如非本人操作，请忽略本短信。"; } @@ -1841,7 +1844,7 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService { String paramsbody = JSONUtil.toJsonStr(caseApplicationVO); long timestamp = System.currentTimeMillis(); String signStr = SignCheckUtils.getSign(paramsbody, accessSec, timestamp); - String urlstr = "http://localhost:8001/callArbitrateCaseApplication/generateCaseApplication"; + String urlstr = arbitrateUrl; HttpResponse httpResponse = (HttpResponse) HttpRequest.post(urlstr) .header("timestampstr", String.valueOf(timestamp)) .header("signstr", signStr) -- 2.54.0