瀏覽代碼

新增电信城管相关配置

pull/106/head
xiaoying 1 年之前
父節點
當前提交
95b65f035d
共有 8 個文件被更改,包括 56 次插入3 次删除
  1. +9
    -0
      src/main/java/com/tuoheng/gateway/commons/CommonsConfig.java
  2. +1
    -0
      src/main/java/com/tuoheng/gateway/config/WebSecurityConfig.java
  3. +6
    -0
      src/main/java/com/tuoheng/gateway/constants/AuthorityConstant.java
  4. +3
    -0
      src/main/java/com/tuoheng/gateway/constants/PermitPathConstant.java
  5. +8
    -0
      src/main/java/com/tuoheng/gateway/utils/GatewayUrlPathUtil.java
  6. +9
    -1
      src/main/resources/application-dev.yml
  7. +11
    -1
      src/main/resources/application-prod.yml
  8. +9
    -1
      src/main/resources/application-test.yml

+ 9
- 0
src/main/java/com/tuoheng/gateway/commons/CommonsConfig.java 查看文件

* 大气权限接口地址 * 大气权限接口地址
*/ */
public static String airmonitorPermissionUrl; public static String airmonitorPermissionUrl;
/**
* 电信城管权限接口地址
*/
public static String telecomumalePermissionUrl;




@Value("${tuoheng.hhz-admin-perUrl}") @Value("${tuoheng.hhz-admin-perUrl}")
airmonitorPermissionUrl = url; airmonitorPermissionUrl = url;
} }


@Value("${tuoheng.telecomumale-admin-perUrl}")
public void setTelecomumalePermissionUrl(String url) {
telecomumalePermissionUrl = url;
}

} }

+ 1
- 0
src/main/java/com/tuoheng/gateway/config/WebSecurityConfig.java 查看文件

.pathMatchers("/oidc/admin/tenant/**", "/oidc/admin/client/**").hasAnyAuthority(AuthorityConstant.SCOPE_ADMIN, AuthorityConstant.SCOPE_TUOHNEG_OIDC_ADMIN) .pathMatchers("/oidc/admin/tenant/**", "/oidc/admin/client/**").hasAnyAuthority(AuthorityConstant.SCOPE_ADMIN, AuthorityConstant.SCOPE_TUOHNEG_OIDC_ADMIN)
.pathMatchers("/waterway/admin/**").hasAnyAuthority(AuthorityConstant.SCOPE_ADMIN, AuthorityConstant.SCOPE_TUOHNEG_WATERWAY_ADMIN) .pathMatchers("/waterway/admin/**").hasAnyAuthority(AuthorityConstant.SCOPE_ADMIN, AuthorityConstant.SCOPE_TUOHNEG_WATERWAY_ADMIN)
.pathMatchers("/waterway/miniprogram/**").hasAnyAuthority(AuthorityConstant.SCOPE_ADMIN, AuthorityConstant.SCOPE_TUOHNEG_WATERWAY_MP) .pathMatchers("/waterway/miniprogram/**").hasAnyAuthority(AuthorityConstant.SCOPE_ADMIN, AuthorityConstant.SCOPE_TUOHNEG_WATERWAY_MP)
.pathMatchers("/telecomumale/admin/**").hasAnyAuthority(AuthorityConstant.SCOPE_ADMIN, AuthorityConstant.SCOPE_TUOHNEG_TELECOMUMALE_ADMIN)
.pathMatchers("/weptsp/admin/**").hasAnyAuthority(AuthorityConstant.SCOPE_ADMIN, AuthorityConstant.SCOPE_TUOHNEG_WEPTSP_ADMIN) .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("/airmonitor/admin/**").hasAnyAuthority(AuthorityConstant.SCOPE_ADMIN, AuthorityConstant.SCOPE_TUOHNEG_AIRMONITOR_ADMIN)
.pathMatchers("/oidc/admin/user/**").authenticated() .pathMatchers("/oidc/admin/user/**").authenticated()

+ 6
- 0
src/main/java/com/tuoheng/gateway/constants/AuthorityConstant.java 查看文件

*/ */
public static final String SCOPE_TUOHNEG_AIRMONITOR_ADMIN = "SCOPE_tuoheng-airmonitor-admin"; public static final String SCOPE_TUOHNEG_AIRMONITOR_ADMIN = "SCOPE_tuoheng-airmonitor-admin";
//public static final String SCOPE_TUOHNEG_AIRPORT_MP= "SCOPE_tuoheng-weptsp-mp"; //public static final String SCOPE_TUOHNEG_AIRPORT_MP= "SCOPE_tuoheng-weptsp-mp";

/**
* Telecomumale 用户权限
*/
public static final String SCOPE_TUOHNEG_TELECOMUMALE_ADMIN = "SCOPE_tuoheng-telecomumale-admin";
//public static final String SCOPE_TUOHNEG_AIRPORT_MP= "SCOPE_tuoheng-weptsp-mp";
} }

+ 3
- 0
src/main/java/com/tuoheng/gateway/constants/PermitPathConstant.java 查看文件



