From 1ceb942441cfb85a8f3180fe13a48f91b7373793 Mon Sep 17 00:00:00 2001 From: zhourui Date: Fri, 26 Aug 2022 21:26:18 +0800 Subject: [PATCH] update messages --- o2server/pom.xml | 8 +- .../x/base/core/project/config/Message.java | 122 ++++++++++++------ .../x/base/core/project/config/Messages.java | 15 +++ .../com/x/base/core/project/config/Query.java | 1 + 4 files changed, 106 insertions(+), 40 deletions(-) diff --git a/o2server/pom.xml b/o2server/pom.xml index 3cf90f0e6c..3cadf815b2 100644 --- a/o2server/pom.xml +++ b/o2server/pom.xml @@ -1204,7 +1204,7 @@ - + o2oa-release http://maven.o2oa.net/repository/o2oa-release/ - + \ No newline at end of file diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Message.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Message.java index c655db59ed..fe931c9437 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Message.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Message.java @@ -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 = ""; diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Messages.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Messages.java index 698d49cc37..fcf43aedfc 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Messages.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Messages.java @@ -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; diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Query.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Query.java index 423ac78e77..3f26db26ec 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Query.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Query.java @@ -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() { -- GitLab