新增机场接入oidc相关改造

src/main/java/com/tuoheng/gateway/commons/CommonsConfig.java

@@ -45,6 +45,10 @@ public class CommonsConfig {
      * 周界警戒控制系统接口地址
      */
     public static String alertPermissionUrl;
+    /**
+     * 机场系统接口地址
+     */
+    public static String airportPermissionUrl;
 
 
     @Value("${tuoheng.hhz-admin-perUrl}")
@@ -82,4 +86,9 @@ public class CommonsConfig {
         alertPermissionUrl = url;
     }
 
+    @Value("${tuoheng.airport-admin-perUrl}")
+    public void setAirportPermissionUrl(String url) {
+        airportPermissionUrl = url;
+    }
+
 }

src/main/java/com/tuoheng/gateway/config/WebSecurityConfig.java

@@ -66,6 +66,7 @@ public class WebSecurityConfig {
         String[] airmonitorPermitPath = PermitPathConstant.airmonitorPermitUrlStr;
         String[] telecomumalePermitPath = PermitPathConstant.telecomumaleUrlStr;
         String[] alertPermitPath = PermitPathConstant.alertleUrlStr;
+        String[] airportPermitPath = PermitPathConstant.airportUrlStr;
         httpSecurity
                 .authorizeExchange()
                 //.pathMatchers(OAUTH_PATH).hasAnyAuthority(AuthorityConstant.SCOPE_ADMIN, AuthorityConstant.SCOPE_TUOHNEG_DSP_MP, AuthorityConstant.SCOPE_TUOHNEG_DSP_WEB)
@@ -77,6 +78,7 @@ public class WebSecurityConfig {
                 .pathMatchers(airmonitorPermitPath).permitAll()
                 .pathMatchers(telecomumalePermitPath).permitAll()
                 .pathMatchers(alertPermitPath).permitAll()
+                .pathMatchers(airportPermitPath).permitAll()
                 .pathMatchers("/pilot/miniprogram/**").hasAnyAuthority(AuthorityConstant.SCOPE_ADMIN, AuthorityConstant.SCOPE_TUOHNEG_PILOT_MP)
                 .pathMatchers("/pilot/admin/**").hasAnyAuthority(AuthorityConstant.SCOPE_ADMIN, AuthorityConstant.SCOPE_TUOHNEG_PILOT_ADMIN)
                 .pathMatchers("/hhz/admin/**").hasAnyAuthority(AuthorityConstant.SCOPE_ADMIN, AuthorityConstant.SCOPE_TUOHNEG_HHZ_ADMIN)
@@ -91,6 +93,7 @@ public class WebSecurityConfig {
                 .pathMatchers("/weptsp/admin/**").hasAnyAuthority(AuthorityConstant.SCOPE_ADMIN, AuthorityConstant.SCOPE_TUOHNEG_WEPTSP_ADMIN)
                 .pathMatchers("/airmonitor/admin/**").hasAnyAuthority(AuthorityConstant.SCOPE_ADMIN, AuthorityConstant.SCOPE_TUOHNEG_AIRMONITOR_ADMIN)
                 .pathMatchers("/alert/admin/**").hasAnyAuthority(AuthorityConstant.SCOPE_ADMIN, AuthorityConstant.SCOPE_TUOHNEG_ALERT_ADMIN)
+                .pathMatchers("/airport/admin/**").hasAnyAuthority(AuthorityConstant.SCOPE_ADMIN, AuthorityConstant.SCOPE_TUOHNEG_AIRPORT_ADMIN)
                 .pathMatchers("/oidc/admin/user/**").authenticated()
                 .pathMatchers("/api/inspection/**").authenticated()
                 .pathMatchers(OAUTH_PATH).authenticated()

src/main/java/com/tuoheng/gateway/constants/AuthorityConstant.java

@@ -70,4 +70,10 @@ public class AuthorityConstant {
      */
     public static final String SCOPE_TUOHNEG_ALERT_ADMIN = "SCOPE_tuoheng-alert-admin";
     //public static final String SCOPE_TUOHNEG_ALERT_MP= "SCOPE_tuoheng-alert-mp";
+
+    /**
+     * Airport 用户权限
+     */
+    public static final String SCOPE_TUOHNEG_AIRPORT_ADMIN = "SCOPE_tuoheng-airport-admin";
+    //public static final String SCOPE_TUOHNEG_ALERT_MP= "SCOPE_tuoheng-alert-mp";
 }

src/main/java/com/tuoheng/gateway/constants/PermitPathConstant.java

@@ -107,4 +107,6 @@ public class PermitPathConstant {
             "/alert/admin/inspection/executeTaskStatus/**",
             "/alert/admin/inspection/status/**"
     };
+    public static String airportUrlStr[] = {
+    };
 }

src/main/java/com/tuoheng/gateway/utils/GatewayUrlPathUtil.java

@@ -44,6 +44,8 @@ public class GatewayUrlPathUtil {
 
     private static final String ALERT_ADMIN = "tuoheng-alert-admin";
 
+    private static final String AIRPORT_ADMIN = "tuoheng-airport-admin";
+
 
     /**
      * 获取 gateway 路由前缀，匹配url
@@ -69,6 +71,9 @@ public class GatewayUrlPathUtil {
             case WATER_ADMIN:
                 apiPath = "/waterway/admin";
                 break;
+            case AIRPORT_ADMIN:
+                apiPath = "/airport/admin";
+                break;
             case WATER_MP:
                 apiPath = "/waterway/miniprogram";
                 break;
@@ -120,6 +125,9 @@ public class GatewayUrlPathUtil {
         if (clientId.equals(ALERT_ADMIN)) {
             url = CommonsConfig.alertPermissionUrl;
         }
+        if (clientId.equals(AIRPORT_ADMIN)) {
+            url = CommonsConfig.airportPermissionUrl;
+        }
         log.info("getRoleIdByApiUrlPermission -url:{},token:{}", url, token);
         if (StringUtils.isNotBlank(url)) {
             HttpHeaders resultRequestHeader = new HttpHeaders();

src/main/resources/application-dev.yml

@@ -225,7 +225,7 @@ spring:
           filters:
             - StripPrefix=2
         # 机场平台 platform服务
-        - id: tuoheng_airport_admin
+        - id: tuoheng-airport-admin
           uri: lb://tuoheng-airport-admin
           predicates:
             - Path=/airport/admin/**
@@ -281,6 +281,7 @@ security:
 # 获取 apiUrl 可访问的 roleIdList
 tuoheng:
   hhz-admin-perUrl: http://192.168.11.11:9055/permission/getRoleIdList
+  airport-admin-perUrl: http://192.168.11.11:9060/permission/getRoleIdList
   freeway-admin-perUrl: http://192.168.11.11:9117/permission/getRoleIdList
   alert-admin-perUrl: http://192.168.11.11:9160/permission/getRoleIdList
   waterway-admin-perUrl: http://192.168.11.11:9120/permission/getRoleIdList

src/main/resources/application-prod.yml

@@ -267,6 +267,7 @@ security:
 tuoheng:
   hhz-admin-perUrl: https://hhz.t-aaron.com/permission/getRoleIdList
   freeway-admin-perUrl: https://freeway.t-aaron.com/permission/getRoleIdList
+  airport-admin-perUrl: https://airport.t-aaron.com/permission/getRoleIdList
   waterway-admin-perUrl: https://waterway.t-aaron.com/permission/getRoleIdList
   airmonitor-admin-perUrl: https://airmonitor.t-aaron.com/permission/getRoleIdList
   weptsp-admin-perUrl: https://weptsp.t-aaron.com/permission/getRoleIdList

src/main/resources/application-test.yml

@@ -275,6 +275,7 @@ security:
 tuoheng:
   hhz-admin-perUrl: http://172.15.1.21:9055/permission/getRoleIdList
   freeway-admin-perUrl: https://freeway-test.t-aaron.com/permission/getRoleIdList
+  airport-admin-perUrl: https://airport-test.t-aaron.com/permission/getRoleIdList
   alert-admin-perUrl: https://alert-test.t-aaron.com/permission/getRoleIdList
   waterway-admin-perUrl: https://waterway-test.t-aaron.com/permission/getRoleIdList
   weptsp-admin-perUrl: https://weptsp-test.t-aaron.com/permission/getRoleIdList

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

@@ -1,149 +0,0 @@
-spring:
-  security:
-    oauth2:
-      resource-server:
-        jwt:
-          issuer-uri: http://127.0.0.1:8090
-  cloud:
-    consul:
-      host: 127.0.0.1 # consul 所在服务地址
-      port: 8500 # consul 服务端口
-      discovery:
-        enabled: true #默认true。Consul Discovery Client是否注册到注册中心。和register同时设置成false，就不需要起consul服务。
-        register: true #是否将服务注册到Consul集群中心.。这个参数和上面的enabled参数同时设置成false，应用才不会注册注册中心，才可以不起consul服务！
-        deregister: true #默认true，服务停止时注销服务，即从服务列表中删除。设置成false的话，？？？
-        ## consul ip地址
-        hostname: 127.0.0.1
-        # 注册到consul的服务名称
-        service-name: ${spring.application.name} # 服务提供者名称,注册在consul上面的名字，在consul的调用中，是通过此名字调用的。默认服务名,不要改
-        instance-id: ${spring.application.name}:${spring.cloud.client.ip-address}:${server.port} #实例ID
-        heartbeat:
-          enabled: true
-        prefer-ip-address: true #表示注册时使用IP而不是hostname
-        health-check-path: /actuator/health #健康检查
-        health-check-interval: 10s  #配置 Consul 健康检查频率，也就是心跳频率。
-        health-check-timeout: 10s #健康检查超时
-    gateway:
-      discovery:
-        locator:
-          lowerCaseServiceId: true
-          enabled: true
-      # 跨域设置
-      globalcors:
-        add-to-simple-url-handler-mapping: true
-        cors-configurations:
-          '[/**]':
-            allowedOrigins:
-              - "http://localhost:8001"
-            allowedMethods:
-              - "GET"
-              - "POST"
-              - "DELETE"
-              - "PUT"
-              - "OPTIONS"
-            allowedHeaders: "*"
-            allowCredentials: true
-            maxAge: 360000
-      routes:
-        # 认证中心
-        - id: tuoheng-auth
-          # 使用lb协议,tuoheng-auth是服务名
-          uri: lb://tuoheng-auth
-          # 断言
-          predicates:
-            - Path=/api/auth/**
-          # 去掉前缀前两级
-          filters:
-            - StripPrefix=2
-        # 系统模块
-        - id: tuoheng-dsp-system
-          uri: lb://tuoheng-dsp-system
-          predicates:
-            - Path=/api/system/**
-          filters:
-            - StripPrefix=2
-        # 代码生成器
-        - id: tuoheng-generator
-          uri: lb://tuoheng-generator
-          predicates:
-            - Path=/api/generator/**
-          filters:
-            - StripPrefix=2
-        # 后台管理
-        - id: tuoheng-admin
-          uri: lb://tuoheng-admin
-          predicates:
-            - Path=/api/admin/**
-          filters:
-            - StripPrefix=2
-#            - name: Hystrix
-#              args:
-#                name: fallbackcmd
-#                fallbackUri: forward:/fallback
-        # 网站服务
-        - id: tuoheng-portal
-          uri: lb://tuoheng-portal
-          predicates:
-            - Path=/api/portal/**
-          filters:
-            - StripPrefix=2
-        # DSP小程序服务
-        - id: tuoheng-dsp-miniprogram
-          uri: lb://tuoheng-dsp-miniprogram
-          predicates:
-            - Path=/api/miniprogram/**
-          filters:
-            - StripPrefix=2
-        # DSP api服务
-        - id: tuoheng-dsp-api
-          uri: lb://tuoheng-dsp-api
-          predicates:
-            - 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
-    database: 0
-    # Redis服务器地址
-    host: 192.168.11.13
-    # Redis服务器连接端口
-    port: 6379
-    # Redis服务器连接密码（默认为空）
-    password:
-    # 连接超时时间（毫秒）
-    timeout: 6000
-    # 默认的数据过期时间，主要用于shiro权限管理
-    expire: 2592000
-    jedis:
-      pool:
-        max-active: 1000  # 连接池最大连接数（使用负值表示没有限制）
-        max-wait: -1      # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        max-idle: 10      # 连接池中的最大空闲连接
-        min-idle: 1       # 连接池中的最小空闲连接
-#security放行白名单配置
-security:
-  ignore:
-    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-dev.yml

@@ -4,6 +4,7 @@ spring:
       resource-server:
         jwt:
           issuer-uri: http://192.168.11.11:8090
+          #issuer-uri: http://oidc.dev.t-aaron.com
   cloud:
     consul:
       host: 192.168.11.13 # consul 所在服务地址
@@ -24,6 +25,9 @@ spring:
         health-check-interval: 10s  #配置 Consul 健康检查频率，也就是心跳频率。
         health-check-timeout: 10s #健康检查超时
     gateway:
+      httpclient:
+        websocket:
+          max-frame-payload-length: 10485760 # 单次通信提交最大数据库设置成10MB
       discovery:
         locator:
           lowerCaseServiceId: true
@@ -101,6 +105,20 @@ spring:
             - Path=/api/web/**
           filters:
             - StripPrefix=2
+        # DSP 巡检云
+        - id: tuoheng-dsp-inspection
+          uri: lb://tuoheng-dsp-inspection
+          predicates:
+            - Path=/api/inspection/**
+          filters:
+            - StripPrefix=2
+        # dsp component服务
+        - id: tuoheng-dsp-component
+          uri: lb://tuoheng-dsp-component
+          predicates:
+            - Path=/api/component/**
+          filters:
+            - StripPrefix=2
         # pilot后台管理
         - id: tuoheng-pilot-admin
           uri: lb://tuoheng-pilot-admin
@@ -122,6 +140,111 @@ spring:
             - Path=/pilot/web/**
           filters:
             - StripPrefix=2
+        # freeway后台管理
+        - id: tuoheng-freeway-admin
+          uri: lb://tuoheng-freeway-admin
+          predicates:
+            - Path=/freeway/admin/**
+          filters:
+            - StripPrefix=2
+        # freeway小程序服务
+        - id: tuoheng-freeway-miniprogram
+          uri: lb://tuoheng-freeway-miniprogram
+          predicates:
+            - Path=/freeway/miniprogram/**
+          filters:
+            - StripPrefix=2
+        # freeway api服务
+        - id: tuoheng-freeway-api
+          uri: lb://tuoheng-freeway-api
+          predicates:
+            - Path=/freeway/web/**
+          filters:
+            - StripPrefix=2
+        # oidc admin服务
+        - id: tuoheng-oidc-admin
+          uri: lb://tuoheng-oidc-admin
+          predicates:
+            - Path=/oidc/admin/**
+          filters:
+            - StripPrefix=2
+        # hhz admin服务
+        - id: tuoheng-hhz-admin
+          uri: lb://tuoheng-hhz-admin
+          predicates:
+            - Path=/hhz/admin/**
+          filters:
+            - StripPrefix=2
+        # hhz 小程序服务
+        - id: tuoheng-hhz-api
+          uri: lb://tuoheng-hhz-api
+          predicates:
+            - Path=/hhz/api/**
+          filters:
+            - StripPrefix=2
+        # waterway后台管理
+        - id: tuoheng-waterway-admin
+          uri: lb://tuoheng-waterway-admin
+          predicates:
+            - Path=/waterway/admin/**
+          filters:
+            - StripPrefix=2
+        # waterway后台管理 webSocket
+        - id: tuoheng-waterway-admin-webSocket
+          uri: lb:ws://tuoheng-waterway-admin
+          predicates:
+            - Path=/waterway/socket/**
+          filters:
+            - StripPrefix=2
+        # waterway小程序服务
+        - id: tuoheng-waterway-miniprogram
+          uri: lb://tuoheng-waterway-miniprogram
+          predicates:
+            - Path=/waterway/miniprogram/**
+          filters:
+            - StripPrefix=2
+        # waterway api服务
+        - id: tuoheng-waterway-api
+          uri: lb://tuoheng-waterway-api
+          predicates:
+            - Path=/waterway/web/**
+          filters:
+            - StripPrefix=2
+        # weptsp admin服务
+        - id: tuoheng-weptsp-admin
+          uri: lb://tuoheng-weptsp-admin
+          predicates:
+            - Path=/weptsp/admin/**
+          filters:
+            - StripPrefix=2
+        # airmonitor admin服务
+        - id: tuoheng-airmonitor-admin
+          uri: lb://tuoheng-airmonitor-admin
+          predicates:
+            - Path=/airmonitor/admin/**
+          filters:
+            - StripPrefix=2
+        # 机场平台 platform服务
+        - id: tuoheng_airport_admin
+          uri: lb://tuoheng-airport-admin
+          predicates:
+            - Path=/airport/admin/**
+          filters:
+            - StripPrefix=2
+        # 电信城管admin服务
+        - id: tuoheng-telecomumale-admin
+          uri: lb://tuoheng-telecomumale-admin
+          predicates:
+            - Path=/telecomumale/admin/**
+          filters:
+            - StripPrefix=2
+        # 电信城管mp服务
+        - id: tuoheng-telecomumale-miniprogram
+          uri: lb://tuoheng-telecomumale-miniprogram
+          predicates:
+            - Path=/telecomumale/miniprogram/**
+          filters:
+            - StripPrefix=2
   # Redis数据源
   redis:
     # 缓存库默认索引0
@@ -146,4 +269,13 @@ spring:
 security:
   ignore:
     permitUrls: /api/system/demo/msg
-    oauthUrls: /api/system/demo/hello,/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
+
+# 获取 apiUrl 可访问的 roleIdList
+tuoheng:
+  hhz-admin-perUrl: http://192.168.11.11:9055/permission/getRoleIdList
+  freeway-admin-perUrl: http://192.168.11.11:9117/permission/getRoleIdList
+  waterway-admin-perUrl: http://192.168.11.11:9120/permission/getRoleIdList
+  weptsp-admin-perUrl: http://192.168.11.11:9140/permission/getRoleIdList
+  airmonitor-admin-perUrl: http://192.168.11.11:9130/permission/getRoleIdList
+  telecomumale-admin-perUrl: http://192.168.11.11:9150/permission/getRoleIdList

target/classes/application-local.yml

@@ -101,6 +101,20 @@ spring:
             - Path=/api/web/**
           filters:
             - StripPrefix=2
+        # DSP 巡检云
+        - id: tuoheng-dsp-inspection
+          uri: lb://tuoheng-dsp-inspection
+          predicates:
+            - Path=/api/inspection/**
+          filters:
+            - StripPrefix=2
+        # dsp component服务
+        - id: tuoheng-dsp-component
+          uri: lb://tuoheng-dsp-component
+          predicates:
+            - Path=/api/component/**
+          filters:
+            - StripPrefix=2
         # pilot后台管理
         - id: tuoheng-pilot-admin
           uri: lb://tuoheng-pilot-admin
@@ -122,6 +136,55 @@ spring:
             - Path=/pilot/web/**
           filters:
             - StripPrefix=2
+        # freeway后台管理
+        - id: tuoheng-freeway-admin
+          uri: lb://tuoheng-freeway-admin
+          predicates:
+            - Path=/freeway/admin/**
+          filters:
+            - StripPrefix=2
+        # freeway小程序服务
+        - id: tuoheng-freeway-miniprogram
+          uri: lb://tuoheng-freeway-miniprogram
+          predicates:
+            - Path=/freeway/miniprogram/**
+          filters:
+            - StripPrefix=2
+        # freeway api服务
+        - id: tuoheng-freeway-api
+          uri: lb://tuoheng-freeway-api
+          predicates:
+            - Path=/freeway/web/**
+          filters:
+            - StripPrefix=2
+        # oidc admin服务
+        - id: tuoheng-oidc-admin
+          uri: lb://tuoheng-oidc-admin
+          predicates:
+            - Path=/oidc/admin/**
+          filters:
+            - StripPrefix=2
+        # hhz admin服务
+        - id: tuoheng-hhz-admin
+          uri: lb://tuoheng-hhz-admin
+          predicates:
+            - Path=/hhz/admin/**
+          filters:
+            - StripPrefix=2
+        # hhz 小程序服务
+        - id: tuoheng-hhz-api
+          uri: lb://tuoheng-hhz-api
+          predicates:
+            - Path=/hhz/api/**
+          filters:
+            - StripPrefix=2
+        # 机场平台 platform服务
+        - id: tuoheng_airport_admin
+          uri: lb://tuoheng-airport-admin
+          predicates:
+            - Path=/airport/admin/**
+          filters:
+            - StripPrefix=2
   # Redis数据源
   redis:
     # 缓存库默认索引0
@@ -146,4 +209,10 @@ spring:
 security:
   ignore:
     permitUrls: /api/system/demo/msg
-    oauthUrls: /api/system/demo/hello,/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
+
+# 获取 apiUrl 可访问的 roleIdList
+tuoheng:
+  hhz-admin-perUrl: http://127.0.0.1:9055/api/permission/getRoleIdList
+  freeway-admin-perUrl: http://192.168.11.11:9117/permission/getRoleIdList
+  waterway-admin-perUrl: http://192.168.11.11:9120/permission/getRoleIdList

target/classes/application-prod.yml

@@ -1,14 +1,19 @@
 spring:
+  security:
+    oauth2:
+      resource-server:
+        jwt:
+          issuer-uri: https://oidc.t-aaron.com
   cloud:
     consul:
-      host: 172.16.1.31 # consul 所在服务地址
+      host: 172.16.5.12 # consul 所在服务地址
       port: 8500 # consul 服务端口
       discovery:
         enabled: true #默认true。Consul Discovery Client是否注册到注册中心。和register同时设置成false，就不需要起consul服务。
         register: true #是否将服务注册到Consul集群中心.。这个参数和上面的enabled参数同时设置成false，应用才不会注册注册中心，才可以不起consul服务！
         deregister: true #默认true，服务停止时注销服务，即从服务列表中删除。设置成false的话，？？？
         ## consul ip地址
-        hostname: 172.16.1.31
+        hostname: 172.16.5.12
         # 注册到consul的服务名称
         service-name: ${spring.application.name} # 服务提供者名称,注册在consul上面的名字，在consul的调用中，是通过此名字调用的。默认服务名,不要改
         instance-id: ${spring.application.name}:${spring.cloud.client.ip-address}:${server.port} #实例ID
@@ -19,6 +24,9 @@ spring:
         health-check-interval: 10s  #配置 Consul 健康检查频率，也就是心跳频率。
         health-check-timeout: 10s #健康检查超时
     gateway:
+      httpclient:
+        websocket:
+          max-frame-payload-length: 10485760 # 单次通信提交最大数据库设置成10MB
       discovery:
         locator:
           lowerCaseServiceId: true
@@ -89,6 +97,20 @@ spring:
             - Path=/api/web/**
           filters:
             - StripPrefix=2
+        # DSP 巡检云
+        - id: tuoheng-dsp-inspection
+          uri: lb://tuoheng-dsp-inspection
+          predicates:
+            - Path=/api/inspection/**
+          filters:
+            - StripPrefix=2
+        # dsp component服务
+        - id: tuoheng-dsp-component
+          uri: lb://tuoheng-dsp-component
+          predicates:
+            - Path=/api/component/**
+          filters:
+            - StripPrefix=2
       # pilot后台管理
         - id: tuoheng-pilot-admin
           uri: lb://tuoheng-pilot-admin
@@ -110,6 +132,104 @@ spring:
             - Path=/pilot/web/**
           filters:
             - StripPrefix=2
+        # freeway后台管理
+        - id: tuoheng-freeway-admin
+          uri: lb://tuoheng-freeway-admin
+          predicates:
+            - Path=/freeway/admin/**
+          filters:
+            - StripPrefix=2
+        # freeway小程序服务
+        - id: tuoheng-freeway-miniprogram
+          uri: lb://tuoheng-freeway-miniprogram
+          predicates:
+            - Path=/freeway/miniprogram/**
+          filters:
+            - StripPrefix=2
+        # freeway api服务
+        - id: tuoheng-freeway-api
+          uri: lb://tuoheng-freeway-api
+          predicates:
+            - Path=/freeway/web/**
+          filters:
+            - StripPrefix=2
+      # oidc admin服务
+        - id: tuoheng-oidc-admin
+          uri: lb://tuoheng-oidc-admin
+          predicates:
+            - Path=/oidc/admin/**
+          filters:
+            - StripPrefix=2
+      # hhz admin服务
+        - id: tuoheng-hhz-admin
+          uri: lb://tuoheng-hhz-admin
+          predicates:
+            - Path=/hhz/admin/**
+          filters:
+            - StripPrefix=2
+        # hhz 小程序服务
+        - id: tuoheng-hhz-api
+          uri: lb://tuoheng-hhz-api
+          predicates:
+            - Path=/hhz/api/**
+          filters:
+            - StripPrefix=2
+        # waterway后台管理
+        - id: tuoheng-waterway-admin
+          uri: lb://tuoheng-waterway-admin
+          predicates:
+            - Path=/waterway/admin/**
+          filters:
+            - StripPrefix=2
+        # waterway后台管理 webSocket
+        - id: tuoheng-waterway-admin-webSocket
+          uri: lb:ws://tuoheng-waterway-admin
+          predicates:
+            - Path=/waterway/socket/**
+          filters:
+            - StripPrefix=2
+        # waterway小程序服务
+        - id: tuoheng-waterway-miniprogram
+          uri: lb://tuoheng-waterway-miniprogram
+          predicates:
+            - Path=/waterway/miniprogram/**
+          filters:
+            - StripPrefix=2
+        # waterway api服务
+        - id: tuoheng-waterway-api
+          uri: lb://tuoheng-waterway-api
+          predicates:
+            - Path=/waterway/web/**
+          filters:
+            - StripPrefix=2
+        # 机场平台 platform服务
+        - id: tuoheng_airport_admin
+          uri: lb://tuoheng-airport-admin
+          predicates:
+            - Path=/airport/admin/**
+          filters:
+            - StripPrefix=2
+        # 电信城管admin服务
+        - id: tuoheng-telecomumale-admin
+          uri: lb://tuoheng-telecomumale-admin
+          predicates:
+            - Path=/telecomumale/admin/**
+          filters:
+            - StripPrefix=2
+        # 电信城管mp服务
+        - id: tuoheng-telecomumale-miniprogram
+          uri: lb://tuoheng-telecomumale-miniprogram
+          predicates:
+            - Path=/telecomumale/miniprogram/**
+          filters:
+            - StripPrefix=2
+        # airmonitor admin服务
+        - id: tuoheng-airmonitor-admin
+          uri: lb://tuoheng-airmonitor-admin
+          predicates:
+            - Path=/airmonitor/admin/**
+          filters:
+            - StripPrefix=2
   # Redis数据源
   redis:
     # 缓存库默认索引0
@@ -134,4 +254,13 @@ spring:
 security:
   ignore:
     permitUrls: /api/system/demo/msg
-    oauthUrls: /api/system/demo/hello,/api/*/serviceInst/*/getServiceInstParam/*,/api/*/serviceInst/*/getServiceInstCaseUrl/*,/api/*/serviceInst/*/*/application,/api/*/serviceInst/*/*/questionList
+    oauthUrls: /api/system/demo/hello,/api/portal/serviceInst/*/getServiceInstParam/*,/api/portal/serviceInst/*/getServiceInstCaseUrl/*,/api/portal/serviceInst/*/*/application,/api/portal/serviceInst/*/*/questionList,/api/miniprogram/serviceInst/*/getServiceInstParam/*,/api/miniprogram/serviceInst/*/getServiceInstCaseUrl/*,/api/miniprogram/serviceInst/*/*/application,/api/miniprogram/serviceInst/*/*/questionList
+
+# 获取 apiUrl 可访问的 roleIdList
+tuoheng:
+  hhz-admin-perUrl: https://hhz.t-aaron.com/permission/getRoleIdList
+  freeway-admin-perUrl: https://freeway.t-aaron.com/permission/getRoleIdList
+  waterway-admin-perUrl: https://waterway.t-aaron.com/permission/getRoleIdList
+  airmonitor-admin-perUrl: https://airmonitor.t-aaron.com/permission/getRoleIdList
+  weptsp-admin-perUrl: https://weptsp.t-aaron.com/permission/getRoleIdList
+  telecomumale-admin-perUrl: https://telecomumale.t-aaron.com/permission/getRoleIdList

target/classes/application-test.yml

@@ -1,14 +1,20 @@
 spring:
+  security:
+    oauth2:
+      resource-server:
+        jwt:
+          #issuer-uri: http://192.168.11.241:8090
+          issuer-uri: https://login-test.t-aaron.com
   cloud:
     consul:
-      host: 192.168.11.242 # consul 所在服务地址
+      host: 172.15.1.11 # consul 所在服务地址
       port: 8500 # consul 服务端口
       discovery:
         enabled: true #默认true。Consul Discovery Client是否注册到注册中心。和register同时设置成false，就不需要起consul服务。
         register: true #是否将服务注册到Consul集群中心.。这个参数和上面的enabled参数同时设置成false，应用才不会注册注册中心，才可以不起consul服务！
         deregister: true #默认true，服务停止时注销服务，即从服务列表中删除。设置成false的话，？？？
         ## consul ip地址
-        hostname: 192.168.11.242
+        hostname: 172.15.1.11
         # 注册到consul的服务名称
         service-name: ${spring.application.name} # 服务提供者名称,注册在consul上面的名字，在consul的调用中，是通过此名字调用的。默认服务名,不要改
         instance-id: ${spring.application.name}:${spring.cloud.client.ip-address}:${server.port} #实例ID
@@ -19,6 +25,9 @@ spring:
         health-check-interval: 10s  #配置 Consul 健康检查频率，也就是心跳频率。
         health-check-timeout: 10s #健康检查超时
     gateway:
+      httpclient:
+        websocket:
+          max-frame-payload-length: 10485760 # 单次通信提交最大数据库设置成10MB
       discovery:
         locator:
           lowerCaseServiceId: true
@@ -89,6 +98,13 @@ spring:
             - Path=/api/web/**
           filters:
             - StripPrefix=2
+        # dsp component服务
+        - id: tuoheng-dsp-component
+          uri: lb://tuoheng-dsp-component
+          predicates:
+            - Path=/api/component/**
+          filters:
+            - StripPrefix=2
         # pilot后台管理
         - id: tuoheng-pilot-admin
           uri: lb://tuoheng-pilot-admin
@@ -110,12 +126,124 @@ spring:
             - Path=/pilot/web/**
           filters:
             - StripPrefix=2
+        # DSP 巡检云
+        - id: tuoheng-dsp-inspection
+          uri: lb://tuoheng-dsp-inspection
+          predicates:
+            - Path=/api/inspection/**
+          filters:
+            - StripPrefix=2
+        # freeway后台管理
+        - id: tuoheng-freeway-admin
+          uri: lb://tuoheng-freeway-admin
+          predicates:
+            - Path=/freeway/admin/**
+          filters:
+            - StripPrefix=2
+        # freeway小程序服务
+        - id: tuoheng-freeway-miniprogram
+          uri: lb://tuoheng-freeway-miniprogram
+          predicates:
+            - Path=/freeway/miniprogram/**
+          filters:
+            - StripPrefix=2
+        # freeway api服务
+        - id: tuoheng-freeway-api
+          uri: lb://tuoheng-freeway-api
+          predicates:
+            - Path=/freeway/web/**
+          filters:
+            - StripPrefix=2
+        # oidc admin服务
+        - id: tuoheng-oidc-admin
+          uri: lb://tuoheng-oidc-admin
+          predicates:
+            - Path=/oidc/admin/**
+          filters:
+            - StripPrefix=2
+        # hhz admin服务
+        - id: tuoheng-hhz-admin
+          uri: lb://tuoheng-hhz-admin
+          predicates:
+            - Path=/hhz/admin/**
+          filters:
+            - StripPrefix=2
+        # hhz 小程序服务
+        - id: tuoheng-hhz-api
+          uri: lb://tuoheng-hhz-api
+          predicates:
+            - Path=/hhz/api/**
+          filters:
+            - StripPrefix=2
+        # waterway后台管理
+        - id: tuoheng-waterway-admin
+          uri: lb://tuoheng-waterway-admin
+          predicates:
+            - Path=/waterway/admin/**
+          filters:
+            - StripPrefix=2
+        # waterway后台管理 webSocket
+        - id: tuoheng-waterway-admin-webSocket
+          uri: lb:ws://tuoheng-waterway-admin
+          predicates:
+            - Path=/waterway/socket/**
+          filters:
+            - StripPrefix=2
+        # waterway小程序服务
+        - id: tuoheng-waterway-miniprogram
+          uri: lb://tuoheng-waterway-miniprogram
+          predicates:
+            - Path=/waterway/miniprogram/**
+          filters:
+            - StripPrefix=2
+        # waterway api服务
+        - id: tuoheng-waterway-api
+          uri: lb://tuoheng-waterway-api
+          predicates:
+            - Path=/waterway/web/**
+          filters:
+            - StripPrefix=2
+        # weptsp admin服务
+        - id: tuoheng-weptsp-admin
+          uri: lb://tuoheng-weptsp-admin
+          predicates:
+            - Path=/weptsp/admin/**
+          filters:
+            - StripPrefix=2
+        # airmonitor admin服务
+        - id: tuoheng-airmonitor-admin
+          uri: lb://tuoheng-airmonitor-admin
+          predicates:
+            - Path=/airmonitor/admin/**
+          filters:
+            - StripPrefix=2
+        # 机场平台 platform服务
+        - id: tuoheng_airport_admin
+          uri: lb://tuoheng-airport-admin
+          predicates:
+            - Path=/airport/admin/**
+          filters:
+            - StripPrefix=2
+        # 电信城管admin服务
+        - id: tuoheng-telecomumale-admin
+          uri: lb://tuoheng-telecomumale-admin
+          predicates:
+            - Path=/telecomumale/admin/**
+          filters:
+            - StripPrefix=2
+        # 电信城管mp服务
+        - id: tuoheng-telecomumale-miniprogram
+          uri: lb://tuoheng-telecomumale-miniprogram
+          predicates:
+            - Path=/telecomumale/miniprogram/**
+          filters:
+            - StripPrefix=2
   # Redis数据源
   redis:
     # 缓存库默认索引0
     database: 0
     # Redis服务器地址
-    host: 192.168.11.242
+    host: r-uf6cdzjifj20jszykr.redis.rds.aliyuncs.com
     # Redis服务器连接端口
     port: 6379
     # Redis服务器连接密码（默认为空）
@@ -134,4 +262,13 @@ spring:
 security:
   ignore:
     permitUrls: /api/system/demo/msg
-    oauthUrls: /api/system/demo/hello,/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
+
+# 获取 apiUrl 可访问的 roleIdList
+tuoheng:
+  hhz-admin-perUrl: http://172.15.1.21:9055/permission/getRoleIdList
+  freeway-admin-perUrl: https://freeway-test.t-aaron.com/permission/getRoleIdList
+  waterway-admin-perUrl: https://waterway-test.t-aaron.com/permission/getRoleIdList
+  weptsp-admin-perUrl: https://weptsp-test.t-aaron.com/permission/getRoleIdList
+  airmonitor-admin-perUrl: https://airmonitor-test.t-aaron.com/permission/getRoleIdList
+  telecomumale-admin-perUrl: https://telecomumale-test.t-aaron.com/permission/getRoleIdList

target/classes/application.yml

@@ -3,7 +3,7 @@ server:
 
 spring:
   profiles:
-    active: local
+    active: dev
   application:
     name: tuoheng-gateway
 

target/maven-archiver/pom.properties

@@ -1,3 +0,0 @@
-artifactId=tuoheng_gateway
-groupId=com.tuoheng.gateway
-version=1.0.0

target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,4 +0,0 @@
-com\tuoheng\gateway\config\GatewayCorsConfig.class
-com\tuoheng\gateway\config\WebSecurityConfig.class
-com\tuoheng\gateway\config\IgnoreWhiteProperties.class
-com\tuoheng\gateway\TuohengGatewayApplication.class

target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,4 +0,0 @@
-D:\TH_workspace\tuoheng_gateway\src\main\java\com\tuoheng\gateway\config\IgnoreWhiteProperties.java
-D:\TH_workspace\tuoheng_gateway\src\main\java\com\tuoheng\gateway\config\GatewayCorsConfig.java
-D:\TH_workspace\tuoheng_gateway\src\main\java\com\tuoheng\gateway\config\WebSecurityConfig.java
-D:\TH_workspace\tuoheng_gateway\src\main\java\com\tuoheng\gateway\TuohengGatewayApplication.java