Просмотр исходного кода

Merge tag 'refs/tags/jenkins-back-end-3300' into SiChuan

release
release_toaliyun_real
Stormeye Wu 6 лет назад
Родитель
Сommit
5052b388ae
23 измененных файлов: 92 добавлений и 69 удалений
  1. +2
    -2
      mallinkAdmin/pom.xml
  2. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java
  3. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/interceptor/RequestInterceptor.java
  4. +10
    -8
      mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java
  5. +1
    -2
      mallinkBApi/src/main/java/com/iformall/interceptor/RequestInterceptor.java
  6. +1
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java
  7. +1
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxMallController.java
  8. +1
    -1
      mallinkCApi/src/main/java/com/iformall/interceptor/RequestInterceptor.java
  9. +2
    -2
      mallinkCallback/pom.xml
  10. +1
    -1
      mallinkCallback/src/main/java/com/iformall/interceptor/RequestInterceptor.java
  11. +1
    -1
      mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java
  12. +8
    -0
      mallinkService/src/main/java/com/iformall/common/ErrorCode.java
  13. +2
    -1
      mallinkService/src/main/java/com/iformall/enums/EnumNeuPosPamentType.java
  14. +1
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java
  15. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java
  16. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
  17. +1
    -1
      mallinkService/src/main/java/com/iformall/service/wechat/FmOpenInRedisDBConfigStorage.java
  18. +10
    -0
      mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml
  19. +2
    -2
      mallinkSysAdmin/pom.xml
  20. +1
    -1
      mallinkSysAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java
  21. +1
    -1
      mallinkSysAdmin/src/main/java/com/iformall/interceptor/RequestInterceptor.java
  22. +4
    -4
      mybatis-multi-tenancy/pom.xml
  23. +37
    -38
      pom.xml

+ 2
- 2
mallinkAdmin/pom.xml Просмотреть файл

@@ -13,8 +13,8 @@
<artifactId>mallinkAdmin</artifactId> <artifactId>mallinkAdmin</artifactId>


<properties> <properties>
<weixin-java-mp.version>3.6.0</weixin-java-mp.version>
<weixin-java-open.version>3.6.0</weixin-java-open.version>
<weixin-java-mp.version>3.7.0</weixin-java-mp.version>
<weixin-java-open.version>3.7.0</weixin-java-open.version>
</properties> </properties>


<dependencies> <dependencies>


+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java Просмотреть файл

@@ -42,7 +42,7 @@ import org.springframework.data.redis.serializer.RedisSerializer;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import redis.clients.jedis.Protocol; import redis.clients.jedis.Protocol;
import redis.clients.util.SafeEncoder;
import redis.clients.jedis.util.SafeEncoder;


import javax.servlet.http.Cookie; import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;


+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/interceptor/RequestInterceptor.java Просмотреть файл

@@ -16,7 +16,7 @@ import org.springframework.stereotype.Component;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
import redis.clients.jedis.Protocol; import redis.clients.jedis.Protocol;
import redis.clients.util.SafeEncoder;
import redis.clients.jedis.util.SafeEncoder;


import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;


+ 10
- 8
mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java Просмотреть файл

@@ -373,13 +373,18 @@ public class WxMicroPayController extends BaseController {
logger.error("payPrice不能为空"); logger.error("payPrice不能为空");
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "payPrice不能为空"); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "payPrice不能为空");
} }
if (StringUtils.isNotBlank(authCode)) {
// 如果传了收款码,先检查收款码格式是否正确
if (!checkAuthCode(authCode)) {
logger.error("微信收款码/authCode不符合规则: {}", authCode);
return new ResultData(ErrorCode.MICRO_PAY_ERR_AUTHCODE.getCode(), "请扫描微信收款码");
}
}


