From a94a6188f10c1b90a641349fa3aa6a51c817baaf Mon Sep 17 00:00:00 2001
From: khalil <khalil@chuhaiwl2023.com>
Date: Tue, 7 May 2024 12:49:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81-swagger3=20pathmatch?=
 =?UTF-8?q?=E5=92=8Cnexus=E7=A7=81=E6=9C=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/bootstrap.yaml         | 24 ++++++++----------
 .../src/main/resources/bootstrap.yaml         | 21 ++++++++--------
 .../src/main/resources/bootstrap.yaml         | 25 ++++++++-----------
 accompany-dependencies/pom.xml                | 14 +++++++++++
 .../src/main/resources/bootstrap.yaml         | 23 ++++++++---------
 .../src/main/resources/bootstrap.yaml         | 18 ++++++-------
 6 files changed, 65 insertions(+), 60 deletions(-)

diff --git a/accompany-admin/accompany-admin-web/src/main/resources/bootstrap.yaml b/accompany-admin/accompany-admin-web/src/main/resources/bootstrap.yaml
index d2f84bf7d..6c3920002 100644
--- a/accompany-admin/accompany-admin-web/src/main/resources/bootstrap.yaml
+++ b/accompany-admin/accompany-admin-web/src/main/resources/bootstrap.yaml
@@ -6,12 +6,20 @@ spring:
   main:
     allow-bean-definition-overriding : true
     allow-circular-references: true
+  mvc:
+    pathmatch:
+      matching-strategy: ant_path_matcher
+
+---
+spring:
+  config:
+    activate:
+      on-profile: native
   cloud:
     nacos:
       config:
         server-addr: 129.226.216.54:8848
         namespace: 5edc3246-3e69-4be5-a32a-273f0a09ddf6
-        name: ${spring.application.name}
         file-extension: yml
         shared-configs:
           - data-id: application.yml
@@ -24,22 +32,17 @@ spring:
             refresh: true
           - data-id: threadpool.yml
             refresh: true
+
 ---
 spring:
-  application:
-    name: admin
   config:
     activate:
       on-profile: dev
-  main:
-    allow-bean-definition-overriding: true
-    allow-circular-references: true
   cloud:
     nacos:
       config:
         server-addr: 129.226.216.54:8848
         namespace: 5edc3246-3e69-4be5-a32a-273f0a09ddf6
-        name: ${spring.application.name}
         file-extension: yml
         shared-configs:
           - data-id: application.yml
@@ -54,22 +57,17 @@ spring:
             refresh: true
           - data-id: database.yml
             refresh: true
+
 ---
 spring:
-  application:
-    name: admin
   config:
     activate:
       on-profile: prod
-  main:
-    allow-bean-definition-overriding: true
-    allow-circular-references: true
   cloud:
     nacos:
       config:
         server-addr: 129.226.216.54:8848
         namespace: 0c9bf047-19ca-4969-bf5d-bbc1f86b501a
-        name: ${spring.application.name}
         file-extension: yml
         shared-configs:
           - data-id: application.yml
diff --git a/accompany-admin/accompany-flow-team-admin-web/src/main/resources/bootstrap.yaml b/accompany-admin/accompany-flow-team-admin-web/src/main/resources/bootstrap.yaml
index a1606ac32..203731339 100644
--- a/accompany-admin/accompany-flow-team-admin-web/src/main/resources/bootstrap.yaml
+++ b/accompany-admin/accompany-flow-team-admin-web/src/main/resources/bootstrap.yaml
@@ -6,12 +6,20 @@ spring:
   main:
     allow-bean-definition-overriding : true
     allow-circular-references: true
+  mvc:
+    pathmatch:
+      matching-strategy: ant_path_matcher
+
+---
+spring:
+  config:
+    activate:
+      on-profile: native
   cloud:
     nacos:
       config:
         server-addr: 129.226.216.54:8848
         namespace: 5edc3246-3e69-4be5-a32a-273f0a09ddf6
-        name: ${spring.application.name}
         file-extension: yml
         shared-configs:
           - data-id: application.yml
