Merge branch 'master' of shine/esb into master

Hos-Resource-Mini/src/main/java/com.yihu.ehr/common/ApplicationStart.java

@@ -8,6 +8,10 @@ import com.yihu.ehr.service.thread.CrawlerThread;
import com.yihu.ehr.service.thread.StandardUpdateThread;
import com.yihu.ehr.service.thread.ThreadManage;
import com.yihu.ehr.util.log.LogUtil;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
import org.springframework.core.io.support.EncodedResource;
import org.springframework.core.io.support.PropertiesLoaderUtils;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
@@ -50,7 +54,16 @@ public class ApplicationStart implements ServletContextListener {
        prop.load(in);
        String configPath = this.getClass().getClassLoader().getResource("/").getPath()+ "config/http.properties";
        OutputStream fos = new FileOutputStream(configPath);
        String url = homeUrl+"ssl/tomcat.keystore";
        prop.getProperty("sslKeystore");
        String url="";
        if(prop.getProperty("sslKeystore")!=null&& prop.getProperty("sslKeystore").length()>0){
             url= this.getClass().getClassLoader().getResource("/").getPath() + "ssl/tomcat.keystore";
        }
        else {
             url = homeUrl + "ssl/tomcat.keystore";
        }
        prop.setProperty("sslKeystore",url);
        prop.store(fos,"last update");
        in.close();

Hos-Resource-Mini/src/main/resources/config/http.properties

@@ -3,9 +3,10 @@ httpUrl = https://172.19.103.73:443/api/v1.0
#ÖÒhttps://192.168.131.15:4432/api/v1.0
  #https://172.19.103.73:443/api/v1.0
clientId=kHAbVppx44
#sslKeystore=/ssl/tomcat.keystore
clientKey=a0hBYlZwcHg0NDpCZDJoOHJkWWhlcDZOS09P
#sslPassword=123456
sslKeystore = I:/ssl/tomcat.keystore
sslPassword = 123456
clientId = kHAbVppx44
clientKey = a0hBYlZwcHg0NDpCZDJoOHJkWWhlcDZOS09P