'合并'

2022-03-03 18:36:42 +08:00
parent 5b4113be4d 441cb6ddcb
commit 6bef12b91b
88 changed files with 64174 additions and 1090 deletions
--- a/common-api/src/main/java/cn/lili/controller/common/SliderImageController.java
+++ b/common-api/src/main/java/cn/lili/controller/common/SliderImageController.java
@@ -1,43 +1,43 @@
-package cn.lili.controller.common;
-
-import cn.lili.cache.limit.annotation.LimitPoint;
-import cn.lili.common.enums.ResultUtil;
-import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.verification.entity.enums.VerificationEnums;
-import cn.lili.modules.verification.service.VerificationService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * 滑块验证码接口
- *
- * @author Chopper
- * @since 2020/11/26 15:41
- */
-@Slf4j
-@RestController
-@RequestMapping("/common/common/slider")
-@Api(tags = "滑块验证码接口")
-public class SliderImageController {
-
-    @Autowired
-    private VerificationService verificationService;
-
-    @LimitPoint(name = "slider_image", key = "verification")
-    @GetMapping("/{verificationEnums}")
-    @ApiOperation(value = "获取校验接口,一分钟同一个ip请求10次")
-    public ResultMessage getSliderImage(@RequestHeader String uuid, @PathVariable VerificationEnums verificationEnums) {
-        return ResultUtil.data(verificationService.createVerification(verificationEnums, uuid));
-
-    }
-
-    @LimitPoint(name = "slider_image", key = "verification_pre_check", limit = 600)
-    @PostMapping("/{verificationEnums}")
-    @ApiOperation(value = "验证码预校验")
-    public ResultMessage verificationImage(Integer xPos, @RequestHeader String uuid, @PathVariable VerificationEnums verificationEnums) {
-        return ResultUtil.data(verificationService.preCheck(xPos, uuid, verificationEnums));
-    }
-}
+package cn.lili.controller.common;
+
+import cn.lili.cache.limit.annotation.LimitPoint;
+import cn.lili.common.enums.ResultUtil;
+import cn.lili.common.vo.ResultMessage;
+import cn.lili.modules.verification.entity.enums.VerificationEnums;
+import cn.lili.modules.verification.service.VerificationService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 滑块验证码接口
+ *
+ * @author Chopper
+ * @since 2020/11/26 15:41
+ */
+@Slf4j
+@RestController
+@RequestMapping("/common/common/slider")
+@Api(tags = "滑块验证码接口")
+public class SliderImageController {
+
+    @Autowired
+    private VerificationService verificationService;
+
+    @LimitPoint(name = "slider_image", key = "verification")
+    @GetMapping("/{verificationEnums}")
+    @ApiOperation(value = "获取校验接口,一分钟同一个ip请求10次")
+    public ResultMessage getSliderImage(@RequestHeader String uuid, @PathVariable VerificationEnums verificationEnums) {
+        return ResultUtil.data(verificationService.createVerification(verificationEnums, uuid));
+
+    }
+
+    @LimitPoint(name = "slider_image", key = "verification_pre_check", limit = 600)
+    @PostMapping("/{verificationEnums}")
+    @ApiOperation(value = "验证码预校验")
+    public ResultMessage verificationImage(Integer xPos, @RequestHeader String uuid, @PathVariable VerificationEnums verificationEnums) {
+        return ResultUtil.data(verificationService.preCheck(xPos, uuid, verificationEnums));
+    }
+}
--- a/common-api/src/main/java/cn/lili/controller/common/SmsController.java
+++ b/common-api/src/main/java/cn/lili/controller/common/SmsController.java
@@ -1,48 +1,48 @@
-package cn.lili.controller.common;
-
-import cn.lili.cache.limit.annotation.LimitPoint;
-import cn.lili.common.enums.ResultCode;
-import cn.lili.common.enums.ResultUtil;
-import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.sms.SmsUtil;
-import cn.lili.modules.verification.entity.enums.VerificationEnums;
-import cn.lili.modules.verification.service.VerificationService;
-import io.swagger.annotations.Api;
-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.web.bind.annotation.*;
-
-/**
- * 短信验证码接口
- *
- * @author Chopper
- * @since 2020/11/26 15:41
- */
-@RestController
-@Api(tags = "短信验证码接口")
-@RequestMapping("/common/common/sms")
-public class SmsController {
-
-    @Autowired
-    private SmsUtil smsUtil;
-    @Autowired
-    private VerificationService verificationService;
-
-    @LimitPoint(name = "sms_send", key = "sms")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "path", dataType = "String", name = "mobile", value = "手机号"),
-            @ApiImplicitParam(paramType = "header", dataType = "String", name = "uuid", value = "uuid"),
-    })
-    @GetMapping("/{verificationEnums}/{mobile}")
-    @ApiOperation(value = "发送短信验证码,一分钟同一个ip请求1次")
-    public ResultMessage getSmsCode(
-            @RequestHeader String uuid,
-            @PathVariable String mobile,
-            @PathVariable VerificationEnums verificationEnums) {
-        verificationService.check(uuid, verificationEnums);
-        smsUtil.sendSmsCode(mobile, verificationEnums, uuid);
-        return ResultUtil.success(ResultCode.VERIFICATION_SEND_SUCCESS);
-    }
-}
+package cn.lili.controller.common;
+
+import cn.lili.cache.limit.annotation.LimitPoint;
+import cn.lili.common.enums.ResultCode;
+import cn.lili.common.enums.ResultUtil;
+import cn.lili.common.vo.ResultMessage;
+import cn.lili.modules.sms.SmsUtil;
+import cn.lili.modules.verification.entity.enums.VerificationEnums;
+import cn.lili.modules.verification.service.VerificationService;
+import io.swagger.annotations.Api;
+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.web.bind.annotation.*;
+
+/**
+ * 短信验证码接口
+ *
+ * @author Chopper
+ * @since 2020/11/26 15:41
+ */
+@RestController
+@Api(tags = "短信验证码接口")
+@RequestMapping("/common/common/sms")
+public class SmsController {
+
+    @Autowired
+    private SmsUtil smsUtil;
+    @Autowired
+    private VerificationService verificationService;
+
+    @LimitPoint(name = "sms_send", key = "sms")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataType = "String", name = "mobile", value = "手机号"),
+            @ApiImplicitParam(paramType = "header", dataType = "String", name = "uuid", value = "uuid"),
+    })
+    @GetMapping("/{verificationEnums}/{mobile}")
+    @ApiOperation(value = "发送短信验证码,一分钟同一个ip请求1次")
+    public ResultMessage getSmsCode(
+            @RequestHeader String uuid,
+            @PathVariable String mobile,
+            @PathVariable VerificationEnums verificationEnums) {
+        verificationService.check(uuid, verificationEnums);
+        smsUtil.sendSmsCode(mobile, verificationEnums, uuid);
+        return ResultUtil.success(ResultCode.VERIFICATION_SEND_SUCCESS);
+    }
+}
--- a/common-api/src/main/java/cn/lili/controller/common/UploadController.java
+++ b/common-api/src/main/java/cn/lili/controller/common/UploadController.java
@@ -12,7 +12,7 @@ import cn.lili.common.utils.Base64DecodeMultipartFile;
 import cn.lili.common.utils.CommonUtil;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.file.entity.File;
