配置文件修改 打包配置

authentication/src/main/resources/application-dev.yml

@@ -0,0 +1,23 @@
+
+spring:
+  redis:
+    redisson:
+      address: redis://192.168.0.250:6379
+      password: 123456
+      database: 0
+
+  datasource:
+    url: jdbc:mysql://39.98.239.48:3366/platform?serverTimezone=Asia/Shanghai&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true
+    username: root
+    password: '@RqGHG#KZ*C9ytkQ'
+    driverClassName: com.mysql.cj.jdbc.Driver
+
+config:
+  sso: 0
+
+
+minio:
+  url: http://192.168.0.250:9000
+  access-key: v7Zb8XhyLcYNcSHlxvyK
+  secret-key: 58YibMwpxGKtXcekPL065OM4GonC1hf2tFMjI9EN
+  bucket-name: jzg

authentication/src/main/resources/application-test.yml

@@ -0,0 +1,22 @@
+
+spring:
+  redis:
+    redisson:
+      address: redis://172.24.144.218:6379
+      password: sxzgkj@2023
+
+  datasource:
+    url: jdbc:mysql://39.98.239.48:3366/platform?serverTimezone=Asia/Shanghai&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true
+    username: root
+    password: '@RqGHG#KZ*C9ytkQ'
+    driverClassName: com.mysql.cj.jdbc.Driver
+
+config:
+  sso: 0
+
+
+minio:
+  url: http://test-api.baoxianzhanggui.com
+  access-key: N8hf40VDM3Uf2xJ5vnvE
+  secret-key: CDe1raroqIMo5R2KhHl6ZQbJOhdq0mrtCI78g3vq
+  bucket-name: jzg

authentication/src/main/resources/application.yml

@@ -1,30 +1,13 @@
 server:
   port: 8081
 spring:
+  profiles:
+    active: test
+
   main:
     allow-bean-definition-overriding: true
