更新

admin/src/main/resources/logback-spring.xml

@@ -34,8 +34,7 @@
             <customFields>{"appName":"${APP_NAME}"}</customFields>
         </encoder>
     </appender>
-    <!--    <root level="INFO">-->
+    <root >
-    <root>
         <appender-ref ref="CONSOLE"/>
         <appender-ref ref="FILE"/>
         <appender-ref ref="LOGSTASH"/>

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 {
 
     /**

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 {
 
     /**

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 {
     /**
      * 商品分类

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 {
 
     /**

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 {
 
     /**

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 {
 
     /**

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 {
 
     /**

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 {
 
     /**

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 {
 
     /**

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 {
 
     /**

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 {
 
     /**

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;

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

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 {
 
     /**

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 {
 
     /**

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

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 {
 
     /**

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 {
 
     /**

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 {
 
     /**

buyer-api/src/main/java/cn/lili/controller/passport/MemberBuyerController.java

@@ -28,7 +28,7 @@ import javax.validation.constraints.NotNull;
  */
 @RestController
 @Api(tags = "买家端,会员接口")
-@RequestMapping("/buyer/members")
+@RequestMapping("/buyer/passport/member")
 public class MemberBuyerController {
 
     @Autowired

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

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

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 {
 

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

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

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 {
 

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

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 {
 
     /**

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;

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

buyer-api/src/main/resources/application.yml

@@ -3,12 +3,19 @@ server:
 
   servlet:
     context-path: /
-
+#
-  tomcat:
+#  tomcat:
-    uri-encoding: UTF-8
+#    #最大链接数，默认不设置，默认是10000
-    threads:
+#    max-connections: 6500
-      min-spare: 50
+#    #最大等待队列长度，允许HTTP请求缓存到请求队列的最大个数，默认不限制
-      max: 1000
+#    accept-count: 1000
+#    threads:
+#      #最少闲置
+#      min-spare: 50
+#      #最大线程数  ，默认是200
+#      max: 800
+  netty:
+    connection-timeout:
 
 # 与Spring Boot 2一样，默认情况下，大多数端点都不通过http公开，我们公开了所有端点。对于生产，您应该仔细选择要公开的端点。
 management:
@@ -22,6 +29,8 @@ management:
       exposure:
         include: '*'
 spring:
+  application:
+    name: buyer-api
   # 要在其中注册的Spring Boot Admin Server的URL。
   boot:
     admin:
@@ -41,20 +50,9 @@ spring:
       #关闭jackson 对json做解析
       fail-on-empty-beans: false
 
-  # mongodb
-  data:
-    mongodb:
-      host: 192.168.2.126
-      port: 27017
-      database: rx-shop
-      username: goboo
-      password: Gb84505016
-      authentication-database: admin
-  #      replica-set-name: mongoreplset
-
   # Redis
   redis:
-    host: 192.168.2.126
+    host: 192.168.2.122
     port: 6379
     password: Gb84505016
     lettuce:
@@ -78,10 +76,10 @@ spring:
         url: jdbc:mysql://192.168.2.126:3306/rx-shop?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC&allowPublicKeyRetrieval=true&verifyServerCertificate=false&useSSL=false
         username: rx-shop
         password: J2xEZ42HwPXrDXt3
-        maxActive: 20
+        maxActive: 50
-        initialSize: 5
+        initialSize: 10
         maxWait: 60000
-        minIdle: 5
+        minIdle: 10
         timeBetweenEvictionRunsMillis: 60000
         minEvictableIdleTimeMillis: 300000
         validationQuery: SELECT 1 FROM DUAL
@@ -119,7 +117,7 @@ spring:
     props:
       #是否打印逻辑SQL语句和实际SQL语句，建议调试时打印，在生产环境关闭
       sql:
-        show: true
+        show: false
 
 # 忽略TOKEN 鉴权 的url
 ignored:
@@ -130,26 +128,21 @@ ignored:
     - /MP_verify_qSyvBPhDsPdxvOhC.txt
     - /weixin/**
     - /source/**
-    - /buyer/mini-program/**
+    - /buyer/payment/cashier/**
-    - /buyer/cashier/**
+    - /buyer/other/pageData/**
-    - /buyer/pageData/**
+    - /buyer/other/article/**
-    - /buyer/article/**
     - /buyer/goods/**
-    - /buyer/category/**
+    - /buyer/store/**
-    - /buyer/store
+    - /buyer/passport/connect/**
-    - /buyer/store/get**
-    - /buyer/store/get/**
-    - /buyer/store/label/get**
-    - /buyer/store/label/get/**
-    - /buyer/connect/**
     - /buyer/members/**
+    - /buyer/passport/member/**
     - /buyer/promotion/pintuan/**
-    - /buyer/promotion/coupon/**
     - /buyer/promotion/seckill/**
     - /buyer/promotion/pointsGoods/**
-    - /buyer/memberEvaluation/**/goodsEvaluation
+    - /buyer/promotion/coupon
-    - /buyer/memberEvaluation/**/evaluationNumber
+    - /buyer/member/evaluation/**/goodsEvaluation
-    - /buyer/appVersion/**
+    - /buyer/member/evaluation/**/evaluationNumber
+    - /buyer/other/appVersion/**
     - /buyer/broadcast/studio/**
     - /druid/**
     - /swagger-ui.html
@@ -170,11 +163,11 @@ swagger:
   title: API接口文档
   description: Api Documentation
   version: 1.0.0
-  termsOfServiceUrl:
+  termsOfServiceUrl: https://pickmall.cn
   contact:
-    name: rx
+    name: lili
-    url:
+    url: https://pickmall.cn
-    email:
+    email: admin@pickmall.com
 
 # Mybatis-plus
 mybatis-plus:
@@ -187,19 +180,20 @@ mybatis-plus:
 
 # 日志
 logging:
+  config: classpath:logback-spring.xml
   # 输出级别
   level:
-    cn.lili: debug
+    root: info
-    org.hibernate: debug
+  #    org.springframework: debug
-#    org.springframework: debug
-  #    org.springframework.data.mongodb.core: debug
   file:
     # 指定路径
     path: lili-logs
-    # 最大保存天数
+  logback:
-    max-history: 7
+    rollingpolicy:
-    # 每个文件最大大小
+      # 最大保存天数
-    max-size: 5MB
+      max-history: 7
+      # 每个文件最大大小
+      max-file-size: 5MB
 #加密参数
 jasypt:
   encryptor:
@@ -207,7 +201,7 @@ jasypt:
 
 lili:
   system:
-    isDemoSite: false
+    isDemoSite: true
   statistics:
     # 在线人数统计 X 小时。这里设置48，即统计过去48小时每小时在线人数
     onlineMember: 48
@@ -247,7 +241,7 @@ lili:
   data:
     elasticsearch:
       cluster-name: elasticsearch
-      cluster-nodes: 192.168.2.126:9200
+      cluster-nodes: 192.168.2.122:9200
       index:
         number-of-replicas: 0
         number-of-shards: 3
@@ -257,7 +251,7 @@ lili:
     #        username: elastic
     #        password: LiLiShopES
     logstash:
-      server: 192.168.2.126:4560
+      server: 192.168.2.122:4560
     rocketmq:
       promotion-topic: lili_promotion_topic
       promotion-group: lili_promotion_group
@@ -278,7 +272,7 @@ lili:
       after-sale-topic: lili_after_sale_topic
       after-sale-group: lili_after_sale_group
 rocketmq:
-  name-server: 192.168.2.126:9876
+  name-server: 192.168.2.122:9876
   producer:
     group: lili_group
     send-message-timeout: 30000
@@ -286,7 +280,7 @@ rocketmq:
 xxl:
   job:
     admin:
-      addresses: http://192.168.2.126:9001/xxl-job-admin
+      addresses: http://192.168.2.122:9001/xxl-job-admin
     executor:
       appname: xxl-job-executor-lilishop
       address:

buyer-api/src/main/resources/logback-spring.xml

@@ -34,8 +34,7 @@
             <customFields>{"appName":"${APP_NAME}"}</customFields>
         </encoder>
     </appender>
-    <!--    <root level="INFO">-->
+    <root >
-    <root>
         <appender-ref ref="CONSOLE"/>
         <appender-ref ref="FILE"/>
         <appender-ref ref="LOGSTASH"/>

buyer-api/src/test/resources/application.yml

@@ -24,11 +24,11 @@ spring:
   boot:
     admin:
       client:
-        url: http://192.168.2.126:8000
+        url: http://192.168.2.122:8000
   # mongodb
   data:
     mongodb:
-      host: 192.168.2.126
+      host: 192.168.2.122
       port: 27017
       database: rx-shop
       username: goboo
@@ -39,10 +39,10 @@ spring:
     type: redis
   #amqp
   #  rabbitmq:
-  #    host: 192.168.2.126
+  #    host: 192.168.2.122
   # Redis
   redis:
-    host: 192.168.2.126
+    host: 192.168.2.122
     port: 6379
     password: Gb84505016
     lettuce:
@@ -143,8 +143,8 @@ ignored:
     - /buyer/memberEvaluation/**/goodsEvaluation
     - /buyer/memberEvaluation/**/evaluationNumber
     - /store/login/**
-    - /manager/user/login
+    - /manager/passport/user/login
-    - /manager/user/refresh/**
+    - /manager/passport/user/refresh/**
     - /druid/**
     - /swagger-ui.html
     - /doc.html
@@ -213,16 +213,16 @@ lili:
     sk: zhNKVrJK6UPOhqIjn8AQvG37b9sz6
   #域名
   domain:
-    pc: http://192.168.2.126:8885
+    pc: http://192.168.2.122:8885
-    wap: http://192.168.2.126:8885
+    wap: http://192.168.2.122:8885
-    seller: http://192.168.2.126:8885
+    seller: http://192.168.2.122:8885
-    admin: http://192.168.2.126:8885
+    admin: http://192.168.2.122:8885
   #api地址
   api:
     buyer: https://z171l91606.51mypc.cn
-    base: http://192.168.2.126:8885
+    base: http://192.168.2.122:8885
-    manager: http://192.168.2.126:8885
+    manager: http://192.168.2.122:8885
-    seller: http://192.168.2.126:8885
+    seller: http://192.168.2.122:8885
 
   # jwt 细节设定
   jwt-setting:
@@ -241,7 +241,7 @@ lili:
   data:
     elasticsearch:
       cluster-name: elasticsearch
-      cluster-nodes: 192.168.2.126:9200
+      cluster-nodes: 192.168.2.122:9200
       index:
         number-of-replicas: 0
         number-of-shards: 3
@@ -269,7 +269,7 @@ lili:
       notice-send-topic: lili_send_notice_topic
       notice-send-group: lili_send_notice_group
 rocketmq:
-  name-server: 192.168.2.126:9876
+  name-server: 192.168.2.122:9876
   producer:
     group: lili_group
     send-message-timeout: 30000
@@ -277,7 +277,7 @@ rocketmq:
 xxl:
   job:
     admin:
-      addresses: http://192.168.2.126:9001/xxl-job-admin
+      addresses: http://192.168.2.122:9001/xxl-job-admin
     executor:
       appname: xxl-job-executor-lilishop
       address:

common-api/src/main/java/cn/lili/controller/common/FileController.java

@@ -30,8 +30,8 @@ import java.util.List;
  * @since 2020/11/26 15:41
  */
 @RestController
-@Api(tags = "文件管理管理接口")
+@Api(tags = "文件管理接口")
-@RequestMapping("/common/file")
+@RequestMapping("/common/common/file")
 public class FileController {
 
     @Autowired

common-api/src/main/java/cn/lili/controller/common/IMController.java

@@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.RestController;
  * 2021-09-16 15:32
  */
 @RestController
-@RequestMapping("/common/IM")
+@RequestMapping("/common/common/IM")
 @Api(tags = "IM 中心")
 public class IMController {
 

common-api/src/main/java/cn/lili/controller/common/IpInfoManagerController.java

@@ -1,7 +1,7 @@
 package cn.lili.controller.common;
 
-import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.utils.IpHelper;
+import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.ResultMessage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -20,7 +20,7 @@ import javax.servlet.http.HttpServletRequest;
  */
 @RestController
 @Api(tags = "获取IP信息以及天气")
-@RequestMapping("/common/ip")
+@RequestMapping("/common/common/ip")
 public class IpInfoManagerController {
     @Autowired
     private IpHelper ipHelper;
@@ -28,6 +28,7 @@ public class IpInfoManagerController {
     @RequestMapping(value = "/info", method = RequestMethod.GET)
     @ApiOperation(value = "IP及天气相关信息")
     public ResultMessage<Object> upload(HttpServletRequest request) {
+
         String result = ipHelper.getIpCity(request);
         return ResultUtil.data(result);
     }

common-api/src/main/java/cn/lili/controller/common/LogoController.java

@@ -19,8 +19,8 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2020/11/26 15:41
  */
 @RestController
-@Api(tags = "文件管理管理接口")
+@Api(tags = "文件管理接口")
-@RequestMapping("/common/logo")
+@RequestMapping("/common/common/logo")
 public class LogoController {
 
     @Autowired

common-api/src/main/java/cn/lili/controller/common/RegionController.java

@@ -22,7 +22,7 @@ import java.util.List;
  */
 @RestController
 @Api(tags = "地址信息接口")
-@RequestMapping("/common/region")
+@RequestMapping("/common/common/region")
 public class RegionController {
 
     @Autowired

common-api/src/main/java/cn/lili/controller/common/SliderImageController.java

@@ -1,7 +1,6 @@
 package cn.lili.controller.common;
 
 import cn.lili.cache.limit.annotation.LimitPoint;
-import cn.lili.common.aop.annotation.PreventDuplicateSubmissions;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.verification.entity.enums.VerificationEnums;
@@ -20,7 +19,7 @@ import org.springframework.web.bind.annotation.*;
  */
 @Slf4j
 @RestController
-@RequestMapping("/common/slider")
+@RequestMapping("/common/common/slider")
 @Api(tags = "滑块验证码接口")
 public class SliderImageController {
 

common-api/src/main/java/cn/lili/controller/common/SmsController.java

@@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.*;
  */
 @RestController
 @Api(tags = "短信验证码接口")
-@RequestMapping("/common/sms")
+@RequestMapping("/common/common/sms")
 public class SmsController {
 
     @Autowired

common-api/src/main/java/cn/lili/controller/common/UploadController.java

@@ -5,7 +5,6 @@ import cn.lili.cache.Cache;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.properties.SystemSettingProperties;
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.security.enums.UserEnums;
@@ -40,7 +39,7 @@ import java.util.Objects;
 @Slf4j
 @RestController
 @Api(tags = "文件上传接口")
-@RequestMapping("/common/upload")
+@RequestMapping("/common/common/upload")
 public class UploadController {
 
     @Autowired

common-api/src/main/resources/application.yml

@@ -22,26 +22,18 @@ management:
       exposure:
         include: '*'
 spring:
+  application:
+    name: common-api
   # 要在其中注册的Spring Boot Admin Server的URL。
   boot:
     admin:
       client:
         url: http://127.0.0.1:8000
-  # mongodb
-  data:
-    mongodb:
-      host: 192.168.2.126
-      port: 27017
-      database: rx-shop
-      username: goboo
-      password: Gb84505016
-      authentication-database: admin
-  #      replica-set-name: mongoreplset
   cache:
     type: redis
   # Redis
   redis:
-    host: 192.168.2.126
+    host: 192.168.2.122
     port: 6379
     password: Gb84505016
     lettuce:
@@ -116,7 +108,7 @@ spring:
     props:
       #是否打印逻辑SQL语句和实际SQL语句，建议调试时打印，在生产环境关闭
       sql:
-        show: true
+        show: false
 
 # 忽略鉴权url
 ignored:
@@ -127,24 +119,8 @@ ignored:
     - /MP_verify_qSyvBPhDsPdxvOhC.txt
     - /weixin/**
     - /source/**
-    - /buyer/mini-program/**
+    - /common/common/slider/**
-    - /buyer/cashier/**
+    - /common/common/sms/**
-    - /buyer/pageData/**
-    - /buyer/article/**
-    - /buyer/goods/**
-    - /buyer/category/**
-    - /buyer/shop/**
-    - /buyer/connect/**
-    - /buyer/members/smsLogin
-    - /buyer/members/refresh/*
-    - /buyer/members/refresh**
-    - /buyer/promotion/pintuan
-    - /buyer/promotion/seckill
-    - /buyer/memberEvaluation/**/goodsEvaluation
-    - /buyer/memberEvaluation/**/evaluationNumber
-    - /store/login/**
-    - /manager/user/login
-    - /manager/user/refresh/**
     - /druid/**
     - /swagger-ui.html
     - /doc.html
@@ -164,11 +140,11 @@ swagger:
   title: API接口文档
   description: Api Documentation
   version: 1.0.0
-  termsOfServiceUrl:
+  termsOfServiceUrl: https://pickmall.cn
   contact:
-    name: rx
+    name: lili
-    url:
+    url: https://pickmall.cn
-    email:
+    email: admin@pickmall.com
 
 # Mybatis-plus
 mybatis-plus:
@@ -181,19 +157,21 @@ mybatis-plus:
 
 # 日志
 logging:
+  config: classpath:logback-spring.xml
   # 输出级别
   level:
-    cn.lili: info
+    root: info
   #    org.hibernate: debug
   #    org.springframework: debug
-  #    org.springframework.data.mongodb.core: debug
   file:
     # 指定路径
     path: lili-logs
-    # 最大保存天数
+  logback:
-    max-history: 7
+    rollingpolicy:
-    # 每个文件最大大小
+      # 最大保存天数
-    max-size: 5MB
+      max-history: 7
+      # 每个文件最大大小
+      max-file-size: 5MB
 #加密参数
 jasypt:
   encryptor:
@@ -205,7 +183,7 @@ lili:
     #图形验证码有效时间 秒 包含滑块验证码有效时间， 以及验证通过之后，缓存中存储的验证结果有效时间
     effectiveTime: 300
     #水印
-    watermark:
+    watermark: LILI-SHOP
     #干扰项数量 最大2 默认0
     interfereNum: 0
     #允许误差像素
@@ -263,7 +241,7 @@ lili:
   data:
     elasticsearch:
       cluster-name: elasticsearch
-      cluster-nodes: 192.168.2.126:9200
+      cluster-nodes: 192.168.2.122:9200
       index:
         number-of-replicas: 0
         number-of-shards: 3
@@ -272,7 +250,8 @@ lili:
     #      account:
     #        username: elastic
     #        password: LiLiShopES
-
+    logstash:
+      server: 192.168.2.122:4560
     rocketmq:
       promotion-topic: lili_promotion_topic
       promotion-group: lili_promotion_group
@@ -291,7 +270,7 @@ lili:
       notice-send-topic: lili_send_notice_topic
       notice-send-group: lili_send_notice_group
 rocketmq:
-  name-server: 192.168.2.126:9876
+  name-server: 192.168.2.122:9876
   producer:
     group: lili_group
     send-message-timeout: 30000
@@ -299,7 +278,7 @@ rocketmq:
 xxl:
   job:
     admin:
-      addresses: http://192.168.2.126:9001/xxl-job-admin
+      addresses: http://192.168.2.122:9001/xxl-job-admin
     executor:
       appname: xxl-job-executor-lilishop
       address:

common-api/src/main/resources/logback-spring.xml

@@ -34,7 +34,6 @@
             <customFields>{"appName":"${APP_NAME}"}</customFields>
         </encoder>
     </appender>
-    <!--    <root level="INFO">-->
     <root>
         <appender-ref ref="CONSOLE"/>
         <appender-ref ref="FILE"/>