BigDecimal totalFee = new BigDecimal(payPriceStr); BigDecimal totalFee = new BigDecimal(payPriceStr);
totalFee.setScale(2, BigDecimal.ROUND_HALF_UP); // 第一个变量是小数位数,第二个变量是取舍方法(四舍五入) totalFee.setScale(2, BigDecimal.ROUND_HALF_UP); // 第一个变量是小数位数,第二个变量是取舍方法(四舍五入)
Integer payPrice = totalFee.multiply(new BigDecimal(100)).intValue(); Integer payPrice = totalFee.multiply(new BigDecimal(100)).intValue();




String ipStr = IPUtil.getIpAddr(request); String ipStr = IPUtil.getIpAddr(request);


WxMerchantBUser wxMerchantBUser = wxMerchantBUserService.getById(user.getId()); WxMerchantBUser wxMerchantBUser = wxMerchantBUserService.getById(user.getId());
@@ -415,6 +420,7 @@ public class WxMicroPayController extends BaseController {
} }
wxCouponOrder = wxCouponOrderService.getById(couponOrderId); wxCouponOrder = wxCouponOrderService.getById(couponOrderId);
} }

WxPayOrder couponPayOrder = null; WxPayOrder couponPayOrder = null;
Integer remainPrice = payPrice; Integer remainPrice = payPrice;
if (wxCouponOrder != null) { if (wxCouponOrder != null) {
@@ -437,12 +443,8 @@ public class WxMicroPayController extends BaseController {


if (remainPrice > 0) { if (remainPrice > 0) {
if (StringUtils.isBlank(authCode)) { if (StringUtils.isBlank(authCode)) {
logger.error("authCode不能为空");
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "authCode不能为空");
}
if (!checkAuthCode(authCode)) {
logger.error("authCode不符合规则");
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "authCode不符合规则");
logger.error("微信收款码/authCode不能为空");
return new ResultData(ErrorCode.MICRO_PAY_NO_AUTHCODE.getCode(), "请提供微信收款码");
} }


WxPayOrder record = new WxPayOrder(); WxPayOrder record = new WxPayOrder();


+ 1
- 2
mallinkBApi/src/main/java/com/iformall/interceptor/RequestInterceptor.java Просмотреть файл

@@ -15,7 +15,7 @@ import org.springframework.stereotype.Component;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
import redis.clients.jedis.Protocol; import redis.clients.jedis.Protocol;
import redis.clients.util.SafeEncoder;
import redis.clients.jedis.util.SafeEncoder;


import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@@ -24,7 +24,6 @@ import java.io.ByteArrayOutputStream;
import java.io.InputStream; import java.io.InputStream;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.concurrent.TimeUnit;


/** /**
* 幂等检查 * 幂等检查


+ 1
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java Просмотреть файл

@@ -49,6 +49,7 @@ public class WxCampaignController extends BaseController {
wxCampaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); wxCampaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode());
wxCampaign.updateTenantInfo(getTenantInfo()); wxCampaign.updateTenantInfo(getTenantInfo());
wxCampaign.setSortColumns(BaseEntity.SortField.SortNum_ASC, BaseEntity.SortField.CreateTime_ASC); wxCampaign.setSortColumns(BaseEntity.SortField.SortNum_ASC, BaseEntity.SortField.CreateTime_ASC);
// TODO 缓存优化
final PageInfo<WxCampaign> page = wxCampaignService.clistAsPage(wxCampaign, pageNum, pageSize); final PageInfo<WxCampaign> page = wxCampaignService.clistAsPage(wxCampaign, pageNum, pageSize);
return new ResultData(page); return new ResultData(page);
} }


+ 1
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxMallController.java Просмотреть файл

@@ -85,6 +85,7 @@ public class WxMallController extends BaseController {
@ApiOperation("商场信息") @ApiOperation("商场信息")
@GetMapping("/mallInfo") @GetMapping("/mallInfo")
public ResultData getMallInfo() { public ResultData getMallInfo() {
//TODO 缓存优化
WxMall mall = wxMallService.getByTenantId(getTenantId()); WxMall mall = wxMallService.getByTenantId(getTenantId());
if (mall == null) { if (mall == null) {
return new ResultData(ErrorCode.MALL_INFO_NOT_FOUND); return new ResultData(ErrorCode.MALL_INFO_NOT_FOUND);


+ 1
- 1
mallinkCApi/src/main/java/com/iformall/interceptor/RequestInterceptor.java Просмотреть файл

@@ -16,7 +16,7 @@ import org.springframework.stereotype.Component;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
import redis.clients.jedis.Protocol; import redis.clients.jedis.Protocol;
import redis.clients.util.SafeEncoder;
import redis.clients.jedis.util.SafeEncoder;


import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;


+ 2
- 2
mallinkCallback/pom.xml Просмотреть файл

@@ -13,8 +13,8 @@
<artifactId>mallinkCallback</artifactId> <artifactId>mallinkCallback</artifactId>


<properties> <properties>
<weixin-java-mp.version>3.6.0</weixin-java-mp.version>
<weixin-java-open.version>3.6.0</weixin-java-open.version>
<weixin-java-mp.version>3.7.0</weixin-java-mp.version>
<weixin-java-open.version>3.7.0</weixin-java-open.version>
</properties> </properties>


<dependencies> <dependencies>


+ 1
- 1
mallinkCallback/src/main/java/com/iformall/interceptor/RequestInterceptor.java Просмотреть файл

@@ -16,7 +16,7 @@ import org.springframework.stereotype.Component;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
import redis.clients.jedis.Protocol; import redis.clients.jedis.Protocol;
import redis.clients.util.SafeEncoder;
import redis.clients.jedis.util.SafeEncoder;


import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;


+ 1
- 1
mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java Просмотреть файл

@@ -2196,7 +2196,7 @@ public class PosServiceImpl implements PosService {
cardSpendService.cardSpendForPosPay(scoreCreditCalc, cardSpend, merchant, buUser); cardSpendService.cardSpendForPosPay(scoreCreditCalc, cardSpend, merchant, buUser);
} else { } else {
logger.error("卡支付ID未发现: " + cardSpendId); logger.error("卡支付ID未发现: " + cardSpendId);
throw new MallinkException(ErrorCode.SYS_PARAMETER_CAST_ERROR);
throw new MallinkException(ErrorCode.POS_CARD_ORDER_NOT_FOUND);
} }
return payOrder; return payOrder;
} }


+ 8
- 0
mallinkService/src/main/java/com/iformall/common/ErrorCode.java Просмотреть файл

@@ -269,8 +269,16 @@ public enum ErrorCode{
POS_CARD_OWNER_NOT_EQUAL(11110, "卡拥有者不对应"), POS_CARD_OWNER_NOT_EQUAL(11110, "卡拥有者不对应"),
POS_ORDER_HAD_SYNCED(11111, "订单已同步"), POS_ORDER_HAD_SYNCED(11111, "订单已同步"),
POS_ORDER_NOT_FOUND(11112, "订单未找到"), POS_ORDER_NOT_FOUND(11112, "订单未找到"),
POS_CARD_ORDER_NOT_FOUND(11113, "卡支付订单未找到"),
POS_CMD_FAIL(11200, "POS命令错误"), POS_CMD_FAIL(11200, "POS命令错误"),


/**
* B端收银台
*/
MICRO_PAY_NO_AUTHCODE(11300, "请提供微信收款码"),
MICRO_PAY_ERR_AUTHCODE(11301, "请提供微信收款码"),




/** /**
* 支付 * 支付


+ 2
- 1
mallinkService/src/main/java/com/iformall/enums/EnumNeuPosPamentType.java Просмотреть файл

@@ -5,7 +5,7 @@ package com.iformall.enums;
*/ */
public enum EnumNeuPosPamentType { public enum EnumNeuPosPamentType {


// 来源于Neusoft的定义 0微信;1支付宝;2现金;3-会员折扣, 4优惠券;5预付卡;6银行卡7记账
// 来源于Neusoft的定义 0微信;1支付宝;2现金;3-会员折扣, 4优惠券;5预付卡;6银行卡7记账;8:东软预付卡
WECHAT(0, "微信"), WECHAT(0, "微信"),
ALIPAY(1, "支付宝"), ALIPAY(1, "支付宝"),
CASH(2, "现金"), CASH(2, "现金"),
@@ -14,6 +14,7 @@ public enum EnumNeuPosPamentType {
MEM_CARD(5, "预付卡"), MEM_CARD(5, "预付卡"),
MEM_BANKCARD(6, "银行卡"), MEM_BANKCARD(6, "银行卡"),
RECORD(7, "记账"), RECORD(7, "记账"),
NEU_CARD(8, "东软预付卡"),
; ;
public static EnumNeuPosPamentType getEnum(Integer code) { public static EnumNeuPosPamentType getEnum(Integer code) {
for (EnumNeuPosPamentType value : values()) { for (EnumNeuPosPamentType value : values()) {


+ 1
- 0
mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java Просмотреть файл

@@ -24,6 +24,7 @@ public interface WxCouponOrderMapper extends CommonMapper<WxCouponOrder, Long> {
// 券包核销 // 券包核销
int updateVerifyCouponOrder(WxCouponOrder wxCouponOrder); int updateVerifyCouponOrder(WxCouponOrder wxCouponOrder);
int updateVerifyCouponOrderStatus(WxCouponOrder wxCouponOrder); int updateVerifyCouponOrderStatus(WxCouponOrder wxCouponOrder);
int updateVerifyCouponOrderStatusForMicroPay(WxCouponOrder wxCouponOrder);
int cancelVerifyCouponOrder(WxCouponOrder wxCouponOrder); int cancelVerifyCouponOrder(WxCouponOrder wxCouponOrder);


//统一的计数接口 //统一的计数接口


+ 1
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java Просмотреть файл

@@ -177,6 +177,7 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService {
couponId = record.getCouponId(); couponId = record.getCouponId();
record.setCouponId(null); record.setCouponId(null);
} }
// TODO 缓存优化
List<WxCouponChannelVo> voList = wxCouponChannelMapper.findVoList(record); List<WxCouponChannelVo> voList = wxCouponChannelMapper.findVoList(record);
if (voList.isEmpty()) { if (voList.isEmpty()) {
return new ResultData(Result.SUCCESS, "查询成功", null); return new ResultData(Result.SUCCESS, "查询成功", null);


+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java Просмотреть файл

@@ -1269,7 +1269,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
logger.error("核销异常:updatete num " + num); logger.error("核销异常:updatete num " + num);
throw new MallinkException(ErrorCode.VERIFY_ERROR.getCode(), "updatete num " + num); throw new MallinkException(ErrorCode.VERIFY_ERROR.getCode(), "updatete num " + num);
} }
} else if (couponOrder.getCouponOrderStatus() == EnumCouponOrderStatus.POS_PRE_VERIFY.getCode()) {
} else if (couponOrder.getCouponOrderStatus().equals(EnumCouponOrderStatus.POS_PRE_VERIFY.getCode())) {
// 券已预核销后,但是未做支付,此券还能继续使用 // 券已预核销后,但是未做支付,此券还能继续使用
// 1. update posOrderId // 1. update posOrderId
PosCouponOrderVerify vQ = new PosCouponOrderVerify(); PosCouponOrderVerify vQ = new PosCouponOrderVerify();
@@ -1294,7 +1294,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
couponOrder.setBUserId(bUser.getId()); couponOrder.setBUserId(bUser.getId());
couponOrder.setVerifyType(EnumCouponVerifyType.VERIFY_B.getCode()); couponOrder.setVerifyType(EnumCouponVerifyType.VERIFY_B.getCode());
couponOrder.setUpdateDate(new Date()); couponOrder.setUpdateDate(new Date());
num = wxCouponOrderMapper.updateVerifyCouponOrder(couponOrder);
num = wxCouponOrderMapper.updateVerifyCouponOrderStatusForMicroPay(couponOrder);
} catch (Exception e) { } catch (Exception e) {
logger.error("db failed: couponOrder-" + couponOrder.getId() + ", e:" + e.getMessage()); logger.error("db failed: couponOrder-" + couponOrder.getId() + ", e:" + e.getMessage());
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage());


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/wechat/FmOpenInRedisDBConfigStorage.java Просмотреть файл

@@ -13,7 +13,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import redis.clients.jedis.Jedis; import redis.clients.jedis.Jedis;
import redis.clients.jedis.JedisPool; import redis.clients.jedis.JedisPool;
import redis.clients.util.Pool;
import redis.clients.jedis.util.Pool;


import java.util.Date; import java.util.Date;




+ 10
- 0
mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml Просмотреть файл

@@ -121,7 +121,17 @@
<if test=" null != #{bUserId} "> <if test=" null != #{bUserId} ">
and `b_user_id` = #{bUserId} and `b_user_id` = #{bUserId}
</if> </if>
</update>


<update id="updateVerifyCouponOrderStatusForMicroPay" parameterType="com.iformall.domain.po.WxCouponOrder">
update wx_coupon_order
set `coupon_order_status` = #{couponOrderStatus},
`b_user_id` = #{bUserId},
`update_date` = #{updateDate},
`verify_type` = #{verifyType}
where 1=1
and `tenant_id`=#{tenantId}
and id=#{id}
</update> </update>


<update id="cancelVerifyCouponOrder" parameterType="com.iformall.domain.po.WxCouponOrder"> <update id="cancelVerifyCouponOrder" parameterType="com.iformall.domain.po.WxCouponOrder">


+ 2
- 2
mallinkSysAdmin/pom.xml Просмотреть файл

@@ -13,8 +13,8 @@
<artifactId>mallinkSysAdmin</artifactId> <artifactId>mallinkSysAdmin</artifactId>


<properties> <properties>
<weixin-java-mp.version>3.6.0</weixin-java-mp.version>
<weixin-java-open.version>3.6.0</weixin-java-open.version>
<weixin-java-mp.version>3.7.0</weixin-java-mp.version>
<weixin-java-open.version>3.7.0</weixin-java-open.version>
</properties> </properties>


<dependencies> <dependencies>


+ 1
- 1
mallinkSysAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java Просмотреть файл

@@ -42,7 +42,7 @@ import org.springframework.data.redis.serializer.RedisSerializer;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import redis.clients.jedis.Protocol; import redis.clients.jedis.Protocol;
import redis.clients.util.SafeEncoder;
import redis.clients.jedis.util.SafeEncoder;


import javax.servlet.http.Cookie; import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;


+ 1
- 1
mallinkSysAdmin/src/main/java/com/iformall/interceptor/RequestInterceptor.java Просмотреть файл

@@ -16,7 +16,7 @@ import org.springframework.stereotype.Component;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
import redis.clients.jedis.Protocol; import redis.clients.jedis.Protocol;
import redis.clients.util.SafeEncoder;
import redis.clients.jedis.util.SafeEncoder;


import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;


+ 4
- 4
mybatis-multi-tenancy/pom.xml Просмотреть файл

@@ -10,13 +10,13 @@
<dependency> <dependency>
<groupId>com.github.jsqlparser</groupId> <groupId>com.github.jsqlparser</groupId>
<artifactId>jsqlparser</artifactId> <artifactId>jsqlparser</artifactId>
<version>1.4</version>
<version>2.0</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.mybatis</groupId> <groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId> <artifactId>mybatis</artifactId>
<version>3.5.2</version>
<version>3.5.4</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<!--测试期间依赖--> <!--测试期间依赖-->
@@ -30,13 +30,13 @@
<scope>test</scope> <scope>test</scope>
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
<version>8.0.17</version>
<version>8.0.19</version>
</dependency> </dependency>
<dependency> <dependency>
<scope>test</scope> <scope>test</scope>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
<artifactId>druid</artifactId> <artifactId>druid</artifactId>
<version>1.1.17</version>
<version>1.1.22</version>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>


+ 37
- 38
pom.xml Просмотреть файл

@@ -27,16 +27,16 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.8.RELEASE</version>
<version>2.2.5.RELEASE</version>
<relativePath/> <relativePath/>
</parent> </parent>


<properties> <properties>
<weixin-java-common.version>3.6.0</weixin-java-common.version>
<weixin-java-mp.version>3.6.0</weixin-java-mp.version>
<weixin-java-miniapp.version>3.6.0</weixin-java-miniapp.version>
<weixin-java-pay.version>3.6.0</weixin-java-pay.version>
<weixin-java-open.version>3.6.0</weixin-java-open.version>
<weixin-java-common.version>3.7.0</weixin-java-common.version>
<weixin-java-mp.version>3.7.0</weixin-java-mp.version>
<weixin-java-miniapp.version>3.7.0</weixin-java-miniapp.version>
<weixin-java-pay.version>3.7.0</weixin-java-pay.version>
<weixin-java-open.version>3.7.0</weixin-java-open.version>
<quartz.version>2.3.0</quartz.version> <quartz.version>2.3.0</quartz.version>
</properties> </properties>


@@ -92,12 +92,30 @@
<artifactId>flowable-spring-boot-starter-process</artifactId> <artifactId>flowable-spring-boot-starter-process</artifactId>
<version>6.4.0</version> <version>6.4.0</version>
</dependency> </dependency>

<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.19</version>
<scope>runtime</scope>
</dependency>

<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>3.2.0</version>
</dependency>

<dependency>
<groupId>org.mybatis.spring.boot</groupId>
<artifactId>mybatis-spring-boot-starter</artifactId>
<version>2.1.2</version>
</dependency>
<dependency> <dependency>
<groupId>com.github.pagehelper</groupId> <groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId> <artifactId>pagehelper-spring-boot-starter</artifactId>
<version>1.2.10</version>
<version>1.2.13</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.mybatis</groupId> <groupId>org.mybatis</groupId>
@@ -109,31 +127,18 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>3.1.0</version>
</dependency>

<dependency> <dependency>
<groupId>org.mybatis.spring.boot</groupId>
<artifactId>mybatis-spring-boot-starter</artifactId>
<version>2.1.0</version>
<groupId>com.alibaba</groupId>
<artifactId>druid</artifactId>
<version>1.1.22</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId> <artifactId>spring-context-support</artifactId>
</dependency> </dependency>


<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.17</version>
<scope>runtime</scope>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId> <artifactId>spring-boot-starter-test</artifactId>
@@ -166,14 +171,8 @@
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId> <artifactId>fastjson</artifactId>
<version>1.2.54</version>
<version>1.2.68</version>
</dependency> </dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid</artifactId>
<version>1.1.17</version>
</dependency>
<dependency> <dependency>
<groupId>org.quartz-scheduler</groupId> <groupId>org.quartz-scheduler</groupId>
@@ -195,27 +194,27 @@
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId> <artifactId>springfox-swagger2</artifactId>
<version>2.8.0</version>
<version>2.9.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId> <artifactId>springfox-swagger-ui</artifactId>
<version>2.8.0</version>
<version>2.9.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>io.springfox</groupId>
<artifactId>springfox-spring-web</artifactId> <artifactId>springfox-spring-web</artifactId>
<version>2.8.0</version>
<version>2.9.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId> <artifactId>jackson-core</artifactId>
<version>2.9.7</version>
<version>2.10.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId> <artifactId>jackson-databind</artifactId>
<version>2.9.7</version>
<version>2.10.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.xml.bind</groupId> <groupId>javax.xml.bind</groupId>
@@ -225,7 +224,7 @@
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
<version>1.18.2</version>
<version>1.18.10</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!-- </dependencyManagement> --> <!-- </dependencyManagement> -->


Загрузка…
Отмена
Сохранить