Browse Source

修改流程配置文件

huanglc 1 month ago
parent
commit
3e0cedddce

+ 1 - 0
bpm-client-base/pom.xml

@@ -10,6 +10,7 @@
10 10
         <groupId>com.srm.bpm</groupId>
11 11
        <artifactId>bpm-pom</artifactId>
12 12
           <version>0.0.1-SNAPSHOT</version>
13
+        <relativePath>../bpm-pom/pom.xml</relativePath>
13 14
     </parent>
14 15
 
15 16
     <artifactId>bpm-client-base</artifactId>

+ 12 - 2
bpm-client-http/src/main/java/com/srm/bpm/facde/oa/WebServiceRequestInfo.java

@@ -2,8 +2,18 @@ package com.srm.bpm.facde.oa;
2 2
 
3 3
 public class WebServiceRequestInfo {
4 4
 
5
-public static final String oaRequestAddress = "http://172.16.0.36"; //正式环境
5
+
6
+/*     //正式
7
+    public static final String oaRequestAddress = "http://172.16.0.36"; //正式环境
6 8
 // public static final String oaRequestAddress = "http://172.16.0.37:8081"; //测试环境
7 9
 
8
-public static final String oaEtenAddress="http://uoa.jqh.cc:20600";
10
+    public static final String oaEtenAddress="http://uoa.jqh.cc:20600";*/
11
+
12
+    //测试
13
+//public static final String oaRequestAddress = "http://172.16.0.36"; //E8正式环境
14
+public static final String oaRequestAddress = "http://172.16.1.36"; //E8假环境
15
+// public static final String oaRequestAddress = "http://172.16.0.37:8081"; //(失效)测试环境
16
+
17
+//public static final String oaEtenAddress="http://uoa.jqh.cc:20600";//E10正式环境
18
+public static final String oaEtenAddress="http://172.16.0.59:20666/";//E10测试环境
9 19
 }

+ 1 - 0
bpm-core/pom.xml

@@ -10,6 +10,7 @@
10 10
         <groupId>com.srm.bpm</groupId>
11 11
         <artifactId>bpm-pom</artifactId>
12 12
         <version>0.0.1-SNAPSHOT</version>
13
+        <relativePath>../bpm-pom/pom.xml</relativePath>
13 14
     </parent>
14 15
 
15 16
     <artifactId>bpm-core</artifactId>

+ 12 - 5
bpm-server/src/main/resources/application.yml

@@ -4,10 +4,14 @@ scis:
4 4
 bpm:
5 5
   file-path: /Users/jiez/workspace/haosen/haosen_srm/media
6 6
   ctx: ''
7
-  target-url: http://127.0.0.1:8778
7
+#  target-url: http://127.0.0.1:8778
8
+#  type: 1
9
+#  callback-url: http://127.0.0.1:8778/bill/rest/callback
10
+#  pushmsg-url: http://127.0.0.1:8778/task/pushmsg
11
+  target-url: http://127.0.0.1:8000
8 12
   type: 1
9
-  callback-url: http://127.0.0.1:8778/bill/rest/callback
10
-  pushmsg-url: http://127.0.0.1:8778/task/pushmsg
13
+  callback-url: http://127.0.0.1:8000/bill/rest/callback
14
+  pushmsg-url: http://127.0.0.1:8000/task/pushmsg
11 15
 server:
12 16
   port: 9094
13 17
 spring:
@@ -48,9 +52,12 @@ spring:
48 52
 #      url: jdbc:mysql://172.16.0.48:3306/jqh_srm_9000?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=GMT%2B8
49 53
 #      username: root
50 54
 #      password: jqh_srm_2022
51
-      url: jdbc:mysql://172.16.0.71:3306/jqh_srm_9001?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=GMT%2B8
55
+#      url: jdbc:mysql://172.16.0.71:3306/jqh_srm_9001?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=GMT%2B8
56
+#      username: root
57
+#      password: jqh_srm_123123
58
+      url: jdbc:mysql://172.16.0.66:3306/jqh_srm_9000?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=GMT%2B8
52 59
       username: root
53
-      password: jqh_srm_123123
60
+      password: jqh_srm_2022
54 61
       initial-size: 10
55 62
       max-active: 20
56 63
       min-idle: 2

+ 1 - 0
devtools/pom.xml

@@ -10,6 +10,7 @@
10 10
         <groupId>com.srm.bpm</groupId>
11 11
        <artifactId>bpm-pom</artifactId>
12 12
           <version>0.0.1-SNAPSHOT</version>
13
+        <relativePath>../bpm-pom/pom.xml</relativePath>
13 14
     </parent>
14 15
 
15 16
     <groupId>com.srm.bpm</groupId>