From 04b0d81c3ab7b5411508056393afe61706f56774 Mon Sep 17 00:00:00 2001 From: chenT <609580885@qq.com> Date: Wed, 4 Dec 2024 17:15:50 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{dolives/gui => dolet}/Application.java | 2 +- .../{dolives/gui => dolet}/GuiStarter.java | 6 ++-- .../gui => dolet}/annotation/Controller.java | 2 +- .../gui => dolet}/base/EntityConverter.java | 2 +- .../controller/BaseController.java | 4 +-- .../controller/ControllerLoader.java | 4 +-- .../controller/MainUIController.java | 28 +++++++++---------- .../dialog/CallPluginController.java | 13 +++++---- .../controller/dialog/LoginController.java | 12 ++++---- .../dialog/PluginPathController.java | 16 +++++------ .../dialog/ProjectPathController.java | 16 +++++------ .../controller/dialog/ShowLogController.java | 8 +++--- .../gui => dolet}/def/ControllerDef.java | 4 +-- .../gui => dolet}/entity/BoundedContext.java | 2 +- .../{dolives/gui => dolet}/entity/Config.java | 2 +- .../{dolives/gui => dolet}/entity/Domain.java | 2 +- .../{dolives/gui => dolet}/entity/Path.java | 2 +- .../{dolives/gui => dolet}/entity/Plugin.java | 2 +- .../gui => dolet}/entity/Project.java | 2 +- .../gui => dolet}/entity/Property.java | 2 +- .../gui => dolet}/entity/Subdomain.java | 2 +- .../{dolives/gui => dolet}/entity/User.java | 2 +- .../gui => dolet}/util/AlertUtils.java | 2 +- .../gui => dolet}/util/HttpClientUtils.java | 2 +- src/main/resources/fxml/CallPlugin.fxml | 2 +- src/main/resources/fxml/Login.fxml | 2 +- src/main/resources/fxml/MainUI.fxml | 2 +- src/main/resources/fxml/PluginPath.fxml | 2 +- src/main/resources/fxml/ProjectPath.fxml | 2 +- src/main/resources/fxml/ShowLog.fxml | 2 +- 30 files changed, 76 insertions(+), 75 deletions(-) rename src/main/java/com/gitee/{dolives/gui => dolet}/Application.java (93%) rename src/main/java/com/gitee/{dolives/gui => dolet}/GuiStarter.java (78%) rename src/main/java/com/gitee/{dolives/gui => dolet}/annotation/Controller.java (88%) rename src/main/java/com/gitee/{dolives/gui => dolet}/base/EntityConverter.java (93%) rename src/main/java/com/gitee/{dolives/gui => dolet}/controller/BaseController.java (86%) rename src/main/java/com/gitee/{dolives/gui => dolet}/controller/ControllerLoader.java (98%) rename src/main/java/com/gitee/{dolives/gui => dolet}/controller/MainUIController.java (96%) rename src/main/java/com/gitee/{dolives/gui => dolet}/controller/dialog/CallPluginController.java (93%) rename src/main/java/com/gitee/{dolives/gui => dolet}/controller/dialog/LoginController.java (78%) rename src/main/java/com/gitee/{dolives/gui => dolet}/controller/dialog/PluginPathController.java (84%) rename src/main/java/com/gitee/{dolives/gui => dolet}/controller/dialog/ProjectPathController.java (84%) rename src/main/java/com/gitee/{dolives/gui => dolet}/controller/dialog/ShowLogController.java (90%) rename src/main/java/com/gitee/{dolives/gui => dolet}/def/ControllerDef.java (89%) rename src/main/java/com/gitee/{dolives/gui => dolet}/entity/BoundedContext.java (88%) rename src/main/java/com/gitee/{dolives/gui => dolet}/entity/Config.java (92%) rename src/main/java/com/gitee/{dolives/gui => dolet}/entity/Domain.java (87%) rename src/main/java/com/gitee/{dolives/gui => dolet}/entity/Path.java (95%) rename src/main/java/com/gitee/{dolives/gui => dolet}/entity/Plugin.java (94%) rename src/main/java/com/gitee/{dolives/gui => dolet}/entity/Project.java (93%) rename src/main/java/com/gitee/{dolives/gui => dolet}/entity/Property.java (88%) rename src/main/java/com/gitee/{dolives/gui => dolet}/entity/Subdomain.java (87%) rename src/main/java/com/gitee/{dolives/gui => dolet}/entity/User.java (94%) rename src/main/java/com/gitee/{dolives/gui => dolet}/util/AlertUtils.java (96%) rename src/main/java/com/gitee/{dolives/gui => dolet}/util/HttpClientUtils.java (99%) diff --git a/src/main/java/com/gitee/dolives/gui/Application.java b/src/main/java/com/gitee/dolet/Application.java similarity index 93% rename from src/main/java/com/gitee/dolives/gui/Application.java rename to src/main/java/com/gitee/dolet/Application.java index 91adca9..bfef8a7 100644 --- a/src/main/java/com/gitee/dolives/gui/Application.java +++ b/src/main/java/com/gitee/dolet/Application.java @@ -1,4 +1,4 @@ -package com.gitee.dolives.gui; +package com.gitee.dolet; import org.apache.velocity.app.Velocity; import org.springframework.boot.SpringApplication; diff --git a/src/main/java/com/gitee/dolives/gui/GuiStarter.java b/src/main/java/com/gitee/dolet/GuiStarter.java similarity index 78% rename from src/main/java/com/gitee/dolives/gui/GuiStarter.java rename to src/main/java/com/gitee/dolet/GuiStarter.java index 85cc67c..fc6c291 100644 --- a/src/main/java/com/gitee/dolives/gui/GuiStarter.java +++ b/src/main/java/com/gitee/dolet/GuiStarter.java @@ -1,7 +1,7 @@ -package com.gitee.dolives.gui; +package com.gitee.dolet; -import com.gitee.dolives.gui.controller.ControllerLoader; -import com.gitee.dolives.gui.controller.MainUIController; +import com.gitee.dolet.controller.ControllerLoader; +import com.gitee.dolet.controller.MainUIController; import javafx.application.Application; import javafx.stage.Stage; diff --git a/src/main/java/com/gitee/dolives/gui/annotation/Controller.java b/src/main/java/com/gitee/dolet/annotation/Controller.java similarity index 88% rename from src/main/java/com/gitee/dolives/gui/annotation/Controller.java rename to src/main/java/com/gitee/dolet/annotation/Controller.java index eded905..a19430d 100644 --- a/src/main/java/com/gitee/dolives/gui/annotation/Controller.java +++ b/src/main/java/com/gitee/dolet/annotation/Controller.java @@ -1,4 +1,4 @@ -package com.gitee.dolives.gui.annotation; +package com.gitee.dolet.annotation; import java.lang.annotation.*; diff --git a/src/main/java/com/gitee/dolives/gui/base/EntityConverter.java b/src/main/java/com/gitee/dolet/base/EntityConverter.java similarity index 93% rename from src/main/java/com/gitee/dolives/gui/base/EntityConverter.java rename to src/main/java/com/gitee/dolet/base/EntityConverter.java index 7c1e729..e34d448 100644 --- a/src/main/java/com/gitee/dolives/gui/base/EntityConverter.java +++ b/src/main/java/com/gitee/dolet/base/EntityConverter.java @@ -1,4 +1,4 @@ -package com.gitee.dolives.gui.base; +package com.gitee.dolet.base; import javafx.util.StringConverter; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/gitee/dolives/gui/controller/BaseController.java b/src/main/java/com/gitee/dolet/controller/BaseController.java similarity index 86% rename from src/main/java/com/gitee/dolives/gui/controller/BaseController.java rename to src/main/java/com/gitee/dolet/controller/BaseController.java index c03b8b3..cb58b23 100644 --- a/src/main/java/com/gitee/dolives/gui/controller/BaseController.java +++ b/src/main/java/com/gitee/dolet/controller/BaseController.java @@ -1,6 +1,6 @@ -package com.gitee.dolives.gui.controller; +package com.gitee.dolet.controller; -import com.gitee.dolives.gui.def.ControllerDef; +import com.gitee.dolet.def.ControllerDef; import javafx.fxml.Initializable; import javafx.stage.Stage; import lombok.Data; diff --git a/src/main/java/com/gitee/dolives/gui/controller/ControllerLoader.java b/src/main/java/com/gitee/dolet/controller/ControllerLoader.java similarity index 98% rename from src/main/java/com/gitee/dolives/gui/controller/ControllerLoader.java rename to src/main/java/com/gitee/dolet/controller/ControllerLoader.java index 9400d61..c44ddd2 100644 --- a/src/main/java/com/gitee/dolives/gui/controller/ControllerLoader.java +++ b/src/main/java/com/gitee/dolet/controller/ControllerLoader.java @@ -1,7 +1,7 @@ -package com.gitee.dolives.gui.controller; +package com.gitee.dolet.controller; import cn.hutool.core.util.StrUtil; -import com.gitee.dolives.gui.def.ControllerDef; +import com.gitee.dolet.def.ControllerDef; import javafx.fxml.FXMLLoader; import javafx.scene.Parent; import javafx.scene.Scene; diff --git a/src/main/java/com/gitee/dolives/gui/controller/MainUIController.java b/src/main/java/com/gitee/dolet/controller/MainUIController.java similarity index 96% rename from src/main/java/com/gitee/dolives/gui/controller/MainUIController.java rename to src/main/java/com/gitee/dolet/controller/MainUIController.java index 1c2d9d8..2f42b25 100644 --- a/src/main/java/com/gitee/dolives/gui/controller/MainUIController.java +++ b/src/main/java/com/gitee/dolet/controller/MainUIController.java @@ -1,4 +1,4 @@ -package com.gitee.dolives.gui.controller; +package com.gitee.dolet.controller; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.net.NetUtil; @@ -7,19 +7,19 @@ import cn.hutool.core.util.URLUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.gitee.dolives.gui.annotation.Controller; -import com.gitee.dolives.gui.controller.dialog.LoginController; -import com.gitee.dolives.gui.controller.dialog.PluginPathController; -import com.gitee.dolives.gui.controller.dialog.ProjectPathController; -import com.gitee.dolives.gui.controller.dialog.CallPluginController; -import com.gitee.dolives.gui.entity.Config; -import com.gitee.dolives.gui.entity.BoundedContext; -import com.gitee.dolives.gui.entity.Path; -import com.gitee.dolives.gui.entity.Plugin; -import com.gitee.dolives.gui.entity.Project; -import com.gitee.dolives.gui.entity.User; -import com.gitee.dolives.gui.util.AlertUtils; -import com.gitee.dolives.gui.util.HttpClientUtils; +import com.gitee.dolet.controller.dialog.CallPluginController; +import com.gitee.dolet.controller.dialog.LoginController; +import com.gitee.dolet.controller.dialog.PluginPathController; +import com.gitee.dolet.controller.dialog.ProjectPathController; +import com.gitee.dolet.util.HttpClientUtils; +import com.gitee.dolet.annotation.Controller; +import com.gitee.dolet.entity.Config; +import com.gitee.dolet.entity.BoundedContext; +import com.gitee.dolet.entity.Path; +import com.gitee.dolet.entity.Plugin; +import com.gitee.dolet.entity.Project; +import com.gitee.dolet.entity.User; +import com.gitee.dolet.util.AlertUtils; import com.gitee.splex.module.entity.JavaFile; import com.gitee.splex.module.entity.Module; import com.gitee.splex.module.entity.Package; diff --git a/src/main/java/com/gitee/dolives/gui/controller/dialog/CallPluginController.java b/src/main/java/com/gitee/dolet/controller/dialog/CallPluginController.java similarity index 93% rename from src/main/java/com/gitee/dolives/gui/controller/dialog/CallPluginController.java rename to src/main/java/com/gitee/dolet/controller/dialog/CallPluginController.java index dfd2041..2676cec 100644 --- a/src/main/java/com/gitee/dolives/gui/controller/dialog/CallPluginController.java +++ b/src/main/java/com/gitee/dolet/controller/dialog/CallPluginController.java @@ -1,11 +1,12 @@ -package com.gitee.dolives.gui.controller.dialog; +package com.gitee.dolet.controller.dialog; import cn.hutool.core.io.FileUtil; -import com.gitee.dolives.gui.annotation.Controller; -import com.gitee.dolives.gui.base.EntityConverter; -import com.gitee.dolives.gui.controller.BaseController; -import com.gitee.dolives.gui.controller.ControllerLoader; -import com.gitee.dolives.gui.controller.MainUIController; +import com.gitee.dolet.entity.*; +import com.gitee.dolet.annotation.Controller; +import com.gitee.dolet.base.EntityConverter; +import com.gitee.dolet.controller.BaseController; +import com.gitee.dolet.controller.ControllerLoader; +import com.gitee.dolet.controller.MainUIController; import com.gitee.dolives.gui.entity.*; import javafx.fxml.FXML; import javafx.scene.control.ComboBox; diff --git a/src/main/java/com/gitee/dolives/gui/controller/dialog/LoginController.java b/src/main/java/com/gitee/dolet/controller/dialog/LoginController.java similarity index 78% rename from src/main/java/com/gitee/dolives/gui/controller/dialog/LoginController.java rename to src/main/java/com/gitee/dolet/controller/dialog/LoginController.java index 5550758..7c7bec1 100644 --- a/src/main/java/com/gitee/dolives/gui/controller/dialog/LoginController.java +++ b/src/main/java/com/gitee/dolet/controller/dialog/LoginController.java @@ -1,10 +1,10 @@ -package com.gitee.dolives.gui.controller.dialog; +package com.gitee.dolet.controller.dialog; -import com.gitee.dolives.gui.annotation.Controller; -import com.gitee.dolives.gui.controller.BaseController; -import com.gitee.dolives.gui.controller.MainUIController; -import com.gitee.dolives.gui.util.AlertUtils; -import com.gitee.dolives.gui.util.HttpClientUtils; +import com.gitee.dolet.annotation.Controller; +import com.gitee.dolet.controller.BaseController; +import com.gitee.dolet.controller.MainUIController; +import com.gitee.dolet.util.AlertUtils; +import com.gitee.dolet.util.HttpClientUtils; import javafx.fxml.FXML; import javafx.scene.control.TextField; import lombok.Data; diff --git a/src/main/java/com/gitee/dolives/gui/controller/dialog/PluginPathController.java b/src/main/java/com/gitee/dolet/controller/dialog/PluginPathController.java similarity index 84% rename from src/main/java/com/gitee/dolives/gui/controller/dialog/PluginPathController.java rename to src/main/java/com/gitee/dolet/controller/dialog/PluginPathController.java index 3ce0756..51817af 100644 --- a/src/main/java/com/gitee/dolives/gui/controller/dialog/PluginPathController.java +++ b/src/main/java/com/gitee/dolet/controller/dialog/PluginPathController.java @@ -1,14 +1,14 @@ -package com.gitee.dolives.gui.controller.dialog; +package com.gitee.dolet.controller.dialog; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.gitee.dolives.gui.annotation.Controller; -import com.gitee.dolives.gui.base.EntityConverter; -import com.gitee.dolives.gui.controller.BaseController; -import com.gitee.dolives.gui.controller.MainUIController; -import com.gitee.dolives.gui.entity.Path; -import com.gitee.dolives.gui.entity.Plugin; -import com.gitee.dolives.gui.util.HttpClientUtils; +import com.gitee.dolet.entity.Plugin; +import com.gitee.dolet.annotation.Controller; +import com.gitee.dolet.base.EntityConverter; +import com.gitee.dolet.controller.BaseController; +import com.gitee.dolet.controller.MainUIController; +import com.gitee.dolet.entity.Path; +import com.gitee.dolet.util.HttpClientUtils; import javafx.collections.ObservableList; import javafx.fxml.FXML; import javafx.scene.control.ComboBox; diff --git a/src/main/java/com/gitee/dolives/gui/controller/dialog/ProjectPathController.java b/src/main/java/com/gitee/dolet/controller/dialog/ProjectPathController.java similarity index 84% rename from src/main/java/com/gitee/dolives/gui/controller/dialog/ProjectPathController.java rename to src/main/java/com/gitee/dolet/controller/dialog/ProjectPathController.java index ef0aad9..9e9df5a 100644 --- a/src/main/java/com/gitee/dolives/gui/controller/dialog/ProjectPathController.java +++ b/src/main/java/com/gitee/dolet/controller/dialog/ProjectPathController.java @@ -1,14 +1,14 @@ -package com.gitee.dolives.gui.controller.dialog; +package com.gitee.dolet.controller.dialog; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.gitee.dolives.gui.annotation.Controller; -import com.gitee.dolives.gui.base.EntityConverter; -import com.gitee.dolives.gui.controller.BaseController; -import com.gitee.dolives.gui.controller.MainUIController; -import com.gitee.dolives.gui.entity.Path; -import com.gitee.dolives.gui.entity.Project; -import com.gitee.dolives.gui.util.HttpClientUtils; +import com.gitee.dolet.entity.Project; +import com.gitee.dolet.annotation.Controller; +import com.gitee.dolet.base.EntityConverter; +import com.gitee.dolet.controller.BaseController; +import com.gitee.dolet.controller.MainUIController; +import com.gitee.dolet.entity.Path; +import com.gitee.dolet.util.HttpClientUtils; import javafx.collections.ObservableList; import javafx.fxml.FXML; import javafx.scene.control.ComboBox; diff --git a/src/main/java/com/gitee/dolives/gui/controller/dialog/ShowLogController.java b/src/main/java/com/gitee/dolet/controller/dialog/ShowLogController.java similarity index 90% rename from src/main/java/com/gitee/dolives/gui/controller/dialog/ShowLogController.java rename to src/main/java/com/gitee/dolet/controller/dialog/ShowLogController.java index 23ae2cd..a079cf1 100644 --- a/src/main/java/com/gitee/dolives/gui/controller/dialog/ShowLogController.java +++ b/src/main/java/com/gitee/dolet/controller/dialog/ShowLogController.java @@ -1,13 +1,13 @@ -package com.gitee.dolives.gui.controller.dialog; +package com.gitee.dolet.controller.dialog; import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.watch.SimpleWatcher; import cn.hutool.core.io.watch.WatchMonitor; import cn.hutool.core.io.watch.Watcher; import cn.hutool.core.io.watch.watchers.DelayWatcher; -import com.gitee.dolives.gui.annotation.Controller; -import com.gitee.dolives.gui.controller.BaseController; -import com.gitee.dolives.gui.entity.Plugin; +import com.gitee.dolet.entity.Plugin; +import com.gitee.dolet.annotation.Controller; +import com.gitee.dolet.controller.BaseController; import javafx.fxml.FXML; import javafx.scene.control.TextArea; import lombok.Data; diff --git a/src/main/java/com/gitee/dolives/gui/def/ControllerDef.java b/src/main/java/com/gitee/dolet/def/ControllerDef.java similarity index 89% rename from src/main/java/com/gitee/dolives/gui/def/ControllerDef.java rename to src/main/java/com/gitee/dolet/def/ControllerDef.java index 2fa70e9..144fc9e 100644 --- a/src/main/java/com/gitee/dolives/gui/def/ControllerDef.java +++ b/src/main/java/com/gitee/dolet/def/ControllerDef.java @@ -1,7 +1,7 @@ -package com.gitee.dolives.gui.def; +package com.gitee.dolet.def; import cn.hutool.core.bean.BeanUtil; -import com.gitee.dolives.gui.annotation.Controller; +import com.gitee.dolet.annotation.Controller; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/gitee/dolives/gui/entity/BoundedContext.java b/src/main/java/com/gitee/dolet/entity/BoundedContext.java similarity index 88% rename from src/main/java/com/gitee/dolives/gui/entity/BoundedContext.java rename to src/main/java/com/gitee/dolet/entity/BoundedContext.java index 9a704e3..af4bda6 100644 --- a/src/main/java/com/gitee/dolives/gui/entity/BoundedContext.java +++ b/src/main/java/com/gitee/dolet/entity/BoundedContext.java @@ -1,4 +1,4 @@ -package com.gitee.dolives.gui.entity; +package com.gitee.dolet.entity; import lombok.Data; diff --git a/src/main/java/com/gitee/dolives/gui/entity/Config.java b/src/main/java/com/gitee/dolet/entity/Config.java similarity index 92% rename from src/main/java/com/gitee/dolives/gui/entity/Config.java rename to src/main/java/com/gitee/dolet/entity/Config.java index 8ae9bcd..19fa146 100644 --- a/src/main/java/com/gitee/dolives/gui/entity/Config.java +++ b/src/main/java/com/gitee/dolet/entity/Config.java @@ -1,4 +1,4 @@ -package com.gitee.dolives.gui.entity; +package com.gitee.dolet.entity; import lombok.Data; diff --git a/src/main/java/com/gitee/dolives/gui/entity/Domain.java b/src/main/java/com/gitee/dolet/entity/Domain.java similarity index 87% rename from src/main/java/com/gitee/dolives/gui/entity/Domain.java rename to src/main/java/com/gitee/dolet/entity/Domain.java index 3eea8ae..f5effa5 100644 --- a/src/main/java/com/gitee/dolives/gui/entity/Domain.java +++ b/src/main/java/com/gitee/dolet/entity/Domain.java @@ -1,4 +1,4 @@ -package com.gitee.dolives.gui.entity; +package com.gitee.dolet.entity; import lombok.Data; diff --git a/src/main/java/com/gitee/dolives/gui/entity/Path.java b/src/main/java/com/gitee/dolet/entity/Path.java similarity index 95% rename from src/main/java/com/gitee/dolives/gui/entity/Path.java rename to src/main/java/com/gitee/dolet/entity/Path.java index ead44b2..f1398aa 100644 --- a/src/main/java/com/gitee/dolives/gui/entity/Path.java +++ b/src/main/java/com/gitee/dolet/entity/Path.java @@ -1,4 +1,4 @@ -package com.gitee.dolives.gui.entity; +package com.gitee.dolet.entity; import cn.hutool.core.collection.CollUtil; import lombok.Data; diff --git a/src/main/java/com/gitee/dolives/gui/entity/Plugin.java b/src/main/java/com/gitee/dolet/entity/Plugin.java similarity index 94% rename from src/main/java/com/gitee/dolives/gui/entity/Plugin.java rename to src/main/java/com/gitee/dolet/entity/Plugin.java index 6c0e0cf..1722c33 100644 --- a/src/main/java/com/gitee/dolives/gui/entity/Plugin.java +++ b/src/main/java/com/gitee/dolet/entity/Plugin.java @@ -1,4 +1,4 @@ -package com.gitee.dolives.gui.entity; +package com.gitee.dolet.entity; import lombok.Data; diff --git a/src/main/java/com/gitee/dolives/gui/entity/Project.java b/src/main/java/com/gitee/dolet/entity/Project.java similarity index 93% rename from src/main/java/com/gitee/dolives/gui/entity/Project.java rename to src/main/java/com/gitee/dolet/entity/Project.java index 9b70253..bc82fd7 100644 --- a/src/main/java/com/gitee/dolives/gui/entity/Project.java +++ b/src/main/java/com/gitee/dolet/entity/Project.java @@ -1,4 +1,4 @@ -package com.gitee.dolives.gui.entity; +package com.gitee.dolet.entity; import com.gitee.splex.module.entity.Module; import lombok.Data; diff --git a/src/main/java/com/gitee/dolives/gui/entity/Property.java b/src/main/java/com/gitee/dolet/entity/Property.java similarity index 88% rename from src/main/java/com/gitee/dolives/gui/entity/Property.java rename to src/main/java/com/gitee/dolet/entity/Property.java index baccde6..0733c53 100644 --- a/src/main/java/com/gitee/dolives/gui/entity/Property.java +++ b/src/main/java/com/gitee/dolet/entity/Property.java @@ -1,4 +1,4 @@ -package com.gitee.dolives.gui.entity; +package com.gitee.dolet.entity; import lombok.Data; diff --git a/src/main/java/com/gitee/dolives/gui/entity/Subdomain.java b/src/main/java/com/gitee/dolet/entity/Subdomain.java similarity index 87% rename from src/main/java/com/gitee/dolives/gui/entity/Subdomain.java rename to src/main/java/com/gitee/dolet/entity/Subdomain.java index 981c0d5..36b7d78 100644 --- a/src/main/java/com/gitee/dolives/gui/entity/Subdomain.java +++ b/src/main/java/com/gitee/dolet/entity/Subdomain.java @@ -1,4 +1,4 @@ -package com.gitee.dolives.gui.entity; +package com.gitee.dolet.entity; import lombok.Data; diff --git a/src/main/java/com/gitee/dolives/gui/entity/User.java b/src/main/java/com/gitee/dolet/entity/User.java similarity index 94% rename from src/main/java/com/gitee/dolives/gui/entity/User.java rename to src/main/java/com/gitee/dolet/entity/User.java index e6cfe1c..2d079cf 100644 --- a/src/main/java/com/gitee/dolives/gui/entity/User.java +++ b/src/main/java/com/gitee/dolet/entity/User.java @@ -1,4 +1,4 @@ -package com.gitee.dolives.gui.entity; +package com.gitee.dolet.entity; import lombok.Data; diff --git a/src/main/java/com/gitee/dolives/gui/util/AlertUtils.java b/src/main/java/com/gitee/dolet/util/AlertUtils.java similarity index 96% rename from src/main/java/com/gitee/dolives/gui/util/AlertUtils.java rename to src/main/java/com/gitee/dolet/util/AlertUtils.java index 78cc842..7347a2a 100644 --- a/src/main/java/com/gitee/dolives/gui/util/AlertUtils.java +++ b/src/main/java/com/gitee/dolet/util/AlertUtils.java @@ -1,4 +1,4 @@ -package com.gitee.dolives.gui.util; +package com.gitee.dolet.util; import javafx.scene.control.Alert; diff --git a/src/main/java/com/gitee/dolives/gui/util/HttpClientUtils.java b/src/main/java/com/gitee/dolet/util/HttpClientUtils.java similarity index 99% rename from src/main/java/com/gitee/dolives/gui/util/HttpClientUtils.java rename to src/main/java/com/gitee/dolet/util/HttpClientUtils.java index 5a30e30..b8776f7 100644 --- a/src/main/java/com/gitee/dolives/gui/util/HttpClientUtils.java +++ b/src/main/java/com/gitee/dolet/util/HttpClientUtils.java @@ -1,4 +1,4 @@ -package com.gitee.dolives.gui.util; +package com.gitee.dolet.util; import cn.hutool.extra.spring.SpringUtil; import com.alibaba.fastjson.JSONObject; diff --git a/src/main/resources/fxml/CallPlugin.fxml b/src/main/resources/fxml/CallPlugin.fxml index 57febe1..d81978a 100644 --- a/src/main/resources/fxml/CallPlugin.fxml +++ b/src/main/resources/fxml/CallPlugin.fxml @@ -12,7 +12,7 @@ - + diff --git a/src/main/resources/fxml/Login.fxml b/src/main/resources/fxml/Login.fxml index 426236b..7167641 100644 --- a/src/main/resources/fxml/Login.fxml +++ b/src/main/resources/fxml/Login.fxml @@ -11,7 +11,7 @@ - + diff --git a/src/main/resources/fxml/MainUI.fxml b/src/main/resources/fxml/MainUI.fxml index f9ae978..5445812 100644 --- a/src/main/resources/fxml/MainUI.fxml +++ b/src/main/resources/fxml/MainUI.fxml @@ -15,7 +15,7 @@ - + diff --git a/src/main/resources/fxml/PluginPath.fxml b/src/main/resources/fxml/PluginPath.fxml index 5588217..d7ee620 100644 --- a/src/main/resources/fxml/PluginPath.fxml +++ b/src/main/resources/fxml/PluginPath.fxml @@ -12,7 +12,7 @@ - + diff --git a/src/main/resources/fxml/ProjectPath.fxml b/src/main/resources/fxml/ProjectPath.fxml index 48c451e..ec130a4 100644 --- a/src/main/resources/fxml/ProjectPath.fxml +++ b/src/main/resources/fxml/ProjectPath.fxml @@ -12,7 +12,7 @@ - + diff --git a/src/main/resources/fxml/ShowLog.fxml b/src/main/resources/fxml/ShowLog.fxml index fcf2754..f094e37 100644 --- a/src/main/resources/fxml/ShowLog.fxml +++ b/src/main/resources/fxml/ShowLog.fxml @@ -11,7 +11,7 @@ - + -- Gitee From 8ba8ff09db5c4fb53f870cf7fbd005f13d40a453 Mon Sep 17 00:00:00 2001 From: chenT <609580885@qq.com> Date: Wed, 4 Dec 2024 17:18:51 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gitee/dolet/controller/dialog/CallPluginController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/gitee/dolet/controller/dialog/CallPluginController.java b/src/main/java/com/gitee/dolet/controller/dialog/CallPluginController.java index 2676cec..e5c9739 100644 --- a/src/main/java/com/gitee/dolet/controller/dialog/CallPluginController.java +++ b/src/main/java/com/gitee/dolet/controller/dialog/CallPluginController.java @@ -1,13 +1,12 @@ package com.gitee.dolet.controller.dialog; import cn.hutool.core.io.FileUtil; -import com.gitee.dolet.entity.*; import com.gitee.dolet.annotation.Controller; import com.gitee.dolet.base.EntityConverter; import com.gitee.dolet.controller.BaseController; import com.gitee.dolet.controller.ControllerLoader; import com.gitee.dolet.controller.MainUIController; -import com.gitee.dolives.gui.entity.*; +import com.gitee.dolet.entity.*; import javafx.fxml.FXML; import javafx.scene.control.ComboBox; import javafx.scene.control.TextArea; -- Gitee From 53564d592fdc8dbd877feaa1c3c89c30544ef9bf Mon Sep 17 00:00:00 2001 From: chenT <609580885@qq.com> Date: Wed, 4 Dec 2024 18:39:48 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=B8=B4=E6=97=B6?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dolet/controller/MainUIController.java | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/gitee/dolet/controller/MainUIController.java b/src/main/java/com/gitee/dolet/controller/MainUIController.java index 2f42b25..7086a67 100644 --- a/src/main/java/com/gitee/dolet/controller/MainUIController.java +++ b/src/main/java/com/gitee/dolet/controller/MainUIController.java @@ -1,6 +1,7 @@ package com.gitee.dolet.controller; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.io.FileUtil; import cn.hutool.core.net.NetUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.URLUtil; @@ -48,15 +49,9 @@ import lombok.SneakyThrows; import org.apache.commons.lang3.StringUtils; import java.io.File; +import java.io.FileInputStream; import java.net.URL; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.Comparator; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.ResourceBundle; +import java.util.*; @Data @EqualsAndHashCode(callSuper = false) @@ -318,6 +313,18 @@ public class MainUIController extends BaseController { ObservableList> children = treeItem.getChildren(); children.clear(); +// // 获取用户目录 +// String userHomePath = FileUtil.getUserHomePath(); +// // 获取项目配置文件 +// String projectConfigPath = userHomePath + File.separator + ".do" + File.separator + "project.properties"; +// if (FileUtil.exist(projectConfigPath)) { +// Properties properties = new Properties(); +// properties.load(new FileInputStream(projectConfigPath)); +// properties.forEach((name, path) -> { +// +// }); +// } + JSONObject jsonObject = HttpClientUtils.sendGet("project/listAllV2"); for (Object object : jsonObject.getJSONArray("data")) { Project project = JSON.toJavaObject((JSON) object, Project.class); -- Gitee From bfa7487e98f0a5c2f14f6d1ab42c0bf0695a83f3 Mon Sep 17 00:00:00 2001 From: chentaoah <609580885@qq.com> Date: Wed, 4 Dec 2024 22:37:16 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 5 + .../dolet/controller/MainUIController.java | 214 ++++++++---------- .../dialog/ProjectPathController.java | 22 +- .../gitee/dolet/entity/BoundedContext.java | 21 +- .../java/com/gitee/dolet/entity/Domain.java | 20 +- .../java/com/gitee/dolet/entity/Project.java | 32 ++- .../java/com/gitee/dolet/entity/Property.java | 6 - .../com/gitee/dolet/entity/Subdomain.java | 12 +- .../gitee/dolet/service/DoXmlResolver.java | 91 ++++++++ 9 files changed, 261 insertions(+), 162 deletions(-) create mode 100644 src/main/java/com/gitee/dolet/service/DoXmlResolver.java diff --git a/pom.xml b/pom.xml index 1df5629..2f1a7fe 100644 --- a/pom.xml +++ b/pom.xml @@ -45,6 +45,11 @@ hutool-all 5.8.12 + + org.dom4j + dom4j + 2.1.4 + org.apache.httpcomponents httpclient diff --git a/src/main/java/com/gitee/dolet/controller/MainUIController.java b/src/main/java/com/gitee/dolet/controller/MainUIController.java index 7086a67..379db8d 100644 --- a/src/main/java/com/gitee/dolet/controller/MainUIController.java +++ b/src/main/java/com/gitee/dolet/controller/MainUIController.java @@ -6,38 +6,24 @@ import cn.hutool.core.net.NetUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.URLUtil; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.gitee.dolet.annotation.Controller; import com.gitee.dolet.controller.dialog.CallPluginController; import com.gitee.dolet.controller.dialog.LoginController; import com.gitee.dolet.controller.dialog.PluginPathController; import com.gitee.dolet.controller.dialog.ProjectPathController; -import com.gitee.dolet.util.HttpClientUtils; -import com.gitee.dolet.annotation.Controller; -import com.gitee.dolet.entity.Config; -import com.gitee.dolet.entity.BoundedContext; -import com.gitee.dolet.entity.Path; -import com.gitee.dolet.entity.Plugin; -import com.gitee.dolet.entity.Project; -import com.gitee.dolet.entity.User; +import com.gitee.dolet.entity.*; +import com.gitee.dolet.service.DoXmlResolver; import com.gitee.dolet.util.AlertUtils; +import com.gitee.dolet.util.HttpClientUtils; import com.gitee.splex.module.entity.JavaFile; import com.gitee.splex.module.entity.Module; import com.gitee.splex.module.entity.Package; import com.gitee.splex.module.entity.Source; import com.gitee.splex.module.impl.ProjectParser; -import com.gitee.splex.type.entity.SCompilationUnit; -import com.gitee.splex.type.impl.JavaScanner; import javafx.collections.ObservableList; import javafx.fxml.FXML; -import javafx.scene.control.ContentDisplay; -import javafx.scene.control.ContextMenu; -import javafx.scene.control.Label; -import javafx.scene.control.MenuItem; -import javafx.scene.control.SelectionMode; -import javafx.scene.control.TreeCell; -import javafx.scene.control.TreeItem; -import javafx.scene.control.TreeView; +import javafx.scene.control.*; import javafx.scene.control.cell.TextFieldTreeCell; import javafx.scene.image.ImageView; import javafx.scene.input.MouseEvent; @@ -188,77 +174,77 @@ public class MainUIController extends BaseController { Object userData = treeItem.getGraphic().getUserData(); if (level == 2) { - ContextMenu contextMenu = new ContextMenu(); - MenuItem menuItem = new MenuItem("上传模块"); - menuItem.setOnAction(event1 -> { - try { - List array = (List) userData; - Project project = (Project) array.get(0); - Module module = (Module) array.get(1); - - Map params = new LinkedHashMap<>(); - params.put("projectId", project.getId()); - params.put("modulePath", module.getQualifier()); - JSONObject jsonObject = HttpClientUtils.sendJson("module/addByPath", JSON.toJSONString(params)); - showAlert(jsonObject, "上传模块成功！"); - - } catch (Exception e) { - e.printStackTrace(); - } - }); - contextMenu.getItems().addAll(menuItem); - contextMenu.show(cell, event.getScreenX(), event.getScreenY()); +// ContextMenu contextMenu = new ContextMenu(); +// MenuItem menuItem = new MenuItem("上传模块"); +// menuItem.setOnAction(event1 -> { +// try { +// List array = (List) userData; +// Project project = (Project) array.get(0); +// Module module = (Module) array.get(1); +// +// Map params = new LinkedHashMap<>(); +// params.put("projectId", project.getId()); +// params.put("modulePath", module.getQualifier()); +// JSONObject jsonObject = HttpClientUtils.sendJson("module/addByPath", JSON.toJSONString(params)); +// showAlert(jsonObject, "上传模块成功！"); +// +// } catch (Exception e) { +// e.printStackTrace(); +// } +// }); +// contextMenu.getItems().addAll(menuItem); +// contextMenu.show(cell, event.getScreenX(), event.getScreenY()); } else if (level == 3) { - ContextMenu contextMenu = new ContextMenu(); - MenuItem menuItem = new MenuItem("上传包"); - menuItem.setOnAction(event1 -> { - try { - List array = (List) userData; - Project project = (Project) array.get(0); - Module module = (Module) array.get(1); - Package aPackage = (Package) array.get(2); - - Map params = new LinkedHashMap<>(); - params.put("projectId", project.getId()); - params.put("modulePath", module.getQualifier()); - params.put("packagePath", aPackage.getQualifier()); - JSONObject jsonObject = HttpClientUtils.sendJson("package/addByPath", JSON.toJSONString(params)); - showAlert(jsonObject, "上传包成功！"); - - } catch (Exception e) { - e.printStackTrace(); - } - }); - contextMenu.getItems().addAll(menuItem); - contextMenu.show(cell, event.getScreenX(), event.getScreenY()); +// ContextMenu contextMenu = new ContextMenu(); +// MenuItem menuItem = new MenuItem("上传包"); +// menuItem.setOnAction(event1 -> { +// try { +// List array = (List) userData; +// Project project = (Project) array.get(0); +// Module module = (Module) array.get(1); +// Package aPackage = (Package) array.get(2); +// +// Map params = new LinkedHashMap<>(); +// params.put("projectId", project.getId()); +// params.put("modulePath", module.getQualifier()); +// params.put("packagePath", aPackage.getQualifier()); +// JSONObject jsonObject = HttpClientUtils.sendJson("package/addByPath", JSON.toJSONString(params)); +// showAlert(jsonObject, "上传包成功！"); +// +// } catch (Exception e) { +// e.printStackTrace(); +// } +// }); +// contextMenu.getItems().addAll(menuItem); +// contextMenu.show(cell, event.getScreenX(), event.getScreenY()); } else if (level == 4) { - ContextMenu contextMenu = new ContextMenu(); - MenuItem menuItem = new MenuItem("上传实体"); - menuItem.setOnAction(event1 -> { - try { - List array = (List) userData; - Project project = (Project) array.get(0); - Package aPackage = (Package) array.get(2); - JavaFile javaFile = (JavaFile) array.get(3); - - JavaScanner javaScanner = new JavaScanner(); - SCompilationUnit compilationUnit = javaScanner.parse(aPackage.getTypeNames(), new File(javaFile.getPath())); - - Map params = new LinkedHashMap<>(); - params.put("projectId", project.getId()); - // 因为compilationUnit的字段不符合驼峰规则，所以只能先转换成字符串 - params.put("compilationUnit", JSON.toJSONString(compilationUnit)); - JSONObject jsonObject = HttpClientUtils.sendJson("entityObj/upload", JSON.toJSONString(params)); - showAlert(jsonObject, "上传实体成功！"); - - } catch (Exception e) { - e.printStackTrace(); - } - }); - contextMenu.getItems().addAll(menuItem); - contextMenu.show(cell, event.getScreenX(), event.getScreenY()); +// ContextMenu contextMenu = new ContextMenu(); +// MenuItem menuItem = new MenuItem("上传实体"); +// menuItem.setOnAction(event1 -> { +// try { +// List array = (List) userData; +// Project project = (Project) array.get(0); +// Package aPackage = (Package) array.get(2); +// JavaFile javaFile = (JavaFile) array.get(3); +// +// JavaScanner javaScanner = new JavaScanner(); +// SCompilationUnit compilationUnit = javaScanner.parse(aPackage.getTypeNames(), new File(javaFile.getPath())); +// +// Map params = new LinkedHashMap<>(); +// params.put("projectId", project.getId()); +// // 因为compilationUnit的字段不符合驼峰规则，所以只能先转换成字符串 +// params.put("compilationUnit", JSON.toJSONString(compilationUnit)); +// JSONObject jsonObject = HttpClientUtils.sendJson("entityObj/upload", JSON.toJSONString(params)); +// showAlert(jsonObject, "上传实体成功！"); +// +// } catch (Exception e) { +// e.printStackTrace(); +// } +// }); +// contextMenu.getItems().addAll(menuItem); +// contextMenu.show(cell, event.getScreenX(), event.getScreenY()); } }); @@ -313,44 +299,32 @@ public class MainUIController extends BaseController { ObservableList> children = treeItem.getChildren(); children.clear(); -// // 获取用户目录 -// String userHomePath = FileUtil.getUserHomePath(); -// // 获取项目配置文件 -// String projectConfigPath = userHomePath + File.separator + ".do" + File.separator + "project.properties"; -// if (FileUtil.exist(projectConfigPath)) { -// Properties properties = new Properties(); -// properties.load(new FileInputStream(projectConfigPath)); -// properties.forEach((name, path) -> { -// -// }); -// } - - JSONObject jsonObject = HttpClientUtils.sendGet("project/listAllV2"); - for (Object object : jsonObject.getJSONArray("data")) { - Project project = JSON.toJavaObject((JSON) object, Project.class); - String path = queryPath(project); - if (StringUtils.isNotBlank(path)) { - project.setPath(path); - useLocalProjectData(project); - TreeItem newTreeItem = newTreeItem("icons/folder.png", Collections.singletonList(project), project.getName()); - children.add(newTreeItem); - } - } - } - - private String queryPath(Project project) throws Exception { - JSONObject jsonObject = HttpClientUtils.sendGet("path/list?category=1&refId=" + project.getId() + "&mac=" + localMacAddress); - JSONArray jsonArray = jsonObject.getJSONArray("data"); - if (jsonArray != null && !jsonArray.isEmpty()) { - JSONObject jsonObject1 = (JSONObject) jsonArray.get(0); - return jsonObject1.getString("path"); + // 获取用户目录 + String userHomePath = FileUtil.getUserHomePath(); + // 获取项目配置文件 + String projectPath = userHomePath + File.separator + ".do" + File.separator + "project.properties"; + if (FileUtil.exist(projectPath)) { + Properties properties = new Properties(); + properties.load(new FileInputStream(projectPath)); + properties.forEach((name, path) -> { + String configPath = path + File.separator + "do.xml"; + try { + Project project = new DoXmlResolver().resolve(configPath); + useLocalProjectData((String) path, project); + + TreeItem newTreeItem = newTreeItem("icons/folder.png", Collections.singletonList(project), project.getName()); + children.add(newTreeItem); + + } catch (Exception e) { + e.printStackTrace(); + } + }); } - return null; } - private void useLocalProjectData(Project project) throws Exception { + private void useLocalProjectData(String path, Project project) throws Exception { ProjectParser projectParser = new ProjectParser(); - com.gitee.splex.module.entity.Project parseProject = projectParser.parse(project.getPath()); + com.gitee.splex.module.entity.Project parseProject = projectParser.parse(path); List lastModules = parseProject.getLastModules(); lastModules.sort(Comparator.comparing(Module::getPath)); project.setModules(lastModules); diff --git a/src/main/java/com/gitee/dolet/controller/dialog/ProjectPathController.java b/src/main/java/com/gitee/dolet/controller/dialog/ProjectPathController.java index 9e9df5a..8071709 100644 --- a/src/main/java/com/gitee/dolet/controller/dialog/ProjectPathController.java +++ b/src/main/java/com/gitee/dolet/controller/dialog/ProjectPathController.java @@ -61,17 +61,17 @@ public class ProjectPathController extends BaseController { @FXML public void confirm() throws Exception { - Project project = projectComboBox.getSelectionModel().getSelectedItem(); - String pathText = pathTextField.getText(); - - MainUIController mainUIController = (MainUIController) getParent(); - - Path path = new Path(); - path.setCategory(1); - path.setRefId(project.getId()); - path.setMac(mainUIController.getLocalMacAddress()); - path.setPath(pathText); - HttpClientUtils.sendJson("path/add", JSON.toJSONString(path)); +// Project project = projectComboBox.getSelectionModel().getSelectedItem(); +// String pathText = pathTextField.getText(); +// +// MainUIController mainUIController = (MainUIController) getParent(); +// +// Path path = new Path(); +// path.setCategory(1); +// path.setRefId(project.getId()); +// path.setMac(mainUIController.getLocalMacAddress()); +// path.setPath(pathText); +// HttpClientUtils.sendJson("path/add", JSON.toJSONString(path)); close(); } diff --git a/src/main/java/com/gitee/dolet/entity/BoundedContext.java b/src/main/java/com/gitee/dolet/entity/BoundedContext.java index af4bda6..ebebb32 100644 --- a/src/main/java/com/gitee/dolet/entity/BoundedContext.java +++ b/src/main/java/com/gitee/dolet/entity/BoundedContext.java @@ -2,19 +2,28 @@ package com.gitee.dolet.entity; import lombok.Data; +import java.util.ArrayList; import java.util.List; /** - * 上下文 + * 边界上下文 */ @Data public class BoundedContext { - // 主键 - private Integer id; // 名称 private String name; - // 描述 - private String description; - // 上下文属性 + // 属性 private List properties; + + public void merge(BoundedContext superBoundedContext) { + List newProperties = new ArrayList<>(); + List superProperties = superBoundedContext.getProperties(); + if (superProperties != null && !superProperties.isEmpty()) { + newProperties.addAll(superProperties); + } + if (properties != null && !properties.isEmpty()) { + newProperties.addAll(properties); + } + this.properties = newProperties; + } } diff --git a/src/main/java/com/gitee/dolet/entity/Domain.java b/src/main/java/com/gitee/dolet/entity/Domain.java index f5effa5..03da725 100644 --- a/src/main/java/com/gitee/dolet/entity/Domain.java +++ b/src/main/java/com/gitee/dolet/entity/Domain.java @@ -2,17 +2,27 @@ package com.gitee.dolet.entity; import lombok.Data; +import java.util.ArrayList; +import java.util.List; + /** * 领域 */ @Data public class Domain { - // 主键 - private Integer id; // 名称 private String name; - // 描述 - private String description; - // 边界上下文（合并后） + // 边界上下文 private BoundedContext boundedContext; + // 子域 + private List subdomains; + + public void mergeContexts(BoundedContext boundedContext) { + this.boundedContext.merge(boundedContext); + if (subdomains != null && !subdomains.isEmpty()) { + for (Subdomain subdomain : subdomains) { + subdomain.mergeContexts(this.boundedContext); + } + } + } } diff --git a/src/main/java/com/gitee/dolet/entity/Project.java b/src/main/java/com/gitee/dolet/entity/Project.java index bc82fd7..cb696a3 100644 --- a/src/main/java/com/gitee/dolet/entity/Project.java +++ b/src/main/java/com/gitee/dolet/entity/Project.java @@ -3,6 +3,7 @@ package com.gitee.dolet.entity; import com.gitee.splex.module.entity.Module; import lombok.Data; +import java.util.ArrayList; import java.util.List; /** @@ -10,20 +11,33 @@ import java.util.List; */ @Data public class Project { - // 主键 - private Integer id; // 名称 private String name; - // 描述 - private String description; - // 边界上下文（合并后） + // 边界上下文 private BoundedContext boundedContext; // 领域 private List domains; - // 子域 - private List subdomains; - // 本地路径（模型不包含） - private String path; // 模块（模型不包含） private List modules; + + public void mergeContexts() { + if (domains != null && !domains.isEmpty()) { + for (Domain domain : domains) { + domain.mergeContexts(this.boundedContext); + } + } + } + + public List getSubdomains() { + List allSubdomains = new ArrayList<>(); + if (domains != null && !domains.isEmpty()) { + for (Domain domain : domains) { + List subdomains = domain.getSubdomains(); + if (subdomains != null) { + allSubdomains.addAll(subdomains); + } + } + } + return allSubdomains; + } } diff --git a/src/main/java/com/gitee/dolet/entity/Property.java b/src/main/java/com/gitee/dolet/entity/Property.java index 0733c53..85a3d9d 100644 --- a/src/main/java/com/gitee/dolet/entity/Property.java +++ b/src/main/java/com/gitee/dolet/entity/Property.java @@ -7,14 +7,8 @@ import lombok.Data; */ @Data public class Property { - // 主键 - private Integer id; - // 边界上下文id - private Integer contextId; // 名称 private String name; // 值 private String value; - // 描述 - private String description; } diff --git a/src/main/java/com/gitee/dolet/entity/Subdomain.java b/src/main/java/com/gitee/dolet/entity/Subdomain.java index 36b7d78..abf1d9c 100644 --- a/src/main/java/com/gitee/dolet/entity/Subdomain.java +++ b/src/main/java/com/gitee/dolet/entity/Subdomain.java @@ -2,17 +2,19 @@ package com.gitee.dolet.entity; import lombok.Data; +import java.util.ArrayList; + /** * 子域 */ @Data public class Subdomain { - // 主键 - private Integer id; // 名称 private String name; - // 描述 - private String description; - // 边界上下文（合并后） + // 边界上下文 private BoundedContext boundedContext; + + public void mergeContexts(BoundedContext boundedContext) { + this.boundedContext.merge(boundedContext); + } } diff --git a/src/main/java/com/gitee/dolet/service/DoXmlResolver.java b/src/main/java/com/gitee/dolet/service/DoXmlResolver.java new file mode 100644 index 0000000..bf33a98 --- /dev/null +++ b/src/main/java/com/gitee/dolet/service/DoXmlResolver.java @@ -0,0 +1,91 @@ +package com.gitee.dolet.service; + +import com.gitee.dolet.entity.Subdomain; + +import com.gitee.dolet.entity.BoundedContext; +import com.gitee.dolet.entity.Domain; +import com.gitee.dolet.entity.Project; +import com.gitee.dolet.entity.Property; +import org.dom4j.Document; +import org.dom4j.Element; +import org.dom4j.io.SAXReader; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; + +public class DoXmlResolver { + + public Project resolve(String path) throws Exception { + SAXReader reader = new SAXReader(); + Document document = reader.read(new File(path)); + Element projectEle = document.getRootElement(); + + Project project = new Project(); + project.setName(projectEle.attributeValue("name")); + + Element boundedContextEle = projectEle.element("boundedContext"); + BoundedContext boundedContext = resolveBoundedContext(boundedContextEle); + project.setBoundedContext(boundedContext); + + List domainElements = projectEle.elements("domain"); + List domains = resolveDomains(domainElements); + project.setDomains(domains); + + project.mergeContexts(); + + return project; + } + + private BoundedContext resolveBoundedContext(Element boundedContextEle) { + BoundedContext boundedContext = new BoundedContext(); + boundedContext.setName(boundedContextEle.attributeValue("name")); + + List propertyElements = boundedContextEle.elements(); + List properties = new ArrayList<>(propertyElements.size()); + for (Element propertyEle : propertyElements) { + Property property = new Property(); + property.setName(propertyEle.attributeValue("name")); + property.setValue(propertyEle.getStringValue()); + properties.add(property); + } + boundedContext.setProperties(properties); + + return boundedContext; + } + + private List resolveDomains(List domainElements) { + List domains = new ArrayList<>(domainElements.size()); + for (Element domainEle : domainElements) { + Domain domain = new Domain(); + domain.setName(domainEle.attributeValue("name")); + + Element boundedContextEle = domainEle.element("boundedContext"); + BoundedContext boundedContext = resolveBoundedContext(boundedContextEle); + domain.setBoundedContext(boundedContext); + + List subdomainElements = domainEle.elements("subdomain"); + List subdomains = resolveSubdomains(subdomainElements); + domain.setSubdomains(subdomains); + + domains.add(domain); + } + return domains; + } + + private List resolveSubdomains(List subdomainElements) { + List subdomains = new ArrayList<>(subdomainElements.size()); + for (Element subdomainEle : subdomainElements) { + Subdomain subdomain = new Subdomain(); + subdomain.setName(subdomainEle.attributeValue("name")); + + Element boundedContextEle = subdomainEle.element("boundedContext"); + BoundedContext boundedContext = resolveBoundedContext(boundedContextEle); + subdomain.setBoundedContext(boundedContext); + + subdomains.add(subdomain); + } + return subdomains; + } + +} -- Gitee From 21f8225ae4f49ee00bb88285919d49e25b60ce31 Mon Sep 17 00:00:00 2001 From: chentaoah <609580885@qq.com> Date: Wed, 4 Dec 2024 22:50:31 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gitee/dolet/controller/MainUIController.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/gitee/dolet/controller/MainUIController.java b/src/main/java/com/gitee/dolet/controller/MainUIController.java index 379db8d..a5decad 100644 --- a/src/main/java/com/gitee/dolet/controller/MainUIController.java +++ b/src/main/java/com/gitee/dolet/controller/MainUIController.java @@ -307,10 +307,12 @@ public class MainUIController extends BaseController { Properties properties = new Properties(); properties.load(new FileInputStream(projectPath)); properties.forEach((name, path) -> { - String configPath = path + File.separator + "do.xml"; try { + String configPath = path + File.separator + "do.xml"; Project project = new DoXmlResolver().resolve(configPath); - useLocalProjectData((String) path, project); + + List modules = loadProjectModules((String) path); + project.setModules(modules); TreeItem newTreeItem = newTreeItem("icons/folder.png", Collections.singletonList(project), project.getName()); children.add(newTreeItem); @@ -322,12 +324,12 @@ public class MainUIController extends BaseController { } } - private void useLocalProjectData(String path, Project project) throws Exception { + private List loadProjectModules(String path) throws Exception { ProjectParser projectParser = new ProjectParser(); - com.gitee.splex.module.entity.Project parseProject = projectParser.parse(path); - List lastModules = parseProject.getLastModules(); + com.gitee.splex.module.entity.Project project = projectParser.parse(path); + List lastModules = project.getLastModules(); lastModules.sort(Comparator.comparing(Module::getPath)); - project.setModules(lastModules); + return lastModules; } private void loadPluginPanel() throws Exception { -- Gitee From 0c91dfbe38e24b72055d3ad850834764d713b1bd Mon Sep 17 00:00:00 2001 From: chenT <609580885@qq.com> Date: Thu, 5 Dec 2024 13:04:26 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=B8=B4=E6=97=B6?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dolet/controller/MainUIController.java | 109 +++++++-------- .../dialog/CallPluginController.java | 14 +- .../controller/dialog/LoginController.java | 27 ++-- .../dialog/PluginPathController.java | 48 +++---- .../dialog/ProjectPathController.java | 22 ++- .../controller/dialog/ShowLogController.java | 4 +- .../java/com/gitee/dolet/entity/Config.java | 30 ---- .../java/com/gitee/dolet/entity/Path.java | 42 ------ .../java/com/gitee/dolet/entity/Plugin.java | 37 ----- .../java/com/gitee/dolet/entity/Project.java | 2 + .../java/com/gitee/dolet/entity/User.java | 34 ----- .../gitee/dolet/service/DoXmlResolver.java | 11 +- .../com/gitee/dolet/util/HttpClientUtils.java | 129 ------------------ 13 files changed, 110 insertions(+), 399 deletions(-) delete mode 100644 src/main/java/com/gitee/dolet/entity/Config.java delete mode 100644 src/main/java/com/gitee/dolet/entity/Path.java delete mode 100644 src/main/java/com/gitee/dolet/entity/Plugin.java delete mode 100644 src/main/java/com/gitee/dolet/entity/User.java delete mode 100644 src/main/java/com/gitee/dolet/util/HttpClientUtils.java diff --git a/src/main/java/com/gitee/dolet/controller/MainUIController.java b/src/main/java/com/gitee/dolet/controller/MainUIController.java index a5decad..5a24b02 100644 --- a/src/main/java/com/gitee/dolet/controller/MainUIController.java +++ b/src/main/java/com/gitee/dolet/controller/MainUIController.java @@ -5,8 +5,6 @@ import cn.hutool.core.io.FileUtil; import cn.hutool.core.net.NetUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.URLUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.gitee.dolet.annotation.Controller; import com.gitee.dolet.controller.dialog.CallPluginController; import com.gitee.dolet.controller.dialog.LoginController; @@ -15,7 +13,6 @@ import com.gitee.dolet.controller.dialog.ProjectPathController; import com.gitee.dolet.entity.*; import com.gitee.dolet.service.DoXmlResolver; import com.gitee.dolet.util.AlertUtils; -import com.gitee.dolet.util.HttpClientUtils; import com.gitee.splex.module.entity.JavaFile; import com.gitee.splex.module.entity.Module; import com.gitee.splex.module.entity.Package; @@ -32,7 +29,6 @@ import javafx.util.Callback; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.SneakyThrows; -import org.apache.commons.lang3.StringUtils; import java.io.File; import java.io.FileInputStream; @@ -41,7 +37,7 @@ import java.util.*; @Data @EqualsAndHashCode(callSuper = false) -@Controller(title = "dolives-gui", listenTo = {Project.class, Module.class, Package.class, BoundedContext.class, Plugin.class, Config.class, User.class}) +@Controller(title = "dolives-gui", listenTo = {Project.class, Module.class, Package.class, BoundedContext.class}) public class MainUIController extends BaseController { @FXML @@ -97,8 +93,8 @@ public class MainUIController extends BaseController { initProjectTree(); // 本地机器识别码 localMacAddress = NetUtil.getLocalMacAddress(); - // 尝试登录 - tryLogin(); + // 加载数据 + loadData(); } @SuppressWarnings("unchecked") @@ -264,26 +260,6 @@ public class MainUIController extends BaseController { return newTreeItem; } - private void showAlert(JSONObject jsonObject, String message) { - Integer code = (Integer) jsonObject.get("code"); - if (code == 0 || code == 200) { - AlertUtils.showInfoAlert(message); - } else { - String msg = (String) jsonObject.get("message"); - AlertUtils.showErrorAlert(msg); - } - } - - public boolean tryLogin() throws Exception { - JSONObject jsonObject = HttpClientUtils.sendGet("auth/isLogin"); - Boolean isLogin = (Boolean) jsonObject.get("data"); - if (isLogin) { - loadData(); - return true; - } - return false; - } - private void loadData() { try { loadProjectTree(); @@ -334,42 +310,53 @@ public class MainUIController extends BaseController { private void loadPluginPanel() throws Exception { pluginPanel.getChildren().clear(); - int index = 0; - JSONObject jsonObject = HttpClientUtils.sendGet("plugin/listAll"); - for (Object object : jsonObject.getJSONArray("data")) { - Plugin plugin = JSON.toJavaObject((JSON) object, Plugin.class); - plugin.setPath(Path.getPath(plugin.getPaths(), localMacAddress)); - if (StringUtils.isBlank(plugin.getPath())) { - continue; - } - File file = new File(plugin.getPath() + "\\logo.png"); - if (!file.exists()) { - continue; - } - ImageView imageView = new ImageView(URLUtil.getURL(file).toString()); - imageView.setFitHeight(60); - imageView.setFitWidth(60); - imageView.setUserData(plugin); - - Label label = new Label(); - label.setGraphic(imageView); - label.setText(plugin.getName()); - label.setContentDisplay(ContentDisplay.TOP); - label.setOnMouseClicked(event -> { - List> selectContexts = getSelectContexts(); - if (selectContexts.isEmpty()) { - AlertUtils.showInfoAlert("请先选择项目！"); - return; - } - Map selectContext = selectContexts.get(0); - Project project = (Project) selectContext.get("project"); + final int[] index = {0}; - CallPluginController controller = ControllerLoader.load(CallPluginController.class, new ControllerLoader.DialogFactory()); - controller.loadData(project, plugin); - controller.show(); + // 获取用户目录 + String userHomePath = FileUtil.getUserHomePath(); + // 获取项目配置文件 + String pluginPath = userHomePath + File.separator + ".do" + File.separator + "plugin.properties"; + if (FileUtil.exist(pluginPath)) { + Properties properties = new Properties(); + properties.load(new FileInputStream(pluginPath)); + properties.forEach((name, path) -> { + try { + String configPath = path + File.separator + "do.xml"; + Project plugin = new DoXmlResolver().resolve(configPath); + + File file = new File(path + File.separator + "logo.png"); + if (!file.exists()) { + return; + } + ImageView imageView = new ImageView(URLUtil.getURL(file).toString()); + imageView.setFitHeight(60); + imageView.setFitWidth(60); + imageView.setUserData(plugin); + + Label label = new Label(); + label.setGraphic(imageView); + label.setText(plugin.getName()); + label.setContentDisplay(ContentDisplay.TOP); + label.setOnMouseClicked(event -> { + List> selectContexts = getSelectContexts(); + if (selectContexts.isEmpty()) { + AlertUtils.showInfoAlert("请先选择项目！"); + return; + } + Map selectContext = selectContexts.get(0); + Project project = (Project) selectContext.get("project"); + + CallPluginController controller = ControllerLoader.load(CallPluginController.class, new ControllerLoader.DialogFactory()); + controller.loadData(project, plugin); + controller.show(); + }); + pluginPanel.add(label, index[0] % 5, index[0] / 5); + index[0]++; + + } catch (Exception e) { + e.printStackTrace(); + } }); - pluginPanel.add(label, index % 5, index / 5); - index++; } } diff --git a/src/main/java/com/gitee/dolet/controller/dialog/CallPluginController.java b/src/main/java/com/gitee/dolet/controller/dialog/CallPluginController.java index e5c9739..fda3af9 100644 --- a/src/main/java/com/gitee/dolet/controller/dialog/CallPluginController.java +++ b/src/main/java/com/gitee/dolet/controller/dialog/CallPluginController.java @@ -31,20 +31,20 @@ public class CallPluginController extends BaseController { @FXML private ComboBox subdomainBox; @FXML - private ComboBox configBox; + private ComboBox configBox; @FXML private TextArea configTextArea; private Project project; - private Plugin plugin; + private Project plugin; @Override public void initialize(URL location, ResourceBundle resources) { subdomainBox.setConverter(new EntityConverter<>(Subdomain::getName)); - configBox.setConverter(new EntityConverter<>(Config::getName)); + configBox.setConverter(new EntityConverter<>(Property::getName)); } - public void loadData(Project project, Plugin plugin) { + public void loadData(Project project, Project plugin) { this.project = project; this.plugin = plugin; @@ -53,14 +53,14 @@ public class CallPluginController extends BaseController { subdomainBox.getItems().addAll(subdomains); } - List configs = plugin.getConfigs(); + List configs = plugin.getBoundedContext().getProperties(); if (configs != null) { configBox.getItems().addAll(configs); } configBox.setOnAction(event -> { Subdomain subdomain = subdomainBox.getSelectionModel().getSelectedItem(); - Config config = configBox.getSelectionModel().getSelectedItem(); + Property config = configBox.getSelectionModel().getSelectedItem(); if (subdomain == null || config == null) { return; } @@ -68,7 +68,7 @@ public class CallPluginController extends BaseController { MainUIController mainUIController = (MainUIController) getParent(); List> selectContexts = mainUIController.getSelectContexts(); List properties = subdomain.getBoundedContext().getProperties(); - String template = config.getTemplate(); + String template = config.getValue(); String configText = buildConfig(project, selectContexts, properties, template); configTextArea.setText(configText); diff --git a/src/main/java/com/gitee/dolet/controller/dialog/LoginController.java b/src/main/java/com/gitee/dolet/controller/dialog/LoginController.java index 7c7bec1..b0a26c3 100644 --- a/src/main/java/com/gitee/dolet/controller/dialog/LoginController.java +++ b/src/main/java/com/gitee/dolet/controller/dialog/LoginController.java @@ -3,13 +3,10 @@ package com.gitee.dolet.controller.dialog; import com.gitee.dolet.annotation.Controller; import com.gitee.dolet.controller.BaseController; import com.gitee.dolet.controller.MainUIController; -import com.gitee.dolet.util.AlertUtils; -import com.gitee.dolet.util.HttpClientUtils; import javafx.fxml.FXML; import javafx.scene.control.TextField; import lombok.Data; import lombok.EqualsAndHashCode; -import org.apache.commons.lang3.StringUtils; import java.net.URL; import java.util.ResourceBundle; @@ -34,18 +31,18 @@ public class LoginController extends BaseController { @FXML public void confirm() throws Exception { - String token = tokenTextField.getText(); - if (StringUtils.isNotBlank(token)) { - String lastToken = HttpClientUtils.token; - HttpClientUtils.token = token; - MainUIController parent = (MainUIController) getParent(); - if (parent.tryLogin()) { - close(); - } else { - HttpClientUtils.token = lastToken; - AlertUtils.showErrorAlert("token无效！"); - } - } +// String token = tokenTextField.getText(); +// if (StringUtils.isNotBlank(token)) { +// String lastToken = HttpClientUtils.token; +// HttpClientUtils.token = token; +// MainUIController parent = (MainUIController) getParent(); +// if (parent.tryLoadData()) { +// close(); +// } else { +// HttpClientUtils.token = lastToken; +// AlertUtils.showErrorAlert("token无效！"); +// } +// } } } diff --git a/src/main/java/com/gitee/dolet/controller/dialog/PluginPathController.java b/src/main/java/com/gitee/dolet/controller/dialog/PluginPathController.java index 51817af..c09634d 100644 --- a/src/main/java/com/gitee/dolet/controller/dialog/PluginPathController.java +++ b/src/main/java/com/gitee/dolet/controller/dialog/PluginPathController.java @@ -1,15 +1,9 @@ package com.gitee.dolet.controller.dialog; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.gitee.dolet.entity.Plugin; import com.gitee.dolet.annotation.Controller; -import com.gitee.dolet.base.EntityConverter; import com.gitee.dolet.controller.BaseController; import com.gitee.dolet.controller.MainUIController; -import com.gitee.dolet.entity.Path; -import com.gitee.dolet.util.HttpClientUtils; -import javafx.collections.ObservableList; +import com.gitee.dolet.entity.Project; import javafx.fxml.FXML; import javafx.scene.control.ComboBox; import javafx.scene.control.TextField; @@ -28,21 +22,21 @@ import java.util.ResourceBundle; public class PluginPathController extends BaseController { @FXML - private ComboBox pluginComboBox; + private ComboBox pluginComboBox; @FXML private TextField pathTextField; @Override @SneakyThrows public void initialize(URL location, ResourceBundle resources) { - pluginComboBox.setConverter(new EntityConverter<>(Plugin::getName)); - ObservableList items = pluginComboBox.getItems(); - items.clear(); - JSONObject jsonObject = HttpClientUtils.sendGet("plugin/list"); - for (Object object : jsonObject.getJSONArray("data")) { - Plugin plugin = JSON.toJavaObject((JSON) object, Plugin.class); - items.add(plugin); - } +// pluginComboBox.setConverter(new EntityConverter<>(Project::getName)); +// ObservableList items = pluginComboBox.getItems(); +// items.clear(); +// JSONObject jsonObject = HttpClientUtils.sendGet("plugin/list"); +// for (Object object : jsonObject.getJSONArray("data")) { +// Project plugin = JSON.toJavaObject((JSON) object, Project.class); +// items.add(plugin); +// } } @FXML @@ -61,17 +55,17 @@ public class PluginPathController extends BaseController { @FXML public void confirm() throws Exception { - Plugin plugin = pluginComboBox.getSelectionModel().getSelectedItem(); - String pathText = pathTextField.getText(); - - MainUIController mainUIController = (MainUIController) getParent(); - - Path path = new Path(); - path.setCategory(2); - path.setRefId(plugin.getId()); - path.setMac(mainUIController.getLocalMacAddress()); - path.setPath(pathText); - HttpClientUtils.sendJson("path/add", JSON.toJSONString(path)); +// Project plugin = pluginComboBox.getSelectionModel().getSelectedItem(); +// String pathText = pathTextField.getText(); +// +// MainUIController mainUIController = (MainUIController) getParent(); +// +// Path path = new Path(); +// path.setCategory(2); +// path.setRefId(plugin.getId()); +// path.setMac(mainUIController.getLocalMacAddress()); +// path.setPath(pathText); +// HttpClientUtils.sendJson("path/add", JSON.toJSONString(path)); close(); } diff --git a/src/main/java/com/gitee/dolet/controller/dialog/ProjectPathController.java b/src/main/java/com/gitee/dolet/controller/dialog/ProjectPathController.java index 8071709..ecf6068 100644 --- a/src/main/java/com/gitee/dolet/controller/dialog/ProjectPathController.java +++ b/src/main/java/com/gitee/dolet/controller/dialog/ProjectPathController.java @@ -1,15 +1,9 @@ package com.gitee.dolet.controller.dialog; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.gitee.dolet.entity.Project; import com.gitee.dolet.annotation.Controller; -import com.gitee.dolet.base.EntityConverter; import com.gitee.dolet.controller.BaseController; import com.gitee.dolet.controller.MainUIController; -import com.gitee.dolet.entity.Path; -import com.gitee.dolet.util.HttpClientUtils; -import javafx.collections.ObservableList; import javafx.fxml.FXML; import javafx.scene.control.ComboBox; import javafx.scene.control.TextField; @@ -35,14 +29,14 @@ public class ProjectPathController extends BaseController { @Override @SneakyThrows public void initialize(URL location, ResourceBundle resources) { - projectComboBox.setConverter(new EntityConverter<>(Project::getName)); - ObservableList items = projectComboBox.getItems(); - items.clear(); - JSONObject jsonObject = HttpClientUtils.sendGet("project/list"); - for (Object object : jsonObject.getJSONArray("data")) { - Project project = JSON.toJavaObject((JSON) object, Project.class); - items.add(project); - } +// projectComboBox.setConverter(new EntityConverter<>(Project::getName)); +// ObservableList items = projectComboBox.getItems(); +// items.clear(); +// JSONObject jsonObject = HttpClientUtils.sendGet("project/list"); +// for (Object object : jsonObject.getJSONArray("data")) { +// Project project = JSON.toJavaObject((JSON) object, Project.class); +// items.add(project); +// } } @FXML diff --git a/src/main/java/com/gitee/dolet/controller/dialog/ShowLogController.java b/src/main/java/com/gitee/dolet/controller/dialog/ShowLogController.java index a079cf1..43540cf 100644 --- a/src/main/java/com/gitee/dolet/controller/dialog/ShowLogController.java +++ b/src/main/java/com/gitee/dolet/controller/dialog/ShowLogController.java @@ -5,9 +5,9 @@ import cn.hutool.core.io.watch.SimpleWatcher; import cn.hutool.core.io.watch.WatchMonitor; import cn.hutool.core.io.watch.Watcher; import cn.hutool.core.io.watch.watchers.DelayWatcher; -import com.gitee.dolet.entity.Plugin; import com.gitee.dolet.annotation.Controller; import com.gitee.dolet.controller.BaseController; +import com.gitee.dolet.entity.Project; import javafx.fxml.FXML; import javafx.scene.control.TextArea; import lombok.Data; @@ -33,7 +33,7 @@ public class ShowLogController extends BaseController { // ignore } - public void loadData(Plugin plugin) { + public void loadData(Project plugin) { String path = plugin.getPath(); path = path + File.separator + "log.txt"; String finalPath = path; diff --git a/src/main/java/com/gitee/dolet/entity/Config.java b/src/main/java/com/gitee/dolet/entity/Config.java deleted file mode 100644 index 19fa146..0000000 --- a/src/main/java/com/gitee/dolet/entity/Config.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.gitee.dolet.entity; - -import lombok.Data; - -import java.util.Date; - -/** - * 配置 - */ -@Data -public class Config { - // 主键 - private Integer id; - // 团队id - private Integer teamId; - // 插件id - private Integer pluginId; - // 名称 - private String name; - // 模板 - private String template; - // 创建者 - private String createUser; - // 创建时间 - private Date createTime; - // 更新者 - private String updateUser; - // 更新时间 - private Date updateTime; -} diff --git a/src/main/java/com/gitee/dolet/entity/Path.java b/src/main/java/com/gitee/dolet/entity/Path.java deleted file mode 100644 index f1398aa..0000000 --- a/src/main/java/com/gitee/dolet/entity/Path.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gitee.dolet.entity; - -import cn.hutool.core.collection.CollUtil; -import lombok.Data; - -import java.util.Date; -import java.util.List; - -/** - * 路径 - */ -@Data -public class Path { - // 主键 - private Integer id; - // 类别 1-project 2-plugin - private Integer category; - // 关联id - private Integer refId; - // 设备识别号 - private String mac; - // 路径 - private String path; - // 创建者 - private String createUser; - // 创建时间 - private Date createTime; - // 更新者 - private String updateUser; - // 更新时间 - private Date updateTime; - - public static String getPath(List paths, String mac) { - if (paths != null && !paths.isEmpty()) { - Path path = CollUtil.findOne(paths, p -> mac.equals(p.getMac())); - if (path != null) { - return path.getPath(); - } - } - return null; - } -} diff --git a/src/main/java/com/gitee/dolet/entity/Plugin.java b/src/main/java/com/gitee/dolet/entity/Plugin.java deleted file mode 100644 index 1722c33..0000000 --- a/src/main/java/com/gitee/dolet/entity/Plugin.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gitee.dolet.entity; - -import lombok.Data; - -import java.util.Date; -import java.util.List; - -/** - * 插件 - */ -@Data -public class Plugin { - // 主键 - private Integer id; - // 团队id - private Integer teamId; - // 名称 - private String name; - // 描述 - private String description; - // 图标 - private String logo; - // 创建者 - private String createUser; - // 创建时间 - private Date createTime; - // 更新者 - private String updateUser; - // 更新时间 - private Date updateTime; - // 配置 - private List configs; - // 路径 - private List paths; - // 本地路径（模型不包含） - private String path; -} diff --git a/src/main/java/com/gitee/dolet/entity/Project.java b/src/main/java/com/gitee/dolet/entity/Project.java index cb696a3..26ad9c8 100644 --- a/src/main/java/com/gitee/dolet/entity/Project.java +++ b/src/main/java/com/gitee/dolet/entity/Project.java @@ -17,6 +17,8 @@ public class Project { private BoundedContext boundedContext; // 领域 private List domains; + // 路径（模型不包含） + private String path; // 模块（模型不包含） private List modules; diff --git a/src/main/java/com/gitee/dolet/entity/User.java b/src/main/java/com/gitee/dolet/entity/User.java deleted file mode 100644 index 2d079cf..0000000 --- a/src/main/java/com/gitee/dolet/entity/User.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.gitee.dolet.entity; - -import lombok.Data; - -import java.util.Date; - -/** - * 用户 - */ -@Data -public class User { - // 主键 - private Integer id; - // 组织id - private Integer organizationId; - // 当前团队id - private Integer currentTeamId; - // 用户名 - private String username; - // 密码 - private String password; - // 头像 - private String avatar; - // 登录时间 - private Date loginTime; - // 创建者 - private String createUser; - // 创建时间 - private Date createTime; - // 更新者 - private String updateUser; - // 更新时间 - private Date updateTime; -} diff --git a/src/main/java/com/gitee/dolet/service/DoXmlResolver.java b/src/main/java/com/gitee/dolet/service/DoXmlResolver.java index bf33a98..00119b4 100644 --- a/src/main/java/com/gitee/dolet/service/DoXmlResolver.java +++ b/src/main/java/com/gitee/dolet/service/DoXmlResolver.java @@ -1,5 +1,6 @@ package com.gitee.dolet.service; +import cn.hutool.core.io.FileUtil; import com.gitee.dolet.entity.Subdomain; import com.gitee.dolet.entity.BoundedContext; @@ -12,6 +13,7 @@ import org.dom4j.io.SAXReader; import java.io.File; import java.util.ArrayList; +import java.util.Collections; import java.util.List; public class DoXmlResolver { @@ -32,13 +34,20 @@ public class DoXmlResolver { List domains = resolveDomains(domainElements); project.setDomains(domains); + project.setPath(FileUtil.getParent(path, 1)); project.mergeContexts(); - return project; } private BoundedContext resolveBoundedContext(Element boundedContextEle) { BoundedContext boundedContext = new BoundedContext(); + boundedContext.setName(""); + boundedContext.setProperties(Collections.emptyList()); + + if (boundedContextEle == null) { + return boundedContext; + } + boundedContext.setName(boundedContextEle.attributeValue("name")); List propertyElements = boundedContextEle.elements(); diff --git a/src/main/java/com/gitee/dolet/util/HttpClientUtils.java b/src/main/java/com/gitee/dolet/util/HttpClientUtils.java deleted file mode 100644 index b8776f7..0000000 --- a/src/main/java/com/gitee/dolet/util/HttpClientUtils.java +++ /dev/null @@ -1,129 +0,0 @@ -package com.gitee.dolet.util; - -import cn.hutool.extra.spring.SpringUtil; -import com.alibaba.fastjson.JSONObject; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.apache.http.HttpResponse; -import org.apache.http.NameValuePair; -import org.apache.http.client.config.RequestConfig; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClients; -import org.apache.http.message.BasicNameValuePair; -import org.apache.http.util.EntityUtils; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -@Slf4j -public class HttpClientUtils { - - public static String urlPrefix; - public static String token; - - static { - urlPrefix = SpringUtil.getProperty("dolives.urlPrefix"); - token = SpringUtil.getProperty("dolives.token"); - } - - private static String buildUrl(String url) { - return StringUtils.isNotBlank(urlPrefix) ? urlPrefix + url : url; - } - - private static Map buildHeaders(Map headers) { - if (StringUtils.isNotBlank(token)) { - if (headers == null) { - headers = new LinkedHashMap<>(); - } - headers.put("satoken", token); - } - return headers; - } - - public static JSONObject sendGet(String url, Map headers) throws Exception { - url = buildUrl(url); - headers = buildHeaders(headers); - try { - CloseableHttpClient httpClient = HttpClients.createDefault(); - HttpGet request = new HttpGet(url); - request.setConfig(RequestConfig.custom().setSocketTimeout(300 * 1000).setConnectTimeout(300 * 1000).build()); - if (headers != null && !headers.isEmpty()) { - headers.forEach(request::setHeader); - } - HttpResponse response = httpClient.execute(request); - String content = EntityUtils.toString(response.getEntity()); - return JSONObject.parseObject(content); - - } catch (Exception e) { - log.error(e.getMessage(), e); - throw e; - } - } - - public static JSONObject sendJson(String url, Map headers, String json) throws Exception { - url = buildUrl(url); - headers = buildHeaders(headers); - try { - CloseableHttpClient httpClient = HttpClients.createDefault(); - HttpPost request = new HttpPost(url); - request.setConfig(RequestConfig.custom().setSocketTimeout(300 * 1000).setConnectTimeout(300 * 1000).build()); - request.setHeader("Content-Type", "application/json;charset=utf-8"); - if (headers != null && !headers.isEmpty()) { - headers.forEach(request::setHeader); - } - request.setEntity(new StringEntity(json, "UTF-8")); - HttpResponse response = httpClient.execute(request); - String content = EntityUtils.toString(response.getEntity()); - return JSONObject.parseObject(content); - - } catch (Exception e) { - log.error(e.getMessage(), e); - throw e; - } - } - - public static JSONObject sendForm(String url, Map headers, Map params) throws Exception { - url = buildUrl(url); - headers = buildHeaders(headers); - try { - CloseableHttpClient httpClient = HttpClients.createDefault(); - HttpPost request = new HttpPost(url); - request.setConfig(RequestConfig.custom().setSocketTimeout(300 * 1000).setConnectTimeout(300 * 1000).build()); - request.setHeader("Content-Type", "application/x-www-form-urlencoded"); - if (headers != null && !headers.isEmpty()) { - headers.forEach(request::setHeader); - } - List list = new ArrayList<>(); - if (params != null && !params.isEmpty()) { - params.forEach((key, value) -> list.add(new BasicNameValuePair(key, value))); - } - request.setEntity(new UrlEncodedFormEntity(list, "UTF-8")); - HttpResponse response = httpClient.execute(request); - String content = EntityUtils.toString(response.getEntity()); - return JSONObject.parseObject(content); - - } catch (Exception e) { - log.error(e.getMessage(), e); - throw e; - } - } - - public static JSONObject sendGet(String url) throws Exception { - return sendGet(url, null); - } - - public static JSONObject sendJson(String url, String json) throws Exception { - return sendJson(url, null, json); - } - - public static JSONObject sendForm(String url, Map params) throws Exception { - return sendForm(url, null, params); - } - -} -- Gitee From 2d9926c57571bf31c6aa9441b9edffdfec5f8203 Mon Sep 17 00:00:00 2001 From: chentaoah <609580885@qq.com> Date: Thu, 5 Dec 2024 22:03:40 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=BA=9F=E5=BC=83?= =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dolet/controller/MainUIController.java | 95 ------------------- .../dialog/PluginPathController.java | 46 +++++---- .../dialog/ProjectPathController.java | 46 +++++---- src/main/resources/fxml/Login.fxml | 63 ------------ src/main/resources/fxml/MainUI.fxml | 15 --- src/main/resources/fxml/PluginPath.fxml | 5 +- src/main/resources/fxml/ProjectPath.fxml | 5 +- 7 files changed, 56 insertions(+), 219 deletions(-) delete mode 100644 src/main/resources/fxml/Login.fxml diff --git a/src/main/java/com/gitee/dolet/controller/MainUIController.java b/src/main/java/com/gitee/dolet/controller/MainUIController.java index 5a24b02..82f66f6 100644 --- a/src/main/java/com/gitee/dolet/controller/MainUIController.java +++ b/src/main/java/com/gitee/dolet/controller/MainUIController.java @@ -47,14 +47,10 @@ public class MainUIController extends BaseController { @FXML private Label refreshLabel; @FXML - private Label loginLabel; - @FXML private TreeView projectTree; @FXML private GridPane pluginPanel; - private String localMacAddress; - @Override @SneakyThrows public void initialize(URL location, ResourceBundle resources) { @@ -82,17 +78,8 @@ public class MainUIController extends BaseController { AlertUtils.showInfoAlert("刷新成功！"); }); - // 登录 - ImageView imageView3 = new ImageView("icons/login.png"); - imageView3.setFitHeight(40); - imageView3.setFitWidth(40); - loginLabel.setGraphic(imageView3); - loginLabel.setOnMouseClicked(event -> ControllerLoader.load(LoginController.class, new ControllerLoader.DialogFactory()).show()); - // 项目树 initProjectTree(); - // 本地机器识别码 - localMacAddress = NetUtil.getLocalMacAddress(); // 加载数据 loadData(); } @@ -162,88 +149,6 @@ public class MainUIController extends BaseController { } } }); - - cell.setOnContextMenuRequested(event -> { - TreeCell treeCell = (TreeCell) event.getSource(); - TreeItem treeItem = treeCell.getTreeItem(); - int level = projectTree.getTreeItemLevel(treeItem); - Object userData = treeItem.getGraphic().getUserData(); - - if (level == 2) { -// ContextMenu contextMenu = new ContextMenu(); -// MenuItem menuItem = new MenuItem("上传模块"); -// menuItem.setOnAction(event1 -> { -// try { -// List array = (List) userData; -// Project project = (Project) array.get(0); -// Module module = (Module) array.get(1); -// -// Map params = new LinkedHashMap<>(); -// params.put("projectId", project.getId()); -// params.put("modulePath", module.getQualifier()); -// JSONObject jsonObject = HttpClientUtils.sendJson("module/addByPath", JSON.toJSONString(params)); -// showAlert(jsonObject, "上传模块成功！"); -// -// } catch (Exception e) { -// e.printStackTrace(); -// } -// }); -// contextMenu.getItems().addAll(menuItem); -// contextMenu.show(cell, event.getScreenX(), event.getScreenY()); - - } else if (level == 3) { -// ContextMenu contextMenu = new ContextMenu(); -// MenuItem menuItem = new MenuItem("上传包"); -// menuItem.setOnAction(event1 -> { -// try { -// List array = (List) userData; -// Project project = (Project) array.get(0); -// Module module = (Module) array.get(1); -// Package aPackage = (Package) array.get(2); -// -// Map params = new LinkedHashMap<>(); -// params.put("projectId", project.getId()); -// params.put("modulePath", module.getQualifier()); -// params.put("packagePath", aPackage.getQualifier()); -// JSONObject jsonObject = HttpClientUtils.sendJson("package/addByPath", JSON.toJSONString(params)); -// showAlert(jsonObject, "上传包成功！"); -// -// } catch (Exception e) { -// e.printStackTrace(); -// } -// }); -// contextMenu.getItems().addAll(menuItem); -// contextMenu.show(cell, event.getScreenX(), event.getScreenY()); - - } else if (level == 4) { -// ContextMenu contextMenu = new ContextMenu(); -// MenuItem menuItem = new MenuItem("上传实体"); -// menuItem.setOnAction(event1 -> { -// try { -// List array = (List) userData; -// Project project = (Project) array.get(0); -// Package aPackage = (Package) array.get(2); -// JavaFile javaFile = (JavaFile) array.get(3); -// -// JavaScanner javaScanner = new JavaScanner(); -// SCompilationUnit compilationUnit = javaScanner.parse(aPackage.getTypeNames(), new File(javaFile.getPath())); -// -// Map params = new LinkedHashMap<>(); -// params.put("projectId", project.getId()); -// // 因为compilationUnit的字段不符合驼峰规则，所以只能先转换成字符串 -// params.put("compilationUnit", JSON.toJSONString(compilationUnit)); -// JSONObject jsonObject = HttpClientUtils.sendJson("entityObj/upload", JSON.toJSONString(params)); -// showAlert(jsonObject, "上传实体成功！"); -// -// } catch (Exception e) { -// e.printStackTrace(); -// } -// }); -// contextMenu.getItems().addAll(menuItem); -// contextMenu.show(cell, event.getScreenX(), event.getScreenY()); - } - }); - return cell; }); } diff --git a/src/main/java/com/gitee/dolet/controller/dialog/PluginPathController.java b/src/main/java/com/gitee/dolet/controller/dialog/PluginPathController.java index c09634d..f932d6d 100644 --- a/src/main/java/com/gitee/dolet/controller/dialog/PluginPathController.java +++ b/src/main/java/com/gitee/dolet/controller/dialog/PluginPathController.java @@ -1,5 +1,6 @@ package com.gitee.dolet.controller.dialog; +import cn.hutool.core.io.FileUtil; import com.gitee.dolet.annotation.Controller; import com.gitee.dolet.controller.BaseController; import com.gitee.dolet.controller.MainUIController; @@ -13,7 +14,11 @@ import lombok.EqualsAndHashCode; import lombok.SneakyThrows; import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.OutputStream; import java.net.URL; +import java.util.Properties; import java.util.ResourceBundle; @Data @@ -22,21 +27,13 @@ import java.util.ResourceBundle; public class PluginPathController extends BaseController { @FXML - private ComboBox pluginComboBox; + private TextField nameTextField; @FXML private TextField pathTextField; @Override @SneakyThrows public void initialize(URL location, ResourceBundle resources) { -// pluginComboBox.setConverter(new EntityConverter<>(Project::getName)); -// ObservableList items = pluginComboBox.getItems(); -// items.clear(); -// JSONObject jsonObject = HttpClientUtils.sendGet("plugin/list"); -// for (Object object : jsonObject.getJSONArray("data")) { -// Project plugin = JSON.toJavaObject((JSON) object, Project.class); -// items.add(plugin); -// } } @FXML @@ -55,17 +52,26 @@ public class PluginPathController extends BaseController { @FXML public void confirm() throws Exception { -// Project plugin = pluginComboBox.getSelectionModel().getSelectedItem(); -// String pathText = pathTextField.getText(); -// -// MainUIController mainUIController = (MainUIController) getParent(); -// -// Path path = new Path(); -// path.setCategory(2); -// path.setRefId(plugin.getId()); -// path.setMac(mainUIController.getLocalMacAddress()); -// path.setPath(pathText); -// HttpClientUtils.sendJson("path/add", JSON.toJSONString(path)); + String name = nameTextField.getText(); + String path = pathTextField.getText(); + + String userHomePath = FileUtil.getUserHomePath(); + String pluginPath = userHomePath + File.separator + ".do" + File.separator + "plugin.properties"; + + if (!FileUtil.exist(pluginPath)) { + FileUtil.mkParentDirs(pluginPath); + FileUtil.newFile(pluginPath).createNewFile(); + } + + Properties properties = new Properties(); + if (FileUtil.exist(pluginPath)) { + properties.load(new FileInputStream(pluginPath)); + } + properties.setProperty(name, path); + + OutputStream outputStream = new FileOutputStream(pluginPath); + properties.store(outputStream, null); + outputStream.close(); close(); } diff --git a/src/main/java/com/gitee/dolet/controller/dialog/ProjectPathController.java b/src/main/java/com/gitee/dolet/controller/dialog/ProjectPathController.java index ecf6068..ddee44b 100644 --- a/src/main/java/com/gitee/dolet/controller/dialog/ProjectPathController.java +++ b/src/main/java/com/gitee/dolet/controller/dialog/ProjectPathController.java @@ -1,5 +1,6 @@ package com.gitee.dolet.controller.dialog; +import cn.hutool.core.io.FileUtil; import com.gitee.dolet.entity.Project; import com.gitee.dolet.annotation.Controller; import com.gitee.dolet.controller.BaseController; @@ -13,7 +14,11 @@ import lombok.EqualsAndHashCode; import lombok.SneakyThrows; import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.OutputStream; import java.net.URL; +import java.util.Properties; import java.util.ResourceBundle; @Data @@ -22,21 +27,13 @@ import java.util.ResourceBundle; public class ProjectPathController extends BaseController { @FXML - private ComboBox projectComboBox; + private TextField nameTextField; @FXML private TextField pathTextField; @Override @SneakyThrows public void initialize(URL location, ResourceBundle resources) { -// projectComboBox.setConverter(new EntityConverter<>(Project::getName)); -// ObservableList items = projectComboBox.getItems(); -// items.clear(); -// JSONObject jsonObject = HttpClientUtils.sendGet("project/list"); -// for (Object object : jsonObject.getJSONArray("data")) { -// Project project = JSON.toJavaObject((JSON) object, Project.class); -// items.add(project); -// } } @FXML @@ -55,17 +52,26 @@ public class ProjectPathController extends BaseController { @FXML public void confirm() throws Exception { -// Project project = projectComboBox.getSelectionModel().getSelectedItem(); -// String pathText = pathTextField.getText(); -// -// MainUIController mainUIController = (MainUIController) getParent(); -// -// Path path = new Path(); -// path.setCategory(1); -// path.setRefId(project.getId()); -// path.setMac(mainUIController.getLocalMacAddress()); -// path.setPath(pathText); -// HttpClientUtils.sendJson("path/add", JSON.toJSONString(path)); + String name = nameTextField.getText(); + String path = pathTextField.getText(); + + String userHomePath = FileUtil.getUserHomePath(); + String projectPath = userHomePath + File.separator + ".do" + File.separator + "project.properties"; + + if (!FileUtil.exist(projectPath)) { + FileUtil.mkParentDirs(projectPath); + FileUtil.newFile(projectPath).createNewFile(); + } + + Properties properties = new Properties(); + if (FileUtil.exist(projectPath)) { + properties.load(new FileInputStream(projectPath)); + } + properties.setProperty(name, path); + + OutputStream outputStream = new FileOutputStream(projectPath); + properties.store(outputStream, null); + outputStream.close(); close(); } diff --git a/src/main/resources/fxml/Login.fxml b/src/main/resources/fxml/Login.fxml deleted file mode 100644 index 7167641..0000000 --- a/src/main/resources/fxml/Login.fxml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/fxml/MainUI.fxml b/src/main/resources/fxml/MainUI.fxml index 5445812..3679fa1 100644 --- a/src/main/resources/fxml/MainUI.fxml +++ b/src/main/resources/fxml/MainUI.fxml @@ -55,21 +55,6 @@ - - - - - diff --git a/src/main/resources/fxml/PluginPath.fxml b/src/main/resources/fxml/PluginPath.fxml index d7ee620..1bc6bdb 100644 --- a/src/main/resources/fxml/PluginPath.fxml +++ b/src/main/resources/fxml/PluginPath.fxml @@ -3,7 +3,6 @@ - @@ -34,11 +33,11 @@ - + - + diff --git a/src/main/resources/fxml/ProjectPath.fxml b/src/main/resources/fxml/ProjectPath.fxml index ec130a4..310267f 100644 --- a/src/main/resources/fxml/ProjectPath.fxml +++ b/src/main/resources/fxml/ProjectPath.fxml @@ -3,7 +3,6 @@ - @@ -77,10 +76,10 @@ - + - + -- Gitee From 2584cad766761c4d8e3d5e68134c80317ce786e1 Mon Sep 17 00:00:00 2001 From: chentaoah <609580885@qq.com> Date: Thu, 5 Dec 2024 22:26:23 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=BA=9F=E5=BC=83?= =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dolet/controller/MainUIController.java | 5 ++--- .../dialog/PluginPathController.java | 2 -- .../dialog/ProjectPathController.java | 2 -- .../java/com/gitee/dolet/entity/Domain.java | 1 - .../java/com/gitee/dolet/entity/Subdomain.java | 2 -- .../com/gitee/dolet/service/DoXmlResolver.java | 18 ++++++++++-------- 6 files changed, 12 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/gitee/dolet/controller/MainUIController.java b/src/main/java/com/gitee/dolet/controller/MainUIController.java index 82f66f6..5e31f77 100644 --- a/src/main/java/com/gitee/dolet/controller/MainUIController.java +++ b/src/main/java/com/gitee/dolet/controller/MainUIController.java @@ -2,15 +2,14 @@ package com.gitee.dolet.controller; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.io.FileUtil; -import cn.hutool.core.net.NetUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.URLUtil; import com.gitee.dolet.annotation.Controller; import com.gitee.dolet.controller.dialog.CallPluginController; -import com.gitee.dolet.controller.dialog.LoginController; import com.gitee.dolet.controller.dialog.PluginPathController; import com.gitee.dolet.controller.dialog.ProjectPathController; -import com.gitee.dolet.entity.*; +import com.gitee.dolet.entity.BoundedContext; +import com.gitee.dolet.entity.Project; import com.gitee.dolet.service.DoXmlResolver; import com.gitee.dolet.util.AlertUtils; import com.gitee.splex.module.entity.JavaFile; diff --git a/src/main/java/com/gitee/dolet/controller/dialog/PluginPathController.java b/src/main/java/com/gitee/dolet/controller/dialog/PluginPathController.java index f932d6d..7b565a3 100644 --- a/src/main/java/com/gitee/dolet/controller/dialog/PluginPathController.java +++ b/src/main/java/com/gitee/dolet/controller/dialog/PluginPathController.java @@ -4,9 +4,7 @@ import cn.hutool.core.io.FileUtil; import com.gitee.dolet.annotation.Controller; import com.gitee.dolet.controller.BaseController; import com.gitee.dolet.controller.MainUIController; -import com.gitee.dolet.entity.Project; import javafx.fxml.FXML; -import javafx.scene.control.ComboBox; import javafx.scene.control.TextField; import javafx.stage.DirectoryChooser; import lombok.Data; diff --git a/src/main/java/com/gitee/dolet/controller/dialog/ProjectPathController.java b/src/main/java/com/gitee/dolet/controller/dialog/ProjectPathController.java index ddee44b..e397d2e 100644 --- a/src/main/java/com/gitee/dolet/controller/dialog/ProjectPathController.java +++ b/src/main/java/com/gitee/dolet/controller/dialog/ProjectPathController.java @@ -1,12 +1,10 @@ package com.gitee.dolet.controller.dialog; import cn.hutool.core.io.FileUtil; -import com.gitee.dolet.entity.Project; import com.gitee.dolet.annotation.Controller; import com.gitee.dolet.controller.BaseController; import com.gitee.dolet.controller.MainUIController; import javafx.fxml.FXML; -import javafx.scene.control.ComboBox; import javafx.scene.control.TextField; import javafx.stage.DirectoryChooser; import lombok.Data; diff --git a/src/main/java/com/gitee/dolet/entity/Domain.java b/src/main/java/com/gitee/dolet/entity/Domain.java index 03da725..53eb43e 100644 --- a/src/main/java/com/gitee/dolet/entity/Domain.java +++ b/src/main/java/com/gitee/dolet/entity/Domain.java @@ -2,7 +2,6 @@ package com.gitee.dolet.entity; import lombok.Data; -import java.util.ArrayList; import java.util.List; /** diff --git a/src/main/java/com/gitee/dolet/entity/Subdomain.java b/src/main/java/com/gitee/dolet/entity/Subdomain.java index abf1d9c..e18d11e 100644 --- a/src/main/java/com/gitee/dolet/entity/Subdomain.java +++ b/src/main/java/com/gitee/dolet/entity/Subdomain.java @@ -2,8 +2,6 @@ package com.gitee.dolet.entity; import lombok.Data; -import java.util.ArrayList; - /** * 子域 */ diff --git a/src/main/java/com/gitee/dolet/service/DoXmlResolver.java b/src/main/java/com/gitee/dolet/service/DoXmlResolver.java index 00119b4..4831e00 100644 --- a/src/main/java/com/gitee/dolet/service/DoXmlResolver.java +++ b/src/main/java/com/gitee/dolet/service/DoXmlResolver.java @@ -1,12 +1,7 @@ package com.gitee.dolet.service; import cn.hutool.core.io.FileUtil; -import com.gitee.dolet.entity.Subdomain; - -import com.gitee.dolet.entity.BoundedContext; -import com.gitee.dolet.entity.Domain; -import com.gitee.dolet.entity.Project; -import com.gitee.dolet.entity.Property; +import com.gitee.dolet.entity.*; import org.dom4j.Document; import org.dom4j.Element; import org.dom4j.io.SAXReader; @@ -53,9 +48,16 @@ public class DoXmlResolver { List propertyElements = boundedContextEle.elements(); List properties = new ArrayList<>(propertyElements.size()); for (Element propertyEle : propertyElements) { + String name = propertyEle.attributeValue("name"); + String method = propertyEle.attributeValue("method"); + String value = propertyEle.getStringValue(); + if ("trim".equals(method)) { + value = value.trim(); + } + Property property = new Property(); - property.setName(propertyEle.attributeValue("name")); - property.setValue(propertyEle.getStringValue()); + property.setName(name); + property.setValue(value); properties.add(property); } boundedContext.setProperties(properties); -- Gitee From 42d0a660e50cdfeb027cbd3cdad56da4b3fde1b0 Mon Sep 17 00:00:00 2001 From: chentaoah <609580885@qq.com> Date: Thu, 5 Dec 2024 22:31:27 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=BA=9F=E5=BC=83?= =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/icons/login.png | Bin 1696 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/main/resources/icons/login.png diff --git a/src/main/resources/icons/login.png b/src/main/resources/icons/login.png deleted file mode 100644 index 0834294d4cd759f2f1c71d9385d283f68b24e960..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1696 zcmV;R24DG!P)d*|Do~brWun`5b_qlXPApY6ArfJHxy}GfV=_ z9LS_O&bXW7VxX8gWP=}9Rj=E(sL$&&_IdcsemAe{@pxWV1)8Rt=2SCWCC#wk(kzD_ zRf(e(#mWyq@|mBtwxd3eZ-V%tUN^t<{IzRy!UNB;>#AAqw~63>C2h`^9p0~uyvivI z7?s=iE6xr@;j3A;1ZMqSAoxPt9>w7OYC8F4U=uvPd;M;oRS|dx$E8&>?1Mn?SnG4j z6gQyIRxe}#g5~f4YQ;ub;c=mZ*}o$M56c2APu;4x0SW2bF{GdgP#6B{8o2tBYzDy0 zw+O*w?cBFtad^MZT$738PME%j=%u^uE*nfMh*ik zV(?hoE9tNq@X?7=q6T2~czLsQ0~qcwi2+6S+OQe$$ropc41le%QL+J${-;R{sHm+A zn*puuT|@>z9cYzq0K>JD7~pU+Xvx|v#o^yc-h#SaUP1%-cF6`nxPzo7*y^1~mzFCVyxwd@7kVxSGyANp@FND$^eo7P^Q0!=vq56!Hp%cQ*=6V} zg5Lkpt!92sqGPr#|LQS4akmmM;}_(9QdsPI&=ukDCX!PjRw=y?t+N!PSfljLaLL+ilvP5bmec1+*Z+O^+U9ckUX@Oc zP!z2Da+vYINx*m1)S-1*#Yigy_(Wkdv&;6NQ)fF#jkp7yU?~EIkl1(C9eEZi|0NP| zs0nCGnH@o@%MLzK_$=UX9wXiop&RV#;`zBj!P5;5^QXG*Wb6Gy z==+tw1QpY&%mUQfPF5FSISh7mbUYQ<0K(fJ8>GFQot{*!*;ItuyZT9sJi{~ES@s?yi^txfKr8;Yiikbdtn?hYu&!3`3E0dWjj+fA+_+AiJC>3q~GJ;COpn%z%O_ z<)6Lf*724$g1&%1N_5|6+FGhQP_WA1RY$TVy79};FM{dsWYN2D08tw#SjBC~MLh#z zeF1+P8!#YbK(W0>b(l~k`iAJ{UAP9Ag$$sqm8ye;sv53IWG5K?PZFUU-;`{t>L8&i zr=nIU{kchJ0mz2EqgP*JT9&fqPqjfpl`bvs52*A_kIBu~_73n%1dqj!h9=2;OKp%) zrO}&zA_ffQF(zzXfBCjx(K+Y`}szQ`W+G6N=GoKyRJgFo=UrPM1rolc%N!UejFdC_sHy!ueY@ZN Date: Thu, 5 Dec 2024 22:38:57 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=BA=9F=E5=BC=83?= =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 8 ++++---- .../java/com/gitee/dolet/controller/MainUIController.java | 2 +- src/main/resources/application-def.yml | 3 --- src/main/resources/start-def.bat | 4 ++-- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 8f93fa0..7989954 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# dolives-gui +# dolet -dolives-gui是一款轻量的项目管理与代码生成工具。 +dolet是一款轻量的项目管理与代码生成工具。 - 帮助开发者高效地管理本地的项目、上下文、插件、配置等信息。 - 统一调度插件，形成工作流。 @@ -13,9 +13,9 @@ dolives-gui是一款轻量的项目管理与代码生成工具。 ## 快速开始 -1. 点击最新的发行版，下载并解压dolives-gui.rar。 +1. 点击最新的发行版，下载并解压dolet.rar。 2. 双击start-def.bat，运行程序。 ## 图形界面 -avatar \ No newline at end of file +avatar \ No newline at end of file diff --git a/src/main/java/com/gitee/dolet/controller/MainUIController.java b/src/main/java/com/gitee/dolet/controller/MainUIController.java index 5e31f77..2b44745 100644 --- a/src/main/java/com/gitee/dolet/controller/MainUIController.java +++ b/src/main/java/com/gitee/dolet/controller/MainUIController.java @@ -36,7 +36,7 @@ import java.util.*; @Data @EqualsAndHashCode(callSuper = false) -@Controller(title = "dolives-gui", listenTo = {Project.class, Module.class, Package.class, BoundedContext.class}) +@Controller(title = "dolet", listenTo = {Project.class, Module.class, Package.class, BoundedContext.class}) public class MainUIController extends BaseController { @FXML diff --git a/src/main/resources/application-def.yml b/src/main/resources/application-def.yml index 5ce4997..e69de29 100644 --- a/src/main/resources/application-def.yml +++ b/src/main/resources/application-def.yml @@ -1,3 +0,0 @@ -dolives: - urlPrefix: http://localhost:80/admin/ - token: 123456 \ No newline at end of file diff --git a/src/main/resources/start-def.bat b/src/main/resources/start-def.bat index 13f04c7..5a11927 100644 --- a/src/main/resources/start-def.bat +++ b/src/main/resources/start-def.bat @@ -1,5 +1,5 @@ @echo off -title dolives-gui +title dolet setlocal enabledelayedexpansion set file=%~n0 @@ -10,6 +10,6 @@ echo path: %~dp0 echo file: %~n0 echo profile: %profile% -java -Xms512m -Xmx512m -Dfile.encoding=UTF-8 -jar dolives-gui-1.0.1.jar --spring.profiles.active=%profile% > log.txt +java -Xms512m -Xmx512m -Dfile.encoding=UTF-8 -jar dolet-1.0.1.jar --spring.profiles.active=%profile% > log.txt exit \ No newline at end of file -- Gitee From 584cee57f852eca124220bb89abcb01e0acdfaed Mon Sep 17 00:00:00 2001 From: chentaoah <609580885@qq.com> Date: Thu, 5 Dec 2024 22:45:36 +0800 Subject: [PATCH 11/14] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=BA=9F=E5=BC=83?= =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pom.xml b/pom.xml index 2f1a7fe..064c933 100644 --- a/pom.xml +++ b/pom.xml @@ -50,15 +50,6 @@ dom4j 2.1.4 - - org.apache.httpcomponents - httpclient - - - com.alibaba - fastjson - 1.2.74 - com.gitee.digital-engine splex-module -- Gitee From dfe0b5134f8bbbc1518fc430272664ae81014396 Mon Sep 17 00:00:00 2001 From: chentaoah <609580885@qq.com> Date: Thu, 5 Dec 2024 23:12:45 +0800 Subject: [PATCH 12/14] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=BA=9F=E5=BC=83?= =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/gitee/dolet/annotation/Controller.java | 2 -- src/main/java/com/gitee/dolet/controller/ControllerLoader.java | 2 +- src/main/java/com/gitee/dolet/controller/MainUIController.java | 3 +-- src/main/java/com/gitee/dolet/def/ControllerDef.java | 1 - 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/gitee/dolet/annotation/Controller.java b/src/main/java/com/gitee/dolet/annotation/Controller.java index a19430d..0084227 100644 --- a/src/main/java/com/gitee/dolet/annotation/Controller.java +++ b/src/main/java/com/gitee/dolet/annotation/Controller.java @@ -16,6 +16,4 @@ public @interface Controller { Class parent() default Object.class; - Class[] listenTo() default {}; - } diff --git a/src/main/java/com/gitee/dolet/controller/ControllerLoader.java b/src/main/java/com/gitee/dolet/controller/ControllerLoader.java index c44ddd2..30b5d67 100644 --- a/src/main/java/com/gitee/dolet/controller/ControllerLoader.java +++ b/src/main/java/com/gitee/dolet/controller/ControllerLoader.java @@ -33,7 +33,7 @@ public class ControllerLoader { public static T load(Class type, Function stageFactory) { ControllerDef controllerDef = ControllerDef.fromElement(type); if (controllerDef == null) { - controllerDef = new ControllerDef("", "", false, Object.class, new Class[]{}); + controllerDef = new ControllerDef("", "", false, Object.class); } boolean cache = controllerDef.isCache(); diff --git a/src/main/java/com/gitee/dolet/controller/MainUIController.java b/src/main/java/com/gitee/dolet/controller/MainUIController.java index 2b44745..026dc68 100644 --- a/src/main/java/com/gitee/dolet/controller/MainUIController.java +++ b/src/main/java/com/gitee/dolet/controller/MainUIController.java @@ -8,7 +8,6 @@ import com.gitee.dolet.annotation.Controller; import com.gitee.dolet.controller.dialog.CallPluginController; import com.gitee.dolet.controller.dialog.PluginPathController; import com.gitee.dolet.controller.dialog.ProjectPathController; -import com.gitee.dolet.entity.BoundedContext; import com.gitee.dolet.entity.Project; import com.gitee.dolet.service.DoXmlResolver; import com.gitee.dolet.util.AlertUtils; @@ -36,7 +35,7 @@ import java.util.*; @Data @EqualsAndHashCode(callSuper = false) -@Controller(title = "dolet", listenTo = {Project.class, Module.class, Package.class, BoundedContext.class}) +@Controller(title = "dolet") public class MainUIController extends BaseController { @FXML diff --git a/src/main/java/com/gitee/dolet/def/ControllerDef.java b/src/main/java/com/gitee/dolet/def/ControllerDef.java index 144fc9e..bb1027c 100644 --- a/src/main/java/com/gitee/dolet/def/ControllerDef.java +++ b/src/main/java/com/gitee/dolet/def/ControllerDef.java @@ -19,7 +19,6 @@ public class ControllerDef { private String fxml; private boolean cache; private Class parent; - private Class[] listenTo; public static ControllerDef fromElement(AnnotatedElement element) { Map attributes = AnnotatedElementUtils.getMergedAnnotationAttributes(element, Controller.class); -- Gitee From 196e009123a6af867170d257d4c3ac780a8cf25c Mon Sep 17 00:00:00 2001 From: chentaoah <609580885@qq.com> Date: Thu, 5 Dec 2024 23:19:50 +0800 Subject: [PATCH 13/14] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=BA=9F=E5=BC=83?= =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gitee/dolet/{ => annotation}/def/ControllerDef.java | 2 +- src/main/java/com/gitee/dolet/controller/BaseController.java | 2 +- src/main/java/com/gitee/dolet/controller/ControllerLoader.java | 2 +- .../com/gitee/dolet/{ => controller}/base/EntityConverter.java | 2 +- .../com/gitee/dolet/controller/dialog/CallPluginController.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename src/main/java/com/gitee/dolet/{ => annotation}/def/ControllerDef.java (95%) rename src/main/java/com/gitee/dolet/{ => controller}/base/EntityConverter.java (92%) diff --git a/src/main/java/com/gitee/dolet/def/ControllerDef.java b/src/main/java/com/gitee/dolet/annotation/def/ControllerDef.java similarity index 95% rename from src/main/java/com/gitee/dolet/def/ControllerDef.java rename to src/main/java/com/gitee/dolet/annotation/def/ControllerDef.java index bb1027c..a26fe5d 100644 --- a/src/main/java/com/gitee/dolet/def/ControllerDef.java +++ b/src/main/java/com/gitee/dolet/annotation/def/ControllerDef.java @@ -1,4 +1,4 @@ -package com.gitee.dolet.def; +package com.gitee.dolet.annotation.def; import cn.hutool.core.bean.BeanUtil; import com.gitee.dolet.annotation.Controller; diff --git a/src/main/java/com/gitee/dolet/controller/BaseController.java b/src/main/java/com/gitee/dolet/controller/BaseController.java index cb58b23..9d6a582 100644 --- a/src/main/java/com/gitee/dolet/controller/BaseController.java +++ b/src/main/java/com/gitee/dolet/controller/BaseController.java @@ -1,6 +1,6 @@ package com.gitee.dolet.controller; -import com.gitee.dolet.def.ControllerDef; +import com.gitee.dolet.annotation.def.ControllerDef; import javafx.fxml.Initializable; import javafx.stage.Stage; import lombok.Data; diff --git a/src/main/java/com/gitee/dolet/controller/ControllerLoader.java b/src/main/java/com/gitee/dolet/controller/ControllerLoader.java index 30b5d67..2eda459 100644 --- a/src/main/java/com/gitee/dolet/controller/ControllerLoader.java +++ b/src/main/java/com/gitee/dolet/controller/ControllerLoader.java @@ -1,7 +1,7 @@ package com.gitee.dolet.controller; import cn.hutool.core.util.StrUtil; -import com.gitee.dolet.def.ControllerDef; +import com.gitee.dolet.annotation.def.ControllerDef; import javafx.fxml.FXMLLoader; import javafx.scene.Parent; import javafx.scene.Scene; diff --git a/src/main/java/com/gitee/dolet/base/EntityConverter.java b/src/main/java/com/gitee/dolet/controller/base/EntityConverter.java similarity index 92% rename from src/main/java/com/gitee/dolet/base/EntityConverter.java rename to src/main/java/com/gitee/dolet/controller/base/EntityConverter.java index e34d448..c4e6159 100644 --- a/src/main/java/com/gitee/dolet/base/EntityConverter.java +++ b/src/main/java/com/gitee/dolet/controller/base/EntityConverter.java @@ -1,4 +1,4 @@ -package com.gitee.dolet.base; +package com.gitee.dolet.controller.base; import javafx.util.StringConverter; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/gitee/dolet/controller/dialog/CallPluginController.java b/src/main/java/com/gitee/dolet/controller/dialog/CallPluginController.java index fda3af9..d0c8fed 100644 --- a/src/main/java/com/gitee/dolet/controller/dialog/CallPluginController.java +++ b/src/main/java/com/gitee/dolet/controller/dialog/CallPluginController.java @@ -2,7 +2,7 @@ package com.gitee.dolet.controller.dialog; import cn.hutool.core.io.FileUtil; import com.gitee.dolet.annotation.Controller; -import com.gitee.dolet.base.EntityConverter; +import com.gitee.dolet.controller.base.EntityConverter; import com.gitee.dolet.controller.BaseController; import com.gitee.dolet.controller.ControllerLoader; import com.gitee.dolet.controller.MainUIController; -- Gitee From 5e4687756d748e4fd7391c2a00fd7a5b0c79b744 Mon Sep 17 00:00:00 2001 From: chenT <609580885@qq.com> Date: Fri, 6 Dec 2024 14:53:17 +0800 Subject: [PATCH 14/14] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gitee/dolet/controller/MainUIController.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gitee/dolet/controller/MainUIController.java b/src/main/java/com/gitee/dolet/controller/MainUIController.java index 026dc68..1dbe4a3 100644 --- a/src/main/java/com/gitee/dolet/controller/MainUIController.java +++ b/src/main/java/com/gitee/dolet/controller/MainUIController.java @@ -185,7 +185,9 @@ public class MainUIController extends BaseController { if (FileUtil.exist(projectPath)) { Properties properties = new Properties(); properties.load(new FileInputStream(projectPath)); - properties.forEach((name, path) -> { + // 有序化 + TreeMap treeMap = new TreeMap<>(properties); + treeMap.forEach((name, path) -> { try { String configPath = path + File.separator + "do.xml"; Project project = new DoXmlResolver().resolve(configPath); @@ -222,7 +224,9 @@ public class MainUIController extends BaseController { if (FileUtil.exist(pluginPath)) { Properties properties = new Properties(); properties.load(new FileInputStream(pluginPath)); - properties.forEach((name, path) -> { + // 有序化 + TreeMap treeMap = new TreeMap<>(properties); + treeMap.forEach((name, path) -> { try { String configPath = path + File.separator + "do.xml"; Project plugin = new DoXmlResolver().resolve(configPath); -- Gitee