From 0e513282772e41e8e2725f532c81203caef1ce97 Mon Sep 17 00:00:00 2001 From: xiaoying Date: Mon, 8 Jan 2024 16:31:55 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=AB=98=E9=80=9F?= =?UTF-8?q?=E6=8E=88=E6=9D=83=E7=99=BD=E5=90=8D=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/tuoheng/gateway/constants/PermitPathConstant.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/tuoheng/gateway/constants/PermitPathConstant.java b/src/main/java/com/tuoheng/gateway/constants/PermitPathConstant.java index e4e5333..7b63d9e 100644 --- a/src/main/java/com/tuoheng/gateway/constants/PermitPathConstant.java +++ b/src/main/java/com/tuoheng/gateway/constants/PermitPathConstant.java @@ -41,7 +41,9 @@ public class PermitPathConstant { "/freeway/admin/airport/inspection/status/**", "/freeway/admin/airport/inspection/track/**", "/freeway/admin/cloudbox/callback/add/**", - "/freeway/admin/airport/inspection/executeTaskStatus/**" + "/freeway/admin/airport/inspection/executeTaskStatus/**", + "/telecomumale/admin/weiXin/send/message/**", + "/telecomumale/miniprogram/weiXin/**" }; public static String waterwayPermitUrlStr[] = { -- 2.27.0 From 5e040a83768fbd619049eda8e1d3dd47038bfe04 Mon Sep 17 00:00:00 2001 From: xiaoying Date: Mon, 8 Jan 2024 16:32:29 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/tuoheng/gateway/constants/PermitPathConstant.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/tuoheng/gateway/constants/PermitPathConstant.java b/src/main/java/com/tuoheng/gateway/constants/PermitPathConstant.java index 7b63d9e..388d1e8 100644 --- a/src/main/java/com/tuoheng/gateway/constants/PermitPathConstant.java +++ b/src/main/java/com/tuoheng/gateway/constants/PermitPathConstant.java @@ -42,8 +42,8 @@ public class PermitPathConstant { "/freeway/admin/airport/inspection/track/**", "/freeway/admin/cloudbox/callback/add/**", "/freeway/admin/airport/inspection/executeTaskStatus/**", - "/telecomumale/admin/weiXin/send/message/**", - "/telecomumale/miniprogram/weiXin/**" + "/freeway/admin/weiXin/send/message/**", + "/freeway/miniprogram/weiXin/**" }; public static String waterwayPermitUrlStr[] = { -- 2.27.0 From a78af96080f41f9451e6a8e52c7868bdb0f80dbe Mon Sep 17 00:00:00 2001 From: xiaoying Date: Mon, 26 Feb 2024 13:45:54 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BD=8E=E7=A9=BA?= =?UTF-8?q?=E7=BB=BC=E5=90=88=E7=AE=A1=E7=90=86=E7=B3=BB=E7=BB=9F=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E7=BD=91=E5=85=B3=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/tuoheng/gateway/commons/CommonsConfig.java | 9 +++++++++ .../com/tuoheng/gateway/config/WebSecurityConfig.java | 1 + .../tuoheng/gateway/constants/AuthorityConstant.java | 6 ++++++ .../com/tuoheng/gateway/utils/GatewayUrlPathUtil.java | 8 ++++++++ src/main/resources/application-dev.yml | 10 +++++++++- src/main/resources/application-prod.yml | 10 +++++++++- src/main/resources/application-test.yml | 10 +++++++++- 7 files changed, 51 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/tuoheng/gateway/commons/CommonsConfig.java b/src/main/java/com/tuoheng/gateway/commons/CommonsConfig.java index 33fd2c2..c5239d5 100644 --- a/src/main/java/com/tuoheng/gateway/commons/CommonsConfig.java +++ b/src/main/java/com/tuoheng/gateway/commons/CommonsConfig.java @@ -61,6 +61,10 @@ public class CommonsConfig { * 设备管理服务接口地址 */ public static String dmpPermissionUrl; + /** + * 低空综合服务接口地址 + */ + public static String lowaltitudePermissionUrl; @Value("${tuoheng.hhz-admin-perUrl}") @@ -115,4 +119,9 @@ public class CommonsConfig { digitaltwinPermissionUrl = url; } + @Value("${tuoheng.lowaltitude-admin-perUrl}") + public void setLowaltitudePermissionUrl(String url) { + lowaltitudePermissionUrl = url; + } + } diff --git a/src/main/java/com/tuoheng/gateway/config/WebSecurityConfig.java b/src/main/java/com/tuoheng/gateway/config/WebSecurityConfig.java index e80a574..e187b85 100644 --- a/src/main/java/com/tuoheng/gateway/config/WebSecurityConfig.java +++ b/src/main/java/com/tuoheng/gateway/config/WebSecurityConfig.java @@ -98,6 +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("/lowaltitude/admin/**").hasAnyAuthority(AuthorityConstant.SCOPE_ADMIN, AuthorityConstant.SCOPE_TUOHNEG_LOWALTITUDE_ADMIN) .pathMatchers("/airport/admin/**").hasAnyAuthority(AuthorityConstant.SCOPE_ADMIN, AuthorityConstant.SCOPE_TUOHNEG_AIRPORT_ADMIN) .pathMatchers("/oidc/admin/user/**").authenticated() .pathMatchers("/api/inspection/**").authenticated() diff --git a/src/main/java/com/tuoheng/gateway/constants/AuthorityConstant.java b/src/main/java/com/tuoheng/gateway/constants/AuthorityConstant.java index b4466da..bbd547e 100644 --- a/src/main/java/com/tuoheng/gateway/constants/AuthorityConstant.java +++ b/src/main/java/com/tuoheng/gateway/constants/AuthorityConstant.java @@ -94,4 +94,10 @@ public class AuthorityConstant { */ public static final String SCOPE_TUOHNEG_DMP_ADMIN = "SCOPE_tuoheng-dmp-admin"; //public static final String SCOPE_TUOHNEG_DMP_MP= "SCOPE_tuoheng-dmp-mp"; + + /** + * Lowaltitude 用户权限 + */ + public static final String SCOPE_TUOHNEG_LOWALTITUDE_ADMIN = "SCOPE_tuoheng-lowaltitude-admin"; + //public static final String SCOPE_TUOHNEG_DMP_MP= "SCOPE_tuoheng-lowaltitude-mp"; } diff --git a/src/main/java/com/tuoheng/gateway/utils/GatewayUrlPathUtil.java b/src/main/java/com/tuoheng/gateway/utils/GatewayUrlPathUtil.java index adc2822..46b2a00 100644 --- a/src/main/java/com/tuoheng/gateway/utils/GatewayUrlPathUtil.java +++ b/src/main/java/com/tuoheng/gateway/utils/GatewayUrlPathUtil.java @@ -52,6 +52,8 @@ public class GatewayUrlPathUtil { private static final String DMP_ADMIN = "tuoheng-dmp-admin"; + private static final String LOWALTITUDE_ADMIN = "tuoheng-lowaltitude-admin"; + /** * 获取 gateway 路由前缀，匹配url @@ -104,6 +106,9 @@ public class GatewayUrlPathUtil { case DMP_ADMIN: apiPath = "/dmp/admin"; break; + case LOWALTITUDE_ADMIN: + apiPath = "/lowaltitude/admin"; + break; default: break; } @@ -152,6 +157,9 @@ public class GatewayUrlPathUtil { if (clientId.equals(DMP_ADMIN)) { url = CommonsConfig.dmpPermissionUrl; } + if (clientId.equals(LOWALTITUDE_ADMIN)) { + url = CommonsConfig.lowaltitudePermissionUrl; + } log.info("getRoleIdByApiUrlPermission -url:{},token:{}", url, token); if (StringUtils.isNotBlank(url)) { HttpHeaders resultRequestHeader = new HttpHeaders(); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index f33e284..284f9a8 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -283,6 +283,13 @@ spring: - Path=/dmp/admin/** filters: - StripPrefix=2 + # 低空综合 admin服务 + - id: tuoheng-lowaltitude-admin + uri: lb://tuoheng-lowaltitude-admin + predicates: + - Path=/lowaltitude/admin/** + filters: + - StripPrefix=2 # Redis数据源 redis: # 缓存库默认索引0 @@ -321,4 +328,5 @@ tuoheng: telecomumale-admin-perUrl: http://192.168.11.11:9150/permission/getRoleIdList spacetime-admin-perUrl: http://192.168.11.11:9170/permission/getRoleIdList digitaltwin-admin-perUrl: http://192.168.11.11:9180/permission/getRoleIdList - dmp-admin-perUrl: http://192.168.11.11:9190/permission/getRoleIdList \ No newline at end of file + dmp-admin-perUrl: http://192.168.11.11:9190/permission/getRoleIdList + lowaltitude-admin-perUrl: http://192.168.11.11:9200/permission/getRoleIdList \ No newline at end of file diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 7272e87..ef45caf 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -275,6 +275,13 @@ spring: - Path=/dmp/admin/** filters: - StripPrefix=2 + # 低空综合 admin服务 + - id: tuoheng-lowaltitude-admin + uri: lb://tuoheng-lowaltitude-admin + predicates: + - Path=/lowaltitude/admin/** + filters: + - StripPrefix=2 # Redis数据源 redis: # 缓存库默认索引0 @@ -313,4 +320,5 @@ tuoheng: 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 - dmp-admin-perUrl: https://dmp.t-aaron.com/permission/getRoleIdList \ No newline at end of file + dmp-admin-perUrl: https://dmp.t-aaron.com/permission/getRoleIdList + lowaltitude-admin-perUrl: https://lowaltitude.t-aaron.com/permission/getRoleIdList \ No newline at end of file diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index 26ce9dd..aedc6a8 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -283,6 +283,13 @@ spring: - Path=/dmp/admin/** filters: - StripPrefix=2 + # 低空综合 admin服务 + - id: tuoheng-lowaltitude-admin + uri: lb://tuoheng-lowaltitude-admin + predicates: + - Path=/lowaltitude/admin/** + filters: + - StripPrefix=2 # Redis数据源 redis: # 缓存库默认索引0 @@ -321,4 +328,5 @@ tuoheng: telecomumale-admin-perUrl: https://telecomumale-test.t-aaron.com/permission/getRoleIdList spacetime-admin-perUrl: https://spacetime-test.t-aaron.com/permission/getRoleIdList digitaltwin-admin-perUrl: https://digitaltwin-test.t-aaron.com/permission/getRoleIdList - dmp-admin-perUrl: https://dmp-test.t-aaron.com/permission/getRoleIdList \ No newline at end of file + dmp-admin-perUrl: https://dmp-test.t-aaron.com/permission/getRoleIdList + lowaltitude-admin-perUrl: https://lowaltitude-test.t-aaron.com/permission/getRoleIdList \ No newline at end of file -- 2.27.0 From 241ac5e21f4d52b6947640af812bda3daa577f86 Mon Sep 17 00:00:00 2001 From: xiaoying Date: Wed, 28 Feb 2024 14:37:42 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BD=8E=E7=A9=BA?= =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=9C=8D=E5=8A=A1=E5=B9=B3=E5=8F=B0=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=90=8D=E6=9B=B4=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/tuoheng/gateway/commons/CommonsConfig.java | 8 ++++---- .../com/tuoheng/gateway/config/WebSecurityConfig.java | 2 +- .../tuoheng/gateway/constants/AuthorityConstant.java | 6 +++--- .../com/tuoheng/gateway/utils/GatewayUrlPathUtil.java | 10 +++++----- src/main/resources/application-dev.yml | 8 ++++---- src/main/resources/application-prod.yml | 8 ++++---- src/main/resources/application-test.yml | 8 ++++---- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/tuoheng/gateway/commons/CommonsConfig.java b/src/main/java/com/tuoheng/gateway/commons/CommonsConfig.java index c5239d5..37a8099 100644 --- a/src/main/java/com/tuoheng/gateway/commons/CommonsConfig.java +++ b/src/main/java/com/tuoheng/gateway/commons/CommonsConfig.java @@ -64,7 +64,7 @@ public class CommonsConfig { /** * 低空综合服务接口地址 */ - public static String lowaltitudePermissionUrl; + public static String lacsPermissionUrl; @Value("${tuoheng.hhz-admin-perUrl}") @@ -119,9 +119,9 @@ public class CommonsConfig { digitaltwinPermissionUrl = url; } - @Value("${tuoheng.lowaltitude-admin-perUrl}") - public void setLowaltitudePermissionUrl(String url) { - lowaltitudePermissionUrl = url; + @Value("${tuoheng.lacs-admin-perUrl}") + public void setLacsPermissionUrl(String url) { + lacsPermissionUrl = url; } } diff --git a/src/main/java/com/tuoheng/gateway/config/WebSecurityConfig.java b/src/main/java/com/tuoheng/gateway/config/WebSecurityConfig.java index e187b85..04cfcdb 100644 --- a/src/main/java/com/tuoheng/gateway/config/WebSecurityConfig.java +++ b/src/main/java/com/tuoheng/gateway/config/WebSecurityConfig.java @@ -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("/lowaltitude/admin/**").hasAnyAuthority(AuthorityConstant.SCOPE_ADMIN, AuthorityConstant.SCOPE_TUOHNEG_LOWALTITUDE_ADMIN) + .pathMatchers("/lacs/admin/**").hasAnyAuthority(AuthorityConstant.SCOPE_ADMIN, AuthorityConstant.SCOPE_TUOHNEG_LACS_ADMIN) .pathMatchers("/airport/admin/**").hasAnyAuthority(AuthorityConstant.SCOPE_ADMIN, AuthorityConstant.SCOPE_TUOHNEG_AIRPORT_ADMIN) .pathMatchers("/oidc/admin/user/**").authenticated() .pathMatchers("/api/inspection/**").authenticated() diff --git a/src/main/java/com/tuoheng/gateway/constants/AuthorityConstant.java b/src/main/java/com/tuoheng/gateway/constants/AuthorityConstant.java index bbd547e..997983e 100644 --- a/src/main/java/com/tuoheng/gateway/constants/AuthorityConstant.java +++ b/src/main/java/com/tuoheng/gateway/constants/AuthorityConstant.java @@ -96,8 +96,8 @@ public class AuthorityConstant { //public static final String SCOPE_TUOHNEG_DMP_MP= "SCOPE_tuoheng-dmp-mp"; /** - * Lowaltitude 用户权限 + * lacs 用户权限 */ - public static final String SCOPE_TUOHNEG_LOWALTITUDE_ADMIN = "SCOPE_tuoheng-lowaltitude-admin"; - //public static final String SCOPE_TUOHNEG_DMP_MP= "SCOPE_tuoheng-lowaltitude-mp"; + public static final String SCOPE_TUOHNEG_LACS_ADMIN = "SCOPE_tuoheng-lacs-admin"; + //public static final String SCOPE_TUOHNEG_DMP_MP= "SCOPE_tuoheng-lacs-mp"; } diff --git a/src/main/java/com/tuoheng/gateway/utils/GatewayUrlPathUtil.java b/src/main/java/com/tuoheng/gateway/utils/GatewayUrlPathUtil.java index 46b2a00..8609981 100644 --- a/src/main/java/com/tuoheng/gateway/utils/GatewayUrlPathUtil.java +++ b/src/main/java/com/tuoheng/gateway/utils/GatewayUrlPathUtil.java @@ -52,7 +52,7 @@ public class GatewayUrlPathUtil { private static final String DMP_ADMIN = "tuoheng-dmp-admin"; - private static final String LOWALTITUDE_ADMIN = "tuoheng-lowaltitude-admin"; + private static final String LACS_ADMIN = "tuoheng-lacs-admin"; /** @@ -106,8 +106,8 @@ public class GatewayUrlPathUtil { case DMP_ADMIN: apiPath = "/dmp/admin"; break; - case LOWALTITUDE_ADMIN: - apiPath = "/lowaltitude/admin"; + case LACS_ADMIN: + apiPath = "/lacs/admin"; break; default: break; @@ -157,8 +157,8 @@ public class GatewayUrlPathUtil { if (clientId.equals(DMP_ADMIN)) { url = CommonsConfig.dmpPermissionUrl; } - if (clientId.equals(LOWALTITUDE_ADMIN)) { - url = CommonsConfig.lowaltitudePermissionUrl; + if (clientId.equals(LACS_ADMIN)) { + url = CommonsConfig.lacsPermissionUrl; } log.info("getRoleIdByApiUrlPermission -url:{},token:{}", url, token); if (StringUtils.isNotBlank(url)) { diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 284f9a8..cd51561 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -284,10 +284,10 @@ spring: filters: - StripPrefix=2 # 低空综合 admin服务 - - id: tuoheng-lowaltitude-admin - uri: lb://tuoheng-lowaltitude-admin + - id: tuoheng-lacs-admin + uri: lb://tuoheng-lacs-admin predicates: - - Path=/lowaltitude/admin/** + - Path=/lacs/admin/** filters: - StripPrefix=2 # Redis数据源 @@ -329,4 +329,4 @@ tuoheng: spacetime-admin-perUrl: http://192.168.11.11:9170/permission/getRoleIdList digitaltwin-admin-perUrl: http://192.168.11.11:9180/permission/getRoleIdList dmp-admin-perUrl: http://192.168.11.11:9190/permission/getRoleIdList - lowaltitude-admin-perUrl: http://192.168.11.11:9200/permission/getRoleIdList \ No newline at end of file + lacs-admin-perUrl: http://192.168.11.11:9200/permission/getRoleIdList \ No newline at end of file diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index ef45caf..2ce31ef 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -276,10 +276,10 @@ spring: filters: - StripPrefix=2 # 低空综合 admin服务 - - id: tuoheng-lowaltitude-admin - uri: lb://tuoheng-lowaltitude-admin + - id: tuoheng-lacs-admin + uri: lb://tuoheng-lacs-admin predicates: - - Path=/lowaltitude/admin/** + - Path=/lacs/admin/** filters: - StripPrefix=2 # Redis数据源 @@ -321,4 +321,4 @@ tuoheng: spacetime-admin-perUrl: https://spacetime.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 - lowaltitude-admin-perUrl: https://lowaltitude.t-aaron.com/permission/getRoleIdList \ No newline at end of file + lacs-admin-perUrl: https://lacs.t-aaron.com/permission/getRoleIdList \ No newline at end of file diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index aedc6a8..eb5d2d3 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -284,10 +284,10 @@ spring: filters: - StripPrefix=2 # 低空综合 admin服务 - - id: tuoheng-lowaltitude-admin - uri: lb://tuoheng-lowaltitude-admin + - id: tuoheng-lacs-admin + uri: lb://tuoheng-lacs-admin predicates: - - Path=/lowaltitude/admin/** + - Path=/lacs/admin/** filters: - StripPrefix=2 # Redis数据源 @@ -329,4 +329,4 @@ tuoheng: spacetime-admin-perUrl: https://spacetime-test.t-aaron.com/permission/getRoleIdList digitaltwin-admin-perUrl: https://digitaltwin-test.t-aaron.com/permission/getRoleIdList dmp-admin-perUrl: https://dmp-test.t-aaron.com/permission/getRoleIdList - lowaltitude-admin-perUrl: https://lowaltitude-test.t-aaron.com/permission/getRoleIdList \ No newline at end of file + lacs-admin-perUrl: https://lacs-test.t-aaron.com/permission/getRoleIdList \ No newline at end of file -- 2.27.0 From 1f6eb31554eff05f1a638986bcb0e43f1b5d34e8 Mon Sep 17 00:00:00 2001 From: xiaoying Date: Tue, 5 Mar 2024 09:01:06 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BD=8E=E7=A9=BA?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=AB=AF=E5=8F=A3=E4=B8=BA9220?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index cd51561..8bd3e45 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -329,4 +329,4 @@ tuoheng: spacetime-admin-perUrl: http://192.168.11.11:9170/permission/getRoleIdList digitaltwin-admin-perUrl: http://192.168.11.11:9180/permission/getRoleIdList dmp-admin-perUrl: http://192.168.11.11:9190/permission/getRoleIdList - lacs-admin-perUrl: http://192.168.11.11:9200/permission/getRoleIdList \ No newline at end of file + lacs-admin-perUrl: http://192.168.11.11:9220/permission/getRoleIdList \ No newline at end of file -- 2.27.0 From fda20f60350ba9438316b9002ac112d4a24ce732 Mon Sep 17 00:00:00 2001 From: xiaoying Date: Tue, 5 Mar 2024 16:10:36 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/tuoheng/gateway/config/WebSecurityConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/tuoheng/gateway/config/WebSecurityConfig.java b/src/main/java/com/tuoheng/gateway/config/WebSecurityConfig.java index 04cfcdb..d09c34a 100644 --- a/src/main/java/com/tuoheng/gateway/config/WebSecurityConfig.java +++ b/src/main/java/com/tuoheng/gateway/config/WebSecurityConfig.java @@ -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("/lacs/admin/**").hasAnyAuthority(AuthorityConstant.SCOPE_ADMIN, AuthorityConstant.SCOPE_TUOHNEG_LACS_ADMIN) + //.pathMatchers("/lacs/admin/**").hasAnyAuthority(AuthorityConstant.SCOPE_ADMIN, AuthorityConstant.SCOPE_TUOHNEG_LACS_ADMIN) .pathMatchers("/airport/admin/**").hasAnyAuthority(AuthorityConstant.SCOPE_ADMIN, AuthorityConstant.SCOPE_TUOHNEG_AIRPORT_ADMIN) .pathMatchers("/oidc/admin/user/**").authenticated() .pathMatchers("/api/inspection/**").authenticated() -- 2.27.0 From 5065097b48982582643c9e01c9c8cb7b3b45fc56 Mon Sep 17 00:00:00 2001 From: wanghaoran Date: Sat, 25 May 2024 16:13:26 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=B5=E4=BF=A1?= =?UTF-8?q?=E5=9F=8E=E7=AE=A1=E5=B9=B3=E5=8F=B0=E7=99=BD=E5=90=8D=E5=8D=95?= =?UTF-8?q?=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/tuoheng/gateway/constants/PermitPathConstant.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/tuoheng/gateway/constants/PermitPathConstant.java b/src/main/java/com/tuoheng/gateway/constants/PermitPathConstant.java index 388d1e8..3bc6012 100644 --- a/src/main/java/com/tuoheng/gateway/constants/PermitPathConstant.java +++ b/src/main/java/com/tuoheng/gateway/constants/PermitPathConstant.java @@ -99,7 +99,8 @@ public class PermitPathConstant { "/telecomumale/admin/cloudbox/callback/add/**", "/telecomumale/admin/airport/inspection/executeTaskStatus/**", "/telecomumale/admin/weiXin/send/message/**", - "/telecomumale/miniprogram/weiXin/**" + "/telecomumale/miniprogram/weiXin/**", + "/telecomumale/admin/oidcLogin/**" }; public static String alertleUrlStr[] = { "/alert/admin/third/event/**", -- 2.27.0