代码优化

alien-api/src/main/resources/bootstrap.yml

@@ -1,13 +1,13 @@
 spring:
   application:
-    name: xiaokuihua-api
+    name: alien-api
 
   cloud:
     nacos:
       #注册中心
       discovery:
         server-addr: localhost:8848
-#        server-addr: xiaokuihua.cc:8848
+        #        server-addr: xiaokuihua.cc:8848
         username: nacos
         password: .,ZyL021405
 
@@ -16,7 +16,7 @@ spring:
 
         enabled: true
         server-addr: localhost:8848
-#        server-addr: xiaokuihua.cc:8848
+        #        server-addr: xiaokuihua.cc:8848
         username: nacos
         password: .,ZyL021405
         group: DEFAULT_GROUP

alien-entity/pom.xml

@@ -70,6 +70,13 @@
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.alibaba.fastjson2</groupId>
+            <artifactId>fastjson2</artifactId>
+            <version>2.0.53</version>
+            <scope>compile</scope>
+        </dependency>
+
     </dependencies>
 
     <build>

alien-store/src/main/java/shop/alien/store/entity/dto/GroupRes.java → alien-entity/src/main/java/shop/alien/entity/store/dto/GroupRes.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.dto;
+package shop.alien.entity.store.dto;
 
 
 import io.swagger.annotations.ApiModel;

alien-store/src/main/java/shop/alien/store/entity/dto/LifeAppealManageDto.java → alien-entity/src/main/java/shop/alien/entity/store/dto/LifeAppealManageDto.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.dto;
+package shop.alien.entity.store.dto;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;

alien-store/src/main/java/shop/alien/store/entity/dto/LifeDiscountCouponDto.java → alien-entity/src/main/java/shop/alien/entity/store/dto/LifeDiscountCouponDto.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.dto;
+package shop.alien.entity.store.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

alien-store/src/main/java/shop/alien/store/entity/dto/LifeDiscountCouponStoreFriendDto.java → alien-entity/src/main/java/shop/alien/entity/store/dto/LifeDiscountCouponStoreFriendDto.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.dto;
+package shop.alien.entity.store.dto;
 
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import io.swagger.annotations.ApiModel;

alien-store/src/main/java/shop/alien/store/entity/dto/LifeDiscountCouponUserDto.java → alien-entity/src/main/java/shop/alien/entity/store/dto/LifeDiscountCouponUserDto.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.dto;
+package shop.alien.entity.store.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

alien-store/src/main/java/shop/alien/store/entity/dto/LifeUserViolationDto.java → alien-entity/src/main/java/shop/alien/entity/store/dto/LifeUserViolationDto.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.dto;
+package shop.alien.entity.store.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

alien-store/src/main/java/shop/alien/store/entity/dto/StoreActivityDto.java → alien-entity/src/main/java/shop/alien/entity/store/dto/StoreActivityDto.java

@@ -1,5 +1,5 @@
 
-package shop.alien.store.entity.dto;
+package shop.alien.entity.store.dto;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;

alien-store/src/main/java/shop/alien/store/entity/dto/StoreActivityRuleDto.java → alien-entity/src/main/java/shop/alien/entity/store/dto/StoreActivityRuleDto.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.dto;
+package shop.alien.entity.store.dto;
 
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.extension.activerecord.Model;

alien-store/src/main/java/shop/alien/store/entity/dto/StoreEvaluationDto.java → alien-entity/src/main/java/shop/alien/entity/store/dto/StoreEvaluationDto.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.dto;
+package shop.alien.entity.store.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

alien-store/src/main/java/shop/alien/store/entity/dto/SystemLoginDto.java → alien-entity/src/main/java/shop/alien/entity/store/dto/SystemLoginDto.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.dto;
+package shop.alien.entity.store.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

alien-store/src/main/java/shop/alien/store/entity/excelVo/LifeAppealManageExcelVo.java → alien-entity/src/main/java/shop/alien/entity/store/excelVo/LifeAppealManageExcelVo.java

