Merge branch 'develop' of gitadmin/tuoheng_gateway into release

src/main/resources/application-prod.yml

@@ -1,4 +1,9 @@
 spring:
+  security:
+    oauth2:
+      resource-server:
+        jwt:
+          issuer-uri: http://192.168.11.241:8090
   cloud:
     consul:
       host: 172.16.1.31 # consul 所在服务地址

src/main/resources/application-test.yml

@@ -1,4 +1,9 @@
 spring:
+  security:
+    oauth2:
+      resource-server:
+        jwt:
+          issuer-uri: http://192.168.11.241:8090
   cloud:
     consul:
       host: 192.168.11.242 # consul 所在服务地址

target/classes/WEB-INF/classes/application-local.yml

@@ -101,6 +101,27 @@ spring:
             - Path=/api/web/**
           filters:
             - StripPrefix=2
+        # pilot后台管理
+        - id: tuoheng-pilot-admin
+          uri: lb://tuoheng-pilot-admin
+          predicates:
+            - Path=/pilot/admin/**
+          filters:
+            - StripPrefix=2
+        # pilot小程序服务
+        - id: tuoheng-pilot-miniprogram
+          uri: lb://tuoheng-pilot-miniprogram
+          predicates:
+            - Path=/pilot/miniprogram/**
+          filters:
+            - StripPrefix=2
+        # pilot api服务
+        - id: tuoheng-pilot-api
+          uri: lb://tuoheng-pilot-api
+          predicates:
+            - Path=/pilot/web/**
+          filters:
+            - StripPrefix=2
   # Redis数据源
   redis:
     # 缓存库默认索引0

target/classes/application-dev.yml

@@ -101,6 +101,27 @@ spring:
             - Path=/api/web/**
           filters:
             - StripPrefix=2
+        # pilot后台管理
+        - id: tuoheng-pilot-admin
+          uri: lb://tuoheng-pilot-admin
+          predicates:
+            - Path=/pilot/admin/**
+          filters:
+            - StripPrefix=2
+        # pilot小程序服务
+        - id: tuoheng-pilot-miniprogram
+          uri: lb://tuoheng-pilot-miniprogram
+          predicates:
+            - Path=/pilot/miniprogram/**
+          filters:
+            - StripPrefix=2
+        # pilot api服务
+        - id: tuoheng-pilot-api
+          uri: lb://tuoheng-pilot-api
+          predicates:
+            - Path=/pilot/web/**
+          filters:
+            - StripPrefix=2
   # Redis数据源
   redis:
     # 缓存库默认索引0
@@ -125,4 +146,4 @@ spring:
 security:
   ignore:
     permitUrls: /api/system/demo/msg
-    oauthUrls: /api/*/serviceInst/*/getServiceInstParam/*,/api/*/serviceInst/*/getServiceInstCaseUrl/*,/api/*/serviceInst/*/*/application,/api/*/serviceInst/*/*/questionList
+    oauthUrls: /api/system/demo/hello,/api/*/serviceInst/*/getServiceInstParam/*,/api/*/serviceInst/*/getServiceInstCaseUrl/*,/api/*/serviceInst/*/*/application,/api/*/serviceInst/*/*/questionList

target/classes/application-local.yml

@@ -101,6 +101,27 @@ spring:
             - Path=/api/web/**
           filters:
             - StripPrefix=2
+        # pilot后台管理
+        - id: tuoheng-pilot-admin
+          uri: lb://tuoheng-pilot-admin
+          predicates:
+            - Path=/pilot/admin/**
+          filters:
+            - StripPrefix=2
+        # pilot小程序服务
+        - id: tuoheng-pilot-miniprogram
+          uri: lb://tuoheng-pilot-miniprogram
+          predicates:
+            - Path=/pilot/miniprogram/**
+          filters:
+            - StripPrefix=2
+        # pilot api服务
+        - id: tuoheng-pilot-api
+          uri: lb://tuoheng-pilot-api
+          predicates:
+            - Path=/pilot/web/**
+          filters:
+            - StripPrefix=2
   # Redis数据源
   redis:
     # 缓存库默认索引0

target/classes/application-prod.yml

@@ -89,6 +89,27 @@ spring:
             - Path=/api/web/**
           filters:
             - StripPrefix=2
+      # pilot后台管理
+        - id: tuoheng-pilot-admin
+          uri: lb://tuoheng-pilot-admin
+          predicates:
+            - Path=/pilot/admin/**
+          filters:
+            - StripPrefix=2
+      # pilot小程序服务
+        - id: tuoheng-pilot-miniprogram
+          uri: lb://tuoheng-pilot-miniprogram
+          predicates:
+            - Path=/pilot/miniprogram/**
+          filters:
+            - StripPrefix=2
+      # pilot api服务
+        - id: tuoheng-pilot-api
+          uri: lb://tuoheng-pilot-api
+          predicates:
+            - Path=/pilot/web/**
+          filters:
+            - StripPrefix=2
   # Redis数据源
   redis:
     # 缓存库默认索引0
@@ -112,5 +133,5 @@ spring:
 #security放行白名单配置
 security:
   ignore:
-#    whites: /api/auth/**,/api/web/**
-    oauthUrls: /api/*/serviceInst/*/getServiceInstParam/*,/api/*/serviceInst/*/getServiceInstCaseUrl/*,/api/*/serviceInst/*/*/application,/api/*/serviceInst/*/*/questionList
+    permitUrls: /api/system/demo/msg
+    oauthUrls: /api/system/demo/hello,/api/*/serviceInst/*/getServiceInstParam/*,/api/*/serviceInst/*/getServiceInstCaseUrl/*,/api/*/serviceInst/*/*/application,/api/*/serviceInst/*/*/questionList

target/classes/application-test.yml

@@ -89,6 +89,27 @@ spring:
             - Path=/api/web/**
           filters:
             - StripPrefix=2
+        # pilot后台管理
+        - id: tuoheng-pilot-admin
+          uri: lb://tuoheng-pilot-admin
+          predicates:
+            - Path=/pilot/admin/**
+          filters:
+            - StripPrefix=2
+        # pilot小程序服务
+        - id: tuoheng-pilot-miniprogram
+          uri: lb://tuoheng-pilot-miniprogram
+          predicates:
+            - Path=/pilot/miniprogram/**
+          filters:
+            - StripPrefix=2
+        # pilot api服务
+        - id: tuoheng-pilot-api
+          uri: lb://tuoheng-pilot-api
+          predicates:
+            - Path=/pilot/web/**
+          filters:
+            - StripPrefix=2
   # Redis数据源
   redis:
     # 缓存库默认索引0
@@ -112,5 +133,5 @@ spring:
 #security放行白名单配置
 security:
   ignore:
-#    whites: /api/auth/**,/api/web/**
-    oauthUrls: /api/*/serviceInst/*/getServiceInstParam/*,/api/*/serviceInst/*/getServiceInstCaseUrl/*,/api/*/serviceInst/*/*/application,/api/*/serviceInst/*/*/questionList
+    permitUrls: /api/system/demo/msg
+    oauthUrls: /api/system/demo/hello,/api/*/serviceInst/*/getServiceInstParam/*,/api/*/serviceInst/*/getServiceInstCaseUrl/*,/api/*/serviceInst/*/*/application,/api/*/serviceInst/*/*/questionList