diff --git a/demo-admin/README.md b/demo-monitor/demo-monitor-admin/README.md similarity index 86% rename from demo-admin/README.md rename to demo-monitor/demo-monitor-admin/README.md index 4711e65..fa1d5d1 100644 --- a/demo-admin/README.md +++ b/demo-monitor/demo-monitor-admin/README.md @@ -50,16 +50,16 @@ #### 1.2.admin-server开发 -参考 [admin-server 模块](./admin-server/README.md) +参考 [admin-server 模块](admin-server/README.md) #### 1.3.admin-client开发 -参考 [admin-client 模块](./admin-client/README.md) +参考 [admin-client 模块](admin-client/README.md) ### 2.测试 -1. 进入 [admin-server](./admin-server) 服务端,启动管控台服务端程序 -2. 进入 [admin-client](./admin-client) 客户端,启动客户端程序,注册到服务端 +1. 进入 [admin-server](admin-server) 服务端,启动管控台服务端程序 +2. 进入 [admin-client](admin-client) 客户端,启动客户端程序,注册到服务端 3. 打开 `http://localhost:8000` 观察 client 是否注册成功,以及实例注册上来的详细信息 4. Spring Boot Admin 支持在线查看日志,但是需要客户端事先配置日志,配置好之后,就可以在线查看日志了 diff --git a/demo-admin/admin-client/README.md b/demo-monitor/demo-monitor-admin/admin-client/README.md similarity index 100% rename from demo-admin/admin-client/README.md rename to demo-monitor/demo-monitor-admin/admin-client/README.md diff --git a/demo-admin/admin-client/pom.xml b/demo-monitor/demo-monitor-admin/admin-client/pom.xml similarity index 100% rename from demo-admin/admin-client/pom.xml rename to demo-monitor/demo-monitor-admin/admin-client/pom.xml diff --git a/demo-admin/admin-client/src/main/java/com/xkcoding/admin/client/AdminClientApplication.java b/demo-monitor/demo-monitor-admin/admin-client/src/main/java/com/xkcoding/admin/client/AdminClientApplication.java similarity index 100% rename from demo-admin/admin-client/src/main/java/com/xkcoding/admin/client/AdminClientApplication.java rename to demo-monitor/demo-monitor-admin/admin-client/src/main/java/com/xkcoding/admin/client/AdminClientApplication.java diff --git a/demo-admin/admin-client/src/main/java/com/xkcoding/admin/client/controller/IndexController.java b/demo-monitor/demo-monitor-admin/admin-client/src/main/java/com/xkcoding/admin/client/controller/IndexController.java similarity index 100% rename from demo-admin/admin-client/src/main/java/com/xkcoding/admin/client/controller/IndexController.java rename to demo-monitor/demo-monitor-admin/admin-client/src/main/java/com/xkcoding/admin/client/controller/IndexController.java diff --git a/demo-admin/admin-client/src/main/java/com/xkcoding/admin/client/controller/TestController.java b/demo-monitor/demo-monitor-admin/admin-client/src/main/java/com/xkcoding/admin/client/controller/TestController.java similarity index 100% rename from demo-admin/admin-client/src/main/java/com/xkcoding/admin/client/controller/TestController.java rename to demo-monitor/demo-monitor-admin/admin-client/src/main/java/com/xkcoding/admin/client/controller/TestController.java diff --git a/demo-admin/admin-client/src/main/resources/application.yml b/demo-monitor/demo-monitor-admin/admin-client/src/main/resources/application.yml similarity index 100% rename from demo-admin/admin-client/src/main/resources/application.yml rename to demo-monitor/demo-monitor-admin/admin-client/src/main/resources/application.yml diff --git a/demo-admin/admin-client/src/test/java/com/xkcoding/admin/client/AdminClientApplicationTests.java b/demo-monitor/demo-monitor-admin/admin-client/src/test/java/com/xkcoding/admin/client/AdminClientApplicationTests.java similarity index 100% rename from demo-admin/admin-client/src/test/java/com/xkcoding/admin/client/AdminClientApplicationTests.java rename to demo-monitor/demo-monitor-admin/admin-client/src/test/java/com/xkcoding/admin/client/AdminClientApplicationTests.java diff --git a/demo-admin/admin-server/README.md b/demo-monitor/demo-monitor-admin/admin-server/README.md similarity index 100% rename from demo-admin/admin-server/README.md rename to demo-monitor/demo-monitor-admin/admin-server/README.md diff --git a/demo-admin/admin-server/pom.xml b/demo-monitor/demo-monitor-admin/admin-server/pom.xml similarity index 100% rename from demo-admin/admin-server/pom.xml rename to demo-monitor/demo-monitor-admin/admin-server/pom.xml diff --git a/demo-admin/admin-server/src/main/java/com/xkcoding/admin/server/AdminServerApplication.java b/demo-monitor/demo-monitor-admin/admin-server/src/main/java/com/xkcoding/admin/server/AdminServerApplication.java similarity index 100% rename from demo-admin/admin-server/src/main/java/com/xkcoding/admin/server/AdminServerApplication.java rename to demo-monitor/demo-monitor-admin/admin-server/src/main/java/com/xkcoding/admin/server/AdminServerApplication.java diff --git a/demo-admin/admin-server/src/main/resources/application.yml b/demo-monitor/demo-monitor-admin/admin-server/src/main/resources/application.yml similarity index 100% rename from demo-admin/admin-server/src/main/resources/application.yml rename to demo-monitor/demo-monitor-admin/admin-server/src/main/resources/application.yml diff --git a/demo-admin/admin-server/src/test/java/com/xkcoding/admin/server/AdminServerApplicationTests.java b/demo-monitor/demo-monitor-admin/admin-server/src/test/java/com/xkcoding/admin/server/AdminServerApplicationTests.java similarity index 100% rename from demo-admin/admin-server/src/test/java/com/xkcoding/admin/server/AdminServerApplicationTests.java rename to demo-monitor/demo-monitor-admin/admin-server/src/test/java/com/xkcoding/admin/server/AdminServerApplicationTests.java diff --git a/demo-admin/pom.xml b/demo-monitor/demo-monitor-admin/pom.xml similarity index 95% rename from demo-admin/pom.xml rename to demo-monitor/demo-monitor-admin/pom.xml index 43be5e9..ebf04c9 100644 --- a/demo-admin/pom.xml +++ b/demo-monitor/demo-monitor-admin/pom.xml @@ -3,8 +3,8 @@ 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"> - spring-boot-demo com.xkcoding + demo-monitor 1.0.0-SNAPSHOT diff --git a/demo-monitor/pom.xml b/demo-monitor/pom.xml index 2e144b3..a6c3daa 100644 --- a/demo-monitor/pom.xml +++ b/demo-monitor/pom.xml @@ -20,6 +20,7 @@ demo-monitor-actuator + demo-monitor-admin diff --git a/demo-template/pom.xml b/demo-template/pom.xml new file mode 100644 index 0000000..d6a5373 --- /dev/null +++ b/demo-template/pom.xml @@ -0,0 +1,24 @@ + + + + spring-boot-demo + com.xkcoding + 1.0.0-SNAPSHOT + + + 4.0.0 + + demo-template + 1.0.0-SNAPSHOT + + + 17 + + + + dem + + + diff --git a/pom.xml b/pom.xml index 4da5ec2..3792d09 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,6 @@ common-tools demo-base demo-monitor - demo-admin