From 292937c16f7ad0021b8cd2dfb8fcc0cdf26f59de Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 01 八月 2019 15:15:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/wx/WXLoginUtil.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 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..46b01b2 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;
@@ -98,8 +100,13 @@
if (user != null) {
if (!StringUtil.isNullOrEmpty(user.getHeadimgurl())) {
- FileUploadResult result = COSManager.getInstance().uploadFile(
- HttpUtil.getAsInputStream(user.getHeadimgurl()),
+ 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("/portrait/wx/%s_%s.jpg", user.getUnionid(), System.currentTimeMillis() + ""));
if (result != null && !StringUtil.isNullOrEmpty(result.getUrl())) {
user.setHeadimgurl(result.getUrl());
@@ -115,6 +122,8 @@
// COSManager.getInstance().deleteFile(object.getKey());
// }
// }
+ } else {
+ LogHelper.test("寰俊澶村儚涓婁紶澶辫触: " +user.getUnionid()+ " " + user.getHeadimgurl());
}
}
}
--
Gitblit v1.8.0