Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat: Add Solon Admin #157

Merged
merged 81 commits into from
Jul 9, 2023
Merged

Feat: Add Solon Admin #157

merged 81 commits into from
Jul 9, 2023

Conversation

shaokeyibb
Copy link
Contributor

@shaokeyibb shaokeyibb commented May 31, 2023

Commit as a project of OSPP 2023(ID: 23f4f0086, 为 Solon 框架增加配套的轻量级监控工具), see #96 or summer-ospp.ac.cn for more details.

What's been added?

This PR added a lightweight, frontend and backend separated monitor tools named Solon Admin, including in solon_tools module, provided 3 modules named solon-admin-client, solon-admin-server, solon-admin-server-ui. it's quite like the spring-boot-admin project.

The solon-admin-server-ui module is a Maven project contains a Vite project, build as a submodule of solon-admin-server, provided frontend web page of server instance.

How to use it?

  1. Add the solon-admin-server and solon-admin-client separately to your Maven/Gradle projects, the solon-admin-server-ui module has been packaged into solon-admin-server module.
  2. Put @EnableAdminServer annotation to the main class of your server instance.
  3. Put @EnableAdminClient annotation to the main class of your every client instances.
  4. Launch the instances.
  5. Go to the server address(default to localhost:8080) for your monitor.

中文版

以 OSPP 2023 项目(ID: 23f4f0086, 为 Solon 框架增加配套的轻量级监控工具)的身份提交 commit,如需了解更多信息请参见 #96summer-ospp.ac.cn

添加了什么?

此 PR 为 Solon 添加了一个名为 Solon Admin 的轻量级的,前后端分离的性能监控工具,包含在 solon_tools 模块中,提供了三个分别命名为 solon-admin-client, solon-admin-server, solon-admin-server-ui 的模块。这很像 spring-boot-admin 项目。

solon-admin-server-ui 模块是一个包含了一个 Vite 项目的 Maven 项目,作为 solon-admin-server 模块的子模块构建,提供服务器实例的前端页面。

如何使用?

  1. 分别添加 solon-admin-serversolon-admin-client 到你的 Maven/Gradle 项目中,solon-admin-server-ui 模块已被打包进 solon-admin-server 模块。
  2. @EnableAdminServer 注解标记在你服务器实例的主类上。
  3. @EnableAdminClient 注解标记在你每一个客户端实例的主类上。
  4. 启动这些实例。
  5. 访问服务器地址(默认为 localhost:8080 查看监控)。

image
image
image
image

Signed-off-by: HikariLan <shaokeyibb@126.com>
Signed-off-by: HikariLan <shaokeyibb@126.com>
Signed-off-by: HikariLan <shaokeyibb@126.com>
Signed-off-by: HikariLan <shaokeyibb@126.com>
Signed-off-by: HikariLan <shaokeyibb@126.com>
Signed-off-by: HikariLan <shaokeyibb@126.com>
Signed-off-by: HikariLan <shaokeyibb@126.com>
Signed-off-by: HikariLan <shaokeyibb@126.com>
Signed-off-by: HikariLan <shaokeyibb@126.com>
Signed-off-by: HikariLan <shaokeyibb@126.com>
Signed-off-by: HikariLan <shaokeyibb@126.com>
Signed-off-by: HikariLan <shaokeyibb@126.com>
Signed-off-by: HikariLan <shaokeyibb@126.com>
Signed-off-by: HikariLan <shaokeyibb@126.com>
Signed-off-by: HikariLan <shaokeyibb@126.com>
Signed-off-by: HikariLan <shaokeyibb@126.com>
Signed-off-by: HikariLan <shaokeyibb@126.com>
Signed-off-by: HikariLan <shaokeyibb@126.com>
Signed-off-by: HikariLan <shaokeyibb@126.com>
Signed-off-by: HikariLan <shaokeyibb@126.com>
…-registration

Signed-off-by: HikariLan <shaokeyibb@126.com>
…tration

Signed-off-by: HikariLan <shaokeyibb@126.com>
Signed-off-by: HikariLan <shaokeyibb@126.com>
Signed-off-by: HikariLan <shaokeyibb@126.com>
Signed-off-by: HikariLan <shaokeyibb@126.com>
Signed-off-by: HikariLan <shaokeyibb@126.com>
Signed-off-by: HikariLan <shaokeyibb@126.com>
Signed-off-by: HikariLan <shaokeyibb@126.com>
Signed-off-by: HikariLan <shaokeyibb@126.com>
Signed-off-by: HikariLan <shaokeyibb@126.com>
shaokeyibb and others added 27 commits May 31, 2023 02:26
…-registration

