From a1a7570a2b8c4fd03d26a14f16f56deb8653b0a8 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Mon, 15 Jun 2020 23:10:23 +0800 Subject: [PATCH] update --- .../src/main/java/com/iformall/config/ShiroConfig.java | 3 ++- .../java/com/iformall/controller/base/BaseController.java | 1 - .../iformall/controller/market/WxCouponController.java | 8 ++++---- mallinkAdmin/src/main/resources/application-dev.yml | 6 +++--- mallinkCallback/src/main/resources/application-dev.yml | 4 ++-- mallinkMQConsumer/src/main/resources/application-dev.yml | 4 ++-- mallinkPosApi/src/main/resources/application-dev.yml | 4 ++-- mallinkSchedule/src/main/resources/application-dev.yml | 4 ++-- .../com/iformall/service/impl/WxOrderServiceImpl.java | 6 +++--- .../src/main/resources/application-dev.yml | 4 ++-- 10 files changed, 22 insertions(+), 22 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java b/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java index 6b0de5002..5ae10dc1e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java +++ b/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java @@ -102,6 +102,7 @@ public class ShiroConfig { filterChainDefinitionMap.put("/wechat/login", "anon"); // 微信第三方登录callback filterChainDefinitionMap.put("/wechat/callback", "anon"); // 微信网页登录回调 filterChainDefinitionMap.put("/wechat/weChatUserLogin", "anon"); // 微信第三方登录 + // 验证码 filterChainDefinitionMap.put("/captcha.jpg", "anon"); // 官网 @@ -116,7 +117,7 @@ public class ShiroConfig { filterChainDefinitionMap.put("/wxMallApply/sendvalidationcode", "anon"); // 补发消息 - filterChainDefinitionMap.put("/msgrecord/resendMsg", "anon"); + filterChainDefinitionMap.put("/wxCoupon/updateStokeAndValidDate", "anon"); // static files filterChainDefinitionMap.put("/css/**", "anon"); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java b/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java index 032d699dd..c6e190b5e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java @@ -66,7 +66,6 @@ public class BaseController { public TenantEntity getTenantInfo(){ Session session = SecurityUtils.getSubject().getSession(); String tenantId = (String)session.getAttribute(UserSession.tenantId); - TenantEntity tenantEntity = new TenantEntity(){{ setTenantId(tenantId); }}; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index 4fcb9b40f..657835101 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -99,7 +99,7 @@ public class WxCouponController extends BaseController { if (resultData.code != 200) { return resultData; } - redisLock.setCouponStock(wxCoupon.getId(), wxCoupon.getInventory()); + redisLock.setCouponStock(wxCoupon.getId(), wxCoupon.getRemainInventory()); //启动投放审批 if(wxCoupon.getFlowParams() !=null && wxCoupon.getFlowParams().size()>0) { wxCoupon.getFlowParams().put("businessId",wxCoupon.getId()); @@ -128,7 +128,7 @@ public class WxCouponController extends BaseController { return new ResultData(ResultData.ERROR, "有活动正在上架,请先下架。"); } } - redisLock.setCouponStock(wxCoupon.getId(), wxCoupon.getInventory()); + redisLock.setCouponStock(wxCoupon.getId(), wxCoupon.getRemainInventory()); //启动审批流 if (wxCoupon.getFlowParams() != null && wxCoupon.getFlowParams().size() > 0) { logger.info("------coupon.update().businessType:"+wxCoupon.getFlowParams().get("businessType")); @@ -251,9 +251,9 @@ public class WxCouponController extends BaseController { updateCoupon.setStockApplyStatus(EnumRentContractAppStatus.APPLYING.getCode()); updateCoupon.setUpdateDate(new Date()); wxCouponService.update(updateCoupon); - redisLock.setCouponStock(wxCoupon.getId(), wxCoupon.getInventory()); + redisLock.setCouponStock(wxCoupon.getId(), wxCoupon.getRemainInventory()); } else { - redisLock.setCouponStock(wxCoupon.getId(), wxCoupon.getInventory()); + redisLock.setCouponStock(wxCoupon.getId(), wxCoupon.getRemainInventory()); return wxCouponService.updateCouponStockAndEndTime(wxCoupon); } diff --git a/mallinkAdmin/src/main/resources/application-dev.yml b/mallinkAdmin/src/main/resources/application-dev.yml index 588874364..011c29034 100644 --- a/mallinkAdmin/src/main/resources/application-dev.yml +++ b/mallinkAdmin/src/main/resources/application-dev.yml @@ -4,7 +4,7 @@ spring: #include: rabbitMQ # JDBC datasource: - url: jdbc:mysql://zc349w82qvn56ftl5e64-rw4rm.rwlb.rds.aliyuncs.com:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true&allowMultiQueries=true + url: jdbc:mysql://rm-2zel9i9t555zy7lftmo.mysql.rds.aliyuncs.com:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true&allowMultiQueries=true username: ENC(dZ8fmrtuBMQYaRytKQgTqg==) password: ENC(IKH7HxMZwIqMttMc9+QsqWa1KMsJvTs4) type: com.alibaba.druid.pool.DruidDataSource @@ -27,7 +27,7 @@ spring: #date-format: yyyy-MM-dd HH:mm:ss # REDIS redis: - host: 202.165.179.86 + host: 101.201.103.81 port: 6379 password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) timeout: 3600 @@ -98,7 +98,7 @@ wechat: componentToken: "formall2018" componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN" redis: - host: 202.165.179.86 + host: 101.201.103.81 port: 6379 password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) timeout: 3600 diff --git a/mallinkCallback/src/main/resources/application-dev.yml b/mallinkCallback/src/main/resources/application-dev.yml index 6a534086e..2d54ca13f 100644 --- a/mallinkCallback/src/main/resources/application-dev.yml +++ b/mallinkCallback/src/main/resources/application-dev.yml @@ -27,7 +27,7 @@ spring: #date-format: yyyy-MM-dd HH:mm:ss # REDIS redis: - host: 202.165.179.86 + host: 101.201.103.81 port: 6379 password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) timeout: 3600 @@ -97,7 +97,7 @@ wechat: componentToken: "formall2018" componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN" redis: - host: 202.165.179.86 + host: 101.201.103.81 port: 6379 password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) timeout: 3600 diff --git a/mallinkMQConsumer/src/main/resources/application-dev.yml b/mallinkMQConsumer/src/main/resources/application-dev.yml index 1fbada993..c8b563a80 100644 --- a/mallinkMQConsumer/src/main/resources/application-dev.yml +++ b/mallinkMQConsumer/src/main/resources/application-dev.yml @@ -28,7 +28,7 @@ spring: # REDIS redis: - host: 202.165.179.86 + host: 101.201.103.81 port: 6379 password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) timeout: 3600 @@ -91,7 +91,7 @@ wechat: componentToken: "formall2018" componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN" redis: - host: 202.165.179.86 + host: 101.201.103.81 port: 6379 password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) timeout: 3600 diff --git a/mallinkPosApi/src/main/resources/application-dev.yml b/mallinkPosApi/src/main/resources/application-dev.yml index 54c956f1b..dad7f419c 100644 --- a/mallinkPosApi/src/main/resources/application-dev.yml +++ b/mallinkPosApi/src/main/resources/application-dev.yml @@ -26,7 +26,7 @@ spring: #date-format: yyyy-MM-dd HH:mm:ss # REDIS redis: - host: 202.165.179.86 + host: 101.201.103.81 port: 6379 password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) timeout: 3600 @@ -95,7 +95,7 @@ wechat: componentToken: "formall2018" componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN" redis: - host: 202.165.179.86 + host: 101.201.103.81 port: 6379 password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) timeout: 3600 diff --git a/mallinkSchedule/src/main/resources/application-dev.yml b/mallinkSchedule/src/main/resources/application-dev.yml index 6a124f9cb..5570f70a0 100644 --- a/mallinkSchedule/src/main/resources/application-dev.yml +++ b/mallinkSchedule/src/main/resources/application-dev.yml @@ -28,7 +28,7 @@ spring: # REDIS redis: - host: 202.165.179.86 + host: 101.201.103.81 port: 6379 password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) timeout: 3600 @@ -91,7 +91,7 @@ wechat: componentToken: "formall2018" componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN" redis: - host: 202.165.179.86 + host: 101.201.103.81 port: 6379 password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) timeout: 3600 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index 1a5772189..52550657f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -622,7 +622,7 @@ public class WxOrderServiceImpl implements WxOrderService { } if (count >= coupon.getUseLimitQuantity()) { logger.error("此券购买数量已超限, couponId: " + couponIdStr + ", count: " + count); - throw new MallinkException(ErrorCode.ORDER_IS_LIMITED); + throw new MallinkException(ErrorCode.ORDER_IS_LIMITED.getCode(),"此券购买数量已超限, couponId: " + couponIdStr + ", count: " + count); } try { @@ -638,8 +638,8 @@ public class WxOrderServiceImpl implements WxOrderService { msg.setMsgType(EnumMsgRecordType.COUPON_STOCK.getCode()); mqBaseProducer.sendMessage(msg, EnumMsgMqTopic.STOCK.getCode(), "*", "decrease_stock_"+coupon.getId()); } catch (RuntimeException e) { - logger.error("此券减库存失败, couponId: " + couponIdStr); - throw new MallinkException(ErrorCode.ORDER_IS_FAIL); + logger.error("此券减库存失败, couponId: " + couponIdStr,e); + throw new MallinkException(ErrorCode.ORDER_IS_FAIL.getCode(),e.getMessage()); } } diff --git a/mallinkWebSocketServer/src/main/resources/application-dev.yml b/mallinkWebSocketServer/src/main/resources/application-dev.yml index 0c237a876..b726571d6 100644 --- a/mallinkWebSocketServer/src/main/resources/application-dev.yml +++ b/mallinkWebSocketServer/src/main/resources/application-dev.yml @@ -28,7 +28,7 @@ spring: # REDIS redis: - host: 202.165.179.86 + host: 101.201.103.81 port: 6379 password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) timeout: 3600 @@ -91,7 +91,7 @@ wechat: componentToken: "formall2018" componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN" redis: - host: 202.165.179.86 + host: 101.201.103.81 port: 6379 password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) timeout: 3600