From 3dedb52664dfa4101589698db52ea9cb9493efa9 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期二, 18 二月 2020 12:53:53 +0800
Subject: [PATCH] Merge branch 'div-new' into div
---
fanli/src/main/java/com/yeshi/fanli/aspect/SignValidateAspect.java | 35 +++++++++++++++++++++++++++++------
1 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/aspect/SignValidateAspect.java b/fanli/src/main/java/com/yeshi/fanli/aspect/SignValidateAspect.java
index 3aafcb1..7eb6b03 100644
--- a/fanli/src/main/java/com/yeshi/fanli/aspect/SignValidateAspect.java
+++ b/fanli/src/main/java/com/yeshi/fanli/aspect/SignValidateAspect.java
@@ -42,7 +42,7 @@
}
@Around(EDP)
- public Object testAround(ProceedingJoinPoint joinPoint) throws IOException {
+ public Object testAround(ProceedingJoinPoint joinPoint) throws Throwable {
Object[] args = joinPoint.getArgs();
PrintWriter out = null;
ServletRequestAttributes servletContainer = (ServletRequestAttributes) RequestContextHolder
@@ -125,7 +125,10 @@
} catch (Throwable e) {
LogHelper.errorDetailInfo(e, getHttpServletParams(request), request.getRequestURI().toString());
- out.print(JsonUtil.loadFalseResult(90009, "鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�"));
+ if (!Constant.IS_TEST)
+ out.print(JsonUtil.loadFalseResult(90009, "鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�"));
+ else
+ throw e;
}
return obj;
} else {
@@ -134,7 +137,7 @@
data.put("msg", "绛惧悕閿欒");
out.print(data);
out.close();
- LogHelper.error("绛惧悕閿欒:" + getHttpServletParams(request));
+ LogHelper.error("绛惧悕閿欒:" + request.getRequestURI() + "-" + getHttpServletParams(request));
return null;
}
}
@@ -193,9 +196,9 @@
while (its.hasNext()) {
String key = its.next();
-// if (key.equalsIgnoreCase("callback")) {
-// fromWEB = true;
-// }
+ // if (key.equalsIgnoreCase("callback")) {
+ // fromWEB = true;
+ // }
if (key.equalsIgnoreCase("sign") || key.equalsIgnoreCase("callback") || key.equalsIgnoreCase("_")) {
continue;
@@ -221,4 +224,24 @@
}
}
+ public static boolean signIsRight(JSONObject json) {
+ List<String> list = new ArrayList<>();
+ for (Iterator<String> its = json.keySet().iterator(); its.hasNext();) {
+ String key = its.next();
+ list.add(key + "=" + json.optString(key));
+ }
+ Collections.sort(list);
+ String str = "";
+ for (String st : list) {
+ str += st + "&";
+ }
+ String sign = StringUtil.Md5(str + KEY);
+ if (sign.equalsIgnoreCase(json.optString("sign"))) {
+ return true;
+ } else {
+ return false;
+ }
+
+ }
+
}
--
Gitblit v1.8.0