jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 08b75738430fcdd9037b05a677ebede3f05fd958

Authored by jiangjiazhi
2 parents ce4f9c5f01 d09a547392
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java View file @ 08b7573
... ... @@ -117,7 +117,7 @@
117 117 * @throws Exception
118 118 */
119 119 public static String aesEncrypt(String content, String encryptKey) throws Exception {
120   - return base64Encode(aesEncryptToBytes(content, encryptKey));
  120 + return parseByte2HexStr(aesEncryptToBytes(content, encryptKey));
121 121 }
122 122  
123 123 /**
... ... @@ -146,7 +146,47 @@
146 146 * @throws Exception
147 147 */
148 148 public static String aesDecrypt(String encryptStr, String decryptKey) throws Exception {
149   - return StringUtils.isEmpty(encryptStr) ? null : aesDecryptByBytes(base64Decode(encryptStr), decryptKey);
  149 + return StringUtils.isEmpty(encryptStr) ? null : aesDecryptByBytes(parseHexStr2Byte(encryptStr), decryptKey);
  150 + }
  151 +
  152 + /**
  153 + * 将二进制转换成16进制
  154 + * @method parseByte2HexStr
  155 + * @param buf
  156 + * @return
  157 + * @throws
  158 + * @since v1.0
  159 + */
  160 + public static String parseByte2HexStr(byte buf[]){
  161 + StringBuffer sb = new StringBuffer();
  162 + for(int i = 0; i < buf.length; i++){
  163 + String hex = Integer.toHexString(buf[i] & 0xFF);
  164 + if (hex.length() == 1) {
  165 + hex = '0' + hex;
  166 + }
  167 + sb.append(hex.toUpperCase());
  168 + }
  169 + return sb.toString();
  170 + }
  171 +
  172 + /**
  173 + * 将16进制转换为二进制
  174 + * @method parseHexStr2Byte
  175 + * @param hexStr
  176 + * @return
  177 + * @throws
  178 + * @since v1.0
  179 + */
  180 + public static byte[] parseHexStr2Byte(String hexStr){
  181 + if(hexStr.length() < 1)
  182 + return null;
  183 + byte[] result = new byte[hexStr.length()/2];
  184 + for (int i = 0;i< hexStr.length()/2; i++) {
  185 + int high = Integer.parseInt(hexStr.substring(i*2, i*2+1), 16);
  186 + int low = Integer.parseInt(hexStr.substring(i*2+1, i*2+2), 16);
  187 + result[i] = (byte) (high * 16 + low);
  188 + }
  189 + return result;
150 190 }
151 191  
152 192 }
platform-common/src/main/java/com/lyms/platform/common/utils/MongoSyncUtil.java View file @ 08b7573
... ... @@ -66,7 +66,48 @@
66 66 Object aaa = JsonUtil.str2Obj(JsonUtil.obj2JsonString(info), Class.forName(info.getClass().getName()));
67 67 System.out.println(MD5Utils.md5(aaa.getClass().getName()));
68 68 System.out.println(LymsEncodeUtil.aesEncrypt("com.lyms.platform.common.utils.MongoSyncUtil", "Lymsh@2016"));
69   - System.out.println(LymsEncodeUtil.aesDecrypt("JusDAcSiQQ6QmFo+VYVuS1YL8F3IPj0IXSd3zoNE6frCm+5TpiA0RRsD4MiXuh9e","Lymsh@2016123"));
  69 + System.out.println(LymsEncodeUtil.aesDecrypt("tjRvEtdaZCzlpZQYqbJjrxslbB5yuZk8m4OzVRMv4Gs=", "Lymsh@2016"));
  70 + System.out.println(LymsEncodeUtil.aesDecrypt("JusDAcSiQQ6QmFo+VYVuS4ZzDNRVQv1RKdjtxe1MaQ0=","Lymsh@2016"));
  71 + System.out.println(LymsEncodeUtil.aesDecrypt("rtBXweb/r9BTCfDbvdlmZ45M17ERPL2ShRjRb2LcyOFvNWqzdBvVijq9yM9soQVRjejvGkhYCx9y\n" +
  72 + "c74XICN3kOX4rUNes0whNUeNaEZTdFIpKnsRRCBMNMoPDUK5dPPlA4/tATTnjG8LGCbQyPUP6Aja\n" +
  73 + "7wUJNDasGc6iblP0KB7A6MPyFOZHHt+dhmLUt3QHO0NJ4MxVk0mqMUIeK+xpP5S7TqHt73dYbkPP\n" +
  74 + "eS5yRUC9xi2ywGRs6rGO0lRBcdel8b426vR9RtyoFdkIi4f3Xn7UEQtI2sbXpRUEpl4sLsIYGCTy\n" +
  75 + "Bu4A3zJSHTwWDDm8CznX7EPryb9W+1z31J2UsyrCcsbc/2Pra3+6Y9UlrIuXKeD20ORtTVcznDwz\n" +
  76 + "azD33d9mkPpFm6ex5lN8ExwPuzXrr+dkAMIIjfOvYAfCOcgvXlEfluR8AIFTEXcICcwS1CCate/e\n" +
  77 + "uOE7SYiMqbo2cgwxNtY0xJgRQsY1zbOp/vYsRpfUUfIfi0dZaai/I2+oCSlJx6aeY+Ks7Ffpd7S5\n" +
  78 + "qFTLUBkHGVafx/7kSNy93MyL/0eJ2w8hUHkpd0gdyOvqRRa/309l9WHhiw2ZedGRuUgNOZ7YYrlE\n" +
  79 + "8MWxyD1jCq0vjhRWNuOI9bW2OHXANap+f7vAQ1jgJxyBTvM63+T1wlVKyuttJVSHMdAAHO2tR6pl\n" +
  80 + "F+nPB0E2lXJxb+JoWRcGrS915f6C8sK5g6L98Fk13A6V5xB2kX16eWUvK1IZbaQmku86NQFXV1gs\n" +
  81 + "bV8Ub78HxnDjNWecX5zrciSXOoB4YwyZCeQoG6u0EV5kLet1m2bjOGKNPv+I6PSv2RGNBCGTo0hM\n" +
  82 + "TBoTtuzWUPnKdCM/Pe5Njns+zvUIXqlMeIh10hWH9sMewPjDnSW+/rpu0cSGGV2Vfn/BSXDiIZfG\n" +
  83 + "yA9IBC0TnoQs/Vz63uWIOkhEFT2DgUGkgDoo1wdETi303n5EVzUpsgH0aVwLKpTYatyOA0x1hOr4\n" +
  84 + "3LYn8b9ZEo0IINRG9KARJHpJsVP49eRhDJzO7IcH405Qz+uhz5Cs9GHyAvAAlAYJEWn0p77gDclY\n" +
  85 + "Rls5fu5RqnAFjFzGjIXuvqyhuKoddBWT0Wd3rvy//9IK38upDnb/j3VgUNaK3sA4kKYxmaZsR8hg\n" +
  86 + "dBWUj6ixGVzN7MkjScAb9cejo/FzGXH6E1JxFy/i0dUsByXA+25ol7ccGVqR4ObRN+XPD1gmh42e\n" +
  87 + "gOFJ8+kswVt/RGBbXqmrw+pdsZNiUfLld6yodBIsi6Ggjzv38yQ+rwnuV7Mqlo4BylMnKM8RRUx+\n" +
  88 + "yYh1KwV4lNvk5iBX7E0/96akAagVHIWQIlflR4DhKCzqbRQmbMPitt5K0oRhF1oF9gGT+D/qIIaQ\n" +
  89 + "qondzBge0OuJ6M++uR8o+sk1W+daQHTAG08ycJaeHK2oMhrBsexaV7xmqoyGdu6TIG8OJoIlsFbn\n" +
  90 + "WUMp6Zv9IRpaScXBWkBER+Cj3ay1abvyrLnnRh9L93uxeqvH7+eFx5u1JKGUrh7O5Xvve9ZEfcgd\n" +
  91 + "drX8p5i/kU4UjjEIhddLfZADCYeQ3KbBzYA449/i0VlMT9MGltC9ET0uBYs/Lrq0pJK5gjlWdlYT\n" +
  92 + "9lD+0mgVt3Gbao34KBYKnYBwRRWXzJBz9b9Y1PsSMp89HZ1SMV/KOSZCA+R9IYVWE+Dq/fRYG7Xi\n" +
  93 + "h7Q3aVkvs8UHzDFPC5VWkabxPVPd++JNK8qBgISkyALHV6X5EOXMIh3jodbirG+Zeki+AIbz69JJ\n" +
  94 + "7yhVwUC7/6Y7yH3+TPJbSnIX//unj7lqhcr+cxXHPSfFmMem3ndCHqUgsJ6XhbstWYu1OW5eelty\n" +
  95 + "PjOn1Tk2gb0tC/bDNYTZqo56f1p9RmCfS8iYBCnHPuRxw5qxQTrLcHwszRECuz/wra+81DYXQ/76\n" +
  96 + "n3+skfeop/5SegruolxZgZEAYBH2hY4oc18RRiOToL3q1Dbhx3lH+4tD7xOuXMIuOF9EAW0L6rqU\n" +
  97 + "C+SMPbKQfGbWNEBEKA3pYkDT83QwpmBJF/Rra23MF4XP4t9JBcdn7dbpki0LMvN2O/4RDREApZ60\n" +
  98 + "Mh/zueXXquWy1fkxWz9YM1HhwvckROgRDZrghVszrClwUP8BrQL5RQlP3Kd/a4/8W5RiIcRiW/8V\n" +
  99 + "a5R5wS2vUXTGfJVALLjsoAhvTRBId4wxoS4HtG+LGxZUzpNQhAGPPjJnhjtk5wHPU8paITqjaY+0\n" +
  100 + "GSrEJ9PDimhrBJHw+b4Jb8XNEyWjVb/7bVPd8ztSbASJEgq1yDguMZTqkbrZp5IK7VDHQpDKlEkL\n" +
  101 + "HxwG1/F0iVYf/fYUjuBtXUZdwL4k0o+D3MkoiTGHijeFcBnAZ74HGczFsVzbv0yZ1JPagLzDwTZr\n" +
  102 + "HDr2Qw5NDnLIe6HwmL8bXFz8H+hla7eABo40gqOCFVja2npPLNuvFDFA1Y6gKCEbwaoFOXWJZT2p\n" +
  103 + "VHiytSPn7KoZN2dlOz8rct3vLMtRBhZcGGs0UHSuHe+OhIBQ1WlSziI9wKHn9T1y6slifwc7D3vb\n" +
  104 + "2DETuGKur2NubxJm2wL4Lz9OI3DZ9xeeXChwQH1uC+6paxzfXNO34OlXOLpVduy7L5caWTUecBnW\n" +
  105 + "41OxspfCar67RBok033NEyHyrtuoSMrNLdr49jU3dUbSXi3/r5tDPMGhZ+OVQvkI932pbLLzx38L\n" +
  106 + "XYOiEGvonk9n1wjX77iSImDa7v48bKkX7oCyvFw9A/b3I1DlWvGfhrrya/BX0+w+8o08o66rMlLZ\n" +
  107 + "wgJq522XXrUO8AMyAJBJ+cARa2XC4UoX5+XkDoqLEIRzXxCtyC9BZ2GevedH3I5DpsV7FJCDxKrm\n" +
  108 + "txXBACB6W9PEHaGhwsx0RBPtiue6y2WBKAQuMJVNLyhCozWBjuaq5+L3YMIat730PGuOQcKPDnA5\n" +
  109 + "Lm7naPdSfCVnUrK5UiTtHrX85b6rqmAFbCU+OzlJ2C9bhGf214X5wOuJMLJJ68vV1fMEZvQkCijF\n" +
  110 + "OZX45OPiwh57hiFZVuLqrL36n5FdrHjfkhpSYymFgAIiSTQgnWSkthpYkbmZv3x+NQ==","Lymsh@2016"));
70 111 }
71 112  
72 113 }