Merge branch 'master' of chenweida/esb into master

Hos-Resource-Mini-Update/src/main/java/com/yihu/ehr/config/ThreadConfig.java

@@ -14,7 +14,7 @@ public class ThreadConfig {
    public static String SERVICE_USERNAME = "admin";
    public static String SERVICE_PASSWORD = "123456";
     public static String SERVICE_URL = "https://192.168.131.151:443/api/v1.0/";
     public static String SERVICE_URL = "https://172.19.103.73:443/api/v1.0/";
    // public static String SERVICE_URL = "https://192.168.131.15:4432/api/v1.0/";
    //public static String SERVICE_URL = "https://192.168.131.6:4432/api/v1.0/";//"";
    //public static String SERVICE_URL = "https://ehr.yihu.com/api/v1.0/";//"";

Hos-Resource-Mini-Update/src/main/java/com/yihu/ehr/util/http/HttpsClientUtil.java

@@ -501,13 +501,13 @@ public class HttpsClientUtil {
        //params.put("info", "{\"fingerprint\": \"abc\"}");
        //params.put("user_name", "admin");
        //POST /api/v1.0/simplified-esb/fillMiningPUT /api/v1.0/authorizations/users/{user_name}
        // System.out.println(getToken());
        System.out.println(getToken());
        // System.out.println(HttpsClientUtil.post("https://192.168.5.109:4431/api/v1.0/simplified-esb/fillMining", formParams, "admin", "123456"));
        //params.put("access_token", "7txx6wx8cmak3zpnpralh3d9626z9vfu");
        //   params.put("systemCode", "MINIESB");
        //  params.put("orgCode", "test1");
        // params.put("info", "{\"fingerprint\": \"abc\"}");
        // HttpsClientUtil.downLoadFileByBase64("E:/a.war", params, "https://172.19.103.45:8443/api/v1.0/simplified-esb/downUpdateWar", "", "");
        HttpsClientUtil.downLoadFile("E:/b.zip", params, "https://192.168.131.6:4432/api/v1.0/simplified-esb/downUpdateWar", "", "");
        //  HttpsClientUtil.downLoadFile("E:/b.zip", params, "https://192.168.131.6:4432/api/v1.0/simplified-esb/downUpdateWar", "", "");
    }
}

Hos-Resource-Mini-helper/src/main/java/com.yihu.ehr/thread/LogThread.java

@@ -117,7 +117,7 @@ public class LogThread implements Runnable {
    public String getLogFile() {
        String home = System.getProperty("catalina.home").replace('\\', '/');
        String srcPath = home.substring(0, home.lastIndexOf('/') + 1) + File.separator + "log4j";
        String srcPath = home.substring(0, home.lastIndexOf('/') + 1) +  "log4j";
        String filePath = srcPath + File.separator + logFileName;
        ZipUtil.zip(srcPath, filePath);
        LogUtil.info("日志文件路径:" + filePath);

Hos-Resource-Mini-helper/src/main/java/com.yihu.ehr/thread/SQLThread.java

@@ -154,7 +154,7 @@ public class SQLThread implements Runnable {
            synchronized (SQLThread.class) {
                //初始化数据库连接池
                LogUtil.info("初始化数据库连接池:");
                List<org.json.JSONObject> list = db.query("select * from system_datasource where id='1'");
                List<org.json.JSONObject> list = db.query(" select * from system_datasource ");
                if (list != null && list.size() > 0) {
                    org.json.JSONObject jo = list.get(0);
                    LogUtil.info("得到数据源:" + (String) jo.get("config"));

Hos-Resource-Mini-helper/src/main/java/com.yihu.ehr/util/ZipUtil.java

@@ -126,11 +126,11 @@ public class ZipUtil {
    public static void main(String[] args) {
        try {
            //ZipUtil.zip("F:/简历",
            //       "F:/sss.war");
            ZipUtil.zip("F:/简历",
                    "F:/sss.war");
            ZipUtil.unZip("F:/sss.war",
                    "E:/");
            //  ZipUtil.unZip("F:/sss.war",
            //          "E:/");
        } catch (Exception e) {
            // TODO Auto-generated catch block
            e.printStackTrace();

Hos-Resource-Mini-helper/src/main/resources/config/threadConfig.properties

@@ -1,6 +1,6 @@
soft.versionCode=1
## service address
service.url=https://ehr.yihu.com/api/v1.0/
service.url=https://172.19.103.73:443:443/api/v1.0/
service.clientId = kHAbVppx44
service.clientKey = Bd2h8rdYhep6NKOO
logThread.sleepTime=30