头像优化

biz/user/classes/UserClass.php

@@ -130,11 +130,13 @@ class UserClass extends BaseClass
 		if (isset($getUserInfo['headImgUrl']) && !empty($getUserInfo['headImgUrl'])) {
 			if (empty($preUser) || (isset($preUser['avatar']) && empty($preUser['avatar']))) {
 				$imgUrl = $getUserInfo['headImgUrl'];
-				$name = ImageService::generateAvatar($merchantId, $imgUrl);
-				self::updateById($userId, ['avatar' => $name]);
+				$currentImg = ImageService::generateAvatar($merchantId, $imgUrl);
+				if (!empty($currentImg)) {
+					self::updateById($userId, ['avatar' => $currentImg]);
+				}
 			}
 		}
-
+		
 		//商家客户粉丝 +1
 		$type = $subscribe == 1 ? 3 : 1;
 		MerchantAssetClass::addUserNum($merchantId, $type);
@@ -185,7 +187,9 @@ class UserClass extends BaseClass
 			if (isset($getUserInfo['headImgUrl']) && !empty($getUserInfo['headImgUrl'])) {
 				$imgUrl = $getUserInfo['headImgUrl'];
 				$name = ImageService::generateAvatar($merchantId, $imgUrl);
-				$data['avatar'] = $name;
+				if(!empty($name)){
+					$data['avatar'] = $name;
+				}
 			}
 		}
 		
@@ -231,17 +235,17 @@ class UserClass extends BaseClass
 		$connection = Yii::$app->db;//事务处理
 		$transaction = $connection->beginTransaction();
 		try {
-
+			
 			$delUserId = $delUser['id'];
 			$retainUserId = $retainUser['id'];
-
+			
 			$userName = $retainUser['userName'];
 			$merchantId = $retainUser['merchantId'];
-
+			
 			//合并记录
 			$return = UserMergeClass::add(['delUserId' => $delUserId, 'merchantId' => $merchantId, 'retainUserId' => $retainUserId, 'addTime' => time(), 'createTime' => date("Y-m-d H:i:s")]);
 			$targetId = $return['id'];
-
+			
 			$typeList = configDict::getConfig('capitalType');
 			$capitalType = $typeList['xhMergeUser']['id'];
 			$now = time();

biz/user/services/UserService.php

@@ -111,7 +111,9 @@ class UserService extends BaseService
 				$headImgUrl = $val['headimgurl'];
 				$openId = $val['openid'];
 				$img = ImageService::generateAvatar($merchantId, $headImgUrl);
-				UserClass::updateByCondition(['openId' => $openId], ['avatar' => $img]);
+				if (!empty($img)) {
+					UserClass::updateByCondition(['openId' => $openId], ['avatar' => $img]);
+				}
 			}
 		}
 		echo "更新成功\n";

common/services/ImageService.php

@@ -27,21 +27,18 @@ class ImageService
 		$fileName = $middle . $name;
 		$curl = new curl\Curl();
 		$result = $curl->get($url);
-
+		
 		$fp = @fopen($fullFileName, 'a');
 		fwrite($fp, $result);
 		fclose($fp);
-
+		
 		$imgInfo = getimagesize($fullFileName);
+		if (empty($imgInfo) || isset($imgInfo[0]) == false) {
+			return '';
+		}
 		$width = $imgInfo[0];
 		$height = $imgInfo[1];
-		
-		if($width == 0){
-			echo $fullFileName;
-			print_r($imgInfo);
-			die;
-		}
-		
+
 		//生成小图 200px
 		$smallWidth = 200;
 		$smallHeight = ceil((200 * $height) / $width);
@@ -49,7 +46,7 @@ class ImageService
 			$smallWidth = $width;
 			$smallHeight = $height;
 		}
-		$smallFullPathFile = $path .$middle. $middleName . '_small.jpg';
+		$smallFullPathFile = $path . $middle . $middleName . '_small.jpg';
 		Image::thumbnail($fullFileName, $smallWidth, $smallHeight)->save($smallFullPathFile, ['quality' => 100]);
 		return $fileName;
 	}