From 7ac3ecbc20cf00ad6a77d23cdc5333113082df0f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 01 八月 2020 15:42:34 +0800
Subject: [PATCH] #当前本版十分完美、冻结
---
src/main/java/com/zy/common/properties/SystemProperties.java | 11 +++++++++--
src/main/java/com/zy/common/model/enums/SysOsType.java | 2 +-
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/model/enums/SysOsType.java b/src/main/java/com/zy/common/model/enums/SysOsType.java
index 26f1051..f874b9a 100644
--- a/src/main/java/com/zy/common/model/enums/SysOsType.java
+++ b/src/main/java/com/zy/common/model/enums/SysOsType.java
@@ -6,7 +6,7 @@
Linux("Linux", null),
Mac_OS("Mac OS", null),
Mac_OS_X("Mac OS X", null),
- Windows("Windows", "D:\\婵�娲荤爜.txt"),
+ Windows("Windows", "D:\\WMS绯荤粺婵�娲荤爜锛堣鍕垮垹闄わ級.txt"),
OS2("OS/2", null),
Solaris("Solaris", null),
SunOS("SunOS", null),
diff --git a/src/main/java/com/zy/common/properties/SystemProperties.java b/src/main/java/com/zy/common/properties/SystemProperties.java
index 37d8e1c..d2b252c 100644
--- a/src/main/java/com/zy/common/properties/SystemProperties.java
+++ b/src/main/java/com/zy/common/properties/SystemProperties.java
@@ -1,8 +1,10 @@
package com.zy.common.properties;
import com.core.common.AesUtils;
+import com.core.common.DateUtils;
import java.io.*;
+import java.util.Date;
/**
* Created by vincent on 2020/8/1
@@ -26,6 +28,8 @@
}
f.close();
buf.close();
+ } catch (FileNotFoundException ignore) {
+
} catch (IOException e) {
e.printStackTrace();
throw new RuntimeException("璇诲彇WMS绯荤粺婵�娲荤爜澶辫触锛侊紒锛乗n璇诲彇璺緞 " + fileName);
@@ -57,8 +61,11 @@
// 鐢熸垚婵�娲荤爜
public static void main(String[] args) {
- String code = AesUtils.encrypt("20200801152500", SystemProperties.SALT);
- System.out.println(code);
+ String timeStr = "2020-08-01 17:15:35";
+ Date exprTime = DateUtils.convert(timeStr);
+ String code = AesUtils.encrypt(DateUtils.convert(exprTime, DateUtils.yyyyMMddHHmmss), SystemProperties.SALT);
+ System.out.println("婵�娲荤爜锛�"+code);
+ System.out.println("鏈夋晥鏈熻嚦锛�"+timeStr);
// saveActivationCode(SysOsType.Windows.getActivationCodePath(), code);
// String activationCode = getActivationCode(OSinfo.getOSname().getActivationCodePath());
// String decrypt = AesUtils.decrypt(activationCode, "123456789qwertyu");
--
Gitblit v1.9.1