SH-Arbitrate/Mediation-Backend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'wq1' of SH-Arbitrate/Mediation-Backend into dev

Browse Source
This commit was merged in pull request #98.
This commit is contained in:
wangqiong123
2024-02-27 18:04:26 +08:00
committed by Gitea
parent badbdf8c13 4a2155f7eb
commit 0579a94658
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-admin/src/main/resources/application-druid.yml
+2 -1
View File
@@ -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#
# 从库数据源
ruoyi-admin/src/main/resources/application.yml
+7 -4
View File
@@ -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
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseApplicationServiceImpl.java
+5 -2
View File
@@ -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)