diff --git a/service/trade-service-others/trade-service-others-pays/src/main/resources/banner.txt b/service/trade-service-others/trade-service-others-pays/src/main/resources/banner.txt new file mode 100644 index 0000000..faf6e91 --- /dev/null +++ b/service/trade-service-others/trade-service-others-pays/src/main/resources/banner.txt @@ -0,0 +1,10 @@ +${AnsiColor.BRIGHT_GREEN} + __ ___ __ ___ ___ / ___ ___ ___ __ ( ) ___ ___ ___ __ ___ / __ ___ __ ___ ___ ___ ___ + / / // ) ) // ) ) // ) / //___) ) ____ (( ) ) //___) ) // ) ) || / / / / // ) ) //___) ) ____ // ) ) / / // ) ) //___) ) // ) ) (( ) ) ____ // ) ) // ) ) // / / (( ) ) + / / // // / / // / / // \ \ // // || / / / / // // // / / / / // / / // // \ \ //___/ / // / / ((___/ / \ \ +/ / // ((___( ( ((___/ / ((____ // ) ) ((____ // ||/ / / / ((____ ((____ ((___/ / / / // / / ((____ // // ) ) // ((___( ( / / // ) ) + +${AnsiColor.CYAN} +:: Spring Boot :: (v2.3.2.RELEASE) +:: By :: (Enzo) + diff --git a/service/trade-service-source/trade-service-source-core/src/main/java/com/hchbox/controller/AppConfigController.java b/service/trade-service-source/trade-service-source-core/src/main/java/com/hchbox/controller/AppConfigController.java index ab65b2c..a721523 100644 --- a/service/trade-service-source/trade-service-source-core/src/main/java/com/hchbox/controller/AppConfigController.java +++ b/service/trade-service-source/trade-service-source-core/src/main/java/com/hchbox/controller/AppConfigController.java @@ -2,6 +2,7 @@ package com.hchbox.controller; import com.hchbox.annotaion.SellerUser; import com.hchbox.api.CommonResult; +import com.hchbox.dto.SellerAccountDTO; import com.hchbox.entity.master.SellerAccount; import com.hchbox.service.AppSettingService; import com.hchbox.vo.AppConfigVo; @@ -25,7 +26,7 @@ public class AppConfigController { @PostMapping("/create") - public CommonResult createConfig(@SellerUser SellerAccount account, @RequestBody AppConfigVo vo) { + public CommonResult createConfig(@SellerUser SellerAccountDTO account, @RequestBody AppConfigVo vo) { return appSettingService.createAppSetting(account, vo); } diff --git a/service/trade-service-source/trade-service-source-core/src/main/java/com/hchbox/controller/SendMessageController.java b/service/trade-service-source/trade-service-source-core/src/main/java/com/hchbox/controller/SendMessageController.java index 46cfbce..c980423 100644 --- a/service/trade-service-source/trade-service-source-core/src/main/java/com/hchbox/controller/SendMessageController.java +++ b/service/trade-service-source/trade-service-source-core/src/main/java/com/hchbox/controller/SendMessageController.java @@ -2,7 +2,7 @@ package com.hchbox.controller; import com.hchbox.annotaion.SellerUser; import com.hchbox.api.CommonResult; -import com.hchbox.entity.master.SellerAccount; +import com.hchbox.dto.SellerAccountDTO; import com.hchbox.enums.ResponseCode; import com.hchbox.service.SellerAccountService; import com.hchbox.service.TaskAccountService; @@ -34,7 +34,7 @@ public class SendMessageController { @PostMapping("/send") - public CommonResult send(@Validated @RequestBody SubmitSendMessageVo submitSendMessageVo, @SellerUser SellerAccount sellerAccount) { + public CommonResult send(@Validated @RequestBody SubmitSendMessageVo submitSendMessageVo, @SellerUser SellerAccountDTO sellerAccount) { if (sellerAccount == null) { return new CommonResult().failed(); } diff --git a/service/trade-service-source/trade-service-source-core/src/main/java/com/hchbox/controller/TopTradeController.java b/service/trade-service-source/trade-service-source-core/src/main/java/com/hchbox/controller/TopTradeController.java index c2fd689..2a83e6b 100644 --- a/service/trade-service-source/trade-service-source-core/src/main/java/com/hchbox/controller/TopTradeController.java +++ b/service/trade-service-source/trade-service-source-core/src/main/java/com/hchbox/controller/TopTradeController.java @@ -2,7 +2,7 @@ package com.hchbox.controller; import com.hchbox.annotaion.SellerUser; import com.hchbox.api.CommonResult; -import com.hchbox.entity.master.SellerAccount; +import com.hchbox.dto.SellerAccountDTO; import com.hchbox.entity.master.TopTrade; import com.hchbox.service.TopTradeService; import com.taobao.api.request.TradesSoldGetRequest; @@ -28,7 +28,7 @@ public class TopTradeController { * 条件查询个订单任务 */ @GetMapping("/list") - public CommonResult> getTradeList(@SellerUser SellerAccount sellerAccount, + public CommonResult> getTradeList(@SellerUser SellerAccountDTO sellerAccount, TradesSoldGetRequest request) { return new CommonResult>().success diff --git a/service/trade-service-source/trade-service-source-core/src/main/java/com/hchbox/controller/UploadController.java b/service/trade-service-source/trade-service-source-core/src/main/java/com/hchbox/controller/UploadController.java index 6fb6594..2148ce5 100644 --- a/service/trade-service-source/trade-service-source-core/src/main/java/com/hchbox/controller/UploadController.java +++ b/service/trade-service-source/trade-service-source-core/src/main/java/com/hchbox/controller/UploadController.java @@ -2,7 +2,7 @@ package com.hchbox.controller; import com.hchbox.annotaion.SellerUser; import com.hchbox.api.CommonResult; -import com.hchbox.entity.master.SellerAccount; +import com.hchbox.dto.SellerAccountDTO; import com.hchbox.service.UploadRecordService; import com.hchbox.vo.UploadVo; import lombok.AllArgsConstructor; @@ -30,7 +30,7 @@ public class UploadController { * @return */ @PostMapping("/file") - public CommonResult dataUpload(@SellerUser SellerAccount sellerAccount, @RequestBody UploadVo uploadVo) { + public CommonResult dataUpload(@SellerUser SellerAccountDTO sellerAccount, @RequestBody UploadVo uploadVo) { return uploadRecordService.uploadFile(sellerAccount, uploadVo); } diff --git a/service/trade-service-source/trade-service-source-dao/src/main/java/com/hchbox/config/SellerUserHandlerMethodArgumentResolver.java b/service/trade-service-source/trade-service-source-dao/src/main/java/com/hchbox/config/SellerUserHandlerMethodArgumentResolver.java index 506c8f5..557889f 100644 --- a/service/trade-service-source/trade-service-source-dao/src/main/java/com/hchbox/config/SellerUserHandlerMethodArgumentResolver.java +++ b/service/trade-service-source/trade-service-source-dao/src/main/java/com/hchbox/config/SellerUserHandlerMethodArgumentResolver.java @@ -1,10 +1,13 @@ package com.hchbox.config; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; import com.hchbox.annotaion.SellerUser; import com.hchbox.constant.AuthConstants; import com.hchbox.constant.DefaultConstants; +import com.hchbox.dto.SellerAccountDTO; import com.hchbox.entity.master.SellerAccount; +import lombok.NonNull; import org.springframework.core.MethodParameter; import org.springframework.web.bind.support.WebDataBinderFactory; import org.springframework.web.context.request.NativeWebRequest; @@ -24,7 +27,7 @@ public class SellerUserHandlerMethodArgumentResolver implements HandlerMethodArg } @Override - public Object resolveArgument(MethodParameter methodParameter, ModelAndViewContainer container, + public Object resolveArgument(@NonNull MethodParameter methodParameter, ModelAndViewContainer container, NativeWebRequest request, WebDataBinderFactory factory) { // session解析账号 SellerAccount sellerAccount = (SellerAccount) request.getAttribute(AuthConstants.SELLER_ACCOUNT, DefaultConstants.ZERO_NUMBER); @@ -35,7 +38,9 @@ public class SellerUserHandlerMethodArgumentResolver implements HandlerMethodArg // 子账号sessionKey sellerAccount.setSessionKey(sellerAccount.getSubSessionKey()); } - return sellerAccount; + SellerAccountDTO sellerAccountDTO = new SellerAccountDTO(); + BeanUtil.copyProperties(sellerAccount,sellerAccountDTO); + return sellerAccountDTO; } return null; } diff --git a/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/AppSettingService.java b/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/AppSettingService.java index f8ae69c..3cef092 100644 --- a/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/AppSettingService.java +++ b/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/AppSettingService.java @@ -1,6 +1,7 @@ package com.hchbox.service; import com.hchbox.api.CommonResult; +import com.hchbox.dto.SellerAccountDTO; import com.hchbox.entity.master.SellerAccount; import com.hchbox.vo.AppConfigVo; @@ -16,7 +17,7 @@ public interface AppSettingService { * @param account * @param vo */ - CommonResult createAppSetting(SellerAccount account, AppConfigVo vo); + CommonResult createAppSetting(SellerAccountDTO account, AppConfigVo vo); /** * 修改设置 diff --git a/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/HistoryTradeService.java b/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/HistoryTradeService.java index 84ef076..aba02b3 100644 --- a/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/HistoryTradeService.java +++ b/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/HistoryTradeService.java @@ -1,6 +1,6 @@ package com.hchbox.service; -import com.hchbox.entity.master.SellerAccount; +import com.hchbox.dto.SellerAccountDTO; import java.util.List; import java.util.Map; @@ -16,5 +16,5 @@ public interface HistoryTradeService { * @param sellerAccount * @param uploadId */ - void initializeMembershipByUploadData(List> maps, SellerAccount sellerAccount, Long uploadId); + void initializeMembershipByUploadData(List> maps, SellerAccountDTO sellerAccount, Long uploadId); } diff --git a/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/SellerAccountService.java b/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/SellerAccountService.java index ff10e63..ad169e4 100644 --- a/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/SellerAccountService.java +++ b/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/SellerAccountService.java @@ -3,7 +3,7 @@ package com.hchbox.service; import com.hchbox.api.CommonResult; -import com.hchbox.entity.master.SellerAccount; +import com.hchbox.dto.SellerAccountDTO; import com.hchbox.vo.UpdateSellerVo; import com.hchbox.vo.taobao.LoginVo; @@ -45,7 +45,7 @@ public interface SellerAccountService { * @param size * @return */ - String checkAccountByNickAndSendSize(SellerAccount account, int size); + String checkAccountByNickAndSendSize(SellerAccountDTO account, int size); /** * 根据昵称查找id diff --git a/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/TaskSendMessageService.java b/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/TaskSendMessageService.java index e3710e1..fac3d68 100644 --- a/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/TaskSendMessageService.java +++ b/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/TaskSendMessageService.java @@ -1,6 +1,6 @@ package com.hchbox.service; -import com.hchbox.entity.master.SellerAccount; +import com.hchbox.dto.SellerAccountDTO; import com.hchbox.vo.taobao.SubmitSendMessageVo; /** @@ -14,5 +14,5 @@ public interface TaskSendMessageService { * @param sellerAccount * @return */ - Boolean createTaskSendMessage(SubmitSendMessageVo submitSendMessageVo, SellerAccount sellerAccount); + Boolean createTaskSendMessage(SubmitSendMessageVo submitSendMessageVo, SellerAccountDTO sellerAccount); } diff --git a/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/TopTradeService.java b/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/TopTradeService.java index eede695..2656385 100644 --- a/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/TopTradeService.java +++ b/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/TopTradeService.java @@ -2,7 +2,7 @@ package com.hchbox.service; -import com.hchbox.entity.master.SellerAccount; +import com.hchbox.dto.SellerAccountDTO; import com.hchbox.entity.master.TopTrade; import com.hchbox.hander.message.TaoBaoTradeMessage; import com.taobao.api.request.TradesSoldGetRequest; @@ -23,7 +23,7 @@ public interface TopTradeService { * @param request * @return */ - List getTopTradesByParam(SellerAccount sellerAccount, TradesSoldGetRequest request); + List getTopTradesByParam(SellerAccountDTO sellerAccount, TradesSoldGetRequest request); /** * 保存订单信息 diff --git a/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/UploadRecordService.java b/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/UploadRecordService.java index eb33b58..5c05469 100644 --- a/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/UploadRecordService.java +++ b/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/UploadRecordService.java @@ -1,7 +1,7 @@ package com.hchbox.service; import com.hchbox.api.CommonResult; -import com.hchbox.entity.master.SellerAccount; +import com.hchbox.dto.SellerAccountDTO; import com.hchbox.vo.UploadVo; /** @@ -15,5 +15,5 @@ public interface UploadRecordService { * @param uploadVo * @return */ - CommonResult uploadFile(SellerAccount sellerAccount, UploadVo uploadVo); + CommonResult uploadFile(SellerAccountDTO sellerAccount, UploadVo uploadVo); } diff --git a/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/AppSettingServiceImpl.java b/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/AppSettingServiceImpl.java index 37f6dca..35a83f0 100644 --- a/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/AppSettingServiceImpl.java +++ b/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/AppSettingServiceImpl.java @@ -2,6 +2,7 @@ package com.hchbox.service.impl; import cn.hutool.core.bean.BeanUtil; import com.hchbox.api.CommonResult; +import com.hchbox.dto.SellerAccountDTO; import com.hchbox.entity.master.AppSetting; import com.hchbox.entity.master.SellerAccount; import com.hchbox.enums.ResponseCode; @@ -24,7 +25,7 @@ public class AppSettingServiceImpl implements AppSettingService { private final AppSettingRepository appSettingRepository; @Override - public CommonResult createAppSetting(SellerAccount account, AppConfigVo vo) { + public CommonResult createAppSetting(SellerAccountDTO account, AppConfigVo vo) { if (vo.getTempId() == null) { return new CommonResult().failed(ResponseCode.PAYMENT_FAILED.getDesc()); } diff --git a/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/HistoryTradeServiceImpl.java b/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/HistoryTradeServiceImpl.java index 13eb9ad..07c7934 100644 --- a/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/HistoryTradeServiceImpl.java +++ b/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/HistoryTradeServiceImpl.java @@ -3,8 +3,8 @@ package com.hchbox.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.hchbox.constant.DefaultConstants; +import com.hchbox.dto.SellerAccountDTO; import com.hchbox.entity.master.HistoryTrade; -import com.hchbox.entity.master.SellerAccount; import com.hchbox.enums.HistoryFiledEnum; import com.hchbox.enums.StatusEnum; import com.hchbox.provider.TbTradeStatus; @@ -37,7 +37,7 @@ public class HistoryTradeServiceImpl implements HistoryTradeService { @Override - public void initializeMembershipByUploadData(List> maps, SellerAccount sellerAccount, Long uploadId) { + public void initializeMembershipByUploadData(List> maps, SellerAccountDTO sellerAccount, Long uploadId) { int count = 0; log.info("upload trade start time as {}", LocalTime.now()); diff --git a/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/SellerAccountServiceImpl.java b/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/SellerAccountServiceImpl.java index 601150b..83e3685 100644 --- a/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/SellerAccountServiceImpl.java +++ b/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/SellerAccountServiceImpl.java @@ -14,6 +14,7 @@ import com.hchbox.constant.DefaultConstants; import com.hchbox.constant.UrlConstant; import com.hchbox.dto.AuthTokenDTO; import com.hchbox.dto.AuthTokenResponseDTO; +import com.hchbox.dto.SellerAccountDTO; import com.hchbox.entity.master.SellerAccount; import com.hchbox.enums.ResponseCode; import com.hchbox.repository.master.SellerAccountRepository; @@ -138,7 +139,7 @@ public class SellerAccountServiceImpl implements SellerAccountService { } @Override - public String checkAccountByNickAndSendSize(SellerAccount account, int size) { + public String checkAccountByNickAndSendSize(SellerAccountDTO account, int size) { // 超出时间范围 if (account.getExpirationTime() != null && account.getExpirationTime().after(new Date())) { return ResponseCode.ACCOUNT_HAS_EXPIRED.getDesc(); diff --git a/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/TaskSendMessageServiceImpl.java b/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/TaskSendMessageServiceImpl.java index a6f3abd..a290a1b 100644 --- a/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/TaskSendMessageServiceImpl.java +++ b/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/TaskSendMessageServiceImpl.java @@ -1,7 +1,7 @@ package com.hchbox.service.impl; import com.hchbox.constant.DefaultConstants; -import com.hchbox.entity.master.SellerAccount; +import com.hchbox.dto.SellerAccountDTO; import com.hchbox.entity.master.TaskSendMessage; import com.hchbox.repository.master.TaskSendMessageRepository; import com.hchbox.service.TaskSendMessageService; @@ -25,7 +25,7 @@ public class TaskSendMessageServiceImpl implements TaskSendMessageService { @Override @Transactional(rollbackFor = Exception.class) - public Boolean createTaskSendMessage(SubmitSendMessageVo submitSendMessageVo, SellerAccount sellerAccount) { + public Boolean createTaskSendMessage(SubmitSendMessageVo submitSendMessageVo, SellerAccountDTO sellerAccount) { TaskSendMessage sendMessage = new TaskSendMessage(); sendMessage.setCreateTime(new Date()); sendMessage.setIsSuccess(Boolean.FALSE); diff --git a/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/TopTradeServiceImpl.java b/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/TopTradeServiceImpl.java index 313a1c1..e99a778 100644 --- a/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/TopTradeServiceImpl.java +++ b/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/TopTradeServiceImpl.java @@ -7,7 +7,7 @@ import com.hchbox.api.TaoBaoApiClient; import com.hchbox.config.MiProperties; import com.hchbox.constant.TaoBaoDataMethod; import com.hchbox.converter.CommConverter; -import com.hchbox.entity.master.SellerAccount; +import com.hchbox.dto.SellerAccountDTO; import com.hchbox.entity.master.TopTrade; import com.hchbox.hander.message.TaoBaoTradeMessage; import com.hchbox.repository.master.TopTradeRepository; @@ -48,7 +48,7 @@ public class TopTradeServiceImpl implements TopTradeService { @Override @SneakyThrows @Transactional(rollbackFor = Exception.class) - public List getTopTradesByParam(SellerAccount sellerAccount, TradesSoldGetRequest request) { + public List getTopTradesByParam(SellerAccountDTO sellerAccount, TradesSoldGetRequest request) { TradesSoldGetResponse taoBaoResponse = TaoBaoApiClient.createTaoBaoResponse(request, miProperties, sellerAccount.getSessionKey()); List trades = new ArrayList<>(); @@ -98,7 +98,6 @@ public class TopTradeServiceImpl implements TopTradeService { // 查看设置是否 设置 if (trade != null) { - } return false; } diff --git a/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/UploadRecordServiceImpl.java b/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/UploadRecordServiceImpl.java index 2d602d9..6903709 100644 --- a/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/UploadRecordServiceImpl.java +++ b/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/UploadRecordServiceImpl.java @@ -8,7 +8,7 @@ import cn.hutool.poi.excel.ExcelReader; import cn.hutool.poi.excel.ExcelUtil; import com.hchbox.api.CommonResult; import com.hchbox.constant.DefaultConstants; -import com.hchbox.entity.master.SellerAccount; +import com.hchbox.dto.SellerAccountDTO; import com.hchbox.entity.master.UploadRecord; import com.hchbox.enums.ResponseCode; import com.hchbox.repository.master.UploadRecordRepository; @@ -50,7 +50,7 @@ public class UploadRecordServiceImpl implements UploadRecordService { @Override - public CommonResult uploadFile(SellerAccount sellerAccount, UploadVo uploadVo) { + public CommonResult uploadFile(SellerAccountDTO sellerAccount, UploadVo uploadVo) { String filePath; Long accountId = sellerAccount.getId(); // 多文件上传 @@ -93,7 +93,7 @@ public class UploadRecordServiceImpl implements UploadRecordService { return CommonResult.successfulOperation(); } - private UploadRecord createUpload(SellerAccount sellerAccount, UploadVo uploadVo, String filePath, Long accountId, String originalFilename, String extName) { + private UploadRecord createUpload(SellerAccountDTO sellerAccount, UploadVo uploadVo, String filePath, Long accountId, String originalFilename, String extName) { UploadRecord uploadRecord = new UploadRecord(); // 添加上传记录 uploadRecord.setFileType(extName); diff --git a/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/config/HttpAuthHandler.java b/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/config/HttpAuthHandler.java index bfd2194..c689e2a 100644 --- a/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/config/HttpAuthHandler.java +++ b/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/config/HttpAuthHandler.java @@ -2,6 +2,7 @@ package com.hchbox.config; import com.hchbox.exception.TaoMiCommException; import lombok.extern.slf4j.Slf4j; +import org.springframework.lang.NonNull; import org.springframework.stereotype.Component; import org.springframework.web.socket.CloseStatus; import org.springframework.web.socket.TextMessage; @@ -20,10 +21,9 @@ public class HttpAuthHandler extends TextWebSocketHandler { * socket 建立成功事件 * * @param session session - * @throws Exception */ @Override - public void afterConnectionEstablished(WebSocketSession session) throws Exception { + public void afterConnectionEstablished(WebSocketSession session) { Object token = session.getAttributes().get("nickname"); if (token != null) { // 用户连接成功，放入在线用户缓存 @@ -36,24 +36,22 @@ public class HttpAuthHandler extends TextWebSocketHandler { /** * 接收消息事件 * - * @param session - * @param message - * @throws Exception + * @param session session + * @param message message */ @Override - protected void handleTextMessage(WebSocketSession session, TextMessage message) throws Exception { + protected void handleTextMessage(@NonNull WebSocketSession session,@NonNull TextMessage message) throws Exception { super.handleTextMessage(session, message); } /** * socket 断开连接时 * - * @param session - * @param status - * @throws Exception + * @param session session + * @param status status */ @Override - public void afterConnectionClosed(WebSocketSession session, CloseStatus status) throws Exception { + public void afterConnectionClosed(WebSocketSession session,@NonNull CloseStatus status){ Object sessionKey = session.getAttributes().get("nickname"); if (sessionKey != null) { // 用户退出，移除缓存 diff --git a/service/trade-service-wwsend/trade-service-wwsend-task/src/main/resources/banner.txt b/service/trade-service-wwsend/trade-service-wwsend-task/src/main/resources/banner.txt new file mode 100644 index 0000000..47caff6 --- /dev/null +++ b/service/trade-service-wwsend/trade-service-wwsend-task/src/main/resources/banner.txt @@ -0,0 +1,10 @@ +${AnsiColor.BRIGHT_GREEN} + __ ___ __ ___ ___ / ___ ___ ___ __ ( ) ___ ___ ___ ___ __ ___ / __ ___ ___ ___ / ___ + / / // ) ) // ) ) // ) / //___) ) ____ (( ) ) //___) ) // ) ) || / / / / // ) ) //___) ) ____ // / / / / // / / / / (( ) ) //___) ) // ) ) // ) / ____ / / // ) ) (( ) ) //\ \ + / / // // / / // / / // \ \ // // || / / / / // // // / / / / // / / / / \ \ // // / / // / / / / // / / \ \ // \ \ + / / // ((___( ( ((___/ / ((____ // ) ) ((____ // ||/ / / / ((____ ((____ ((__( (__/ / ((__( (__/ / // ) ) ((____ // / / ((___/ / / / ((___( ( // ) ) // \ \ + +${AnsiColor.CYAN} +:: Spring Boot :: (v2.3.2.RELEASE) +:: By :: (Enzo) + diff --git a/trade-gateway/src/main/java/com/hchbox/gateway/config/GatewayConfigProperties.java b/trade-gateway/src/main/java/com/hchbox/gateway/config/GatewayConfigProperties.java index 14cceb3..90a9218 100644 --- a/trade-gateway/src/main/java/com/hchbox/gateway/config/GatewayConfigProperties.java +++ b/trade-gateway/src/main/java/com/hchbox/gateway/config/GatewayConfigProperties.java @@ -7,7 +7,7 @@ import org.springframework.cloud.context.config.annotation.RefreshScope; import java.util.List; /** - * @author + * @author Enzo * @date 2020/10/4 *

