Merge remote-tracking branch 'origin/bfasrs6' into bfasrs6

Administrator

2023-12-12 4054f952396930f34b938074d2908926e0e40c96

 src/main/java/com/zy/common/properties/SystemProperties.java

@@ -63,7 +63,7 @@

    // 生成激活码
    public static void main(String[] args) {
        String timeStr = "2021-08-01 17:48:35";
        String timeStr = "2099-08-01 17:48:35";
        Date exprTime = DateUtils.convert(timeStr);
        String code = AesUtils.encrypt(DateUtils.convert(exprTime, DateUtils.yyyyMMddHHmmss), SystemProperties.SALT);
        System.out.println("激活码："+code);