@@ -24,20 +32,17 @@ spring:
             refresh: true
           - data-id: threadpool.yml
             refresh: true
+
 ---
 spring:
   config:
     activate:
       on-profile: dev
-  main:
-    allow-bean-definition-overriding: true
-    allow-circular-references: true
   cloud:
     nacos:
       config:
         server-addr: 129.226.216.54:8848
         namespace: 5edc3246-3e69-4be5-a32a-273f0a09ddf6
-        name: ${spring.application.name}
         file-extension: yml
         shared-configs:
           - data-id: application.yml
@@ -57,15 +62,11 @@ spring:
   config:
     activate:
       on-profile: prod
-  main:
-    allow-bean-definition-overriding: true
-    allow-circular-references: true
   cloud:
     nacos:
       config:
         server-addr: 129.226.216.54:8848
         namespace: 0c9bf047-19ca-4969-bf5d-bbc1f86b501a
-        name: ${spring.application.name}
         file-extension: yml
         shared-configs:
           - data-id: application.yml
@@ -79,4 +80,4 @@ spring:
           - data-id: threadpool.yml
             refresh: true
           - data-id: database.yml
-            refresh: true
\ No newline at end of file
+            refresh: true
diff --git a/accompany-business/accompany-business-web/src/main/resources/bootstrap.yaml b/accompany-business/accompany-business-web/src/main/resources/bootstrap.yaml
index fb0606f6e..6bc507917 100644
--- a/accompany-business/accompany-business-web/src/main/resources/bootstrap.yaml
+++ b/accompany-business/accompany-business-web/src/main/resources/bootstrap.yaml
@@ -2,16 +2,24 @@ spring:
   application:
     name: web
   profiles:
-      active: native
+    active: native
   main:
     allow-bean-definition-overriding : true
     allow-circular-references: true
+  mvc:
+    pathmatch:
+      matching-strategy: ant_path_matcher
+
+---
+spring:
+  config:
+    activate:
+      on-profile: native
   cloud:
     nacos:
       config:
         server-addr: 129.226.216.54:8848
         namespace: 5edc3246-3e69-4be5-a32a-273f0a09ddf6
-        name: ${spring.application.name}
         file-extension: yml
         shared-configs:
           - data-id: application.yml
@@ -24,22 +32,17 @@ spring:
             refresh: true
           - data-id: threadpool.yml
             refresh: true
+
 ---
 spring:
-  application:
-    name: web
   config:
     activate:
       on-profile: dev
-  main:
-    allow-bean-definition-overriding: true
-    allow-circular-references: true
   cloud:
     nacos:
       config:
         server-addr: 129.226.216.54:8848
         namespace: 5edc3246-3e69-4be5-a32a-273f0a09ddf6
-        name: ${spring.application.name}
         file-extension: yml
         shared-configs:
           - data-id: application.yml
@@ -56,20 +59,14 @@ spring:
             refresh: true
 ---
 spring:
-  application:
-    name: web
   config:
     activate:
       on-profile: prod
-  main:
-    allow-bean-definition-overriding: true
-    allow-circular-references: true
   cloud:
     nacos:
       config:
         server-addr: 129.226.216.54:8848
         namespace: 0c9bf047-19ca-4969-bf5d-bbc1f86b501a
-        name: ${spring.application.name}
         file-extension: yml
         shared-configs:
           - data-id: application.yml
diff --git a/accompany-dependencies/pom.xml b/accompany-dependencies/pom.xml
index d491c348e..53cbfc6af 100644
--- a/accompany-dependencies/pom.xml
+++ b/accompany-dependencies/pom.xml
@@ -703,4 +703,18 @@
 
     </dependencies>
 
+    <repositories>
+        <repository>
+            <id>peko-public</id>
+            <url>http://nexus.pekolive.com/repository/maven-public/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+            </snapshots>
+        </repository>
+    </repositories>
+
 </project>
