diff --git a/xdclass-common/src/main/java/net/jieyuu/constant/TimeConstant.java b/xdclass-common/src/main/java/net/jieyuu/constant/TimeConstant.java index c94b887..3600c5d 100644 --- a/xdclass-common/src/main/java/net/jieyuu/constant/TimeConstant.java +++ b/xdclass-common/src/main/java/net/jieyuu/constant/TimeConstant.java @@ -6,5 +6,6 @@ public class TimeConstant { * 支付订单有效时长,超过未支付则关闭订单 * 订单超时 毫秒 默认30分钟 */ - public static final long ORDER_PAY_TIMEOUT_MILLS = 1000 * 60 * 30; + // todo 测试时将时间改为了5分钟 ,记得改回30分钟 + public static final long ORDER_PAY_TIMEOUT_MILLS = 1000 * 60 * 5; } diff --git a/xdclass-coupon-service/src/main/resources/application.yml b/xdclass-coupon-service/src/main/resources/application.yml index 7722e08..4bf7238 100644 --- a/xdclass-coupon-service/src/main/resources/application.yml +++ b/xdclass-coupon-service/src/main/resources/application.yml @@ -73,4 +73,5 @@ mqconfig: coupon_release_routing_key: coupon.release.routing.key #消息过期时间,毫秒,测试改为15秒 - ttl: 15000 \ No newline at end of file + #为了测试修改时间 todo 记得修改回1500 + ttl: 360000 \ No newline at end of file diff --git a/xdclass-coupon-service/src/test/java/net/jieyuu/db/MyBatisPlusGenerator.java b/xdclass-coupon-service/src/test/java/net/jieyuu/db/MyBatisPlusGenerator.java index cb6cc49..bbcfbcf 100644 --- a/xdclass-coupon-service/src/test/java/net/jieyuu/db/MyBatisPlusGenerator.java +++ b/xdclass-coupon-service/src/test/java/net/jieyuu/db/MyBatisPlusGenerator.java @@ -66,7 +66,6 @@ public class MyBatisPlusGenerator { .setRestControllerStyle(true) // 生成的表, 支持多表一起生成,以数组形式填写 - //TODO TODO TODO TODO // .setInclude("coupon","coupon_record"); .setInclude("coupon_task"); diff --git a/xdclass-order-service/src/main/java/net/jieyuu/service/impl/ProductOrderServiceImpl.java b/xdclass-order-service/src/main/java/net/jieyuu/service/impl/ProductOrderServiceImpl.java index 83d67cb..68a9d8b 100644 --- a/xdclass-order-service/src/main/java/net/jieyuu/service/impl/ProductOrderServiceImpl.java +++ b/xdclass-order-service/src/main/java/net/jieyuu/service/impl/ProductOrderServiceImpl.java @@ -201,11 +201,11 @@ public class ProductOrderServiceImpl extends ServiceImpl implements /** * 用户注册 * 邮箱验证码验证 - * 密码加密 TODO - * 账号唯一性检查 TODO + * 密码加密 + * 账号唯一性检查 * 插入数据库 - * 新注册用户福利发放 TODO + * 新注册用户福利发放 * * @param registerRequest * @return @@ -88,7 +88,6 @@ public class UserServiceImpl extends ServiceImpl implements userDO.setCreateTime(new Date()); //设置密码 加密 -// userDO.setPwd(userRegisterRequest.getPwd()); //生成密钥 盐e userDO.setSecret("$1$" + CommonUtil.getStringNumRandom(8));