From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:54:38 +0800
Subject: [PATCH] 足迹、收藏订单兼容新需求
---
fanli/src/main/java/com/yeshi/fanli/util/wx/WXLoginUtil.java | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 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 f9b98be..cce50f0 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
@@ -1,5 +1,7 @@
package com.yeshi.fanli.util.wx;
+import java.io.InputStream;
+
import org.json.JSONException;
import org.json.JSONObject;
import org.yeshi.utils.HttpUtil;
@@ -10,6 +12,7 @@
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.FilePathEnum;
import com.yeshi.fanli.util.StringUtil;
public class WXLoginUtil {
@@ -17,14 +20,9 @@
public static String WEXIN_APPID = "wx43617e2ed82c5b28";
public static String WEXIN_SECRET = "f8a65908fb4681bdd181de70f6ab9a3b";
- static String APPID = "wx5c0d167c6e3ad726";
- static String SECRET = "0c79d5869bb0f2d7c13e43f9a18f440d";
-
static {
WEXIN_APPID = Constant.systemCommonConfig.getWxGZAppId();
WEXIN_SECRET = Constant.systemCommonConfig.getWxGZAppSecret();
- APPID = Constant.systemCommonConfig.getWxOpenAppId();
- SECRET = Constant.systemCommonConfig.getWxOpenAppSecret();
}
// 閫氳繃code鑾峰彇access_token openId
@@ -32,8 +30,8 @@
public static String weiXinUrl2 = "https://api.weixin.qq.com/sns/userinfo?access_token=%s&openid=%s&lang=zh_CN";
- public static WeiXinUserParam getWxParam(String code) {
- String wxUrl = String.format(weiXinUrl1, APPID, SECRET, code);
+ public static WeiXinUserParam getWxParam(String code,String appId,String appSecret) {
+ String wxUrl = String.format(weiXinUrl1, appId, appSecret, code);
String result = HttpUtil.get(wxUrl);
WeiXinUserParam weiXinUserParam = getWeiXinUserParam(result);
return weiXinUserParam;
@@ -74,8 +72,8 @@
return weiXinUser;
}
- public static WeiXinUser getWeiXinUser(String code) {
- WeiXinUserParam param = getWxParam(code);
+ public static WeiXinUser getWeiXinUser(String code,String appId,String appSecret) {
+ WeiXinUserParam param = getWxParam(code,appId,appSecret);
if (param == null) {
return null;
}
@@ -93,14 +91,19 @@
* @param code
* @return
*/
- public static WeiXinUser getWeiXinUserWithSavePortrait(String code) {
- WeiXinUser user = getWeiXinUser(code);
+ public static WeiXinUser getWeiXinUserWithSavePortrait(String code,String appId,String appSecret) {
+ WeiXinUser user = getWeiXinUser(code,appId,appSecret);
if (user != null) {
if (!StringUtil.isNullOrEmpty(user.getHeadimgurl())) {
- FileUploadResult result = COSManager.getInstance().uploadFile(
- HttpUtil.getAsInputStream(user.getHeadimgurl()),
- String.format("/portrait/wx/%s_%s.jpg", user.getUnionid(), System.currentTimeMillis() + ""));
+ InputStream asInputStream = HttpUtil.getAsInputStream(user.getHeadimgurl());
+ if (asInputStream == null) {
+ LogHelper.test("寰俊澶村儚涓嬭浇澶辫触: " +user.getUnionid()+ " " + user.getHeadimgurl());
+ return user;
+ }
+
+ FileUploadResult result = COSManager.getInstance().uploadFile(asInputStream,
+ String.format(FilePathEnum.userWXPortrait.getPath() + "%s_%s.jpg", user.getUnionid(), System.currentTimeMillis() + ""));
if (result != null && !StringUtil.isNullOrEmpty(result.getUrl())) {
user.setHeadimgurl(result.getUrl());
// COS鍒犻櫎鍏朵綑澶村儚
@@ -115,6 +118,8 @@
// COSManager.getInstance().deleteFile(object.getKey());
// }
// }
+ } else {
+ LogHelper.test("寰俊澶村儚涓婁紶澶辫触: " +user.getUnionid()+ " " + user.getHeadimgurl());
}
}
}
--
Gitblit v1.8.0