he2802 2 gadi atpakaļ
vecāks
revīzija
709bcc57f5

+ 2 - 9
zhongzheng-admin/src/main/java/com/zhongzheng/controller/common/CommonController.java

@@ -751,17 +751,10 @@ public class CommonController extends BaseController {
     @GetMapping("/common/free/getShanDongExam")
     public AjaxResult getShanDongExam(GoodsQueryBo bo) throws UnsupportedEncodingException {
         System.out.println(bo.getBuyNote());
-        System.out.println(dataSign(bo.getBuyNote(), "ca7c349b-52f2-4751-81ea-c86036e2b4e9"));
         return AjaxResult.success();
     }
-    public String dataSign(String SourceMsg, String PKey) throws UnsupportedEncodingException {
-        String TempPKey;
-        TempPKey = ToolsUtils.MD5PubHasher(PKey.getBytes("gb2312"));
-        TempPKey = SourceMsg + TempPKey;
-        System.out.println(TempPKey);
-        TempPKey = ToolsUtils.MD5PubHasher(TempPKey.getBytes("gb2312"));
-        return TempPKey;
-    }
+
+
 
     @ApiOperation("旧系统post请求")
     @PostMapping("/common/free/clientPost")

+ 2 - 28
zhongzheng-common/src/main/java/com/zhongzheng/common/utils/ToolsUtils.java

@@ -368,33 +368,7 @@ public class ToolsUtils {
         return result;
     }
 
-    public static String EncoderByMd5New(String str) {
-        StringBuilder pwd = new StringBuilder("");
-        try {
-        MessageDigest md = MessageDigest.getInstance("MD5");// 生成一个MD5加密计算摘要
-        byte[] digest1 = md.digest(str.getBytes("gb2312"));
-//        byte[] digest1 = passord.getBytes("UTF-16LE");
-        for (int i = 0; i < digest1.length; i++)
-        {
-            //将得到的字符串使用十六进制类型格式。格式后的字符是小写的字母,如果使用大写(X)则格式后的字符是大写字符
-//            pwd = pwd + digest1[i].toString("x");
-            int v = digest1[i] & 0xFf;
-            String hv = Integer.toHexString(v);
-            if (hv.length() < 2) {
-                pwd.append(0);
-            }
-            pwd.append(hv);
-        }
-        } catch (NoSuchAlgorithmException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        } catch (UnsupportedEncodingException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
-//        MD5 md5 = new MD5CryptoServiceProvider();
-        return pwd.toString();
-    }
+
 
     public static String EncoderByMd5(String str) {
         String result = "";
@@ -402,7 +376,7 @@ public class ToolsUtils {
         try {
             md5 = MessageDigest.getInstance("MD5");
             // 这句是关键
-            md5.update(str.getBytes("gb2312"));
+            md5.update(str.getBytes("gbk"));
         } catch (NoSuchAlgorithmException e) {
             // TODO Auto-generated catch block
             e.printStackTrace();