18792927508 hace 2 años
padre
commit
4a2155f7eb

+ 2
- 1
ruoyi-admin/src/main/resources/application-druid.yml Ver fichero

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

+ 7
- 4
ruoyi-admin/src/main/resources/application.yml Ver fichero

@@ -17,8 +17,8 @@ ruoyi:
17 17
 
18 18
 # 开发环境配置
19 19
 server:
20
-  # 服务器的HTTP端口,默认为8080
21
-  port: 6001
20
+  # 测试环境6001,开发环境7001
21
+  port: 7001
22 22
   servlet:
23 23
     # 应用的访问路径
24 24
     context-path: /
@@ -131,8 +131,8 @@ mybatis:
131 131
   mapperLocations: classpath*:mapper/**/*Mapper.xml
132 132
   # 加载全局的配置文件
133 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 136
 # PageHelper分页插件
137 137
 pagehelper:
138 138
   helperDialect: mysql
@@ -188,6 +188,9 @@ imConfig:
188 188
 organizeConfig:
189 189
   # creditCode
190 190
   creditCode: 910000058386410047
191
+#  引入仲裁系统url配置
192
+arbitrateConfig:
193
+  url: http://121.40.189.20:9001/callArbitrateCaseApplication/generateCaseApplication
191 194
 #jodconverter:
192 195
 #  local:
193 196
 #    host: 121.40.189.20

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

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