Browse Source

fix bug : 同步项目名称乱码

FanXiaoyu 6 years ago
parent
commit
bf8c1fc039

+ 22 - 24
src/main/java/com/sagacloud/route/Route.java

@@ -1,6 +1,5 @@
 package com.sagacloud.route;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.github.rjeschke.txtmark.Processor;
@@ -25,17 +24,14 @@ import org.slf4j.LoggerFactory;
 
 import javax.ws.rs.core.MediaType;
 import java.io.StringWriter;
-import java.lang.reflect.ParameterizedType;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 /**
  * Created by Xiaoyu on 2018/7/10
  */
 public class Route extends ExceptionHandlerBaseRoute {
     private static final Logger log = LoggerFactory.getLogger(Route.class);
+
     @Override
     public void configure() throws Exception {
         configExceptionHandler();
@@ -133,7 +129,6 @@ public class Route extends ExceptionHandlerBaseRoute {
                 .process(new FilterPropertyProcessor());
 
 
-
         rest("/project/sync").post()
                 .consumes(MediaType.APPLICATION_JSON)
                 .produces(MediaType.APPLICATION_JSON)
@@ -229,14 +224,13 @@ public class Route extends ExceptionHandlerBaseRoute {
                     try {
                         String body = exchange.getIn().getBody(String.class);
                         JSONObject obj = JSONObject.parseObject(body);
-                        if(obj != null && obj.getJSONArray("project") != null && obj.getJSONArray("project").size() > 0)
-                        {
+                        if (obj != null && obj.getJSONArray("project") != null && obj.getJSONArray("project").size() > 0) {
 //                            List<String> projectIds = JSONArray.parseArray(obj.getJSONArray("project").toJSONString(), String.class);
                             List<String> projectIds = obj.getJSONArray("project").toJavaList(String.class);
                             exchange.setProperty("projectIds", new HashSet<String>(projectIds));
-                        }else
+                        } else
                             throw new InvalidPostException("输入格式错误");
-                    }catch (Exception ex){
+                    } catch (Exception ex) {
                         throw new InvalidPostException("输入格式错误");
                     }
                     exchange.getIn().setHeader(Exchange.HTTP_URI, String.join("", InitEnvRoute.dataPlatform, "/mng/project/query?bridgeEndpoint=true&secret=A123456"));
@@ -250,34 +244,38 @@ public class Route extends ExceptionHandlerBaseRoute {
                     JSONArray criterias = new JSONArray();
                     for (String pjId : ProPasCache.nameMap.keySet()) {
                         JSONObject obj = new JSONObject();
-                        obj.put("projectId",pjId);
-                        obj.put("projectLocalName",ProPasCache.nameMap.get(pjId));
+                        obj.put("projectId", pjId);
+                        obj.put("projectLocalName", ProPasCache.nameMap.get(pjId));
                         criterias.add(obj);
                     }
                     JSONObject inserJson = new JSONObject();
-                    inserJson.put("criterias",criterias);
-                    log.info("数据:"+inserJson.toString());
+                    inserJson.put("criterias", criterias);
+                    log.info("数据:" + inserJson.toString());
                     exchange.getIn().setBody(inserJson.toString());
-                    exchange.getIn().setHeader(Exchange.HTTP_URI, InitEnvRoute.venders+"/auxiliary/project/create?method=POST");
-                    log.info(InitEnvRoute.venders+"/auxiliary/project/create?method=POST");
+                    System.out.println(inserJson.toString());
+                    exchange.getIn().setHeader(Exchange.HTTP_URI, InitEnvRoute.venders + "/auxiliary/project/create");
+                    exchange.getIn().setHeader(Exchange.HTTP_METHOD, "POST");
+                    exchange.setProperty("CamelCharsetName", "utf-8");
+                    log.info(InitEnvRoute.venders + "/auxiliary/project/create");
                 })
-                .to(InitEnvRoute.venders+"/auxiliary/project/create");
+//                .convertBodyTo(String.class,"UTF-8")
+                .to(InitEnvRoute.venders + "/auxiliary/project/create");
 
         rest("/getInsuranceNum").post()
                 .produces(MediaType.APPLICATION_JSON)
                 .route()
-                .process(ContractMethods :: validateDPInsurerID)
-                .process(ContractMethods :: preQueryEq)
+                .process(ContractMethods::validateDPInsurerID)
+                .process(ContractMethods::preQueryEq)
                 .to(InitEnvRoute.dataPlatform + "/object/subset_query?bridgeEndpoint=true")
-                .process(ContractMethods :: extractInsuranceNum);
+                .process(ContractMethods::extractInsuranceNum);
 
         rest("/getSupplierContractID").post()
                 .produces(MediaType.APPLICATION_JSON)
                 .route()
-                .process(ContractMethods :: validateDPSupplierID)
-                .process(ContractMethods :: preQueryEq)
+                .process(ContractMethods::validateDPSupplierID)
+                .process(ContractMethods::preQueryEq)
                 .to(InitEnvRoute.dataPlatform + "/object/subset_query?bridgeEndpoint=true")
-                .process(ContractMethods :: extractSupplierContractIds);
+                .process(ContractMethods::extractSupplierContractIds);
 
         rest("/recommend").post()
                 .produces(MediaType.APPLICATION_JSON)

+ 1 - 1
src/main/resources/test/config.properties

@@ -2,6 +2,6 @@ dataPlatform.baseUrl=http4://192.168.100.225:8080/data-platform-3
 venders.baseUrl=http4://192.168.100.225:8080/venders
 
 
-#venders.baseUrl=http://localhost:8080
+#venders.baseUrl=http4://localhost:8080/venders
 #venders.baseUrl=http://localhost:8080