From 8522e469e00e1cf6c0410165b0f76c806c13ca83 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 16 八月 2025 09:17:04 +0800
Subject: [PATCH] 合并代码
---
DriverQYTTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/DriverQYTTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java b/DriverQYTTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java
index fdc0840..31a3689 100644
--- a/DriverQYTTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java
+++ b/DriverQYTTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java
@@ -2,10 +2,9 @@
//
//import com.stylefeng.guns.modular.system.model.Driver;
//import com.stylefeng.guns.modular.system.service.IDriverService;
-//import com.stylefeng.guns.modular.system.util.zhenglian.ZhengLianUtil;
+//import com.stylefeng.guns.modular.system.util.zhenglian.TokenUtil;
//import com.stylefeng.guns.modular.system.util.zhenglian.model.TokenRequest;
//import com.stylefeng.guns.modular.system.util.zhenglian.model.TradeTerminalInfo;
-//import com.stylefeng.guns.modular.system.util.zhenglian.model.ZLUserInfo;
//import org.junit.Test;
//import org.junit.runner.RunWith;
//import org.springframework.beans.factory.annotation.Autowired;
@@ -35,13 +34,14 @@
// TradeTerminalInfo tradeTerminalInfo = new TradeTerminalInfo();
// tradeTerminalInfo.setIp("127.0.0.1");
// tradeTerminalInfo.setTerminal("1");
-// tradeTerminalInfo.setMac("");
-// ZLUserInfo userInfo = null;
+// tradeTerminalInfo.setMac("111-111-111-111");
+// tokenRequest.setTradeTerminalInfo(tradeTerminalInfo);
+// tokenRequest.setType("04");
// try {
-// userInfo = ZhengLianUtil.getUserInfo("14", tradeTerminalInfo);
+// String token = TokenUtil.getToken(tokenRequest);
+// System.err.println(token);
// } catch (Exception e) {
// throw new RuntimeException(e);
// }
-// System.err.println(userInfo);
// }
//}
--
Gitblit v1.7.1