This is an automated email from the ASF dual-hosted git repository.
xiatian pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/eventmesh-dashboard.git
The following commit(s) were added to refs/heads/dev by this push:
new ad4bd7a [ISSUE #20] Add dependency of console module (#19)
ad4bd7a is described below
commit ad4bd7afd91af0df0f33984153ac64dd7e25809c
Author: Lambert Rao <[email protected]>
AuthorDate: Mon Jan 22 19:48:45 2024 +0800
[ISSUE #20] Add dependency of console module (#19)
* refactor: add dependency of console module and move controllers into
console module.
* fix: add logback config, fix application-dev.yml and move
`</dependencyManagement>` to root `pom.xml` as pointed out in PR#19.
---
eventmesh-dashboard-common/pom.xml | 16 +++++-
eventmesh-dashboard-console/pom.xml | 61 ++++++++++++++++++++--
.../console/EventmeshConsoleApplication.java | 38 ++++++++++++++
.../apache/eventmesh/dashboard/console/Main.java | 7 ---
.../src/main/resources/application-dev.yml | 58 ++++++--------------
.../src/main/resources/application.yml | 38 ++++++++++++++
.../src/main/resources/logback.xml | 50 ++++++++++++++++++
eventmesh-dashboard-core/pom.xml | 22 ++------
.../src/main/resources/application-dev.yml | 2 +-
pom.xml | 18 +++++++
10 files changed, 238 insertions(+), 72 deletions(-)
diff --git a/eventmesh-dashboard-common/pom.xml
b/eventmesh-dashboard-common/pom.xml
index 4247216..f79bd00 100644
--- a/eventmesh-dashboard-common/pom.xml
+++ b/eventmesh-dashboard-common/pom.xml
@@ -13,9 +13,21 @@
<artifactId>eventmesh-dashboard-common</artifactId>
<properties>
- <maven.compiler.source>8</maven.compiler.source>
- <maven.compiler.target>8</maven.compiler.target>
+ <java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <spring-boot.version>2.7.6</spring-boot.version>
</properties>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ </dependency>
+ </dependencies>
+
</project>
\ No newline at end of file
diff --git a/eventmesh-dashboard-console/pom.xml
b/eventmesh-dashboard-console/pom.xml
index 2042c89..fa06c45 100644
--- a/eventmesh-dashboard-console/pom.xml
+++ b/eventmesh-dashboard-console/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.eventmesh.dashboard</groupId>
@@ -13,9 +13,62 @@
<artifactId>eventmesh-dashboard-console</artifactId>
<properties>
- <maven.compiler.source>8</maven.compiler.source>
- <maven.compiler.target>8</maven.compiler.target>
+ <java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
+ <dependencies>
+ <!-- springframework dependencies -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- swagger -->
+ <dependency>
+ <groupId>org.springdoc</groupId>
+ <artifactId>springdoc-openapi-ui</artifactId>
+ <version>1.7.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springdoc</groupId>
+ <artifactId>springdoc-openapi-javadoc</artifactId>
+ <version>1.7.0</version>
+ </dependency>
+
+ <!-- eventmesh.dashboard dependency -->
+ <dependency>
+ <groupId>org.apache.eventmesh.dashboard.common</groupId>
+ <artifactId>eventmesh-dashboard-common</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.eventmesh.dashboard.service</groupId>
+ <artifactId>eventmesh-dashboard-service</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </dependency>
+
+ <!-- Database -->
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>druid-spring-boot-starter</artifactId>
+ <version>1.2.21</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mybatis.spring.boot</groupId>
+ <artifactId>mybatis-spring-boot-starter</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.mysql</groupId>
+ <artifactId>mysql-connector-j</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+
</project>
\ No newline at end of file
diff --git
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/EventmeshConsoleApplication.java
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/EventmeshConsoleApplication.java
new file mode 100644
index 0000000..1e4d6db
--- /dev/null
+++
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/EventmeshConsoleApplication.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.eventmesh.dashboard.console;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.ComponentScan;
+
+@Slf4j
+@SpringBootApplication
+@ComponentScan({"org.apache.eventmesh.dashboard.service",
"org.apache.eventmesh.dashboard.console"})
+public class EventmeshConsoleApplication {
+
+ public static void main(String[] args) {
+ try {
+ SpringApplication.run(EventmeshConsoleApplication.class, args);
+ log.info("{} Successfully booted.",
EventmeshConsoleApplication.class.getSimpleName());
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ }
+ }
+}
diff --git
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/Main.java
b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/Main.java
deleted file mode 100644
index 7e966a2..0000000
---
a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/Main.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.apache.eventmesh.dashboard.console;
-
-public class Main {
- public static void main(String[] args) {
- System.out.println("Hello world!");
- }
-}
\ No newline at end of file
diff --git a/eventmesh-dashboard-core/src/main/resources/application-dev.yml
b/eventmesh-dashboard-console/src/main/resources/application-dev.yml
similarity index 50%
copy from eventmesh-dashboard-core/src/main/resources/application-dev.yml
copy to eventmesh-dashboard-console/src/main/resources/application-dev.yml
index 9137786..bfe0280 100644
--- a/eventmesh-dashboard-core/src/main/resources/application-dev.yml
+++ b/eventmesh-dashboard-console/src/main/resources/application-dev.yml
@@ -14,14 +14,27 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
+
+server:
+ port: 9898
+ servlet:
+ context-path: "/eventmesh"
+
spring:
+ servlet:
+ multipart:
+ max-file-size: 500MB
+ max-request-size: 500MB
+ application:
+ name: eventmesh-console
datasource:
+ name: eventmesh-console
type: com.alibaba.druid.pool.DruidDataSource
druid:
driver-class-name: com.mysql.cj.jdbc.Driver
- url:
jdbc:mysql://localhost:3306/eventmesh-dashboard?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
+ url:
jdbc:mysql://localhost:3306/eventmesh-dashboard?useSSL=false&useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true
username: root
- password:
+ password: root
initial-size: 1
max-active: 50
@@ -33,43 +46,6 @@ spring:
test-while-idle: true
min-evictable-idle-time-millis: 300000
- stat-view-servlet:
- enabled: true
- url-pattern: /druid/*
- filter:
- wall:
- config:
- multi-statement-allow: true # corresponds to allowMultiQueries
-eventmesh:
- meta:
- # registry type: nacos, etcd
- type: nacos
- nacos:
- addr: 127.0.0.1:8848
- namespace: # namespace id, empty by default
- authEnabled: false
- protocol: http # http or https
- username:
- password:
- # Alibaba Cloud MSE Nacos auth, not nacos.token.secret.key
- accessKey:
- secretKey:
- etcd:
- addr: # TODO
- # timeout for admin client
- timeoutMs: 5000
- store:
- # Event Store type, should be consistent with the EventMesh Runtime
configuration.
- type: rocketmq
- standalone:
- # TODO
- rocketmq:
- namesrvAddr: 127.0.0.1:9876;127.0.0.1:9876
- clusterName: DefaultCluster
- accessKey: '********'
- secretKey: '********'
- kafka:
- namesrvAddr: localhost:9092;localhost:9092
- partitions: 1
- replicationFactors: 1
\ No newline at end of file
+
+
diff --git a/eventmesh-dashboard-console/src/main/resources/application.yml
b/eventmesh-dashboard-console/src/main/resources/application.yml
new file mode 100644
index 0000000..f39890e
--- /dev/null
+++ b/eventmesh-dashboard-console/src/main/resources/application.yml
@@ -0,0 +1,38 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+spring:
+ application:
+ name: eventmesh-dashboard
+ profiles:
+ active: dev
+
+logging:
+ config: classpath:logback.xml
+
+mybatis:
+ checkConfig-location: false
+ configuration:
+ useGeneratedKeys: true
+ mapUnderscoreToCamelCase: true
+
+
+pagehelper:
+ helperDialect: mysql
+ reasonable: true
+ supportMethodsArguments: true
+ params: count=countSql
\ No newline at end of file
diff --git a/eventmesh-dashboard-console/src/main/resources/logback.xml
b/eventmesh-dashboard-console/src/main/resources/logback.xml
new file mode 100644
index 0000000..c9925d3
--- /dev/null
+++ b/eventmesh-dashboard-console/src/main/resources/logback.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<configuration>
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder charset="UTF-8">
+ <pattern>[%d{yyyy-MM-dd HH:mm:ss.SSS}] %p %t - %m%n</pattern>
+ </encoder>
+ </appender>
+
+ <appender name="FILE"
+ class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${user.home}/logs/eventmesh-dashboard.log</file>
+ <append>true</append>
+ <rollingPolicy
class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+
<fileNamePattern>${user.home}/logs/eventmesh-dashboard-%d{yyyy-MM-dd}.%i.log
+ </fileNamePattern>
+ <timeBasedFileNamingAndTriggeringPolicy
+ class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+ <maxFileSize>104857600</maxFileSize>
+ </timeBasedFileNamingAndTriggeringPolicy>
+ <MaxHistory>10</MaxHistory>
+ </rollingPolicy>
+ <encoder>
+ <pattern>[%d{yyyy-MM-dd HH:mm:ss.SSS}] %p %t - %m%n</pattern>
+ <charset class="java.nio.charset.Charset">UTF-8</charset>
+ </encoder>
+ </appender>
+
+ <root level="INFO">
+ <appender-ref ref="STDOUT" />
+ <appender-ref ref="FILE" />
+ </root>
+
+</configuration>
\ No newline at end of file
diff --git a/eventmesh-dashboard-core/pom.xml b/eventmesh-dashboard-core/pom.xml
index 98ade69..651cad8 100644
--- a/eventmesh-dashboard-core/pom.xml
+++ b/eventmesh-dashboard-core/pom.xml
@@ -57,11 +57,6 @@
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
</dependency>
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <optional>true</optional>
- </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
@@ -69,6 +64,11 @@
</dependency>
<!-- utility -->
+ <dependency>
+ <groupId>org.apache.eventmesh.dashboard.common</groupId>
+ <artifactId>eventmesh-dashboard-common</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
@@ -80,18 +80,6 @@
<version>2.0.40</version>
</dependency>
- <!-- swagger -->
- <dependency>
- <groupId>org.springdoc</groupId>
- <artifactId>springdoc-openapi-ui</artifactId>
- <version>1.7.0</version>
- </dependency>
- <dependency>
- <groupId>org.springdoc</groupId>
- <artifactId>springdoc-openapi-javadoc</artifactId>
- <version>1.7.0</version>
- </dependency>
-
<!-- unit test -->
<dependency>
<groupId>org.mockito</groupId>
diff --git a/eventmesh-dashboard-core/src/main/resources/application-dev.yml
b/eventmesh-dashboard-core/src/main/resources/application-dev.yml
index 9137786..f61a3c3 100644
--- a/eventmesh-dashboard-core/src/main/resources/application-dev.yml
+++ b/eventmesh-dashboard-core/src/main/resources/application-dev.yml
@@ -21,7 +21,7 @@ spring:
driver-class-name: com.mysql.cj.jdbc.Driver
url:
jdbc:mysql://localhost:3306/eventmesh-dashboard?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
username: root
- password:
+ password: root
initial-size: 1
max-active: 50
diff --git a/pom.xml b/pom.xml
index 3abf420..ed8fd4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,6 +78,8 @@
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <spring-boot.version>2.7.6</spring-boot.version>
+ <mybatis-spring-boot.version>2.3.2</mybatis-spring-boot.version>
</properties>
<modules>
@@ -87,4 +89,20 @@
<module>eventmesh-dashboard-service</module>
<module>eventmesh-dashboard-common</module>
</modules>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-dependencies</artifactId>
+ <version>${spring-boot.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mybatis.spring.boot</groupId>
+ <artifactId>mybatis-spring-boot-starter</artifactId>
+ <version>${mybatis-spring-boot.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
</project>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
