Sfoglia il codice sorgente

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

wangqiong123 2 anni fa
parent
commit
0579a94658

+ 2
- 1
ruoyi-admin/src/main/resources/application-druid.yml Vedi File

6
         druid:
6
         druid:
7
             # 主库数据源
7
             # 主库数据源
8
             master:
8
             master:
9
-                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
9
+#                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
10
+                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
10
                 username: root
11
                 username: root
11
                 password: YMzc157#
12
                 password: YMzc157#
12
             # 从库数据源
13
             # 从库数据源

+ 7
- 4
ruoyi-admin/src/main/resources/application.yml Vedi File

17
 
17
 
18
 # 开发环境配置
18
 # 开发环境配置
19
 server:
19
 server:
20
-  # 服务器的HTTP端口,默认为8080
21
-  port: 6001
20
+  # 测试环境6001,开发环境7001
21
+  port: 7001
22
   servlet:
22
   servlet:
23
     # 应用的访问路径
23
     # 应用的访问路径
24
     context-path: /
24
     context-path: /
131
   mapperLocations: classpath*:mapper/**/*Mapper.xml
131
   mapperLocations: classpath*:mapper/**/*Mapper.xml
132
   # 加载全局的配置文件
132
   # 加载全局的配置文件
133
   configLocation: classpath:mybatis/mybatis-config.xml
133
   configLocation: classpath:mybatis/mybatis-config.xml
134
-  configuration:
135
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
134
+#  configuration:
135
+#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
136
 # PageHelper分页插件
136
 # PageHelper分页插件
137
 pagehelper:
137
 pagehelper:
138
   helperDialect: mysql
138
   helperDialect: mysql
188
 organizeConfig:
188
 organizeConfig:
189
   # creditCode
189
   # creditCode
190
   creditCode: 910000058386410047
190
   creditCode: 910000058386410047
191
+#  引入仲裁系统url配置
192
+arbitrateConfig:
193
+  url: http://121.40.189.20:9001/callArbitrateCaseApplication/generateCaseApplication
191
 #jodconverter:
194
 #jodconverter:
192
 #  local:
195
 #  local:
193
 #    host: 121.40.189.20
196
 #    host: 121.40.189.20

+ 5
- 2
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseApplicationServiceImpl.java Vedi File

88
      */
88
      */
89
     @Value("${organizeConfig.creditCode}")
89
     @Value("${organizeConfig.creditCode}")
90
     private long creditCode;
90
     private long creditCode;
91
+
92
+    @Value("${arbitrateConfig.url}")
93
+    private String arbitrateUrl;
91
     @Autowired
94
     @Autowired
92
     MsCaseApplicationService caseApplicationService;
95
     MsCaseApplicationService caseApplicationService;
93
     @Autowired
96
     @Autowired
1334
             sendContent = "尊敬的用户,您的" + application.getCaseNum() + "的案件,线上调解日期已确定为"+application.getHearDate()+",请知晓,如非本人操作,请忽略本短信。";
1337
             sendContent = "尊敬的用户,您的" + application.getCaseNum() + "的案件,线上调解日期已确定为"+application.getHearDate()+",请知晓,如非本人操作,请忽略本短信。";
1335
         }else {
1338
         }else {
1336
             // 线下调解 2077966 尊敬的用户,您的{1}案件,线下调解日期已确定为{2},请知晓,如非本人操作,请忽略本短信。
1339
             // 线下调解 2077966 尊敬的用户,您的{1}案件,线下调解日期已确定为{2},请知晓,如非本人操作,请忽略本短信。
1337
-            smsFlag = SmsUtils.sendSms(application.getId(), "2075447", phone, new String[]{application.getCaseNum(),application.getHearDate()});
1340
+            smsFlag = SmsUtils.sendSms(application.getId(), "2077966", phone, new String[]{application.getCaseNum(),application.getHearDate()});
1338
             sendContent = "尊敬的用户,您的" + application.getCaseNum() + "的案件,线下调解日期已确定为"+application.getHearDate()+",请知晓,如非本人操作,请忽略本短信。";
1341
             sendContent = "尊敬的用户,您的" + application.getCaseNum() + "的案件,线下调解日期已确定为"+application.getHearDate()+",请知晓,如非本人操作,请忽略本短信。";
1339
 
1342
 
1340
         }
1343
         }
1841
                     String paramsbody = JSONUtil.toJsonStr(caseApplicationVO);
1844
                     String paramsbody = JSONUtil.toJsonStr(caseApplicationVO);
1842
                     long timestamp = System.currentTimeMillis();
1845
                     long timestamp = System.currentTimeMillis();
1843
                     String signStr = SignCheckUtils.getSign(paramsbody, accessSec, timestamp);
1846
                     String signStr = SignCheckUtils.getSign(paramsbody, accessSec, timestamp);
1844
-                    String urlstr = "http://localhost:8001/callArbitrateCaseApplication/generateCaseApplication";
1847
+                    String urlstr = arbitrateUrl;
1845
                     HttpResponse httpResponse = (HttpResponse) HttpRequest.post(urlstr)
1848
                     HttpResponse httpResponse = (HttpResponse) HttpRequest.post(urlstr)
1846
                             .header("timestampstr", String.valueOf(timestamp))
1849
                             .header("timestampstr", String.valueOf(timestamp))
1847
                             .header("signstr", signStr)
1850
                             .header("signstr", signStr)