-  redis:
-    redisson:
-      address: redis://192.168.0.250:6379
-      password: 123456
-      database: 0
-
-  datasource:
-      url: jdbc:mysql://39.98.239.48:3366/platform?serverTimezone=Asia/Shanghai&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true
-      username: root
-      password: '@RqGHG#KZ*C9ytkQ'
-      driverClassName: com.mysql.cj.jdbc.Driver
 
 mybatis-plus:
   mapper-locations: classpath*:/mapper/*Mapper.xml
   configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-config:
-  sso: 0
-
-
-minio:
-  url: http://192.168.0.250:9000
-  access-key: v7Zb8XhyLcYNcSHlxvyK
-  secret-key: 58YibMwpxGKtXcekPL065OM4GonC1hf2tFMjI9EN
-  bucket-name: jzg
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl

gateway/pom.xml

@@ -25,6 +25,11 @@
         </dependency>
     </dependencies>
     <build>
-        <finalName>gateway</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
     </build>
 </project>

gateway/src/main/resources/application-dev.yml

@@ -0,0 +1,20 @@
+spring:
+  cloud:
+    gateway:
+      routes:
+        - id: auth_route
+          uri: http://localhost:8081/
+          predicates:
+            - Path=/auth/**
+
+        - id: platform_route
+          uri: http://localhost:8083/
+          predicates:
+            - Path=/userRole/**,/system/**,/file/**,/user/**,/esmInsCompany/**,/jyxConfig/**,/qrBarcode/**
+
+        - id: tenant_route
+          uri: http://localhost:8084/
+          predicates:
+            - Path=/tenant/**,/dept/**,/area/**,/dict/**,/userInfo/**,/sysOrganization/**,/activity/**
+
+

gateway/src/main/resources/application-test.yml

@@ -0,0 +1,21 @@
+
+spring:
+  cloud:
+    gateway:
+      routes:
+        - id: auth_route
+          uri: http://172.24.144.223:9081/
+          predicates:
+            - Path=/auth/**
+
+        - id: platform_route
+          uri: http://172.24.144.223:9083/
+          predicates:
+            - Path=/userRole/**,/system/**,/file/**,/user/**,/esmInsCompany/**,/jyxConfig/**,/qrBarcode/**
+
+        - id: tenant_route
+          uri: http://172.24.144.223:9084/
+          predicates:
+            - Path=/tenant/**,/dept/**,/area/**,/dict/**,/userInfo/**,/sysOrganization/**,/activity/**
+
+

gateway/src/main/resources/application.yml

@@ -1,26 +1,8 @@
 server:
   port: 8001
 spring:
+  profiles:
+    active: test
   main:
     web-application-type: reactive
     allow-bean-definition-overriding: true
-  cloud:
-    gateway:
-
-      routes:
-        - id: auth_route
-          uri: http://localhost:8081/
-          predicates:
-            - Path=/auth/**
-
-        - id: platform_route
-          uri: http://localhost:8083/
-          predicates:
-            - Path=/userRole/**,/system/**,/file/**,/user/**,/esmInsCompany/**,/jyxConfig/**,/qrBarcode/**
-
-        - id: tenant_route
-          uri: http://localhost:8084/
-          predicates:
-            - Path=/tenant/**,/dept/**,/area/**,/dict/**,/userInfo/**,/sysOrganization/**,/activity/**
-
-

platform/src/main/resources/application-dev.yml

@@ -0,0 +1,34 @@
+server:
+  port: 8083
+spring:
+
+#  zipkin:
+#    base-url: http://192.168.0.250:9411
+#  sleuth:
+#    sampler:
+#      probability: 1.0
+  redis:
+    redisson:
+      address: redis://192.168.0.250:6379
+      password: 123456
+  servlet:
+    multipart:
+      max-file-size: 5MB
+      max-request-size: 5MB
+
+  datasource:
+      url: jdbc:mysql://39.98.239.48:3366/platform?serverTimezone=Asia/Shanghai&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true
+      username: root
+      password: '@RqGHG#KZ*C9ytkQ'
+      driverClassName: com.mysql.cj.jdbc.Driver
+
+config:
+  sso: 1
+
+
+minio:
+  url: http://192.168.0.250:9000
+  access-key: v7Zb8XhyLcYNcSHlxvyK
+  secret-key: 58YibMwpxGKtXcekPL065OM4GonC1hf2tFMjI9EN
+  bucket-name: jzg
+

platform/src/main/resources/application-test.yml

@@ -0,0 +1,30 @@
+server:
+  port: 9083
+spring:
+
+#  zipkin:
+#    base-url: http://192.168.0.250:9411
+#  sleuth:
+#    sampler:
+#      probability: 1.0
+  redis:
+    redisson:
+      address: redis://172.24.144.218:6379
+      password: sxzgkj@2023
+
+  datasource:
+      url: jdbc:mysql://39.98.239.48:3366/platform?serverTimezone=Asia/Shanghai&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true
+      username: root
+      password: '@RqGHG#KZ*C9ytkQ'
+      driverClassName: com.mysql.cj.jdbc.Driver
+
+config:
+  sso: 1
+
+
+minio:
+  url: http://test-api.baoxianzhanggui.com
+  access-key: N8hf40VDM3Uf2xJ5vnvE
+  secret-key: CDe1raroqIMo5R2KhHl6ZQbJOhdq0mrtCI78g3vq
+  bucket-name: jzg
+

platform/src/main/resources/application.yml

@@ -1,27 +1,18 @@
 server:
   port: 8083
 spring:
-
 #  zipkin:
 #    base-url: http://192.168.0.250:9411
 #  sleuth:
 #    sampler:
 #      probability: 1.0
-  redis:
-    redisson:
-      address: redis://192.168.0.250:6379
-      password: 123456
+  profiles:
+    active: test
   servlet:
     multipart:
       max-file-size: 5MB
       max-request-size: 5MB
 
-  datasource:
-      url: jdbc:mysql://39.98.239.48:3366/platform?serverTimezone=Asia/Shanghai&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true
-      username: root
-      password: '@RqGHG#KZ*C9ytkQ'
-      driverClassName: com.mysql.cj.jdbc.Driver
-
 mybatis-plus:
   mapper-locations: classpath*:/mapper/*Mapper.xml
   global-config:
@@ -32,9 +23,6 @@ mybatis-plus:
   configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 
-config:
-  sso: 1
-
 #多租户配置
 tenant:
   enable: true
@@ -65,9 +53,3 @@ tenant:
 data-scope:
   ignoreTables:
 
-minio:
-  url: http://test-api.baoxianzhanggui.com
-  access-key: N8hf40VDM3Uf2xJ5vnvE
-  secret-key: CDe1raroqIMo5R2KhHl6ZQbJOhdq0mrtCI78g3vq
-  bucket-name: jzg
-

tenant/organization/pom.xml

@@ -36,6 +36,14 @@
 
     </dependencies>
     <build>
-        <finalName>organization</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <mainClass>com.jzg.organization.OrganizationApplication</mainClass>
+                </configuration>
+            </plugin>
+        </plugins>
     </build>
 </project>

tenant/organization/src/main/resources/application-dev.yml

@@ -0,0 +1,61 @@
+server:
+  port: 8084
+spring:
+  redis:
+    redisson:
+      address: redis://192.168.0.250:6379
+      password: 123456
+
+  datasource:
+      url: jdbc:mysql://39.98.239.48:3366/platform?serverTimezone=Asia/Shanghai&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true
+      username: root
+      password: '@RqGHG#KZ*C9ytkQ'
+      driverClassName: com.mysql.cj.jdbc.Driver
+
+mybatis-plus:
+  mapper-locations: classpath*:/mapper/*Mapper.xml
+  global-config:
+    db-config:
+      logic-delete-field: is_delete
+      logic-delete-value: 1
+      logic-not-delete-value: 0
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
+config:
+  sso: 1
+
+#多租户配置
+tenant:
+  enable: true
+  column: system_code
+  filterTables:
+  ignoreTables:
+    - sys_system
+    - sys_role_perms
+    - sys_area
+    - sys_dict
+    - sys_dict_type
+    - sys_user
+    - sys_user_jzg_info_bank_card
+    - sys_user_role
+    - sys_user_jzg_info_file
+    - sys_organization
+    - sys_organization_user_link
+    - sys_upload_files
+    - sys_config
+    - sys_activity
+    - sys_activity_award
+    - sys_poster_org
+  ignoreLoginNames:
+
+data-scope:
+  tables:
+    - sys_user_jzg_info
+    - sys_dept
+
+minio:
+  url: http://192.168.0.250:9000
+  access-key: v7Zb8XhyLcYNcSHlxvyK
+  secret-key: 58YibMwpxGKtXcekPL065OM4GonC1hf2tFMjI9EN
+  bucket-name: jzg

tenant/organization/src/main/resources/application-test.yml

@@ -0,0 +1,62 @@
+server:
+  port: 9084
+spring:
+  redis:
+    redisson:
+      address: redis://172.24.144.218:6379
+      password: sxzgkj@2023
+  main:
+    allow-circular-references: true
+  datasource:
+      url: jdbc:mysql://39.98.239.48:3366/platform?serverTimezone=Asia/Shanghai&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true
+      username: root
+      password: '@RqGHG#KZ*C9ytkQ'
+      driverClassName: com.mysql.cj.jdbc.Driver
+
+mybatis-plus:
+  mapper-locations: classpath*:/mapper/*Mapper.xml
+  global-config:
+    db-config:
+      logic-delete-field: is_delete
+      logic-delete-value: 1
+      logic-not-delete-value: 0
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
+config:
+  sso: 1
+
+#多租户配置
+tenant:
+  enable: true
+  column: system_code
+  filterTables:
+  ignoreTables:
+    - sys_system
+    - sys_role_perms
+    - sys_area
+    - sys_dict
+    - sys_dict_type
+    - sys_user
+    - sys_user_jzg_info_bank_card
+    - sys_user_role
+    - sys_user_jzg_info_file
+    - sys_organization
+    - sys_organization_user_link
+    - sys_upload_files
+    - sys_config
+    - sys_activity
+    - sys_activity_award
+    - sys_poster_org
+  ignoreLoginNames:
+
+data-scope:
+  tables:
+    - sys_user_jzg_info
+    - sys_dept
+
+minio:
+  url: http://test-api.baoxianzhanggui.com
+  access-key: N8hf40VDM3Uf2xJ5vnvE
+  secret-key: CDe1raroqIMo5R2KhHl6ZQbJOhdq0mrtCI78g3vq
+  bucket-name: jzg

tenant/organization/src/main/resources/application.yml

@@ -1,18 +1,8 @@
-server:
-  port: 8084
 spring:
-  redis:
-    redisson:
-      address: redis://192.168.0.250:6379
-      password: 123456
-      database: 0
   main:
     allow-circular-references: true
-  datasource:
-      url: jdbc:mysql://39.98.239.48:3366/platform?serverTimezone=Asia/Shanghai&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true
-      username: root
-      password: '@RqGHG#KZ*C9ytkQ'
-      driverClassName: com.mysql.cj.jdbc.Driver
+  profiles:
+    active: test
 
 mybatis-plus:
   mapper-locations: classpath*:/mapper/*Mapper.xml
@@ -24,9 +14,6 @@ mybatis-plus:
   configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 
-config:
-  sso: 1
-
 #多租户配置
 tenant:
   enable: true
@@ -55,9 +42,3 @@ data-scope:
   tables:
     - sys_user_jzg_info
     - sys_dept
-
-minio:
-  url: http://192.168.0.250:9000
-  access-key: v7Zb8XhyLcYNcSHlxvyK
-  secret-key: 58YibMwpxGKtXcekPL065OM4GonC1hf2tFMjI9EN
-  bucket-name: jzg

tenant/pom.xml

@@ -63,6 +63,34 @@
 
     </dependencyManagement>
     <build>
-        <finalName>tenant</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.2.4</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+
+                            <transformers>
+                                <!--                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">-->
+                                <!--                  <mainClass>com.example.MainClass</mainClass>-->
+                                <!--                </transformer>-->
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+                                    <resource>META-INF/spring.handlers</resource>
+                                </transformer>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+                                    <resource>META-INF/spring.schemas</resource>
+                                </transformer>
+                            </transformers>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </build>
 </project>