-import cn.lili.modules.file.plugin.FileManagerPlugin;
+import cn.lili.modules.file.plugin.QiNiuManagerPlugin;
 import cn.lili.modules.file.service.FileService;
 import cn.lili.modules.system.entity.dos.Setting;
 import cn.lili.modules.system.entity.enums.SettingEnum;
@@ -47,7 +47,7 @@ public class UploadController {
    @Autowired
    private SettingService settingService;
    @Autowired
-    private FileManagerPlugin fileManagerPlugin;
+    private QiNiuManagerPlugin fileManagerPlugin;
    @Autowired
    private Cache cache;

--- a/common-api/src/main/resources/application.yml
+++ b/common-api/src/main/resources/application.yml
@@ -1,6 +1,5 @@
 server:
  port: 8890
-
  servlet:
    context-path: /

@@ -33,9 +32,9 @@ spring:
    type: redis
  # Redis
  redis:
-    host: 127.0.0.1
+    host: 120.71.145.134
    port: 6379
-    password: lilishop
+    password: ekLhvPGraSj8DGO0
    lettuce:
      pool:
        # 连接池最大连接数（使用负值表示没有限制） 默认 8
@@ -64,9 +63,9 @@ spring:
      default-datasource:
        type: com.alibaba.druid.pool.DruidDataSource
        driverClassName: com.mysql.cj.jdbc.Driver
-        url: jdbc:mysql://127.0.0.1:3306/lilishop?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
-        username: root
-        password: lilishop
+        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
@@ -137,8 +136,8 @@ ignored:

 # Swagger界面内容配置
 swagger:
-  title: lili API接口文档
-  description: lili Api Documentation
+  title: API接口文档
+  description: Api Documentation
  version: 1.0.0
  termsOfServiceUrl: https://pickmall.cn
  contact:
@@ -191,17 +190,17 @@ lili:
  #短信模版配置
  sms:
    #登录
-    LOGIN: SMS_205755300
+    LOGIN: SMS_185821482
    #注册
-    REGISTER: SMS_205755298
+    REGISTER: SMS_185821482
    #找回密码
-    FIND_USER: SMS_205755301
+    FIND_USER: SMS_185821482
    #设置密码
-    UPDATE_PASSWORD: SMS_205755297
+    UPDATE_PASSWORD: SMS_185821482
    #支付密码
-    WALLET_PASSWORD: SMS_205755301
+    WALLET_PASSWORD: SMS_185821482
  system:
-    isTestModel: true
+    isTestModel: false
  statistics:
    # 在线人数统计 X 小时。这里设置48，即统计过去48小时每小时在线人数
    onlineMember: 48
@@ -213,17 +212,16 @@ lili:
    sk: zhNKVrJK6UPOhqIjn8AQvG37b9sz6
  #域名
  domain:
-    pc: https://pc.b2b2c.pickmall.cn
-    wap: https://m.b2b2c.pickmall.cn
-    store: https://store.b2b2c.pickmall.cn
-    admin: https://admin.b2b2c.pickmall.cn
+    pc: https://zbuyer.sx1788.cn
+    wap: https://zshop.sx1788.cn
+    store: https://zseller.sx1788.cn
+    admin: https://zmanager.sx1788.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:
    # token过期时间（分钟）
@@ -241,7 +239,7 @@ lili:
  data:
    elasticsearch:
      cluster-name: elasticsearch
-      cluster-nodes: 127.0.0.1:9200
+      cluster-nodes: 106.124.130.167:9200
      index:
        number-of-replicas: 0
        number-of-shards: 3
@@ -251,7 +249,7 @@ lili:
    #        username: elastic
    #        password: LiLiShopES
    logstash:
-      server: 127.0.0.1:4560
+      server: 106.124.130.167:4560
    rocketmq:
      promotion-topic: lili_promotion_topic
      promotion-group: lili_promotion_group
@@ -270,7 +268,7 @@ lili:
      notice-send-topic: lili_send_notice_topic
      notice-send-group: lili_send_notice_group
 rocketmq:
-  name-server: 127.0.0.1:9876
+  name-server: 106.124.130.167:9876
  producer:
    group: lili_group
    send-message-timeout: 30000