From cb31b698f025cf7b3d9d63df1e58cb47ff999441 Mon Sep 17 00:00:00 2001 From: caiyuchao Date: Fri, 27 Dec 2024 15:09:26 +0800 Subject: [PATCH] feat: add feign httpclient --- sql/wfc_config_db/wfc_config_db.sql | 2 +- .../wfc/omada/api/account/OmadaSsoApi.java | 3 +- .../api/account/OmadaUserAndRoleApi.java | 3 +- .../omada/api/batch/OmadaBatchOpenApiApi.java | 3 +- .../wfc/omada/api/client/OmadaClientApi.java | 3 +- .../api/client/OmadaClientInsightApi.java | 3 +- .../org/wfc/omada/api/device/OmadaApApi.java | 3 +- .../wfc/omada/api/device/OmadaDeviceApi.java | 3 +- .../omada/api/device/OmadaFirmwareApi.java | 3 +- .../wfc/omada/api/device/OmadaGatewayApi.java | 3 +- .../wfc/omada/api/device/OmadaSwitchApi.java | 3 +- .../OmadaDeviceManagementSettingApi.java | 3 +- .../api/globalsetting/OmadaLicenseApi.java | 3 +- .../globalsetting/OmadaWebhookSettingApi.java | 3 +- .../api/hotspot/OmadaAuthorizedClientApi.java | 13 ++++- .../api/hotspot/OmadaFormAuthDataApi.java | 3 +- .../omada/api/hotspot/OmadaLocalUserApi.java | 3 +- .../omada/api/hotspot/OmadaVoucherApi.java | 3 +- .../api/insight/OmadaThreatManagementApi.java | 3 +- .../org/wfc/omada/api/log/OmadaLogApi.java | 3 +- .../omada/api/log/OmadaLogTemplateApi.java | 3 +- .../maintenance/OmadaBackupAndRestoreApi.java | 3 +- .../OmadaHistoryDataRetentionApi.java | 3 +- .../omada/api/monitor/OmadaDashboardApi.java | 3 +- .../wfc/omada/api/msp/OmadaCustomerApi.java | 3 +- .../api/msp/OmadaMspBatchOpenApiApi.java | 3 +- .../wfc/omada/api/msp/OmadaMspDeviceApi.java | 3 +- .../msp/OmadaMspHistoryDataRetentionApi.java | 3 +- .../wfc/omada/api/msp/OmadaMspLicenseApi.java | 3 +- .../org/wfc/omada/api/msp/OmadaMspLogApi.java | 3 +- .../wfc/omada/api/msp/OmadaMspSettingApi.java | 3 +- .../wfc/omada/api/msp/OmadaMspSiteApi.java | 3 +- .../org/wfc/omada/api/msp/OmadaMspSsoApi.java | 3 +- .../omada/api/msp/OmadaMspUserAndRoleApi.java | 3 +- .../api/msp/OmadaMspWebhookSettingApi.java | 3 +- .../omada/api/organization/OmadaSiteApi.java | 3 +- .../organization/OmadaSiteTemplateApi.java | 3 +- .../omada/api/sitesetting/OmadaAclApi.java | 3 +- .../OmadaApplicationControlApi.java | 3 +- .../sitesetting/OmadaAttackDefenseApi.java | 3 +- .../sitesetting/OmadaAuthenticationApi.java | 3 +- .../sitesetting/OmadaBandwidthControlApi.java | 3 +- .../api/sitesetting/OmadaFirewallApi.java | 3 +- .../api/sitesetting/OmadaGatewayQoSApi.java | 3 +- .../omada/api/sitesetting/OmadaIdsIpsApi.java | 3 +- .../api/sitesetting/OmadaIpMacBindingApi.java | 3 +- .../api/sitesetting/OmadaMacFilteringApi.java | 3 +- .../omada/api/sitesetting/OmadaNatApi.java | 3 +- .../api/sitesetting/OmadaOuiBasedVlanApi.java | 3 +- .../api/sitesetting/OmadaProfilesApi.java | 3 +- .../api/sitesetting/OmadaRoutingApi.java | 3 +- .../api/sitesetting/OmadaScheduleApi.java | 3 +- .../api/sitesetting/OmadaServiceApi.java | 3 +- .../api/sitesetting/OmadaSessionLimitApi.java | 3 +- .../omada/api/sitesetting/OmadaSimApi.java | 3 +- .../OmadaSiteConfigurationApi.java | 3 +- .../omada/api/sitesetting/OmadaSslVpnApi.java | 3 +- .../api/sitesetting/OmadaUrlFilteringApi.java | 3 +- .../omada/api/sitesetting/OmadaVoIpApi.java | 3 +- .../omada/api/sitesetting/OmadaVpnApi.java | 3 +- .../api/sitesetting/OmadaWiredNetworkApi.java | 3 +- .../api/sitesetting/OmadaWireguardVpnApi.java | 3 +- .../sitesetting/OmadaWirelessIdsIpsApi.java | 3 +- .../sitesetting/OmadaWirelessNetworkApi.java | 3 +- .../wfc/omada/config/FeignHttpsConfig.java | 55 ------------------- wfc-common/wfc-common-core/pom.xml | 5 ++ 66 files changed, 78 insertions(+), 183 deletions(-) delete mode 100644 wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/config/FeignHttpsConfig.java diff --git a/sql/wfc_config_db/wfc_config_db.sql b/sql/wfc_config_db/wfc_config_db.sql index 32185e6..9dfb93a 100644 --- a/sql/wfc_config_db/wfc_config_db.sql +++ b/sql/wfc_config_db/wfc_config_db.sql @@ -68,7 +68,7 @@ INSERT INTO `config_info` VALUES (15, 'wfc-gen-dev.yml', 'DEFAULT_GROUP', '# spr INSERT INTO `config_info` VALUES (16, 'wfc-job-dev.yml', 'DEFAULT_GROUP', '# spring配置\nspring:\n redis:\n host: wfc-redis\n port: 6379\n password: \n datasource:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://wfc-mysql:3306/wfc_system_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: 123456\n\n# mybatis配置\nmybatis:\n # 搜索指定包别名\n typeAliasesPackage: org.wfc.job.domain\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\n mapperLocations: classpath:mapper/**/*.xml\n\n# swagger配置\nswagger:\n title: 定时任务接口文档\n license: Powered By wfc\n licenseUrl: https://wfc.vip\n', '1376deec876c0878df743b4d96c7f125', '2024-11-18 18:11:28', '2024-12-13 21:47:34', NULL, '192.168.2.116', '', 'wfc-dev', '定时任务', '', '', 'yaml', '', ''); INSERT INTO `config_info` VALUES (17, 'wfc-file-dev.yml', 'DEFAULT_GROUP', '# 本地文件上传 \nfile:\n domain: http://127.0.0.1:9300\n path: /home/wfc/upload\n prefix: /statics\n\n# FastDFS配置\nfdfs:\n domain: http://8.129.231.12\n soTimeout: 3000\n connectTimeout: 2000\n trackerList: 8.129.231.12:22122\n\n# Minio配置\nminio:\n url: http://8.129.231.12:9000\n accessKey: minioadmin\n secretKey: minioadmin\n bucketName: test', '580197933f0f0b2ba468a0916b911d4b', '2024-11-18 18:11:28', '2024-12-13 21:44:58', NULL, '192.168.2.116', '', 'wfc-dev', '文件服务', '', '', 'yaml', '', ''); INSERT INTO `config_info` VALUES (18, 'sentinel-wfc-gateway', 'DEFAULT_GROUP', '[\r\n {\r\n \"resource\": \"wfc-auth\",\r\n \"count\": 500,\r\n \"grade\": 1,\r\n \"limitApp\": \"default\",\r\n \"strategy\": 0,\r\n \"controlBehavior\": 0\r\n },\r\n {\r\n \"resource\": \"wfc-system\",\r\n \"count\": 1000,\r\n \"grade\": 1,\r\n \"limitApp\": \"default\",\r\n \"strategy\": 0,\r\n \"controlBehavior\": 0\r\n },\r\n {\r\n \"resource\": \"wfc-gen\",\r\n \"count\": 200,\r\n \"grade\": 1,\r\n \"limitApp\": \"default\",\r\n \"strategy\": 0,\r\n \"controlBehavior\": 0\r\n },\r\n {\r\n \"resource\": \"wfc-job\",\r\n \"count\": 300,\r\n \"grade\": 1,\r\n \"limitApp\": \"default\",\r\n \"strategy\": 0,\r\n \"controlBehavior\": 0\r\n }\r\n]', 'a8b3ec396dd09d5f2ba494cc80a7afa0', '2024-11-18 18:11:28', '2024-11-18 18:11:28', '', '192.168.88.14', '', 'wfc-dev', '限流策略', NULL, NULL, 'json', NULL, ''); -INSERT INTO `config_info` VALUES (19, 'application-test.yml', 'DEFAULT_GROUP', 'spring:\n autoconfigure:\n exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure\n mvc:\n pathmatch:\n matching-strategy: ant_path_matcher\n # 资源信息\n messages:\n # 国际化资源文件路径\n basename: i18n/messages\n\n# feign 配置\nfeign:\n sentinel:\n enabled: true\n okhttp:\n enabled: true\n httpclient:\n enabled: false\n client:\n config:\n default:\n connectTimeout: 10000\n readTimeout: 10000\n compression:\n request:\n enabled: true\n min-request-size: 8192\n response:\n enabled: true\n\n# 暴露监控端点\nmanagement:\n endpoints:\n web:\n exposure:\n include: \'*\'\n', '333d0b5dd60a01407c0107d0e4aec172', '2024-11-18 18:11:56', '2024-11-28 20:03:55', NULL, '192.168.88.14', '', 'wfc-test', '通用配置', '', '', 'yaml', '', ''); +INSERT INTO `config_info` VALUES (19, 'application-test.yml', 'DEFAULT_GROUP', 'spring:\n autoconfigure:\n exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure\n mvc:\n pathmatch:\n matching-strategy: ant_path_matcher\n # 资源信息\n messages:\n # 国际化资源文件路径\n basename: i18n/messages\n\n# feign 配置\nfeign:\n sentinel:\n enabled: true\n okhttp:\n enabled: false\n httpclient:\n enabled: true\n disable-ssl-validation: true\n client:\n config:\n default:\n connectTimeout: 60000\n readTimeout: 60000\n compression:\n request:\n enabled: true\n min-request-size: 8192\n response:\n enabled: true\n\n# 暴露监控端点\nmanagement:\n endpoints:\n web:\n exposure:\n include: \'*\'\n', '333d0b5dd60a01407c0107d0e4aec172', '2024-11-18 18:11:56', '2024-11-28 20:03:55', NULL, '192.168.88.14', '', 'wfc-test', '通用配置', '', '', 'yaml', '', ''); INSERT INTO `config_info` VALUES (20, 'wfc-gateway-test.yml', 'DEFAULT_GROUP', 'spring:\n redis:\n host: wfc-redis\n port: 6379\n password:\n cloud:\n gateway:\n discovery:\n locator:\n lowerCaseServiceId: true\n enabled: true\n routes:\n # 认证中心\n - id: wfc-auth\n uri: lb://wfc-auth\n predicates:\n - Path=/auth/**\n filters:\n # 验证码处理\n - CacheRequestFilter\n - ValidateCodeFilter\n - StripPrefix=1\n # 代码生成\n - id: wfc-gen\n uri: lb://wfc-gen\n predicates:\n - Path=/code/**\n filters:\n - StripPrefix=1\n # 定时任务\n - id: wfc-job\n uri: lb://wfc-job\n predicates:\n - Path=/schedule/**\n filters:\n - StripPrefix=1\n # 系统模块\n - id: wfc-system\n uri: lb://wfc-system\n predicates:\n - Path=/system/**\n filters:\n - StripPrefix=1\n # 用户模块\n - id: wfc-modules-user\n uri: lb://wfc-modules-user\n predicates:\n - Path=/u/**\n filters:\n - StripPrefix=1\n # 文件服务\n - id: wfc-file\n uri: lb://wfc-file\n predicates:\n - Path=/file/**\n filters:\n - StripPrefix=1\n # payment\n - id: wfc-payment\n uri: lb://wfc-payment\n predicates:\n - Path=/payment/**\n filters:\n - StripPrefix=1 \n\n# 安全配置\nsecurity:\n # 验证码\n captcha:\n enabled: true\n mailEnabled: true\n type: math\n # 防止XSS攻击\n xss:\n enabled: true\n excludeUrls:\n - /system/notice\n # 不校验白名单\n ignore:\n whites:\n - /auth/logout\n - /auth/login\n - /auth/register\n - /*/v2/api-docs\n - /*/v3/api-docs\n - /csrf\n - /system/email/code\n - /system/user/checkRepeat\n - /u/user/checkRepeat\n\n# springdoc配置\nspringdoc:\n webjars:\n # 访问前缀\n prefix:', 'eec87fd6097c3d5c35d88da9f8280f10', '2024-11-18 18:11:56', '2024-12-26 09:45:05', NULL, '172.100.88.1', '', 'wfc-test', '网关模块', '', '', 'yaml', '', ''); INSERT INTO `config_info` VALUES (21, 'wfc-auth-test.yml', 'DEFAULT_GROUP', 'spring:\n redis:\n host: wfc-redis\n port: 6379\n password:\n# springdoc配置\nspringdoc:\n gatewayUrl: http://wfc-gateway:8080/${spring.application.name}\n api-docs:\n # 是否开启接口文档\n enabled: true\n info:\n # 标题\n title: \'授权模块接口文档\'\n # 描述\n description: \'授权模块接口描述\'\n # 作者信息\n contact:\n name: wfc\n url: https://wfc.vip\n', 'd77ab6f041b802a9d077756fa36a1fe7', '2024-11-18 18:11:56', '2024-12-13 21:49:53', NULL, '192.168.2.116', '', 'wfc-test', '认证中心', '', '', 'yaml', '', ''); INSERT INTO `config_info` VALUES (22, 'wfc-monitor-test.yml', 'DEFAULT_GROUP', '# spring\nspring:\n security:\n user:\n name: wfc\n password: 123456\n boot:\n admin:\n ui:\n title: \n', '6494d8b29fceace33c96fc69cdaf0ec6', '2024-11-18 18:11:56', '2024-12-13 21:50:08', NULL, '192.168.2.116', '', 'wfc-test', '监控中心', '', '', 'yaml', '', ''); diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/account/OmadaSsoApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/account/OmadaSsoApi.java index 963c1e1..0a49363 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/account/OmadaSsoApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/account/OmadaSsoApi.java @@ -21,7 +21,6 @@ import org.wfc.omada.api.account.model.OperationResponseGridVoIdpMetadataDetailO import org.wfc.omada.api.account.model.OperationResponseResponseIdVo; import org.wfc.omada.api.account.model.OperationResponseWithoutResult; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import javax.validation.Valid; import javax.validation.constraints.NotNull; @@ -29,7 +28,7 @@ import javax.validation.constraints.NotNull; @Validated @Api(value = "OmadaSso", description = "the OmadaSso API") -@FeignClient(name="OmadaSsoApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaSsoApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaSsoApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/account/OmadaUserAndRoleApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/account/OmadaUserAndRoleApi.java index 868f3ea..0798457 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/account/OmadaUserAndRoleApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/account/OmadaUserAndRoleApi.java @@ -26,7 +26,6 @@ import org.wfc.omada.api.account.model.OperationResponseObject; import org.wfc.omada.api.account.model.OperationResponseUserDetailVo; import org.wfc.omada.api.account.model.OperationResponseWithoutResult; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import javax.validation.Valid; import javax.validation.constraints.NotNull; @@ -34,7 +33,7 @@ import javax.validation.constraints.NotNull; @Validated @Api(value = "OmadaUserAndRole", description = "the OmadaUserAndRole API") -@FeignClient(name="OmadaUserAndRoleApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaUserAndRoleApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaUserAndRoleApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/batch/OmadaBatchOpenApiApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/batch/OmadaBatchOpenApiApi.java index 21bef86..01ee13e 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/batch/OmadaBatchOpenApiApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/batch/OmadaBatchOpenApiApi.java @@ -14,14 +14,13 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.wfc.omada.api.batch.model.BatchRequestEntity; import org.wfc.omada.api.batch.model.OperationResponseBatchResponseEntity; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import javax.validation.Valid; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2024-12-04T11:47:27.319+08:00[Asia/Shanghai]") @Validated @Api(value = "OmadaBatchOpenApi", description = "the OmadaBatchOpenApi API") -@FeignClient(name="OmadaBatchOpenApiApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaBatchOpenApiApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaBatchOpenApiApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/client/OmadaClientApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/client/OmadaClientApi.java index 6a44064..daa43e4 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/client/OmadaClientApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/client/OmadaClientApi.java @@ -20,7 +20,6 @@ import org.wfc.omada.api.client.model.OperationResponseClientDetail; import org.wfc.omada.api.client.model.OperationResponseClientGridVoClientInfo; import org.wfc.omada.api.client.model.OperationResponseWithoutResult; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import javax.validation.Valid; import javax.validation.constraints.NotNull; @@ -28,7 +27,7 @@ import javax.validation.constraints.NotNull; @Validated @Api(value = "OmadaClient", description = "the OmadaClient API") -@FeignClient(name="OmadaClientApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaClientApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaClientApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/client/OmadaClientInsightApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/client/OmadaClientInsightApi.java index eb0f4fe..8e4620a 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/client/OmadaClientInsightApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/client/OmadaClientInsightApi.java @@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.wfc.omada.api.client.model.OperationResponseGridVoClientHistoryInfo; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import javax.validation.Valid; import javax.validation.constraints.NotNull; @@ -22,7 +21,7 @@ import javax.validation.constraints.NotNull; @Validated @Api(value = "OmadaClientInsight", description = "the OmadaClientInsight API") -@FeignClient(value = "OmadaClientInsightApi",url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(value = "OmadaClientInsightApi",url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaClientInsightApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/device/OmadaApApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/device/OmadaApApi.java index e53dcaf..06d5d33 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/device/OmadaApApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/device/OmadaApApi.java @@ -13,7 +13,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.device.model.ApBridgeConfig; import org.wfc.omada.api.device.model.ApGeneralConfig; import org.wfc.omada.api.device.model.ApIpSetting; @@ -47,7 +46,7 @@ import javax.validation.Valid; @Validated @Api(value = "OmadaAp", description = "the OmadaAp API") -@FeignClient(name="OmadaApApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaApApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaApApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/device/OmadaDeviceApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/device/OmadaDeviceApi.java index 0499d45..ea244f3 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/device/OmadaDeviceApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/device/OmadaDeviceApi.java @@ -15,7 +15,6 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.multipart.MultipartFile; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.device.model.ActiveDeviceMultiSiteOpenApiVo; import org.wfc.omada.api.device.model.ActiveDeviceOpenApiVo; import org.wfc.omada.api.device.model.ActiveDeviceRespVo; @@ -65,7 +64,7 @@ import java.util.List; @Validated @Api(value = "OmadaDevice", description = "the OmadaDevice API") -@FeignClient(name="OmadaDeviceApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaDeviceApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaDeviceApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/device/OmadaFirmwareApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/device/OmadaFirmwareApi.java index dee13bd..65ed953 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/device/OmadaFirmwareApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/device/OmadaFirmwareApi.java @@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.device.model.AutoCheckUpgradeCreateInfo; import org.wfc.omada.api.device.model.InlineObject; import org.wfc.omada.api.device.model.ModelFwReleaseNoteReqInfo; @@ -51,7 +50,7 @@ import java.util.List; @Validated @Api(value = "OmadaFirmware", description = "the OmadaFirmware API") -@FeignClient(name="OmadaFirmwareApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaFirmwareApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaFirmwareApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/device/OmadaGatewayApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/device/OmadaGatewayApi.java index 46f0fc5..4795c10 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/device/OmadaGatewayApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/device/OmadaGatewayApi.java @@ -13,7 +13,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.device.model.GatewayGeneralConfig; import org.wfc.omada.api.device.model.GatewayPortSettingConfig; import org.wfc.omada.api.device.model.GatewayPortsConfigEntity; @@ -31,7 +30,7 @@ import javax.validation.Valid; @Validated @Api(value = "OmadaGateway", description = "the OmadaGateway API") -@FeignClient(name="OmadaGatewayApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaGatewayApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaGatewayApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/device/OmadaSwitchApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/device/OmadaSwitchApi.java index 621076b..75a95d0 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/device/OmadaSwitchApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/device/OmadaSwitchApi.java @@ -13,7 +13,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.device.model.BatchProfileOverride; import org.wfc.omada.api.device.model.EasyManagedSwitchGeneralConfig; import org.wfc.omada.api.device.model.OperationResponseEasyManageOverviewInfo; @@ -37,7 +36,7 @@ import javax.validation.Valid; @Validated @Api(value = "OmadaSwitch", description = "the OmadaSwitch API") -@FeignClient(name="OmadaSwitchApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaSwitchApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaSwitchApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/globalsetting/OmadaDeviceManagementSettingApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/globalsetting/OmadaDeviceManagementSettingApi.java index 4c143fb..9ab1287 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/globalsetting/OmadaDeviceManagementSettingApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/globalsetting/OmadaDeviceManagementSettingApi.java @@ -13,7 +13,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.globalsetting.model.DeviceAccessManagementSetting; import org.wfc.omada.api.globalsetting.model.OperationResponseDeviceAccessManagementSetting; import org.wfc.omada.api.globalsetting.model.OperationResponseWithoutResult; @@ -23,7 +22,7 @@ import javax.validation.Valid; @Validated @Api(value = "OmadaDeviceManagementSetting", description = "the OmadaDeviceManagementSetting API") -@FeignClient(name="OmadaDeviceManagementSettingApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaDeviceManagementSettingApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaDeviceManagementSettingApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/globalsetting/OmadaLicenseApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/globalsetting/OmadaLicenseApi.java index edfbb5d..645f5c7 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/globalsetting/OmadaLicenseApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/globalsetting/OmadaLicenseApi.java @@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.globalsetting.model.LicenseAutoActiveOpenApiVo; import org.wfc.omada.api.globalsetting.model.LicenseAutoRenewOpenApiVo; import org.wfc.omada.api.globalsetting.model.LicenseBindAvailableNumOpenApiVo; @@ -28,7 +27,7 @@ import javax.validation.constraints.NotNull; @Validated @Api(value = "OmadaLicense", description = "the OmadaLicense API") -@FeignClient(name="OmadaLicenseApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaLicenseApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaLicenseApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/globalsetting/OmadaWebhookSettingApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/globalsetting/OmadaWebhookSettingApi.java index 6ff5591..0265a8b 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/globalsetting/OmadaWebhookSettingApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/globalsetting/OmadaWebhookSettingApi.java @@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.globalsetting.model.OpenApiWebhookSettingAddVo; import org.wfc.omada.api.globalsetting.model.OpenApiWebhookSettingEditVo; import org.wfc.omada.api.globalsetting.model.OpenApiWebhookSettingTestVo; @@ -28,7 +27,7 @@ import javax.validation.constraints.NotNull; @Validated @Api(value = "OmadaWebhookSetting", description = "the OmadaWebhookSetting API") -@FeignClient(name="OmadaWebhookSettingApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaWebhookSettingApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaWebhookSettingApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/hotspot/OmadaAuthorizedClientApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/hotspot/OmadaAuthorizedClientApi.java index 61b04db..fdf5512 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/hotspot/OmadaAuthorizedClientApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/hotspot/OmadaAuthorizedClientApi.java @@ -13,11 +13,10 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; -import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.hotspot.model.ExtendOpenApiVo; import org.wfc.omada.api.hotspot.model.OperationResponseGridVoAuthClientOpenApiVo; import org.wfc.omada.api.hotspot.model.OperationResponseWithoutResult; +import org.wfc.omada.config.FeignConfig; import javax.validation.Valid; import javax.validation.constraints.NotNull; @@ -25,7 +24,7 @@ import javax.validation.constraints.NotNull; @Validated @Api(value = "OmadaAuthorizedClient", description = "the OmadaAuthorizedClient API") -@FeignClient(name="OmadaAuthorizedClientApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaAuthorizedClientApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaAuthorizedClientApi { /** @@ -114,4 +113,12 @@ public interface OmadaAuthorizedClientApi { method = RequestMethod.GET) ResponseEntity getHotspotAuthedClients(@ApiParam(value = "Site ID",required=true) @PathVariable("siteId") String siteId,@NotNull @ApiParam(value = "Start page number. Start from 1.", required = true) @Valid @RequestParam(value = "page", required = true) Integer page,@NotNull @ApiParam(value = "Number of entries per page. It should be within the range of 1–1000.", required = true) @Valid @RequestParam(value = "pageSize", required = true) Integer pageSize,@ApiParam(value = "Sort parameter may be one of asc or desc. Optional parameter. If it is not carried, it means it is not sorted by this field. When there are more than one, the first one takes effect") @Valid @RequestParam(value = "sorts.name", required = false) String sortsName,@ApiParam(value = "Sort parameter may be one of asc or desc. Optional parameter. If it is not carried, it means it is not sorted by this field. When there are more than one, the first one takes effect") @Valid @RequestParam(value = "sorts.mac", required = false) String sortsMac,@ApiParam(value = "Sort parameter may be one of asc or desc. Optional parameter. If it is not carried, it means it is not sorted by this field. When there are more than one, the first one takes effect") @Valid @RequestParam(value = "sorts.ip", required = false) String sortsIp,@ApiParam(value = "Sort parameter may be one of asc or desc. Optional parameter. If it is not carried, it means it is not sorted by this field. When there are more than one, the first one takes effect") @Valid @RequestParam(value = "sorts.authType", required = false) String sortsAuthType,@ApiParam(value = "Sort parameter may be one of asc or desc. Optional parameter. If it is not carried, it means it is not sorted by this field. When there are more than one, the first one takes effect") @Valid @RequestParam(value = "sorts.ssidOrNetwork", required = false) String sortsSsidOrNetwork,@ApiParam(value = "Sort parameter may be one of asc or desc. Optional parameter. If it is not carried, it means it is not sorted by this field. When there are more than one, the first one takes effect") @Valid @RequestParam(value = "sorts.download", required = false) String sortsDownload,@ApiParam(value = "Sort parameter may be one of asc or desc. Optional parameter. If it is not carried, it means it is not sorted by this field. When there are more than one, the first one takes effect") @Valid @RequestParam(value = "sorts.upload", required = false) String sortsUpload,@ApiParam(value = "Sort parameter may be one of asc or desc. Optional parameter. If it is not carried, it means it is not sorted by this field. When there are more than one, the first one takes effect") @Valid @RequestParam(value = "sorts.status", required = false) String sortsStatus,@ApiParam(value = "Sort parameter may be one of asc or desc. Optional parameter. If it is not carried, it means it is not sorted by this field. When there are more than one, the first one takes effect") @Valid @RequestParam(value = "sorts.start", required = false) String sortsStart,@ApiParam(value = "Sort parameter may be one of asc or desc. Optional parameter. If it is not carried, it means it is not sorted by this field. When there are more than one, the first one takes effect") @Valid @RequestParam(value = "sorts.end", required = false) String sortsEnd,@ApiParam(value = "Sort parameter may be one of asc or desc. Optional parameter. If it is not carried, it means it is not sorted by this field. When there are more than one, the first one takes effect") @Valid @RequestParam(value = "sorts.duration", required = false) String sortsDuration,@ApiParam(value = "Fuzzy query parameters, support field client_mac,client_name,voucher.code,local_user.user_name,form_name,auth_admin,ssid_name,network_name") @Valid @RequestParam(value = "searchKey", required = false) String searchKey); + @ApiOperation(value = "Get authentication record list", nickname = "getHotspotAuthedClients", notes = "Get all authentication records in a site with the given omadacId, siteId.

The interface requires one of the permissions:
Site Hotspot Manager View Only
Site Insight Manager View Only

The possible error code for the interface in the returned body is one of the following error codes (non generic error codes):
-1005 - Operation forbidden.", response = OperationResponseGridVoAuthClientOpenApiVo.class, tags={ "Omada/Authorized Client","Authorized Client", }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "OK", response = OperationResponseGridVoAuthClientOpenApiVo.class) }) + @RequestMapping(value = "/openapi/v1/${omada.omadac-id}/sites/{siteId}/hotspot/authed-records", + produces = "*/*", + method = RequestMethod.GET) + ResponseEntity getHotspotAuthedClients(@ApiParam(value = "Site ID",required=true) @PathVariable("siteId") String siteId,@NotNull @ApiParam(value = "Start page number. Start from 1.", required = true) @Valid @RequestParam(value = "page", required = true) Integer page,@NotNull @ApiParam(value = "Number of entries per page. It should be within the range of 1–1000.", required = true) @Valid @RequestParam(value = "pageSize", required = true) Integer pageSize,@ApiParam(value = "Fuzzy query parameters, support field client_mac,client_name,voucher.code,local_user.user_name,form_name,auth_admin,ssid_name,network_name") @Valid @RequestParam(value = "searchKey", required = false) String searchKey); + } diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/hotspot/OmadaFormAuthDataApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/hotspot/OmadaFormAuthDataApi.java index bb15419..bcd93ff 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/hotspot/OmadaFormAuthDataApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/hotspot/OmadaFormAuthDataApi.java @@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.hotspot.model.CreateFormAuthOpenApiVo; import org.wfc.omada.api.hotspot.model.OperationResponseCreatedResIdOpenApiVo; import org.wfc.omada.api.hotspot.model.OperationResponseFormAuthOpenApiVo; @@ -29,7 +28,7 @@ import javax.validation.constraints.NotNull; @Validated @Api(value = "OmadaFormAuthData", description = "the OmadaFormAuthData API") -@FeignClient(name="OmadaFormAuthDataApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaFormAuthDataApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaFormAuthDataApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/hotspot/OmadaLocalUserApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/hotspot/OmadaLocalUserApi.java index 2aba8ed..eb1516d 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/hotspot/OmadaLocalUserApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/hotspot/OmadaLocalUserApi.java @@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.hotspot.model.CreateLocalUserOpenApiVo; import org.wfc.omada.api.hotspot.model.OperationResponseCreatedResIdOpenApiVo; import org.wfc.omada.api.hotspot.model.OperationResponseGridVoLocalUserOpenApiVo; @@ -27,7 +26,7 @@ import javax.validation.constraints.NotNull; @Validated @Api(value = "OmadaLocalUser", description = "the OmadaLocalUser API") -@FeignClient(name="OmadaLocalUserApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaLocalUserApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaLocalUserApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/hotspot/OmadaVoucherApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/hotspot/OmadaVoucherApi.java index db7d7b3..c0edfdb 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/hotspot/OmadaVoucherApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/hotspot/OmadaVoucherApi.java @@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.hotspot.model.CreateVoucherGroupOpenApiVo; import org.wfc.omada.api.hotspot.model.HotspotSiteSettingOpenApiVo; import org.wfc.omada.api.hotspot.model.OperationResponseAllTimeVoucherSummaryOpenApiVo; @@ -37,7 +36,7 @@ import javax.validation.constraints.NotNull; @Validated @Api(value = "OmadaVoucher", description = "the OmadaVoucher API") -@FeignClient(name="OmadaVoucherApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaVoucherApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaVoucherApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/insight/OmadaThreatManagementApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/insight/OmadaThreatManagementApi.java index b7c1b2e..56855a3 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/insight/OmadaThreatManagementApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/insight/OmadaThreatManagementApi.java @@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.insight.model.DeleteIpsThreat; import org.wfc.omada.api.insight.model.IpsOperateThreat; import org.wfc.omada.api.insight.model.OperationResponseGetIpsThreatDetail; @@ -27,7 +26,7 @@ import javax.validation.constraints.NotNull; @Validated @Api(value = "OmadaThreatManagement", description = "the OmadaThreatManagement API") -@FeignClient(name="OmadaThreatManagementApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaThreatManagementApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaThreatManagementApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/log/OmadaLogApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/log/OmadaLogApi.java index 60337e9..7b1ef0f 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/log/OmadaLogApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/log/OmadaLogApi.java @@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.log.model.AuditLogNotificationSettingEditOpenApiVo; import org.wfc.omada.api.log.model.LogNotificationSettingEditOpenApiV2Vo; import org.wfc.omada.api.log.model.LogNotificationSettingEditOpenApiVo; @@ -29,7 +28,7 @@ import javax.validation.constraints.NotNull; @Validated @Api(value = "OmadaLog", description = "the OmadaLog API") -@FeignClient(name="OmadaLogApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaLogApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaLogApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/log/OmadaLogTemplateApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/log/OmadaLogTemplateApi.java index 8707f55..ea37f21 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/log/OmadaLogTemplateApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/log/OmadaLogTemplateApi.java @@ -13,7 +13,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.log.model.AuditLogNotificationSettingEditOpenApiVo; import org.wfc.omada.api.log.model.OperationResponseAuditLogNotificationSettingOpenApiVo; import org.wfc.omada.api.log.model.OperationResponseWithoutResult; @@ -23,7 +22,7 @@ import javax.validation.Valid; @Validated @Api(value = "OmadaLogTemplate", description = "the OmadaLogTemplate API") -@FeignClient(name="OmadaLogTemplateApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaLogTemplateApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaLogTemplateApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/maintenance/OmadaBackupAndRestoreApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/maintenance/OmadaBackupAndRestoreApi.java index 6d459ea..8284e7c 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/maintenance/OmadaBackupAndRestoreApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/maintenance/OmadaBackupAndRestoreApi.java @@ -13,7 +13,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.maintenance.model.BackupFileListVo; import org.wfc.omada.api.maintenance.model.BackupResultOpenApiVo; import org.wfc.omada.api.maintenance.model.BatchSiteBackupVo; @@ -32,7 +31,7 @@ import javax.validation.Valid; @Validated @Api(value = "OmadaBackupAndRestore", description = "the OmadaBackupAndRestore API") -@FeignClient(name="OmadaBackupAndRestoreApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaBackupAndRestoreApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaBackupAndRestoreApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/maintenance/OmadaHistoryDataRetentionApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/maintenance/OmadaHistoryDataRetentionApi.java index 588f9e9..e35d917 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/maintenance/OmadaHistoryDataRetentionApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/maintenance/OmadaHistoryDataRetentionApi.java @@ -13,7 +13,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.maintenance.model.ModifyHistoryRetentionOpenApiVo; import org.wfc.omada.api.maintenance.model.OperationResponseHistoryRetentionOpenApiVo; import org.wfc.omada.api.maintenance.model.OperationResponseWithoutResult; @@ -23,7 +22,7 @@ import javax.validation.Valid; @Validated @Api(value = "OmadaHistoryDataRetention", description = "the OmadaHistoryDataRetention API") -@FeignClient(name="OmadaHistoryDataRetentionApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaHistoryDataRetentionApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaHistoryDataRetentionApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/monitor/OmadaDashboardApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/monitor/OmadaDashboardApi.java index a05f888..c4e08ca 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/monitor/OmadaDashboardApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/monitor/OmadaDashboardApi.java @@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.monitor.model.BatchEditTabs; import org.wfc.omada.api.monitor.model.CreateTabOpenApiVo; import org.wfc.omada.api.monitor.model.OperationResponseApChannelStats; @@ -42,7 +41,7 @@ import javax.validation.constraints.NotNull; @Validated @Api(value = "OmadaDashboard", description = "the OmadaDashboard API") -@FeignClient(name="OmadaDashboardApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaDashboardApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaDashboardApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/msp/OmadaCustomerApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/msp/OmadaCustomerApi.java index 5ce4f76..87f7fd0 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/msp/OmadaCustomerApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/msp/OmadaCustomerApi.java @@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.msp.model.CustomerOpenApiVo; import org.wfc.omada.api.msp.model.OperationResponseCreateCustomerOmadacVo; import org.wfc.omada.api.msp.model.OperationResponseCustomerInfoOpenApiVo; @@ -28,7 +27,7 @@ import javax.validation.constraints.NotNull; @Validated @Api(value = "OmadaCustomer", description = "the OmadaCustomer API") -@FeignClient(name="OmadaCustomerApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaCustomerApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaCustomerApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/msp/OmadaMspBatchOpenApiApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/msp/OmadaMspBatchOpenApiApi.java index 5b9b35a..d1af26e 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/msp/OmadaMspBatchOpenApiApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/msp/OmadaMspBatchOpenApiApi.java @@ -13,7 +13,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.msp.model.BatchRequestEntity; import org.wfc.omada.api.msp.model.OperationResponseBatchResponseEntity; @@ -22,7 +21,7 @@ import javax.validation.Valid; @Validated @Api(value = "OmadaMspBatchOpenApi", description = "the OmadaMspBatchOpenApi API") -@FeignClient(name="OmadaMspBatchOpenApiApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaMspBatchOpenApiApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaMspBatchOpenApiApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/msp/OmadaMspDeviceApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/msp/OmadaMspDeviceApi.java index 788f096..2dd5dc4 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/msp/OmadaMspDeviceApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/msp/OmadaMspDeviceApi.java @@ -13,7 +13,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.msp.model.OperationResponseGridVoMspKnownDeviceOpenApiVo; import org.wfc.omada.api.msp.model.OperationResponseGridVoMspUnknownDeviceOpenApiVo; import org.wfc.omada.api.msp.model.OperationResponseListTagRespOpenApiVo; @@ -24,7 +23,7 @@ import javax.validation.constraints.NotNull; @Validated @Api(value = "OmadaMspDevice", description = "the OmadaMspDevice API") -@FeignClient(name="OmadaMspDeviceApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaMspDeviceApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaMspDeviceApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/msp/OmadaMspHistoryDataRetentionApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/msp/OmadaMspHistoryDataRetentionApi.java index a6f8296..ac644fe 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/msp/OmadaMspHistoryDataRetentionApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/msp/OmadaMspHistoryDataRetentionApi.java @@ -13,7 +13,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.msp.model.ModifyHistoryRetentionOpenApiVo; import org.wfc.omada.api.msp.model.OperationResponseHistoryRetentionOpenApiVo; import org.wfc.omada.api.msp.model.OperationResponseWithoutResult; @@ -23,7 +22,7 @@ import javax.validation.Valid; @Validated @Api(value = "OmadaMspHistoryDataRetention", description = "the OmadaMspHistoryDataRetention API") -@FeignClient(name="OmadaMspHistoryDataRetentionApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaMspHistoryDataRetentionApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaMspHistoryDataRetentionApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/msp/OmadaMspLicenseApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/msp/OmadaMspLicenseApi.java index 625a2c8..cfc3bd0 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/msp/OmadaMspLicenseApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/msp/OmadaMspLicenseApi.java @@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.msp.model.GridVoUsedLicenseDetailOpenApiVo; import org.wfc.omada.api.msp.model.LicenseAssignmentOpenApiVo; import org.wfc.omada.api.msp.model.LicenseAutoActiveOpenApiVo; @@ -30,7 +29,7 @@ import javax.validation.constraints.NotNull; @Validated @Api(value = "OmadaMspLicense", description = "the OmadaMspLicense API") -@FeignClient(name="OmadaMspLicenseApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaMspLicenseApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaMspLicenseApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/msp/OmadaMspLogApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/msp/OmadaMspLogApi.java index 97edd36..db6e09a 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/msp/OmadaMspLogApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/msp/OmadaMspLogApi.java @@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.msp.model.AuditLogNotificationSettingEditOpenApiVo; import org.wfc.omada.api.msp.model.LogNotificationSettingEditOpenApiV2Vo; import org.wfc.omada.api.msp.model.LogNotificationSettingEditOpenApiVo; @@ -29,7 +28,7 @@ import javax.validation.constraints.NotNull; @Validated @Api(value = "OmadaMspLog", description = "the OmadaMspLog API") -@FeignClient(name="OmadaMspLogApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaMspLogApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaMspLogApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/msp/OmadaMspSettingApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/msp/OmadaMspSettingApi.java index 5203696..b5d2144 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/msp/OmadaMspSettingApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/msp/OmadaMspSettingApi.java @@ -13,7 +13,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.msp.model.ModifyMspGeneralSettingOpenApiVo; import org.wfc.omada.api.msp.model.MspUiInterfaceOpenApiVo; import org.wfc.omada.api.msp.model.OperationResponseMspGeneralSettingOpenApiVo; @@ -25,7 +24,7 @@ import javax.validation.Valid; @Validated @Api(value = "OmadaMspSetting", description = "the OmadaMspSetting API") -@FeignClient(name="OmadaMspSettingApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaMspSettingApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaMspSettingApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/msp/OmadaMspSiteApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/msp/OmadaMspSiteApi.java index 446ada4..14c67d6 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/msp/OmadaMspSiteApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/msp/OmadaMspSiteApi.java @@ -13,7 +13,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.msp.model.OperationResponseGridVoSiteSummaryInfo; import org.wfc.omada.api.msp.model.SiteTag; @@ -24,7 +23,7 @@ import java.util.List; @Validated @Api(value = "OmadaMspSite", description = "the OmadaMspSite API") -@FeignClient(name="OmadaMspSiteApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaMspSiteApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaMspSiteApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/msp/OmadaMspSsoApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/msp/OmadaMspSsoApi.java index 1bde3a3..870b9e7 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/msp/OmadaMspSsoApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/msp/OmadaMspSsoApi.java @@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.msp.model.IdpMetadataOpenApiVo; import org.wfc.omada.api.msp.model.MspExternalUserGroupOpenApiVo; import org.wfc.omada.api.msp.model.OperationResponseGridVoIdpMetadataDetailOpenApiVo; @@ -29,7 +28,7 @@ import javax.validation.constraints.NotNull; @Validated @Api(value = "OmadaMspSso", description = "the OmadaMspSso API") -@FeignClient(name="OmadaMspSsoApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaMspSsoApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaMspSsoApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/msp/OmadaMspUserAndRoleApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/msp/OmadaMspUserAndRoleApi.java index c6ecc4a..5ee21b7 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/msp/OmadaMspUserAndRoleApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/msp/OmadaMspUserAndRoleApi.java @@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.msp.model.CreateMspUserVo; import org.wfc.omada.api.msp.model.DeleteUserVo; import org.wfc.omada.api.msp.model.ModifyMspRoleVo; @@ -35,7 +34,7 @@ import javax.validation.constraints.NotNull; @Validated @Api(value = "OmadaMspUserAndRole", description = "the OmadaMspUserAndRole API") -@FeignClient(name="OmadaMspUserAndRoleApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaMspUserAndRoleApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaMspUserAndRoleApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/msp/OmadaMspWebhookSettingApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/msp/OmadaMspWebhookSettingApi.java index 27ba033..2ceadba 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/msp/OmadaMspWebhookSettingApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/msp/OmadaMspWebhookSettingApi.java @@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.msp.model.OpenApiWebhookSettingAddVo; import org.wfc.omada.api.msp.model.OpenApiWebhookSettingEditVo; import org.wfc.omada.api.msp.model.OpenApiWebhookSettingTestVo; @@ -28,7 +27,7 @@ import javax.validation.constraints.NotNull; @Validated @Api(value = "OmadaMspWebhookSetting", description = "the OmadaMspWebhookSetting API") -@FeignClient(name="OmadaMspWebhookSettingApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaMspWebhookSettingApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaMspWebhookSettingApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/organization/OmadaSiteApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/organization/OmadaSiteApi.java index dbf2be9..af5b5c7 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/organization/OmadaSiteApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/organization/OmadaSiteApi.java @@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.organization.model.BatchSiteCopyVo; import org.wfc.omada.api.organization.model.BatchSiteImportVo; import org.wfc.omada.api.organization.model.CreateSiteByTemplate; @@ -40,7 +39,7 @@ import java.util.List; @Validated @Api(value = "OmadaSite", description = "the OmadaSite API") -@FeignClient(name="OmadaSiteApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaSiteApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaSiteApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/organization/OmadaSiteTemplateApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/organization/OmadaSiteTemplateApi.java index 2916ebe..d30454e 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/organization/OmadaSiteTemplateApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/organization/OmadaSiteTemplateApi.java @@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.organization.model.BatchBindDeviceOpenApiVo; import org.wfc.omada.api.organization.model.BatchBindDeviceResultOpenApiVo; import org.wfc.omada.api.organization.model.BatchCopySiteTemplateOpenApiVo; @@ -42,7 +41,7 @@ import javax.validation.constraints.NotNull; @Validated @Api(value = "OmadaSiteTemplate", description = "the OmadaSiteTemplate API") -@FeignClient(name="OmadaSiteTemplateApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaSiteTemplateApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaSiteTemplateApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaAclApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaAclApi.java index 6772950..3e85db8 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaAclApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaAclApi.java @@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.sitesetting.model.DragSortIndexOpenapiVo; import org.wfc.omada.api.sitesetting.model.EapAclConfig; import org.wfc.omada.api.sitesetting.model.GatewayAclConfig; @@ -34,7 +33,7 @@ import javax.validation.constraints.NotNull; @Validated @Api(value = "OmadaAcl", description = "the OmadaAcl API") -@FeignClient(name="OmadaAclApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaAclApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaAclApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaApplicationControlApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaApplicationControlApi.java index cc01ff3..c8f8168 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaApplicationControlApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaApplicationControlApi.java @@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.sitesetting.model.AddFilterEntity; import org.wfc.omada.api.sitesetting.model.AddRuleEntity; import org.wfc.omada.api.sitesetting.model.ClearDpiDataRequest; @@ -39,7 +38,7 @@ import javax.validation.constraints.NotNull; @Validated @Api(value = "OmadaApplicationControl", description = "the OmadaApplicationControl API") -@FeignClient(name="OmadaApplicationControlApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaApplicationControlApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaApplicationControlApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaAttackDefenseApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaAttackDefenseApi.java index d1ba75e..9abdf87 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaAttackDefenseApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaAttackDefenseApi.java @@ -13,7 +13,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.sitesetting.model.AttackDefenseSetting; import org.wfc.omada.api.sitesetting.model.OperationResponseAttackDefenseSetting; import org.wfc.omada.api.sitesetting.model.OperationResponseWithoutResult; @@ -23,7 +22,7 @@ import javax.validation.Valid; @Validated @Api(value = "OmadaAttackDefense", description = "the OmadaAttackDefense API") -@FeignClient(name="OmadaAttackDefenseApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaAttackDefenseApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaAttackDefenseApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaAuthenticationApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaAuthenticationApi.java index 05f85b0..e483585 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaAuthenticationApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaAuthenticationApi.java @@ -15,7 +15,6 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.multipart.MultipartFile; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.sitesetting.model.Dot1xEapOpenApiVo; import org.wfc.omada.api.sitesetting.model.Dot1xSwitchOpenApiVo; import org.wfc.omada.api.sitesetting.model.OperationResponseDot1xEapOpenApiVo; @@ -39,7 +38,7 @@ import javax.validation.constraints.NotNull; @Validated @Api(value = "OmadaAuthentication", description = "the OmadaAuthentication API") -@FeignClient(name="OmadaAuthenticationApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaAuthenticationApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaAuthenticationApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaBandwidthControlApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaBandwidthControlApi.java index 8d2d866..9b4393b 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaBandwidthControlApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaBandwidthControlApi.java @@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.sitesetting.model.BandwidthControl; import org.wfc.omada.api.sitesetting.model.BandwidthControlRule; import org.wfc.omada.api.sitesetting.model.OperationResponseBandwidthControl; @@ -28,7 +27,7 @@ import javax.validation.constraints.NotNull; @Validated @Api(value = "OmadaBandwidthControl", description = "the OmadaBandwidthControl API") -@FeignClient(name="OmadaBandwidthControlApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaBandwidthControlApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaBandwidthControlApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaFirewallApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaFirewallApi.java index 3d15dad..a64f31d 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaFirewallApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaFirewallApi.java @@ -13,7 +13,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.sitesetting.model.FirewallSetting; import org.wfc.omada.api.sitesetting.model.OperationResponseFirewallSetting; import org.wfc.omada.api.sitesetting.model.OperationResponseWithoutResult; @@ -23,7 +22,7 @@ import javax.validation.Valid; @Validated @Api(value = "OmadaFirewall", description = "the OmadaFirewall API") -@FeignClient(name="OmadaFirewallApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaFirewallApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaFirewallApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaGatewayQoSApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaGatewayQoSApi.java index 06afbc4..87e130e 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaGatewayQoSApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaGatewayQoSApi.java @@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.sitesetting.model.ClassRuleOpenApiVo; import org.wfc.omada.api.sitesetting.model.OperationResponseGridVoClassRuleDetailOpenApiVo; import org.wfc.omada.api.sitesetting.model.OperationResponseGridVoQosBwcDetailOpenApiVo; @@ -34,7 +33,7 @@ import javax.validation.constraints.NotNull; @Validated @Api(value = "OmadaGatewayQoS", description = "the OmadaGatewayQoS API") -@FeignClient(name="OmadaGatewayQoSApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaGatewayQoSApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaGatewayQoSApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaIdsIpsApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaIdsIpsApi.java index f216f77..83e03e4 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaIdsIpsApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaIdsIpsApi.java @@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.sitesetting.model.IpsInfo; import org.wfc.omada.api.sitesetting.model.IpsSignatureConfig; import org.wfc.omada.api.sitesetting.model.ModifyIpsAllowListEntry; @@ -30,7 +29,7 @@ import javax.validation.constraints.NotNull; @Validated @Api(value = "OmadaIdsIps", description = "the OmadaIdsIps API") -@FeignClient(name="OmadaIdsIpsApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaIdsIpsApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaIdsIpsApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaIpMacBindingApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaIpMacBindingApi.java index a0537c0..83f0c09 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaIpMacBindingApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaIpMacBindingApi.java @@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.sitesetting.model.BatchSelectIpMacBindingId; import org.wfc.omada.api.sitesetting.model.IpMacBinding; import org.wfc.omada.api.sitesetting.model.IpMacBindingGeneralSetting; @@ -28,7 +27,7 @@ import javax.validation.constraints.NotNull; @Validated @Api(value = "OmadaIpMacBinding", description = "the OmadaIpMacBinding API") -@FeignClient(name="OmadaIpMacBindingApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaIpMacBindingApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaIpMacBindingApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaMacFilteringApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaMacFilteringApi.java index 7f38ae0..8885a1d 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaMacFilteringApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaMacFilteringApi.java @@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.sitesetting.model.MacFiltering; import org.wfc.omada.api.sitesetting.model.MacFilteringGeneralSetting; import org.wfc.omada.api.sitesetting.model.OperationResponseGridVoMacFiltering; @@ -27,7 +26,7 @@ import javax.validation.constraints.NotNull; @Validated @Api(value = "OmadaMacFiltering", description = "the OmadaMacFiltering API") -@FeignClient(name="OmadaMacFilteringApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaMacFilteringApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaMacFilteringApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaNatApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaNatApi.java index b18d5b8..254e02c 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaNatApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaNatApi.java @@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.sitesetting.model.AlgSetting; import org.wfc.omada.api.sitesetting.model.OperationResponseAlgSetting; import org.wfc.omada.api.sitesetting.model.OperationResponseGridVoOtoNatInfoOpenApiVo; @@ -29,7 +28,7 @@ import javax.validation.constraints.NotNull; @Validated @Api(value = "OmadaNat", description = "the OmadaNat API") -@FeignClient(name="OmadaNatApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaNatApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaNatApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaOuiBasedVlanApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaOuiBasedVlanApi.java index 5a61e90..f925dea 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaOuiBasedVlanApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaOuiBasedVlanApi.java @@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.sitesetting.model.OperationResponseGridVoOuiBasedVlanApQueryOpenApiVo; import org.wfc.omada.api.sitesetting.model.OperationResponseGridVoOuiBasedVlanSwitchInfoOpenApiVo; import org.wfc.omada.api.sitesetting.model.OperationResponseGridVoOuiBasedVlanSwitchQueryOpenApiVo; @@ -29,7 +28,7 @@ import javax.validation.constraints.NotNull; @Validated @Api(value = "OmadaOuiBasedVlan", description = "the OmadaOuiBasedVlan API") -@FeignClient(name="OmadaOuiBasedVlanApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaOuiBasedVlanApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaOuiBasedVlanApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaProfilesApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaProfilesApi.java index f6b1cbe..36f199e 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaProfilesApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaProfilesApi.java @@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.sitesetting.model.ApnProfileConfig; import org.wfc.omada.api.sitesetting.model.BonjourServiceOpenApiVo; import org.wfc.omada.api.sitesetting.model.CreateGroupOpenApiVo; @@ -56,7 +55,7 @@ import java.util.List; @Validated @Api(value = "OmadaProfiles", description = "the OmadaProfiles API") -@FeignClient(name="OmadaProfilesApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaProfilesApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaProfilesApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaRoutingApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaRoutingApi.java index 379b5b3..bd1ebe6 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaRoutingApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaRoutingApi.java @@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.sitesetting.model.OperationResponseGridVoPolicyRoutingInfo; import org.wfc.omada.api.sitesetting.model.OperationResponseGridVoStaticRoutingInfo; import org.wfc.omada.api.sitesetting.model.OperationResponseStaticRoutingInterfaceResult; @@ -29,7 +28,7 @@ import javax.validation.constraints.NotNull; @Validated @Api(value = "OmadaRouting", description = "the OmadaRouting API") -@FeignClient(name="OmadaRoutingApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaRoutingApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaRoutingApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaScheduleApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaScheduleApi.java index a6ee2b7..c564978 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaScheduleApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaScheduleApi.java @@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.sitesetting.model.OperationResponseGridVoPoeScheduleQueryOpenApiVo; import org.wfc.omada.api.sitesetting.model.OperationResponseGridVoPortScheduleQueryOpenApiVo; import org.wfc.omada.api.sitesetting.model.OperationResponseListPoeDeviceDetail; @@ -33,7 +32,7 @@ import javax.validation.constraints.NotNull; @Validated @Api(value = "OmadaSchedule", description = "the OmadaSchedule API") -@FeignClient(name="OmadaScheduleApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaScheduleApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaScheduleApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaServiceApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaServiceApi.java index c5ecbc3..cb95316 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaServiceApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaServiceApi.java @@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.sitesetting.model.CreateDdnsOpenApiVo; import org.wfc.omada.api.sitesetting.model.CreateDhcpReservationOpenApiVo; import org.wfc.omada.api.sitesetting.model.CreateMdnsRuleOpenApiVo; @@ -43,7 +42,7 @@ import javax.validation.constraints.NotNull; @Validated @Api(value = "OmadaService", description = "the OmadaService API") -@FeignClient(name="OmadaServiceApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaServiceApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaServiceApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaSessionLimitApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaSessionLimitApi.java index af6ff11..b379f35 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaSessionLimitApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaSessionLimitApi.java @@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.sitesetting.model.OperationResponseGridVoQuerySessionLimitRuleOpenApiVo; import org.wfc.omada.api.sitesetting.model.OperationResponseSessionLimitEntity; import org.wfc.omada.api.sitesetting.model.OperationResponseWithoutResult; @@ -28,7 +27,7 @@ import javax.validation.constraints.NotNull; @Validated @Api(value = "OmadaSessionLimit", description = "the OmadaSessionLimit API") -@FeignClient(name="OmadaSessionLimitApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaSessionLimitApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaSessionLimitApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaSimApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaSimApi.java index a18ed6e..df8616a 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaSimApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaSimApi.java @@ -13,7 +13,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.sitesetting.model.CorrectSimQuota; import org.wfc.omada.api.sitesetting.model.OperationResponseSimQuotaSetting; import org.wfc.omada.api.sitesetting.model.OperationResponseWithoutResult; @@ -24,7 +23,7 @@ import javax.validation.Valid; @Validated @Api(value = "OmadaSim", description = "the OmadaSim API") -@FeignClient(name="OmadaSimApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaSimApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaSimApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaSiteConfigurationApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaSiteConfigurationApi.java index b78fb95..0814fa5 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaSiteConfigurationApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaSiteConfigurationApi.java @@ -13,7 +13,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.sitesetting.model.OperationResponseSiteBandSteeringSetting; import org.wfc.omada.api.sitesetting.model.OperationResponseSiteBeaconControlSetting; import org.wfc.omada.api.sitesetting.model.OperationResponseSiteChannelLimitSetting; @@ -39,7 +38,7 @@ import javax.validation.Valid; @Validated @Api(value = "OmadaSiteConfiguration", description = "the OmadaSiteConfiguration API") -@FeignClient(name="OmadaSiteConfigurationApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaSiteConfigurationApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaSiteConfigurationApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaSslVpnApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaSslVpnApi.java index 1e00289..ccea0ee 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaSslVpnApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaSslVpnApi.java @@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.sitesetting.model.OperationResponseGridVoSslVpnResourceEntity; import org.wfc.omada.api.sitesetting.model.OperationResponseGridVoSslVpnResourceGroup; import org.wfc.omada.api.sitesetting.model.OperationResponseGridVoSslVpnUserGroupEntity; @@ -40,7 +39,7 @@ import javax.validation.constraints.NotNull; @Validated @Api(value = "OmadaSslVpn", description = "the OmadaSslVpn API") -@FeignClient(name="OmadaSslVpnApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaSslVpnApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaSslVpnApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaUrlFilteringApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaUrlFilteringApi.java index 7fbc70f..bbaefd3 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaUrlFilteringApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaUrlFilteringApi.java @@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.sitesetting.model.OperationResponseResIdOpenApiVo; import org.wfc.omada.api.sitesetting.model.OperationResponseUrlCategoryOpenApiVo; import org.wfc.omada.api.sitesetting.model.OperationResponseUrlFilterGlobalOpenApiVo; @@ -30,7 +29,7 @@ import javax.validation.constraints.NotNull; @Validated @Api(value = "OmadaUrlFiltering", description = "the OmadaUrlFiltering API") -@FeignClient(name="OmadaUrlFilteringApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaUrlFilteringApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaUrlFilteringApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaVoIpApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaVoIpApi.java index e7c66da..ffaaf09 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaVoIpApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaVoIpApi.java @@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.sitesetting.model.BatchModifyVoipDeviceSettingEntity; import org.wfc.omada.api.sitesetting.model.BindNumberList; import org.wfc.omada.api.sitesetting.model.ConfirmBindedDevicesEntity; @@ -67,7 +66,7 @@ import javax.validation.constraints.NotNull; @Validated @Api(value = "OmadaVoIp", description = "the OmadaVoIp API") -@FeignClient(name="OmadaVoIpApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaVoIpApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaVoIpApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaVpnApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaVpnApi.java index 6a09558..c9c44de 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaVpnApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaVpnApi.java @@ -15,7 +15,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.sitesetting.model.ClientToSiteVpnClient; import org.wfc.omada.api.sitesetting.model.ClientToSiteVpnServer; import org.wfc.omada.api.sitesetting.model.IPsecFailover; @@ -39,7 +38,7 @@ import javax.validation.constraints.NotNull; @Validated @Api(value = "OmadaVpn", description = "the OmadaVpn API") -@FeignClient(name="OmadaVpnApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaVpnApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaVpnApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaWiredNetworkApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaWiredNetworkApi.java index 9cf606f..704baed 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaWiredNetworkApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaWiredNetworkApi.java @@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.sitesetting.model.CheckWanLanStatusOpenApiVo; import org.wfc.omada.api.sitesetting.model.CreateVlaNs; import org.wfc.omada.api.sitesetting.model.GridVoLanNetworkVlansOpenApiVo; @@ -54,7 +53,7 @@ import javax.validation.constraints.NotNull; @Validated @Api(value = "OmadaWiredNetwork", description = "the OmadaWiredNetwork API") -@FeignClient(name="OmadaWiredNetworkApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaWiredNetworkApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaWiredNetworkApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaWireguardVpnApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaWireguardVpnApi.java index e3ba164..d319e04 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaWireguardVpnApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaWireguardVpnApi.java @@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.sitesetting.model.OperationResponseGridVoWireguardDetailOpenApiVo; import org.wfc.omada.api.sitesetting.model.OperationResponseGridVoWireguardPeerDetailOpenApiVo; import org.wfc.omada.api.sitesetting.model.OperationResponseResponseDataVoWireguardSummaryOpenApiVo; @@ -30,7 +29,7 @@ import javax.validation.constraints.NotNull; @Validated @Api(value = "OmadaWireguardVpn", description = "the OmadaWireguardVpn API") -@FeignClient(name="OmadaWireguardVpnApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaWireguardVpnApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaWireguardVpnApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaWirelessIdsIpsApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaWirelessIdsIpsApi.java index f77e17a..b199af4 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaWirelessIdsIpsApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaWirelessIdsIpsApi.java @@ -13,7 +13,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.sitesetting.model.OperationResponseWidsConfigOpenApiVo; import org.wfc.omada.api.sitesetting.model.OperationResponseWipsConfigOpenApiVo; import org.wfc.omada.api.sitesetting.model.OperationResponseWithoutResult; @@ -25,7 +24,7 @@ import javax.validation.Valid; @Validated @Api(value = "OmadaWirelessIdsIps", description = "the OmadaWirelessIdsIps API") -@FeignClient(name="OmadaWirelessIdsIpsApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaWirelessIdsIpsApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaWirelessIdsIpsApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaWirelessNetworkApi.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaWirelessNetworkApi.java index 0050301..82075c4 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaWirelessNetworkApi.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/sitesetting/OmadaWirelessNetworkApi.java @@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.wfc.omada.config.FeignConfig; -import org.wfc.omada.config.FeignHttpsConfig; import org.wfc.omada.api.sitesetting.model.CreateSsidOpenApiVo; import org.wfc.omada.api.sitesetting.model.CreateWlanGroupOpenApiVo; import org.wfc.omada.api.sitesetting.model.OperationResponseGridVoSsidOpenApiVo; @@ -37,7 +36,7 @@ import javax.validation.constraints.NotNull; @Validated @Api(value = "OmadaWirelessNetwork", description = "the OmadaWirelessNetwork API") -@FeignClient(name="OmadaWirelessNetworkApi", url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) +@FeignClient(name="OmadaWirelessNetworkApi", url = "${omada.omada-url}", configuration = FeignConfig.class) public interface OmadaWirelessNetworkApi { /** diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/config/FeignHttpsConfig.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/config/FeignHttpsConfig.java deleted file mode 100644 index 4c82c85..0000000 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/config/FeignHttpsConfig.java +++ /dev/null @@ -1,55 +0,0 @@ -package org.wfc.omada.config; - -import feign.Client; -import feign.Feign; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Scope; - -import javax.net.ssl.SSLContext; -import javax.net.ssl.TrustManager; -import javax.net.ssl.X509TrustManager; -import java.security.cert.CertificateException; -import java.security.cert.X509Certificate; - -/** - * @description: Feign https 配置 - * @author: caiyuchao - * @date: 2024-11-21 - */ -@Configuration -public class FeignHttpsConfig { - - - @Bean - @Scope("prototype") - public Feign.Builder feignBuilder() { - return Feign.builder(); - } - - @Bean - public Client generateClient() { - try { - SSLContext ctx = SSLContext.getInstance("SSL"); - X509TrustManager tm = new X509TrustManager() { - @Override - public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException { - } - - @Override - public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException { - } - - @Override - public X509Certificate[] getAcceptedIssuers() { - return null; - } - }; - ctx.init(null, new TrustManager[]{tm}, null); - return new Client.Default(ctx.getSocketFactory(), (hostname, session) -> true); - } catch (Exception e) { - return null; - } - } - -} \ No newline at end of file diff --git a/wfc-common/wfc-common-core/pom.xml b/wfc-common/wfc-common-core/pom.xml index dfb5879..02b6d37 100644 --- a/wfc-common/wfc-common-core/pom.xml +++ b/wfc-common/wfc-common-core/pom.xml @@ -22,6 +22,11 @@ org.springframework.cloud spring-cloud-starter-openfeign + + + io.github.openfeign + feign-httpclient +