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/buyer-api/src/main/java/cn/lili/BuyerApiApplication.java
+++ b/buyer-api/src/main/java/cn/lili/BuyerApiApplication.java
@@ -29,6 +29,7 @@ public class BuyerApiApplication {

    public static void main(String[] args) {
        System.setProperty("es.set.netty.runtime.available.processors", "false");
+        System.setProperty("rocketmq.client.logUseSlf4j","true");
        SpringApplication.run(BuyerApiApplication.class, args);
    }
 }
--- a/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionBuyerController.java
@@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.*;
 */
@RestController
@Api(tags = "买家端,分销员接口")
-@RequestMapping("/buyer/distribution")
+@RequestMapping("/buyer/distribution/distribution")
 public class DistributionBuyerController {

    /**
--- a/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsBuyerController.java
@@ -30,7 +30,7 @@ import javax.validation.constraints.NotNull;
 */
@RestController
@Api(tags = "买家端,分销商品接口")
-@RequestMapping("/buyer/distributionGoods")
+@RequestMapping("/buyer/distribution/goods")
 public class DistributionGoodsBuyerController {

    /**
--- a/buyer-api/src/main/java/cn/lili/controller/goods/CategoryBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/goods/CategoryBuyerController.java
@@ -25,7 +25,7 @@ import java.util.List;
 */
@RestController
@Api(tags = "买家端,商品分类接口")
-@RequestMapping("/buyer/category")
+@RequestMapping("/buyer/goods/category")
 public class CategoryBuyerController {
    /**
     * 商品分类
--- a/buyer-api/src/main/java/cn/lili/controller/goods/GoodsBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/goods/GoodsBuyerController.java
@@ -43,7 +43,7 @@ import java.util.Map;
@Slf4j
@Api(tags = "买家端,商品接口")
@RestController
-@RequestMapping("/buyer/goods")
+@RequestMapping("/buyer/goods/goods")
 public class GoodsBuyerController {

    /**
--- a/buyer-api/src/main/java/cn/lili/controller/member/FootprintController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/member/FootprintController.java
@@ -23,7 +23,7 @@ import java.util.List;
 */
@RestController
@Api(tags = "买家端,浏览历史接口")
-@RequestMapping("/buyer/footprint")
+@RequestMapping("/buyer/member/footprint")
 public class FootprintController {

    /**
--- a/buyer-api/src/main/java/cn/lili/controller/member/MemberAddressBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/member/MemberAddressBuyerController.java
@@ -26,7 +26,7 @@ import java.util.Objects;
 */
@RestController
@Api(tags = "买家端,会员地址接口")
-@RequestMapping("/buyer/memberAddress")
+@RequestMapping("/buyer/member/address")
 public class MemberAddressBuyerController {

    /**
--- a/buyer-api/src/main/java/cn/lili/controller/member/MemberEvaluationBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/member/MemberEvaluationBuyerController.java
@@ -29,7 +29,7 @@ import javax.validation.constraints.NotNull;
 */
@RestController
@Api(tags = "买家端,会员商品评价接口")
-@RequestMapping("/buyer/memberEvaluation")
+@RequestMapping("/buyer/member/evaluation")
 public class MemberEvaluationBuyerController {

    /**
--- a/buyer-api/src/main/java/cn/lili/controller/message/MemberMessageBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/message/MemberMessageBuyerController.java
@@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.*;
 */
@RestController
@Api(tags = "买家端,会员站内消息接口")
-@RequestMapping("/buyer/member/message")
+@RequestMapping("/buyer/message/member")
 public class MemberMessageBuyerController {

    /**
--- a/buyer-api/src/main/java/cn/lili/controller/order/AfterSaleBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/order/AfterSaleBuyerController.java
@@ -36,7 +36,7 @@ import java.util.List;
 */
@RestController
@Api(tags = "买家端,售后管理接口")
-@RequestMapping("/buyer/afterSale")
+@RequestMapping("/buyer/order/afterSale")
 public class AfterSaleBuyerController {

    /**
--- a/buyer-api/src/main/java/cn/lili/controller/order/OrderBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/order/OrderBuyerController.java
@@ -35,7 +35,7 @@ import java.util.Objects;
 */
@RestController
@Api(tags = "买家端,订单接口")
-@RequestMapping("/buyer/orders")
+@RequestMapping("/buyer/order/order")
 public class OrderBuyerController {

    /**
--- a/buyer-api/src/main/java/cn/lili/controller/order/OrderComplaintBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/order/OrderComplaintBuyerController.java
@@ -34,7 +34,7 @@ import java.util.Objects;
 **/
@RestController
@Api(tags = "买家端,交易投诉接口")
-@RequestMapping("/buyer/complain")
+@RequestMapping("/buyer/order/complain")
 public class OrderComplaintBuyerController {

    /**
--- a/buyer-api/src/main/java/cn/lili/controller/order/RechargeTradeBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/order/RechargeTradeBuyerController.java
@@ -10,7 +10,6 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
--- a/buyer-api/src/main/java/cn/lili/controller/other/AppVersionBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/other/AppVersionBuyerController.java
@@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.RestController;
 */
@RestController
@Api(tags = "买家端,APP版本")
-@RequestMapping("/buyer/appVersion")
+@RequestMapping("/buyer/other/appVersion")
 public class AppVersionBuyerController {

    @Autowired
--- a/buyer-api/src/main/java/cn/lili/controller/other/ArticleBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/other/ArticleBuyerController.java
@@ -29,7 +29,7 @@ import java.util.List;
 */
@RestController
@Api(tags = "买家端,文章接口")
-@RequestMapping("/buyer/article")
+@RequestMapping("/buyer/other/article")
 public class ArticleBuyerController {

    /**
--- a/buyer-api/src/main/java/cn/lili/controller/other/FeedbackBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/other/FeedbackBuyerController.java
@@ -23,7 +23,7 @@ import javax.validation.Valid;
 */
@RestController
@Api(tags = "买家端,意见反馈接口")
-@RequestMapping("/buyer/feedback")
+@RequestMapping("/buyer/other/feedback")
 public class FeedbackBuyerController {

    /**
--- a/buyer-api/src/main/java/cn/lili/controller/other/LogisticsBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/other/LogisticsBuyerController.java
@@ -21,7 +21,7 @@ import java.util.List;
 */
@RestController
@Api(tags = "买家端,物流公司接口")
-@RequestMapping("/buyer/logistics")
+@RequestMapping("/buyer/other/logistics")
 public class LogisticsBuyerController {

    @Autowired
--- a/buyer-api/src/main/java/cn/lili/controller/other/PageBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/other/PageBuyerController.java
@@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
 */
@RestController
@Api(tags = "买家端,页面接口")
-@RequestMapping("/buyer/pageData")
+@RequestMapping("/buyer/other/pageData")
 public class PageBuyerController {

    /**
--- a/buyer-api/src/main/java/cn/lili/controller/other/purchase/PurchaseBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/other/purchase/PurchaseBuyerController.java
@@ -30,7 +30,7 @@ import javax.validation.constraints.NotNull;
 */
@Api(tags = "买家端,采购接口")
@RestController
-@RequestMapping("/buyer/purchase")
+@RequestMapping("/buyer/other/purchase/purchase")
 public class PurchaseBuyerController {

    /**
--- a/buyer-api/src/main/java/cn/lili/controller/other/purchase/PurchaseQuotedController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/other/purchase/PurchaseQuotedController.java
@@ -27,7 +27,7 @@ import java.util.List;
 */
@Api(tags = "买家端,采购报价接口")
@RestController
-@RequestMapping("/buyer/purchaseQuoted")
+@RequestMapping("/buyer/other/purchase/purchaseQuoted")
 public class PurchaseQuotedController {

    /**
--- a/buyer-api/src/main/java/cn/lili/controller/passport/MemberBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/passport/MemberBuyerController.java
@@ -32,7 +32,7 @@ import javax.validation.constraints.NotNull;
 */
@RestController
@Api(tags = "买家端,会员接口")
-@RequestMapping("/buyer/members")
+@RequestMapping("/buyer/passport/member")
 public class MemberBuyerController {

    @Autowired
--- a/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerBindController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerBindController.java
@@ -21,7 +21,7 @@ import java.util.List;
 */
@RestController
@Api(tags = "买家端,app/小程序 联合登录")
-@RequestMapping("/buyer/connect/bind")
+@RequestMapping("/buyer/passport/connect/bind")
 public class ConnectBuyerBindController {

    @Autowired
--- a/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerWebController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerWebController.java
@@ -33,7 +33,7 @@ import java.io.IOException;
@Slf4j
@RestController
@Api(tags = "买家端,web联合登录")
-@RequestMapping("/buyer/connect")
+@RequestMapping("/buyer/passport/connect/connect")
 public class ConnectBuyerWebController {

    @Autowired
--- a/buyer-api/src/main/java/cn/lili/controller/passport/connect/MiniProgramBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/passport/connect/MiniProgramBuyerController.java
@@ -26,7 +26,7 @@ import java.util.List;
 * @since 2021/2/19 09:28
 */
@RestController
-@RequestMapping("/buyer/mini-program")
+@RequestMapping("/buyer/passport/connect/miniProgram")
@Api(tags = "买家端,小程序登录接口")
 public class MiniProgramBuyerController {

--- a/buyer-api/src/main/java/cn/lili/controller/payment/CashierController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/payment/CashierController.java
@@ -30,7 +30,7 @@ import javax.servlet.http.HttpServletResponse;
@Slf4j
@RestController
@Api(tags = "买家端,收银台接口")
-@RequestMapping("/buyer/cashier")
+@RequestMapping("/buyer/payment/cashier")
 public class CashierController {

    @Autowired
--- a/buyer-api/src/main/java/cn/lili/controller/payment/CashierRefundController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/payment/CashierRefundController.java
@@ -20,7 +20,7 @@ import javax.servlet.http.HttpServletRequest;
 */
@Api(tags = "买家端,退款回调")
@RestController
-@RequestMapping("/buyer/cashier/refund")
+@RequestMapping("/buyer/payment/cashierRefund")
 public class CashierRefundController {

    @Autowired
--- a/buyer-api/src/main/java/cn/lili/controller/store/StoreBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/store/StoreBuyerController.java
@@ -31,7 +31,7 @@ import java.util.List;
 * @since 2020/11/17 2:32 下午
 */
@RestController
-@RequestMapping("/buyer/store")
+@RequestMapping("/buyer/store/store")
@Api(tags = "买家端,店铺接口")
 public class StoreBuyerController {

--- a/buyer-api/src/main/java/cn/lili/controller/wallet/MemberReceiptController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/wallet/MemberReceiptController.java
@@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.*;
 */
@RestController
@Api(tags = "买家端,会员发票接口")
-@RequestMapping("/buyer/member/receipt")
+@RequestMapping("/buyer/wallet/receipt")
 public class MemberReceiptController {

    @Autowired
--- a/buyer-api/src/main/java/cn/lili/controller/wallet/MemberWalletBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/wallet/MemberWalletBuyerController.java
@@ -35,7 +35,7 @@ import javax.validation.constraints.Pattern;
 */
@RestController
@Api(tags = "买家端,会员余额接口")
-@RequestMapping("/buyer/members/wallet")
+@RequestMapping("/buyer/wallet/wallet")
 public class MemberWalletBuyerController {

    /**
--- a/buyer-api/src/main/java/cn/lili/controller/wallet/MemberWithdrawApplyBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/wallet/MemberWithdrawApplyBuyerController.java
@@ -12,7 +12,6 @@ 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;
--- a/buyer-api/src/main/java/cn/lili/controller/wallet/RechargeBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/wallet/RechargeBuyerController.java
@@ -11,7 +11,6 @@ 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("/buyer/member/recharge")
+@RequestMapping("/buyer/wallet/recharge")
 public class RechargeBuyerController {

    @Autowired
--- a/buyer-api/src/main/resources/application.yml
+++ b/buyer-api/src/main/resources/application.yml
@@ -128,21 +128,23 @@ ignored:
    - /MP_verify_qSyvBPhDsPdxvOhC.txt
    - /weixin/**
    - /source/**
-    - /buyer/mini-program/**
-    - /buyer/cashier/**
-    - /buyer/pageData/**
-    - /buyer/article/**
+    - /buyer/payment/cashier/**
+    - /buyer/payment/cashierRefund/**
+    - /buyer/other/pageData/**
+    - /buyer/other/article/**
    - /buyer/goods/**
-    - /buyer/category/**
    - /buyer/store/**
-    - /buyer/connect/**
+    - /buyer/passport/connect/**
    - /buyer/members/**
+    - /buyer/passport/member/**
+    - /buyer/passport/member/refresh/**
    - /buyer/promotion/pintuan/**
    - /buyer/promotion/seckill/**
    - /buyer/promotion/pointsGoods/**
-    - /buyer/memberEvaluation/**/goodsEvaluation
-    - /buyer/memberEvaluation/**/evaluationNumber
-    - /buyer/appVersion/**
+    - /buyer/promotion/coupon
+    - /buyer/member/evaluation/**/goodsEvaluation
+    - /buyer/member/evaluation/**/evaluationNumber
+    - /buyer/other/appVersion/**
    - /buyer/broadcast/studio/**
    - /druid/**
    - /swagger-ui.html
@@ -183,7 +185,7 @@ logging:
  config: classpath:logback-spring.xml
  # 输出级别
  level:
-    root: error
+    root: info
 #    org.springframework: debug
  file:
    # 指定路径
--- a/buyer-api/src/main/resources/logback-spring.xml
+++ b/buyer-api/src/main/resources/logback-spring.xml
@@ -20,6 +20,23 @@
        </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/buyer-api/src/main/resources/redisson.yaml
+++ b/buyer-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"