Skip to content

Commit c9c8fd7

Browse files
xwintopxwintop
committed
1.将configuration配置换成json配置
1 parent 4a485ad commit c9c8fd7

15 files changed

Lines changed: 196 additions & 230 deletions

File tree

‎debugTools/x-ActiveMqTool/src/main/java/com/xwintop/xJavaFxTool/services/debugTools/ActiveMqToolService.java‎

Lines changed: 12 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,14 @@
1818
import org.apache.activemq.ActiveMQConnectionFactory;
1919
import org.apache.activemq.command.ActiveMQBytesMessage;
2020
import org.apache.activemq.command.ActiveMQMapMessage;
21-
import org.apache.commons.configuration2.PropertiesConfiguration;
22-
import org.apache.commons.configuration2.builder.fluent.Configurations;
23-
import org.apache.commons.io.FileUtils;
2421
import org.apache.commons.lang3.StringUtils;
2522

2623
import javax.jms.*;
2724
import java.io.File;
28-
import java.io.FileWriter;
2925
import java.text.SimpleDateFormat;
3026
import java.util.Date;
3127
import java.util.HashMap;
3228
import java.util.Map;
33-
import java.util.function.Consumer;
3429

3530
/**
3631
* @ClassName: ActiveMqToolService
@@ -51,18 +46,15 @@ public class ActiveMqToolService {
5146
// Connection ：JMS 客户端到JMS Provider 的连接
5247
private Connection connection = null;
5348

54-
public void saveConfigure() throws Exception {
55-
saveConfigure(ConfigureUtil.getConfigureFile("ActiveMqToolConfigure.properties"));
49+
public void saveConfigure() {
50+
saveConfigure(ConfigureUtil.getConfigureFile("ActiveMqToolConfigure.json"));
5651
}
5752

58-
public void saveConfigure(File file) throws Exception {
59-
FileUtils.touch(file);
60-
PropertiesConfiguration xmlConfigure = new Configurations().properties(file);
61-
xmlConfigure.clear();
53+
public void saveConfigure(File file) {
54+
ConfigureUtil.getConfig(file).clear();
6255
for (int i = 0; i < activeMqToolController.getTableData().size(); i++) {
63-
xmlConfigure.setProperty("tableBean" + i, activeMqToolController.getTableData().get(i).getPropertys());
56+
ConfigureUtil.set(file, "tableBean" + i, activeMqToolController.getTableData().get(i).getPropertys());
6457
}
65-
xmlConfigure.write(new FileWriter(file));
6658
Platform.runLater(() -> {
6759
TooltipUtil.showToast("保存配置成功,保存在：" + file.getPath());
6860
});
@@ -71,27 +63,24 @@ public void saveConfigure(File file) throws Exception {
7163
public void otherSaveConfigureAction() throws Exception {
7264
String fileName = "ActiveMqToolConfigure.properties";
7365
File file = FileChooserUtil.chooseSaveFile(fileName, new FileChooser.ExtensionFilter("All File", "*.*"),
74-
new FileChooser.ExtensionFilter("Properties", "*.properties"));
66+
new FileChooser.ExtensionFilter("Properties", "*.json"));
7567
if (file != null) {
7668
saveConfigure(file);
7769
TooltipUtil.showToast("保存配置成功,保存在：" + file.getPath());
7870
}
7971
}
8072

8173
public void loadingConfigure() {
82-
loadingConfigure(ConfigureUtil.getConfigureFile("ActiveMqToolConfigure.properties"));
74+
loadingConfigure(ConfigureUtil.getConfigureFile("ActiveMqToolConfigure.json"));
8375
}
8476

8577
public void loadingConfigure(File file) {
8678
try {
8779
activeMqToolController.getTableData().clear();
88-
PropertiesConfiguration xmlConfigure = new Configurations().properties(file);
89-
xmlConfigure.getKeys().forEachRemaining(new Consumer<String>() {
90-
@Override
91-
public void accept(String t) {
92-
activeMqToolController.getTableData().add(new ActiveMqToolTableBean(xmlConfigure.getString(t)));
93-
}
94-
});
80+
Map xmlConfigure = ConfigureUtil.getConfig(file);
81+
for (Object key : xmlConfigure.keySet()) {
82+
activeMqToolController.getTableData().add(new ActiveMqToolTableBean((String) xmlConfigure.get(key)));
83+
}
9584
} catch (Exception e) {
9685
try {
9786
TooltipUtil.showToast("加载配置失败：" + e.getMessage());
@@ -102,7 +91,7 @@ public void accept(String t) {
10291

10392
public void loadingConfigureAction() {
10493
File file = FileChooserUtil.chooseFile(new FileChooser.ExtensionFilter("All File", "*.*"),
105-
new FileChooser.ExtensionFilter("Properties", "*.properties"));
94+
new FileChooser.ExtensionFilter("Properties", "*.json"));
10695
if (file != null) {
10796
loadingConfigure(file);
10897
}

‎debugTools/x-CmdTool/src/main/java/com/xwintop/xJavaFxTool/services/debugTools/CmdToolService.java‎

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,12 @@
1111
import lombok.Getter;
1212
import lombok.Setter;
1313
import lombok.extern.slf4j.Slf4j;
14-
import org.apache.commons.configuration2.PropertiesConfiguration;
15-
import org.apache.commons.configuration2.builder.fluent.Configurations;
16-
import org.apache.commons.io.FileUtils;
1714
import org.apache.commons.lang3.StringUtils;
1815
import org.quartz.*;
1916
import org.quartz.impl.StdSchedulerFactory;
2017

2118
import java.io.File;
22-
import java.io.FileWriter;
23-
import java.util.function.Consumer;
19+
import java.util.Map;
2420

2521
/**
2622
* @ClassName: CmdToolService
@@ -35,7 +31,7 @@
3531
public class CmdToolService {
3632
private CmdToolController cmdToolController;
3733

38-
private String fileName = "cmdToolConfigure.properties";
34+
private String fileName = "cmdToolConfigure.json";
3935

4036
private SchedulerFactory sf = new StdSchedulerFactory();
4137

@@ -156,19 +152,16 @@ public void saveConfigure() throws Exception {
156152
}
157153

158154
public void saveConfigure(File file) throws Exception {
159-
FileUtils.touch(file);
160-
PropertiesConfiguration xmlConfigure = new Configurations().properties(file);
161-
xmlConfigure.clear();
155+
ConfigureUtil.getConfig(file).clear();
162156
for (int i = 0; i < cmdToolController.getTableData().size(); i++) {
163-
xmlConfigure.setProperty("tableBean" + i, cmdToolController.getTableData().get(i).getPropertys());
157+
ConfigureUtil.set(file, "tableBean" + i, cmdToolController.getTableData().get(i).getPropertys());
164158
}
165-
xmlConfigure.write(new FileWriter(file));
166159
TooltipUtil.showToast("保存配置成功,保存在：" + file.getPath());
167160
}
168161

169162
public void otherSaveConfigureAction() throws Exception {
170163
File file = FileChooserUtil.chooseSaveFile(fileName, new FileChooser.ExtensionFilter("All File", "*.*"),
171-
new FileChooser.ExtensionFilter("Properties", "*.properties"));
164+
new FileChooser.ExtensionFilter("Properties", "*.json"));
172165
if (file != null) {
173166
saveConfigure(file);
174167
TooltipUtil.showToast("保存配置成功,保存在：" + file.getPath());
@@ -182,13 +175,10 @@ public void loadingConfigure() {
182175
public void loadingConfigure(File file) {
183176
try {
184177
cmdToolController.getTableData().clear();
185-
PropertiesConfiguration xmlConfigure = new Configurations().properties(file);
186-
xmlConfigure.getKeys().forEachRemaining(new Consumer<String>() {
187-
@Override
188-
public void accept(String t) {
189-
cmdToolController.getTableData().add(new CmdToolTableBean(xmlConfigure.getString(t)));
190-
}
191-
});
178+
Map xmlConfigure = ConfigureUtil.getConfig(file);
179+
for (Object key : xmlConfigure.keySet()) {
180+
cmdToolController.getTableData().add(new CmdToolTableBean((String) xmlConfigure.get(key)));
181+
}
192182
} catch (Exception e) {
193183
try {
194184
log.error("加载配置失败：" + e.getMessage());
@@ -200,7 +190,7 @@ public void accept(String t) {
200190

201191
public void loadingConfigureAction() {
202192
File file = FileChooserUtil.chooseFile(new FileChooser.ExtensionFilter("All File", "*.*"),
203-
new FileChooser.ExtensionFilter("Properties", "*.properties"));
193+
new FileChooser.ExtensionFilter("Properties", "*.json"));
204194
if (file != null) {
205195
loadingConfigure(file);
206196
}

‎debugTools/x-FtpClientTool/src/main/java/com/xwintop/xJavaFxTool/services/debugTools/FtpClientToolService.java‎

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
import lombok.Getter;
1515
import lombok.Setter;
1616
import lombok.extern.slf4j.Slf4j;
17-
import org.apache.commons.configuration2.PropertiesConfiguration;
18-
import org.apache.commons.configuration2.builder.fluent.Configurations;
1917
import org.apache.commons.io.FileUtils;
2018
import org.apache.commons.lang3.StringUtils;
2119
import org.quartz.*;
@@ -24,9 +22,8 @@
2422
import java.io.ByteArrayInputStream;
2523
import java.io.File;
2624
import java.io.FileOutputStream;
27-
import java.io.FileWriter;
25+
import java.util.Map;
2826
import java.util.Properties;
29-
import java.util.function.Consumer;
3027

3128
/**
3229
* @ClassName: FtpClientToolService
@@ -41,7 +38,7 @@
4138
public class FtpClientToolService {
4239
private FtpClientToolController ftpClientToolController;
4340

44-
private String fileName = "ftpClientToolConfigure.properties";
41+
private String fileName = "ftpClientToolConfigure.json";
4542
private SchedulerFactory sf = new StdSchedulerFactory();
4643
private String schedulerKeyGroup = "ftpClientTool";
4744
private String schedulerKeyName = "ftpClientTool" + System.currentTimeMillis();
@@ -241,19 +238,16 @@ public void saveConfigure() throws Exception {
241238
}
242239

243240
public void saveConfigure(File file) throws Exception {
244-
FileUtils.touch(file);
245-
PropertiesConfiguration xmlConfigure = new Configurations().properties(file);
246-
xmlConfigure.clear();
241+
ConfigureUtil.getConfig(file).clear();
247242
for (int i = 0; i < ftpClientToolController.getTableData().size(); i++) {
248-
xmlConfigure.setProperty("tableBean" + i, ftpClientToolController.getTableData().get(i).getPropertys());
243+
ConfigureUtil.set(file, "tableBean" + i, ftpClientToolController.getTableData().get(i).getPropertys());
249244
}
250-
xmlConfigure.write(new FileWriter(file));
251245
TooltipUtil.showToast("保存配置成功,保存在：" + file.getPath());
252246
}
253247

254248
public void otherSaveConfigureAction() throws Exception {
255249
File file = FileChooserUtil.chooseSaveFile(fileName, new FileChooser.ExtensionFilter("All File", "*.*"),
256-
new FileChooser.ExtensionFilter("Properties", "*.properties"));
250+
new FileChooser.ExtensionFilter("Properties", "*.json"));
257251
if (file != null) {
258252
saveConfigure(file);
259253
TooltipUtil.showToast("保存配置成功,保存在：" + file.getPath());
@@ -267,13 +261,10 @@ public void loadingConfigure() {
267261
public void loadingConfigure(File file) {
268262
try {
269263
ftpClientToolController.getTableData().clear();
270-
PropertiesConfiguration xmlConfigure = new Configurations().properties(file);
271-
xmlConfigure.getKeys().forEachRemaining(new Consumer<String>() {
272-
@Override
273-
public void accept(String t) {
274-
ftpClientToolController.getTableData().add(new FtpClientToolTableBean(xmlConfigure.getString(t)));
275-
}
276-
});
264+
Map xmlConfigure = ConfigureUtil.getConfig(file);
265+
for (Object key : xmlConfigure.keySet()) {
266+
ftpClientToolController.getTableData().add(new FtpClientToolTableBean((String) xmlConfigure.get(key)));
267+
}
277268
} catch (Exception e) {
278269
try {
279270
log.error("加载配置失败：", e);
@@ -285,7 +276,7 @@ public void accept(String t) {
285276

286277
public void loadingConfigureAction() {
287278
File file = FileChooserUtil.chooseFile(new FileChooser.ExtensionFilter("All File", "*.*"),
288-
new FileChooser.ExtensionFilter("Properties", "*.properties"));
279+
new FileChooser.ExtensionFilter("Properties", "*.json"));
289280
if (file != null) {
290281
loadingConfigure(file);
291282
}

‎debugTools/x-FtpServer/src/main/java/com/xwintop/xJavaFxTool/services/debugTools/FtpServerService.java‎

Lines changed: 15 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
import com.xwintop.xcore.util.ConfigureUtil;
66
import com.xwintop.xcore.util.javafx.FileChooserUtil;
77
import com.xwintop.xcore.util.javafx.TooltipUtil;
8-
9-
import org.apache.commons.configuration2.PropertiesConfiguration;
10-
import org.apache.commons.configuration2.builder.fluent.Configurations;
11-
import org.apache.commons.io.FileUtils;
8+
import javafx.stage.FileChooser;
9+
import lombok.Getter;
10+
import lombok.Setter;
11+
import lombok.extern.slf4j.Slf4j;
1212
import org.apache.ftpserver.ConnectionConfig;
1313
import org.apache.ftpserver.FtpServer;
1414
import org.apache.ftpserver.FtpServerFactory;
@@ -20,15 +20,9 @@
2020
import org.apache.ftpserver.usermanager.impl.WritePermission;
2121

2222
import java.io.File;
23-
import java.io.FileWriter;
2423
import java.util.ArrayList;
2524
import java.util.List;
26-
import java.util.function.Consumer;
27-
28-
import javafx.stage.FileChooser;
29-
import lombok.Getter;
30-
import lombok.Setter;
31-
import lombok.extern.slf4j.Slf4j;
25+
import java.util.Map;
3226

3327
/**
3428
* @ClassName: FtpServerService
@@ -102,44 +96,38 @@ public boolean stopFtpServerAction() {
10296
}
10397

10498
public void saveConfigure() throws Exception {
105-
saveConfigure(ConfigureUtil.getConfigureFile("ftpServerConfigure.properties"));
99+
saveConfigure(ConfigureUtil.getConfigureFile("ftpServerConfigure.json"));
106100
}
107101

108102
public void saveConfigure(File file) throws Exception {
109-
FileUtils.touch(file);
110-
PropertiesConfiguration xmlConfigure = new Configurations().properties(file);
111-
xmlConfigure.clear();
103+
ConfigureUtil.getConfig(file).clear();
112104
for (int i = 0; i < ftpServerController.getTableData().size(); i++) {
113-
xmlConfigure.setProperty("tableBean" + i, ftpServerController.getTableData().get(i).getPropertys());
105+
ConfigureUtil.set(file, "tableBean" + i, ftpServerController.getTableData().get(i).getPropertys());
114106
}
115-
xmlConfigure.write(new FileWriter(file));
116107
TooltipUtil.showToast("保存配置成功,保存在：" + file.getPath());
117108
}
118109

119110
public void otherSaveConfigureAction() throws Exception {
120111
String fileName = "ftpServerConfigure.properties";
121112
File file = FileChooserUtil.chooseSaveFile(fileName, new FileChooser.ExtensionFilter("All File", "*.*"),
122-
new FileChooser.ExtensionFilter("Properties", "*.properties"));
113+
new FileChooser.ExtensionFilter("Properties", "*.json"));
123114
if (file != null) {
124115
saveConfigure(file);
125116
TooltipUtil.showToast("保存配置成功,保存在：" + file.getPath());
126117
}
127118
}
128119

129120
public void loadingConfigure() {
130-
loadingConfigure(ConfigureUtil.getConfigureFile("ftpServerConfigure.properties"));
121+
loadingConfigure(ConfigureUtil.getConfigureFile("ftpServerConfigure.json"));
131122
}
132123

133124
public void loadingConfigure(File file) {
134125
try {
135126
ftpServerController.getTableData().clear();
136-
PropertiesConfiguration xmlConfigure = new Configurations().properties(file);
137-
xmlConfigure.getKeys().forEachRemaining(new Consumer<String>() {
138-
@Override
139-
public void accept(String t) {
140-
ftpServerController.getTableData().add(new FtpServerTableBean(xmlConfigure.getString(t)));
141-
}
142-
});
127+
Map xmlConfigure = ConfigureUtil.getConfig(file);
128+
for (Object key : xmlConfigure.keySet()) {
129+
ftpServerController.getTableData().add(new FtpServerTableBean((String) xmlConfigure.get(key)));
130+
}
143131
} catch (Exception e) {
144132
try {
145133
log.error("加载配置失败：" + e.getMessage());
@@ -151,7 +139,7 @@ public void accept(String t) {
151139

152140
public void loadingConfigureAction() {
153141
File file = FileChooserUtil.chooseFile(new FileChooser.ExtensionFilter("All File", "*.*"),
154-
new FileChooser.ExtensionFilter("Properties", "*.properties"));
142+
new FileChooser.ExtensionFilter("Properties", "*.json"));
155143
if (file != null) {
156144
loadingConfigure(file);
157145
}

0 commit comments

Comments
 (0)