update

src/main/java/com/zhiqiyun/open/mvc/manager/controller/AppKeyInfoController.java → src/main/java/com/zhiqiyun/open/mvc/controller/AppKeyInfoController.java

@@ -1,4 +1,4 @@
-package com.zhiqiyun.open.mvc.manager.controller;
+package com.zhiqiyun.open.mvc.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -13,9 +13,9 @@ import com.zhiqiyun.open.core.service.ApiRequestLogService;
 import com.zhiqiyun.open.core.service.AppKeyInfoService;
 import com.zhiqiyun.open.core.service.SequenceService;
 import com.zhiqiyun.open.mvc.Result;
-import com.zhiqiyun.open.mvc.manager.params.QueryApiRequestLogParams;
-import com.zhiqiyun.open.mvc.manager.params.QueryAppKeyInfoParams;
-import com.zhiqiyun.open.mvc.manager.params.SaveAppKeyInfoParam;
+import com.zhiqiyun.open.mvc.params.QueryApiRequestLogParams;
+import com.zhiqiyun.open.mvc.params.QueryAppKeyInfoParams;
+import com.zhiqiyun.open.mvc.params.SaveAppKeyInfoParam;
 import com.zhiqiyun.open.utils.DateUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;

src/main/java/com/zhiqiyun/open/mvc/manager/controller/AuthorityInfoController.java → src/main/java/com/zhiqiyun/open/mvc/controller/AuthorityInfoController.java

@@ -1,4 +1,4 @@
-package com.zhiqiyun.open.mvc.manager.controller;
+package com.zhiqiyun.open.mvc.controller;
 
 import com.zhiqiyun.open.annotation.Permission;
 import com.zhiqiyun.open.mvc.Result;

src/main/java/com/zhiqiyun/open/mvc/manager/controller/HolidayVillageInfoController.java → src/main/java/com/zhiqiyun/open/mvc/controller/HolidayVillageInfoController.java

@@ -1,4 +1,4 @@
-package com.zhiqiyun.open.mvc.manager.controller;
+package com.zhiqiyun.open.mvc.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
@@ -8,8 +8,8 @@ import com.zhiqiyun.open.core.models.bz.HolidayVillageInfo;
 import com.zhiqiyun.open.core.service.HolidayVillageInfoService;
 import com.zhiqiyun.open.core.service.SequenceService;
 import com.zhiqiyun.open.mvc.Result;
-import com.zhiqiyun.open.mvc.manager.params.QueryHolidayVillageInfoParams;
-import com.zhiqiyun.open.mvc.manager.params.SaveHolidayVillageInfoParams;
+import com.zhiqiyun.open.mvc.params.QueryHolidayVillageInfoParams;
+import com.zhiqiyun.open.mvc.params.SaveHolidayVillageInfoParams;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/zhiqiyun/open/mvc/manager/controller/IndexController.java → src/main/java/com/zhiqiyun/open/mvc/controller/IndexController.java

@@ -1,4 +1,4 @@
-package com.zhiqiyun.open.mvc.manager.controller;
+package com.zhiqiyun.open.mvc.controller;
 
 import com.dliyun.oap.framework.service.RouterService;
 import com.dliyun.oap.framework.service.ServiceMethodHandler;

src/main/java/com/zhiqiyun/open/mvc/manager/controller/OauthController.java → src/main/java/com/zhiqiyun/open/mvc/controller/OauthController.java

@@ -1,4 +1,4 @@
-package com.zhiqiyun.open.mvc.manager.controller;
+package com.zhiqiyun.open.mvc.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
@@ -13,10 +13,10 @@ import com.zhiqiyun.open.core.service.OauthService;
 import com.zhiqiyun.open.core.service.UserBaseInfoService;
 import com.zhiqiyun.open.core.service.UserLoginLogService;
 import com.zhiqiyun.open.mvc.Result;
