过期注解移除

src/main/java/com/gogirl/infrastructure/common/util/MapUtil.java

-package com.gogirl.infrastructure.common.util;
-
-import org.apache.commons.collections.MapUtils;
-
-/**
- * Map操作工具类集成至 apache MapUtils
- *
- * @author Dxd
- */
-public class MapUtil extends MapUtils {
-
-
-}

src/main/java/com/gogirl/infrastructure/common/util/MD5Util.java → src/main/java/com/gogirl/infrastructure/common/util/Md5Utils.java

@@ -7,7 +7,7 @@ import java.security.MessageDigest;
  *
  * @author Dxd
  */
-public class MD5Util {
+public class Md5Utils {
 
     /**
      * 返回加密后的md5字符串

src/main/java/com/gogirl/infrastructure/common/util/PageUtils.java

-package com.gogirl.infrastructure.common.util;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gogirl.infrastructure.common.base.PageReq;
-
-public class PageUtils {
-
-    /**
-     * rpc分页入参转换成mp page对象
-     *
-     * @param <T>            rpc分页入参类型
-     * @param pageReq        rpc分页入参
-     * @param mallOrderClass
-     * @return
-     */
-    public static <T extends PageReq, C> Page<C> castPageReq(T pageReq, Class<C> mallOrderClass) {
-        Page<C> page = new Page<>();
-        page.setSize(pageReq.getPageSize());
-        page.setCurrent(pageReq.getPageIndex());
-        return page;
-    }
-
-}

src/main/java/com/gogirl/infrastructure/common/util/RandomUtil.java

 package com.gogirl.infrastructure.common.util;
 
+import org.apache.commons.lang3.RandomUtils;
+
 import java.security.SecureRandom;
 import java.util.UUID;
 import java.util.concurrent.ThreadLocalRandom;
@@ -9,7 +11,7 @@ import java.util.concurrent.ThreadLocalRandom;
  *
  * @author Dxd
  */
-public class RandomUtil {
+public class RandomUtil extends RandomUtils {
 
     /**
      * 获取随机数生成器对象<br>

src/main/java/com/gogirl/interfaces/market/discount/DiscountConfigController.java

@@ -2,8 +2,6 @@ package com.gogirl.interfaces.market.discount;
 
 import com.gogirl.application.market.discount.DiscountConfigService;
 import com.gogirl.domain.market.discount.DiscountConfig;
-import com.gogirl.infrastructure.common.annotation.GogirlMember;
-import com.gogirl.infrastructure.common.annotation.GogirlShop;
 import com.gogirl.infrastructure.common.base.JsonResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -36,8 +34,6 @@ public class DiscountConfigController {
 
     @ApiOperation(value = "查询充送信息", notes = "")
     @GetMapping("/technician/selectAllDiscount")
-    @GogirlMember
-    @GogirlShop
     public JsonResult<Map<String, Object>> techSelectAllDiscount() {
         List<DiscountConfig> list = discountConfigService.selectAllDiscount();
         Map<String, Object> map = new HashMap<String, Object>();

src/main/java/com/gogirl/interfaces/market/timescard/TimesCardController.java

@@ -14,7 +14,6 @@ import com.gogirl.domain.market.timescard.TimesCardTypeContent;
 import com.gogirl.domain.market.timescard.TimesCardUsedRecord;
 import com.gogirl.domain.order.serve.OrderServe;
 import com.gogirl.domain.xcx.GogirlToken;
-import com.gogirl.infrastructure.common.annotation.GogirlMember;
 import com.gogirl.infrastructure.common.base.JsonResult;
 import com.gogirl.infrastructure.common.exception.RRException;
 import com.gogirl.infrastructure.common.util.ListUtil;
@@ -70,7 +69,6 @@ public class TimesCardController {
 
     @ApiOperation(value = "查询次卡种类详情")
     @GetMapping("/customer/timescard/getTimesCardTypeDetail")
-    @GogirlMember
     public JsonResult<TimesCardType> getTimesCardTypeDetail(@RequestParam Integer id) {
         return JsonResult.success(timesCardService.getAggregate(id));
     }

src/main/java/com/gogirl/interfaces/order/mall/MallOrderController.java

@@ -6,8 +6,6 @@ import com.gogirl.application.order.mall.MallOrderService;
 import com.gogirl.application.xcx.GogirlTokenService;
 import com.gogirl.domain.order.mall.MallOrder;
 import com.gogirl.infrastructure.common.base.JsonResult;
-import com.gogirl.infrastructure.common.exception.RRException;
-import com.gogirl.infrastructure.common.util.PageUtils;
 import com.gogirl.infrastructure.util.SessionUtils;
 import com.gogirl.shared.market.ListMallOrderReqDTO;
 import com.gogirl.shared.market.SubmitMallOrderCommand;
@@ -20,7 +18,6 @@ import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
-import java.util.Optional;
 
 @Api(tags = "商城订单接口", value = "商城订单接口")
 @RestController
@@ -68,7 +65,10 @@ public class MallOrderController {
     public JsonResult<IPage<MallOrder>> listMallOrderAggregate(@RequestHeader String token,
                                                                @RequestBody ListMallOrderReqDTO reqDTO) {
         Integer currentCustomerId = SessionUtils.getCustomerId();
-        Page<MallOrder> page = PageUtils.castPageReq(reqDTO, MallOrder.class);
+        Page<MallOrder> page = new Page<>();
+        page.setCurrent(reqDTO.getPageIndex());
+        page.setSize(reqDTO.getPageSize());
+
         MallOrder mallOrder = ListMallOrderReqDTO.convertToMallOrder(reqDTO);
         mallOrder.setCustomerId(currentCustomerId);
         IPage<MallOrder> data = mallOrderService.listMallOrderAggregate(page, mallOrder);

src/main/java/com/gogirl/interfaces/order/serve/OrderCommentLabelController.java

@@ -2,7 +2,6 @@ package com.gogirl.interfaces.order.serve;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.gogirl.domain.order.serve.OrderCommentLabel;
-import com.gogirl.infrastructure.common.annotation.GogirlMember;
 import com.gogirl.infrastructure.common.base.JsonResult;
 import com.gogirl.infrastructure.common.util.ListUtil;
 import com.gogirl.infrastructure.mapper.order.serve.OrderCommentLabelMapper;
@@ -34,7 +33,6 @@ public class OrderCommentLabelController {
      */
     @ApiOperation(value = "查询所有标签")
     @GetMapping("/customer/orderlabel/queryOrderLabel")
-    @GogirlMember
     public JsonResult<Map<Integer, List<OrderCommentLabel>>> queryOrderLabel() {
         List<OrderCommentLabel> commentLabelList = orderCommentLabelMapper.selectList(new QueryWrapper<>());
 

src/main/java/com/gogirl/interfaces/order/serve/OrderManageController.java

@@ -14,7 +14,6 @@ import com.gogirl.domain.order.serve.OrderServe;
 import com.gogirl.domain.order.serve.OrderServeDescribe;
 import com.gogirl.domain.product.purchase.PurchaseSku;
 import com.gogirl.domain.xcx.GogirlToken;
-import com.gogirl.infrastructure.common.annotation.GogirlShop;
 import com.gogirl.infrastructure.common.base.JsonResult;
 import com.gogirl.infrastructure.common.exception.RRException;
 import com.gogirl.infrastructure.common.util.ListUtil;
@@ -144,7 +143,6 @@ public class OrderManageController {
 
     @ApiOperation("美甲师录入款式/色号和款式描述")
     @PostMapping("/technician/ordermanage/recordOrderServeData")
-    @GogirlShop
     public JsonResult<Void> recordOrderServeData(@RequestBody OrderServe param) {
         orderManageService.recordOrderServeData(param);
         return JsonResult.success();
@@ -165,7 +163,6 @@ public class OrderManageController {
 
     @ApiOperation(value = "查询会员消费记录")
     @GetMapping("/technician/ordermanage/queryCustomerOrder")
-    @GogirlShop
     public JsonResult<Map<String, Object>> queryCustomerOrder(@RequestHeader String token,
                                                               @RequestParam Integer customerId,
                                                               @RequestParam Integer pageNum,

src/main/java/com/gogirl/interfaces/order/serve/ScheduleManageController.java

@@ -18,7 +18,6 @@ import com.gogirl.dto.IdleTimeProgramQuery;
 import com.gogirl.dto.LeisureScheduleServe;
 import com.gogirl.dto.LeisureScheduleServeQuery;
 import com.gogirl.dto.QueryLeisureTechnicianReq;
-import com.gogirl.infrastructure.common.annotation.GogirlShop;
 import com.gogirl.infrastructure.common.base.JsonResult;
 import com.gogirl.infrastructure.common.exception.RRException;
 import com.gogirl.infrastructure.common.util.ListUtil;
@@ -169,7 +168,6 @@ public class ScheduleManageController {
 
     @ApiOperation(value = "店员查询可预约时间")
     @GetMapping("/technician/schedule/queryReservableTime")
-    @GogirlShop
     public JsonResult<List<Map<String, Object>>> queryReservableTime(String startDate,
                                                                      Integer lengthTime,
                                                                      Integer departmentId,

src/main/java/com/gogirl/interfaces/product/serve/TypeController.java

@@ -2,8 +2,6 @@ package com.gogirl.interfaces.product.serve;
 
 import com.gogirl.application.product.serve.BaseTypeService;
 import com.gogirl.domain.product.serve.BaseType;
-import com.gogirl.infrastructure.common.annotation.GogirlMember;
-import com.gogirl.infrastructure.common.annotation.GogirlShop;
 import com.gogirl.infrastructure.common.base.JsonResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -34,8 +32,6 @@ public class TypeController {
 
 
     @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/technician/type/queryType")
-    @GogirlMember
-    @GogirlShop
     public JsonResult<List<BaseType>> technicianQueryType() {
         JsonResult<List<BaseType>> jsonResult = new JsonResult<>();
         List<BaseType> lists = baseTypeService.list();

src/main/java/com/gogirl/interfaces/store/shop/ClassesTechnicianController.java

@@ -9,7 +9,6 @@ import com.gogirl.domain.store.store.StoreClassesTechnician;
 import com.gogirl.domain.store.store.StoreTechnician;
 import com.gogirl.domain.xcx.GogirlToken;
 import com.gogirl.dto.ParmTechnicianClasses;
-import com.gogirl.infrastructure.common.annotation.GogirlShop;
 import com.gogirl.infrastructure.common.base.JsonResult;
 import com.gogirl.infrastructure.mapper.store.store.StoreClassesTechnicianMapper;
 import com.gogirl.infrastructure.mapper.xcx.SysLogMapper;
@@ -45,7 +44,6 @@ public class ClassesTechnicianController {
 
     @ApiOperation(value = "美甲师端查询当天店铺排班")
     @GetMapping("/technician/classestechnician/queryDayTechnicianClasses")
-    @GogirlShop
     public JsonResult<List<StoreTechnician>> queryDayTechnicianClasses(String token,
                                                                        String dayString) throws ParseException {
         GogirlToken gogirlToken = SessionUtils.getTechnicianToken();

src/main/java/com/gogirl/interfaces/store/technician/StoreTechnicianController.java

@@ -6,7 +6,6 @@ import com.gogirl.application.xcx.GogirlTokenService;
 import com.gogirl.domain.store.store.StoreTechnician;
 import com.gogirl.domain.store.store.StoreUser;
 import com.gogirl.domain.xcx.GogirlToken;
-import com.gogirl.infrastructure.common.annotation.GogirlShop;
 import com.gogirl.infrastructure.common.base.JsonResult;
 import com.gogirl.infrastructure.config.property.GogirlProperties;
 import com.gogirl.infrastructure.service.file.FileService;
@@ -44,7 +43,6 @@ public class StoreTechnicianController {
 
     @ApiOperation(value = "查询当前店铺的美甲师,选推荐人")
     @GetMapping("/technician/user/queryUserForAll")
-    @GogirlShop
     public JsonResult<List<StoreUser>> queryUserForAll(String token) {
         GogirlToken gt = gogirlTokenService.getByToken(token);
         if (gt == null) {

src/main/java/com/gogirl/interfaces/user/PhoneLoginController.java

@@ -3,8 +3,6 @@ package com.gogirl.interfaces.user;
 import com.gogirl.application.store.store.StoreTechnicianService;
 import com.gogirl.application.xcx.GogirlTokenService;
 import com.gogirl.domain.user.customer.Customer;
-import com.gogirl.infrastructure.common.annotation.GogirlMember;
-import com.gogirl.infrastructure.common.annotation.GogirlShop;
 import com.gogirl.infrastructure.common.base.JsonResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -30,8 +28,6 @@ public class PhoneLoginController {
 
     @ApiOperation(value = "获取验证码，用于绑定手机号码")
     @PostMapping("/customer/phone/getBindCode")
-    @GogirlShop
-    @GogirlMember
     public JsonResult<String> getBindCode(@RequestParam String phone,
                                           @RequestHeader String token) {
         String code = gogirlTokenService.getBindCode(phone);