Merge remote-tracking branch 'origin/master'

Pu Zhibing

8 天以前 e998c057be6d077dcec169ab4cb34f4755932601

 DriverQYTTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java

@@ -2,9 +2,10 @@
//
//import com.stylefeng.guns.modular.system.model.Driver;
//import com.stylefeng.guns.modular.system.service.IDriverService;
//import com.stylefeng.guns.modular.system.util.zhenglian.TokenUtil;
//import com.stylefeng.guns.modular.system.util.zhenglian.ZhengLianUtil;
//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;
@@ -25,7 +26,7 @@
//   @Test
//   public void test() {
//
//      Driver driver = driverService.selectById(driverId);
//      Driver driver = driverService.selectById(14);
//      TokenRequest tokenRequest = new TokenRequest();
//      tokenRequest.setAppUserId(driver.getEmpId().toString());
//      tokenRequest.setUserName(driver.getName());
@@ -35,14 +36,12 @@
//      tradeTerminalInfo.setIp("127.0.0.1");
//      tradeTerminalInfo.setTerminal("1");
//      tradeTerminalInfo.setMac("");
//      tokenRequest.setTradeTerminalInfo(tradeTerminalInfo);
//      tokenRequest.setType(type);
//      String token = null;
//      ZLUserInfo userInfo = null;
//      try {
//         token = TokenUtil.getToken(tokenRequest);
//         userInfo = ZhengLianUtil.getUserInfo("14", tradeTerminalInfo);
//      } catch (Exception e) {
//         throw new RuntimeException(e);
//      }
//      System.err.println(token);
//      System.err.println(userInfo);
//   }
//}