From e8ce24f3a378d1fdb5c1c9e6fbecb067aa22cdd9 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 20 七月 2023 23:23:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.1' into 1.1
---
driver/guns-admin/src/test/java/com/supersavedriving/driver/GunsApplicationTest.java | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/driver/guns-admin/src/test/java/com/supersavedriving/driver/GunsApplicationTest.java b/driver/guns-admin/src/test/java/com/supersavedriving/driver/GunsApplicationTest.java
index 6b56cfa..69778a5 100644
--- a/driver/guns-admin/src/test/java/com/supersavedriving/driver/GunsApplicationTest.java
+++ b/driver/guns-admin/src/test/java/com/supersavedriving/driver/GunsApplicationTest.java
@@ -3,12 +3,14 @@
// import com.alibaba.fastjson.JSON;
// import com.alibaba.fastjson.JSONObject;
// import com.baomidou.mybatisplus.mapper.EntityWrapper;
+// import com.supersavedriving.driver.core.util.ToolUtil;
// import com.supersavedriving.driver.modular.system.model.*;
// import com.supersavedriving.driver.modular.system.service.*;
// import com.supersavedriving.driver.modular.system.service.impl.CashWithdrawalServiceImpl;
// import com.supersavedriving.driver.modular.system.service.impl.OrderServiceImpl;
// import com.supersavedriving.driver.modular.system.util.MallBook.model.*;
// import com.supersavedriving.driver.modular.system.util.MallBook.util.TrhRequest;
+// import com.supersavedriving.driver.modular.system.util.RedisUtil;
// import com.supersavedriving.driver.modular.system.util.ResultUtil;
// import com.supersavedriving.driver.modular.system.util.UUIDUtil;
// import com.supersavedriving.driver.modular.system.util.juhe.WeatherCityInfo;
@@ -63,6 +65,9 @@
// @Autowired
// private ICashWithdrawalService cashWithdrawalService;
//
+// @Autowired
+// private RedisUtil redisUtil;
+//
//
//
//
@@ -111,6 +116,19 @@
//// }else{
//// System.err.println("结算接口异常【提现】：" + execute.getMsg());
//// }
+//
+//
+// for (int i = 0; i < 2; i++) {
+// String value = redisUtil.getValue("repeat_" + 10);
+// if(ToolUtil.isEmpty(value)){
+// redisUtil.setStrValue("repeat_" + 10, System.currentTimeMillis() + "", 600);//10分钟
+// }else{
+// Long s = System.currentTimeMillis() - Long.valueOf(value);
+// if(s.compareTo(60000L) < 0){//1分钟
+// System.err.println("数据处理中");
+// }
+// }
+// }
// }
//
//}
--
Gitblit v1.7.1