Merge branch 'master' of http://192.168.1.220:10080/esb/esb

hos-broker/src/main/resources/application.yml

@@ -25,9 +25,9 @@ spring:
  profiles: dev
  datasource:
    driverClassName: com.mysql.jdbc.Driver
    url: jdbc:mysql://172.19.103.71:3306/esb?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true
    username: hos
    password: hos
    url: jdbc:mysql://192.168.1.220:3306/esb?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true
    username: hos2
    password: hos2
    test-on-borrow: true
    validation-query: SELECT 1
    test-while-idle: true
@@ -64,9 +64,9 @@ spring:
  profiles: test
  datasource:
      driverClassName: com.mysql.jdbc.Driver
      url: jdbc:mysql://172.19.103.71:3306/esb?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true
      username: hos
      password: hos
      url: jdbc:mysql://192.168.1.220:3306/esb?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true
      username: hos2
      password: hos2
      test-on-borrow: true
      validation-query: SELECT 1
      test-while-idle: true
@@ -102,9 +102,9 @@ spring:
  profiles: lfq
  datasource:
      driverClassName: com.mysql.jdbc.Driver
      url: jdbc:mysql://172.19.103.71:3306/esb?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true
      username: hos
      password: hos
      url: jdbc:mysql://192.168.1.220:3306/esb?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true
      username: hos2
      password: hos2
      test-on-borrow: true
      validation-query: SELECT 1
      test-while-idle: true

src/main/resources/spring/applicationContext.xml

@@ -37,9 +37,9 @@
    <bean id="dataSource" class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close">
        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
        <property name="url" value="jdbc:mysql://172.19.103.71:3306/esb?useUnicode=true&amp;characterEncoding=UTF-8"/>
        <property name="username" value="hos"/>
        <property name="password" value="hos"/>
        <property name="url" value="jdbc:mysql://192.168.1.220:3306/esb?useUnicode=true&amp;characterEncoding=UTF-8"/>
        <property name="username" value="hos2"/>
        <property name="password" value="hos2"/>
        <property name="initialSize" value="1"/>
        <property name="maxTotal" value="100"/>
        <property name="maxIdle" value="50"/>

src/main/webapp/WEB-INF/ehr/jsp/common/indexJs.jsp