-import com.zhiqiyun.open.mvc.manager.params.ChangePasswordParam;
-import com.zhiqiyun.open.mvc.manager.params.LoginParam;
-import com.zhiqiyun.open.mvc.manager.params.QueryPageParams;
-import com.zhiqiyun.open.mvc.manager.params.SaveUserBaseInfoParam;
+import com.zhiqiyun.open.mvc.params.ChangePasswordParam;
+import com.zhiqiyun.open.mvc.params.LoginParam;
+import com.zhiqiyun.open.mvc.params.QueryPageParams;
+import com.zhiqiyun.open.mvc.params.SaveUserBaseInfoParam;
 import com.zhiqiyun.open.utils.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;

src/main/java/com/zhiqiyun/open/mvc/manager/controller/RoleInfoController.java → src/main/java/com/zhiqiyun/open/mvc/controller/RoleInfoController.java

@@ -1,4 +1,4 @@
-package com.zhiqiyun.open.mvc.manager.controller;
+package com.zhiqiyun.open.mvc.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
@@ -7,8 +7,8 @@ import com.zhiqiyun.open.annotation.Permission;
 import com.zhiqiyun.open.core.models.user.RoleInfo;
 import com.zhiqiyun.open.core.service.RoleInfoService;
 import com.zhiqiyun.open.mvc.Result;
-import com.zhiqiyun.open.mvc.manager.params.QueryRoleParam;
-import com.zhiqiyun.open.mvc.manager.params.SaveRoleParam;
+import com.zhiqiyun.open.mvc.params.QueryRoleParam;
+import com.zhiqiyun.open.mvc.params.SaveRoleParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/zhiqiyun/open/mvc/manager/controller/SceneryInfoController.java → src/main/java/com/zhiqiyun/open/mvc/controller/SceneryInfoController.java

@@ -1,4 +1,4 @@
-package com.zhiqiyun.open.mvc.manager.controller;
+package com.zhiqiyun.open.mvc.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
@@ -8,8 +8,8 @@ import com.zhiqiyun.open.core.models.bz.SceneryInfo;
 import com.zhiqiyun.open.core.service.SceneryInfoService;
 import com.zhiqiyun.open.core.service.SequenceService;
 import com.zhiqiyun.open.mvc.Result;
-import com.zhiqiyun.open.mvc.manager.params.QuerySceneryInfoParams;
-import com.zhiqiyun.open.mvc.manager.params.SaveSceneryInfoParams;
+import com.zhiqiyun.open.mvc.params.QuerySceneryInfoParams;
+import com.zhiqiyun.open.mvc.params.SaveSceneryInfoParams;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/zhiqiyun/open/mvc/manager/controller/SystemConfigController.java → src/main/java/com/zhiqiyun/open/mvc/controller/SystemConfigController.java

@@ -1,4 +1,4 @@
-package com.zhiqiyun.open.mvc.manager.controller;
+package com.zhiqiyun.open.mvc.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,8 +7,8 @@ import com.zhiqiyun.open.core.models.settings.SystemConfig;
 import com.zhiqiyun.open.core.models.settings.SystemConfigItem;
 import com.zhiqiyun.open.core.service.SystemConfigService;
 import com.zhiqiyun.open.mvc.Result;
-import com.zhiqiyun.open.mvc.manager.params.QuerySystemConfigParam;
-import com.zhiqiyun.open.mvc.manager.params.SaveSystemConfigParam;
+import com.zhiqiyun.open.mvc.params.QuerySystemConfigParam;
+import com.zhiqiyun.open.mvc.params.SaveSystemConfigParam;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;

src/main/java/com/zhiqiyun/open/mvc/manager/controller/UploaderController.java → src/main/java/com/zhiqiyun/open/mvc/controller/UploaderController.java

@@ -1,12 +1,11 @@
-package com.zhiqiyun.open.mvc.manager.controller;
+package com.zhiqiyun.open.mvc.controller;
 
 
-import com.alibaba.fastjson.JSONObject;
 import com.zhiqiyun.open.annotation.Permission;
 import com.zhiqiyun.open.core.models.UploadResult;
 import com.zhiqiyun.open.exception.UploadException;
 import com.zhiqiyun.open.mvc.Result;
