diff --git a/cash-api/account-server/src/main/java/com/czg/controller/AuthorizationController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/AuthorizationController.java similarity index 97% rename from cash-api/account-server/src/main/java/com/czg/controller/AuthorizationController.java rename to cash-api/account-server/src/main/java/com/czg/controller/admin/AuthorizationController.java index 14d9d4d4..edd48ec1 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/AuthorizationController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/AuthorizationController.java @@ -1,4 +1,4 @@ -package com.czg.controller; +package com.czg.controller.admin; import com.czg.account.dto.SysLoginDTO; import com.czg.account.service.AuthorizationService; diff --git a/cash-api/account-server/src/main/java/com/czg/controller/CommonController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/CommonController.java similarity index 95% rename from cash-api/account-server/src/main/java/com/czg/controller/CommonController.java rename to cash-api/account-server/src/main/java/com/czg/controller/admin/CommonController.java index 2d3a4360..af9c6f22 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/CommonController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/CommonController.java @@ -1,4 +1,4 @@ -package com.czg.controller; +package com.czg.controller.admin; import com.czg.account.service.CommonService; import com.czg.resp.CzgResult; @@ -11,8 +11,6 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import java.io.IOException; - /** * 公共接口 * @author Administrator diff --git a/cash-api/account-server/src/main/java/com/czg/controller/MenuController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/MenuController.java similarity index 95% rename from cash-api/account-server/src/main/java/com/czg/controller/MenuController.java rename to cash-api/account-server/src/main/java/com/czg/controller/admin/MenuController.java index 52faab57..f68a4e30 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/MenuController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/MenuController.java @@ -1,4 +1,4 @@ -package com.czg.controller; +package com.czg.controller.admin; import com.czg.account.service.SysMenuService; import com.czg.resp.CzgResult; diff --git a/cash-api/account-server/src/main/java/com/czg/controller/MerchantRegisterController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/MerchantRegisterController.java similarity index 96% rename from cash-api/account-server/src/main/java/com/czg/controller/MerchantRegisterController.java rename to cash-api/account-server/src/main/java/com/czg/controller/admin/MerchantRegisterController.java index c1cdbebe..8ab797bd 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/MerchantRegisterController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/MerchantRegisterController.java @@ -1,4 +1,4 @@ -package com.czg.controller; +package com.czg.controller.admin; import com.czg.account.dto.PageDTO; import com.czg.account.dto.register.MerchantRegisterDTO; @@ -12,8 +12,6 @@ import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.time.LocalDateTime; - /** * 激活码管理 * @author Administrator diff --git a/cash-api/account-server/src/main/java/com/czg/controller/RoleController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/RoleController.java similarity index 98% rename from cash-api/account-server/src/main/java/com/czg/controller/RoleController.java rename to cash-api/account-server/src/main/java/com/czg/controller/admin/RoleController.java index 256cfaf4..1cb4660b 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/RoleController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/RoleController.java @@ -1,4 +1,4 @@ -package com.czg.controller; +package com.czg.controller.admin; import com.czg.account.dto.PageDTO; import com.czg.account.dto.role.RoleAddDTO; diff --git a/cash-api/account-server/src/main/java/com/czg/controller/ShopInfoController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopInfoController.java similarity index 98% rename from cash-api/account-server/src/main/java/com/czg/controller/ShopInfoController.java rename to cash-api/account-server/src/main/java/com/czg/controller/admin/ShopInfoController.java index 376d4039..744ea36c 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/ShopInfoController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopInfoController.java @@ -1,4 +1,4 @@ -package com.czg.controller; +package com.czg.controller.admin; import com.czg.account.dto.PageDTO; import com.czg.account.dto.shopinfo.ShopInfoAddDTO; diff --git a/cash-api/account-server/src/main/java/com/czg/controller/ShopMerchantController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopMerchantController.java similarity index 95% rename from cash-api/account-server/src/main/java/com/czg/controller/ShopMerchantController.java rename to cash-api/account-server/src/main/java/com/czg/controller/admin/ShopMerchantController.java index 66943b40..587c41c8 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/ShopMerchantController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopMerchantController.java @@ -1,4 +1,4 @@ -package com.czg.controller; +package com.czg.controller.admin; import com.czg.account.dto.merchant.ShopMerchantEditDTO; import com.czg.account.entity.ShopMerchant; @@ -6,7 +6,6 @@ import com.czg.account.service.ShopMerchantService; import com.czg.annotation.SaAdminCheckPermission; import com.czg.annotation.SaAdminCheckRole; import com.czg.resp.CzgResult; -import com.mybatisflex.core.paginate.Page; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/cash-api/account-server/src/main/java/com/czg/controller/ShopStaffController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopStaffController.java similarity index 98% rename from cash-api/account-server/src/main/java/com/czg/controller/ShopStaffController.java rename to cash-api/account-server/src/main/java/com/czg/controller/admin/ShopStaffController.java index 1c9bc0da..50361bca 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/ShopStaffController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopStaffController.java @@ -1,4 +1,4 @@ -package com.czg.controller; +package com.czg.controller.admin; import com.czg.account.dto.staff.ShopStaffAddDTO; import com.czg.account.dto.staff.ShopStaffEditDTO; diff --git a/cash-api/account-server/src/main/java/com/czg/controller/UserAuthorizationController.java b/cash-api/account-server/src/main/java/com/czg/controller/user/UserAuthorizationController.java similarity index 96% rename from cash-api/account-server/src/main/java/com/czg/controller/UserAuthorizationController.java rename to cash-api/account-server/src/main/java/com/czg/controller/user/UserAuthorizationController.java index 372d5cdc..9b323492 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/UserAuthorizationController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/user/UserAuthorizationController.java @@ -1,4 +1,4 @@ -package com.czg.controller; +package com.czg.controller.user; import com.czg.account.dto.auth.LoginTokenDTO; import com.czg.account.dto.auth.UserAuthorizationLoginDTO;