加入knife4j文档

pom.xml

@@ -19,7 +19,7 @@
         <druid.version>1.2.19</druid.version>
         <bitwalker.version>1.19</bitwalker.version>
         <kaptcha.version>2.3.2</kaptcha.version>
-        <swagger.version>2.9.2</swagger.version>
+        <swagger.version>3.0.0</swagger.version>
         <pagehelper.boot.version>1.3.1</pagehelper.boot.version>
         <fastjson.version>2.0.10</fastjson.version>
         <oshi.version>5.2.5</oshi.version>

poyee-order/src/main/java/com/tzy/controller/LotOrderController.java

@@ -1,21 +1,28 @@
 package com.tzy.controller;
 
+import com.tzy.common.config.handle.ApiVersion;
 import com.tzy.common.dto.OutDTO;
 import com.tzy.entity.LotOrder;
 import com.tzy.service.LotOrderService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
 @RestController
-@RequestMapping("/lot/order")
+@Api(tags = "拍品订单")
+@RequestMapping("/api/{version}/lot/order/")
 public class LotOrderController {
     @Autowired
     private LotOrderService lotOrderService;
 
     @PostMapping("create")
     @ResponseBody
+    @ApiOperation("创建拍品订单")
+    @ApiVersion(1.0)
     public OutDTO createLotOrder(@RequestBody LotOrder lotOrder) {
         int inserted = lotOrderService.createLotOrder(lotOrder);
         if (inserted > 0) {
@@ -28,6 +35,8 @@ public class LotOrderController {
     //app拍品订单列表查询
     @PostMapping("/list")
     @ResponseBody
+    @ApiOperation("拍品订单列表查询")
+    @ApiVersion(1.0)
     public OutDTO queryLotList(@RequestBody LotOrder lotOrder) {
         List<LotOrder> lotOrders = lotOrderService.getLotOrders(lotOrder);
         return OutDTO.ok().put("lotOrders", lotOrders);
@@ -36,13 +45,18 @@ public class LotOrderController {
     //app订单详情查询
     @PostMapping("/query")
     @ResponseBody
+    @ApiOperation("拍品订单详情查询")
+    @ApiVersion(1.0)
     public OutDTO queryLotOrderById(@RequestBody LotOrder lotOrder) {
         lotOrder = lotOrderService.getLotOrderById(lotOrder.getId());
         return OutDTO.ok().put("lotOrder", lotOrder);
     }
 
     //修改订单收货地址
+    @ResponseBody
     @PostMapping("/editOrderAddress")
+    @ApiOperation("修改订单收货地址")
+    @ApiVersion(1.0)
     public OutDTO editOrderShippingAddress(@RequestBody LotOrder lotOrder) {
         int i = lotOrderService.updateLotOrderAddress(lotOrder);
         if (i > 0) {

poyee-order/src/main/resources/mapper/LotOrderMapper.xml

@@ -3,7 +3,7 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "https://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.tzy.mapper.LotOrderMapper">
-    <resultMap id="lotOrderResultMap" type="lotOrder">
+    <resultMap id="lotOrderResultMap" type="com.tzy.entity.LotOrder">
         <id column="id" property="id"/>
         <result column="order_no" property="orderNo"/>
         <result column="auction_name" property="auctionName"/>
@@ -19,7 +19,7 @@
         <result column="create_time" property="createTime"/>
         <result column="pay_time" property="payTime"/>
     </resultMap>
-    <select id="selectLotOrder" resultMap="lotOrderResultMap" parameterType="lotOrder">
+    <select id="selectLotOrder" resultMap="lotOrderResultMap" parameterType="com.tzy.entity.LotOrder">
         select id,order_no,auction_name,lot_name,user_id,status,payment_amount,merchant_id,shipping_address_id,express_id,lot_id,auction_id,create_time,pay_time from lot_order_info
         <where>
 
@@ -35,18 +35,18 @@
         </where>
         order by create_time desc
     </select>
-    <select id="selectLotOrderById" resultType="lotOrder">
+    <select id="selectLotOrderById" resultType="com.tzy.entity.LotOrder">
         select id,order_no,auction_name,lot_name,user_id,status,payment_amount,merchant_id,shipping_address_id,express_id,lot_id,auction_id,create_time,pay_time from lot_order_info
         where id=#{id}
     </select>
-    <select id="countLotOrderByLotId" parameterType="lotOrder" resultType="int">
+    <select id="countLotOrderByLotId" parameterType="com.tzy.entity.LotOrder" resultType="int">
         select count(*) from lot_order_info where lot_id=#{lotId}
     </select>
     <insert id="insertLotOrder">
         insert into lot_order_info (order_no,auction_name,lot_name,user_id,status,payment_amount,merchant_id,shipping_address_id,express_id,lot_id,auction_id,create_time,pay_time)
         values (#{orderNo},#{auctionName},#{lotName},#{userId},#{status},#{paymentAmount},#{merchantId},#{shippingAddressId},#{expressId},#{lotId},#{auctionId},#{createTime},#{payTime})
     </insert>
-    <update id="updateLotOrderAddress" parameterType="lotOrder">
+    <update id="updateLotOrderAddress" parameterType="com.tzy.entity.LotOrder">
         update lot_order_info set shipping_address_id=#{shippingAddressId},shipping_address=#{shippingAddress},shipping_address_likename=#{shippingAddressLinkname},shipping_address_phone=#{shippingAddressPhone}
         where id=#{id}
     </update>

poyee-order/target/classes/mapper/LotOrderMapper.xml

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "https://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.tzy.mapper.LotOrderMapper">
-    <resultMap id="lotOrderResultMap" type="lotOrder">
-        <id column="id" property="id"/>
-        <result column="order_no" property="orderNo"/>
-        <result column="auction_name" property="auctionName"/>
-        <result column="lot_name" property="lotName"/>
-        <result column="user_id" property="lotId"/>
-        <result column="status" property="status"/>
-        <result column="payment_amount" property="paymentAmount"/>
-        <result  column="merchant_id" property="merchantId"/>
-        <result column="shipping_address_id" property="shippingAddressId"/>
-        <result column="express_id" property="expressId"/>
-        <result column="lot_id" property="lotId"/>
-        <result column="auction_id" property="auctionId"/>
-        <result column="create_time" property="createTime"/>
-        <result column="pay_time" property="payTime"/>
-    </resultMap>
-    <select id="selectLotOrder" resultMap="lotOrderResultMap" parameterType="lotOrder">
-        select id,order_no,auction_name,lot_name,user_id,status,payment_amount,merchant_id,shipping_address_id,express_id,lot_id,auction_id,create_time,pay_time from lot_order_info
-        <where>
-            <if test="id!=null">
-                and id=#{id}
-            </if>
-            <if test="orderNo!=null and orderNo!=''">
-                and order_no=#{orderNo}
-            </if>
-            <if test="status!=null">
-                and status=#{status}
-            </if>
-            <if test="userId!=null">
-                and user_id=#{userId}
-            </if>
-        </where>
-        order by create_time desc
-    </select>
-    <insert id="insertLotOrder">
-        insert into lot_order_info (order_no,auction_name,lot_name,user_id,status,payment_amount,merchant_id,shipping_address_id,express_id,lot_id,auction_id,create_time,pay_time)
-        values (#{orderNo},#{auctionName},#{lotName},#{userId},#{status},#{paymentAmount},#{merchantId},#{shippingAddressId},#{expressId},#{lotId},#{auctionId},#{createTime},#{payTime})
-    </insert>
-</mapper>

poyi-app-common/pom.xml

@@ -43,21 +43,21 @@
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger2</artifactId>
         </dependency>
-        <!--防止进入swagger页面报类型转换错误，排除2.9.2中的引用，手动增加1.5.21版本-->
         <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-annotations</artifactId>
-            <version>1.5.21</version>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-boot-starter</artifactId>
+            <version>3.0.0</version>
         </dependency>
         <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-models</artifactId>
-            <version>1.5.21</version>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>knife4j-spring-boot-starter</artifactId>
+            <version>3.0.3</version>
         </dependency>
-        <!-- swagger2-UI-->
+        <!-- 防止进入swagger页面报类型转换错误，排除3.0.0中的引用，手动增加1.6.2版本 -->
         <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-models</artifactId>
+            <version>1.6.2</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>

poyi-app/pom.xml

@@ -17,6 +17,11 @@
             <artifactId>poyi-service</artifactId>
             <version>${tzy.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.tzy</groupId>
+            <artifactId>poyee-order</artifactId>
+            <version>${tzy.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.codehaus.janino</groupId>
             <artifactId>janino</artifactId>

poyi-app/src/main/resources/application-druid.yml

@@ -0,0 +1,59 @@
+# 数据源配置
+spring:
+    datasource:
+        type: com.alibaba.druid.pool.DruidDataSource
+        driverClassName: org.postgresql.Driver
+        druid:
+            # 主库数据源
+            master:
+              username: postgres
+              password: 123456
+              url: jdbc:postgresql://192.168.50.8:5432/ahx_app
+            # 初始连接数
+            initialSize: 5
+            # 最小连接池数量
+            minIdle: 10
+            # 最大连接池数量
+            maxActive: 20
+            # 配置获取连接等待超时的时间
+            maxWait: 60000
+            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+            timeBetweenEvictionRunsMillis: 60000
+            # 配置一个连接在池中最小生存的时间，单位是毫秒
+            minEvictableIdleTimeMillis: 300000
+            # 配置一个连接在池中最大生存的时间，单位是毫秒
+            maxEvictableIdleTimeMillis: 900000
+            # 配置检测连接是否有效
+            validationQuery: SELECT 1
+            # 检测连接超时时间(ms)
+            validationQueryTimeout: 200
+            testWhileIdle: true
+            testOnBorrow: false
+            testOnReturn: false
+            removeAbandoned: false
+            logAbandoned: false
+            webStatFilter:
+                enabled: false
+            statViewServlet:
+                enabled: true
+                # 设置白名单，不填则允许所有访问
+                allow:
+                url-pattern: /druid/*
+                # 控制台管理用户名和密码
+                login-username:
+                login-password:
+            filter:
+                stat:
+                    enabled: true
+                    # 慢SQL记录
+                    log-slow-sql: true
+                    slow-sql-millis: 1000
+                    merge-sql: true
+                wall:
+                    config:
+                        multi-statement-allow: true
+knife4j:
+  enable: true
+  setting:
+    language: zh-CN
+  production: false #是否生产环境

poyi-app/src/main/resources/application-prod.yml

@@ -0,0 +1,209 @@
+# 项目相关配置
+tzy:
+  # 名称
+  name: TzyTms
+  # 版本
+  version: 4.5.0
+  # 版权年份
+  copyrightYear: 2019
+  # 实例演示开关
+  demoEnabled: true
+  # 文件路径 示例（ Windows配置D:/tzy/uploadPath，Linux配置 /home/tzy/uploadPath）
+  profile: /tmp
+#  profile: F:/tomcat/card/uploadPath
+  # 获取ip地址开关
+  addressEnabled: false
+  #版本
+  app-version: prod
+
+#Forest
+forest:
+  #bean-id: config0 # 在spring上下文中bean的id（默认为 forestConfiguration）
+  #backend: okhttp3 # 后端HTTP框架（默认为 okhttp3）
+  #max-connections: 1000 # 连接池最大连接数（默认为 500）
+  #max-route-connections: 500 # 每个路由的最大连接数（默认为 500）你这
+  timeout: 30000 # 请求超时时间，单位为毫秒（默认为 3000）
+  connect-timeout: 30000 # 连接超时时间，单位为毫秒（默认为 timeout）
+  read-timeout: 300000 # 数据读取超时时间，单位为毫秒（默认为 timeout）
+  #max-retry-count: 0 # 请求失败后重试次数（默认为 0 次不重试）
+  #ssl-protocol: SSLv3 # 单向验证的HTTPS的默认SSL协议（默认为 SSLv3）
+  #logEnabled: true # 打开或关闭日志（默认为 true）
+  #log-request: true # 打开/关闭Forest请求日志（默认为 true）
+  #log-response-status: true # 打开/关闭Forest响应状态日志（默认为 true）
+  #log-response-content: true # 打开/关闭Forest响应内容日志（默认为 false）
+
+# 开发环境配置
+server:
+  # 服务器的HTTP端口，默认为80
+  port: 80
+  tomcat:
+    # tomcat的URI编码
+    uri-encoding: UTF-8
+    # tomcat最大线程数，默认为200
+    max-threads: 800
+    # Tomcat启动初始化的线程数，默认值25
+    min-spare-threads: 30
+    #超时时间
+    connection-timeout: 600000
+    basedir: /tmp/logs
+    accesslog:
+      enabled: true
+      buffered: true
+      prefix: access_log
+      file-date-format: .yyyy-MM-dd
+
+
+# 日志配置
+logging:
+  console.enabled: ${CONSOLE_ENABLED:true}
+  file.enabled: ${FILE_ENABLED:false}
+  level:
+    com.tzy: info
+    org.springframework: warn
+  fluentd:
+    enabled: ${FLUENTD_ENABLED:false}
+    host: ${FLUENTD_HOST:127.0.0.1}
+    port: ${FLUENTD_PORT:24225}
+
+# 用户配置
+user:
+  password:
+    # 密码错误{maxRetryCount}次锁定10分钟
+    maxRetryCount: 5
+
+# Spring配置
+spring:
+  jackson:
+    time-zone: GMT+8
+    date-format: yyyy-MM-dd HH:mm:ss
+  profiles:
+    active: druid
+  # 文件上传
+  servlet:
+     multipart:
+       # 单个文件大小
+       max-file-size:  50MB
+       # 设置总上传的文件大小
+       max-request-size:  50MB
+  # 服务模块
+  devtools:
+    restart:
+      # 热部署开关
+      enabled: true
+  redis:
+      database: 1
+      host: ${REDIS_HOST:172.29.19.234}
+      #host: hobbystock.cn
+      port: ${REDIS_PORT:6379}
+      password: #Pass2021    # 密码（默认为空）
+      timeout: 60000  # 连接超时时长（毫秒）
+      pool:
+        max-active: 1000  # 连接池最大连接数（使用负值表示没有限制）
+        max-wait: -1ms    # 连接池最大阻塞等待时间（使用负值表示没有限制）
+        max-idle: 10      # 连接池中的最大空闲连接
+        min-idle: 5       # 连接池中的最小空闲连接
+# MyBatis
+mybatis:
+    # 搜索指定包别名
+    typeAliasesPackage: com.tzy.**.domain
+    # 配置mapper的扫描，找到所有的mapper.xml映射文件
+    mapperLocations: classpath*:mapper/**/*Mapper.xml
+    # 加载全局的配置文件
+    configLocation: classpath:mybatis/mybatis-config.xml
+
+# PageHelper分页插件
+pagehelper:
+  helperDialect: postgresql
+  reasonable: true
+  supportMethodsArguments: true
+  params: count=countSql
+
+# Swagger配置
+swagger:
+  # 是否开启swagger
+  enabled: false
+
+pay:
+  #微信支付
+  wxpay:
+    app:
+      appID: wx8ee47a255776f241
+      appletID: wx8ee47a255776f241
+      thirdAndriID: wx22a7349c29e688d4
+      mchID: 1620428472 #1618054254 #1612475613
+      key: 49F1947DC77ABDDEA204544FC2DB4246F2EB7A0C #cA0aI2eN0bB0eD2fC6tB4kB3aF4fD188 #123456789123456789123456789abcdd
+      #微信商户平台下载的安全证书存放路径
+      certPath: /app/configs/apiclient_cert.p12
+      #微信支付成功的回调地址
+      payNotifyUrl: https://m2.hobbystocks.cn/api/wx/paymentBack
+      #微信退款结果回调地址
+      refundNotifyUrl: https://m2.hobbystocks.cn/api/wx/refundBack
+  alipay:
+    app:
+      appId: 2021002181669560
+      privateKey:
+      alipayPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgCIKpTwnnPm2D1IsMlTvuCq3WBAZKm8IaUqR/IxqQAzwEVuW0+lf6Ririm4PLNcU5eZXK7w+oHqi23b7rL5htqz1K0/q/oBHEeAliCNX+zMr+6sTBN33i5yX/buvVmBPGJJg791lFdnnnELGqZf+nQrJBlOAW/aCVTga7hcf8CH/ZRDboExzf9zK5N6qcxKexsgXZRZso+d47DcAj3sF1lAcYQvTAOG+aJRcwBFFOrb3QYZI1WLOZdjq3kdhXUuVrR8HhQ68BRIvfJGX7Hwy4Ffmb9hD/ljkT1S6+jzslMp3cMbU4IlJPF0o9xxCz4KWiW0pWhwQTolNVqW3GyHG2wIDAQAB
+      privateKeyPath: /app/configs/privatekey.txt
+      #支付宝支付成功的回调地址
+      payNotifyUrl: https://m2.hobbystocks.cn/api/ali/paymentBack
+      refundNotifyUrl: https://m2.hobbystocks.cn/api/ali/refundBack
+  hm:
+    app:
+      hmPublicKey: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCkByRMw/sL8tg38lrGi4JFXFR/jrphyyj3LYHYYnTQj3dl+w4JUysgE7cE7FxEfxMkuM3efv6HeMP0vIsYBrS7EXvVB9vm/HH7QcpvqCfUOLhe4ugaDqfKz9/2BQinieiSRy8gRnm5eadEZn42EtxnZ+s6PBPKeijrxz+JyvCR8QIDAQAB
+      publicKey: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCJBww/AEqKfofkDGP+EkIKC5r4oHw93O6qFJ5QCnGgNMd5MC3q4Pyk6ImOjSj/OdRqTefRdWZUzcjlEPxMBLARa1wqKcdw4f2Wyxr+eT+VcJSQu5F8zWYjtNO+9BVwpKqJ4CXYPyZqY8fAx0urrd9opRkV0xpK3f/mlkgbgF+XvQIDAQAB
+      privateKeyPath: /app/configs/hmPrivatekey.txt
+      wxMchID: 480528577
+      app_id: 663101000155258
+      format: JSON
+      version: 1.0
+      storeId: 100001
+      #支付宝支付成功的回调地址
+      host:
+      payNotifyUrl: https://m2.hobbystocks.cn/api/hm/paymentBack
+      refundNotifyUrl: https://m2.hobbystocks.cn/api/hm/refundBack
+      returnUrl: https://m2.hobbystocks.cn/api/hm/refundBack
+      ghStaticUrl: https://hobby-6g7xp6r63e7767bb-1309590715.tcloudbaseapp.com/jump_mp.html
+
+# 防止XSS攻击
+xss:
+  # 过滤开关
+  enabled: true
+  # 排除链接（多个用逗号分隔）
+  excludes: /system/notice/*
+  # 匹配链接
+  urlPatterns: /system/*,/monitor/*,/tool/*,/base/*,/api/*
+
+wx:
+  default_avatar: https://static.public.hobbystock.cn/applet/share/share_logo2.png
+  applet:
+    lives:
+    # 直播认证二维码
+      authUrl: https://res.wx.qq.com/op_res/9rSix1dhHfK4rR049JL0PHJ7TpOvkuZ3mE0z7Ou_Etvjf-w1J_jVX0rZqeStLfwh
+#手机验证码
+phone:
+    verification_code_uri: https://coresvc-dev/api/verification/code/
+    verification_code_uri_hk: http://coresvc-dev/api/verification/code/hk/
+authenticate:
+    url: http://coresvc-dev/api/auth/
+#服务前缀路径
+coreService:
+  baseurl: http://coresvc
+  smsUrl: /api/reminder/live/on
+  appSmsUrl: /api/appmsg/live/on
+#物流
+express:
+  sf:
+    client_code: LSSWCkEipb #顾客编码
+    check_word: 98vtuFMv6FQabirYZ3LD0OhI1fspjc4Z #校验码
+    box_url: https://sfapi-sbox.sf-express.com/std/service #沙箱环境的地址
+    url: https://sfapi.sf-express.com/std/service #生产环境的地址
+  jd:
+    appkey: 76f41d301d75499f9a85f9603f535a26
+    appsecret: 44d5f413cebb406b867b4f5b3477b0af
+    redirect_uri: https://m-dev.hobbystocks.cn/api/home/jdAuth
+
+knife4j:
+  enable: true
+  setting:
+    language: zh-CN
+  production: true #是否生产环境