用户头像url拼接

ch-dao/src/main/java/com/wwdz/ch/db/domain/User.java

@@ -5,7 +5,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
-
 import com.xxdxxs.entity.Entity;
 import lombok.Data;
 import org.springframework.util.ObjectUtils;
@@ -172,7 +171,11 @@ public class User implements Entity {
         }
         user.setNickname(wuser.getUnick());
         user.setMobile(wuser.getPhone());
-        user.setAvatar("https://cdn.wanwudezhi.com" + wuser.getAvatar());
+        if (StringUtils.hasLength(wuser.getAvatar()) && wuser.getAvatar().startsWith("/")) {
+            user.setAvatar("https://cdn.wanwudezhi.com" + wuser.getAvatar());
+        } else {
+            user.setAvatar("https://cdn.wanwudezhi.com/" + wuser.getAvatar());
+        }
         user.setWeixinOpenid(wuser.getOpenId());
         user.setWeixinUnionid(wuser.getUnionId());
         user.setStatus(wuser.getStatus());
@@ -192,6 +195,8 @@ public class User implements Entity {
 
 
 
+
+
     public static com.wwdz.user.api.model.user.User convertToWWDZUser(User user){
 
         com.wwdz.user.api.model.user.User wuser = new com.wwdz.user.api.model.user.User();

ch-wx-api/src/main/java/com/wwdz/ch/wx/web/WxStorageController.java

@@ -6,6 +6,7 @@ import com.wwdz.ch.core.util.CharUtil;
 import com.wwdz.ch.core.util.ResponseUtil;
 import com.wwdz.ch.db.dao.dts.DtsStorageDao;
 import com.wwdz.ch.db.domain.Storage;
+import com.wwdz.ch.db.domain.System;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
@@ -15,6 +16,7 @@ import org.springframework.core.io.Resource;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
+import org.springframework.util.StringUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -60,6 +62,8 @@ public class WxStorageController {
 		return key;
 	}
 
+
+
 	/**
 	 * 上传文件
 	 *