|
@@ -10,6 +10,7 @@ import cn.hutool.core.lang.UUID;
|
|
import cn.hutool.core.thread.ThreadUtil;
|
|
import cn.hutool.core.thread.ThreadUtil;
|
|
import cn.hutool.core.util.StrUtil;
|
|
import cn.hutool.core.util.StrUtil;
|
|
import cn.hutool.core.util.ZipUtil;
|
|
import cn.hutool.core.util.ZipUtil;
|
|
|
|
+import cn.hutool.crypto.digest.MD5;
|
|
import cn.hutool.extra.qrcode.QrCodeUtil;
|
|
import cn.hutool.extra.qrcode.QrCodeUtil;
|
|
import cn.hutool.extra.qrcode.QrConfig;
|
|
import cn.hutool.extra.qrcode.QrConfig;
|
|
import cn.hutool.http.HttpUtil;
|
|
import cn.hutool.http.HttpUtil;
|
|
@@ -2381,9 +2382,13 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
|
|
// System.out.println(s);
|
|
// System.out.println(s);
|
|
// System.out.println(UUID.fastUUID());
|
|
// System.out.println(UUID.fastUUID());
|
|
|
|
|
|
- String test = "bpvt00017#1396877795149217792#";
|
|
|
|
- String[] split = test.split("#");
|
|
|
|
- System.out.println(split);
|
|
|
|
|
|
+// String test = "bpvt00017#1396877795149217792#";
|
|
|
|
+// String[] split = test.split("#");
|
|
|
|
+// System.out.println(split);
|
|
|
|
+ String password = MD5.create().digestHex("Aa123456");
|
|
|
|
+ System.out.println(password);
|
|
|
|
+ password = MD5.create().digestHex16("Aa123456");
|
|
|
|
+ System.out.println(password);
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
@@ -2534,7 +2539,8 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
|
|
String folderName = configJson.getString("id");
|
|
String folderName = configJson.getString("id");
|
|
ryId = configJson.getString("customUserId");
|
|
ryId = configJson.getString("customUserId");
|
|
ryNo = configJson.getString("customUserName");
|
|
ryNo = configJson.getString("customUserName");
|
|
- password = AesUtil.encryptCBC(configJson.getString("customUserPwd"), userPasswordKey, userPasswordIv, AesUtil.ALMODE_CBC_NOPADDING);
|
|
|
|
|
|
+// password = AesUtil.encryptCBC(configJson.getString("customUserPwd"), userPasswordKey, userPasswordIv, AesUtil.ALMODE_CBC_NOPADDING);
|
|
|
|
+ password = MD5.create().digestHex(configJson.getString("customUserPwd"));
|
|
if(StrUtil.isBlank(folderName) || StrUtil.isBlank(snCode)){
|
|
if(StrUtil.isBlank(folderName) || StrUtil.isBlank(snCode)){
|
|
throw new RuntimeException("config.json 文件有误!");
|
|
throw new RuntimeException("config.json 文件有误!");
|
|
}
|
|
}
|