Merge remote-tracking branch 'remotes/origin/master' into zhuly_bate

src/main/java/com/founder/interservice/config/filter/LogFilter.java

@@ -69,7 +69,7 @@ public class LogFilter implements Filter {
                 filterChain.doFilter(httpServletRequest, servletResponse);
             }else{
                 if (StringUtil.ckeckEmpty(yhCateCode) || StringUtil.ckeckEmpty(projectName)) {
-                    ResultVO resultVO = ResultVOUtil.error(ResultEnum.PARAM_NOTNULL.getCode(), ResultEnum.PARAM_NOTNULL.getMessage());
+                    ResultVO resultVO = ResultVOUtil.error(ResultEnum.PARAM_NOTNULL.getCode(), ResultEnum.PARAM_NOTNULL.getMessage(),"请检查yhCate和projectName参数是否正确");
                     OutputStream outputStream = servletResponse.getOutputStream();
                     outputStream.write(resultVO.toString().getBytes());
                 } else {
@@ -94,6 +94,9 @@ public class LogFilter implements Filter {
                             case "05":
                                 yhCateName = "讯之美";
                                 break;
+                            case "06":
+                                yhCateName = "德拓";
+                                break;
                             default:
                                 yhCateName = "方正";
                                 break;

src/main/java/com/founder/interservice/protogenesis/controller/ProtoController.java

@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/com/founder/interservice/protogenesis/service/impl/ProtoServiceImpl.java

@@ -273,7 +273,6 @@ public class ProtoServiceImpl implements ProtoService {
             String result = HttpClient.doPostWaData(url,param);
             return result;
         }catch (InterServiceException e){
-            e.printStackTrace();
             throw new InterServiceException(ResultEnum.REQUEST_URL_ERROR.getCode(),ResultEnum.REQUEST_URL_ERROR.getMessage());
         }
     }

src/main/java/com/founder/interservice/util/HttpClient.java

@@ -203,15 +203,11 @@ public class HttpClient {
             CloseableHttpResponse result = httpClient.execute(httpPost);
             if (result.getStatusLine().getStatusCode() == HttpStatus.SC_OK){
                 String str = "";
-                try{
-                    // 读取服务器返回的json数据（然后解析）
-                    jsonResult = EntityUtils.toString(result.getEntity(), "utf-8");
-                    // 把json字符串转换成json对象
-                }catch (Exception e){
-                    throw new InterServiceException(ResultEnum.REQUEST_URL_ERROR.getCode(),ResultEnum.REQUEST_URL_ERROR.getMessage(),e);
-                }
+                // 读取服务器返回的json数据（然后解析）
+                jsonResult = EntityUtils.toString(result.getEntity(), "utf-8");
             }
         }catch (IOException e){
+            e.printStackTrace();
             throw new InterServiceException(ResultEnum.REQUEST_URL_ERROR.getCode(),ResultEnum.REQUEST_URL_ERROR.getMessage(),e);
         }finally{
             httpPost.releaseConnection();

src/main/resources/templates/公司代码.properties

-\u65B9\u6B63=00
+\u65B9\u6B63=00
@@ -4,3 +4,4 @@
 \u5929\u5F66=03
 \u6D77\u946B=04
 \u8BAF\u4E4B\u7F8E=05
+\u5FB7\u62D3=06

src/main/resources/token.properties

-apikey=fb5aaf49482721d6c495d3ae26796216
+apiKey=fb5aaf49482721d6c495d3ae26796216
 username=xjzd-fangzheng
 token_url=http://www.adu.cq:8071/doc/token/token
 token=