调整broker目录结构，增加broker一层级目录

hos-broker/src/main/java/com/yihu/hos/broker/HosBrokerApplication.java

@@ -1,6 +1,6 @@
package com.yihu.hos.broker;
import com.yihu.hos.broker.common.listener.ApplicationStartListener;
import com.yihu.hos.broker.listeners.ApplicationStartListener;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfiguration;

hos-broker/src/main/java/com/yihu/hos/broker/common/appender/JMSAppender.java

@@ -15,7 +15,7 @@
 * limitations under the License.
 */
package com.yihu.hos.broker.common.appender;
package com.yihu.hos.broker.common.log;
import com.yihu.hos.core.datatype.DateUtil;
import com.yihu.hos.core.datatype.StringUtil;

hos-broker/src/main/java/com/yihu/hos/broker/common/format/PatternLayout.java

@@ -3,7 +3,7 @@
// (powered by Fernflower decompiler)
//
package com.yihu.hos.broker.common.format;
package com.yihu.hos.broker.common.log;
import com.yihu.hos.core.constants.CoreConstant;
import com.yihu.hos.core.datatype.DateUtil;

hos-broker/src/main/java/com/yihu/hos/broker/common/scheduler/MonitorScheduler.java

@@ -2,9 +2,9 @@ package com.yihu.hos.broker.common.scheduler;
import com.mongodb.*;
import com.yihu.hos.broker.common.constants.MonitorConstant;
import com.yihu.hos.broker.common.dao.BrokerDao;
import com.yihu.hos.broker.common.util.MongodbUtil;
import com.yihu.hos.broker.common.util.SigarUtil;
import com.yihu.hos.broker.daos.BrokerDao;
import com.yihu.hos.broker.util.MongodbUtil;
import com.yihu.hos.broker.util.SigarUtil;
import com.yihu.hos.core.datatype.DateUtil;
import com.yihu.hos.core.log.Logger;
import com.yihu.hos.core.log.LoggerFactory;

hos-broker/src/main/java/com/yihu/hos/broker/common/dao/BrokerDao.java

@@ -1,4 +1,4 @@
package com.yihu.hos.broker.common.dao;
package com.yihu.hos.broker.daos;
import com.yihu.hos.broker.common.constants.BrokerConstant;
import com.yihu.hos.broker.models.SystemServiceEndpoint;

hos-broker/src/main/java/com/yihu/hos/broker/common/listener/ApplicationStartListener.java

@@ -1,9 +1,9 @@
package com.yihu.hos.broker.common.listener;
package com.yihu.hos.broker.listeners;
import com.mongodb.client.MongoDatabase;
import com.yihu.hos.broker.configurations.MongoConfiguration;
import com.yihu.hos.broker.common.constants.BrokerConstant;
import com.yihu.hos.broker.common.dao.BrokerDao;
import com.yihu.hos.broker.daos.BrokerDao;
import com.yihu.hos.core.constants.CoreConstant;
import com.yihu.hos.core.datatype.ClassFileUtil;
import com.yihu.hos.core.datatype.CollectionUtil;

hos-broker/src/main/java/com/yihu/hos/broker/common/util/MongodbUtil.java

@@ -1,4 +1,4 @@
package com.yihu.hos.broker.common.util;
package com.yihu.hos.broker.util;
import com.mongodb.client.MongoDatabase;
import com.yihu.ehr.dbhelper.mongodb.MongodbFactory;

hos-broker/src/main/java/com/yihu/hos/broker/common/util/SigarUtil.java

@@ -1,4 +1,4 @@
package com.yihu.hos.broker.common.util;
package com.yihu.hos.broker.util;
import com.yihu.hos.core.log.Logger;
import com.yihu.hos.core.log.LoggerFactory;

hos-broker/src/main/resources/log4j.properties

@@ -25,11 +25,11 @@ log4j.rootLogger=INFO, jms
# CONSOLE appender not used by default
log4j.appender.out=org.apache.log4j.ConsoleAppender
log4j.appender.out.layout=com.yihu.hos.broker.common.format.PatternLayout
log4j.appender.out.layout=com.yihu.hos.broker.common.log.PatternLayout
log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n
#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
log4j.appender.jms=com.yihu.hos.broker.common.appender.JMSAppender
log4j.appender.jms=com.yihu.hos.broker.common.log.JMSAppender
log4j.appender.jms.InitialContextFactoryName=org.apache.activemq.jndi.ActiveMQInitialContextFactory
log4j.appender.jms.ProviderURL=tcp://172.19.103.86:61616
log4j.appender.jms.TopicBindingName=logTopic
@@ -38,7 +38,7 @@ log4j.appender.jms.userName=admin
log4j.appender.jms.password=admin
#log4j.appender.file=org.apache.log4j.FileAppender
#log4j.appender.file.layout=com.yihu.hos.broker.common.format.PatternLayout
#log4j.appender.file.layout=com.yihu.hos.broker.common.log.PatternLayout
#log4j.appender.file.layout.ConversionPattern=%m%n
#log4j.appender.file.file=D:/log/camel-http4-test.log