Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/intelligent_d...

liujie

9 天以前 ac84b3314e48b61055af907d12aa8bfd4d2cdc75

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/intelligent_dispatching

 ruoyi-common/src/main/java/com/ruoyi/common/utils/Sm4Utils.java

@@ -22,7 +22,7 @@
     */
    public static String sm4EncryptUtil(String params){
        SymmetricCrypto sm4 = SmUtil.sm4(KEY.getBytes());
        return sm4.encryptHex(params);
        return sm4.encryptBase64(params);
    }
 
    /**
@@ -42,8 +42,9 @@
     */
    public static void main(String[] args) {
        JSONObject jsonObject = new JSONObject();
        jsonObject.put("pageNum", 1);
        jsonObject.put("pageSize",10);
        jsonObject.put("code", 500);
        jsonObject.put("msg","该账号已存在");
        jsonObject.put("data",null);
        String strParams = JSON.toJSONString(jsonObject);
        System.out.println(String.format("明文参数: %s", strParams));