chenjun 1 год назад
Родитель
Сommit
f3559fc205

+ 4 - 4
zjugis-business/src/main/resources/application-prod.yaml

@@ -44,10 +44,10 @@ spring:
           username: ZJUGIS_BUSINESS
           password: Zjugis1402
 serviceUrl:
-  sysUrl: http://10.10.10.7:18080/business
-  UI: http://10.10.10.7:18080/workflow
-  ui_version: http://10.10.10.7:18080/workflow
-  z_workflow: http://10.10.10.7:18080/workflow
+  sysUrl: http://10.10.10.7:28080/business
+  UI: http://10.10.10.7:28080/workflow
+  ui_version: http://10.10.10.7:28080/workflow
+  z_workflow: http://10.10.10.7:28080/workflow
 
 # 日志文件配置
 logging:

+ 5 - 0
zjugis-framework/zjugis-spring-boot-starter-mybatis/pom.xml

@@ -33,6 +33,11 @@
             <groupId>com.oracle.database.jdbc</groupId>
             <artifactId>ojdbc8</artifactId>
         </dependency>
+        <dependency>
+            <groupId>cn.easyproject</groupId>
+            <artifactId>orai18n</artifactId>
+            <version>12.1.0.2.0</version>
+        </dependency>
 
         <dependency>
             <groupId>com.alibaba</groupId>

+ 4 - 4
zjugis-module-adm/zjugis-module-adm-biz/src/main/resources/application-prod.yaml

@@ -154,10 +154,10 @@ logging:
 
 --- #################### 海康门禁相关配置 ####################
 hcnet:
-  strDllPath: /home/oa_test/zjugis-adm/lib/libhcnetsdk.so # HCNetSDK地址
-  strPath1: /home/oa_test/zjugis-adm/lib/libcrypto.so.1.1 # linux系统下必须 libcrypto.so.1.1地址
-  strPath2: /home/oa_test/zjugis-adm/lib/libssl.so.1.1 # linux系统下必须 libssl.so.1.1地址
-  strPathCom: /home/oa_test/zjugis-adm/lib # linux系统下必须 lib包路径
+  strDllPath: /home/oa_prod/zjugis-adm/lib/libhcnetsdk.so # HCNetSDK地址
+  strPath1: /home/oa_prod/zjugis-adm/lib/libcrypto.so.1.1 # linux系统下必须 libcrypto.so.1.1地址
+  strPath2: /home/oa_prod/zjugis-adm/lib/libssl.so.1.1 # linux系统下必须 libssl.so.1.1地址
+  strPathCom: /home/oa_prod/zjugis-adm/lib # linux系统下必须 lib包路径
 --- #################### 万维相关配置 ####################
 
 # 万维配置项,设置当前项目所有自定义的配置

+ 7 - 2
zjugis-report/pom.xml

@@ -34,8 +34,13 @@
             <version>3.5.3.2</version>
         </dependency>
         <dependency>
-            <groupId>com.zjugis.cloud</groupId>
-            <artifactId>zjugis-spring-boot-starter-mybatis</artifactId>
+            <groupId>com.oracle.database.jdbc</groupId>
+            <artifactId>ojdbc8</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>cn.easyproject</groupId>
+            <artifactId>orai18n</artifactId>
+            <version>12.1.0.2.0</version>
         </dependency>
 
         <dependency>

+ 6 - 6
zjugis-report/src/main/resources/application-prod.yaml

@@ -4,14 +4,14 @@ spring:
     password: zdww1402
   datasource:
     driverClassName: oracle.jdbc.OracleDriver
-    url: jdbc:oracle:thin:@10.10.10.8:1521:ORCL
+    url: jdbc:oracle:thin:@10.10.10.8:1521:OA
     username: ZJUGIS_REPORT
     password: Zjugis1402
     type: com.zaxxer.hikari.HikariDataSource
 
 serviceUrl:
-  sysUrl: http://10.10.10.7:18080/report
-  UI: http://10.10.10.7:18080/workflow
-  ui_version: http://10.10.10.7:18080/workflow
-  z_workflow: http://10.10.10.7:18080/workflow
-  report: http://10.10.10.7:18080/report
+  sysUrl: http://10.10.10.7:28080/report
+  UI: http://10.10.10.7:28080/workflow
+  ui_version: http://10.10.10.7:28080/workflow
+  z_workflow: http://10.10.10.7:28080/workflow
+  report: http://10.10.10.7:28080/report

+ 7 - 7
zjugis-workflow/src/main/resources/application-prod.yaml

@@ -43,14 +43,14 @@ spring:
           test-on-borrow: false
           test-on-return: false
 websocket:
-  post: 6091
+  post: 26091
   path: "/ws"
-  url: ws://10.10.10.7:6091/ws/
+  url: ws://10.10.10.7:26091/ws/
 
 serviceUrl:
-  sysUrl: http://10.10.10.7:18080/workflow
-  UI: http://10.10.10.7:18080/workflow
-  ui_version: http://10.10.10.7:18080/UI
-  z_workflow: http://10.10.10.7:18080/workflow
+  sysUrl: http://10.10.10.7:28080/workflow
+  UI: http://10.10.10.7:28080/workflow
+  ui_version: http://10.10.10.7:28080/UI
+  z_workflow: http://10.10.10.7:28080/workflow
   z_file_management: http://114.215.200.79:81/z_file_management/
-  reportUrl: http://10.10.10.7:18080/report
+  reportUrl: http://10.10.10.7:28080/report