-import com.zhiqiyun.open.mvc.manager.params.UploaderBase64Param;
+import com.zhiqiyun.open.mvc.params.UploaderBase64Param;
 import com.zhiqiyun.open.utils.DateUtil;
 import lombok.extern.slf4j.Slf4j;
 import net.coobird.thumbnailator.Thumbnails;
@@ -17,7 +16,6 @@ import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
 import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;

src/main/java/com/zhiqiyun/open/mvc/manager/controller/UserInfoController.java → src/main/java/com/zhiqiyun/open/mvc/controller/UserInfoController.java

@@ -1,4 +1,4 @@
-package com.zhiqiyun.open.mvc.manager.controller;
+package com.zhiqiyun.open.mvc.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
@@ -10,10 +10,10 @@ import com.zhiqiyun.open.core.enmus.UserState;
 import com.zhiqiyun.open.core.models.user.*;
 import com.zhiqiyun.open.core.service.*;
 import com.zhiqiyun.open.mvc.Result;
-import com.zhiqiyun.open.mvc.manager.params.QueryLoginLogParam;
-import com.zhiqiyun.open.mvc.manager.params.QueryOperateLogParams;
-import com.zhiqiyun.open.mvc.manager.params.QueryUserParam;
-import com.zhiqiyun.open.mvc.manager.params.SaveUserParam;
+import com.zhiqiyun.open.mvc.params.QueryLoginLogParam;
+import com.zhiqiyun.open.mvc.params.QueryOperateLogParams;
+import com.zhiqiyun.open.mvc.params.QueryUserParam;
+import com.zhiqiyun.open.mvc.params.SaveUserParam;
 import com.zhiqiyun.open.utils.RandomUtil;
 import com.zhiqiyun.open.utils.ServletContext;
 import org.apache.commons.lang3.StringUtils;

src/main/java/com/zhiqiyun/open/mvc/manager/controller/VenueInfoController.java → src/main/java/com/zhiqiyun/open/mvc/controller/VenueInfoController.java

@@ -1,18 +1,15 @@
-package com.zhiqiyun.open.mvc.manager.controller;
+package com.zhiqiyun.open.mvc.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zhiqiyun.open.annotation.Permission;
-import com.zhiqiyun.open.core.enmus.YN;
-import com.zhiqiyun.open.core.models.app.AppKeyInfo;
 import com.zhiqiyun.open.core.models.bz.VenueInfo;
 import com.zhiqiyun.open.core.service.SequenceService;
 import com.zhiqiyun.open.core.service.VenueInfoService;
 import com.zhiqiyun.open.mvc.Result;
-import com.zhiqiyun.open.mvc.manager.params.QueryVenueInfoParams;
-import com.zhiqiyun.open.mvc.manager.params.SaveVenueInfoParams;
+import com.zhiqiyun.open.mvc.params.QueryVenueInfoParams;
+import com.zhiqiyun.open.mvc.params.SaveVenueInfoParams;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,7 +20,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
-import java.util.function.Consumer;
 
 @RestController
 @RequestMapping("/bz/base/venue")

src/main/java/com/zhiqiyun/open/mvc/manager/params/ChangePasswordParam.java → src/main/java/com/zhiqiyun/open/mvc/params/ChangePasswordParam.java

@@ -1,4 +1,4 @@
-package com.zhiqiyun.open.mvc.manager.params;
+package com.zhiqiyun.open.mvc.params;
 
 import com.zhiqiyun.open.utils.validation.StrongPassword;
 

src/main/java/com/zhiqiyun/open/mvc/manager/params/LoginParam.java → src/main/java/com/zhiqiyun/open/mvc/params/LoginParam.java

@@ -1,4 +1,4 @@
-package com.zhiqiyun.open.mvc.manager.params;
+package com.zhiqiyun.open.mvc.params;
 
 import lombok.Data;
 

src/main/java/com/zhiqiyun/open/mvc/manager/params/QueryApiRequestLogParams.java → src/main/java/com/zhiqiyun/open/mvc/params/QueryApiRequestLogParams.java

