소스 검색

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

wangqiong123 2 년 전
부모
커밋
5abeaf5224
2개의 변경된 파일5개의 추가작업 그리고 5개의 파일을 삭제
  1. 2
    2
      ruoyi-admin/src/main/resources/application-druid.yml
  2. 3
    3
      ruoyi-admin/src/main/resources/application.yml

+ 2
- 2
ruoyi-admin/src/main/resources/application-druid.yml 파일 보기

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
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
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
11
                 username: root
11
                 username: root
12
                 password: YMzc157#
12
                 password: YMzc157#
13
             # 从库数据源
13
             # 从库数据源

+ 3
- 3
ruoyi-admin/src/main/resources/application.yml 파일 보기

18
 # 开发环境配置
18
 # 开发环境配置
19
 server:
19
 server:
20
   # 测试环境6001,开发环境7001
20
   # 测试环境6001,开发环境7001
21
-  port: 6001
21
+  port: 7001
22
   servlet:
22
   servlet:
23
     # 应用的访问路径
23
     # 应用的访问路径
24
     context-path: /
24
     context-path: /
73
     # 端口,默认为6379
73
     # 端口,默认为6379
74
     port: 6389
74
     port: 6389
75
     # TODO 数据库索引,测试环境1,正式环境0
75
     # TODO 数据库索引,测试环境1,正式环境0
76
-    database: 1
76
+    database: 0
77
     # 密码
77
     # 密码
78
     password:
78
     password:
79
     # 连接超时时间
79
     # 连接超时时间
195
 #  TODO 引入仲裁系统url配置
195
 #  TODO 引入仲裁系统url配置
196
 arbitrateConfig:
196
 arbitrateConfig:
197
   url: http://121.40.189.20:9001/callArbitrateCaseApplication/generateCaseApplication
197
   url: http://121.40.189.20:9001/callArbitrateCaseApplication/generateCaseApplication
198
-  smsURL: http://121.40.189.20:9001/callArbitrateCaseApplication/sendSms
198
+  smsURL: http://121.40.189.20:9001/shortMessage/smsCallBack
199
 # TODO 回调通知
199
 # TODO 回调通知
200
 signSealCallbackConfig:
200
 signSealCallbackConfig:
201
   url: http://121.40.189.20:7001/mssignSeal/signSeaalCaseApplicaCallback
201
   url: http://121.40.189.20:7001/mssignSeal/signSeaalCaseApplicaCallback