public static String weptspPermitUrlStr[] = { public static String weptspPermitUrlStr[] = {
"/weptsp/admin/download/workStreamExcel/**", "/weptsp/admin/download/workStreamExcel/**",
"/weptsp/admin/inspection/uploadFlightUrl/**",
"/weptsp/admin/inspection/updateTaskByCode/**",
"/weptsp/admin/dsp/callback/**"
}; };


public static String airmonitorPermitUrlStr[] = { public static String airmonitorPermitUrlStr[] = {

+ 8
- 0
src/main/java/com/tuoheng/gateway/utils/GatewayUrlPathUtil.java 查看文件



private static final String AIRMONITOR_ADMIN = "tuoheng-airmonitor-admin"; private static final String AIRMONITOR_ADMIN = "tuoheng-airmonitor-admin";


private static final String TELECOMUMALE_ADMIN = "tuoheng-telecomumale-admin";

/** /**
* 获取 gateway 路由前缀,匹配url * 获取 gateway 路由前缀,匹配url
* *
case AIRMONITOR_ADMIN: case AIRMONITOR_ADMIN:
apiPath = "/airmonitor/admin"; apiPath = "/airmonitor/admin";
break; break;
case TELECOMUMALE_ADMIN:
apiPath = "/telecomumale/admin";
break;
default: default:
break; break;
} }
if (clientId.equals(AIRMONITOR_ADMIN)) { if (clientId.equals(AIRMONITOR_ADMIN)) {
url = CommonsConfig.airmonitorPermissionUrl; url = CommonsConfig.airmonitorPermissionUrl;
} }
if (clientId.equals(TELECOMUMALE_ADMIN)) {
url = CommonsConfig.telecomumalePermissionUrl;
}
log.info("getRoleIdByApiUrlPermission -url:{},token:{}", url, token); log.info("getRoleIdByApiUrlPermission -url:{},token:{}", url, token);
if (StringUtils.isNotBlank(url)) { if (StringUtils.isNotBlank(url)) {
HttpHeaders resultRequestHeader = new HttpHeaders(); HttpHeaders resultRequestHeader = new HttpHeaders();

+ 9
- 1
src/main/resources/application-dev.yml 查看文件

- Path=/airport/admin/** - Path=/airport/admin/**
filters: filters:
- StripPrefix=2 - StripPrefix=2
# 电信城管admin服务
- id: tuoheng-telecomumale-admin
uri: lb://tuoheng-telecomumale-admin
predicates:
- Path=/telecomumale/admin/**
filters:
- StripPrefix=2
# Redis数据源 # Redis数据源
redis: redis:
# 缓存库默认索引0 # 缓存库默认索引0
freeway-admin-perUrl: http://192.168.11.11:9117/permission/getRoleIdList freeway-admin-perUrl: http://192.168.11.11:9117/permission/getRoleIdList
waterway-admin-perUrl: http://192.168.11.11:9120/permission/getRoleIdList waterway-admin-perUrl: http://192.168.11.11:9120/permission/getRoleIdList
weptsp-admin-perUrl: http://192.168.11.11:9140/permission/getRoleIdList weptsp-admin-perUrl: http://192.168.11.11:9140/permission/getRoleIdList
airmonitor-admin-perUrl: http://192.168.11.11:9130/permission/getRoleIdList
airmonitor-admin-perUrl: http://192.168.11.11:9130/permission/getRoleIdList
telecomumale-admin-perUrl: http://192.168.11.11:9150/permission/getRoleIdList

+ 11
- 1
src/main/resources/application-prod.yml 查看文件

- Path=/airport/admin/** - Path=/airport/admin/**
filters: filters:
- StripPrefix=2 - StripPrefix=2
# 电信城管admin服务
- id: tuoheng-telecomumale-admin
uri: lb://tuoheng-telecomumale-admin
predicates:
- Path=/telecomumale/admin/**
filters:
- StripPrefix=2
# Redis数据源 # Redis数据源
redis: redis:
# 缓存库默认索引0 # 缓存库默认索引0
tuoheng: tuoheng:
hhz-admin-perUrl: https://hhz.t-aaron.com/permission/getRoleIdList hhz-admin-perUrl: https://hhz.t-aaron.com/permission/getRoleIdList
freeway-admin-perUrl: https://freeway.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
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

+ 9
- 1
src/main/resources/application-test.yml 查看文件

- Path=/airport/admin/** - Path=/airport/admin/**
filters: filters:
- StripPrefix=2 - StripPrefix=2
# 电信城管admin服务
- id: tuoheng-telecomumale-admin
uri: lb://tuoheng-telecomumale-admin
predicates:
- Path=/telecomumale/admin/**
filters:
- StripPrefix=2
# Redis数据源 # Redis数据源
redis: redis:
# 缓存库默认索引0 # 缓存库默认索引0
freeway-admin-perUrl: https://freeway-test.t-aaron.com/permission/getRoleIdList freeway-admin-perUrl: https://freeway-test.t-aaron.com/permission/getRoleIdList
waterway-admin-perUrl: https://waterway-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 weptsp-admin-perUrl: https://weptsp-test.t-aaron.com/permission/getRoleIdList
airmonitor-admin-perUrl: https://airmonitor-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

Loading…
取消
儲存