@@ -1,10 +1,9 @@
-package com.zhiqiyun.open.mvc.manager.params;
+package com.zhiqiyun.open.mvc.params;
 
 import com.zhiqiyun.open.core.models.RangeDate;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
 import java.util.List;
 
 @Data

src/main/java/com/zhiqiyun/open/mvc/manager/params/QueryAppKeyInfoParams.java → src/main/java/com/zhiqiyun/open/mvc/params/QueryAppKeyInfoParams.java

@@ -1,4 +1,4 @@
-package com.zhiqiyun.open.mvc.manager.params;
+package com.zhiqiyun.open.mvc.params;
 
 import com.zhiqiyun.open.core.enmus.YN;
 import lombok.Data;

src/main/java/com/zhiqiyun/open/mvc/manager/params/QueryHolidayVillageInfoParams.java → src/main/java/com/zhiqiyun/open/mvc/params/QueryHolidayVillageInfoParams.java

@@ -1,4 +1,4 @@
-package com.zhiqiyun.open.mvc.manager.params;
+package com.zhiqiyun.open.mvc.params;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

src/main/java/com/zhiqiyun/open/mvc/manager/params/QueryLoginLogParam.java → src/main/java/com/zhiqiyun/open/mvc/params/QueryLoginLogParam.java

@@ -1,4 +1,4 @@
-package com.zhiqiyun.open.mvc.manager.params;
+package com.zhiqiyun.open.mvc.params;
 
 import com.zhiqiyun.open.core.enmus.AccountType;
 import com.zhiqiyun.open.core.enmus.UserLoginLogState;

src/main/java/com/zhiqiyun/open/mvc/manager/params/QueryOperateLogParams.java → src/main/java/com/zhiqiyun/open/mvc/params/QueryOperateLogParams.java

@@ -1,4 +1,4 @@
-package com.zhiqiyun.open.mvc.manager.params;
+package com.zhiqiyun.open.mvc.params;
 
 import com.zhiqiyun.open.core.models.RangeDate;
 import lombok.Data;

src/main/java/com/zhiqiyun/open/mvc/manager/params/QueryPageParams.java → src/main/java/com/zhiqiyun/open/mvc/params/QueryPageParams.java

@@ -1,4 +1,4 @@
-package com.zhiqiyun.open.mvc.manager.params;
+package com.zhiqiyun.open.mvc.params;
 
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

src/main/java/com/zhiqiyun/open/mvc/manager/params/QueryRoleParam.java → src/main/java/com/zhiqiyun/open/mvc/params/QueryRoleParam.java

@@ -1,4 +1,4 @@
-package com.zhiqiyun.open.mvc.manager.params;
+package com.zhiqiyun.open.mvc.params;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

src/main/java/com/zhiqiyun/open/mvc/manager/params/QuerySceneryInfoParams.java → src/main/java/com/zhiqiyun/open/mvc/params/QuerySceneryInfoParams.java

@@ -1,4 +1,4 @@
-package com.zhiqiyun.open.mvc.manager.params;
+package com.zhiqiyun.open.mvc.params;
 
 import com.zhiqiyun.open.core.enmus.SceneryGrade;
 import lombok.Data;

src/main/java/com/zhiqiyun/open/mvc/manager/params/QuerySystemConfigParam.java → src/main/java/com/zhiqiyun/open/mvc/params/QuerySystemConfigParam.java

@@ -1,4 +1,4 @@
-package com.zhiqiyun.open.mvc.manager.params;
+package com.zhiqiyun.open.mvc.params;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

src/main/java/com/zhiqiyun/open/mvc/manager/params/QueryUserParam.java → src/main/java/com/zhiqiyun/open/mvc/params/QueryUserParam.java

@@ -1,4 +1,4 @@
-package com.zhiqiyun.open.mvc.manager.params;
+package com.zhiqiyun.open.mvc.params;
 
 import com.zhiqiyun.open.core.enmus.Gender;
 import com.zhiqiyun.open.core.enmus.UserState;

