Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'dev' of https://github.com/shaokeyibb/solon
# 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