Merge remote-tracking branch 'origin/master'

# Conflicts:
#	zjugis-module-system/zjugis-module-system-biz/src/main/resources/bootstrap-local.yaml

zjugis-business/pom.xml

@@ -59,6 +59,16 @@
         </dependency>
 
         <!-- 依赖服务 -->
+        <dependency>
+            <groupId>com.zjugis.cloud</groupId>
+            <artifactId>zjugis-module-system-api</artifactId>
+            <version>${revision}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.zjugis.cloud</groupId>
+            <artifactId>zjugis-module-adm-api</artifactId>
+            <version>${revision}</version>
+        </dependency>
         <dependency>
             <groupId>com.zjugis.cloud</groupId>
             <artifactId>zjugis-module-infra-api</artifactId>

zjugis-business/src/main/resources/application-dev.yaml

@@ -0,0 +1,10 @@
+spring:
+  redis:
+    host: 10.10.10.7
+    password: zdww1402
+
+serviceUrl:
+  sysUrl: http://10.10.10.7:6010
+  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

zjugis-business/src/main/resources/application-local.yaml

@@ -0,0 +1,10 @@
+spring:
+  redis:
+    host: 127.0.0.1
+    password: zdww1402
+
+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/UI
+  z_workflow: http://10.10.10.7:18080/workflow

zjugis-business/src/main/resources/application.yaml

@@ -12,10 +12,6 @@ spring:
           url: jdbc:oracle:thin:@10.10.10.8:1521:ORCL
           username: ZJUGIS_BUSINESS
           password: Zjugis1402
-
-  #redis
-  redis:
-    host: 127.0.0.1
   #freemarker
   freemarker:
     settings:
@@ -46,17 +42,9 @@ zjugis:
     version: 1.0.0
     base-package: com.zjugis.business
 
-#外部系统Url
-serviceUrl:
-  sysUrl: http://localhost:6010
-  workflow-client: http://localhost:6010
-  UI: http://localhost:6090
-  ui_version: http://114.215.200.79:81/UI
-  z_workflow: http://localhost:6090
-
 version: 2023.11.13
 
 #系统id
-SysID: workflow-client
+SysID: business
 entrance_ip:
 extranet_entrance_ip:

zjugis-business/src/main/resources/bootstrap-dev.yaml

@@ -0,0 +1,18 @@
+spring:
+  application:
+    name: business
+  cloud:
+    inetutils:
+      preferred-networks: 10.10
+    nacos:
+      server-addr: 10.10.10.7:8848
+      discovery:
+        service: business
+        server-addr: 10.10.10.7:8848
+        namespace: f444858c-ae8b-4b7d-aa45-2c3238895348
+      config:
+        server-addr: 10.10.10.7:8848 # Nacos 服务器地址
+        namespace: f444858c-ae8b-4b7d-aa45-2c3238895348       # 命名空间。这里使用 dev 开发环境
+        group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP
+        name: # 使用的 Nacos 配置集的 dataId，默认为 spring.application.name
+        file-extension: yaml

zjugis-workflow/src/main/resources/application-dev.yml

@@ -9,8 +9,9 @@ websocket:
   url: ws://10.10.10.7:6091/ws/
 
 serviceUrl:
+  sysUrl: http://10.10.10.7:18080/workflow
   UI: http://10.10.10.7:18080/workflow
-  ui_version: http://114.215.200.79:81/UI
+  ui_version: http://10.10.10.7:18080/UI
   z_workflow: http://10.10.10.7:18080/workflow
   z_auto_deploy: http://114.215.200.79:81/z_auto_deploy/
   z_user_org_right: http://114.215.200.79:81/z_user_org_right/

zjugis-workflow/src/main/resources/application-local.yml

@@ -9,6 +9,7 @@ websocket:
   url: ws://localhost:6091/ws/
 
 serviceUrl:
+  sysUrl: http://127.0.0.1/workflow
   UI: http://localhost:6090
   ui_version: http://114.215.200.79:81/UI
   z_workflow: http://localhost:6090