diff --git a/README.md b/README.md
index 4efee92e8eb015c9c3d7df31086f5a2a72137871..1872cd1c8bfaa4f52c33a739d33caaa5a5164343 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@
 
 [英文说明/English Documentation](README_EN.md)
 
-**xJavaFxTool交流QQ群: [![](https://img.shields.io/badge/QQ-387473650-green.svg?logo=tencent%20qq)](https://jq.qq.com/?_wv=1027&k=59UDEAD) 或加群②[![](https://img.shields.io/badge/QQ-1104780992-green.svg?logo=tencent%20qq)](https://jq.qq.com/?_wv=1027&k=bhAdkju9)**
+**xJavaFxTool交流QQ群: [![](https://img.shields.io/badge/QQ-387473650-green.svg?logo=tencent%20qq)](https://jq.qq.com/?_wv=1027&k=59UDEAD) 或加群②（已满）[![](https://img.shields.io/badge/QQ-1104780992-green.svg?logo=tencent%20qq)](https://jq.qq.com/?_wv=1027&k=bhAdkju9) 或加群③[![](https://img.shields.io/badge/QQ-235011461-green.svg?logo=tencent%20qq)](https://jq.qq.com/?_wv=1027&k=zXUFDNuE)**
 
 **xJavaFxTool吐个槽：== [进来吐槽](https://support.qq.com/product/127577) ==**
 
diff --git a/pom.xml b/pom.xml
index 43e5d8644e537ad9173e64bf21026eabf25ff11a..b7c92e6bdbd0623b0c78f4fa243f5bc120f5af24 100755
--- a/pom.xml
+++ b/pom.xml
@@ -17,17 +17,22 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.test.skip>true</maven.test.skip>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>8</maven.compiler.source>
+    <maven.compiler.target>8</maven.compiler.target>
+    <jpro.version>2022.1.3</jpro.version>
   </properties>
   <repositories>
+    <!--    <repository>-->
+    <!--      <id>aliyunmaven</id>-->
+    <!--      <url>https://maven.aliyun.com/repository/public</url>-->
+    <!--    </repository>-->
+    <!--    <repository>-->
+    <!--      <id>jitpack.io</id>-->
+    <!--      <url>https://jitpack.io</url>-->
+    <!--    </repository>-->
     <repository>
-      <id>aliyunmaven</id>
-      <url>https://maven.aliyun.com/repository/public</url>
-    </repository>
-    <repository>
-      <id>jitpack.io</id>
-      <url>https://jitpack.io</url>
+      <id>jpro - sandec repository</id>
+      <url>https://sandec.jfrog.io/ui/native/repo</url>
     </repository>
   </repositories>
   <dependencies>
@@ -48,9 +53,34 @@
       <version>1.18.24</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>com.sandec.jpro</groupId>
+      <artifactId>jpro-webapi</artifactId>
+      <version>${jpro.version}</version>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
+  <pluginRepositories>
+    <pluginRepository>
+      <id>jpro - sandec repository</id>
+      <url>https://sandec.jfrog.io/ui/native/repo</url>
+    </pluginRepository>
+  </pluginRepositories>
   <build>
     <plugins>
+      <plugin>
+        <groupId>com.sandec.jpro</groupId>
+        <artifactId>jpro-maven-plugin</artifactId>
+        <version>${jpro.version}</version>
+        <configuration>
+          <visible>false</visible>
+          <JVMArgs>
+            <!-- <JVMArg>your-args</JVMArg> -->
+          </JVMArgs>
+          <mainClassName>com.xwintop.xJavaFxTool.XJavaFxToolApplication</mainClassName>
+          <openingPath>/</openingPath>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
diff --git a/src/main/java/com/xwintop/xJavaFxTool/XJavaFxToolApplication.java b/src/main/java/com/xwintop/xJavaFxTool/XJavaFxToolApplication.java
index 7b8db115adf609d0ff1599de2487474150f37518..c8164d341bd24272e871e8d03829b796802003a7 100644
--- a/src/main/java/com/xwintop/xJavaFxTool/XJavaFxToolApplication.java
+++ b/src/main/java/com/xwintop/xJavaFxTool/XJavaFxToolApplication.java
@@ -67,9 +67,7 @@ public class XJavaFxToolApplication extends Application {
         loadClassicUI(primaryStage);
 
         StageUtils.loadPrimaryStageBound(primaryStage);
-        primaryStage.setOnShown(windowEvent -> {
-            VersionChecker.checkNewVersion();
-        });
+        primaryStage.setOnShown(windowEvent -> VersionChecker.checkNewVersion());
         primaryStage.show();
     }
 
diff --git a/src/main/java/com/xwintop/xJavaFxTool/common/logback/ConsoleLogAppender.java b/src/main/java/com/xwintop/xJavaFxTool/common/logback/ConsoleLogAppender.java
index e6b8487ffe6ad54a83594f6c4d9432efa1b25a3a..288a7be29abae4e0a23235658f1fe6d6ecdb37a0 100644
--- a/src/main/java/com/xwintop/xJavaFxTool/common/logback/ConsoleLogAppender.java
+++ b/src/main/java/com/xwintop/xJavaFxTool/common/logback/ConsoleLogAppender.java
@@ -6,6 +6,8 @@ import ch.qos.logback.core.OutputStreamAppender;
 import com.xwintop.xcore.util.javafx.TooltipUtil;
 import javafx.scene.control.TextArea;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -19,6 +21,7 @@ import java.util.List;
  * @date: 2019/4/25 0025 23:18
  */
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class ConsoleLogAppender extends OutputStreamAppender<ILoggingEvent> {
     public final static List<TextArea> textAreaList = new ArrayList<>();
@@ -34,7 +37,7 @@ public class ConsoleLogAppender extends OutputStreamAppender<ILoggingEvent> {
             }
 
             @Override
-            public void write(byte[] b) throws IOException {
+            public void write(@NotNull byte[] b) throws IOException {
                 for (TextArea textArea : textAreaList) {
                     textArea.appendText(new String(b) + "\n");
                 }
diff --git a/src/main/java/com/xwintop/xJavaFxTool/controller/IndexController.java b/src/main/java/com/xwintop/xJavaFxTool/controller/IndexController.java
index 46311284dcd2efaf68e295c9912d813fe92337d1..ab7c1ef53f9be30eb07023825d6f61e75d906100 100644
--- a/src/main/java/com/xwintop/xJavaFxTool/controller/IndexController.java
+++ b/src/main/java/com/xwintop/xJavaFxTool/controller/IndexController.java
@@ -5,8 +5,8 @@ import com.xwintop.xJavaFxTool.controller.index.PluginManageController;
 import com.xwintop.xJavaFxTool.event.AppEvents;
 import com.xwintop.xJavaFxTool.event.PluginEvent;
 import com.xwintop.xJavaFxTool.model.PluginJarInfo;
-import com.xwintop.xJavaFxTool.newui.PluginCategoryController;
-import com.xwintop.xJavaFxTool.newui.PluginItemController;
+import com.xwintop.xJavaFxTool.controller.plugin.PluginCategoryController;
+import com.xwintop.xJavaFxTool.controller.plugin.PluginItemController;
 import com.xwintop.xJavaFxTool.plugin.PluginManager;
 import com.xwintop.xJavaFxTool.plugin.PluginParser;
 import com.xwintop.xJavaFxTool.services.IndexService;
@@ -83,7 +83,7 @@ public class IndexController extends IndexView {
             addNodepadAction(null);
         }
         this.indexService.addWebView(XJavaFxToolApplication.RESOURCE_BUNDLE.getString("feedback"), QQ_URL, null);
-        this.tongjiWebView.getEngine().load(STATISTICS_URL);
+//        this.tongjiWebView.getEngine().load(STATISTICS_URL);
         this.tabPaneMain.getSelectionModel().select(0);
     }
 
@@ -96,9 +96,7 @@ public class IndexController extends IndexView {
         PluginManager pluginManager = PluginManager.getInstance();
         pluginManager.loadLocalDevPluginConfiguration();
         loadPlugins();  // 加载插件列表到界面上
-        AppEvents.addEventHandler(PluginEvent.PLUGIN_DOWNLOADED, pluginEvent -> {
-            loadPlugins();
-        });
+        AppEvents.addEventHandler(PluginEvent.PLUGIN_DOWNLOADED, pluginEvent -> loadPlugins());
     }
 
     /**
@@ -178,18 +176,14 @@ public class IndexController extends IndexView {
             imageView.setFitWidth(18);
             menuItem.setGraphic(imageView);
         }
-        menuItem.setOnAction((ActionEvent event) -> {
-            indexService.loadPlugin(jarInfo);
-        });
+        menuItem.setOnAction((ActionEvent event) -> indexService.loadPlugin(jarInfo));
         ((Menu) menu).getItems().add(menuItem);
         menuItemMap.put(menuItem.getText(), menuItem);
     }
 
     public void selectAction(String selectText) {
         boolean notSearching = StringUtils.isBlank(selectText);
-        pluginItemControllers.forEach(itemController -> {
-            itemController.setVisible(notSearching || itemController.matchKeyword(selectText));
-        });
+        pluginItemControllers.forEach(itemController -> itemController.setVisible(notSearching || itemController.matchKeyword(selectText)));
     }
 
     @FXML
diff --git a/src/main/java/com/xwintop/xJavaFxTool/controller/index/PluginManageController.java b/src/main/java/com/xwintop/xJavaFxTool/controller/index/PluginManageController.java
index 1118a2968ce820e4145bbc04581081f7025b4352..8797346b1de47823bf2359028312fa95a677d2b5 100644
--- a/src/main/java/com/xwintop/xJavaFxTool/controller/index/PluginManageController.java
+++ b/src/main/java/com/xwintop/xJavaFxTool/controller/index/PluginManageController.java
@@ -142,9 +142,7 @@ public class PluginManageController extends PluginManageView {
                 log.error("保存插件配置失败", ex);
             }
         });
-        JavaFxViewUtil.addMenuItem(contextMenu, "删除插件", actionEvent -> {
-            pluginManageService.deletePlugin();
-        });
+        JavaFxViewUtil.addMenuItem(contextMenu, "删除插件", actionEvent -> pluginManageService.deletePlugin());
         pluginDataTableView.setContextMenu(contextMenu);
         // 搜索
         selectPluginTextField.textProperty().addListener((_ob, _old, _new) -> pluginManageService.searchPlugin(_new));
diff --git a/src/main/java/com/xwintop/xJavaFxTool/newui/PluginCategoryController.java b/src/main/java/com/xwintop/xJavaFxTool/controller/plugin/PluginCategoryController.java
similarity index 85%
rename from src/main/java/com/xwintop/xJavaFxTool/newui/PluginCategoryController.java
rename to src/main/java/com/xwintop/xJavaFxTool/controller/plugin/PluginCategoryController.java
index 28acc22c10e3c3ddf086932c970c22e9efd6b4cc..ba8b65d22aaa0d4f8144e3e1d6023abe46969bd8 100644
--- a/src/main/java/com/xwintop/xJavaFxTool/newui/PluginCategoryController.java
+++ b/src/main/java/com/xwintop/xJavaFxTool/controller/plugin/PluginCategoryController.java
@@ -1,4 +1,4 @@
-package com.xwintop.xJavaFxTool.newui;
+package com.xwintop.xJavaFxTool.controller.plugin;
 
 import com.xwintop.xcore.javafx.helper.FxmlHelper;
 import javafx.fxml.FXMLLoader;
@@ -7,22 +7,21 @@ import javafx.scene.layout.FlowPane;
 import javafx.scene.layout.VBox;
 
 public class PluginCategoryController {
+    public Label lblCategoryName;
+
+    public FlowPane items;
+
+    public VBox root;
 
     public static PluginCategoryController newInstance(String categoryName) {
         FXMLLoader fxmlLoader = FxmlHelper.loadFromResource(
-            "/com/xwintop/xJavaFxTool/fxmlView/newui/plugin-category.fxml"
+            "/com/xwintop/xJavaFxTool/fxmlView/plugin/plugin-category.fxml"
         );
         PluginCategoryController controller = fxmlLoader.getController();
         controller.lblCategoryName.setText(categoryName);
         return controller;
     }
 
-    public Label lblCategoryName;
-
-    public FlowPane items;
-
-    public VBox root;
-
     public void addItem(PluginItemController item) {
         this.items.getChildren().add(item.root);
     }
diff --git a/src/main/java/com/xwintop/xJavaFxTool/newui/PluginItemController.java b/src/main/java/com/xwintop/xJavaFxTool/controller/plugin/PluginItemController.java
similarity index 97%
rename from src/main/java/com/xwintop/xJavaFxTool/newui/PluginItemController.java
rename to src/main/java/com/xwintop/xJavaFxTool/controller/plugin/PluginItemController.java
index 108948e5014cc98e2c8388bbd2477079752b709e..bf4ac929ecab82d2e2ed631e968868db6fc695a9 100644
--- a/src/main/java/com/xwintop/xJavaFxTool/newui/PluginItemController.java
+++ b/src/main/java/com/xwintop/xJavaFxTool/controller/plugin/PluginItemController.java
@@ -1,4 +1,4 @@
-package com.xwintop.xJavaFxTool.newui;
+package com.xwintop.xJavaFxTool.controller.plugin;
 
 import com.xwintop.xJavaFxTool.controller.IndexController;
 import com.xwintop.xJavaFxTool.model.PluginJarInfo;
@@ -19,14 +19,7 @@ import lombok.extern.slf4j.Slf4j;
 @Data
 @Slf4j
 public class PluginItemController {
-    public static final String FXML_PATH = "/com/xwintop/xJavaFxTool/fxmlView/newui/plugin-item.fxml";
-
-    public static PluginItemController newInstance(PluginJarInfo pluginJarInfo) {
-        FXMLLoader fxmlLoader = FxmlHelper.loadFromResource(FXML_PATH);
-        PluginItemController controller = fxmlLoader.getController();
-        controller.setPluginInfo(pluginJarInfo);
-        return controller;
-    }
+    public static final String FXML_PATH = "/com/xwintop/xJavaFxTool/fxmlView/plugin/plugin-item.fxml";
 
     private PluginJarInfo pluginJarInfo;
 
@@ -40,6 +33,13 @@ public class PluginItemController {
 
     private IndexController indexController;
 
+    public static PluginItemController newInstance(PluginJarInfo pluginJarInfo) {
+        FXMLLoader fxmlLoader = FxmlHelper.loadFromResource(FXML_PATH);
+        PluginItemController controller = fxmlLoader.getController();
+        controller.setPluginInfo(pluginJarInfo);
+        return controller;
+    }
+
     public void initialize() {
         // 当元素不可见时也从布局流中去掉
         this.root.managedProperty().bind(this.root.visibleProperty());
diff --git a/src/main/java/com/xwintop/xJavaFxTool/services/IndexService.java b/src/main/java/com/xwintop/xJavaFxTool/services/IndexService.java
index e18c1687077268822c1590123941996f188b5669..3e38331b8dde152eb93ca8924e65d96f1afcb7e2 100644
--- a/src/main/java/com/xwintop/xJavaFxTool/services/IndexService.java
+++ b/src/main/java/com/xwintop/xJavaFxTool/services/IndexService.java
@@ -1,5 +1,6 @@
 package com.xwintop.xJavaFxTool.services;
 
+import com.jpro.webapi.HTMLView;
 import com.xwintop.xJavaFxTool.AppException;
 import com.xwintop.xJavaFxTool.XJavaFxToolApplication;
 import com.xwintop.xJavaFxTool.common.logback.ConsoleLogAppender;
@@ -24,13 +25,14 @@ import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.Region;
-import javafx.scene.web.WebEngine;
-import javafx.scene.web.WebView;
 import javafx.stage.Stage;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
@@ -72,9 +74,7 @@ public class IndexService {
         TextArea textArea = new TextArea();
         textArea.setFocusTraversable(true);
         ConsoleLogAppender.textAreaList.add(textArea);
-        addTabAction(event, textArea, indexController.getBundle().getString("addLogConsole"), (Event event1) -> {
-            ConsoleLogAppender.textAreaList.remove(textArea);
-        });
+        addTabAction(event, textArea, indexController.getBundle().getString("addLogConsole"), (Event event1) -> ConsoleLogAppender.textAreaList.remove(textArea));
     }
 
     public void addTabAction(ActionEvent event, Region content, String title, EventHandler closeRequest) {
@@ -91,7 +91,10 @@ public class IndexService {
                 indexController.getTabPaneMain().getSelectionModel().select(tab);
             }
             if (closeRequest != null) {
-                tab.setOnCloseRequest(closeRequest);
+                tab.setOnCloseRequest(event1 -> {
+                    closeRequest.handle(event1);
+                    indexController.getTabPaneMain().getSelectionModel().select(0);
+                });
             }
         }
     }
@@ -128,7 +131,10 @@ public class IndexService {
         }
 
         if (tab != null) {
-            tab.setOnClosed(event -> this.jarInfoMap.remove(pluginJarInfo));
+            tab.setOnClosed(event -> {
+                this.jarInfoMap.remove(pluginJarInfo);
+                indexController.getTabPaneMain().getSelectionModel().select(0);
+            });
             jarInfoMap.put(pluginJarInfo, tab);
         }
     }
@@ -190,16 +196,24 @@ public class IndexService {
     }
 
     public static Tab loadWebViewAsTab(PluginJarInfo plugin, TabPane tabPane, boolean singleWindowBoot) {
-        WebView browser = new WebView();
-        WebEngine webEngine = browser.getEngine();
+//        WebView browser = new WebView();
+//        WebEngine webEngine = browser.getEngine();
         String url = plugin.getPagePath();
         String title = plugin.getTitle();
 
+        HTMLView browser = null;
         if (url.startsWith("http")) {
-            webEngine.load(url);
+//            webEngine.load(url);
+            String contentIframe2 = "<iframe frameborder=\"0\" style=\"width: 100%; height: 100%;\" src=\"" + url + "\"> </iframe>";
+            browser = new HTMLView(contentIframe2);
         } else {
             PluginContainer pluginContainer = new PluginContainer(plugin);
-            webEngine.load(pluginContainer.getResource(url).toExternalForm());
+//            webEngine.load(pluginContainer.getResource(url).toExternalForm());
+            try {
+                browser = new HTMLView(IOUtils.toString(pluginContainer.getResource(url).openStream(), StandardCharsets.UTF_8));
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
         }
 
         if (singleWindowBoot) {
diff --git a/src/main/java/com/xwintop/xJavaFxTool/services/index/SystemSettingService.java b/src/main/java/com/xwintop/xJavaFxTool/services/index/SystemSettingService.java
index bdc3772f0387258108c7244b64947c856eba4595..e7954275cf5f3874a69e77b19b3fb093db215d68 100644
--- a/src/main/java/com/xwintop/xJavaFxTool/services/index/SystemSettingService.java
+++ b/src/main/java/com/xwintop/xJavaFxTool/services/index/SystemSettingService.java
@@ -20,9 +20,7 @@ import lombok.extern.slf4j.Slf4j;
 @Setter
 @Slf4j
 public class SystemSettingService {
-
     public static void openSystemSettings(String title) {
-
         FxDialog<SystemSettingController> dialog = new FxDialog<SystemSettingController>()
             .setResourceBundle(XJavaFxToolApplication.RESOURCE_BUNDLE)
             .setTitle(title)
diff --git a/src/main/java/com/xwintop/xJavaFxTool/utils/Config.java b/src/main/java/com/xwintop/xJavaFxTool/utils/Config.java
index a66061d99f7c3c175ef9e8f25a7dfa731e394079..179a124008955942f63d4a699d59403c441adff8 100644
--- a/src/main/java/com/xwintop/xJavaFxTool/utils/Config.java
+++ b/src/main/java/com/xwintop/xJavaFxTool/utils/Config.java
@@ -18,7 +18,7 @@ public class Config {
 
     public static Locale defaultLocale = Locale.getDefault();// 设置系统语言
 
-    public static final String xJavaFxToolVersions = "V0.3.2";// xJavaFxTool版本信息
+    public static final String xJavaFxToolVersions = "V0.3.3";// xJavaFxTool版本信息
 
     public enum Keys {
         MainWindowWidth, MainWindowHeight, MainWindowTop, MainWindowLeft,
diff --git a/src/main/java/com/xwintop/xJavaFxTool/utils/XJavaFxSystemUtil.java b/src/main/java/com/xwintop/xJavaFxTool/utils/XJavaFxSystemUtil.java
index 02f32af3dc4064ab43461e2e662bedb84be34560..b31a50199677ae20558492c2e02cf680478003fd 100644
--- a/src/main/java/com/xwintop/xJavaFxTool/utils/XJavaFxSystemUtil.java
+++ b/src/main/java/com/xwintop/xJavaFxTool/utils/XJavaFxSystemUtil.java
@@ -34,72 +34,4 @@ public class XJavaFxSystemUtil {
             log.error("初始化本地语言失败", e);
         }
     }
-
-
-    /**
-     * @Title: addJarByLibs
-     * @Description: 添加libs中jar包到系统中
-     */
-//    public static void addJarByLibs() {
-//        try {
-//            // 系统类库路径
-//            File libPath = new File("libs/");
-//            // 获取所有的.jar和.zip文件
-//            File[] jarFiles = libPath.listFiles(
-//                (dir, name) -> name.endsWith(".jar")
-//            );
-//            if (jarFiles != null) {
-//                for (File file : jarFiles) {
-//                    if (!PluginManageService.isPluginEnabled(file.getName())) {
-//                        continue;
-//                    }
-//                    addJarClass(file);
-//                }
-//            }
-//            PluginManager.getInstance().loadLocalPlugins();
-//        } catch (Exception e) {
-//            log.error("添加libs中jar包到系统中异常:", e);
-//        }
-//    }
-
-    /**
-     * @Title: addJarClass
-     * @Description: 添加jar包到系统中
-     */
-//    public static void addJarClass(File jarFile) {
-//        try {
-//            ClassLoader classLoader = ClassLoader.getSystemClassLoader();
-//            URL url = jarFile.toURI().toURL();
-//            if (classLoader instanceof URLClassLoader) {
-//                System.out.println("DEB: classLoader instanceof URLClassLoader");
-//                URLClassLoader sysloader = (URLClassLoader) ClassLoader.getSystemClassLoader();
-//                Class sysclass = URLClassLoader.class;
-//                try {
-//                    Method method = sysclass.getDeclaredMethod("addURL", URL.class);
-//                    method.setAccessible(true);
-//                    method.invoke(sysloader, url);
-//                } catch (Exception var5) {
-//                    var5.printStackTrace();
-//                    throw new IllegalStateException(var5.getMessage(), var5);
-//                }
-//            } else {
-//                try {
-//                    Field field = classLoader.getClass().getDeclaredField("ucp");
-//                    field.setAccessible(true);
-//                    Object ucp = field.get(classLoader);
-//
-//                    System.out.println("DEB: invoke method!");
-//                    Method method = ucp.getClass().getDeclaredMethod("addURL", URL.class);
-//                    method.setAccessible(true);
-//
-//                    method.invoke(ucp, url);
-//                } catch (Exception exception) {
-//                    exception.printStackTrace();
-//                    throw new IllegalStateException(exception.getMessage(), exception);
-//                }
-//            }
-//        } catch (Exception e) {
-//            log.error("添加libs中jar包到系统中异常:", e);
-//        }
-//    }
 }
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
deleted file mode 100644
index 4e536d409f1f81f242884b2bb3785a1c9dfc980f..0000000000000000000000000000000000000000
--- a/src/main/resources/application.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-server:
-    port: 10820
-spring:
-    jmx: 
-        enabled: false
diff --git a/src/main/resources/banner.txt b/src/main/resources/banner.txt
index d07ecdd8c09ad4b57c63e6c0e127de6fe5720771..b6b52e02d98d6e084df0515041f135dae3fbceec 100644
--- a/src/main/resources/banner.txt
+++ b/src/main/resources/banner.txt
@@ -47,4 +47,4 @@
 //   ;              iEEEL    ,EEEEEL,         EEEE                  //
 //////////////////////////////////////////////////////////////////////
 ${AnsiColor.BRIGHT_BLUE}
-::: Project (version:0.2.3) :::    http://www.xwintop.com＼(^O^)／    Spring-Boot ${spring-boot.version}
\ No newline at end of file
+::: Project (version:0.3.3) :::    http://www.xwintop.com＼(^O^)／    Spring-Boot ${spring-boot.version}
\ No newline at end of file
diff --git a/src/main/resources/com/xwintop/xJavaFxTool/fxmlView/Index.fxml b/src/main/resources/com/xwintop/xJavaFxTool/fxmlView/Index.fxml
index cfad94911e48c0ddbb96d8fe02d1bb8f346ff267..633a616ef6b210d39d4be5cf59cceec1fed0d7c0 100644
--- a/src/main/resources/com/xwintop/xJavaFxTool/fxmlView/Index.fxml
+++ b/src/main/resources/com/xwintop/xJavaFxTool/fxmlView/Index.fxml
@@ -4,7 +4,7 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.web.WebView?>
-<AnchorPane prefHeight="654.0" prefWidth="1044.0" stylesheets="/com/xwintop/xJavaFxTool/fxmlView/newui/main.css"
+<AnchorPane prefHeight="654.0" prefWidth="1044.0" stylesheets="/com/xwintop/xJavaFxTool/fxmlView/plugin/main.css"
             xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1"
             fx:controller="com.xwintop.xJavaFxTool.controller.IndexController">
   <TabPane fx:id="tabPaneMain" tabClosingPolicy="ALL_TABS" tabMinWidth="45.0" AnchorPane.bottomAnchor="0.0"
@@ -69,7 +69,7 @@
               </padding>
             </Label>
             <TextField fx:id="myTextField" promptText="%selectTextField" styleClass="search-text"/>
-            <WebView fx:id="tongjiWebView" prefHeight="1.0" prefWidth="1.0" visible="false"/>
+<!--            <WebView fx:id="tongjiWebView" prefHeight="1.0" prefWidth="1.0" visible="false"/>-->
             <Pane HBox.hgrow="ALWAYS"/>
             <Hyperlink onAction="#xwintopLinkOnAction" text="http://gitee.com/xwintop/xJavaFxTool"
                        textFill="#868686"/>
diff --git a/src/main/resources/com/xwintop/xJavaFxTool/fxmlView/newui/main.css b/src/main/resources/com/xwintop/xJavaFxTool/fxmlView/plugin/main.css
similarity index 100%
rename from src/main/resources/com/xwintop/xJavaFxTool/fxmlView/newui/main.css
rename to src/main/resources/com/xwintop/xJavaFxTool/fxmlView/plugin/main.css
diff --git a/src/main/resources/com/xwintop/xJavaFxTool/fxmlView/newui/plugin-category.fxml b/src/main/resources/com/xwintop/xJavaFxTool/fxmlView/plugin/plugin-category.fxml
similarity index 81%
rename from src/main/resources/com/xwintop/xJavaFxTool/fxmlView/newui/plugin-category.fxml
rename to src/main/resources/com/xwintop/xJavaFxTool/fxmlView/plugin/plugin-category.fxml
index 29fda87083ceede1da7883241d01975981819b51..5c03306c2e5137780eba02030220a7ced4baa33a 100644
--- a/src/main/resources/com/xwintop/xJavaFxTool/fxmlView/newui/plugin-category.fxml
+++ b/src/main/resources/com/xwintop/xJavaFxTool/fxmlView/plugin/plugin-category.fxml
@@ -2,7 +2,7 @@
 <?import javafx.scene.layout.FlowPane?>
 <?import javafx.scene.layout.VBox?>
 <VBox spacing="5" styleClass="app-category"
-      fx:controller="com.xwintop.xJavaFxTool.newui.PluginCategoryController"
+      fx:controller="com.xwintop.xJavaFxTool.controller.plugin.PluginCategoryController"
       fx:id="root"
       xmlns:fx="http://javafx.com/fxml/1">
     <Label styleClass="app-category-title" text="最近使用" fx:id="lblCategoryName"/>
diff --git a/src/main/resources/com/xwintop/xJavaFxTool/fxmlView/newui/plugin-item.fxml b/src/main/resources/com/xwintop/xJavaFxTool/fxmlView/plugin/plugin-item.fxml
similarity index 87%
rename from src/main/resources/com/xwintop/xJavaFxTool/fxmlView/newui/plugin-item.fxml
rename to src/main/resources/com/xwintop/xJavaFxTool/fxmlView/plugin/plugin-item.fxml
index e8fa591fed9055059c8218da399f74d21e0ae011..c88915b0637e393c6ab8895a601bba1cf26485a3 100644
--- a/src/main/resources/com/xwintop/xJavaFxTool/fxmlView/newui/plugin-item.fxml
+++ b/src/main/resources/com/xwintop/xJavaFxTool/fxmlView/plugin/plugin-item.fxml
@@ -5,7 +5,7 @@
 <?import javafx.scene.layout.VBox?>
 <VBox spacing="5" styleClass="app-item"
       fx:id="root" alignment="CENTER"
-      fx:controller="com.xwintop.xJavaFxTool.newui.PluginItemController"
+      fx:controller="com.xwintop.xJavaFxTool.controller.plugin.PluginItemController"
       xmlns:fx="http://javafx.com/fxml/1">
   <HBox alignment="CENTER" VBox.vgrow="ALWAYS">
     <ImageView fitWidth="48" fitHeight="48" fx:id="imgLogo">
diff --git a/src/test/java/com/xwintop/xJavaFxTool/event/AppEventsTest.java b/src/test/java/com/xwintop/xJavaFxTool/event/AppEventsTest.java
index 05e3b7a411422af918afeaf1b823688b054702ca..f0c7ec81833f1cc7f2f394a05be3cebfe01bbb55 100644
--- a/src/test/java/com/xwintop/xJavaFxTool/event/AppEventsTest.java
+++ b/src/test/java/com/xwintop/xJavaFxTool/event/AppEventsTest.java
@@ -6,9 +6,7 @@ public class AppEventsTest {
 
     @Test
     public void testFireEvent() {
-        AppEvents.addEventHandler(PluginEvent.PLUGIN_DOWNLOADED, event -> {
-            System.out.println("Plugin downloaded: " + event.getPluginJarInfo());
-        });
+        AppEvents.addEventHandler(PluginEvent.PLUGIN_DOWNLOADED, event -> System.out.println("Plugin downloaded: " + event.getPluginJarInfo()));
 
         AppEvents.fire(new PluginEvent(PluginEvent.PLUGIN_DOWNLOADED, null));
     }
diff --git a/src/test/java/com/xwintop/xJavaFxTool/javafx/PluginProgectBuildTool.java b/src/test/java/com/xwintop/xJavaFxTool/javafx/PluginProgectBuildTool.java
index baf7d6f51ea7aeed3a09e8d45a2107a7ab8481f8..9726cf59bba58dca8c3373f3e35bc196b0307675 100644
--- a/src/test/java/com/xwintop/xJavaFxTool/javafx/PluginProgectBuildTool.java
+++ b/src/test/java/com/xwintop/xJavaFxTool/javafx/PluginProgectBuildTool.java
@@ -18,10 +18,10 @@ import java.io.File;
 
 @Slf4j
 public class PluginProgectBuildTool {
-    private String projectPath = "C:/IDEA/xwintop/xJavaFxTool/src/main/";
+    private final String projectPath = "C:/IDEA/xwintop/xJavaFxTool/src/main/";
 
     //    private String projectPath = "";
-    private String resources = "resources/com/xwintop/xJavaFxTool/";
+    private final String resources = "resources/com/xwintop/xJavaFxTool/";
 
     //    private String xmlPath = "assistTools/";
 //    private String xmlPath = "codeTools/";
@@ -31,11 +31,11 @@ public class PluginProgectBuildTool {
 //    private String xmlPath = "games/";
 //    private String xmlPath = "littleTools/";
 //    private String xmlPath = "webTools/";
-    private String xmlPath = "javaFxTools/";
+    private final String xmlPath = "javaFxTools/";
 
-    private String srcPath = "java/com/xwintop/xJavaFxTool/";
+    private final String srcPath = "java/com/xwintop/xJavaFxTool/";
 
-    private String pluginPath = "C:/IDEA/xJavaFxTool-plugin/";
+    private final String pluginPath = "C:/IDEA/xJavaFxTool-plugin/";
 
     @Test
     public void buildJava() throws Exception {
diff --git a/src/test/java/com/xwintop/xJavaFxTool/javafx/PluginProgectPomBuildTool.java b/src/test/java/com/xwintop/xJavaFxTool/javafx/PluginProgectPomBuildTool.java
index 0fd25e1f7a25f1ab38acfeb1278b56af8e85afe1..eace52ebfed38d056707ce385a0a55613180fe34 100644
--- a/src/test/java/com/xwintop/xJavaFxTool/javafx/PluginProgectPomBuildTool.java
+++ b/src/test/java/com/xwintop/xJavaFxTool/javafx/PluginProgectPomBuildTool.java
@@ -116,7 +116,7 @@ public class PluginProgectPomBuildTool {
                 "        try {\n" +
                 "            launch(args);\n" +
                 "        } catch (Exception e) {\n" +
-                "            e.printStackTrace();\n" +
+                "            log.error(e.getMessage(), e);\n" +
                 "        }\n" +
                 "    }\n" +
                 "\n" +
diff --git a/src/test/java/com/xwintop/xJavaFxTool/javafx/tool/TableBeanTool.java b/src/test/java/com/xwintop/xJavaFxTool/javafx/tool/TableBeanTool.java
index 9081f8b7d516691fa86d1bbd7b37be73ff1d31fd..af5b598d32abdb57c0fd3f972f8025f1d0f1b432 100644
--- a/src/test/java/com/xwintop/xJavaFxTool/javafx/tool/TableBeanTool.java
+++ b/src/test/java/com/xwintop/xJavaFxTool/javafx/tool/TableBeanTool.java
@@ -8,15 +8,14 @@ import org.junit.Test;
 public class TableBeanTool {
 	@Test
 	public void buildTableBean(){
-//		Class<?> beanClass = EmailToolTableBean.class;
 		Class<?> beanClass = this.getClass();
 		Field[] fields = FieldUtils.getAllFields(beanClass);
 		StringBuffer soutStringBuffer = new StringBuffer();//输出字符串
-		StringBuffer stringBuffer = new StringBuffer();//构造函数头
-		StringBuffer stringBuffer2 = new StringBuffer();//构造函数结构
-		StringBuffer stringBuffer3 = new StringBuffer();//构造函数2头
-		StringBuffer stringBuffer4 = new StringBuffer();//获取构造函数
-		StringBuffer stringBuffer5 = new StringBuffer();//获取getSet方法
+		StringBuilder stringBuffer = new StringBuilder();//构造函数头
+		StringBuilder stringBuffer2 = new StringBuilder();//构造函数结构
+		StringBuilder stringBuffer3 = new StringBuilder();//构造函数2头
+		StringBuilder stringBuffer4 = new StringBuilder();//获取构造函数
+		StringBuilder stringBuffer5 = new StringBuilder();//获取getSet方法
 		stringBuffer.append("public ").append(beanClass.getSimpleName()).append("(");
 		stringBuffer3.append("public ").append(beanClass.getSimpleName()).append("(String propertys) {\nString[] strings = propertys.split(\"__\","+fields.length+");\n");
 		stringBuffer4.append("public String getPropertys() {\nreturn ");
@@ -56,9 +55,9 @@ public class TableBeanTool {
 		stringBuffer4.delete(stringBuffer4.length()-10, stringBuffer4.length()).append(";\n");
 		
 		soutStringBuffer.append(stringBuffer.toString()+stringBuffer2+"}\n\n");
-		soutStringBuffer.append(stringBuffer3.toString()+"}\n\n");
-		soutStringBuffer.append(stringBuffer4.toString()+"}\n\n");
-		soutStringBuffer.append(stringBuffer5.toString()+"\n\n");
+		soutStringBuffer.append(stringBuffer3 +"}\n\n");
+		soutStringBuffer.append(stringBuffer4 +"}\n\n");
+		soutStringBuffer.append(stringBuffer5 +"\n\n");
 		System.out.println(soutStringBuffer);
 	}
 }