diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/RemoteOmadaFeign.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/RemoteOmadaFeign.java deleted file mode 100644 index 09abcdb..0000000 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/RemoteOmadaFeign.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.wfc.omada.api; - - -import org.springframework.cloud.openfeign.FeignClient; -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.api.config.FeignHttpsConfig; -import org.wfc.omada.api.config.FeignConfig; - -/** - * @description: Omada接口 - * @author: caiyuchao - * @date: 2024-11-20 - */ -@FeignClient(name = "remoteOmadaFeign",url = "${omada.omada-url}", configuration = {FeignConfig.class, FeignHttpsConfig.class}) -public interface RemoteOmadaFeign { - - @RequestMapping(value = "/openapi/v1/${omada.omadac-id}/sites", method = RequestMethod.GET) - Object getData(@RequestParam("page") Integer page, @RequestParam("pageSize") Integer pageSize); - -} 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 0b54a43..963c1e1 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 @@ -20,8 +20,8 @@ import org.wfc.omada.api.account.model.OperationResponseGridVoExternalUserGroupD import org.wfc.omada.api.account.model.OperationResponseGridVoIdpMetadataDetailOpenApiVo; import org.wfc.omada.api.account.model.OperationResponseResponseIdVo; import org.wfc.omada.api.account.model.OperationResponseWithoutResult; -import org.wfc.omada.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +import org.wfc.omada.config.FeignConfig; +import org.wfc.omada.config.FeignHttpsConfig; import javax.validation.Valid; import javax.validation.constraints.NotNull; 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 b101bf3..868f3ea 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 @@ -25,8 +25,8 @@ import org.wfc.omada.api.account.model.OperationResponseListControllerRoleDetail 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +import org.wfc.omada.config.FeignConfig; +import org.wfc.omada.config.FeignHttpsConfig; import javax.validation.Valid; import javax.validation.constraints.NotNull; 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 f11cb09..21bef86 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 @@ -8,14 +8,13 @@ import io.swagger.annotations.ApiResponses; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PathVariable; 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.api.batch.model.BatchRequestEntity; import org.wfc.omada.api.batch.model.OperationResponseBatchResponseEntity; -import org.wfc.omada.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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]") 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 d5bc852..9aa5f64 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 @@ -19,8 +19,8 @@ import org.wfc.omada.api.client.model.ClientRateLimitSetting; 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +import org.wfc.omada.config.FeignConfig; +import org.wfc.omada.config.FeignHttpsConfig; import javax.validation.Valid; import javax.validation.constraints.NotNull; 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 a201c72..0a2d0be 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 @@ -13,8 +13,8 @@ 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.api.client.model.OperationResponseGridVoClientHistoryInfo; -import org.wfc.omada.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +import org.wfc.omada.config.FeignConfig; +import org.wfc.omada.config.FeignHttpsConfig; import javax.validation.Valid; import javax.validation.constraints.NotNull; 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 52b9640..e53dcaf 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 @@ -12,8 +12,8 @@ import org.springframework.web.bind.annotation.PathVariable; 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 8b929c7..98ac6c1 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 @@ -14,8 +14,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.multipart.MultipartFile; -import org.wfc.omada.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 4ced963..dee13bd 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 @@ -13,8 +13,8 @@ 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 60b9fc9..46f0fc5 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 @@ -12,8 +12,8 @@ import org.springframework.web.bind.annotation.PathVariable; 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 bab78a8..621076b 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 @@ -12,8 +12,8 @@ import org.springframework.web.bind.annotation.PathVariable; 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 a7f2f9a..4c143fb 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 @@ -12,8 +12,8 @@ import org.springframework.web.bind.annotation.PathVariable; 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 dee713e..edfbb5d 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 @@ -13,8 +13,8 @@ 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 c14939c..6ff5591 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 @@ -13,8 +13,8 @@ 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 4bfe0a1..61b04db 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,8 +13,8 @@ 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 e0bac3c..bb15419 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 @@ -13,8 +13,8 @@ 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 c8f1474..2aba8ed 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 @@ -13,8 +13,8 @@ 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 c57d6b9..db7d7b3 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 @@ -13,8 +13,8 @@ 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 2377615..b7c1b2e 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 @@ -13,8 +13,8 @@ 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 8f05969..60337e9 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 @@ -13,8 +13,8 @@ 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 207eabe..8707f55 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 @@ -12,8 +12,8 @@ import org.springframework.web.bind.annotation.PathVariable; 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 d036ce7..6d459ea 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 @@ -12,8 +12,8 @@ import org.springframework.web.bind.annotation.PathVariable; 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 b164139..588f9e9 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 @@ -12,8 +12,8 @@ import org.springframework.web.bind.annotation.PathVariable; 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 997ee13..a05f888 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 @@ -13,8 +13,8 @@ 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 b8e3ec4..5ce4f76 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 @@ -13,8 +13,8 @@ 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 77543d7..5b9b35a 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 @@ -12,8 +12,8 @@ import org.springframework.web.bind.annotation.PathVariable; 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 3f40b6f..788f096 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 @@ -12,8 +12,8 @@ import org.springframework.web.bind.annotation.PathVariable; 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 951b4e3..a6f8296 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 @@ -12,8 +12,8 @@ import org.springframework.web.bind.annotation.PathVariable; 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 d867324..625a2c8 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 @@ -13,8 +13,8 @@ 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 da50b58..97edd36 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 @@ -13,8 +13,8 @@ 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 4284a6a..5203696 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 @@ -12,8 +12,8 @@ import org.springframework.web.bind.annotation.PathVariable; 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 ccd10d5..446ada4 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 @@ -12,8 +12,8 @@ import org.springframework.web.bind.annotation.PathVariable; 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 5cd10ff..1bde3a3 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 @@ -13,8 +13,8 @@ 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 4762d93..c6ecc4a 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 @@ -13,8 +13,8 @@ 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 9f674bd..27ba033 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 @@ -13,8 +13,8 @@ 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 ad988e4..8a9aa77 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 @@ -13,8 +13,8 @@ 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 d1496f7..2916ebe 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 @@ -13,8 +13,8 @@ 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 9a99a1d..6772950 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 @@ -13,8 +13,8 @@ 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 7710287..cc01ff3 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 @@ -13,8 +13,8 @@ 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 48a6aa6..d1ba75e 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 @@ -12,8 +12,8 @@ import org.springframework.web.bind.annotation.PathVariable; 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 1ba0fd1..05f85b0 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 @@ -14,8 +14,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.multipart.MultipartFile; -import org.wfc.omada.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 44664de..8d2d866 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 @@ -13,8 +13,8 @@ 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 153f4b1..3d15dad 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 @@ -12,8 +12,8 @@ import org.springframework.web.bind.annotation.PathVariable; 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 f935da9..06afbc4 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 @@ -13,8 +13,8 @@ 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 8228674..f216f77 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 @@ -13,8 +13,8 @@ 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 2694a8e..a0537c0 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 @@ -13,8 +13,8 @@ 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 7bef71a..7f38ae0 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 @@ -13,8 +13,8 @@ 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 9c8629c..b18d5b8 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 @@ -13,8 +13,8 @@ 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 bf2f23f..5a61e90 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 @@ -13,8 +13,8 @@ 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 52a7b13..f6b1cbe 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 @@ -13,8 +13,8 @@ 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 1f5c2df..379b5b3 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 @@ -13,8 +13,8 @@ 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 ee6b7f2..a6ee2b7 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 @@ -13,8 +13,8 @@ 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 d133e03..c5ecbc3 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 @@ -13,8 +13,8 @@ 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 435cd80..af6ff11 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 @@ -13,8 +13,8 @@ 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 9db6356..a18ed6e 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 @@ -12,8 +12,8 @@ import org.springframework.web.bind.annotation.PathVariable; 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 24994d7..b78fb95 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 @@ -12,8 +12,8 @@ import org.springframework.web.bind.annotation.PathVariable; 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 944d327..1e00289 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 @@ -13,8 +13,8 @@ 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 f07703a..7fbc70f 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 @@ -13,8 +13,8 @@ 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 b8022ef..e7c66da 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 @@ -13,8 +13,8 @@ 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 6d8944b..6a09558 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 @@ -14,8 +14,8 @@ 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 4ed47d9..9cf606f 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 @@ -13,8 +13,8 @@ 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 1aa073a..e3ba164 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 @@ -13,8 +13,8 @@ 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 54e2a8a..f77e17a 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 @@ -12,8 +12,8 @@ import org.springframework.web.bind.annotation.PathVariable; 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; 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 12a0b86..0050301 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 @@ -13,8 +13,8 @@ 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.api.config.FeignConfig; -import org.wfc.omada.api.config.FeignHttpsConfig; +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; diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/config/FeignConfig.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/config/FeignConfig.java similarity index 58% rename from wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/config/FeignConfig.java rename to wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/config/FeignConfig.java index eaf3321..f79dae1 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/config/FeignConfig.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/config/FeignConfig.java @@ -1,4 +1,4 @@ -package org.wfc.omada.api.config; +package org.wfc.omada.config; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson2.JSON; @@ -14,8 +14,8 @@ import org.springframework.util.LinkedMultiValueMap; import org.springframework.web.client.RestTemplate; import org.springframework.web.util.UriComponentsBuilder; import org.wfc.common.redis.service.RedisService; -import org.wfc.omada.api.domain.vo.AuthorizeTokenVO; -import org.wfc.omada.api.domain.vo.OmadaResult; +import org.wfc.omada.config.domain.vo.AuthorizeTokenVO; +import org.wfc.omada.config.domain.vo.OmadaResult; import java.util.HashMap; import java.util.Map; @@ -56,34 +56,14 @@ public class FeignConfig implements RequestInterceptor { if (StrUtil.isBlank(cacheAccessToken)) { // 访问令牌不存在获取redis中的刷新令牌 String cacheRefreshToken = redisService.getCacheObject(REDIS_REFRESH_TOKEN); - // 构造请求参数query和body - Map body = new HashMap<>(); - body.put(CLIENT_ID, omadaProperties.getClientId()); - body.put(CLIENT_SECRET, omadaProperties.getClientSecret()); - LinkedMultiValueMap query = new LinkedMultiValueMap<>(); - String url = omadaProperties.getOmadaUrl() + OPENAPI_AUTHORIZE_TOKEN_PATH; - if (StrUtil.isBlank(cacheRefreshToken)) { - // 获取访问令牌 - // 调用客户端认证模式获取access token - body.put(OMADACID, omadaProperties.getOmadacId()); - query.add(GRANT_TYPE, CLIENT_CREDENTIALS); - } else { - // 刷新访问令牌 - query.add(GRANT_TYPE, REFRESH_TOKEN); - query.add(REFRESH_TOKEN, cacheRefreshToken); + OmadaResult omadaResult = callOmadaTokenAPI(cacheRefreshToken); + if (omadaResult == null || omadaResult.getResult() == null) { + // 获取失败重新调用获取访问令牌接口 + omadaResult = callOmadaTokenAPI(null); + if (omadaResult == null || omadaResult.getResult() == null) { + return; + } } - HttpEntity request = new HttpEntity<>(JSON.toJSONString(body)); - String uriString = UriComponentsBuilder.fromHttpUrl(url).queryParams(query).build().toUriString(); - // 发送调用请求 - RestTemplate restTemplate = new RestTemplate(new RestTemplateConfig.HttpsClientRequestFactory()); - ResponseEntity> responseEntity = restTemplate.exchange(uriString, HttpMethod.POST, - request, new ParameterizedTypeReference>() { - }); - OmadaResult omadaResult = responseEntity.getBody(); - if (omadaResult == null) { - return; - } - // 如果返回结果未成功,重新调获取访问令牌接口 String accessToken = omadaResult.getResult().getAccessToken(); String refreshToken = omadaResult.getResult().getRefreshToken(); authorization = PRE_ACCESS_TOKEN + accessToken; @@ -99,4 +79,32 @@ public class FeignConfig implements RequestInterceptor { } } + private OmadaResult callOmadaTokenAPI(String cacheRefreshToken) { + // 构造请求参数query和body + Map body = new HashMap<>(); + body.put(CLIENT_ID, omadaProperties.getClientId()); + body.put(CLIENT_SECRET, omadaProperties.getClientSecret()); + LinkedMultiValueMap query = new LinkedMultiValueMap<>(); + String url = omadaProperties.getOmadaUrl() + OPENAPI_AUTHORIZE_TOKEN_PATH; + if (StrUtil.isBlank(cacheRefreshToken)) { + // 获取访问令牌 + // 调用客户端认证模式获取access token + body.put(OMADACID, omadaProperties.getOmadacId()); + query.add(GRANT_TYPE, CLIENT_CREDENTIALS); + } else { + // 刷新访问令牌 + query.add(GRANT_TYPE, REFRESH_TOKEN); + query.add(REFRESH_TOKEN, cacheRefreshToken); + } + HttpEntity request = new HttpEntity<>(JSON.toJSONString(body)); + String uriString = UriComponentsBuilder.fromHttpUrl(url).queryParams(query).build().toUriString(); + // 发送调用请求 + RestTemplate restTemplate = new RestTemplate(new RestTemplateConfig.HttpsClientRequestFactory()); + ResponseEntity> responseEntity = restTemplate.exchange(uriString, HttpMethod.POST, + request, new ParameterizedTypeReference>() { + }); + OmadaResult omadaResult = responseEntity.getBody(); + return omadaResult; + } + } \ No newline at end of file diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/config/FeignHttpsConfig.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/config/FeignHttpsConfig.java similarity index 97% rename from wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/config/FeignHttpsConfig.java rename to wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/config/FeignHttpsConfig.java index 7af777d..4c82c85 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/config/FeignHttpsConfig.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/config/FeignHttpsConfig.java @@ -1,4 +1,4 @@ -package org.wfc.omada.api.config; +package org.wfc.omada.config; import feign.Client; import feign.Feign; diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/config/OmadaProperties.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/config/OmadaProperties.java similarity index 92% rename from wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/config/OmadaProperties.java rename to wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/config/OmadaProperties.java index 5a38425..3f1e09a 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/config/OmadaProperties.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/config/OmadaProperties.java @@ -1,4 +1,4 @@ -package org.wfc.omada.api.config; +package org.wfc.omada.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/config/RestTemplateConfig.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/config/RestTemplateConfig.java similarity index 99% rename from wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/config/RestTemplateConfig.java rename to wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/config/RestTemplateConfig.java index 16886ea..5006b03 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/config/RestTemplateConfig.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/config/RestTemplateConfig.java @@ -1,4 +1,4 @@ -package org.wfc.omada.api.config; +package org.wfc.omada.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/domain/vo/AuthorizeTokenVO.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/config/domain/vo/AuthorizeTokenVO.java similarity index 90% rename from wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/domain/vo/AuthorizeTokenVO.java rename to wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/config/domain/vo/AuthorizeTokenVO.java index 93d9415..cceef33 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/domain/vo/AuthorizeTokenVO.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/config/domain/vo/AuthorizeTokenVO.java @@ -1,4 +1,4 @@ -package org.wfc.omada.api.domain.vo; +package org.wfc.omada.config.domain.vo; import lombok.Data; diff --git a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/domain/vo/OmadaResult.java b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/config/domain/vo/OmadaResult.java similarity index 89% rename from wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/domain/vo/OmadaResult.java rename to wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/config/domain/vo/OmadaResult.java index 0e0c9be..6638284 100644 --- a/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/domain/vo/OmadaResult.java +++ b/wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/config/domain/vo/OmadaResult.java @@ -1,4 +1,4 @@ -package org.wfc.omada.api.domain.vo; +package org.wfc.omada.config.domain.vo; import lombok.Data; diff --git a/wfc-api/wfc-api-omada/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/wfc-api/wfc-api-omada/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 943069e..7fd23f4 100644 --- a/wfc-api/wfc-api-omada/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/wfc-api/wfc-api-omada/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -org.wfc.omada.api.config.OmadaProperties \ No newline at end of file +org.wfc.omada.config.OmadaProperties \ No newline at end of file