From 981a04a92cbdf6fbd7b54ff9eec7b9c4e0896354 Mon Sep 17 00:00:00 2001
From: yanghb <yanghb>
Date: 星期一, 24 四月 2023 15:13:25 +0800
Subject: [PATCH] 代码调整
---
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/AESUtil.java | 2 +-
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java | 7 +++----
DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/AESUtil.java | 7 ++++---
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/AESUtil.java b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/AESUtil.java
index d5e8a49..8a64dec 100644
--- a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/AESUtil.java
+++ b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/AESUtil.java
@@ -1,6 +1,7 @@
package com.stylefeng.guns.modular.system.util;
+import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.ToolUtil;
import org.springframework.util.Base64Utils;
@@ -88,12 +89,12 @@
public static void main(String[] ages){
-// String encrypt = AESUtil.encrypt("19167181339");
-// System.err.println(encrypt);
+ String encrypt = AESUtil.encrypt("15908401995");
+ System.err.println(encrypt);
// String travel = AESUtil.decrypt("43um1VRZ1t1wL3Z9IWUV7e4Z/w29owZM");
// System.err.println(travel);
String decrypt = DESUtil.decrypt("xqT86jictTPpHMem", "43um1VRZ1t1wL3Z9IWUV7e4Z/w29owZM");
- System.err.println(decrypt);
+ System.err.println(ShiroKit.md5("12345678", "SA;d5#"));
}
}
diff --git a/ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java b/ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
index f01a5ff..ab5e7d4 100644
--- a/ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
+++ b/ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
@@ -629,7 +629,7 @@
@ResponseBody
public Object add(TDriver tDriver,@RequestParam String serverBox,@RequestParam String lineStr,Integer roleType,Integer companyType,Integer oneId,Integer twoId,Integer franchiseeId) {
//判断登录账户是否重复
- int count = tDriverService.selectCount(new EntityWrapper<TDriver>().eq("phone", tDriver.getPhone()).in("authState", "1,2,3").ne("flag", 3));
+ int count = tDriverService.selectCount(new EntityWrapper<TDriver>().eq("phone", AESUtil.encrypt(tDriver.getPhone())).in("authState", "1,2,3").ne("flag", 3));
if (count > 0){
return "error";
}
@@ -676,8 +676,7 @@
tDriver.setInsertTime(new Date());
tDriver.setInsertUser(ShiroKit.getUser().getId());
// tDriver.setPassword(MD5Util.encrypt(tDriver.getPassword()));
- tDriver.setAccount(AESUtil.encrypt(tDriver.getAccount()));
- tDriver.setPhone(AESUtil.encrypt(tDriver.getPhone()));
+ tDriver.setAccount(tDriver.getPhone());
tDriver.setPassword(ShiroKit.md5(tDriver.getPassword(), "SA;d5#"));
tDriverService.insert(tDriver);
@@ -816,7 +815,7 @@
tDriver.setUpdateUser(ShiroKit.getUser().getId());
tDriver.setAccount(AESUtil.encrypt(tDriver.getAccount()));
- tDriver.setPhone(AESUtil.encrypt(tDriver.getPhone()));
+ tDriver.setPhone(tDriver.getPhone());
tDriver.setPassword(ShiroKit.md5(tDriver.getPassword(), "SA;d5#"));
tDriverService.updateById(tDriver);
diff --git a/ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/AESUtil.java b/ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/AESUtil.java
index bdc963e..3c383af 100644
--- a/ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/AESUtil.java
+++ b/ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/AESUtil.java
@@ -88,7 +88,7 @@
public static void main(String[] ages){
- String encrypt = AESUtil.encrypt("19167181339");
+ String encrypt = AESUtil.encrypt("15908401995");
System.err.println(encrypt);
String travel = AESUtil.decrypt(encrypt);
System.err.println(travel);
--
Gitblit v1.7.1