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/util/wx/WXLoginUtil.java | 45 +++++++++++++++++++++++++++------------------
1 files changed, 27 insertions(+), 18 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/wx/WXLoginUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/wx/WXLoginUtil.java
index 4fb0f0f..f9b98be 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/wx/WXLoginUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/wx/WXLoginUtil.java
@@ -2,17 +2,15 @@
import org.json.JSONException;
import org.json.JSONObject;
-
-import com.qcloud.cos.model.COSObjectSummary;
-import com.qcloud.cos.model.ObjectListing;
-import com.yeshi.fanli.entity.bus.user.WeiXinUser;
-import com.yeshi.fanli.entity.bus.user.WeiXinUserParam;
-import com.yeshi.fanli.util.Constant;
-import com.yeshi.fanli.util.StringUtil;
import org.yeshi.utils.HttpUtil;
import org.yeshi.utils.entity.FileUploadResult;
import org.yeshi.utils.tencentcloud.COSManager;
-import org.yeshi.utils.wx.WXUtil;
+
+import com.yeshi.fanli.entity.bus.user.WeiXinUser;
+import com.yeshi.fanli.entity.bus.user.WeiXinUserParam;
+import com.yeshi.fanli.log.LogHelper;
+import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.StringUtil;
public class WXLoginUtil {
@@ -76,12 +74,17 @@
return weiXinUser;
}
- private static WeiXinUser getWeiXinUser(String code) {
+ public static WeiXinUser getWeiXinUser(String code) {
WeiXinUserParam param = getWxParam(code);
if (param == null) {
return null;
}
- return getWeiXinUser(param);
+ WeiXinUser weiXinUser = getWeiXinUser(param);
+ if (weiXinUser != null && StringUtil.isNullOrEmpty(weiXinUser.getUnionid())
+ && !StringUtil.isNullOrEmpty(param.getUnionId())) {
+ weiXinUser.setUnionid(param.getUnionId());
+ }
+ return weiXinUser;
}
/**
@@ -101,14 +104,17 @@
if (result != null && !StringUtil.isNullOrEmpty(result.getUrl())) {
user.setHeadimgurl(result.getUrl());
// COS鍒犻櫎鍏朵綑澶村儚
-// String prefix = String.format("/portrait/wx/%s_", user.getUnionid());
-// ObjectListing list = COSManager.getInstance().getObjectList(prefix, null, 30);
-// if (list != null && list.getObjectSummaries() != null)
-// for (COSObjectSummary object : list.getObjectSummaries()) {
-// if (!result.getUrl().contains(object.getKey())) {
-// COSManager.getInstance().deleteFile(object.getKey());
-// }
-// }
+ // String prefix = String.format("/portrait/wx/%s_",
+ // user.getUnionid());
+ // ObjectListing list =
+ // COSManager.getInstance().getObjectList(prefix, null, 30);
+ // if (list != null && list.getObjectSummaries() != null)
+ // for (COSObjectSummary object : list.getObjectSummaries())
+ // {
+ // if (!result.getUrl().contains(object.getKey())) {
+ // COSManager.getInstance().deleteFile(object.getKey());
+ // }
+ // }
}
}
}
@@ -124,6 +130,7 @@
}
private static WeiXinUserParam getWeiXinUserParam(String result) {
+ LogHelper.test(result);
WeiXinUserParam weiXinUserParam = new WeiXinUserParam();
JSONObject jsonObject = null;
try {
@@ -139,12 +146,14 @@
String refreshToken = jsonObject.optString("refresh_token");
String scope = jsonObject.optString("scope");
int expires = jsonObject.optInt("expires_in");
+ String unionId = jsonObject.optString("unionid");
weiXinUserParam.setRefreshToken(refreshToken);
weiXinUserParam.setOpenId(openId);
weiXinUserParam.setExpires(expires);
weiXinUserParam.setAccessToken(accessToken);
weiXinUserParam.setScope(scope);
+ weiXinUserParam.setUnionId(unionId);
return weiXinUserParam;
}
--
Gitblit v1.8.0