实体类提出共通 提交

alien-store/pom.xml

@@ -253,6 +253,28 @@
             <version>1.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>shop.alien</groupId>
+            <artifactId>alien-util</artifactId>
+            <version>1.0.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>shop.alien</groupId>
+            <artifactId>alien-gateway</artifactId>
+            <version>1.0.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+        </dependency>
+
+        <!--允许你使用流（Flux和Mono）来处理异步、非阻塞的数据-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webflux</artifactId>
+        </dependency>
 
     </dependencies>
 

alien-store/src/main/java/shop/alien/store/AlienStoreApplication.java

@@ -7,7 +7,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
-@ComponentScan("shop.alien.store.*")
+@ComponentScan({"shop.alien.store.*", "shop.alien.util.*"})
 @EnableSwaggerBootstrapUI
 @MapperScan({"shop.alien.store.mapper"})
 @SpringBootApplication

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

@@ -10,7 +10,7 @@ import org.springframework.web.method.support.ModelAndViewContainer;
 import javax.servlet.http.HttpServletRequest;
 
 import shop.alien.entity.store.UserLoginInfo;
-import shop.alien.store.util.TokenInfo;
+import shop.alien.util.common.TokenInfo;
 
 public class TokenInfoArgumentResolver implements HandlerMethodArgumentResolver {
 

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

@@ -11,8 +11,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import shop.alien.entity.result.R;
 import shop.alien.store.service.AliService;
-import shop.alien.store.util.AlipayTradeAppPay;
-import shop.alien.store.util.AlipayTradeRefund;
+import shop.alien.util.common.AlipayTradeAppPay;
+import shop.alien.util.common.AlipayTradeRefund;
 import shop.alien.store.util.ali.AliApi;
 import shop.alien.store.util.ali.AliSms;
 

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

@@ -6,7 +6,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-import shop.alien.store.util.FileUpload;
+import shop.alien.util.common.FileUpload;
 
 import java.util.HashMap;
 import java.util.Map;

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

@@ -10,7 +10,7 @@ import shop.alien.entity.result.R;
 import shop.alien.entity.store.LifeActivity;
 import shop.alien.store.entity.vo.LifeActivityVo;
 import shop.alien.store.service.LifeActivityService;
-import shop.alien.store.util.FileUpload;
+import shop.alien.util.common.FileUpload;
 
 import java.util.Map;
 

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

@@ -15,7 +15,7 @@ import shop.alien.entity.store.LifeAppealManage;
 import shop.alien.store.entity.dto.LifeAppealManageDto;
 import shop.alien.store.entity.vo.LifeAppealManageVo;
 import shop.alien.store.service.LifeAppealManageService;
-import shop.alien.store.util.FileUpload;
+import shop.alien.util.common.FileUpload;
 
 import java.io.IOException;
 import java.util.List;

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

@@ -10,7 +10,7 @@ import shop.alien.entity.store.LifeBrandedCard;
 import shop.alien.entity.store.LifeCoupon;
 import shop.alien.store.entity.vo.StoreInfoVo;
 import shop.alien.store.service.LifeBrandedCardService;
-import shop.alien.store.util.FileUpload;
+import shop.alien.util.common.FileUpload;
 
 import java.util.HashMap;
 import java.util.List;

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

@@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.*;
 import shop.alien.entity.result.R;
 import shop.alien.entity.store.LifeBrowseRecord;
 import shop.alien.store.service.LifeBrowseRecordService;
-import shop.alien.store.util.ListToPage;
+import shop.alien.util.common.ListToPage;
 
 import java.util.*;
 import java.util.stream.Collectors;

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

@@ -17,7 +17,7 @@ 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.store.util.FileUpload;
+import shop.alien.util.common.FileUpload;
 
 import java.io.IOException;
 import java.net.URLEncoder;

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

@@ -14,7 +14,7 @@ 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.store.util.ListToPage;
+import shop.alien.util.common.ListToPage;
 
 import java.text.DecimalFormat;
 import java.util.ArrayList;

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

@@ -11,8 +11,8 @@ import shop.alien.entity.result.R;
 import shop.alien.entity.store.LifeComment;
 import shop.alien.store.entity.vo.LifePinglunVo;
 import shop.alien.store.service.LifeCommentService;
-import shop.alien.store.util.FileUpload;
-import shop.alien.store.util.ListToPage;
+import shop.alien.util.common.FileUpload;
+import shop.alien.util.common.ListToPage;
 
 import java.util.ArrayList;
 import java.util.HashMap;

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

@@ -12,7 +12,7 @@ import shop.alien.store.entity.dto.LifeDiscountCouponUserDto;
 import shop.alien.store.entity.vo.LifeDiscountCouponVo;
 import shop.alien.store.service.LifeDiscountCouponService;
 import shop.alien.store.service.LifeDiscountCouponUserService;
-import shop.alien.store.util.TokenInfo;
+import shop.alien.util.common.TokenInfo;
 import springfox.documentation.annotations.ApiIgnore;
 
 import java.math.BigDecimal;

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

@@ -12,7 +12,7 @@ import shop.alien.entity.store.UserLoginInfo;
 import shop.alien.store.entity.dto.LifeDiscountCouponStoreFriendDto;
 import shop.alien.store.entity.vo.LifeDiscountCouponStoreFriendVo;
 import shop.alien.store.service.LifeDiscountCouponStoreFriendService;
-import shop.alien.store.util.TokenInfo;
+import shop.alien.util.common.TokenInfo;
 import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.List;

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

@@ -19,7 +19,7 @@ import shop.alien.store.mapper.LifeCouponMapper;
 import shop.alien.store.mapper.StoreGroupInfoMapper;
 import shop.alien.store.service.LifeCouponService;
 import shop.alien.store.service.LifeGroupPackageService;
-import shop.alien.store.util.ListToPage;
+import shop.alien.util.common.ListToPage;
 
 import java.util.Collections;
 import java.util.List;

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

@@ -9,8 +9,8 @@ import shop.alien.entity.result.R;
 import shop.alien.entity.store.LifePromotionPackage;
 import shop.alien.store.entity.vo.LifePromotionPackageVo;
 import shop.alien.store.service.PromotionPackageService;
-import shop.alien.store.util.AlipayTradeAppPay;
-import shop.alien.store.util.UniqueRandomNumGenerator;
+import shop.alien.util.common.AlipayTradeAppPay;
+import shop.alien.util.common.UniqueRandomNumGenerator;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;

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

@@ -17,7 +17,7 @@ import shop.alien.store.entity.vo.LifeUserVo;
 import shop.alien.store.entity.vo.StoreInfoVo;
 import shop.alien.store.mapper.StoreInfoMapper;
 import shop.alien.store.service.LifeStoreService;
-import shop.alien.store.util.FileUpload;
+import shop.alien.util.common.FileUpload;
 
 import java.util.HashMap;
 import java.util.List;

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

@@ -13,8 +13,8 @@ import shop.alien.entity.store.LifeUser;
 import shop.alien.store.entity.vo.LifeUserVo;
 import shop.alien.store.mapper.LifeUserMapper;
 import shop.alien.store.service.LifeUserService;
-import shop.alien.store.util.FileUpload;
-import shop.alien.store.util.RandomCreateUtil;
+import shop.alien.util.common.FileUpload;
+import shop.alien.util.common.RandomCreateUtil;
 
 import java.util.HashMap;
 import java.util.Map;

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

@@ -12,9 +12,9 @@ import shop.alien.entity.store.LifeUserDynamics;
 import shop.alien.store.entity.vo.LifePinglunVo;
 import shop.alien.store.entity.vo.LifeUserDynamicsVo;
 import shop.alien.store.service.LifeUserDynamicsService;
-import shop.alien.store.util.ListToPage;
-import shop.alien.store.util.netease.ImageCheckUtil;
-import shop.alien.store.util.netease.TextCheckUtil;
+import shop.alien.util.common.ListToPage;
+import shop.alien.util.common.netease.ImageCheckUtil;
+import shop.alien.util.common.netease.TextCheckUtil;
 
 import java.util.ArrayList;
 import java.util.HashMap;

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

@@ -13,7 +13,7 @@ import shop.alien.store.entity.vo.StoreDynamicDiscountVo;
 import shop.alien.store.service.StoreDynamicDiscountInviteLogService;
 import shop.alien.store.service.StoreDynamicDiscountReceiveLogService;
 import shop.alien.store.service.StoreDynamicDiscountService;
-import shop.alien.store.util.RandomCreateUtil;
+import shop.alien.util.common.RandomCreateUtil;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;

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

@@ -9,7 +9,7 @@ import shop.alien.entity.store.UserLoginInfo;
 import shop.alien.store.entity.dto.SystemLoginDto;
 import shop.alien.store.entity.vo.SystemLoginVo;
 import shop.alien.store.service.SystemService;
-import shop.alien.store.util.TokenInfo;
+import shop.alien.util.common.TokenInfo;
 import springfox.documentation.annotations.ApiIgnore;
 
 /**

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

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import shop.alien.entity.result.R;
-import shop.alien.store.util.CommendUtil;
+import shop.alien.util.common.CommendUtil;
 
 /**
  * @author ssk

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

@@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.*;
 import shop.alien.entity.result.R;
 import shop.alien.entity.store.LifeRefundOrder;
 import shop.alien.store.service.LifeUserOrderService;
-import shop.alien.store.util.ListToPage;
+import shop.alien.util.common.ListToPage;
 
 import java.io.IOException;
 import java.util.List;

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

@@ -8,9 +8,9 @@ import org.apache.commons.collections4.map.HashedMap;
 import org.springframework.web.bind.annotation.*;
 import shop.alien.entity.result.R;
 import shop.alien.store.service.LifeUserStoreService;
-import shop.alien.store.util.AlipayTradeAppPay;
-import shop.alien.store.util.ListToPage;
-import shop.alien.store.util.UniqueRandomNumGenerator;
+import shop.alien.util.common.AlipayTradeAppPay;
+import shop.alien.util.common.ListToPage;
+import shop.alien.util.common.UniqueRandomNumGenerator;
 
 import java.util.List;
 import java.util.Map;

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

@@ -10,7 +10,7 @@ import shop.alien.entity.store.LifeUserViolation;
 import shop.alien.entity.store.UserLoginInfo;
 import shop.alien.store.entity.dto.LifeUserViolationDto;
 import shop.alien.store.service.LifeUserViolationService;
-import shop.alien.store.util.TokenInfo;
+import shop.alien.util.common.TokenInfo;
 import springfox.documentation.annotations.ApiIgnore;
 
 import java.io.IOException;

alien-store/src/main/java/shop/alien/store/service/LifeActivityService.java

@@ -19,7 +19,7 @@ import shop.alien.store.mapper.LifeActivityMapper;
 import shop.alien.store.mapper.LifeCommentMapper;
 import shop.alien.store.mapper.LifeLikeRecordMapper;
 import shop.alien.store.mapper.LifeUserMapper;
-import shop.alien.store.util.ListToPage;
+import shop.alien.util.common.ListToPage;
 
 import java.util.*;
 import java.util.stream.Collectors;

alien-store/src/main/java/shop/alien/store/service/LifeStoreService.java

@@ -16,7 +16,7 @@ import shop.alien.store.entity.vo.LifeStoreVo;
 import shop.alien.store.entity.vo.LifeUserVo;
 import shop.alien.store.entity.vo.StoreInfoVo;
 import shop.alien.store.mapper.*;
-import shop.alien.store.util.ListToPage;
+import shop.alien.util.common.ListToPage;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;

alien-store/src/main/java/shop/alien/store/service/LifeUserBrandedCardService.java

@@ -16,7 +16,7 @@ import shop.alien.store.mapper.LifeBrandedCardMapper;
 import shop.alien.store.mapper.LifeCouponMapper;
 import shop.alien.store.mapper.LifeUserOrderMapper;
 import shop.alien.store.mapper.StoreInfoMapper;
-import shop.alien.store.util.UniqueRandomNumGenerator;
+import shop.alien.util.common.UniqueRandomNumGenerator;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;

alien-store/src/main/java/shop/alien/store/service/LifeUserOrderService.java

@@ -14,8 +14,8 @@ import shop.alien.store.entity.excelVo.LifeUserOrderExcelVo;
 import shop.alien.store.entity.vo.StoreInfoVo;
 import shop.alien.store.mapper.*;
 import shop.alien.store.service.impl.StoreUserServiceImpl;
-import shop.alien.store.util.AlipayTradeRefund;
 import shop.alien.store.util.ExcelGenerator;
+import shop.alien.util.common.AlipayTradeRefund;
 
 import java.io.IOException;
 import java.math.BigDecimal;

alien-store/src/main/java/shop/alien/store/service/LifeUserService.java

@@ -144,7 +144,7 @@ public class LifeUserService extends ServiceImpl<LifeUserMapper, LifeUser> {
                 tokenMap.put("userName", lifeUser.getUserName());
                 tokenMap.put("userId", lifeUser.getId().toString());
                 tokenMap.put("userType", "user");
-                userVo.setToken(JWTUtils.createToken(tokenMap));
+//                userVo.setToken(JWTUtils1.createToken(tokenMap));
                 baseRedisService.setString("user_" + phoneNum, userVo.getToken());
                 return userVo;
             } else {

alien-store/src/main/java/shop/alien/store/service/LifeUserStoreService.java

@@ -12,9 +12,9 @@ import shop.alien.store.config.GaoDeMapUtil;
 import shop.alien.store.entity.vo.LifeUserDynamicsVo;
 import shop.alien.store.entity.vo.StoreInfoVo;
 import shop.alien.store.mapper.*;
-import shop.alien.store.util.DistanceUtil;
-import shop.alien.store.util.UniqueRandomNumGenerator;
-import shop.alien.store.util.constant.DiscountCouponEnum;
+import shop.alien.util.common.DistanceUtil;
+import shop.alien.util.common.UniqueRandomNumGenerator;
+import shop.alien.util.common.constant.DiscountCouponEnum;
 
 import java.time.LocalDate;
 import java.time.ZoneId;

alien-store/src/main/java/shop/alien/store/service/impl/LifeCouponServiceImpl.java

@@ -20,7 +20,7 @@ import shop.alien.store.mapper.StoreDictionaryMapper;
 import shop.alien.store.mapper.StoreIncomeDetailsRecordMapper;
 import shop.alien.store.service.LifeCouponService;
 import shop.alien.store.service.LifeDiscountCouponStoreFriendService;
-import shop.alien.store.util.UniqueRandomNumGenerator;
+import shop.alien.util.common.UniqueRandomNumGenerator;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;

alien-store/src/main/java/shop/alien/store/service/impl/LifeDiscountCouponServiceImpl.java

@@ -16,7 +16,7 @@ import shop.alien.store.entity.vo.LifeDiscountCouponStoreFriendVo;
 import shop.alien.store.entity.vo.LifeDiscountCouponVo;
 import shop.alien.store.mapper.*;
 import shop.alien.store.service.LifeDiscountCouponService;
-import shop.alien.store.util.constant.DiscountCouponEnum;
+import shop.alien.util.common.constant.DiscountCouponEnum;
 
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;

alien-store/src/main/java/shop/alien/store/service/impl/LifeDiscountCouponStoreFriendServiceImpl.java

@@ -14,7 +14,7 @@ import shop.alien.store.entity.vo.LifeDiscountCouponStoreFriendVo;
 import shop.alien.store.entity.vo.LifeDiscountCouponVo;
 import shop.alien.store.mapper.*;
 import shop.alien.store.service.LifeDiscountCouponStoreFriendService;
-import shop.alien.store.util.constant.DiscountCouponEnum;
+import shop.alien.util.common.constant.DiscountCouponEnum;
 
 import java.time.LocalDate;
 import java.util.ArrayList;

alien-store/src/main/java/shop/alien/store/service/impl/LifeDiscountCouponUserServiceImpl.java

@@ -12,7 +12,7 @@ import shop.alien.store.entity.dto.LifeDiscountCouponUserDto;
 import shop.alien.store.mapper.LifeDiscountCouponMapper;
 import shop.alien.store.mapper.LifeDiscountCouponUserMapper;
 import shop.alien.store.service.LifeDiscountCouponUserService;
-import shop.alien.store.util.constant.DiscountCouponEnum;
+import shop.alien.util.common.constant.DiscountCouponEnum;
 
 import java.time.Instant;
 import java.time.LocalDate;

alien-store/src/main/java/shop/alien/store/service/impl/LifeGroupPackageServiceImpl.java

@@ -15,8 +15,8 @@ import shop.alien.store.entity.vo.LifeCouponVo;
 import shop.alien.store.entity.vo.LifeTuanGouParamVo;
 import shop.alien.store.mapper.*;
 import shop.alien.store.service.LifeGroupPackageService;
-import shop.alien.store.util.UniqueRandomNumGenerator;
-import shop.alien.store.util.constant.DiscountCouponEnum;
+import shop.alien.util.common.UniqueRandomNumGenerator;
+import shop.alien.util.common.constant.DiscountCouponEnum;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;

alien-store/src/main/java/shop/alien/store/service/impl/LifeReverseGroupBuyingServiceImpl.java

@@ -17,8 +17,8 @@ import shop.alien.store.entity.vo.LifeReverseGroupBuyingStoreVo;
 import shop.alien.store.entity.vo.LifeReverseGroupBuyingUserVo;
 import shop.alien.store.mapper.LifeReverseGroupBuyingMapper;
 import shop.alien.store.service.*;
-import shop.alien.store.util.DateUtils;
-import shop.alien.store.util.UniqueRandomNumGenerator;
+import shop.alien.util.common.DateUtils;
+import shop.alien.util.common.UniqueRandomNumGenerator;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;

alien-store/src/main/java/shop/alien/store/service/impl/LifeUserViolationServiceImpl.java

@@ -28,8 +28,8 @@ import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
+import static shop.alien.util.common.constant.Constant.*;
 
-import static shop.alien.store.util.constant.Constant.*;
 
 /**
  * <p>

alien-store/src/main/java/shop/alien/store/service/impl/NearMeServiceImpl.java

@@ -10,7 +10,7 @@ import org.springframework.stereotype.Service;
 import shop.alien.store.config.BaseRedisService;
 import shop.alien.store.service.NearMeService;
 import shop.alien.store.util.FunctionMagic;
-import shop.alien.store.util.constant.Constant;
+import shop.alien.util.common.constant.Constant;
 
 import java.util.List;
 import java.util.function.Consumer;

alien-store/src/main/java/shop/alien/store/service/impl/PlatformBrandedCardServiceImpl.java

@@ -8,8 +8,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartRequest;
 import shop.alien.entity.store.LifeBrandedCard;
 import shop.alien.entity.store.LifeCoupon;
 import shop.alien.entity.store.StoreImg;

alien-store/src/main/java/shop/alien/store/service/impl/PlatformClassServiceImpl.java

@@ -11,8 +11,6 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartRequest;
 import shop.alien.entity.store.LifeClassManage;
 import shop.alien.store.entity.vo.LifeClassManageVo;
 import shop.alien.store.mapper.LifeClassManageMapper;
@@ -20,8 +18,8 @@ import shop.alien.store.service.LifeClassManageService;
 import shop.alien.store.service.PlatformClassService;
 import shop.alien.store.util.ExcelExporter;
 import shop.alien.store.util.FileUploadUtil;
-import shop.alien.store.util.VideoDurationFFmpeg;
-import shop.alien.store.util.VideoUtils;
+import shop.alien.util.common.VideoDurationFFmpeg;
+import shop.alien.util.common.VideoUtils;
 
 import java.io.IOException;
 import java.net.URLEncoder;

alien-store/src/main/java/shop/alien/store/service/impl/PlatformStoreCouponServiceImpl.java

@@ -1,6 +1,5 @@
 package shop.alien.store.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;

alien-store/src/main/java/shop/alien/store/service/impl/StoreActivityServiceImpl.java

@@ -20,7 +20,7 @@ import shop.alien.store.entity.vo.StoreInfoVo;
 import shop.alien.store.mapper.*;
 import shop.alien.store.service.StoreActivityService;
 import shop.alien.store.util.ExcelGenerator;
-import shop.alien.store.util.StringToJsonConverterUtils;
+import shop.alien.util.common.StringToJsonConverterUtils;
 
 import java.io.IOException;
 import java.text.SimpleDateFormat;

alien-store/src/main/java/shop/alien/store/service/impl/StoreCommentAppealServiceImpl.java

@@ -22,7 +22,7 @@ import shop.alien.store.mapper.*;
 import shop.alien.store.service.StoreCommentAppealService;
 import shop.alien.store.util.ExcelExporter;
 import shop.alien.store.util.FileUploadUtil;
-import shop.alien.store.util.netease.TextCheckUtil;
+import shop.alien.util.common.netease.TextCheckUtil;
 
 import java.net.URLEncoder;
 import java.util.*;

alien-store/src/main/java/shop/alien/store/service/impl/StoreCommentServiceImpl.java

@@ -21,10 +21,10 @@ import shop.alien.store.mapper.LifeLikeRecordMapper;
 import shop.alien.store.mapper.StoreCommentMapper;
 import shop.alien.store.mapper.StoreImgMapper;
 import shop.alien.store.service.StoreCommentService;
-import shop.alien.store.util.DateUtils;
 import shop.alien.store.util.FileUploadUtil;
-import shop.alien.store.util.netease.ImageCheckUtil;
-import shop.alien.store.util.netease.TextCheckUtil;
+import shop.alien.util.common.DateUtils;
+import shop.alien.util.common.netease.ImageCheckUtil;
+import shop.alien.util.common.netease.TextCheckUtil;
 
 import java.io.IOException;
 import java.math.BigDecimal;

alien-store/src/main/java/shop/alien/store/service/impl/StoreDynamicDiscountReceiveLogServiceImpl.java

@@ -11,7 +11,7 @@ import shop.alien.store.mapper.StoreDynamicDiscountReceiveLogMapper;
 import shop.alien.store.service.LifeCouponService;
 import shop.alien.store.service.StoreDynamicDiscountReceiveLogService;
 import shop.alien.store.service.StoreDynamicDiscountService;
-import shop.alien.store.util.UniqueRandomNumGenerator;
+import shop.alien.util.common.UniqueRandomNumGenerator;
 
 /**
  * 商户动态折扣领取记录 服务实现类

alien-store/src/main/java/shop/alien/store/service/impl/StoreEvaluationServiceImpl.java

@@ -20,9 +20,9 @@ import shop.alien.store.service.EvaluationLabelService;
 import shop.alien.store.service.LifeUserService;
 import shop.alien.store.service.StoreEvaluationService;
 import shop.alien.store.service.StoreImgService;
-import shop.alien.store.util.netease.TextCheckUtil;
+import shop.alien.util.common.netease.TextCheckUtil;
 
-import static shop.alien.store.util.constant.Constant.*;
+import static shop.alien.util.common.constant.Constant.*;
 
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;

alien-store/src/main/java/shop/alien/store/service/impl/StoreGroupPackageServiceImpl.java

@@ -16,7 +16,7 @@ import shop.alien.store.mapper.StoreGroupPackageMapper;
 import shop.alien.store.mapper.StoreLabelTypeMapper;
 import shop.alien.store.service.LifeGroupPackageService;
 import shop.alien.store.service.StoreGroupPackageService;
-import shop.alien.store.util.UniqueRandomNumGenerator;
+import shop.alien.util.common.UniqueRandomNumGenerator;
 
 import java.lang.reflect.Field;
 import java.util.*;

alien-store/src/main/java/shop/alien/store/service/impl/StoreIncomeDetailsRecordServiceImpl.java

@@ -19,7 +19,7 @@ import shop.alien.store.mapper.StoreIncomeDetailsRecordMapper;
 import shop.alien.store.mapper.StoreUserMapper;
 import shop.alien.store.service.StoreIncomeDetailsRecordService;
 import shop.alien.store.service.StoreUserService;
-import shop.alien.store.util.DateUtils;
+import shop.alien.util.common.DateUtils;
 import shop.alien.store.util.ali.AliApi;
 
 import java.math.BigDecimal;

alien-store/src/main/java/shop/alien/store/service/impl/StoreInfoServiceImpl.java

@@ -31,10 +31,10 @@ import shop.alien.store.entity.vo.*;
 import shop.alien.store.mapper.*;
 import shop.alien.store.service.NearMeService;
 import shop.alien.store.service.StoreInfoService;
-import shop.alien.store.util.DistanceUtil;
 import shop.alien.store.util.ExcelExporter;
 import shop.alien.store.util.ExcelGenerator;
 import shop.alien.store.util.FileUploadUtil;
+import shop.alien.util.common.DistanceUtil;
 
 import java.io.IOException;
 import java.net.URLEncoder;

alien-store/src/main/java/shop/alien/store/service/impl/StorePersonalCustomizedServiceImpl.java

@@ -17,7 +17,7 @@ import shop.alien.store.mapper.StorePersonalCustomizedMapper;
 import shop.alien.store.service.StorePersonalCustomizedService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-import shop.alien.store.util.DistanceUtil;
+import shop.alien.util.common.DistanceUtil;
 
 import java.util.ArrayList;
 import java.util.List;

alien-store/src/main/java/shop/alien/store/service/impl/StoreUserServiceImpl.java

@@ -21,9 +21,9 @@ import shop.alien.store.entity.excelVo.StoreUserExcelVo;
 import shop.alien.store.entity.vo.StoreUserVo;
 import shop.alien.store.mapper.*;
 import shop.alien.store.service.StoreUserService;
-import shop.alien.store.util.DateUtils;
 import shop.alien.store.util.ExcelGenerator;
 import shop.alien.store.util.FunctionMagic;
+import shop.alien.util.common.DateUtils;
 
 import java.io.IOException;
 import java.time.Instant;

alien-store/src/main/java/shop/alien/store/task/ScheduledTask.java

@@ -10,8 +10,8 @@ import shop.alien.store.mapper.LifeCouponMapper;
 import shop.alien.store.mapper.LifeMessageMapper;
 import shop.alien.store.mapper.LifeUserOrderMapper;
 import shop.alien.store.service.*;
-import shop.alien.store.util.AlipayTradeRefund;
-import shop.alien.store.util.DateUtils;
+import shop.alien.util.common.AlipayTradeRefund;
+import shop.alien.util.common.DateUtils;
 import shop.alien.store.util.ali.AliApi;
 
 import java.math.BigDecimal;

alien-store/src/main/java/shop/alien/store/util/ExcelExporter.java

@@ -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/FileUploadUtil.java

@@ -10,6 +10,8 @@ import org.springframework.web.multipart.MultipartRequest;
 import shop.alien.entity.result.R;
 import shop.alien.store.entity.vo.StoreImgVo;
 import shop.alien.store.service.StoreImgService;
+import shop.alien.util.common.RandomCreateUtil;
+import shop.alien.util.common.VideoUtils;
 
 import java.io.File;
 import java.nio.file.Files;

alien-store/src/main/java/shop/alien/store/util/FunctionMagic.java

@@ -11,7 +11,7 @@ import org.springframework.util.CollectionUtils;
 import shop.alien.entity.store.LifeUser;
 import shop.alien.entity.store.StoreUser;
 import shop.alien.store.entity.dto.NearMeDto;
-import shop.alien.store.util.constant.Constant;
+import shop.alien.util.common.constant.Constant;
 
 import java.util.*;
 import java.util.function.*;

alien-store/src/main/java/shop/alien/store/util/ali/AliApi.java

@@ -20,8 +20,8 @@ import shop.alien.store.mapper.LifeUserMapper;
 import shop.alien.store.service.LifeUserService;
 import shop.alien.store.service.StoreAliPayLogService;
 import shop.alien.store.service.StoreUserService;
-import shop.alien.store.util.OSUtil;
-import shop.alien.store.util.RandomCreateUtil;
+import shop.alien.util.common.OSUtil;
+import shop.alien.util.common.RandomCreateUtil;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;

alien-store/src/main/java/shop/alien/store/util/ali/AliSms.java

@@ -9,7 +9,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
-import shop.alien.store.util.RandomCreateUtil;
+import shop.alien.util.common.RandomCreateUtil;
 
 import java.util.Arrays;
 import java.util.List;

alien-util/pom.xml

@@ -293,6 +293,18 @@
             <version>1.9</version> <!-- 使用最新版本 -->
         </dependency>
 
+        <dependency>
+            <groupId>com.alipay.sdk</groupId>
+            <artifactId>alipay-sdk-java</artifactId>
+            <version>4.40.8.ALL</version>
+        </dependency>
+
+        <!--允许你使用流（Flux和Mono）来处理异步、非阻塞的数据-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webflux</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>

alien-store/src/main/java/shop/alien/store/util/AlipayTradeAppPay.java → alien-util/src/main/java/shop/alien/util/common/AlipayTradeAppPay.java

@@ -1,4 +1,4 @@
-package shop.alien.store.util;
+package shop.alien.util.common;
 
 import com.alipay.api.AlipayApiException;
 import com.alipay.api.AlipayClient;

alien-store/src/main/java/shop/alien/store/util/AlipayTradeRefund.java → alien-util/src/main/java/shop/alien/util/common/AlipayTradeRefund.java

@@ -1,4 +1,4 @@
-package shop.alien.store.util;
+package shop.alien.util.common;
 
 import com.alipay.api.AlipayApiException;
 import com.alipay.api.AlipayClient;

alien-store/src/main/java/shop/alien/store/util/CommendUtil.java → alien-util/src/main/java/shop/alien/util/common/CommendUtil.java

@@ -1,4 +1,4 @@
-package shop.alien.store.util;
+package shop.alien.util.common;
 
 import lombok.extern.slf4j.Slf4j;
 

alien-store/src/main/java/shop/alien/store/util/DateUtils.java → alien-util/src/main/java/shop/alien/util/common/DateUtils.java

@@ -1,4 +1,4 @@
-package shop.alien.store.util;
+package shop.alien.util.common;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;

alien-store/src/main/java/shop/alien/store/util/DistanceUtil.java → alien-util/src/main/java/shop/alien/util/common/DistanceUtil.java

@@ -1,4 +1,4 @@
-package shop.alien.store.util;
+package shop.alien.util.common;
 
 import java.text.DecimalFormat;
 

alien-store/src/main/java/shop/alien/store/util/FileUpload.java → alien-util/src/main/java/shop/alien/util/common/FileUpload.java

@@ -1,4 +1,4 @@
-package shop.alien.store.util;
+package shop.alien.util.common;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;

alien-store/src/main/java/shop/alien/store/util/ListToPage.java → alien-util/src/main/java/shop/alien/util/common/ListToPage.java

@@ -1,4 +1,4 @@
-package shop.alien.store.util;
+package shop.alien.util.common;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

alien-store/src/main/java/shop/alien/store/util/OSUtil.java → alien-util/src/main/java/shop/alien/util/common/OSUtil.java

@@ -1,4 +1,4 @@
-package shop.alien.store.util;
+package shop.alien.util.common;
 
 import org.springframework.stereotype.Component;
 

alien-store/src/main/java/shop/alien/store/util/RandomCreateUtil.java → alien-util/src/main/java/shop/alien/util/common/RandomCreateUtil.java

@@ -1,4 +1,4 @@
-package shop.alien.store.util;
+package shop.alien.util.common;
 
 import org.springframework.stereotype.Component;
 

alien-store/src/main/java/shop/alien/store/util/StringToJsonConverterUtils.java → alien-util/src/main/java/shop/alien/util/common/StringToJsonConverterUtils.java

@@ -1,4 +1,4 @@
-package shop.alien.store.util;
+package shop.alien.util.common;
 
 public class StringToJsonConverterUtils {
 

alien-store/src/main/java/shop/alien/store/util/TokenInfo.java → alien-util/src/main/java/shop/alien/util/common/TokenInfo.java

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

alien-store/src/main/java/shop/alien/store/util/UniqueRandomNumGenerator.java → alien-util/src/main/java/shop/alien/util/common/UniqueRandomNumGenerator.java

@@ -1,4 +1,4 @@
-package shop.alien.store.util;
+package shop.alien.util.common;
 
 import java.util.HashSet;
 import java.util.Random;

alien-store/src/main/java/shop/alien/store/util/UrlEncode.java → alien-util/src/main/java/shop/alien/util/common/UrlEncode.java

@@ -1,4 +1,4 @@
-package shop.alien.store.util;
+package shop.alien.util.common;
 
 import java.nio.charset.StandardCharsets;
 

alien-store/src/main/java/shop/alien/store/util/VideoDurationFFmpeg.java → alien-util/src/main/java/shop/alien/util/common/VideoDurationFFmpeg.java

@@ -1,4 +1,4 @@
-package shop.alien.store.util;
+package shop.alien.util.common;
 
 import java.io.BufferedReader;
 import java.io.IOException;

alien-store/src/main/java/shop/alien/store/util/VideoUtils.java → alien-util/src/main/java/shop/alien/util/common/VideoUtils.java

@@ -1,4 +1,4 @@
-package shop.alien.store.util;
+package shop.alien.util.common;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

alien-store/src/main/java/shop/alien/store/util/constant/Constant.java → alien-util/src/main/java/shop/alien/util/common/constant/Constant.java

@@ -1,4 +1,4 @@
-package shop.alien.store.util.constant;
+package shop.alien.util.common.constant;
 
 /**
  * 常量

alien-store/src/main/java/shop/alien/store/util/constant/DiscountCouponEnum.java → alien-util/src/main/java/shop/alien/util/common/constant/DiscountCouponEnum.java

@@ -1,4 +1,4 @@
-package shop.alien.store.util.constant;
+package shop.alien.util.common.constant;
 
 /**
  * 优惠券相关功能枚举

alien-store/src/main/java/shop/alien/store/util/generator/CodeGenerator.java → alien-util/src/main/java/shop/alien/util/common/generator/CodeGenerator.java

@@ -1,4 +1,4 @@
-package shop.alien.store.util.generator;
+package shop.alien.util.common.generator;
 
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.annotation.FieldFill;

alien-store/src/main/java/shop/alien/store/util/generator/MyDMQuery.java → alien-util/src/main/java/shop/alien/util/common/generator/MyDMQuery.java

@@ -1,4 +1,4 @@
-package shop.alien.store.util.generator;
+package shop.alien.util.common.generator;
 
 import com.baomidou.mybatisplus.generator.config.querys.DMQuery;
 

alien-store/src/main/java/shop/alien/store/util/generator/MyDataSourceConfig.java → alien-util/src/main/java/shop/alien/util/common/generator/MyDataSourceConfig.java

@@ -1,4 +1,4 @@
-package shop.alien.store.util.generator;
+package shop.alien.util.common.generator;
 
 import com.baomidou.mybatisplus.generator.config.DataSourceConfig;
 import com.baomidou.mybatisplus.generator.config.IDbQuery;

alien-store/src/main/java/shop/alien/store/util/netease/ImageCheckUtil.java → alien-util/src/main/java/shop/alien/util/common/netease/ImageCheckUtil.java

@@ -1,4 +1,4 @@
-package shop.alien.store.util.netease;
+package shop.alien.util.common.netease;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
@@ -6,9 +6,10 @@ import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import org.apache.http.Consts;
 import org.apache.http.client.HttpClient;
-import shop.alien.store.util.netease.util.HttpClient4Utils;
-import shop.alien.store.util.netease.util.SignatureUtils;
-import shop.alien.store.util.netease.util.Utils;
+import shop.alien.util.common.netease.util.HttpClient4Utils;
+import shop.alien.util.common.netease.util.SignatureUtils;
+import shop.alien.util.common.netease.util.Utils;
+import shop.alien.util.common.netease.util.HttpClient4Utils;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;

alien-store/src/main/java/shop/alien/store/util/netease/TextCheckUtil.java → alien-util/src/main/java/shop/alien/util/common/netease/TextCheckUtil.java

@@ -1,12 +1,12 @@
-package shop.alien.store.util.netease;
+package shop.alien.util.common.netease;
 
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import org.apache.http.Consts;
 import org.apache.http.client.HttpClient;
-import shop.alien.store.util.netease.util.HttpClient4Utils;
-import shop.alien.store.util.netease.util.SignatureUtils;
-import shop.alien.store.util.netease.util.Utils;
+import shop.alien.util.common.netease.util.HttpClient4Utils;
+import shop.alien.util.common.netease.util.SignatureUtils;
+import shop.alien.util.common.netease.util.Utils;
 
 import java.util.HashMap;
 import java.util.Map;

alien-store/src/main/java/shop/alien/store/util/netease/util/HttpClient4Utils.java → alien-util/src/main/java/shop/alien/util/common/netease/util/HttpClient4Utils.java

@@ -3,7 +3,7 @@
  * 
  * Copyright 2010 NetEase.com, Inc. All rights reserved.
  */
-package shop.alien.store.util.netease.util;
+package shop.alien.util.common.netease.util;
 
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;

alien-store/src/main/java/shop/alien/store/util/netease/util/SignatureMethodEnum.java → alien-util/src/main/java/shop/alien/util/common/netease/util/SignatureMethodEnum.java

@@ -1,4 +1,4 @@
-package shop.alien.store.util.netease.util;
+package shop.alien.util.common.netease.util;
 
 import org.apache.commons.lang3.StringUtils;
 

alien-store/src/main/java/shop/alien/store/util/netease/util/SignatureUtils.java → alien-util/src/main/java/shop/alien/util/common/netease/util/SignatureUtils.java

@@ -3,7 +3,7 @@
  *
  * Copyright 2010 NetEase.com, Inc. All rights reserved.
  */
-package shop.alien.store.util.netease.util;
+package shop.alien.util.common.netease.util;
 
 import org.apache.commons.codec.binary.Hex;
 import org.apache.commons.codec.digest.DigestUtils;

alien-store/src/main/java/shop/alien/store/util/netease/util/Utils.java → alien-util/src/main/java/shop/alien/util/common/netease/util/Utils.java

@@ -4,7 +4,7 @@
  * Copyright 2020 NetEase.com, Inc. All rights reserved.
  */
 
-package shop.alien.store.util.netease.util;
+package shop.alien.util.common.netease.util;
 
 import com.google.gson.JsonObject;
 import org.apache.commons.lang3.StringUtils;