登陆调整

src/main/java/cn/com/duiba/jdactivity/controller/Open2LankouController.java

@@ -236,20 +236,11 @@ public class Open2LankouController {
             return URLDecoder.decode(redirectUrl, "UTF-8") + "&avatar=" + avatar + "&nickname=" + nickName + "&uid=" + uid;
         }
 
-        CreditTool tool = new CreditTool(APP_KEY, APP_SECRET);
-        Map<String, String> params = new HashMap<>();
-
-        //生成dcustom数据
-        Map<String, String> dcustomParam = new HashMap<>();
-//        dcustomParam.put("avatar", avatar);
-//        dcustomParam.put("nickname", nickName);
-        // 带上是否关注店铺信息
-        dcustomParam.put("isFollow", String.valueOf(isFollow));
-        getDcustom(dcustomParam, params);
         if (StringUtils.equalsIgnoreCase("null", redirectUrl)) {
             redirectUrl = "";
         }
-
+        //免登参数
+        Map<String, String> params = new HashMap<>();
         if (StringUtils.isNotBlank(redirectUrl)) {
             redirectUrl = UrlUtils.urlDecode(redirectUrl);
             params.put("redirect", redirectUrl);
@@ -257,15 +248,25 @@ public class Open2LankouController {
         params.put("uid", uid);
         params.put("nickname", nickName);
         params.put("avatar", avatar);
+        params.put("isFollow", isFollow ? "1" : "0");
         if (StringUtils.isNotBlank(credits)) {
             params.put("credits", credits);
         }
-        String autoUrl = getAutologinHome(env);
 
-        String url = tool.buildUrlWithSign(autoUrl, params);
-        String param = url.substring(url.indexOf("?") + 1, url.length() - 1);
-        String json = paramJson(param);
-        return autoUrl + "?data=" + URLEncoder.encode(json, "UTF-8");
+        //增加签名参数
+        params.put("appKey", APP_KEY);
+        params.put("appSecret", APP_SECRET);
+        if (params.get("timestamp") == null) {
+            params.put("timestamp", System.currentTimeMillis() + "");
+        }
+        //计算签名值
+        String sign = SignTool.sign(params);
+        params.put("sign", sign);
+        params.remove("appSecret");
+        //json字符串参数
+        String paramsJsonStr = JSON.toJSONString(params);
+        String autoUrl = getAutologinHome(env);
+        return autoUrl + "?data=" + URLEncoder.encode(paramsJsonStr, "UTF-8");
     }
 
     public static String paramJson(String paramIn) {