Signed-off-by: HikariLan <shaokeyibb@126.com>
…tration

Signed-off-by: HikariLan <shaokeyibb@126.com>
Signed-off-by: HikariLan <shaokeyibb@126.com>
Signed-off-by: HikariLan <shaokeyibb@126.com>
Signed-off-by: HikariLan <shaokeyibb@126.com>
Signed-off-by: HikariLan <shaokeyibb@126.com>
Signed-off-by: HikariLan <shaokeyibb@126.com>
Signed-off-by: HikariLan <shaokeyibb@126.com>
Signed-off-by: HikariLan <shaokeyibb@126.com>
Signed-off-by: HikariLan <shaokeyibb@126.com>
Signed-off-by: HikariLan <shaokeyibb@126.com>
Signed-off-by: HikariLan <shaokeyibb@126.com>
… long polling

Signed-off-by: HikariLan <shaokeyibb@126.com>
Signed-off-by: HikariLan <shaokeyibb@126.com>
Signed-off-by: HikariLan <shaokeyibb@126.com>
# Conflicts:
#	_solon_tool/solon-admin-server-ui/src/main/vue/src/App.vue
#	_solon_tool/solon-admin-server-ui/src/main/vue/src/components/global_layout/Header.vue
#	_solon_tool/solon-admin-server-ui/src/main/vue/src/components/global_layout/index.vue
#	_solon_tool/solon-admin-server-ui/src/main/vue/src/locale/en_us/index.ts
#	_solon_tool/solon-admin-server-ui/src/main/vue/src/locale/zh_cn/index.ts
#	_solon_tool/solon-admin-server-ui/src/main/vue/src/route/route.ts
#	_solon_tool/solon-admin-server-ui/src/main/vue/src/style.css
#	_solon_tool/solon-admin-server/src/main/java/org/noear/solon/admin/server/config/AdminServerBootstrapConfiguration.java
#	solon-projects/solon-tool/solon-admin-client/src/main/java/org/noear/solon/admin/client/config/AdminClientBootstrapConfiguration.java
#	solon-projects/solon-tool/solon-admin-client/src/main/java/org/noear/solon/admin/client/config/CloudClientProperties.java
#	solon-projects/solon-tool/solon-admin-client/src/main/java/org/noear/solon/admin/client/config/IClientProperties.java
#	solon-projects/solon-tool/solon-admin-client/src/main/java/org/noear/solon/admin/client/config/LocalClientProperties.java
#	solon-projects/solon-tool/solon-admin-server-ui/src/main/vue/src/hooks/application.ts
#	solon-projects/solon-tool/solon-admin-server-ui/src/main/vue/src/pages/application/NotFound.vue
#	solon-projects/solon-tool/solon-admin-server-ui/src/main/vue/src/pages/application/application/Details.vue
#	solon-projects/solon-tool/solon-admin-server-ui/src/main/vue/src/pages/application/application/index.vue
#	solon-projects/solon-tool/solon-admin-server/src/main/java/org/noear/solon/admin/server/config/ServerProperties.java
#	solon-projects/solon-tool/solon-admin-server/src/main/java/org/noear/solon/admin/server/config/WebSocketConfiguration.java
#	solon-projects/solon-tool/solon-admin-server/src/main/java/org/noear/solon/admin/server/config/XPluginImpl.java
#	solon-projects/solon-tool/solon-admin-server/src/main/java/org/noear/solon/admin/server/controller/ApplicationController.java
#	solon-projects/solon-tool/solon-admin-server/src/main/java/org/noear/solon/admin/server/controller/ApplicationWebsocketController.java
Signed-off-by: HikariLan <shaokeyibb@126.com>
Signed-off-by: HikariLan <shaokeyibb@126.com>
Signed-off-by: HikariLan <hikarilan@minecraft.kim>
Signed-off-by: HikariLan <hikarilan@minecraft.kim>
Signed-off-by: HikariLan <hikarilan@minecraft.kim>
Signed-off-by: HikariLan <hikarilan@minecraft.kim>
Signed-off-by: HikariLan <hikarilan@minecraft.kim>
Signed-off-by: HikariLan <hikarilan@minecraft.kim>
Signed-off-by: HikariLan <hikarilan@minecraft.kim>
Signed-off-by: HikariLan <hikarilan@minecraft.kim>
Signed-off-by: HikariLan <hikarilan@minecraft.kim>
@shaokeyibb shaokeyibb marked this pull request as ready for review July 9, 2023 22:55
@noear noear merged commit 95856e6 into opensolon:dev Jul 9, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants