更新,BUG修改

2022-03-02 15:17:06 +08:00
parent c62f31c387
commit a52b672e9b
78 changed files with 2499 additions and 178 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/passport/MemberBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/passport/MemberBuyerController.java
@@ -39,6 +39,16 @@ public class MemberBuyerController {
    private VerificationService verificationService;


+    @ApiOperation(value = "手机号登录")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mobile", value = "手机号", required = true, paramType = "query")
+    })
+    @PostMapping("/phoneLogin")
+    public ResultMessage<Object> phoneLogin(@NotNull(message = "手机号为空") @RequestParam String mobile) {
+        return ResultUtil.data(memberService.mobilePhoneLogin(mobile));
+    }
+
+
    @ApiOperation(value = "登录接口")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "username", value = "用户名", required = true, paramType = "query"),
--- a/buyer-api/src/main/resources/application.yml
+++ b/buyer-api/src/main/resources/application.yml
@@ -51,9 +51,9 @@ spring:

  # Redis
  redis:
-    host: 192.168.2.122
+    host: 120.71.145.134
    port: 6379
-    password: Gb84505016
+    password: ekLhvPGraSj8DGO0
    lettuce:
      pool:
        # 连接池最大连接数（使用负值表示没有限制） 默认 8
@@ -72,9 +72,9 @@ spring:
      default-datasource:
        type: com.alibaba.druid.pool.DruidDataSource
        driverClassName: com.mysql.cj.jdbc.Driver
-        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
+        url: jdbc:mysql://120.71.183.195:3306/zyt_shop?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC&allowPublicKeyRetrieval=true&verifyServerCertificate=false&useSSL=false
+        username: zyt_shop
+        password: Gb84505016@zytshop
        maxActive: 50
        initialSize: 10
        maxWait: 60000
@@ -135,6 +135,7 @@ ignored:
    - /buyer/passport/connect/**
    - /buyer/members/**
    - /buyer/passport/member/**
+    - /buyer/passport/member/refresh/**
    - /buyer/promotion/pintuan/**
    - /buyer/promotion/seckill/**
    - /buyer/promotion/pointsGoods/**
@@ -218,10 +219,10 @@ lili:
    admin: https://admin-b2b2c.pickmall.cn
  #api地址
  api:
-    buyer: https://buyer-api.pickmall.cn
-    common: https://common-api.pickmall.cn
-    manager: https://admin-api.pickmall.cn
-    store: https://store-api.pickmall.cn
+    buyer: https://zshop-api.sx1788.cn/buyer-api
+    common: https://zshop-api.sx1788.cn/common-api
+    manager: https://zshop-api.sx1788.cn/manager-api
+    store: https://zshop-api.sx1788.cn/seller-api

  # jwt 细节设定
  jwt-setting:
@@ -240,7 +241,7 @@ lili:
  data:
    elasticsearch:
      cluster-name: elasticsearch
-      cluster-nodes: 192.168.2.122:9200
+      cluster-nodes: 106.124.130.167:9200
      index:
        number-of-replicas: 0
        number-of-shards: 3
@@ -250,7 +251,7 @@ lili:
    #        username: elastic
    #        password: LiLiShopES
    logstash:
-      server: 192.168.2.122:4560
+      server: 106.124.130.167:4560
    rocketmq:
      promotion-topic: lili_promotion_topic
      promotion-group: lili_promotion_group
@@ -271,7 +272,7 @@ lili:
      after-sale-topic: lili_after_sale_topic
      after-sale-group: lili_after_sale_group
 rocketmq:
-  name-server: 192.168.2.122:9876
+  name-server: 106.124.130.167:9876
  producer:
    group: lili_group
    send-message-timeout: 30000
@@ -279,7 +280,7 @@ rocketmq:
 xxl:
  job:
    admin:
-      addresses: http://192.168.2.122:9001/xxl-job-admin
+      addresses: http://127.0.0.1:9001/xxl-job-admin
    executor:
      appname: xxl-job-executor-lilishop
      address:
--- 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/test/resources/application.yml
+++ b/buyer-api/src/test/resources/application.yml
@@ -28,7 +28,7 @@ spring:
  # mongodb
  data:
    mongodb:
-      host: 192.168.2.122
+      host: 106.124.130.167
      port: 27017
      database: rx-shop
      username: goboo
@@ -39,12 +39,12 @@ spring:
    type: redis
  #amqp
  #  rabbitmq:
-  #    host: 192.168.2.122
+  #    host: 106.124.130.167
  # Redis
  redis:
-    host: 192.168.2.122
+    host: 120.71.145.134
    port: 6379
-    password: Gb84505016
+    password: ekLhvPGraSj8DGO0
    lettuce:
      pool:
        # 连接池最大连接数（使用负值表示没有限制） 默认 8
@@ -73,9 +73,9 @@ spring:
      default-datasource:
        type: com.alibaba.druid.pool.DruidDataSource
        driverClassName: com.mysql.cj.jdbc.Driver
-        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
+        url: jdbc:mysql://120.71.183.195:3306/zyt_shop?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC&allowPublicKeyRetrieval=true&verifyServerCertificate=false&useSSL=false
+        username: zyt_shop
+        password: Gb84505016@zytshop
        maxActive: 20
        initialSize: 5
        maxWait: 60000
@@ -213,16 +213,16 @@ lili:
    sk: zhNKVrJK6UPOhqIjn8AQvG37b9sz6
  #域名
  domain:
-    pc: http://192.168.2.122:8885
-    wap: http://192.168.2.122:8885
-    seller: http://192.168.2.122:8885
-    admin: http://192.168.2.122:8885
+    pc: http://106.124.130.167:8885
+    wap: http://106.124.130.167:8885
+    seller: http://106.124.130.167:8885
+    admin: http://106.124.130.167:8885
  #api地址
  api:
    buyer: https://z171l91606.51mypc.cn
-    base: http://192.168.2.122:8885
-    manager: http://192.168.2.122:8885
-    seller: http://192.168.2.122:8885
+    base: http://106.124.130.167:8885
+    manager: http://106.124.130.167:8885
+    seller: http://106.124.130.167:8885

  # jwt 细节设定
  jwt-setting:
@@ -241,7 +241,7 @@ lili:
  data:
    elasticsearch:
      cluster-name: elasticsearch
-      cluster-nodes: 192.168.2.122:9200
+      cluster-nodes: 106.124.130.167: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.122:9876
+  name-server: 106.124.130.167:9876
  producer:
    group: lili_group
    send-message-timeout: 30000
@@ -277,7 +277,7 @@ rocketmq:
 xxl:
  job:
    admin:
-      addresses: http://192.168.2.122:9001/xxl-job-admin
+      addresses: http://127.0.0.1:9001/xxl-job-admin
    executor:
      appname: xxl-job-executor-lilishop
      address: