山西

pom.xml

@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.0.RELEASE</version>
+		<version>2.0.4.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -22,7 +22,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
-        <spring-cloud.version>Finchley.M8</spring-cloud.version>
+        <spring-cloud.version>Finchley.RELEASE</spring-cloud.version>
     </properties>
 
 	<dependencies>
@@ -46,6 +46,12 @@
 		    <artifactId>spring-boot-autoconfigure</artifactId>
 		</dependency>
 		
+		<dependency>
+		    <groupId>org.springframework.boot</groupId>
+		    <artifactId>spring-boot-devtools</artifactId>
+		    <optional>true</optional>
+		</dependency>
+
 		
 		<!--activiti新增的jar包   开始  -->
 		<dependency>
@@ -114,11 +120,16 @@
 		</dependency>
 		
 		<!--添加webservice-->
+		<dependency>
+		   <groupId>org.apache.cxf</groupId>
+		   <artifactId>cxf-spring-boot-starter-jaxws</artifactId>
+		   <version>3.2.4</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web-services</artifactId>
         </dependency>
-        <dependency>
+        <!-- <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
             <version>3.1.6</version>
@@ -127,7 +138,7 @@
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
             <version>3.1.6</version>
-        </dependency>
+        </dependency> -->
         <!--添加webservice end-->
         
 		<!-- 引入spring boot自带的pagehelper插件 -->
@@ -147,6 +158,12 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-config</artifactId>
         </dependency>
+        
+        <!-- <dependency>
+　　        <groupId>org.springframework.cloud</groupId>
+　　      	   <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency> -->
+
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
@@ -186,11 +203,10 @@
 			<version>3.9</version>
 		</dependency>
 		
-		<!--<dependency>
+		<dependency>
 		    <groupId>org.apache.httpcomponents</groupId>
 		    <artifactId>httpclient</artifactId>
-		    <version>4.5.3</version>
-		</dependency>-->
+		</dependency>
 		
 		<dependency>  
 	       <groupId>log4j</groupId>  
@@ -238,6 +254,9 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
+				<configuration>
+                    <fork>true</fork>
+                </configuration>
 			</plugin>
 			<!-- <plugin>
             	<groupId>org.apache.maven.plugins</groupId>

src/main/java/com/chinaitop/depot/DepotBusinessApplication.java

@@ -40,7 +40,7 @@ public class DepotBusinessApplication {
 	/**
 	 * 注册一个dispatcherServlet,解决增加ws之后https接口访问不了问题
 	 */
-	@Bean
+	/*@Bean
 	public ServletRegistrationBean restServlet(){
 		//注解扫描上下文
 		AnnotationConfigWebApplicationContext applicationContext = new AnnotationConfigWebApplicationContext();
@@ -57,11 +57,11 @@ public class DepotBusinessApplication {
 		registrationBean.setName("rest");
 		return registrationBean;
 	}
-
-	@Bean
+*/
+	/*@Bean
 	public ThreadPoolTaskScheduler threadPoolTaskScheduler() {
 		return new ThreadPoolTaskScheduler();
-	}
+	}*/
 	
 
 }

src/main/java/com/chinaitop/depot/act/controller/ActTemplateController.java

@@ -2,12 +2,10 @@ package com.chinaitop.depot.act.controller;
 
 import java.io.UnsupportedEncodingException;
 
