阿里云同步到处理(西藏)

common/common_utils/src/main/java/com/founder/commonutils/util/AesEncryptUtil.java

@@ -5,8 +5,11 @@ import org.apache.commons.codec.binary.Base64;
 import javax.crypto.Cipher;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
+import javax.servlet.http.HttpServletResponse;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * AES 128bit 加密解密工具类
@@ -71,8 +74,8 @@ public class AesEncryptUtil {
      */
     public static String desEncrypt(String data, String key, String iv) throws Exception {
         try {
+            data = data.replaceAll(" ","+");
             byte[] encrypted1 = new Base64().decode(data);
-
             Cipher cipher = Cipher.getInstance("AES/CBC/NoPadding");
             SecretKeySpec keyspec = new SecretKeySpec(key.getBytes(), "AES");
             IvParameterSpec ivspec = new IvParameterSpec(iv.getBytes());
@@ -84,7 +87,7 @@ public class AesEncryptUtil {
             return originalString;
         } catch (Exception e) {
             e.printStackTrace();
-            return null;
+            return "解密失败";
         }
     }
 
@@ -110,7 +113,12 @@ public class AesEncryptUtil {
         return desEncrypt(data, KEY, IV);
     }
 
-
+    public static Map<String, Object> getMap(Integer status, String msg) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("code", status);
+        map.put("msg", msg);
+        return map;
+    }
 
     /**
      * 测试

common/service_base/src/main/java/com/founder/servicebase/controller/SysUserController.java

@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
@@ -59,6 +60,10 @@ public class SysUserController extends ApiController {
         String username = desEncrypt(user.getUsername(), KEY, IV).trim();
         String password = desEncrypt(user.getPassword(), KEY, IV).trim();
 
+        // 解密失败
+        if("解密失败".equals(username)||"解密失败".equals(password)){
+            return MapRestResult.build(201, "解密失败", "解密失败");
+        }
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq("USERNAME", username);
         queryWrapper.eq("PASSWORD", DigestUtil.encrypt(password));