* 网关配置文件 diff --git a/trade-gateway/src/main/resources/banner.txt b/trade-gateway/src/main/resources/banner.txt new file mode 100644 index 0000000..be83c9d --- /dev/null +++ b/trade-gateway/src/main/resources/banner.txt @@ -0,0 +1,10 @@ +${AnsiColor.BRIGHT_GREEN} + __ ___ __ ___ ___ / ___ ___ ___ __ ___ ___ ___ + / / // ) ) // ) ) // ) / //___) ) ____ // ) ) // ) ) / / //___) ) // / / / / // ) ) // / / + / / // // / / // / / // ((___/ / // / / / / // // / / / / // / / ((___/ / +/ / // ((___( ( ((___/ / ((____ //__ ((___( ( / / ((____ ((__( (__/ / ((___( ( / / + +${AnsiColor.CYAN} +:: Spring Boot :: (v2.3.2.RELEASE) +:: By :: (Enzo) + diff --git a/trade-pojo/pom.xml b/trade-pojo/pom.xml index ad9fcbc..13aa643 100644 --- a/trade-pojo/pom.xml +++ b/trade-pojo/pom.xml @@ -20,6 +20,12 @@ com.google.code.gson gson + + io.swagger + swagger-annotations + 1.5.13 + compile + diff --git a/trade-pojo/src/main/java/com/hchbox/dto/AccountDeductionDTO.java b/trade-pojo/src/main/java/com/hchbox/dto/AccountDeductionDTO.java index a7eac37..68749a0 100644 --- a/trade-pojo/src/main/java/com/hchbox/dto/AccountDeductionDTO.java +++ b/trade-pojo/src/main/java/com/hchbox/dto/AccountDeductionDTO.java @@ -5,6 +5,7 @@ import lombok.Data; /** * @author Enzo * @date : 2021/6/22 + * 账号扣除相关 */ @Data public class AccountDeductionDTO { diff --git a/trade-pojo/src/main/java/com/hchbox/dto/SellerAccountDTO.java b/trade-pojo/src/main/java/com/hchbox/dto/SellerAccountDTO.java index cdd8619..9241142 100644 --- a/trade-pojo/src/main/java/com/hchbox/dto/SellerAccountDTO.java +++ b/trade-pojo/src/main/java/com/hchbox/dto/SellerAccountDTO.java @@ -1,9 +1,11 @@ package com.hchbox.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; +import java.util.Date; /** * @author Enzo @@ -12,5 +14,48 @@ import java.io.Serializable; @Data public class SellerAccountDTO implements Serializable { + @ApiModelProperty(value = "id") + private Long id; + @ApiModelProperty(value = "昵称") + private String nick; + + @ApiModelProperty(value = "子账户昵称") + private String subNick; + + @ApiModelProperty(value = "子账户数字sessionKey") + private String subSessionKey; + + @ApiModelProperty(value = "账号等级") + private Integer level; + + @ApiModelProperty(value = "店铺类型") + private String shopType; + + @ApiModelProperty(value = "信用等级") + private Integer creditLevel; + + @ApiModelProperty(value = "当前登录的appKey") + private String appKey; + + @ApiModelProperty(value = "当前登录的appKey") + private String sessionKey; + + @ApiModelProperty(value = "近30天店铺销量") + private Integer sellCount; + + @ApiModelProperty(value = "店铺名称") + private String shopTitle; + + @ApiModelProperty(value = "最后登录时间") + private Date lastLoginTime; + + @ApiModelProperty(value = "是否子账号") + private Boolean isSubAccount; + + @ApiModelProperty(value = "旺旺群发日限额") + private Integer messageCount; + + @ApiModelProperty(value = "过期天数") + private Date expirationTime ; }