Skip to content

o2oa
o2oa

weixin_42566577 / o2oa
与 Fork 源项目一致

Fork自 浙江兰德纵横网络技术股份有限公司 / o2oa

通知 1
Star 0
Fork 0
o2oa
o2oa

体验新版 GitCode，发现更多精彩内容 >>

提交 1ceb9424 编写于 作者: Z zhourui
浏览文件
操作

update messages

上级 b3720c60
隐藏空白更改
内联 并排
Showing with 106 addition and 40 deletion
o2server/pom.xml
浏览文件 @ 1ceb9424
......@@ -1204,7 +1204,7 @@
</dependencyManagement>
<!-- 中心仓库发布地址-->
<distributionManagement>
<!--distributionManagement>
<snapshotRepository>
<id>ossrh</id>
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
......@@ -1213,7 +1213,7 @@
<id>ossrh</id>
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>
</distributionManagement-->
<!--repositories>
<repository>
......@@ -1227,11 +1227,11 @@
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
</repositories-->
<distributionManagement>
<repository>
<id>o2oa-release</id>
<url>http://maven.o2oa.net/repository/o2oa-release/</url>
</repository>
</distributionManagement-->
</distributionManagement>
</project>
\ No newline at end of file
o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Message.java
浏览文件 @ 1ceb9424
......@@ -95,7 +95,7 @@ public class Message extends GsonPropertyObject {
@FieldDescribe("过滤脚本")
private String filter;
@FieldDescribe("配置项")
private String consumer;
protected String consumer;
public Boolean getEnable() {
return (null == this.enable) ? DEFAULT_ENABLE : this.enable;
......@@ -112,9 +112,9 @@ public class Message extends GsonPropertyObject {
public String getLoader() {
return StringUtils.isBlank(this.loader) ? DEFAULT_LOADER : this.loader;
}
public String getConsumer() {
return StringUtils.isBlank(this.consumer) ? DEFAULT_CONSUMER: this.consumer;
return StringUtils.isBlank(this.consumer) ? DEFAULT_CONSUMER : this.consumer;
}
}
......@@ -242,11 +242,17 @@ public class Message extends GsonPropertyObject {
private static final long serialVersionUID = -4452633351300698272L;
public static ApiConsumer defaultInstance() {
ApiConsumer o = new ApiConsumer();
o.application = DEFAULT_APPLICATION;
o.path = DEFAULT_PATH;
o.method = DEFAULT_METHOD;
o.consumer = null;
return o;
}
public ApiConsumer() {
super(MessageConnector.CONSUME_API, false);
this.application = DEFAULT_APPLICATION;
this.path = DEFAULT_PATH;
this.method = DEFAULT_METHOD;
}
private static final String DEFAULT_APPLICATION = "";
......@@ -278,14 +284,21 @@ public class Message extends GsonPropertyObject {
private static final long serialVersionUID = -8411174187306234827L;
public static MailConsumer defaultInstance() {
MailConsumer o = new MailConsumer();
o.host = DEFAULT_HOST;
o.port = DEFAULT_PORT;
o.sslEnable = DEFAULT_SSLENABLE;
o.auth = DEFAULT_AUTH;
o.from = DEFAULT_FROM;
o.password = DEFAULT_PASSWORD;
o.consumer = null;
return o;
}
public MailConsumer() {
super(MessageConnector.CONSUME_MAIL, false);
this.host = DEFAULT_HOST;
this.port = DEFAULT_PORT;
this.sslEnable = DEFAULT_SSLENABLE;
this.auth = DEFAULT_AUTH;
this.from = DEFAULT_FROM;
this.password = DEFAULT_PASSWORD;
}
private static final String DEFAULT_HOST = "";
......@@ -343,15 +356,21 @@ public class Message extends GsonPropertyObject {
private static final long serialVersionUID = 3234273317758806957L;
public static JdbcConsumer defaultInstance() {
JdbcConsumer o = new JdbcConsumer();
o.driverClass = DEFAULT_DRIVERCLASS;
o.url = DEFAULT_URL;
o.username = DEFAULT_USERNAME;
o.password = DEFAULT_PASSWORD;
o.catalog = DEFAULT_CATALOG;
o.schema = DEFAULT_SCHEMA;
o.table = DEFAULT_TABLE;
o.consumer = null;
return o;
}
public JdbcConsumer() {
super(MessageConnector.CONSUME_JDBC, false);
this.driverClass = DEFAULT_DRIVERCLASS;
this.url = DEFAULT_URL;
this.username = DEFAULT_USERNAME;
this.password = DEFAULT_PASSWORD;
this.catalog = DEFAULT_CATALOG;
this.schema = DEFAULT_SCHEMA;
this.table = DEFAULT_TABLE;
}
private static final String DEFAULT_DRIVERCLASS = "com.mysql.cj.jdbc.Driver";
......@@ -417,9 +436,16 @@ public class Message extends GsonPropertyObject {
private static final long serialVersionUID = 1791986872720051543L;
public static TableConsumer defaultInstance() {
TableConsumer o = new TableConsumer();
o.table = DEFAULT_TABLE;
o.consumer = null;
return o;
}
public TableConsumer() {
super(MessageConnector.CONSUME_TABLE, false);
this.table = DEFAULT_TABLE;
}
private static final String DEFAULT_TABLE = "";
......@@ -440,11 +466,17 @@ public class Message extends GsonPropertyObject {
private static final String DEFAULT_METHOD = "get";
private static final Boolean DEFAULT_INTERNAL = true;
public static RestfulConsumer defaultInstance() {
RestfulConsumer o = new RestfulConsumer();
o.url = DEFAULT_URL;
o.method = DEFAULT_METHOD;
o.internal = DEFAULT_INTERNAL;
o.consumer = null;
return o;
}
public RestfulConsumer() {
super(MessageConnector.CONSUME_RESTFUL, false);
this.url = DEFAULT_URL;
this.method = DEFAULT_METHOD;
this.internal = DEFAULT_INTERNAL;
}
......@@ -474,11 +506,17 @@ public class Message extends GsonPropertyObject {
private static final long serialVersionUID = -8274136904009320770L;
public static HadoopConsumer defaultInstance() {
HadoopConsumer o = new HadoopConsumer();
o.fsDefaultFS = DEFAULT_FS_DEFAULTFS;
o.username = DEFAULT_USERNAME;
o.path = DEFAULT_PATH;
o.consumer = null;
return o;
}
public HadoopConsumer() {
super(MessageConnector.CONSUME_HADOOP, false);
this.fsDefaultFS = DEFAULT_FS_DEFAULTFS;
this.username = DEFAULT_USERNAME;
this.path = DEFAULT_PATH;
}
private static final String DEFAULT_FS_DEFAULTFS = "hdfs://";
......@@ -511,14 +549,20 @@ public class Message extends GsonPropertyObject {
private static final long serialVersionUID = 8788289001004063043L;
public static KafkaConsumer defaultInstance() {
KafkaConsumer o = new KafkaConsumer();
o.bootstrapServers = DEFAULT_BOOTSTRAPSERVERS;
o.topic = DEFAULT_TOPIC;
o.securityProtocol = DEFAULT_SECURITYPROTOCOL;
o.saslMechanism = DEFAULT_SASLMECHANISM;
o.username = DEFAULT_USERNAME;
o.password = DEFAULT_PASSWORD;
o.consumer = null;
return o;
}
public KafkaConsumer() {
super(MessageConnector.CONSUME_KAFKA, false);
this.bootstrapServers = DEFAULT_BOOTSTRAPSERVERS;
this.topic = DEFAULT_TOPIC;
this.securityProtocol = DEFAULT_SECURITYPROTOCOL;
this.saslMechanism = DEFAULT_SASLMECHANISM;
this.username = DEFAULT_USERNAME;
this.password = DEFAULT_PASSWORD;
}
private static final String DEFAULT_BOOTSTRAPSERVERS = "";
......@@ -576,12 +620,18 @@ public class Message extends GsonPropertyObject {
private static final long serialVersionUID = -7469816290407400176L;
public static ActivemqConsumer defaultInstance() {
ActivemqConsumer o = new ActivemqConsumer();
o.username = DEFAULT_USERNAME;
o.password = DEFAULT_PASSWORD;
o.url = DEFAULT_URL;
o.queueName = DEFAULT_QUEUENAME;
o.consumer = null;
return o;
}
public ActivemqConsumer() {
super(MessageConnector.CONSUME_ACTIVEMQ, false);
this.username = DEFAULT_USERNAME;
this.password = DEFAULT_PASSWORD;
this.url = DEFAULT_URL;
this.queueName = DEFAULT_QUEUENAME;
}
private static final String DEFAULT_USERNAME = "";
......
o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Messages.java
浏览文件 @ 1ceb9424
......@@ -231,6 +231,21 @@ public class Messages extends ConfigObject {
o.im_create = new Message(MessageConnector.CONSUME_WS, MessageConnector.CONSUME_PMS_INNER)
.cloneThenSetDescription("聊聊消息.");
o.consumers = new LinkedHashMap<>();
o.consumers.put("ws_demo", XGsonBuilder.instance().toJsonTree(new WsConsumer()));
o.consumers.put("pmsinner_demo", XGsonBuilder.instance().toJsonTree(new PmsinnerConsumer()));
o.consumers.put("calendar_demo", XGsonBuilder.instance().toJsonTree(new CalendarConsumer()));
o.consumers.put("dingding_demo", XGsonBuilder.instance().toJsonTree(new DingdingConsumer()));
o.consumers.put("welink_demo", XGsonBuilder.instance().toJsonTree(new WelinkConsumer()));
o.consumers.put("qiyeweixin_demo", XGsonBuilder.instance().toJsonTree(new QiyeweixinConsumer()));
o.consumers.put("mpweixin_demo", XGsonBuilder.instance().toJsonTree(new MpweixinConsumer()));
o.consumers.put("kafka_demo", XGsonBuilder.instance().toJsonTree(KafkaConsumer.defaultInstance()));
o.consumers.put("activemq_demo", XGsonBuilder.instance().toJsonTree(ActivemqConsumer.defaultInstance()));
o.consumers.put("restful_demo", XGsonBuilder.instance().toJsonTree(RestfulConsumer.defaultInstance()));
o.consumers.put("mail_demo", XGsonBuilder.instance().toJsonTree(MailConsumer.defaultInstance()));
o.consumers.put("api_demo", XGsonBuilder.instance().toJsonTree(ApiConsumer.defaultInstance()));
o.consumers.put("jdbc_demo", XGsonBuilder.instance().toJsonTree( JdbcConsumer.defaultInstance()));
o.consumers.put("table_demo", XGsonBuilder.instance().toJsonTree( TableConsumer.defaultInstance()));
o.consumers.put("hadoop_demo", XGsonBuilder.instance().toJsonTree(HadoopConsumer.defaultInstance()));
o.loaders = new LinkedHashMap<>();
o.filters = new LinkedHashMap<>();
return o;
......
o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Query.java
浏览文件 @ 1ceb9424
......@@ -14,6 +14,7 @@ import com.x.base.core.project.annotation.FieldDescribe;
import com.x.base.core.project.gson.XGsonBuilder;
import com.x.base.core.project.tools.DefaultCharset;
@Deprecated(forRemoval = true)
public class Query extends ConfigObject {
public static Query defaultInstance() {
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或