系统测试与修改

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

@@ -1,9 +1,9 @@
package com.yihu.ehr.common.config;
public class ThreadConfig {
    public static int CRAWLER_THREAD_SLEEP_TIME = 0;
    public static int CRAWLER_THREAD_SLEEP_TIME = 60;
    public static int UPDATE_THREAD_SLEEP_TIME = 0;
    public static int UPDATE_THREAD_SLEEP_TIME = 60;
    public static int CRAWLER_SUPPLY_THREAD_SLEEP_TIME = 60;
}

Hos-Resource-Mini/src/main/java/com.yihu.ehr/service/thread/ThreadManage.java

@@ -35,7 +35,7 @@ public class ThreadManage {
            return;
        }
        String interval = json.getString("param_value");
        if (!StringUtil.isEmpty(interval)) {
        if (!StringUtil.isEmpty(interval) && Integer.parseInt(interval) != 0) {
            ThreadConfig.CRAWLER_THREAD_SLEEP_TIME = Integer.parseInt(interval);
        }
    }
@@ -47,7 +47,7 @@ public class ThreadManage {
            return;
        }
        String interval = json.getString("param_value");
        if (!StringUtil.isEmpty(interval)) {
        if (!StringUtil.isEmpty(interval) && Integer.parseInt(interval) != 0) {
            ThreadConfig.UPDATE_THREAD_SLEEP_TIME = Integer.parseInt(interval);
        }
    }

Hos-Resource-Mini/src/main/resources/config/sys.config.xml

@@ -3,8 +3,8 @@
    <debug>true</debug>
    <!--存储模式：轻量模式：0，传统模式：1-->
    <platform>
        <url>https://da.ehr.yihu.com:5666/ehr</url>
        <user pwd="123456">admin</user>
        <url>https://172.19.103.49:5666/ehr</url>
        <user pwd="123456">2</user>
        <app secret="u2akgXkkRRkiiCVR">gAP3ma6grh</app>
        <trust_store pwd="123456"></trust_store>
        <basic_auth pwd="123456">admin</basic_auth>

Hos-Resource-Mini/src/main/webapp/develop/lib/ligerui/custom/ligerOverwrite.js

@@ -4,7 +4,7 @@
(function ($, win) {
    /***************** 字典相关扩展 *************************/
    //字典数据
        //字典数据
    $.ehrDict = {
        dictDataUrl: window.root + "/basedict/getDict", //字典数据获取路径
        dictCodeName: "code", //字典code字段
@@ -1346,9 +1346,19 @@
                {
                    parentHeight = layoutparent.height();
                }
                h = parentHeight * parseFloat(p.height) * 0.01;
                if (p.inWindow || layoutparent[0].tagName.toLowerCase() == "body")
                    h -= (g.layout.offset().top - parseInt($('body').css('paddingTop')));
                /****** 判断是否比外层高 add by hzp at 2016-03-15 **********/
                if(layoutparent.height() >0 && h > layoutparent.height())
                {
                    var padding = layoutparent.innerHeight() - layoutparent.height();
                    var margin = layoutparent.outerHeight(true) - layoutparent.outerHeight();
                    h = layoutparent.height() - padding - margin;
                }
                /*************************************************/
            }
            else
            {

Hos-Resource-Mini/target/classes/config/sys.config.xml

@@ -3,8 +3,8 @@
    <debug>true</debug>
    <!--存储模式：轻量模式：0，传统模式：1-->
    <platform>
        <url>https://da.ehr.yihu.com:5666/ehr</url>
        <user pwd="123456">admin</user>
        <url>https://172.19.103.49:5666/ehr</url>
        <user pwd="123456">2</user>
        <app secret="u2akgXkkRRkiiCVR">gAP3ma6grh</app>
        <trust_store pwd="123456"></trust_store>
        <basic_auth pwd="123456">admin</basic_auth>

Hos-resource/pom.xml

@@ -17,7 +17,6 @@
            <name>Releases</name>
            <url>http://172.19.103.47:8081/nexus/content/repositories/releases/</url>
        </repository>
        <snapshotRepository>
        <snapshotRepository>
            <id>snapshots</id>
            <name>Snapshots</name>
@@ -107,9 +106,9 @@
        <dependency>
            <groupId>com.oracle</groupId>
            <artifactId>ojdbc6</artifactId>
            <artifactId>ojdbc6</artifactId>
            <version>11.2.0.3.0</version>
        </dependency>
        <!--=============oracle驱动 end =============-->
        <!--jxl导出工具-->
        <dependency>

Hos-resource/src/main/webapp/develop/lib/ligerui/custom/ligerOverwrite.js

@@ -4,7 +4,7 @@
(function ($, win) {
    /***************** 字典相关扩展 *************************/
    //字典数据
        //字典数据
    $.ehrDict = {
        dictDataUrl: window.root + "/basedict/getDict", //字典数据获取路径
        dictCodeName: "code", //字典code字段
@@ -1346,9 +1346,19 @@
                {
                    parentHeight = layoutparent.height();
                }
                h = parentHeight * parseFloat(p.height) * 0.01;
                if (p.inWindow || layoutparent[0].tagName.toLowerCase() == "body")
                    h -= (g.layout.offset().top - parseInt($('body').css('paddingTop')));
                /****** 判断是否比外层高 add by hzp at 2016-03-15 **********/
                if(layoutparent.height() >0 && h > layoutparent.height())
                {
                    var padding = layoutparent.innerHeight() - layoutparent.height();
                    var margin = layoutparent.outerHeight(true) - layoutparent.outerHeight();
                    h = layoutparent.height() - padding - margin;
                }
                /*************************************************/
            }
            else
            {