Merge remote-tracking branch 'origin/master'

dmp-dic/doc/config.sql

@@ -68,14 +68,14 @@ VALUES
 ('dmp-dic','dev','master','DMP',1,'persagy.rabbitmq.virtual-host', '/test', null),
 
 ('dmp-dic','dev','master','DMP',1,'persagy.redis.host', 'localhost', null),
-('dmp-dic','dev','master','DMP',1,'persagy.redis.port', '5672', null),
+('dmp-dic','dev','master','DMP',1,'persagy.redis.port', '6379', null),
 ('dmp-dic','dev','master','DMP',1,'persagy.redis.password', '123456', null),
 ('dmp-dic','dev','master','DMP',1,'persagy.redis.database', '0', null),
 ('dmp-dic','dev','master','DMP',1,'persagy.redis.max-active', '300', null),
 ('dmp-dic','dev','master','DMP',1,'persagy.redis.max-idle', '30', null),
 ('dmp-dic','dev','master','DMP',1,'persagy.redis.min-idle', '10', null),
 
-('dmp-dic','dev','master','DMP',1,'persagy.log.path', '.', null),
+('dmp-dic','dev','master','DMP',1,'persagy.log.path', '.', '日志文件所在路径'),
 
-('dmp-dic','dev','master','DMP',1,'persagy.dmp.dic.queue', 'queue-dmp-dic', '日志文件所在路径');
+('dmp-dic','dev','master','DMP',1,'persagy.dmp.dic.queue', 'queue-dmp-dic', null);
 

dmp-org/doc/config.sql

@@ -48,7 +48,7 @@ VALUES
 ('dmp-org','default','master','DMP',1,'persagy.dmp.alarm.routingKey', 'routing-dmp-alarm', null),
 ('dmp-org','default','master','DMP',1,'persagy.dmp.task.routingKey', 'routing-dmp-task', null),
 
-('dmp-org','dev','master','DMP',1,'server.port', '8081', null),
+('dmp-org','dev','master','DMP',1,'server.port', '8080', null),
 
 ('dmp-org','dev','master','DMP',1,'eureka.client.service-url.defaultZone','http://frame:123456@localhost:9931/eureka/','注册中心地址'),
 ('dmp-org','dev','master','DMP',1,'eureka.instance.ip-address','localhost',null),
@@ -64,7 +64,7 @@ VALUES
 ('dmp-org','dev','master','DMP',1,'persagy.mysql.maxActive', '100', null),
 
 ('dmp-org','dev','master','DMP',1,'persagy.redis.host', 'localhost', null),
-('dmp-org','dev','master','DMP',1,'persagy.redis.port', '5672', null),
+('dmp-org','dev','master','DMP',1,'persagy.redis.port', '6379', null),
 ('dmp-org','dev','master','DMP',1,'persagy.redis.password', '123456', null),
 ('dmp-org','dev','master','DMP',1,'persagy.redis.database', '0', null),
 ('dmp-org','dev','master','DMP',1,'persagy.redis.max-active', '300', null),

dmp-rwd/doc/config.sql

@@ -48,7 +48,7 @@ VALUES
 ('dmp-rwd','default','master','DMP',1,'persagy.dmp.alarm.routingKey', 'routing-dmp-alarm', null),
 ('dmp-rwd','default','master','DMP',1,'persagy.dmp.task.routingKey', 'routing-dmp-task', null),
 
-('dmp-rwd','dev','master','DMP',1,'server.port', '8082', null),
+('dmp-rwd','dev','master','DMP',1,'server.port', '8080', null),
 
 ('dmp-rwd','dev','master','DMP',1,'eureka.client.service-url.defaultZone','http://frame:123456@localhost:9931/eureka/','注册中心地址'),
 ('dmp-rwd','dev','master','DMP',1,'eureka.instance.ip-address','localhost',null),
@@ -64,7 +64,7 @@ VALUES
 ('dmp-rwd','dev','master','DMP',1,'persagy.mysql.maxActive', '300', null),
 
 ('dmp-rwd','dev','master','DMP',1,'persagy.redis.host', 'localhost', null),
-('dmp-rwd','dev','master','DMP',1,'persagy.redis.port', '5672', null),
+('dmp-rwd','dev','master','DMP',1,'persagy.redis.port', '6379', null),
 ('dmp-rwd','dev','master','DMP',1,'persagy.redis.password', '123456', null),
 ('dmp-rwd','dev','master','DMP',1,'persagy.redis.database', '0', null),
 ('dmp-rwd','dev','master','DMP',1,'persagy.redis.max-active', '500', null),

dmp-rwd/src/main/java/com/persagy/dmp/rwd/config/RwdConstants.java

@@ -72,4 +72,6 @@ public class RwdConstants {
 	public static final String MESSAGE_INSTANCE_OBJECT_DELETE = "instanceObjectDelete";
 	public static final String MESSAGE_INSTANCE_RELATION_CREATE = "instanceRelationCreate";
 	public static final String MESSAGE_INSTANCE_RELATION_DELETE = "instanceRelationDelete";
+	public static final String MESSAGE_ORG_GROUP_CREATE = "groupCreate";
+	public static final String MESSAGE_ORG_PROJECT_CREATE = "projectCreate";
 }

dmp-rwd/src/main/java/com/persagy/dmp/rwd/jms/MessageProcesser.java

@@ -44,6 +44,8 @@ public class MessageProcesser {
 
 	static {
 		beanNames.add(RwdConstants.MESSAGE_INSTANCE_OBJECT_UPDATE);
+		beanNames.add(RwdConstants.MESSAGE_ORG_GROUP_CREATE);
+		beanNames.add(RwdConstants.MESSAGE_ORG_PROJECT_CREATE);
 	}
 
 	public void listen(DmpMessage message) {

dmp-task/doc/config.sql

@@ -46,7 +46,7 @@ VALUES
 ('dmp-task','default','master','DMP',1,'persagy.dmp.alarm.routingKey', 'routing-dmp-alarm', null),
 ('dmp-task','default','master','DMP',1,'persagy.dmp.task.routingKey', 'routing-dmp-task', null),
 
-('dmp-task','dev','master','DMP',1,'server.port', '8084', null),
+('dmp-task','dev','master','DMP',1,'server.port', '8080', null),
 
 ('dmp-task','dev','master','DMP',1,'eureka.client.service-url.defaultZone','http://frame:123456@localhost:9931/eureka/','注册中心地址'),
 ('dmp-task','dev','master','DMP',1,'eureka.instance.ip-address','localhost',null),