@@ -1,12 +1,12 @@
-package shop.alien.store.entity.excelVo;
+package shop.alien.entity.store.excelVo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import shop.alien.store.util.ExcelHeader;
-import shop.alien.store.util.ExcelImage;
+import shop.alien.entity.store.excelVo.util.ExcelHeader;
+import shop.alien.entity.store.excelVo.util.ExcelImage;
 
 /**
  * @Author: fcw

alien-store/src/main/java/shop/alien/store/entity/excelVo/LifeUserOrderExcelVo.java → alien-entity/src/main/java/shop/alien/entity/store/excelVo/LifeUserOrderExcelVo.java

@@ -1,11 +1,11 @@
-package shop.alien.store.entity.excelVo;
+package shop.alien.entity.store.excelVo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import shop.alien.store.util.ExcelHeader;
-import shop.alien.store.util.ExcelImage;
+import shop.alien.entity.store.excelVo.util.ExcelHeader;
+import shop.alien.entity.store.excelVo.util.ExcelImage;
 
 /**
  * @Author: fcw

alien-store/src/main/java/shop/alien/store/entity/excelVo/LifeUserViolationExcelVO.java → alien-entity/src/main/java/shop/alien/entity/store/excelVo/LifeUserViolationExcelVO.java

@@ -1,12 +1,12 @@
-package shop.alien.store.entity.excelVo;
+package shop.alien.entity.store.excelVo;
 
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import shop.alien.store.util.ExcelHeader;
-import shop.alien.store.util.ExcelImage;
+import shop.alien.entity.store.excelVo.util.ExcelHeader;
+import shop.alien.entity.store.excelVo.util.ExcelImage;
 
 /**
  * @Author: fcw
@@ -27,7 +27,6 @@ public class LifeUserViolationExcelVO {
     private String nickname;
 
 
-
     @ExcelHeader("用户联系电话")
     @ApiModelProperty(value = "用户联系电话")
     private String phone;
@@ -48,14 +47,12 @@ public class LifeUserViolationExcelVO {
     private String violationType;
 
 
-
     @ExcelHeader("凭证")
     @ApiModelProperty(value = "凭证")
     @ExcelImage
     private String reportEvidenceImg;
 
 
-
     @ExcelHeader("状态")
     @ApiModelProperty(value = "状态")
     private String processingStatus;

alien-store/src/main/java/shop/alien/store/entity/excelVo/StoreActivityExcelVo.java → alien-entity/src/main/java/shop/alien/entity/store/excelVo/StoreActivityExcelVo.java

@@ -1,11 +1,11 @@
-package shop.alien.store.entity.excelVo;
+package shop.alien.entity.store.excelVo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import shop.alien.store.util.ExcelHeader;
-import shop.alien.store.util.ExcelImage;
+import shop.alien.entity.store.excelVo.util.ExcelHeader;
+import shop.alien.entity.store.excelVo.util.ExcelImage;
 
 /**
  * @author YinDP

alien-store/src/main/java/shop/alien/store/entity/excelVo/StoreCouponStatusVo.java → alien-entity/src/main/java/shop/alien/entity/store/excelVo/StoreCouponStatusVo.java

@@ -1,10 +1,10 @@
-package shop.alien.store.entity.excelVo;
+package shop.alien.entity.store.excelVo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import shop.alien.store.util.ExcelHeader;
+import shop.alien.entity.store.excelVo.util.ExcelHeader;
 
 /**
  * @Author: fcw

alien-store/src/main/java/shop/alien/store/entity/excelVo/StoreInfoExcelVo.java → alien-entity/src/main/java/shop/alien/entity/store/excelVo/StoreInfoExcelVo.java

@@ -1,11 +1,11 @@
-package shop.alien.store.entity.excelVo;
+package shop.alien.entity.store.excelVo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import shop.alien.store.util.ExcelHeader;
-import shop.alien.store.util.ExcelImage;
+import shop.alien.entity.store.excelVo.util.ExcelHeader;
+import shop.alien.entity.store.excelVo.util.ExcelImage;
 
 /**
  * @author YinDP

alien-store/src/main/java/shop/alien/store/entity/excelVo/StoreInfoExpiredRecordsExcelVo.java → alien-entity/src/main/java/shop/alien/entity/store/excelVo/StoreInfoExpiredRecordsExcelVo.java

@@ -1,11 +1,11 @@
 
-package shop.alien.store.entity.excelVo;
+package shop.alien.entity.store.excelVo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import shop.alien.store.util.ExcelHeader;
+import shop.alien.entity.store.excelVo.util.ExcelHeader;
 
 /**
  * @author YinDP

alien-store/src/main/java/shop/alien/store/entity/excelVo/StoreStaffConfigExcelVo.java → alien-entity/src/main/java/shop/alien/entity/store/excelVo/StoreStaffConfigExcelVo.java

@@ -1,12 +1,12 @@
-package shop.alien.store.entity.excelVo;
+package shop.alien.entity.store.excelVo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import shop.alien.store.util.ExcelHeader;
-import shop.alien.store.util.ExcelImage;
+import shop.alien.entity.store.excelVo.util.ExcelHeader;
+import shop.alien.entity.store.excelVo.util.ExcelImage;
 
 /**
  * @Author: fcw

alien-store/src/main/java/shop/alien/store/entity/excelVo/StoreUserExcelVo.java → alien-entity/src/main/java/shop/alien/entity/store/excelVo/StoreUserExcelVo.java

@@ -1,10 +1,10 @@
-package shop.alien.store.entity.excelVo;
+package shop.alien.entity.store.excelVo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import shop.alien.store.util.ExcelHeader;
+import shop.alien.entity.store.excelVo.util.ExcelHeader;
 
 /**
  * @author YinDP

alien-store/src/main/java/shop/alien/store/util/ExcelExporter.java → alien-entity/src/main/java/shop/alien/entity/store/excelVo/util/ExcelExporter.java

@@ -1,4 +1,4 @@
-package shop.alien.store.util;
+package shop.alien.entity.store.excelVo.util;
 
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
@@ -6,9 +6,9 @@ import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.util.StringUtils;
 import shop.alien.entity.store.LifeClassManage;
-import shop.alien.store.entity.vo.StoreCommentAppealVo;
-import shop.alien.store.entity.vo.StoreDynamicDiscountVo;
-import shop.alien.store.entity.vo.StoreInfoVo;
+import shop.alien.entity.store.vo.StoreCommentAppealVo;
+import shop.alien.entity.store.vo.StoreDynamicDiscountVo;
+import shop.alien.entity.store.vo.StoreInfoVo;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

alien-store/src/main/java/shop/alien/store/util/ExcelGenerator.java → alien-entity/src/main/java/shop/alien/entity/store/excelVo/util/ExcelGenerator.java

@@ -1,4 +1,4 @@
-package shop.alien.store.util;
+package shop.alien.entity.store.excelVo.util;
 
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFClientAnchor;

alien-store/src/main/java/shop/alien/store/util/ExcelHeader.java → alien-entity/src/main/java/shop/alien/entity/store/excelVo/util/ExcelHeader.java

@@ -1,4 +1,4 @@
-package shop.alien.store.util;
+package shop.alien.entity.store.excelVo.util;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

alien-store/src/main/java/shop/alien/store/util/ExcelImage.java → alien-entity/src/main/java/shop/alien/entity/store/excelVo/util/ExcelImage.java

@@ -1,4 +1,4 @@
-package shop.alien.store.util;
+package shop.alien.entity.store.excelVo.util;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

alien-store/src/main/java/shop/alien/store/entity/vo/EssentialModuleInformationVo.java → alien-entity/src/main/java/shop/alien/entity/store/vo/EssentialModuleInformationVo.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.extension.activerecord.Model;

alien-store/src/main/java/shop/alien/store/entity/vo/ExpertGoodsTypeVo.java → alien-entity/src/main/java/shop/alien/entity/store/vo/ExpertGoodsTypeVo.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 import lombok.Data;
 

alien-store/src/main/java/shop/alien/store/entity/vo/LifeActivityVo.java → alien-entity/src/main/java/shop/alien/entity/store/vo/LifeActivityVo.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModelProperty;

alien-store/src/main/java/shop/alien/store/entity/vo/LifeAppealManageVo.java → alien-entity/src/main/java/shop/alien/entity/store/vo/LifeAppealManageVo.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModelProperty;

alien-store/src/main/java/shop/alien/store/entity/vo/LifeBlacklistVo.java → alien-entity/src/main/java/shop/alien/entity/store/vo/LifeBlacklistVo.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;

alien-store/src/main/java/shop/alien/store/entity/vo/LifeBrandedCardVo.java → alien-entity/src/main/java/shop/alien/entity/store/vo/LifeBrandedCardVo.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;

alien-store/src/main/java/shop/alien/store/entity/vo/LifeClassManageVo.java → alien-entity/src/main/java/shop/alien/entity/store/vo/LifeClassManageVo.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;

alien-store/src/main/java/shop/alien/store/entity/vo/LifeCouponVo.java → alien-entity/src/main/java/shop/alien/entity/store/vo/LifeCouponVo.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;

alien-store/src/main/java/shop/alien/store/entity/vo/LifeDiscountCouponStoreFriendVo.java → alien-entity/src/main/java/shop/alien/entity/store/vo/LifeDiscountCouponStoreFriendVo.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import io.swagger.annotations.ApiModel;
@@ -12,7 +12,7 @@ import java.util.List;
 
 /**
  * <p>
- * 优惠券商户发放好友优惠券关系表	
+ * 优惠券商户发放好友优惠券关系表
  * </p>
  *
  * @author ssk
@@ -21,7 +21,7 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@ApiModel(value="LifeDiscountCouponStoreFriend对象", description="优惠券商户发放好友优惠券关系表	")
+@ApiModel(value = "LifeDiscountCouponStoreFriend对象", description = "优惠券商户发放好友优惠券关系表	")
 public class LifeDiscountCouponStoreFriendVo extends Model<LifeDiscountCouponStoreFriendVo> {
 
     private static final long serialVersionUID = 1L;

alien-store/src/main/java/shop/alien/store/entity/vo/LifeDiscountCouponUserVo.java → alien-entity/src/main/java/shop/alien/entity/store/vo/LifeDiscountCouponUserVo.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

alien-store/src/main/java/shop/alien/store/entity/vo/LifeDiscountCouponVo.java → alien-entity/src/main/java/shop/alien/entity/store/vo/LifeDiscountCouponVo.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

alien-store/src/main/java/shop/alien/store/entity/vo/LifeFansVo.java → alien-entity/src/main/java/shop/alien/entity/store/vo/LifeFansVo.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;

alien-store/src/main/java/shop/alien/store/entity/vo/LifeMessageVo.java → alien-entity/src/main/java/shop/alien/entity/store/vo/LifeMessageVo.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;

alien-store/src/main/java/shop/alien/store/entity/vo/LifeNoticeVo.java → alien-entity/src/main/java/shop/alien/entity/store/vo/LifeNoticeVo.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;

alien-store/src/main/java/shop/alien/store/entity/vo/LifePinglunVo.java → alien-entity/src/main/java/shop/alien/entity/store/vo/LifePinglunVo.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;

alien-store/src/main/java/shop/alien/store/entity/vo/LifePromotionPackageVo.java → alien-entity/src/main/java/shop/alien/entity/store/vo/LifePromotionPackageVo.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;

alien-store/src/main/java/shop/alien/store/entity/vo/LifeReverseGroupBuyingStoreVo.java → alien-entity/src/main/java/shop/alien/entity/store/vo/LifeReverseGroupBuyingStoreVo.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

alien-store/src/main/java/shop/alien/store/entity/vo/LifeReverseGroupBuyingUserVo.java → alien-entity/src/main/java/shop/alien/entity/store/vo/LifeReverseGroupBuyingUserVo.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

alien-store/src/main/java/shop/alien/store/entity/vo/LifeStoreVo.java → alien-entity/src/main/java/shop/alien/entity/store/vo/LifeStoreVo.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;

alien-store/src/main/java/shop/alien/store/entity/vo/LifeTuanGouParamVo.java → alien-entity/src/main/java/shop/alien/entity/store/vo/LifeTuanGouParamVo.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;

alien-store/src/main/java/shop/alien/store/entity/vo/LifeUserDongTaiVo.java → alien-entity/src/main/java/shop/alien/entity/store/vo/LifeUserDongTaiVo.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;

alien-store/src/main/java/shop/alien/store/entity/vo/LifeUserDynamicsVo.java → alien-entity/src/main/java/shop/alien/entity/store/vo/LifeUserDynamicsVo.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;

alien-store/src/main/java/shop/alien/store/entity/vo/LifeUserExpertOrderVo.java → alien-entity/src/main/java/shop/alien/entity/store/vo/LifeUserExpertOrderVo.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;

alien-store/src/main/java/shop/alien/store/entity/vo/LifeUserExpertVo.java → alien-entity/src/main/java/shop/alien/entity/store/vo/LifeUserExpertVo.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

alien-store/src/main/java/shop/alien/store/entity/vo/LifeUserExpertWorksVo.java → alien-entity/src/main/java/shop/alien/entity/store/vo/LifeUserExpertWorksVo.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;

alien-store/src/main/java/shop/alien/store/entity/vo/LifeUserOrderVo.java → alien-entity/src/main/java/shop/alien/entity/store/vo/LifeUserOrderVo.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;

alien-store/src/main/java/shop/alien/store/entity/vo/LifeUserViolationVo.java → alien-entity/src/main/java/shop/alien/entity/store/vo/LifeUserViolationVo.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 import io.swagger.annotations.ApiModel;
 import lombok.Data;

alien-store/src/main/java/shop/alien/store/entity/vo/ManagementInfoVo.java → alien-entity/src/main/java/shop/alien/entity/store/vo/ManagementInfoVo.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 
 import io.swagger.annotations.ApiModelProperty;

alien-store/src/main/java/shop/alien/store/entity/vo/ScreeningOfEightMajorCategoriesVO.java → alien-entity/src/main/java/shop/alien/entity/store/vo/ScreeningOfEightMajorCategoriesVO.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

alien-store/src/main/java/shop/alien/store/entity/vo/StoreActivityVo.java → alien-entity/src/main/java/shop/alien/entity/store/vo/StoreActivityVo.java

@@ -1,5 +1,5 @@
 
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;

alien-store/src/main/java/shop/alien/store/entity/vo/StoreCashOutRecordVo.java → alien-entity/src/main/java/shop/alien/entity/store/vo/StoreCashOutRecordVo.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 import com.alibaba.fastjson2.JSONArray;
 import io.swagger.annotations.ApiModel;

alien-store/src/main/java/shop/alien/store/entity/vo/StoreClockInVo.java → alien-entity/src/main/java/shop/alien/entity/store/vo/StoreClockInVo.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModelProperty;

alien-store/src/main/java/shop/alien/store/entity/vo/StoreCommentAppealLogVo.java → alien-entity/src/main/java/shop/alien/entity/store/vo/StoreCommentAppealLogVo.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModelProperty;

alien-store/src/main/java/shop/alien/store/entity/vo/StoreCommentAppealVo.java → alien-entity/src/main/java/shop/alien/entity/store/vo/StoreCommentAppealVo.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonInclude;

alien-store/src/main/java/shop/alien/store/entity/vo/StoreCommentVo.java → alien-entity/src/main/java/shop/alien/entity/store/vo/StoreCommentVo.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModelProperty;

alien-store/src/main/java/shop/alien/store/entity/vo/StoreCommitPercentVo.java → alien-entity/src/main/java/shop/alien/entity/store/vo/StoreCommitPercentVo.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModelProperty;

alien-store/src/main/java/shop/alien/store/entity/vo/StoreDictionaryVo.java → alien-entity/src/main/java/shop/alien/entity/store/vo/StoreDictionaryVo.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import io.swagger.annotations.ApiModel;

alien-store/src/main/java/shop/alien/store/entity/vo/StoreDynamicDiscountInviteLogVo.java → alien-entity/src/main/java/shop/alien/entity/store/vo/StoreDynamicDiscountInviteLogVo.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 import lombok.Data;
 import shop.alien.entity.store.StoreDynamicDiscountInviteLog;

alien-store/src/main/java/shop/alien/store/entity/vo/StoreDynamicDiscountVo.java → alien-entity/src/main/java/shop/alien/entity/store/vo/StoreDynamicDiscountVo.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModelProperty;

alien-store/src/main/java/shop/alien/store/entity/vo/StoreGroupPackageVO.java → alien-entity/src/main/java/shop/alien/entity/store/vo/StoreGroupPackageVO.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

alien-store/src/main/java/shop/alien/store/entity/vo/StoreImgTypeVo.java → alien-entity/src/main/java/shop/alien/entity/store/vo/StoreImgTypeVo.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModelProperty;

alien-store/src/main/java/shop/alien/store/entity/vo/StoreImgVo.java → alien-entity/src/main/java/shop/alien/entity/store/vo/StoreImgVo.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;

alien-store/src/main/java/shop/alien/store/entity/vo/StoreIncomeDetailsRecordVo.java → alien-entity/src/main/java/shop/alien/entity/store/vo/StoreIncomeDetailsRecordVo.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;

alien-store/src/main/java/shop/alien/store/entity/vo/StoreInfoVo.java → alien-entity/src/main/java/shop/alien/entity/store/vo/StoreInfoVo.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;

alien-store/src/main/java/shop/alien/store/entity/vo/StoreMainInfoVo.java → alien-entity/src/main/java/shop/alien/entity/store/vo/StoreMainInfoVo.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModelProperty;

alien-store/src/main/java/shop/alien/store/entity/vo/StoreMembershipCardOrderVo.java → alien-entity/src/main/java/shop/alien/entity/store/vo/StoreMembershipCardOrderVo.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.extension.activerecord.Model;

alien-store/src/main/java/shop/alien/store/entity/vo/StoreMembershipCardVo.java → alien-entity/src/main/java/shop/alien/entity/store/vo/StoreMembershipCardVo.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.extension.activerecord.Model;

alien-store/src/main/java/shop/alien/store/entity/vo/StoreMenuVo.java → alien-entity/src/main/java/shop/alien/entity/store/vo/StoreMenuVo.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModelProperty;

alien-store/src/main/java/shop/alien/store/entity/vo/StorePersonalCustomizedVo.java → alien-entity/src/main/java/shop/alien/entity/store/vo/StorePersonalCustomizedVo.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

alien-store/src/main/java/shop/alien/store/entity/vo/StoreSalesDetailsVo.java → alien-entity/src/main/java/shop/alien/entity/store/vo/StoreSalesDetailsVo.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;

alien-store/src/main/java/shop/alien/store/entity/vo/StoreVipLogVo.java → alien-entity/src/main/java/shop/alien/entity/store/vo/StoreVipLogVo.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 import lombok.Data;
 import shop.alien.entity.store.StoreVipLog;

alien-store/src/main/java/shop/alien/store/entity/vo/SystemLoginVo.java → alien-entity/src/main/java/shop/alien/entity/store/vo/SystemLoginVo.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

alien-store/src/main/java/shop/alien/store/entity/vo/WebAuditVo.java → alien-entity/src/main/java/shop/alien/entity/store/vo/WebAuditVo.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 import lombok.Data;
 import shop.alien.entity.store.WebAudit;

alien-store/src/main/java/shop/alien/store/entity/vo/WebsocketVo.java → alien-entity/src/main/java/shop/alien/entity/store/vo/WebsocketVo.java

@@ -1,4 +1,4 @@
-package shop.alien.store.entity.vo;
+package shop.alien.entity.store.vo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModelProperty;

alien-gateway/pom.xml

@@ -36,16 +36,10 @@
             <artifactId>spring-cloud-starter-gateway</artifactId>
         </dependency>
 
-<!--        <dependency>-->
-<!--            <groupId>org.springframework.boot</groupId>-->
-<!--            <artifactId>spring-boot-starter-web</artifactId>-->
-<!--            <exclusions>-->
-<!--                <exclusion>-->
-<!--                    <groupId>com.fasterxml.jackson.core</groupId>-->
-<!--                    <artifactId>jackson-databind</artifactId>-->
-<!--                </exclusion>-->
-<!--            </exclusions>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
 
         <!--loadBalancer负载均衡-->
         <dependency>
@@ -59,6 +53,11 @@
         </dependency>
 
         <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+
+        <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
         </dependency>
@@ -147,11 +146,6 @@
             <version>3.4.0</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
-        </dependency>
-
         <!--redis连接池需要此依赖-->
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -163,25 +157,12 @@
             <artifactId>commons-lang3</artifactId>
         </dependency>
 
-
-<!--        <dependency>-->
-<!--            <groupId>shop.alien</groupId>-->
-<!--            <artifactId>alien-util</artifactId>-->
-<!--            <version>1.0.0</version>-->
-<!--        </dependency>-->
-
         <dependency>
             <groupId>shop.alien</groupId>
             <artifactId>alien-entity</artifactId>
             <version>1.0.0</version>
         </dependency>
 
-<!--        <dependency>-->
-<!--            <groupId>shop.alien</groupId>-->
-<!--            <artifactId>alien-config</artifactId>-->
-<!--            <version>1.0.0</version>-->
-<!--        </dependency>-->
-
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
@@ -192,8 +173,6 @@
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
         </dependency>
 
-
-
     </dependencies>
 
     <build>

alien-gateway/src/main/java/shop/alien/gateway/AlienGatewayApplication.java

@@ -13,7 +13,7 @@ import org.springframework.context.annotation.ComponentScan;
  * @date 2025/1/21 16:58
  */
 @ComponentScan({"shop.alien.gateway.*"})