-import javax.servlet.http.HttpServletRequest;
 import javax.xml.stream.XMLStreamException;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -21,15 +19,15 @@ public class ActTemplateController {
 	@Autowired
 	private ActTemplateService actTemplateService;
 	
-	@RequestMapping(value = "/deploy", method=RequestMethod.POST)
-	public String deploy( MultipartFile file, RedirectAttributes redirectAttributes, HttpServletRequest request) {
+	@RequestMapping(value = "/actDeploy",method=RequestMethod.POST)
+	public String deploy(MultipartFile file,RedirectAttributes redirectAttributes, Integer orgId) {
 
 		String fileName = file.getOriginalFilename();
 		
 		if (StringUtils.isBlank(fileName)){
 			redirectAttributes.addFlashAttribute("message", "请选择要部署的流程文件");
 		}else{
-			String message = actTemplateService.deploy(file,request);
+			String message = actTemplateService.deploy(file,orgId);
 			return message;
 		}
 		return null;

src/main/java/com/chinaitop/depot/act/service/ActTemplateService.java

@@ -38,7 +38,7 @@ public class ActTemplateService {
 	 * @return
 	 */
 	@Transactional(readOnly = false)
-	public String deploy(MultipartFile file, HttpServletRequest request) {
+	public String deploy(MultipartFile file,Integer orgId) {
 
 		String message = "";
 		
@@ -64,13 +64,11 @@ public class ActTemplateService {
 			
 			List<ProcessDefinition> list = repositoryService.createProcessDefinitionQuery().deploymentId(deployment.getId()).list();
 			
-			Integer depotId =(Integer) request.getSession().getAttribute("depotId");
-			
 				// 设置流程分类
 			for (ProcessDefinition processDefinition : list) {
 	//				ActUtils.exportDiagramToFile(repositoryService, processDefinition, exportDir);
-				repositoryService.setProcessDefinitionCategory(processDefinition.getId(), depotId.toString());
-				message += "部署成功，流程ID=" + processDefinition.getId() + "<br/>";
+				repositoryService.setProcessDefinitionCategory(processDefinition.getId(), orgId.toString());
+				message += "部署成功，流程ID=" + processDefinition.getId();
 			}
 			if (list.size() == 0){
 				message = "部署失败，没有流程。";

src/main/java/com/chinaitop/depot/business/controller/RoleInfoController.java

@@ -0,0 +1,47 @@
+package com.chinaitop.depot.business.controller;
+
+import com.chinaitop.depot.business.model.RoleInfo;
+import com.chinaitop.depot.business.model.RoleInfoExample;
+import com.chinaitop.depot.business.model.RoleInfoExample.Criteria;
+import com.chinaitop.depot.business.service.RoleInfoService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import java.util.List;
+
+@RestController
+@RequestMapping(value="/roleInfo")
+public class RoleInfoController {
+	
+	@Resource
+	private RoleInfoService roleInfoService;
+	
+	
+	/**
+	 * 查找角色信息
+	 * @param pageNum	页码
+	 * @param pageSize	每页条数
+	 * @return
+	 */
+	@RequestMapping(value="/getRole")
+	public PageInfo<RoleInfo> getRoleInfo(HttpServletRequest request) {
+		RoleInfoExample example = new RoleInfoExample();
+		Criteria criteria = example.createCriteria();
+		Integer orgId = (Integer)request.getSession().getAttribute("orgId");
+		if (orgId != null) {
+			criteria.andOrgIdEqualTo(orgId);
+		}
+		List<RoleInfo> list = roleInfoService.queryByExample(example);	
+		PageInfo<RoleInfo> pageInfo = new PageInfo<RoleInfo>(list);
+		return pageInfo;
+	}
+
+	
+
+}

src/main/java/com/chinaitop/depot/business/controller/UserInfoController.java

@@ -77,86 +77,17 @@ public class UserInfoController {
 	 */
 	@RequestMapping(value="/getUser", method = RequestMethod.GET)
 	@ApiOperation(value="查询用户信息", notes = "查询用户信息列表，支持分页")
-	@ApiImplicitParams({
-			@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
-			@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
-			@ApiImplicitParam(name = "username", value = "用户名", paramType = "query"),
-			@ApiImplicitParam(name = "realName", value = "用户真实姓名", paramType = "query")
-	})
-	public PageInfo<UserInfo> getUserInfo(HttpServletRequest request, Integer pageNum, Integer pageSize,
-                                          String username, String realName, Integer roleId, String orgIds) {
-		
-		if (pageNum!=null && pageSize!=null) {
-			PageHelper.startPage(pageNum, pageSize);
-		}
-		
+	public PageInfo<UserInfo> getUserInfo(HttpServletRequest request) {
+                                          
 		HashMap<Object, Object> map = new HashMap<Object, Object>();
-		map.put("username", username);
-		map.put("realName", realName);
-		map.put("roleId", roleId);
+		Integer orgId = (Integer)request.getSession().getAttribute("orgId");
+		map.put("orgIds", orgId);
 		List<UserInfo> listAll=userInfoService.queryAll(map);
 		PageInfo<UserInfo> pageInfo = new PageInfo<UserInfo>(listAll);
 		return pageInfo;
 	}
 
-	/**
-	 * 用户登录
-	 * @param request
-	 * @param username	用户名
-	 * @param password	密码
-	 * @return
-	 */
-	@RequestMapping(value="/login", method = RequestMethod.POST)
-	@ApiOperation(value="用户登录", notes = "用户登录")
-	@ApiImplicitParams({
-			@ApiImplicitParam(name = "username", value = "用户名", paramType = "form"),
-			@ApiImplicitParam(name = "password", value = "密码", paramType = "form"),
-			@ApiImplicitParam(name = "yzm", value = "验证码", paramType = "form"),
-			@ApiImplicitParam(name = "from", value = "来源，app代表来自于移动端", paramType = "form")
-	})
-	public Map<String, Object> Login(HttpServletRequest request, String username, String password, String yzm, String from) {
-		Map<String, Object> map = new HashMap<String, Object>();
-		if (StringUtils.isBlank(from) || from.compareTo("app")!=0) {
-			String yzm_code = (String) request.getSession().getAttribute("Service_Code");
-			if (!yzm_code.equals(yzm)) {
-				map.put("status", false);
-				map.put("success", "验证码输入错误！");
-				return map;
-			}
-		}
-		UserInfo userInfo = userInfoService.valid(username, password);
-		if (userInfo != null) {
-			//把对象转变成一个json
-			ObjectMapper mapper = new ObjectMapper();
-			try {
-				String userInfoObject = mapper.writeValueAsString(userInfo);
-				// 当前登录用户
-				request.getSession().setAttribute("userInfo", userInfoObject);
-				// 当前登录用户id
-				request.getSession().setAttribute("userId", userInfo.getUserId());
-				// 当前组织信息
-				OrgInfo orgInfo = orgInfoService.findById(userInfo.getOrgId());
-				String orgInfoObject = mapper.writeValueAsString(orgInfo);
-				request.getSession().setAttribute("orgInfo", orgInfoObject);
-				// 当前用户所属的库信息及库编号
-				OrgInfo depotInfo = orgInfoService.getDepotInfo(orgInfo);
-				if(depotInfo!=null){
-					String depotInfoObject = mapper.writeValueAsString(depotInfo);
-					request.getSession().setAttribute("depotInfo", depotInfoObject);
-					request.getSession().setAttribute("depotId", depotInfo.getOrgId());
-				}
-			} catch (JsonProcessingException e) {
-				e.printStackTrace();
-			}
-			map.put("status", true);
-			map.put("userInfo", userInfo);
-		} else {
-			map.put("status", false);
-			map.put("success", "用户名或密码错误，登录失败！");
-		}
-		return map;
-	}
-
+	
 	/**
 	 * 获取用户登录信息,包括当前用户、当前组织、当前库、当前库编号
 	 * @param request

src/main/java/com/chinaitop/depot/unissoft/serviceconfig/CxfConfig.java

@@ -7,8 +7,6 @@ import com.chinaitop.depot.unissoft.webservice.NoticePassServiceImpl;
 import org.apache.cxf.Bus;
 import org.apache.cxf.bus.spring.SpringBus;
 import org.apache.cxf.jaxws.EndpointImpl;
-import org.apache.cxf.transport.servlet.CXFServlet;
-import org.springframework.boot.web.servlet.ServletRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -16,10 +14,10 @@ import javax.xml.ws.Endpoint;
 
 @Configuration
 public class CxfConfig {
-    @Bean
+    /*@Bean
     public ServletRegistrationBean dispatcherServlet() {
         return new ServletRegistrationBean(new CXFServlet(),"/business/*");
-    }
+    }*/
     @Bean(name = Bus.DEFAULT_BUS_ID)
     public SpringBus springBus() {
         return new SpringBus();

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

@@ -14,16 +14,25 @@ eureka:
     lease-renewal-interval-in-seconds: 10
     # 告知服务端30秒还未收到心跳的话，就将该服务移除列表(默认90s)
     lease-expiration-duration-in-seconds: 30
- 
+    
+
 spring:
   application:
     name: depot-business
   # 数据库配置
   datasource:
-    driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://192.168.123.38:3306/depot_shanxi?useUnicode=true&characterEncoding=utf-8
-    username: root
-    password: 123456
+    depot:
+      driver-class-name: com.mysql.jdbc.Driver
+      jdbcUrl: jdbc:mysql://192.168.123.38:3306/depot_shanxi?useUnicode=true&characterEncoding=utf-8&useSSL=false
+      username: root
+      password: 123456
+    agile:
+      driver-class-name: com.mysql.jdbc.Driver
+      jdbcUrl: jdbc:mysql://192.168.123.38:3306/lsreport_ts_shanxi?useUnicode=true&characterEncoding=utf-8&useSSL=false
+      username: root
+      password: 123456
+  activiti:
+    check-process-definitions: false
   # 缓存配置
   session:
     store-type: redis
@@ -39,20 +48,22 @@ spring:
         max-wait: -1
         max-idle: 8
         min-idle: 0
+  # 静态资源配置
+  resources:
+    static-locations: classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/,file:${web.upload-path}
   servlet:
     multipart:
       max-file-size: 10Mb
       max-request-size: 10Mb
-      
-  jackson:
-    date-format: yyyy-MM-dd
-    time-zone: GMT+8
-  
+  devtools:
+    restart:
+      enabled: true  #设置开启热部署
+      additional-paths: src/main/java #重启目录
+  freemarker:
+    cache: false    #页面不加载缓存，修改即时生效
+reportUrl: http://192.168.123.132:88/api
+
 web:
   upload-path: /home/depot/depot-web/apache-tomcat-8.0.53/webapps/ROOT/WEB-INF/classes/static
-
-
-        
-
-
-      
+cxf:
+  path: /business