Merge branch 'master' of https://gitee.com/xuxiaowei-com-cn/crmeb_java into master-sun

# Conflicts: # crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/CrmebUtil.java
2023-03-29 10:12:53 +08:00
parent f2acafda7a 1983d002b4
commit e36deee626
15 changed files with 41 additions and 94 deletions
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/CrmebUtil.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/CrmebUtil.java
@@ -127,6 +127,7 @@ public class CrmebUtil {
        // 原始数据：中国123ABCabc
        // 加密结果：5JNGj04iE/XUuTZM75zMrA==
        // 解密结果：中国123ABCabc
+        System.out.println(encryptPassword("crmeb@123456", "18292417675"));
    }

    /**