Merge branch 'develop' of gitadmin/tuoheng_gateway into release

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

@@ -79,7 +79,7 @@ public class WebSecurityConfig {
                 .pathMatchers(airmonitorPermitPath).permitAll()
                 .pathMatchers(telecomumalePermitPath).permitAll()
                 .pathMatchers(alertPermitPath).permitAll()
-                //.pathMatchers(airportPermitPath).permitAll()
+                .pathMatchers(airportPermitPath).permitAll()
                 .pathMatchers(oidcPermitPath).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)
@@ -98,7 +98,7 @@ public class WebSecurityConfig {
                 .pathMatchers("/spacetime/admin/**").hasAnyAuthority(AuthorityConstant.SCOPE_ADMIN, AuthorityConstant.SCOPE_TUOHNEG_SPACETIME_ADMIN)
                 .pathMatchers("/digitaltwin/admin/**").hasAnyAuthority(AuthorityConstant.SCOPE_ADMIN, AuthorityConstant.SCOPE_TUOHNEG_DIGITALTWIN_ADMIN)
                 .pathMatchers("/dmp/admin/**").hasAnyAuthority(AuthorityConstant.SCOPE_ADMIN, AuthorityConstant.SCOPE_TUOHNEG_DMP_ADMIN)
-                //.pathMatchers("/airport/admin/**").hasAnyAuthority(AuthorityConstant.SCOPE_ADMIN, AuthorityConstant.SCOPE_TUOHNEG_AIRPORT_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/resources/application-prod.yml

@@ -268,6 +268,13 @@ spring:
             - Path=/digitaltwin/admin/**
           filters:
             - StripPrefix=2
+        # 设备管理 admin服务
+        - id: tuoheng-dmp-admin
+          uri: lb://tuoheng-dmp-admin
+          predicates:
+            - Path=/dmp/admin/**
+          filters:
+            - StripPrefix=2
   # Redis数据源
   redis:
     # 缓存库默认索引0
@@ -305,4 +312,5 @@ tuoheng:
   telecomumale-admin-perUrl: https://telecomumale.t-aaron.com/permission/getRoleIdList
   alert-admin-perUrl: https://alert.t-aaron.com/permission/getRoleIdList
   spacetime-admin-perUrl: https://spacetime.t-aaron.com/permission/getRoleIdList
-  digitaltwin-admin-perUrl: https://digitaltwin.t-aaron.com/permission/getRoleIdList
+  digitaltwin-admin-perUrl: https://digitaltwin.t-aaron.com/permission/getRoleIdList
+  dmp-admin-perUrl: https://dmp.t-aaron.com/permission/getRoleIdList