src/main/java/com/zhiqiyun/open/mvc/manager/params/QueryVenueInfoParams.java → src/main/java/com/zhiqiyun/open/mvc/params/QueryVenueInfoParams.java

@@ -1,4 +1,4 @@
-package com.zhiqiyun.open.mvc.manager.params;
+package com.zhiqiyun.open.mvc.params;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

src/main/java/com/zhiqiyun/open/mvc/manager/params/SaveAppKeyInfoParam.java → src/main/java/com/zhiqiyun/open/mvc/params/SaveAppKeyInfoParam.java

@@ -1,4 +1,4 @@
-package com.zhiqiyun.open.mvc.manager.params;
+package com.zhiqiyun.open.mvc.params;
 
 import lombok.Data;
 

src/main/java/com/zhiqiyun/open/mvc/manager/params/SaveHolidayVillageInfoParams.java → src/main/java/com/zhiqiyun/open/mvc/params/SaveHolidayVillageInfoParams.java

@@ -1,4 +1,4 @@
-package com.zhiqiyun.open.mvc.manager.params;
+package com.zhiqiyun.open.mvc.params;
 
 import lombok.Data;
 

src/main/java/com/zhiqiyun/open/mvc/manager/params/SaveRoleParam.java → src/main/java/com/zhiqiyun/open/mvc/params/SaveRoleParam.java

@@ -1,4 +1,4 @@
-package com.zhiqiyun.open.mvc.manager.params;
+package com.zhiqiyun.open.mvc.params;
 
 import lombok.Data;
 

src/main/java/com/zhiqiyun/open/mvc/manager/params/SaveSceneryInfoParams.java → src/main/java/com/zhiqiyun/open/mvc/params/SaveSceneryInfoParams.java

@@ -1,4 +1,4 @@
-package com.zhiqiyun.open.mvc.manager.params;
+package com.zhiqiyun.open.mvc.params;
 
 import com.zhiqiyun.open.core.enmus.SceneryGrade;
 import lombok.Data;

src/main/java/com/zhiqiyun/open/mvc/manager/params/SaveSystemConfigParam.java → src/main/java/com/zhiqiyun/open/mvc/params/SaveSystemConfigParam.java

@@ -1,4 +1,4 @@
-package com.zhiqiyun.open.mvc.manager.params;
+package com.zhiqiyun.open.mvc.params;
 
 import lombok.Data;
 

src/main/java/com/zhiqiyun/open/mvc/manager/params/SaveUserBaseInfoParam.java → src/main/java/com/zhiqiyun/open/mvc/params/SaveUserBaseInfoParam.java

@@ -1,4 +1,4 @@
-package com.zhiqiyun.open.mvc.manager.params;
+package com.zhiqiyun.open.mvc.params;
 
 import com.zhiqiyun.open.core.enmus.Gender;
 import lombok.Data;

src/main/java/com/zhiqiyun/open/mvc/manager/params/SaveUserParam.java → src/main/java/com/zhiqiyun/open/mvc/params/SaveUserParam.java

@@ -1,4 +1,4 @@
-package com.zhiqiyun.open.mvc.manager.params;
+package com.zhiqiyun.open.mvc.params;
 
 import com.zhiqiyun.open.core.enmus.Gender;
 import com.zhiqiyun.open.utils.validation.MobileNumber;

src/main/java/com/zhiqiyun/open/mvc/manager/params/SaveVenueInfoParams.java → src/main/java/com/zhiqiyun/open/mvc/params/SaveVenueInfoParams.java

@@ -1,4 +1,4 @@
-package com.zhiqiyun.open.mvc.manager.params;
+package com.zhiqiyun.open.mvc.params;
 
 import lombok.Data;
 

src/main/java/com/zhiqiyun/open/mvc/manager/params/UploaderBase64Param.java → src/main/java/com/zhiqiyun/open/mvc/params/UploaderBase64Param.java

@@ -1,4 +1,4 @@
-package com.zhiqiyun.open.mvc.manager.params;
+package com.zhiqiyun.open.mvc.params;
 
 import lombok.Data;