Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/shaokeyibb/solon
Browse files Browse the repository at this point in the history
# Conflicts:
#	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/LocalClientProperties.java
#	solon-projects/solon-tool/solon-admin-client/src/main/java/org/noear/solon/admin/client/controller/MonitorController.java
#	solon-projects/solon-tool/solon-admin-client/src/main/java/org/noear/solon/admin/client/data/Application.java
#	solon-projects/solon-tool/solon-admin-client/src/main/java/org/noear/solon/admin/client/data/ApplicationWebsocketTransfer.java
#	solon-projects/solon-tool/solon-admin-client/src/main/java/org/noear/solon/admin/client/data/Detector.java
#	solon-projects/solon-tool/solon-admin-client/src/main/java/org/noear/solon/admin/client/data/EnvironmentInformation.java
#	solon-projects/solon-tool/solon-admin-client/src/main/java/org/noear/solon/admin/client/registration/AutoRegistrationConfiguration.java
#	solon-projects/solon-tool/solon-admin-client/src/main/java/org/noear/solon/admin/client/services/ApplicationRegistrationService.java
#	solon-projects/solon-tool/solon-admin-client/src/main/java/org/noear/solon/admin/client/services/MonitorService.java
#	solon-projects/solon-tool/solon-admin-server/src/main/java/org/noear/solon/admin/server/config/AdminServerBootstrapConfiguration.java
#	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/controller/ApplicationController.java
#	solon-projects/solon-tool/solon-admin-server/src/main/java/org/noear/solon/admin/server/controller/ApplicationWebsocketController.java
#	solon-projects/solon-tool/solon-admin-server/src/main/java/org/noear/solon/admin/server/controller/UIController.java
#	solon-projects/solon-tool/solon-admin-server/src/main/java/org/noear/solon/admin/server/data/Application.java
#	solon-projects/solon-tool/solon-admin-server/src/main/java/org/noear/solon/admin/server/data/ApplicationWebsocketTransfer.java
#	solon-projects/solon-tool/solon-admin-server/src/main/java/org/noear/solon/admin/server/data/Detector.java
#	solon-projects/solon-tool/solon-admin-server/src/main/java/org/noear/solon/admin/server/data/EnvironmentInformation.java
#	solon-projects/solon-tool/solon-admin-server/src/main/java/org/noear/solon/admin/server/services/ApplicationService.java
  • Loading branch information
shaokeyibb committed Jul 25, 2023
2 parents 0272ea3 + 9705e48 commit 978b9b1
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 978b9b1

Please sign in to comment.