feat: update omada api module

wfc-api/wfc-api-omada/src/main/java/org/wfc/omada/api/RemoteOmadaFeign.java

@@ -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);
-
-}

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+import org.wfc.omada.config.FeignHttpsConfig;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+import org.wfc.omada.config.FeignHttpsConfig;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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]")

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+import org.wfc.omada.config.FeignHttpsConfig;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+import org.wfc.omada.config.FeignHttpsConfig;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+import org.wfc.omada.config.FeignHttpsConfig;
 import org.wfc.omada.api.msp.model.BatchRequestEntity;
 import org.wfc.omada.api.msp.model.OperationResponseBatchResponseEntity;
 

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+import org.wfc.omada.config.FeignHttpsConfig;
 import org.wfc.omada.api.msp.model.OperationResponseGridVoSiteSummaryInfo;
 import org.wfc.omada.api.msp.model.SiteTag;
 

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.FeignConfig;
-import org.wfc.omada.api.config.FeignHttpsConfig;
+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;

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.config.domain.vo.AuthorizeTokenVO;
-import org.wfc.omada.api.domain.vo.OmadaResult;
+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
+            OmadaResult<AuthorizeTokenVO> omadaResult = callOmadaTokenAPI(cacheRefreshToken);
-            Map<String, String> body = new HashMap<>();
+            if (omadaResult == null || omadaResult.getResult() == null) {
-            body.put(CLIENT_ID, omadaProperties.getClientId());
+                // 获取失败重新调用获取访问令牌接口
-            body.put(CLIENT_SECRET, omadaProperties.getClientSecret());
+                omadaResult = callOmadaTokenAPI(null);
-            LinkedMultiValueMap<String, String> query = new LinkedMultiValueMap<>();
+                if (omadaResult == null || omadaResult.getResult() == null) {
-            String url = omadaProperties.getOmadaUrl() + OPENAPI_AUTHORIZE_TOKEN_PATH;
+                    return;
-            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<String> request = new HttpEntity<>(JSON.toJSONString(body));
-            String uriString = UriComponentsBuilder.fromHttpUrl(url).queryParams(query).build().toUriString();
-            // 发送调用请求
-            RestTemplate restTemplate = new RestTemplate(new RestTemplateConfig.HttpsClientRequestFactory());
-            ResponseEntity<OmadaResult<AuthorizeTokenVO>> responseEntity = restTemplate.exchange(uriString, HttpMethod.POST,
-                    request, new ParameterizedTypeReference<OmadaResult<AuthorizeTokenVO>>() {
-                    });
-            OmadaResult<AuthorizeTokenVO> 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<AuthorizeTokenVO> callOmadaTokenAPI(String cacheRefreshToken) {
+        // 构造请求参数query和body
+        Map<String, String> body = new HashMap<>();
+        body.put(CLIENT_ID, omadaProperties.getClientId());
+        body.put(CLIENT_SECRET, omadaProperties.getClientSecret());
+        LinkedMultiValueMap<String, String> 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<String> request = new HttpEntity<>(JSON.toJSONString(body));
+        String uriString = UriComponentsBuilder.fromHttpUrl(url).queryParams(query).build().toUriString();
+        // 发送调用请求
+        RestTemplate restTemplate = new RestTemplate(new RestTemplateConfig.HttpsClientRequestFactory());
+        ResponseEntity<OmadaResult<AuthorizeTokenVO>> responseEntity = restTemplate.exchange(uriString, HttpMethod.POST,
+                request, new ParameterizedTypeReference<OmadaResult<AuthorizeTokenVO>>() {
+                });
+        OmadaResult<AuthorizeTokenVO> omadaResult = responseEntity.getBody();
+        return omadaResult;
+    }
+
 }

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;

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;

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;

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;
 

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;
 

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
+org.wfc.omada.config.OmadaProperties