-@MapperScan({"shop.alien.gateway.mapper","shop.alien.entity.system.mapper"})
+@MapperScan({"shop.alien.gateway.mapper"})
 @SpringBootApplication
 public class AlienGatewayApplication {
 

alien-second/src/main/java/shop/alien/second/controller/TestController.java

@@ -2,7 +2,6 @@ package shop.alien.second.controller;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiSort;
-import jdk.nashorn.internal.objects.annotations.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.CrossOrigin;

alien-store/src/main/java/shop/alien/store/config/JWTInterceptor.java

@@ -40,81 +40,83 @@ public class JWTInterceptor implements HandlerInterceptor {
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
             throws Exception {
-        if (CorsUtils.isPreFlightRequest(request)) {
-            // 这是一个OPTIONS请求，我们可以选择放行
-            return true;
-        }
-        //获取请求头中的token
-        String token = request.getHeader("Authorization");
-        log.info("====================>token值: " + token);
-        String path = request.getRequestURI();
-        log.info("====================>path: " + path);
-        Map<String, Object> map = new HashMap<>();
-        int errorType = 0;
-        try {
-            JWTUtils.TokenVerify(token);
-            DecodedJWT tokenInfo = JWTUtils.getTokenInfo(token);
-            log.info("phone：{}", tokenInfo.getClaim("phone").asString());
-            String phone = tokenInfo.getClaim("phone").asString();
-            log.info("userType：{}", tokenInfo.getClaim("userType").asString());
-            String deviceType = tokenInfo.getClaim("userType").asString();
-            String redisKey;
-            //区分
-            if ("web".equals(deviceType)) {
-                //管理端单设备登录
-//                redisKey = deviceType + "_" + tokenInfo.getClaim("userName").asString();
-                //不限制
-                return true;
-            } else {
-                redisKey = deviceType + "_" + tokenInfo.getClaim("phone").asString();
-            }
-            String redisVal = baseRedisService.getString(redisKey);
-            if (StringUtils.isEmpty(redisVal) || !token.equals(redisVal)) {
-                //判断程序是否为用户禁用
-                StoreUser storeUser = storeUserMapper.selectOne(new LambdaQueryWrapper<StoreUser>().eq(StoreUser::getPhone, phone));
-                if (storeUser.getStatus() == 1) {
-                    map.put("msg", "你的账号已被禁用");
-                    //别问, 问就是约定俗成
-                    map.put("code", 777);
-                } else {
-                    map.put("msg", "用户在别处登录");
-                    //别问, 问就是约定俗成
-                    map.put("code", 666);
-                }
+//        if (CorsUtils.isPreFlightRequest(request)) {
+//            // 这是一个OPTIONS请求，我们可以选择放行
+//            return true;
+//        }
+//        //获取请求头中的token
+//        String token = request.getHeader("Authorization");
+//        log.info("====================>token值: " + token);
+//        String path = request.getRequestURI();
+//        log.info("====================>path: " + path);
+//        Map<String, Object> map = new HashMap<>();
+//        int errorType = 0;
+//        try {
+//            JWTUtils.TokenVerify(token);
+//            DecodedJWT tokenInfo = JWTUtils.getTokenInfo(token);
+//            log.info("phone：{}", tokenInfo.getClaim("phone").asString());
+//            String phone = tokenInfo.getClaim("phone").asString();
+//            log.info("userType：{}", tokenInfo.getClaim("userType").asString());
+//            String deviceType = tokenInfo.getClaim("userType").asString();
+//            String redisKey;
+//            //区分
+//            if ("web".equals(deviceType)) {
+//                //管理端单设备登录
+////                redisKey = deviceType + "_" + tokenInfo.getClaim("userName").asString();
+//                //不限制
+//                return true;
+//            } else {
+//                redisKey = deviceType + "_" + tokenInfo.getClaim("phone").asString();
+//            }
+//            String redisVal = baseRedisService.getString(redisKey);
+//            if (StringUtils.isEmpty(redisVal) || !token.equals(redisVal)) {
+//                //判断程序是否为用户禁用
+//                StoreUser storeUser = storeUserMapper.selectOne(new LambdaQueryWrapper<StoreUser>().eq(StoreUser::getPhone, phone));
+//                if (storeUser.getStatus() == 1) {
+//                    map.put("msg", "你的账号已被禁用");
+//                    //别问, 问就是约定俗成
+//                    map.put("code", 777);
+//                } else {
+//                    map.put("msg", "用户在别处登录");
+//                    //别问, 问就是约定俗成
+//                    map.put("code", 666);
+//                }
+//
+//                map.put("success", false);
+//                String json = new ObjectMapper().writeValueAsString(map);
+//                response.setContentType("application/json;charset=UTF-8");
+//                response.getWriter().print(json);
+//                return false;
+//            }
+//            //放行请求
+//            return true;
+//        } catch (SignatureVerificationException e) {
+//            errorType = 1;
+//            log.error("JWTInterceptor SignatureVerificationException Msg={}", e.getMessage());
+//            map.put("msg", "无效签名");
+//        } catch (TokenExpiredException e) {
+//            errorType = 2;
+//            log.error("JWTInterceptor TokenExpiredException Msg={}", e.getMessage());
+//            map.put("msg", "token已过期");
+//        } catch (AlgorithmMismatchException e) {
+//            errorType = 3;
+//            log.error("JWTInterceptor AlgorithmMismatchException Msg={}", e.getMessage());
+//            map.put("msg", "算法不一致");
+//        } catch (Exception e) {
+//            errorType = 4;
+//            log.error("JWTInterceptor Exception Msg={}", e.getMessage());
+//            map.put("msg", "token无效");
+//        }
+//        log.info("====================>token无效类型: " + errorType);
+//        map.put("code", 401);
+//        map.put("success", false);
+//        //使用jackson将map转为json
+//        String json = new ObjectMapper().writeValueAsString(map);
+//        response.setContentType("application/json;charset=UTF-8");
+//        response.getWriter().print(json);
+//        return false;
 
-                map.put("success", false);
-                String json = new ObjectMapper().writeValueAsString(map);
-                response.setContentType("application/json;charset=UTF-8");
-                response.getWriter().print(json);
-                return false;
-            }
-            //放行请求
-            return true;
-        } catch (SignatureVerificationException e) {
-            errorType = 1;
-            log.error("JWTInterceptor SignatureVerificationException Msg={}", e.getMessage());
-            map.put("msg", "无效签名");
-        } catch (TokenExpiredException e) {
-            errorType = 2;
-            log.error("JWTInterceptor TokenExpiredException Msg={}", e.getMessage());
-            map.put("msg", "token已过期");
-        } catch (AlgorithmMismatchException e) {
-            errorType = 3;
-            log.error("JWTInterceptor AlgorithmMismatchException Msg={}", e.getMessage());
-            map.put("msg", "算法不一致");
-        } catch (Exception e) {
-            errorType = 4;
-            log.error("JWTInterceptor Exception Msg={}", e.getMessage());
-            map.put("msg", "token无效");
-        }
-        log.info("====================>token无效类型: " + errorType);
-        map.put("code", 401);
-        map.put("success", false);
-        //使用jackson将map转为json
-        String json = new ObjectMapper().writeValueAsString(map);
-        response.setContentType("application/json;charset=UTF-8");
-        response.getWriter().print(json);
-        return false;
+        return true;
     }
 
 }

alien-store/src/main/java/shop/alien/store/controller/EssentialModuleInformationController.java

@@ -7,7 +7,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 import shop.alien.entity.result.R;
 import shop.alien.entity.store.EssentialModuleInformation;
-import shop.alien.store.entity.vo.EssentialModuleInformationVo;
+import shop.alien.entity.store.vo.EssentialModuleInformationVo;
 import shop.alien.store.service.EssentialModuleInformationService;
 
 import java.util.List;

alien-store/src/main/java/shop/alien/store/controller/LifeActivityController.java

@@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import shop.alien.entity.result.R;
 import shop.alien.entity.store.LifeActivity;
-import shop.alien.store.entity.vo.LifeActivityVo;
+import shop.alien.entity.store.vo.LifeActivityVo;
 import shop.alien.store.service.LifeActivityService;
 import shop.alien.util.common.FileUpload;
 

alien-store/src/main/java/shop/alien/store/controller/LifeAppealManageController.java

@@ -12,8 +12,8 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import shop.alien.entity.result.R;
 import shop.alien.entity.store.LifeAppealManage;
-import shop.alien.store.entity.dto.LifeAppealManageDto;
-import shop.alien.store.entity.vo.LifeAppealManageVo;
+import shop.alien.entity.store.dto.LifeAppealManageDto;
+import shop.alien.entity.store.vo.LifeAppealManageVo;
 import shop.alien.store.service.LifeAppealManageService;
 import shop.alien.util.common.FileUpload;
 

alien-store/src/main/java/shop/alien/store/controller/LifeBlacklistController.java

@@ -9,7 +9,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 import shop.alien.entity.result.R;
 import shop.alien.entity.store.LifeBlacklist;
-import shop.alien.store.entity.vo.LifeBlacklistVo;
+import shop.alien.entity.store.vo.LifeBlacklistVo;
 import shop.alien.store.service.LifeBlacklistService;
 
 import java.util.List;

alien-store/src/main/java/shop/alien/store/controller/LifeBrandedCardController.java

@@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import shop.alien.entity.store.LifeBrandedCard;
 import shop.alien.entity.store.LifeCoupon;
-import shop.alien.store.entity.vo.StoreInfoVo;
+import shop.alien.entity.store.vo.StoreInfoVo;
 import shop.alien.store.service.LifeBrandedCardService;
 import shop.alien.util.common.FileUpload;
 

alien-store/src/main/java/shop/alien/store/controller/LifeClassManageController.java

@@ -16,7 +16,7 @@ import shop.alien.entity.result.R;
 import shop.alien.entity.store.LifeClassManage;
 import shop.alien.store.mapper.LifeClassManageMapper;
 import shop.alien.store.service.LifeClassManageService;
-import shop.alien.store.util.ExcelExporter;
+import shop.alien.entity.store.excelVo.util.ExcelExporter;
 import shop.alien.util.common.FileUpload;
 
 import java.io.IOException;

alien-store/src/main/java/shop/alien/store/controller/LifeCollectController.java

@@ -10,8 +10,8 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 import shop.alien.entity.result.R;
 import shop.alien.entity.store.LifeCollect;
+import shop.alien.entity.store.vo.StoreInfoVo;
 import shop.alien.store.config.GaoDeMapUtil;
-import shop.alien.store.entity.vo.StoreInfoVo;
 import shop.alien.store.mapper.LifeCollectMapper;
 import shop.alien.store.mapper.StoreInfoMapper;
 import shop.alien.util.common.ListToPage;

alien-store/src/main/java/shop/alien/store/controller/LifeCommentController.java

@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import shop.alien.entity.result.R;
 import shop.alien.entity.store.LifeComment;
-import shop.alien.store.entity.vo.LifePinglunVo;
+import shop.alien.entity.store.vo.LifePinglunVo;
 import shop.alien.store.service.LifeCommentService;
 import shop.alien.util.common.FileUpload;
 import shop.alien.util.common.ListToPage;

alien-store/src/main/java/shop/alien/store/controller/LifeDictController.java

@@ -6,7 +6,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 import shop.alien.entity.result.R;
 import shop.alien.entity.store.LifeDict;
-import shop.alien.store.entity.vo.StoreDictionaryVo;
+import shop.alien.entity.store.vo.StoreDictionaryVo;
 import shop.alien.store.service.LifeDictService;
 
 import java.util.List;

alien-store/src/main/java/shop/alien/store/controller/LifeDiscountCouponController.java

@@ -7,9 +7,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 import shop.alien.entity.result.R;
 import shop.alien.entity.store.UserLoginInfo;
-import shop.alien.store.entity.dto.LifeDiscountCouponDto;
-import shop.alien.store.entity.dto.LifeDiscountCouponUserDto;
-import shop.alien.store.entity.vo.LifeDiscountCouponVo;
+import shop.alien.entity.store.dto.LifeDiscountCouponDto;
+import shop.alien.entity.store.dto.LifeDiscountCouponUserDto;
+import shop.alien.entity.store.vo.LifeDiscountCouponVo;
 import shop.alien.store.service.LifeDiscountCouponService;
 import shop.alien.store.service.LifeDiscountCouponUserService;
 import shop.alien.util.common.TokenInfo;

alien-store/src/main/java/shop/alien/store/controller/LifeDiscountCouponStoreFriendController.java

@@ -9,8 +9,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 import shop.alien.entity.result.R;
 import shop.alien.entity.store.UserLoginInfo;
-import shop.alien.store.entity.dto.LifeDiscountCouponStoreFriendDto;
-import shop.alien.store.entity.vo.LifeDiscountCouponStoreFriendVo;
+import shop.alien.entity.store.dto.LifeDiscountCouponStoreFriendDto;
+import shop.alien.entity.store.vo.LifeDiscountCouponStoreFriendVo;
 import shop.alien.store.service.LifeDiscountCouponStoreFriendService;
 import shop.alien.util.common.TokenInfo;
 import springfox.documentation.annotations.ApiIgnore;

alien-store/src/main/java/shop/alien/store/controller/LifeGroupPackageController.java

@@ -13,8 +13,8 @@ import org.springframework.web.bind.annotation.*;
 import shop.alien.entity.result.R;
 import shop.alien.entity.store.LifeCoupon;
 import shop.alien.entity.store.StoreGroupInfo;
-import shop.alien.store.entity.vo.LifeCouponVo;
-import shop.alien.store.entity.vo.LifeTuanGouParamVo;
+import shop.alien.entity.store.vo.LifeCouponVo;
+import shop.alien.entity.store.vo.LifeTuanGouParamVo;
 import shop.alien.store.mapper.LifeCouponMapper;
 import shop.alien.store.mapper.StoreGroupInfoMapper;
 import shop.alien.store.service.LifeCouponService;

alien-store/src/main/java/shop/alien/store/controller/LifeMessageController.java

@@ -10,7 +10,7 @@ import org.springframework.messaging.handler.annotation.SendTo;
 import org.springframework.web.bind.annotation.*;
 import shop.alien.entity.result.R;
 import shop.alien.entity.store.LifeMessage;
-import shop.alien.store.entity.vo.LifeMessageVo;
+import shop.alien.entity.store.vo.LifeMessageVo;
 import shop.alien.store.mapper.LifeMessageMapper;
 import shop.alien.store.service.LifeMessageService;
 

alien-store/src/main/java/shop/alien/store/controller/LifeNoticeController.java

@@ -8,7 +8,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 import shop.alien.entity.result.R;
 import shop.alien.entity.store.LifeNotice;
-import shop.alien.store.entity.vo.LifeNoticeVo;
+import shop.alien.entity.store.vo.LifeNoticeVo;
 import shop.alien.store.mapper.LifeNoticeMapper;
 import shop.alien.store.service.LifeNoticeService;
 

alien-store/src/main/java/shop/alien/store/controller/LifePromotionPackageController.java

@@ -7,7 +7,7 @@ import org.apache.commons.collections4.map.HashedMap;
 import org.springframework.web.bind.annotation.*;
 import shop.alien.entity.result.R;
 import shop.alien.entity.store.LifePromotionPackage;
-import shop.alien.store.entity.vo.LifePromotionPackageVo;
+import shop.alien.entity.store.vo.LifePromotionPackageVo;
 import shop.alien.store.service.PromotionPackageService;
 import shop.alien.util.common.AlipayTradeAppPay;
 import shop.alien.util.common.UniqueRandomNumGenerator;

alien-store/src/main/java/shop/alien/store/controller/LifeReverseGroupBuyingController.java

@@ -8,8 +8,8 @@ import org.springframework.web.bind.annotation.*;
 import shop.alien.entity.result.R;
 import shop.alien.entity.store.LifeReverseGroupBidding;
 import shop.alien.entity.store.LifeReverseGroupBuying;
-import shop.alien.store.entity.vo.LifeReverseGroupBuyingStoreVo;
-import shop.alien.store.entity.vo.LifeReverseGroupBuyingUserVo;
+import shop.alien.entity.store.vo.LifeReverseGroupBuyingStoreVo;
+import shop.alien.entity.store.vo.LifeReverseGroupBuyingUserVo;
 import shop.alien.store.service.LifeReverseGroupBuyingService;
 
 /**

alien-store/src/main/java/shop/alien/store/controller/LifeStoreController.java

@@ -11,10 +11,10 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import shop.alien.entity.result.R;
 import shop.alien.entity.store.LifeUser;
-import shop.alien.store.entity.vo.LifeFansVo;
-import shop.alien.store.entity.vo.LifeStoreVo;
-import shop.alien.store.entity.vo.LifeUserVo;
-import shop.alien.store.entity.vo.StoreInfoVo;
+import shop.alien.entity.store.vo.LifeFansVo;
+import shop.alien.entity.store.vo.LifeStoreVo;
+import shop.alien.entity.store.vo.LifeUserVo;
+import shop.alien.entity.store.vo.StoreInfoVo;
 import shop.alien.store.mapper.StoreInfoMapper;
 import shop.alien.store.service.LifeStoreService;
 import shop.alien.util.common.FileUpload;