Skip to content

Commit 4bca16d

Browse files
yiding-heyiding-he
committed
Merge remote-tracking branch 'upstream/master' into remember-window-position
# Conflicts: # src/main/java/com/xwintop/xJavaFxTool/utils/Config.java
2 parents c86ce32 + 2cf7196 commit 4bca16d

9 files changed

Lines changed: 115 additions & 146 deletions

File tree

‎README.md‎

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
[英文说明/English Documentation](README_EN.md)
2323

2424
**xJavaFxTool交流QQ群：== [387473650](https://jq.qq.com/?_wv=1027&k=59UDEAD) ==**
25+
**xJavaFxTool吐个槽：== [进来吐槽](https://support.qq.com/product/127577) ==**
2526

2627
#### 项目简介：
2728
xJavaFxTool是使用javaFx开发的实用小工具集，利用业余时间把工作中遇到的一些问题总结起来，打包进小工具集中，供大家参考和使用，里面包含了javaFx的一些功能的示例，如布局、国际化、第三方UI库([controlsfx](http://fxexperience.com/controlsfx/)、[JFoenix](http://www.jfoenix.com/)等)、外部jar包加载(插件机制)等一些常用功能，想学习javaFx的同学可以参考参考，学习javaFx的资料参考[www.javafxchina.net](http://www.javafxchina.net/main/)
@@ -38,7 +39,8 @@ xJavaFxTool是使用javaFx开发的实用小工具集，利用业余时间把工
3839
- 百度云链接：[https://pan.baidu.com/s/193fhGnJL4dDWcqDnFJcHbA](https://pan.baidu.com/s/193fhGnJL4dDWcqDnFJcHbA) 提取码：mokl
3940
- 腾讯微云链接：[https://share.weiyun.com/5T6FPLW](https://share.weiyun.com/5T6FPLW) 提取码：java
4041

41-
支持插件开发，将插件jar包放至根目录libs下即可自动加载(插件开发示例见[开源项目xJavaFxTool-plugin](https://gitee.com/xwintop/xJavaFxTool-plugin)，后续准备将小工具拆分至各插件中按需加载，目前插件功能暂不完善，后续将各功能拆分至各模块按需加载，减小jar包的大小);
42+
#### 支持插件开发：
43+
将插件jar包放至根目录libs下即可自动加载(插件开发示例见[开源项目xJavaFxTool-plugin](https://gitee.com/xwintop/xJavaFxTool-plugin)，后续准备将小工具拆分至各插件中按需加载，目前插件功能暂不完善，后续将各功能拆分至各模块按需加载，减小jar包的大小);
4244

4345
#### 环境搭建说明：
4446
- 开发环境为jdk1.8，基于maven构建
@@ -57,7 +59,7 @@ xJavaFxTool是使用javaFx开发的实用小工具集，利用业余时间把工
5759
5. TimeTool：Time转换(常用格式转换(含时区)、计算时间差、时间叠加计算)
5860
6. LinuxPathToWindowsPath：路径转换(使用[oshi](https://github.com/oshi/oshi)工具)
5961
7. QRCodeBuilder：二维码生成工具(自动生成、加入logo、截图识别、自定义格式)(使用[google.zxing](https://github.com/zxing/zxing)、[jkeymaster](https://github.com/tulskiy/jkeymaster)等工具)
60-
8. IdCardGenerator：身份证生成器
62+
8. IdCardGenerator：ID证生成器
6163
9. RegexTester：正则表达式生成工具
6264
10. ShortURL：网址缩短(目前支持百度、新浪、缩我等短网址缩短)
6365
11. EscapeCharacter：转义字符(支持Html、XML、Java、JavaScript、CSV、Sql)(使用[commons-lang3](https://commons.apache.org/lang)工具)
@@ -207,33 +209,10 @@ xJavaFxTool
207209
![输入图片说明](images/加密解密.gif "加密解密.png")
208210
![输入图片说明](images/正则表达式生成工具.gif "正则表达式生成工具.png")
209211
![输入图片说明](images/二维码生成工具.gif "二维码生成工具.png")
210-
![输入图片说明](images/Socket调试工具.gif "Socket调试工具.png")
211-
![输入图片说明](images/json格式化编辑工具.gif "json格式化编辑工具.png")
212-
![输入图片说明](images/Http调试工具.gif "Http调试工具.png")
213212
![输入图片说明](images/随机数生成工具.gif "随机数生成工具.png")
214-
![输入图片说明](images/字符串转换.gif "字符串转换.png")
215213
![输入图片说明](images/Redis连接工具.gif "Redis连接工具.png")
216-
![输入图片说明](images/Mq调试工具.gif "Mq调试工具.png")
217-
![输入图片说明](images/zookeeper工具.png "zookeeper工具.png")
218-
![输入图片说明](images/编码转换.png "编码转换.png")
219-
![输入图片说明](images/转义字符.gif "转义字符.png")
220-
![输入图片说明](images/文件列表生成器.gif "文件列表生成器.png")
221-
![输入图片说明](images/文件复制.png "文件复制.png")
222-
![输入图片说明](images/Time转换.gif "Time转换.gif")
223-
![输入图片说明](images/图标生成工具.gif "图标生成工具.png")
224-
![输入图片说明](images/Ftp服务器.gif "Ftp服务器.png")
225214
![输入图片说明](images/图片压缩工具.gif "图片压缩工具.png")
226-
![输入图片说明](images/Ftp客户端调试工具.gif "Ftp客户端调试工具.png")
227-
![输入图片说明](images/Pdf转换工具.gif "Pdf转换工具.png")
228215
![输入图片说明](images/图片转码工具.gif "图片转码工具.png")
229-
![输入图片说明](images/Cmd调试工具.png "Cmd调试工具.png")
230216
![输入图片说明](images/短信群发工具.gif "短信群发工具.png")
231217
![输入图片说明](images/文件重命名工具.gif "文件重命名工具.png")
232-
![输入图片说明](images/Json转换工具.gif "Json转换工具.png")
233-
![输入图片说明](images/系统信息.gif "系统信息.gif")
234-
![输入图片说明](images/Excel拆分工具.gif "Excel拆分工具.png")
235-
![输入图片说明](images/文件编码检测工具.gif "文件编码检测工具.png")
236-
![输入图片说明](images/端口扫描工具.gif "端口扫描工具.png")
237-
![输入图片说明](images/印章生成工具.gif "印章生成工具.png")
238-
![输入图片说明](images/猜数字游戏.png "猜数字游戏.png")
239218
![输入图片说明](images/成语字典工具.gif "成语字典工具.png")

‎README_EN.md‎

Lines changed: 63 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ Due to the hot SpringBoot, the project has been released SpringBoot-javafx versi
3838
- Baidu cloud link: [https://pan.baidu.com/s/193fhGnJL4dDWcqDnFJcHbA](https://pan.baidu.com/s/193fhGnJL4dDWcqDnFJcHbA) extraction code: mokl
3939
- Tencent micro cloud link: [https://share.weiyun.com/5T6FPLW](https://share.weiyun.com/5T6FPLW) extraction code: java
4040

41-
Support plug-in development, the plug-in jar package can be automatically loaded under the root directory libs (see the open source project [xJavaFxTool-plugin](https://gitee.com/xwintop/xJavaFxTool-plugin) for plug-in development examples , and the next step is to split the gadget into each plug-in and load it as needed. Currently, the plug-in function is not perfect, follow-up Split each function into modules and load them as needed to reduce the size of the jar package);
41+
#### Support plug-in development:
42+
the plug-in jar package can be automatically loaded under the root directory libs (see the open source project [xJavaFxTool-plugin](https://gitee.com/xwintop/xJavaFxTool-plugin) for plug-in development examples , and the next step is to split the gadget into each plug-in and load it as needed. Currently, the plug-in function is not perfect, follow-up Split each function into modules and load them as needed to reduce the size of the jar package);
4243

4344
#### Environmental construction instructions:
4445
- The development environment is jdk1.8, based on maven build
@@ -114,74 +115,74 @@ Support plug-in development, the plug-in jar package can be automatically loaded
114115
- [ ] Convert excel to sql insert statement
115116
- [ ] Record keyboard usage gadget
116117
- [ ] Random file generator (with template engine)
117-
118+
118119
#### Project structure
119120

120121
```
121-
xJavaFxTool
122-
├─ project ImagesRF Royalty Free Screenshot
123-
├─ external storage jar package lib reference
124-
├─ libs plugin jar package store
125-
├─ pom.xml maven profile
126-
├─ README.md documentation
127-
├─ src
128-
│ ├─ main
129-
│ │ ├─ the Java
130-
│ │ │ └ com
131-
│ │ │ └ ─ xwintop
132-
│ │ │ └ ─ ─ xJavaFxTool
133-
│ │ │ ├─ common third-party tools
134-
│ │ │ ├─ config springBoot configuration class
135-
│ │ │ ├─ controller javafx control layer
136-
│ │ │ │ ├─ assistTools Auxiliary Tool Control Layer
137-
│ │ │ │ ├ ─ codeTools Code Tool Control Layer
138-
│ │ │ │ ├─ debugTools Debug Tool Control Layer
139-
│ │ │ │ ├─ developTools Development Tool Control Layer
140-
│ │ │ │ ├─ epmsTools epms Tool Control Layer
141-
│ │ │ │ ├─ javaFxTools javaFx tool control layer
122+
xJavaFxTool
123+
├─ project ImagesRF Royalty Free Screenshot
124+
├─ external storage jar package lib reference
125+
├─ libs plugin jar package store
126+
├─ pom.xml maven profile
127+
├─ README.md documentation
128+
├─ src
129+
│ ├─ main
130+
│ │ ├─ the Java
131+
│ │ │ └ com
132+
│ │ │ └ ─ xwintop
133+
│ │ │ └ ─ ─ xJavaFxTool
134+
│ │ │ ├─ common third-party tools
135+
│ │ │ ├─ config springBoot configuration class
136+
│ │ │ ├─ controller javafx control layer
137+
│ │ │ │ ├─ assistTools Auxiliary Tool Control Layer
138+
│ │ │ │ ├ ─ codeTools Code Tool Control Layer
139+
│ │ │ │ ├─ debugTools Debug Tool Control Layer
140+
│ │ │ │ ├─ developTools Development Tool Control Layer
141+
│ │ │ │ ├─ epmsTools epms Tool Control Layer
142+
│ │ │ │ ├─ javaFxTools javaFx tool control layer
142143
│ │ │ │ ├─ littleTools gadget control layer
143-
│ │ │ │ └ ─ webTools html tool control layer
144-
│ │ │ ├─ job timed task processing job
145-
│ │ │ ├─ main main function package
146-
│ │ │ ├─ manager management
147-
│ │ │ ├─ model basic bean class layer
148-
│ │ │ ├─ services tool service layer
149-
│ │ │ │ ├─ assistTools auxiliary tool service layer
150-
│ │ │ │ ├─ codeTools Code tool service layer
151-
│ │ │ │ ├─ debugTools debugging tool service layer
152-
│ │ │ │ ├─ developTools development tool service layer
153-
│ │ │ │ ├─ epmsTools epms tool service layer
154-
│ │ │ │ ├─ javaFxTools javaFx tool service layer
155-
│ │ │ │ ├─ littleTools gadgets service layer
156-
│ │ │ │ └─ webTools html tool service layer
157-
│ │ │ ├─ Utils system tools class
158-
│ │ │ ├─ view javafx view layer
159-
│ │ │ │ ├─ assistTools auxiliary tool view layer
144+
│ │ │ │ └ ─ webTools html tool control layer
145+
│ │ │ ├─ job timed task processing job
146+
│ │ │ ├─ main main function package
147+
│ │ │ ├─ manager management
148+
│ │ │ ├─ model basic bean class layer
149+
│ │ │ ├─ services tool service layer
150+
│ │ │ │ ├─ assistTools auxiliary tool service layer
151+
│ │ │ │ ├─ codeTools Code tool service layer
152+
│ │ │ │ ├─ debugTools debugging tool service layer
153+
│ │ │ │ ├─ developTools development tool service layer
154+
│ │ │ │ ├─ epmsTools epms tool service layer
155+
│ │ │ │ ├─ javaFxTools javaFx tool service layer
156+
│ │ │ │ ├─ littleTools gadgets service layer
157+
│ │ │ │ └─ webTools html tool service layer
158+
│ │ │ ├─ Utils system tools class
159+
│ │ │ ├─ view javafx view layer
160+
│ │ │ │ ├─ assistTools auxiliary tool view layer
160161
│ │ │ │ ├─ codeTools Code tool view layer
161-
│ │ │ │ ├─ debugTools debugging tool View layer
162-
│ │ │ │ ├─ developTools development tools view layer
163-
│ │ │ │ ├─ javaFxTools javaFx tool view layer
164-
│ │ │ │ ├─ littleTools widget view layer
165-
│ │ │ │ └─ webTools html tool view layer
166-
│ │ │ └ ─ web web control view layer
167-
│ │ └ ─ resources
168-
│ │ ├ com
169-
│ │ │ └ ─ xwintop
170-
│ │ │ └─ xJavaFxTool
162+
│ │ │ │ ├─ debugTools debugging tool View layer
163+
│ │ │ │ ├─ developTools development tools view layer
164+
│ │ │ │ ├─ javaFxTools javaFx tool view layer
165+
│ │ │ │ ├─ littleTools widget view layer
166+
│ │ │ │ └─ webTools html tool view layer
167+
│ │ │ └ ─ web web control view layer
168+
│ │ └ ─ resources
169+
│ │ ├ com
170+
│ │ │ └ ─ xwintop
171+
│ │ │ └─ xJavaFxTool
171172
│ │ │ └─ fxmlView .fxml file
172-
│ │ ├─ Config configuration file
173-
│ │ │ └─ toolFxmlLoaderConfiguration.xml system menu loading configuration file
174-
│ │ ├─ css style resource
175-
│ │ ├─ data data resource
176-
│ │ ├─ images image resource
177-
│ │ ├─ locale internationalization
178-
│ │ ├─ web html tools
179-
│ │ ├─ application.yaml SpringBoot configuration file
173+
│ │ ├─ Config configuration file
174+
│ │ │ └─ toolFxmlLoaderConfiguration.xml system menu loading configuration file
175+
│ │ ├─ css style resource
176+
│ │ ├─ data data resource
177+
│ │ ├─ images image resource
178+
│ │ ├─ locale internationalization
179+
│ │ ├─ web html tools
180+
│ │ ├─ application.yaml SpringBoot configuration file
180181
│ │ ├─ banner.txt start banner pictures
181-
│ │ └─ logback.xml logback log configuration file
182-
│ └─ test test class
183-
│ ├─ java
184-
│ └─ resources
182+
│ │ └─ logback.xml logback log configuration file
183+
│ └─ test test class
184+
│ ├─ java
185+
│ └─ resources
185186
├─ xJavaFxTool.jar run the package directly
186187
187188
```
@@ -204,33 +205,10 @@ From time to time, add the pain points tool that summarizes the requirements in
204205
![输入图片说明](images/加密解密.gif "加密解密.png")
205206
![输入图片说明](images/正则表达式生成工具.gif "正则表达式生成工具.png")
206207
![输入图片说明](images/二维码生成工具.gif "二维码生成工具.png")
207-
![输入图片说明](images/Socket调试工具.gif "Socket调试工具.png")
208-
![输入图片说明](images/json格式化编辑工具.gif "json格式化编辑工具.png")
209-
![输入图片说明](images/Http调试工具.gif "Http调试工具.png")
210208
![输入图片说明](images/随机数生成工具.gif "随机数生成工具.png")
211-
![输入图片说明](images/字符串转换.gif "字符串转换.png")
212209
![输入图片说明](images/Redis连接工具.gif "Redis连接工具.png")
213-
![输入图片说明](images/Mq调试工具.gif "Mq调试工具.png")
214-
![输入图片说明](images/zookeeper工具.png "zookeeper工具.png")
215-
![输入图片说明](images/编码转换.png "编码转换.png")
216-
![输入图片说明](images/转义字符.gif "转义字符.png")
217-
![输入图片说明](images/文件列表生成器.gif "文件列表生成器.png")
218-
![输入图片说明](images/文件复制.png "文件复制.png")
219-
![输入图片说明](images/Time转换.gif "Time转换.gif")
220-
![输入图片说明](images/图标生成工具.gif "图标生成工具.png")
221-
![输入图片说明](images/Ftp服务器.gif "Ftp服务器.png")
222210
![输入图片说明](images/图片压缩工具.gif "图片压缩工具.png")
223-
![输入图片说明](images/Ftp客户端调试工具.gif "Ftp客户端调试工具.png")
224-
![输入图片说明](images/Pdf转换工具.gif "Pdf转换工具.png")
225211
![输入图片说明](images/图片转码工具.gif "图片转码工具.png")
226-
![输入图片说明](images/Cmd调试工具.png "Cmd调试工具.png")
227212
![输入图片说明](images/短信群发工具.gif "短信群发工具.png")
228213
![输入图片说明](images/文件重命名工具.gif "文件重命名工具.png")
229-
![输入图片说明](images/Json转换工具.gif "Json转换工具.png")
230-
![输入图片说明](images/系统信息.gif "系统信息.gif")
231-
![输入图片说明](images/Excel拆分工具.gif "Excel拆分工具.png")
232-
![输入图片说明](images/文件编码检测工具.gif "文件编码检测工具.png")
233-
![输入图片说明](images/端口扫描工具.gif "端口扫描工具.png")
234-
![输入图片说明](images/印章生成工具.gif "印章生成工具.png")
235-
![输入图片说明](images/猜数字游戏.png "猜数字游戏.png")
236214
![输入图片说明](images/成语字典工具.gif "成语字典工具.png")

‎src/main/java/com/xwintop/xJavaFxTool/controller/IndexController.java‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,9 @@ public void initialize(URL location, ResourceBundle resources) {
7070
initView();
7171
initEvent();
7272
initService();
73-
// new Thread(() -> {//启动SpringBoot
74-
// SpringApplication.run(Main.class,new String[0]);
75-
// }).start();
7673
addNodepadAction(null);
74+
indexService.addWebView("欢迎吐槽", "https://support.qq.com/product/127577", null);
75+
tongjiWebView.getEngine().load("https://xwintop.gitee.io/maven/tongji/xJavaFxTool.html");
7776
}
7877

7978
private void initView() {
@@ -302,4 +301,9 @@ private void openPluginFolderAction(ActionEvent event) throws Exception {
302301
private void xwintopLinkOnAction(ActionEvent event) throws Exception {
303302
HttpClientUtil.openBrowseURLThrowsException("https://gitee.com/xwintop/xJavaFxTool");
304303
}
304+
305+
@FXML
306+
private void userSupportAction(ActionEvent event) throws Exception {
307+
HttpClientUtil.openBrowseURLThrowsException("https://support.qq.com/product/127577");
308+
}
305309
}

‎src/main/java/com/xwintop/xJavaFxTool/utils/Config.java‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,28 @@
77
*/
88
public class Config {
99

10-
public static Locale defaultLocale = Locale.getDefault();// 设置系统语言
10+
public static Locale defaultLocale = Locale.getDefault();// 设置系统语言
1111

12-
public static final String xJavaFxToolVersions = "V0.2.0";// xJavaFxTool版本信息
12+
public static final String xJavaFxToolVersions = "V0.2.1-beta1";// xJavaFxTool版本信息
1313

14-
public static final int xJavaFxToolVersionsInteger = 12;// xJavaFxTool更新信息
14+
public static final int xJavaFxToolVersionsInteger = 13;// xJavaFxTool更新信息
1515

1616
/**
1717
* 集中存放配置 key 的地方
1818
*/
19-
public static class Keys {
19+
public static class Keys {
2020

2121
/**
2222
* 窗体相关配置
2323
*/
2424
public static class MainWindow {
2525

26-
public static final String WIDTH = "main-window.width";
26+
public static final String WIDTH = "main-window.width";
2727

28-
public static final String HEIGHT = "main-window.height";
28+
public static final String HEIGHT = "main-window.height";
2929

30-
public static final String TOP = "main-window.top";
30+
public static final String TOP = "main-window.top";
3131

32-
public static final String LEFT = "main-window.left";
33-
}
34-
}
35-
}
32+
public static final String LEFT = "main-window.left";
33+
}
34+
}}

‎src/main/java/com/xwintop/xJavaFxTool/utils/XJavaFxSystemUtil.java‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -107,22 +107,11 @@ public boolean accept(File dir, String name) {
107107
public static void addJarClass(File jarFile) {
108108
try {
109109
Method method = URLClassLoader.class.getDeclaredMethod("addURL", URL.class);
110-
// boolean accessible = method.isAccessible(); // 获取方法的访问权限
111-
// try {
112-
// if (accessible == false) {
113110
method.setAccessible(true); // 设置方法的访问权限
114-
// }
115111
// 获取系统类加载器
116112
URLClassLoader classLoader = (URLClassLoader) ClassLoader.getSystemClassLoader();
117113
URL url = jarFile.toURI().toURL();
118-
// try {
119114
method.invoke(classLoader, url);
120-
// } catch (Exception e) {
121-
// e.printStackTrace();
122-
// }
123-
// } finally {
124-
// method.setAccessible(accessible);
125-
// }
126115
} catch (Exception e) {
127116
log.error("添加libs中jar包到系统中异常:", e);
128117
}

‎src/main/java/com/xwintop/xJavaFxTool/view/IndexView.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import javafx.scene.control.MenuBar;
1111
import javafx.scene.control.TabPane;
1212
import javafx.scene.control.TextField;
13+
import javafx.scene.web.WebView;
1314
import lombok.Getter;
1415
import lombok.Setter;
1516

@@ -39,4 +40,7 @@ public abstract class IndexView implements Initializable {
3940
protected Menu moreToolsMenu;
4041
@FXML
4142
protected Menu helpMenu;
43+
44+
@FXML
45+
protected WebView tongjiWebView;
4246
}

0 commit comments

Comments
 (0)