Merge remote-tracking branch 'origin/master'

admin

2019-05-22 9b4bf99c1a30f3a7c2bdd6faba7589ff4f7e48e5

 fanli/src/main/java/com/yeshi/fanli/aspect/SignValidateAspect.java

@@ -24,6 +24,7 @@
import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.ThreadUtil;



import net.sf.json.JSONObject;



@@ -32,7 +33,7 @@
@Aspect

@Order(2)

public class SignValidateAspect {

   public static final String EDP = "execution(* com.yeshi.fanli.controller.client.*.*(..))";

   public static final String EDP = "execution(* com.yeshi.fanli.controller.client.v1.*.*(..))";



   public static String KEY = "";



@@ -85,16 +86,25 @@
      // 签名是否正确

      if (isRight) {

         // 判断签名超时

         // if (Math.abs((Long.parseLong(acceptData.getTime()) -

         // System.currentTimeMillis())) > 1000 * 60 * 10) {

         // JSONObject data = new JSONObject();

         // data.put("code", -2);

         // data.put("msg", "时间错误");

         // out.print(data);

         // out.close();

         // return null;

         // }

         // uid

         if (Math.abs((Long.parseLong(acceptData.getTime()) - System.currentTimeMillis())) > 1000 * 60 * 10) {

            JSONObject data = new JSONObject();

            data.put("code", -2);

            data.put("msg", "时间错误");

            out.print(data);

            out.close();

            return null;

         }



         final String url = request.getRequestURI();

         @SuppressWarnings("unchecked")

         final Map<String, Object> params = request.getParameterMap();

         ThreadUtil.run(new Runnable() {

            @Override

            public void run() {

               // 记录请求日志

               LogHelper.requestInfo(url, params);

            }

         });



         Object obj = null;

         try {