云南配置修改

src/main/java/com/chinaitop/depot/utils/DataSynchronization.java

@@ -0,0 +1,144 @@
+package com.chinaitop.depot.utils;
+
+import java.text.SimpleDateFormat;
+/*import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang.ObjectUtils;
+
+import com.chinaitop.depot.business.model.BusinessContract;
+import com.google.gson.Gson;*/
+
+public class DataSynchronization {
+	private static String urls = "http://192.168.123.123:14100";
+	private static SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");
+	
+	/**
+	 * 查询合同信息
+	 *//*
+	public static List queryContractInfo() {
+		Gson gson = new Gson();
+		Map<String,Object> params = new HashMap<String,Object>();
+		//json对象转换成json字符串
+		String jsonStr = gson.toJson(params);
+		String result = HttpClientUtil.doPostJson(urls+"/contractList", jsonStr);
+		System.out.print(result);
+		params = gson.fromJson(result, Map.class);
+		List list = (List)params.get("data");
+		return list;
+	}
+	
+	*//**
+	 * 合同信息同步---插入
+	 *//*
+	public static void businessContractSynchronizationInsert(BusinessContract contract) {
+		Gson gson = new Gson();
+		Map<String,Object> params = new HashMap<String,Object>();
+		params.put("createDate",contract.getCreateTime()==null?"":format.format(contract.getCreateTime()));
+		params.put("creator",contract.getCreater());
+		params.put("creatorCode","");
+		params.put("htbh",contract.getContractNumber());
+		params.put("htbzje",0);
+		params.put("htbzxx",contract.getRemark());
+		params.put("htjctj",contract.getDissolutionConditions());
+		params.put("htmc",contract.getContractTitle());
+		params.put("htqsdd","");
+		params.put("htqssj",contract.getSigningTime()==null?"":format.format(contract.getSigningTime()));
+		params.put("htsxjzsj",contract.getDisableDate()==null?"":format.format(contract.getDisableDate()));
+		params.put("htsxkssj",contract.getEnableDate()==null?"":format.format(contract.getEnableDate()));
+		params.put("htwyzr",contract.getBreachLiability());
+		params.put("htxxid",contract.getId());
+		params.put("htzdj",0);
+		params.put("htzje",contract.getMoneyQuantity());
+		params.put("htzsl",contract.getGrainQuantity());
+		params.put("jfkdbm",0);
+		params.put("jfkdmc",0);
+		params.put("jfkhh",0);
+		params.put("jflxdh",0);
+		params.put("jfqydm",0);
+		params.put("jfqymc",0);
+		params.put("jfqyr",0);
+		params.put("jfqzzt",0);
+		params.put("jfyhzh",0);
+		params.put("jhjssj",0);
+		params.put("jhkssj",0);
+		params.put("lsdjbm",0);
+		params.put("lsdjmc",0);
+		params.put("lspzbm",0);
+		params.put("lspzhm",contract.getPlanNumber());
+		params.put("lspzid",contract.getPlanBid());
+		params.put("lspzmc","");
+		params.put("refreshTime",contract.getChangeTime()==null?"":format.format(contract.getChangeTime()));
+		params.put("refresher","");
+		params.put("refresherCode","");
+		params.put("remark",contract.getRemark());
+		params.put("spzt",contract.getAuditState());
+		params.put("status",0);
+		params.put("yfkdbm",0);
+		params.put("yfkdmc",0);
+		params.put("yfkhh",0);
+		params.put("yflxdh",0);
+		params.put("yfqydm",0);
+		params.put("yfqymc",0);
+		params.put("yfqyr",0);
+		params.put("yfqzzt",0);
+		params.put("yfyhzh",0);
+		params.put("ysfs",contract.getShippingType());
+		params.put("zffs",contract.getContractPayType());
+		params.put("zxzt",0);
+		params.put("zyjjfs",contract.getDisputeSettlementMethod());
+		
+		
+		
+		//json对象转换成json字符串
+		String jsonStr = gson.toJson(params);
+		String result = HttpClientUtil.doPostJson(urls+"/sinkpoint", jsonStr);
+		System.out.print(result);
+	}
+	
+	*//**
+	 * 库点信息同步---更新
+	 *//*
+	public static void orgInfoSynchronizationUpdate(Map<String,Object> params,OrgInfo orgInfo) {
+		Gson gson = new Gson();
+		params.put("jcrq",orgInfo.getCompleteDate()==null?"":format.format(orgInfo.getCompleteDate()));
+		params.put("kdcz",orgInfo.getFax());
+		params.put("kddh",orgInfo.getContact());
+		params.put("kddm",orgInfo.getOrgId());
+		params.put("kddz",orgInfo.getAddress());
+		params.put("kdjc",orgInfo.getBriefIntroduction());
+		params.put("kdjd",orgInfo.getLongitude());
+		params.put("kdmc",orgInfo.getOrgName());
+		params.put("kdmj",orgInfo.getDepotArea());
+		params.put("kdqyxz",orgInfo.getCompanyNature());
+		params.put("kdwd",orgInfo.getLatitude());
+		params.put("kdyb",orgInfo.getPost());
+		params.put("kdyxcr",orgInfo.getEffectiveCapacity());
+		params.put("lklb",orgInfo.getOrgClassId());
+		params.put("qymc",orgInfo.getOrgName());
+		params.put("refreshTime",orgInfo.getUpdateTime()==null?"":format.format(orgInfo.getUpdateTime()));
+		params.put("remark",orgInfo.getRemark());
+		params.put("sjcr",orgInfo.getDesignCapacity());
+		params.put("status",orgInfo.getStatus());
+		params.put("tyshxydm",orgInfo.getCompanyOrgCode());
+		params.put("xzqhdm",orgInfo.getAreaCode());
+		params.put("xzqhmc",orgInfo.getAreaName());
+		//json对象转换成json字符串
+		String jsonStr = gson.toJson(params);
+		String result = HttpClientUtil.doPutJson(urls+"/sinkpoint", jsonStr);
+		System.out.print(result);
+	}
+	
+	*//**
+	 * 库点信息同步---删除
+	 *//*
+	public static void orgInfoSynchronizationDelete(OrgInfo orgInfo) {
+		Map<String,String> params = new HashMap<String,String>();
+		params.put("kddm",ObjectUtils.toString(orgInfo.getOrgId(),""));
+		//json对象转换成json字符串
+		String result = HttpClientUtil.doDelete(urls+"/sinkpoint", params);
+		System.out.print(result);
+	}*/
+}