@@ -65,26 +65,26 @@
            var menu = [
                //标准管理
                //标准规范中心
                {id: 2, text: '标准规范中心', icon: '${staticRoot}/images/index/menu3_icon.png'},
                {id: 2, text: '标准规范', icon: '${staticRoot}/images/index/menu3_icon.png'},
                {id: 21, pid: 2, text: '平台标准', url: '${contextRoot}/integration/initial/standard'},
                {id: 22, pid: 2, text: '应用标准', url: '${contextRoot}/integration/initial/application'},
                {id: 23, pid: 2, text: '适配方案', url: '${contextRoot}/adapterPlan/initial'},
                //服务管理中心
                {id: 6, text: '服务管理中心', icon: '${staticRoot}/images/index/menu5_icon.png'},
                {id: 6, text: '服务管理', icon: '${staticRoot}/images/index/menu5_icon.png'},
                {id: 61, pid: 6, text: '服务管理', url: '${contextRoot}/app/initial'},
                //数据服务总线
                {id: 1, text: '数据服务总线', icon: '${staticRoot}/images/index/menu2_icon.png'},
                {id: 11, pid: 1, text: '任务跟踪', url: '${contextRoot}/datacollect/trackJob', targetType: '1'},
                {id: 12, pid: 1, text: '任务补采', url: '${contextRoot}/datacollect/repeatDatacollect'},
                {id: 13, pid: 1, text: '任务配置', url: '${contextRoot}/datacollect/configJob'},
                {id: 14, pid: 1, text: '采集编排', url: '${contextRoot}/crawler/jobLayout'},
                {id: 15, pid: 1, text: '流程编排', url: '${contextRoot}/flow/initial'},
                {id: 1, text: '服务总线', icon: '${staticRoot}/images/index/menu2_icon.png'},
                {id: 11, pid: 1, text: '流程编排', url: '${contextRoot}/flow/initial'},
                {id: 12, pid: 1, text: '任务配置', url: '${contextRoot}/datacollect/configJob'},
                {id: 13, pid: 1, text: '采集编排', url: '${contextRoot}/crawler/jobLayout'},
                //运行监控中心
                {id: 5, text: '运行监控中心', icon: '${staticRoot}/images/index/menu5_icon.png'},
                {id: 5, text: '运行监控', icon: '${staticRoot}/images/index/menu5_icon.png'},
                {id: 51, pid: 5, text: '系统监控', url: '${contextRoot}/monitor/server/initial'},
                {id: 52, pid: 5, text: '服务监控', url: '${contextRoot}/monitor/service/initial'},
                {id: 53, pid: 5, text: '任务跟踪', url: '${contextRoot}/datacollect/trackJob', targetType: '1'},
                {id: 54, pid: 5, text: '任务补采', url: '${contextRoot}/datacollect/repeatDatacollect'},
                //资源管理
                {id: 3, text: '资源服务中心', icon: '${staticRoot}/images/index/menu4_icon.png'},
                {id: 3, text: '资源服务', icon: '${staticRoot}/images/index/menu4_icon.png'},
                {id: 31, pid: 3, text: '资源注册', url: '${contextRoot}/resource/resource/initial'},
                {id: 32, pid: 3, text: '资源浏览', url: '${contextRoot}/resource/resourcePage'},
                {id: 34, pid: 3, text: '资源分类', url: '${contextRoot}/resource/rsCategory/initial'},
@@ -94,17 +94,18 @@
                {id: 36, pid: 3, text: '维度配置', url: '${contextRoot}/dimension/dimension'},
                {id: 37, pid: 3, text: '维度类别配置', url: '${contextRoot}/dimension/dimensioncatetory'},
                //用户安全中心
                {id: 7, text: '用户安全中心', icon: '${staticRoot}/images/index/menu5_icon.png'},
                {id: 7, text: '用户安全', icon: '${staticRoot}/images/index/menu5_icon.png'},
                {id: 71, pid: 7, text: '机构管理', url: '${contextRoot}/org/initial'},
                {id: 72, pid: 7, text: '用户管理', url: '${contextRoot}/user/initial'},
                {id: 73, pid: 7, text: '角色管理', url: '${contextRoot}/role/initial'},
                {id: 74, pid: 7, text: '权限管理', url: '${contextRoot}/authority/initial'},
                //系统配置
                {id: 9, text: '系统配置中心', icon: '${staticRoot}/images/index/menu6_icon.png'},
                {id: 91, pid: 9, text: '数据源配置', url: '${contextRoot}/datasource/configSources'},
                {id: 92, pid: 9, text: '菜单配置', url: '${contextRoot}/menu/initial'},
                {id: 93, pid: 9, text: '菜单按钮配置', url: '${contextRoot}/menu/menuAction/initial'},
                {id: 94, pid: 9, text: '字典管理', url: '${contextRoot}/dict/initial'},
                {id: 9, text: '系统配置', icon: '${staticRoot}/images/index/menu6_icon.png'},
                {id: 91, pid: 9, text: '系统参数', url: '${contextRoot}/param/initial'},
                {id: 92, pid: 9, text: '字典管理', url: '${contextRoot}/dict/initial'},
                {id: 93, pid: 9, text: '菜单配置', url: '${contextRoot}/menu/initial'},
                {id: 94, pid: 9, text: '菜单按钮配置', url: '${contextRoot}/menu/menuAction/initial'},
                <%--{id: 95, pid: 9, text: '数据源配置', url: '${contextRoot}/datasource/configSources'},--%>
            ];
            me.menuTree = $('#ulTree').ligerTree({
                data: menu,