From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/aspect/LoginAspect.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/aspect/LoginAspect.java b/fanli/src/main/java/com/yeshi/fanli/aspect/LoginAspect.java
index 6a3fe4e..240026f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/aspect/LoginAspect.java
+++ b/fanli/src/main/java/com/yeshi/fanli/aspect/LoginAspect.java
@@ -19,6 +19,7 @@
import org.yeshi.utils.JsonUtil;
import com.yeshi.fanli.entity.common.AdminUser;
+import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.AdminUserService;
import com.yeshi.fanli.util.AESUtil;
import com.yeshi.fanli.util.Constant;
@@ -54,9 +55,12 @@
// 閭欢H5鏉ユ簮鐨勪笉鍒ゆ柇鏄惁鐧诲綍
if ("emailh5".equalsIgnoreCase(from)) {
String callback = request.getParameter("callback");
- String signAES = URLDecoder.decode(request.getParameter("sign"),"UTF-8");
+ String signAES = request.getParameter("sign");
+ if (signAES != null && signAES.contains("%"))
+ signAES = URLDecoder.decode(request.getParameter("sign"), "UTF-8");
String sign = AESUtil.decrypt(signAES, Constant.ADMINH5_AESKEY);
if (!StringUtil.isNullOrEmpty(sign)) {
+ LogHelper.error("H5瀹℃牳绛惧悕:" + sign);
JSONObject json = JSONObject.fromObject(sign);
long time = json.optLong("timeStamp");
long adminId = json.optLong("adminId");
--
Gitblit v1.8.0