src/main/java/com/chinaitop/depot/utils/HttpClientUtil.java

@@ -0,0 +1,234 @@
+package com.chinaitop.depot.utils;
+
+import java.io.IOException;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.http.NameValuePair;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpDelete;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.methods.HttpPut;
+import org.apache.http.client.utils.URIBuilder;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.util.EntityUtils;
+
+public class HttpClientUtil {
+	/**
+	 * 带参数的get请求
+	 * @param url
+	 * @param param
+	 * @return String
+	 */
+	public static String doGet(String url, Map<String, String> param) {
+		// 创建Httpclient对象
+		CloseableHttpClient httpclient = HttpClients.createDefault();
+ 
+		String resultString = "";
+		CloseableHttpResponse response = null;
+		try {
+			// 创建uri
+			URIBuilder builder = new URIBuilder(url);
+			if (param != null) {
+				for (String key : param.keySet()) {
+					builder.addParameter(key, param.get(key));
+				}
+			}
+			URI uri = builder.build();
+			// 创建http GET请求
+			HttpGet httpGet = new HttpGet(uri);
+			// 执行请求
+			response = httpclient.execute(httpGet);
+			// 判断返回状态是否为200
+			if (response.getStatusLine().getStatusCode() == 200) {
+				resultString = EntityUtils.toString(response.getEntity(), "UTF-8");
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		} finally {
+			try {
+				if (response != null) {
+					response.close();
+				}
+				httpclient.close();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+		return resultString;
+	}
+	
+	/**
+	 * 不带参数的get请求
+	 * @param url
+	 * @return String
+	 */
+	public static String doGet(String url) {
+		return doGet(url, null);
+	}
+ 
+	/**
+	 * 带参数的post请求
+	 * @param url
+	 * @param param
+	 * @return String
+	 */
+	public static String doPost(String url, Map<String, String> param) {
+		// 创建Httpclient对象
+		CloseableHttpClient httpClient = HttpClients.createDefault();
+		CloseableHttpResponse response = null;
+		String resultString = "";
+		try {
+			// 创建Http Post请求
+			HttpPost httpPost = new HttpPost(url);
+			// 创建参数列表
+			if (param != null) {
+				List<NameValuePair> paramList = new ArrayList<>();
+				for (String key : param.keySet()) {
+					paramList.add(new BasicNameValuePair(key, param.get(key)));
+				}
+				// 模拟表单
+				UrlEncodedFormEntity entity = new UrlEncodedFormEntity(paramList);
+				httpPost.setEntity(entity);
+			}
+			// 执行http请求
+			response = httpClient.execute(httpPost);
+			resultString = EntityUtils.toString(response.getEntity(), "utf-8");
+		} catch (Exception e) {
+			e.printStackTrace();
+		} finally {
+			try {
+				response.close();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+		return resultString;
+	}
+ 
+	/**
+	 * 不带参数的post请求
+	 * @param url
+	 * @return String
+	 */
+	public static String doPost(String url) {
+		return doPost(url, null);
+	}
+	
+	/**
+	 * 传送json类型的post请求
+	 * @param url
+	 * @param json
+	 * @return String
+	 */
+	public static String doPostJson(String url, String json) {
+		// 创建Httpclient对象
+		CloseableHttpClient httpClient = HttpClients.createDefault();
+		CloseableHttpResponse response = null;
+		String resultString = "";
+		try {
+			// 创建Http Post请求
+			HttpPost httpPost = new HttpPost(url);
+			// 创建请求内容
+			StringEntity entity = new StringEntity(json, ContentType.APPLICATION_JSON);
+			httpPost.setEntity(entity);
+			// 执行http请求
+			response = httpClient.execute(httpPost);
+			resultString = EntityUtils.toString(response.getEntity(), "utf-8");
+		} catch (Exception e) {
+			e.printStackTrace();
+		} finally {
+			try {
+				response.close();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+		return resultString;
+	}
+	
+	/**
+	 * 传送json类型的put请求
+	 * @param url
+	 * @param json
+	 * @return String
+	 */
+	public static String doPutJson(String url, String json) {
+		// 创建Httpclient对象
+		CloseableHttpClient httpClient = HttpClients.createDefault();
+		CloseableHttpResponse response = null;
+		String resultString = "";
+		try {
+			// 创建Http Put请求
+			HttpPut httpPut = new HttpPut(url);
+			// 创建请求内容
+			StringEntity entity = new StringEntity(json, ContentType.APPLICATION_JSON);
+			httpPut.setEntity(entity);
+			// 执行http请求
+			response = httpClient.execute(httpPut);
+			resultString = EntityUtils.toString(response.getEntity(), "utf-8");
+		} catch (Exception e) {
+			e.printStackTrace();
+		} finally {
+			try {
+				response.close();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+		return resultString;
+	}
+	
+	/**
+	 * 带参数的delete请求
+	 * @param url
+	 * @param param
+	 * @return String
+	 */
+	public static String doDelete(String url, Map<String, String> param) {
+		// 创建Httpclient对象
+		CloseableHttpClient httpclient = HttpClients.createDefault();
+ 
+		String resultString = "";
+		CloseableHttpResponse response = null;
+		try {
+			// 创建uri
+			URIBuilder builder = new URIBuilder(url);
+			if (param != null) {
+				for (String key : param.keySet()) {
+					builder.addParameter(key, param.get(key));
+				}
+			}
+			URI uri = builder.build();
+			// 创建http Delete请求
+			HttpDelete httpDelete = new HttpDelete(uri);
+			// 执行请求
+			response = httpclient.execute(httpDelete);
+			// 判断返回状态是否为200
+			if (response.getStatusLine().getStatusCode() == 200) {
+				resultString = EntityUtils.toString(response.getEntity(), "UTF-8");
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		} finally {
+			try {
+				if (response != null) {
+					response.close();
+				}
+				httpclient.close();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+		return resultString;
+	}
+
+}

src/main/resources/bootstrap.yml

@@ -10,10 +10,15 @@ eureka:
       defaultZone: http://eureka-depot-yn:9001/eureka/
   instance:
     prefer-ip-address: true
+    # 每隔10s发送一次心跳(默认30s)
+    lease-renewal-interval-in-seconds: 10
+    # 告知服务端30秒还未收到心跳的话，就将该服务移除列表(默认90s)
+    lease-expiration-duration-in-seconds: 30
+    
 
 spring:
   application:
-    name: depot-business-yunnan
+    name: depot-business
   # 数据库配置
   datasource:
     depot: