Merge branches 'clerk' and 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop into clerk

2022-03-03 17:44:53 +08:00
parent d5091bf659 f4d7c07f57
commit 4d551366ed
284 changed files with 922 additions and 687 deletions
--- a/seller-api/src/main/java/cn/lili/StoreApiApplication.java
+++ b/seller-api/src/main/java/cn/lili/StoreApiApplication.java
@@ -28,7 +28,7 @@ public class StoreApiApplication {
    }

    public static void main(String[] args) {
-
+        System.setProperty("rocketmq.client.logUseSlf4j","true");
        System.setProperty("es.set.netty.runtime.available.processors", "false");
        SpringApplication.run(StoreApiApplication.class, args);
    }
--- a/seller-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsStoreController.java
@@ -29,7 +29,7 @@ import java.util.Objects;
 */
@RestController
@Api(tags = "店铺端,分销商品接口")
-@RequestMapping("/store/distributionGoods")
+@RequestMapping("/store/distribution/goods")
 public class DistributionGoodsStoreController {

    /**
--- a/seller-api/src/main/java/cn/lili/controller/distribution/DistributionOrderStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/distribution/DistributionOrderStoreController.java
@@ -24,7 +24,7 @@ import java.util.Objects;
 */
@RestController
@Api(tags = "店铺端,分销订单接口")
-@RequestMapping("/store/distributionOrder")
+@RequestMapping("/store/distribution/order")
 public class DistributionOrderStoreController {

    /**
--- a/seller-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupStoreController.java
@@ -6,7 +6,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -22,7 +21,7 @@ import java.util.List;
 */
@RestController
@Api(tags = "店铺端,分类绑定参数组管理接口")
-@RequestMapping("/store/goods/category/parameters")
+@RequestMapping("/store/goods/categoryParameters")
 public class CategoryParameterGroupStoreController {


--- a/seller-api/src/main/java/cn/lili/controller/goods/CategorySpecificationStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/goods/CategorySpecificationStoreController.java
@@ -6,7 +6,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -22,7 +21,7 @@ import java.util.List;
 */
@RestController
@Api(tags = "店铺端,商品分类规格接口")
-@RequestMapping("/store/goods/category/spec")
+@RequestMapping("/store/goods/categorySpec")
 public class CategorySpecificationStoreController {
    @Autowired
    private CategorySpecificationService categorySpecificationService;
--- a/seller-api/src/main/java/cn/lili/controller/goods/CategoryStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/goods/CategoryStoreController.java
@@ -14,7 +14,6 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheConfig;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
--- a/seller-api/src/main/java/cn/lili/controller/goods/DraftGoodsStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/goods/DraftGoodsStoreController.java
@@ -27,7 +27,7 @@ import java.util.Objects;
 */
@RestController
@Api(tags = "店铺端,草稿商品接口")
-@RequestMapping("/store/draft/goods")
+@RequestMapping("/store/goods/draftGoods")
 public class DraftGoodsStoreController {
    @Autowired
    private DraftGoodsService draftGoodsService;
--- a/seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java
@@ -39,7 +39,7 @@ import java.util.stream.Collectors;
 */
@RestController
@Api(tags = "店铺端,商品接口")
-@RequestMapping("/store/goods")
+@RequestMapping("/store/goods/goods")
 public class GoodsStoreController {

    /**
--- a/seller-api/src/main/java/cn/lili/controller/goods/GoodsUnitStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/goods/GoodsUnitStoreController.java
@@ -1,17 +1,16 @@
 package cn.lili.controller.goods;


-import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.goods.entity.dos.GoodsUnit;
 import cn.lili.modules.goods.service.GoodsUnitService;
+import cn.lili.mybatis.util.PageUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -24,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
 */
@RestController
@Api(tags = "店铺端,商品计量单位接口")
-@RequestMapping("/store/goods/unit")
+@RequestMapping("/store/goods/goodsUnit")
 public class GoodsUnitStoreController {
    @Autowired
    private GoodsUnitService goodsUnitService;
--- a/seller-api/src/main/java/cn/lili/controller/member/BillStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/member/BillStoreController.java
@@ -31,7 +31,7 @@ import java.util.Objects;
 */
@RestController
@Api(tags = "店铺端,结算单接口")
-@RequestMapping("/store/bill")
+@RequestMapping("/store/order/bill")
 public class BillStoreController {

    @Autowired
--- a/seller-api/src/main/java/cn/lili/controller/member/MemberEvaluationStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/member/MemberEvaluationStoreController.java
@@ -26,7 +26,7 @@ import java.util.Objects;
 */
@RestController
@Api(tags = "店铺端,商品评价管理接口")
-@RequestMapping("/store/memberEvaluation")
+@RequestMapping("/store/member/evaluation")
 public class MemberEvaluationStoreController {

    @Autowired
--- a/seller-api/src/main/java/cn/lili/controller/member/StoreUserController.java
+++ b/seller-api/src/main/java/cn/lili/controller/member/StoreUserController.java
@@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RestController;
 */
@RestController
@Api(tags = "店铺端,管理员接口")
-@RequestMapping("/store/user")
+@RequestMapping("/store/member/user")
 public class StoreUserController {
    @Autowired
    private MemberService memberService;
--- a/seller-api/src/main/java/cn/lili/controller/message/StoreMessageController.java
+++ b/seller-api/src/main/java/cn/lili/controller/message/StoreMessageController.java
@@ -29,7 +29,7 @@ import java.util.Objects;
 */
@RestController
@Api(tags = "店铺端,消息接口")
-@RequestMapping("/store/message")
+@RequestMapping("/store/message/storeMessage")
 public class StoreMessageController {

    /**
--- a/seller-api/src/main/java/cn/lili/controller/order/AfterSaleStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/order/AfterSaleStoreController.java
@@ -31,7 +31,7 @@ import java.util.Objects;
 */
@RestController
@Api(tags = "店铺端,售后管理接口")
-@RequestMapping("/store/afterSale")
+@RequestMapping("/store/order/afterSale")
 public class AfterSaleStoreController {

    @Autowired
--- a/seller-api/src/main/java/cn/lili/controller/order/OrderComplaintStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/order/OrderComplaintStoreController.java
@@ -30,7 +30,7 @@ import java.util.Objects;
 **/
@RestController
@Api(tags = "店铺端,交易投诉接口")
-@RequestMapping("/store/complain")
+@RequestMapping("/store/order/complain")
 public class OrderComplaintStoreController {

    /**
--- a/seller-api/src/main/java/cn/lili/controller/order/OrderLogStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/order/OrderLogStoreController.java
@@ -25,7 +25,7 @@ import java.util.List;
 **/
@RestController
@Api(tags = "店铺端,订单日志接口")
-@RequestMapping("/store/orderLog")
+@RequestMapping("/store/order/orderLog")
 public class OrderLogStoreController {

    @Autowired
--- a/seller-api/src/main/java/cn/lili/controller/order/OrderStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/order/OrderStoreController.java
@@ -41,7 +41,7 @@ import java.util.Objects;
 **/
@Slf4j
@RestController
-@RequestMapping("/store/orders")
+@RequestMapping("/store/order/order")
@Api(tags = "店铺端,订单接口")
 public class OrderStoreController {

--- a/seller-api/src/main/java/cn/lili/controller/order/ReceiptStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/order/ReceiptStoreController.java
@@ -27,7 +27,7 @@ import java.util.Objects;
 **/
@RestController
@Api(tags = "店铺端,发票接口")
-@RequestMapping("/store/receipt")
+@RequestMapping("/store/trade/receipt")
 public class ReceiptStoreController {

    @Autowired
--- a/seller-api/src/main/java/cn/lili/controller/other/article/ArticleStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/other/article/ArticleStoreController.java
@@ -1,4 +1,4 @@
-package cn.lili.controller.other.article;
+package cn.lili.controller.other;

 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.ResultMessage;
@@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.RestController;
 */
@RestController
@Api(tags = "店铺端,文章接口")
-@RequestMapping("/store/article")
+@RequestMapping("/store/other/article")
 public class ArticleStoreController {

    /**
--- a/seller-api/src/main/java/cn/lili/controller/settings/LogisticsStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/settings/LogisticsStoreController.java
@@ -1,4 +1,4 @@
-package cn.lili.controller.settings;
+package cn.lili.controller.other;


 import cn.lili.common.enums.ResultUtil;
@@ -25,7 +25,7 @@ import java.util.Objects;
 */
@RestController
@Api(tags = "店铺端,物流公司接口")
-@RequestMapping("/store/logistics")
+@RequestMapping("/store/other/logistics")
 public class LogisticsStoreController {

    /**
--- a/seller-api/src/main/java/cn/lili/controller/passport/StorePassportController.java
+++ b/seller-api/src/main/java/cn/lili/controller/passport/StorePassportController.java
@@ -32,7 +32,7 @@ import javax.validation.constraints.NotNull;

@RestController
@Api(tags = "店铺端,商家登录接口 ")
-@RequestMapping("/store/login")
+@RequestMapping("/store/passport/login")
 public class StorePassportController {

    /**
--- a/seller-api/src/main/java/cn/lili/controller/settings/FreightTemplateStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/settings/FreightTemplateStoreController.java
@@ -24,7 +24,7 @@ import java.util.Objects;
 **/
@RestController
@Api(tags = "店铺端,运费模板接口")
-@RequestMapping("/store/freightTemplate")
+@RequestMapping("/store/setting/freightTemplate")
 public class FreightTemplateStoreController {
    @Autowired
    private FreightTemplateService freightTemplateService;
--- a/seller-api/src/main/java/cn/lili/controller/settings/LogStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/settings/LogStoreController.java
@@ -25,7 +25,7 @@ import java.util.Objects;
 */
@RestController
@Api(tags = "店铺端,日志管理接口")
-@RequestMapping("/store/log")
+@RequestMapping("/store/settings/log")
 public class LogStoreController {
    @Autowired
    private SystemLogService systemLogService;
--- a/seller-api/src/main/java/cn/lili/controller/settings/StoreAddressController.java
+++ b/seller-api/src/main/java/cn/lili/controller/settings/StoreAddressController.java
@@ -26,7 +26,7 @@ import java.util.Objects;
 */
@RestController
@Api(tags = "店铺端,商家地址（自提点）接口")
-@RequestMapping("/store/storeAddress")
+@RequestMapping("/store/member/storeAddress")
 public class StoreAddressController {

    /**
--- a/seller-api/src/main/java/cn/lili/controller/settings/StorePageDataController.java
+++ b/seller-api/src/main/java/cn/lili/controller/settings/StorePageDataController.java
@@ -31,7 +31,7 @@ import java.util.Objects;
 */
@RestController
@Api(tags = "店铺端,页面接口")
-@RequestMapping("/store/pageData")
+@RequestMapping("/store/settings/pageData")
 public class StorePageDataController {
    @Autowired
    private PageDataService pageDataService;
--- a/seller-api/src/main/java/cn/lili/controller/settings/StoreSettingsController.java
+++ b/seller-api/src/main/java/cn/lili/controller/settings/StoreSettingsController.java
@@ -27,7 +27,7 @@ import javax.validation.Valid;
 */
@RestController
@Api(tags = "店铺端,店铺设置接口")
-@RequestMapping("/store/settings")
+@RequestMapping("/store/settings/storeSettings")
 public class StoreSettingsController {

    /**
--- a/seller-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsStoreController.java
@@ -25,7 +25,7 @@ import java.util.Objects;
 */
@Api(tags = "店铺端,退款统计接口")
@RestController
-@RequestMapping("/store/statistics/refund/order")
+@RequestMapping("/store/statistics/refundOrder")
 public class RefundOrderStatisticsStoreController {

    @Autowired
--- a/seller-api/src/main/resources/application.yml
+++ b/seller-api/src/main/resources/application.yml
@@ -119,7 +119,8 @@ ignored:
    - /MP_verify_qSyvBPhDsPdxvOhC.txt
    - /weixin/**
    - /source/**
-    - /store/login/**
+    - /store/passport/login/**
+    - /store/passport/login/refresh/**
    - /druid/**
    - /swagger-ui.html
    - /doc.html
--- a/seller-api/src/main/resources/logback-spring.xml
+++ b/seller-api/src/main/resources/logback-spring.xml
@@ -20,6 +20,22 @@
        </encoder>
    </appender>

+    <appender name="RocketmqClientAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${LOG_FILE_PATH}/rocketmq.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_FILE_PATH}/rocketmq/rocketmq-%d{yyyy-MM-dd}.log</fileNamePattern>
+            <maxHistory>30</maxHistory>
+            <totalSizeCap>30MB</totalSizeCap>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%d{yy-MM-dd.HH:mm:ss.SSS} [%-16t] %-5p %-22c{0} %X{ServiceId} - %m%n</pattern>
+        </encoder>
+    </appender>
+    <logger name="RocketmqClient" additivity="false">
+        <level value="info" />
+        <appender-ref ref="RocketmqClientAppender"/>
+    </logger>
+
    <!--输出到elk的LOGSTASH-->
    <appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
        <!-- 配置elk日志收集 配饰的是 LOGSTASH 的地址-->
--- a/seller-api/src/main/resources/redisson.yaml
+++ b/seller-api/src/main/resources/redisson.yaml
@@ -1,21 +0,0 @@
---
-singleServerConfig:
-  idleConnectionTimeout: 10000
-  connectTimeout: 10000
-  timeout: 3000
-  retryAttempts: 3
-  retryInterval: 1500
-  password: lilishop
-  subscriptionsPerConnection: 5
-  clientName: null
-  address: "redis://127.0.0.1:6379"
-  subscriptionConnectionMinimumIdleSize: 1
-  subscriptionConnectionPoolSize: 50
-  connectionMinimumIdleSize: 24
-  connectionPoolSize: 64
-  database: 0
-  dnsMonitoringInterval: 5000
-threads: 16
-nettyThreads: 32
-codec: !<org.redisson.codec.MarshallingCodec> {}
-transportMode: "NIO"