李俊

Merge branch 'master-weblogic'

package com.erry.iclear.dateInterface.api;
import com.erry.iclear.dateInterface.api.request.HsCodeParam;
import com.erry.iclear.dateInterface.api.response.ResultHsCode;
import com.erry.iclear.dateInterface.entity.IClearApiHsCodeLog;
import com.erry.iclear.dateInterface.service.HsCodeService;
import com.erry.iclear.dateInterface.service.IClearApiHsCodeLogService;
import com.erry.iclear.dateInterface.util.StringUtil;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.Date;
/**
* @author Administrator
* /hscode/hscodeRequest
*/
@RestController
@RequestMapping("/version")
@Slf4j
public class VersionInterface {
//当前版本号
final String VERSION = "1.3";
@ApiOperation(value = "获取当前API版本", httpMethod = "GET", notes = "ex: http://192.168.1.71:8080/version/version")
@GetMapping("/version")
@ResponseBody
public String version(HttpServletRequest request) {
String msg = "当前API版本号为:" + this.VERSION;
return msg;
}
}
......@@ -114,7 +114,7 @@ public class ApiService {
public void refreshToken(String token) throws Exception{
Map<String,String> map = new HashMap<String,String>();
map.put("token", token);
HttpUtils.doPost(this.refreshTokenUrl,map);
HttpUtils.doProxyPost(this.refreshTokenUrl,map,this.proxyUrl,this.proxyPort);
}
/**
......@@ -156,6 +156,7 @@ public class ApiService {
//推送海关回执数据
// String json = HttpUtils.doPost(this.customsUrl,objJson,headerMap);
String json = HttpUtils.doProxyPost(this.customsUrl,objJson,headerMap,this.proxyUrl,this.proxyPort);
log.info("sendCustoms:"+json);
//接口响应时间
declearTask.setResponseTime(new Date());
TokenResult tokenResult = JsonToJava.parseJson(json,TokenResult.class);
......