Commit 48409765 4840976550912462155787223e7e576a04751cf9 by xianghan

1.优化

1 parent 5ffa9270
......@@ -21,6 +21,7 @@ import com.topdraw.config.RedisKeyUtil;
import com.topdraw.exception.BadRequestException;
import com.topdraw.exception.EntityNotFoundException;
import com.topdraw.exception.GlobeExceptionMsg;
import com.topdraw.resttemplate.RestTemplateClient;
import com.topdraw.util.Base64Util;
import com.topdraw.util.JSONUtil;
import com.topdraw.utils.RedisUtils;
......@@ -266,7 +267,9 @@ public class UserOperationController {
if (StringUtils.isNotBlank(headimgurl)) {
String headimgurlDecode = URLDecoder.decode(headimgurl, "UTF-8");
memberDTO.setAvatarUrl(headimgurlDecode);
String imageEncode = Base64Util.encode(headimgurlDecode);
String image = RestTemplateClient.chooseImage(imageEncode, "image");
memberDTO.setAvatarUrl(StringUtils.isNotBlank(image) == true ? image:headimgurlDecode);
}
}catch (Exception e) {
log.info("headimgurl , nickname ===>> encode error!");
......
package com.topdraw.resttemplate;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.topdraw.business.module.member.address.domain.MemberAddress;
import com.topdraw.business.module.member.domain.Member;
import com.topdraw.business.module.member.relatedinfo.domain.MemberRelatedInfo;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.env.Environment;
import org.springframework.http.ResponseEntity;
import org.springframework.http.client.SimpleClientHttpRequestFactory;
import org.springframework.stereotype.Component;
import org.springframework.web.client.RestTemplate;
import javax.annotation.PostConstruct;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@Slf4j
@Component
public class RestTemplateClient {
private static RestTemplate restTemplate;
private static String BASE_URL;
@Autowired
private Environment environment;
@PostConstruct
private void init() {
BASE_URL = environment.getProperty("api.uc-service");
SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory();
// 设置连接超时
factory.setConnectTimeout(5000);
// 设置读取超时
factory.setReadTimeout(3000);
restTemplate = new RestTemplate(factory);
}
public static String chooseImage(String base64Url, String entity) {
Image image = new Image(base64Url, entity);
String entityBody = "";
String url = BASE_URL + "/ucService/api/upload/chooseImage";
log.info("request uc : url is " + url + ", memberId is " + com.alibaba.fastjson.JSONObject.toJSONString(image));
ResponseEntity<String> responseEntity = restTemplate.postForEntity(url, image, String.class);
if (responseEntity.getStatusCode().is2xxSuccessful()) {
entityBody = responseEntity.getBody();
JSONObject parseObject = JSON.parseObject(entityBody);
List<Object> resultSet = (List)parseObject.get("resultSet");
Object o = resultSet.get(0);
return Objects.nonNull(o)?o.toString():"";
}
return entityBody;
}
@Data
static class Image {
private String base64URL;
private String entity;
public Image(String base64Url, String entity){
this.base64URL = base64Url;
this.entity = entity;
}
}
}
......@@ -141,4 +141,5 @@ weixin:
qrCodeExpireSeconds: 300
env: dev
api:
uc-service: https://inet.dev1.topmall.topdraw.cn
\ No newline at end of file
......