\ No newline at end of file
diff --git a/accompany-oauth2/accompany-oauth2-web/src/main/resources/bootstrap.yaml b/accompany-oauth2/accompany-oauth2-web/src/main/resources/bootstrap.yaml
index bc7777d0b..ffbd17c38 100644
--- a/accompany-oauth2/accompany-oauth2-web/src/main/resources/bootstrap.yaml
+++ b/accompany-oauth2/accompany-oauth2-web/src/main/resources/bootstrap.yaml
@@ -6,12 +6,20 @@ spring:
   main:
     allow-bean-definition-overriding : true
     allow-circular-references: true
+  mvc:
+    pathmatch:
+      matching-strategy: ant_path_matcher
+
+---
+spring:
+  config:
+    activate:
+      on-profile: native
   cloud:
     nacos:
       config:
         server-addr: 129.226.216.54:8848
         namespace: 5edc3246-3e69-4be5-a32a-273f0a09ddf6
-        name: ${spring.application.name}
         file-extension: yml
         shared-configs:
           - data-id: application.yml
@@ -24,22 +32,17 @@ spring:
             refresh: true
           - data-id: threadpool.yml
             refresh: true
+
 ---
 spring:
-  application:
-    name: oauth2
   config:
     activate:
       on-profile: dev
-  main:
-    allow-bean-definition-overriding: true
-    allow-circular-references: true
   cloud:
     nacos:
       config:
         server-addr: 129.226.216.54:8848
         namespace: 5edc3246-3e69-4be5-a32a-273f0a09ddf6
-        name: ${spring.application.name}
         file-extension: yml
         shared-configs:
           - data-id: application.yml
@@ -56,20 +59,14 @@ spring:
             refresh: true
 ---
 spring:
-  application:
-    name: oauth2
   config:
     activate:
       on-profile: prod
-  main:
-    allow-bean-definition-overriding: true
-    allow-circular-references: true
   cloud:
     nacos:
       config:
         server-addr: 129.226.216.54:8848
         namespace: 0c9bf047-19ca-4969-bf5d-bbc1f86b501a
-        name: ${spring.application.name}
         file-extension: yml
         shared-configs:
           - data-id: application.yml
diff --git a/accompany-scheduler/accompany-scheduler-web/src/main/resources/bootstrap.yaml b/accompany-scheduler/accompany-scheduler-web/src/main/resources/bootstrap.yaml
index 27f1ffda1..8f62bd089 100644
--- a/accompany-scheduler/accompany-scheduler-web/src/main/resources/bootstrap.yaml
+++ b/accompany-scheduler/accompany-scheduler-web/src/main/resources/bootstrap.yaml
@@ -6,12 +6,17 @@ spring:
   main:
     allow-bean-definition-overriding : true
     allow-circular-references: true
+
+---
+spring:
+  config:
+    activate:
+      on-profile: native
   cloud:
     nacos:
       config:
         server-addr: 129.226.216.54:8848
         namespace: 5edc3246-3e69-4be5-a32a-273f0a09ddf6
-        name: ${spring.application.name}
         file-extension: yml
         shared-configs:
           - data-id: application.yml
@@ -24,20 +29,17 @@ spring:
             refresh: true
           - data-id: threadpool.yml
             refresh: true
+
 ---
 spring:
   config:
     activate:
       on-profile: dev
-  main:
-    allow-bean-definition-overriding: true
-    allow-circular-references: true
   cloud:
     nacos:
       config:
         server-addr: 129.226.216.54:8848
         namespace: 5edc3246-3e69-4be5-a32a-273f0a09ddf6
-        name: ${spring.application.name}
         file-extension: yml
         shared-configs:
           - data-id: application.yml
@@ -57,15 +59,11 @@ spring:
   config:
     activate:
       on-profile: prod
-  main:
-    allow-bean-definition-overriding: true
-    allow-circular-references: true
   cloud:
     nacos:
       config:
         server-addr: 129.226.216.54:8848
         namespace: 0c9bf047-19ca-4969-bf5d-bbc1f86b501a
-        name: ${spring.application.name}
         file-extension: yml
         shared-configs:
           - data-id: application.yml
@@ -79,4 +77,4 @@ spring:
           - data-id: threadpool.yml
             refresh: true
           - data-id: database.yml
-            refresh: true
\ No newline at end of file
+            refresh: true