Browse Source

sigar 服务器硬件信息采集,初步添加(后面需要删除相应的system.out

demon 8 years ago
parent
commit
cec4e0650b

+ 1 - 1
hos-rest/src/main/java/com/yihu/hos/rest/common/filter/HibernateFilter.java

@ -1,6 +1,6 @@
package com.yihu.hos.rest.common.filter;
import org.springframework.orm.hibernate5.support.OpenSessionInViewFilter;
import org.springframework.orm.hibernate4.support.OpenSessionInViewFilter;
import javax.servlet.annotation.WebFilter;

+ 3 - 3
hos-rest/src/main/resources/spring/applicationContext.xml

@ -37,7 +37,7 @@
    </bean>
    <!--Hibernate 会话管理器配置-->
    <bean id="sessionFactory" class="org.springframework.orm.hibernate5.LocalSessionFactoryBean">
    <bean id="sessionFactory" class="org.springframework.orm.hibernate4.LocalSessionFactoryBean">
        <property name="dataSource" ref="dataSource"/>
        <property name="packagesToScan">
            <list>
@ -61,7 +61,7 @@
    </bean>
    <!-- 将多个配置文件读取到容器中,交给Spring管理 -->
    <!--Hibernate 事务配置-->
    <bean id="txManager" class="org.springframework.orm.hibernate5.HibernateTransactionManager">
    <bean id="txManager" class="org.springframework.orm.hibernate4.HibernateTransactionManager">
        <property name="sessionFactory" ref="sessionFactory"/>
    </bean>
    <tx:annotation-driven transaction-manager="txManager" proxy-target-class="true"/>
@ -81,7 +81,7 @@
        <property name="dataSource" ref="dataSource"/>
    </bean>
    <!--Hibernate模版配置 -->
    <bean id="hibernateTemplate" class="org.springframework.orm.hibernate5.HibernateTemplate">
    <bean id="hibernateTemplate" class="org.springframework.orm.hibernate4.HibernateTemplate">
        <property name="sessionFactory" ref="sessionFactory"></property>
    </bean>
    <!--<bean id="quartzScheduler" class="org.springframework.scheduling.quartz.SchedulerFactoryBean" scope="singleton">-->

+ 3 - 3
hos-web-framework-dependencies/pom.xml

@ -12,13 +12,13 @@
        <groupId>org.springframework.boot</groupId>
        <artifactId>spring-boot-starter-parent</artifactId>
        <version>1.3.8.RELEASE</version>
        <relativePath/> <!-- lookup parent from repository -->
        <relativePath/> <!-- lookup parent from repository1212 -->
    </parent>
    <properties>
        <camel.version>2.17.1</camel.version>
        <spring.version>4.3.2.RELEASE</spring.version>
        <hibernate.version>5.2.3.Final</hibernate.version>
        <!--<spring.version>4.2.8.RELEASE</spring.version>-->
        <hibernate.version>4.3.11.Final</hibernate.version>
        <camel.osgi.export.pkg>org.apache.camel.dataformat.xmljson.*</camel.osgi.export.pkg>
        <camel.osgi.export.service>org.apache.camel.spi.DataFormatResolver;dataformat=xmljson</camel.osgi.export.service>
        <!--<spring.security.version>4.0.2.RELEASE</spring.security.version>-->

+ 1 - 1
hos-web-framework/src/main/java/com/yihu/hos/web/framework/dao/SQLGeneralDAO.java

@ -21,7 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.core.RowMapper;
import org.springframework.orm.hibernate5.HibernateTemplate;
import org.springframework.orm.hibernate4.HibernateTemplate;
import javax.annotation.Resource;
import java.io.IOException;

+ 30 - 1
pom.xml

@ -64,7 +64,6 @@
        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-orm</artifactId>
            <version>${spring.version}</version>
        </dependency>
        <!--=============tilesJSP布局框架 start =============-->
@ -89,6 +88,36 @@
        <!--========== hibernate start=======-->
        <!--========== hibernate end=========-->
        <dependency>
            <groupId>org.apache.xmlgraphics</groupId>
            <artifactId>fop</artifactId>
            <version>1.0</version>
            <scope>provided</scope>
        </dependency>
        <dependency>
            <groupId>xalan</groupId>
            <artifactId>xalan</artifactId>
            <version>2.7.0</version>
            <scope>provided</scope>
        </dependency>
        <dependency>
            <groupId>org.openoffice</groupId>
            <artifactId>jurt</artifactId>
            <version>2.3.0</version>
            <scope>provided</scope>
        </dependency>
        <dependency>
            <groupId>org.openoffice</groupId>
            <artifactId>juh</artifactId>
            <version>2.3.0</version>
            <scope>provided</scope>
        </dependency>
        <dependency>
            <groupId>org.fusesource</groupId>
            <artifactId>sigar</artifactId>
            <version>1.6.4</version>
        </dependency>
    </dependencies>

+ 2 - 0
src/main/java/com/yihu/hos/ESBApplication.java

@ -7,11 +7,13 @@ import org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfigurat
import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;
import org.springframework.context.annotation.Bean;
import org.springframework.jms.annotation.EnableJms;
import org.springframework.scheduling.annotation.EnableScheduling;
import javax.jms.Queue;
@SpringBootApplication(exclude = {MongoAutoConfiguration.class, MongoDataAutoConfiguration.class})
@EnableJms
@EnableScheduling
public class ESBApplication {
    public static void main(String[] args) throws Exception {

+ 1 - 2
src/main/java/com/yihu/hos/common/ActiveMqUtil.java

@ -3,7 +3,6 @@ package com.yihu.hos.common;
import com.yihu.hos.common.activeMq.ActiveMqConstants;
import com.yihu.hos.common.activeMq.ActivemqConfiguration;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.springframework.stereotype.Component;
import javax.jms.*;
import java.util.Map;
@ -14,7 +13,7 @@ import java.util.concurrent.ConcurrentHashMap;
 * @vsrsion 1.0
 * Created at 2016/8/22.
 */
@Component
//@Component
public class ActiveMqUtil {
    static ConnectionFactory connectionFactory;

+ 1 - 2
src/main/java/com/yihu/hos/common/activeMq/ActivemqConfiguration.java

@ -1,7 +1,6 @@
package com.yihu.hos.common.activeMq;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
import javax.annotation.PostConstruct;
@ -11,7 +10,7 @@ import javax.annotation.PostConstruct;
 * @vsrsion 1.0
 * Created at 2016/8/21.
 */
@Configuration
//@Configuration
public class ActivemqConfiguration {
    @Value("${spring.activemq.broker-url}")
    private String brokerURL;

+ 1 - 1
src/main/java/com/yihu/hos/filter/HibernateFilter.java

@ -1,6 +1,6 @@
package com.yihu.hos.filter;
import org.springframework.orm.hibernate5.support.OpenSessionInViewFilter;
import org.springframework.orm.hibernate4.support.OpenSessionInViewFilter;
import javax.servlet.annotation.WebFilter;

+ 3 - 3
src/main/resources/spring/applicationContext.xml

@ -50,7 +50,7 @@
    </bean>
    <!--Hibernate 会话管理器配置-->
    <bean id="sessionFactory" class="org.springframework.orm.hibernate5.LocalSessionFactoryBean">
    <bean id="sessionFactory" class="org.springframework.orm.hibernate4.LocalSessionFactoryBean">
        <property name="dataSource" ref="dataSource"/>
        <property name="packagesToScan">
            <list>
@ -74,7 +74,7 @@
    </bean>
    <!-- 将多个配置文件读取到容器中,交给Spring管理 -->
    <!--Hibernate 事务配置-->
    <bean id="txManager" class="org.springframework.orm.hibernate5.HibernateTransactionManager">
    <bean id="txManager" class="org.springframework.orm.hibernate4.HibernateTransactionManager">
        <property name="sessionFactory" ref="sessionFactory"/>
    </bean>
    <tx:annotation-driven transaction-manager="txManager" proxy-target-class="true"/>
@ -104,7 +104,7 @@
        <property name="dataSource" ref="dataSource"/>
    </bean>
    <!--Hibernate模版配置 -->
    <bean id="hibernateTemplate" class="org.springframework.orm.hibernate5.HibernateTemplate">
    <bean id="hibernateTemplate" class="org.springframework.orm.hibernate4.HibernateTemplate">
        <property name="sessionFactory" ref="sessionFactory"></property>
    </bean>
    <!--<bean id="quartzScheduler" class="org.springframework.scheduling.quartz.SchedulerFactoryBean" scope="singleton">-->