Skip to content

Commit 38d5f2a

Browse files
xwintopxwintop
committed
修改打印日志。
1 parent 689b179 commit 38d5f2a

18 files changed

Lines changed: 583 additions & 617 deletions

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ private void initView() {
8585
}
8686
}
8787
} catch (Exception e) {
88-
log.error(e.getMessage());
88+
log.error("加载菜单失败", e);
8989
}
9090
if (toolConfig.getIsMenu()) {
9191
Menu menu = new Menu(toolConfig.getTitle());

‎src/main/java/com/xwintop/xJavaFxTool/controller/debugTools/CmdToolController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ private void initEvent() {
180180
try {
181181
saveConfigure(null);
182182
} catch (Exception e) {
183-
log.error(e.getMessage());
183+
log.error("保存配置失败",e);
184184
}
185185
});
186186
tableViewMain.setOnMouseClicked(event -> {

‎src/main/java/com/xwintop/xJavaFxTool/controller/debugTools/FtpClientToolController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ private void initEvent() {
142142
try {
143143
saveConfigure(null);
144144
} catch (Exception e) {
145-
log.error(e.getMessage());
145+
log.error("报错配置失败", e);
146146
}
147147
});
148148
tableViewMain.setOnMouseClicked(event -> {

‎src/main/java/com/xwintop/xJavaFxTool/controller/debugTools/ScriptEngineToolController.java‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
import java.net.URL;
2626
import java.util.ResourceBundle;
27+
2728
/**
2829
* @ClassName: ScriptEngineToolController
2930
* @Description: 脚本引擎调试工具类
@@ -37,9 +38,9 @@
3738
public class ScriptEngineToolController extends ScriptEngineToolView {
3839
private ScriptEngineToolService scriptEngineToolService = new ScriptEngineToolService(this);
3940
private ObservableList<ScriptEngineToolTableBean> tableData = FXCollections.observableArrayList();
40-
private String[] quartzChoiceBoxStrings = new String[] { "简单表达式", "Cron表达式" };
41-
private String[] typeChoiceBoxStrings = new String[] { "JavaScript脚本", "JavaScript脚本文件",
42-
"Groovy脚本", "Groovy脚本文件", "Python脚本", "Python脚本文件", "Lua脚本", "Lua脚本文件" };
41+
private String[] quartzChoiceBoxStrings = new String[]{"简单表达式", "Cron表达式"};
42+
private String[] typeChoiceBoxStrings = new String[]{"JavaScript脚本", "JavaScript脚本文件",
43+
"Groovy脚本", "Groovy脚本文件", "Python脚本", "Python脚本文件", "Lua脚本", "Lua脚本文件"};
4344

4445
@Override
4546
public void initialize(URL location, ResourceBundle resources) {
@@ -172,7 +173,7 @@ private void initEvent() {
172173
try {
173174
saveConfigure(null);
174175
} catch (Exception e) {
175-
log.error(e.getMessage());
176+
log.error("保存配置失败", e);
176177
}
177178
});
178179
tableViewMain.setOnMouseClicked(event -> {
@@ -213,7 +214,7 @@ private void initService() {
213214

214215
@FXML
215216
private void addItemAction(ActionEvent event) {
216-
String id = "x"+String.valueOf(System.currentTimeMillis()).substring(7);
217+
String id = "x" + String.valueOf(System.currentTimeMillis()).substring(7);
217218
tableData.add(new ScriptEngineToolTableBean(id, isEnabledCheckBox.isSelected(),
218219
scriptTextField.getText(), typeChoiceBox.getValue(), parameterTextField.getText(), false, " ", " "));
219220
}
@@ -235,15 +236,15 @@ private void loadingConfigureAction(ActionEvent event) {
235236

236237
@FXML
237238
private void runQuartzAction(ActionEvent event) throws Exception {
238-
if("定时运行".equals(runQuartzButton.getText())){
239+
if ("定时运行".equals(runQuartzButton.getText())) {
239240
boolean isTrue = scriptEngineToolService.runQuartzAction(quartzChoiceBox.getValue(), cronTextField.getText(), intervalSpinner.getValue(),
240241
repeatCountSpinner.getValue());
241-
if(isTrue){
242+
if (isTrue) {
242243
runQuartzButton.setText("停止运行");
243244
}
244-
}else{
245+
} else {
245246
boolean isTrue = scriptEngineToolService.stopQuartzAction();
246-
if(isTrue){
247+
if (isTrue) {
247248
runQuartzButton.setText("定时运行");
248249
}
249250
}

‎src/main/java/com/xwintop/xJavaFxTool/controller/debugTools/redisTool/RedisToolController.java‎

Lines changed: 77 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22

33
import com.xwintop.xJavaFxTool.services.debugTools.redisTool.RedisToolService;
44
import com.xwintop.xJavaFxTool.view.debugTools.redisTool.RedisToolView;
5-
6-
import java.net.URL;
7-
import java.util.ResourceBundle;
8-
95
import javafx.beans.value.ChangeListener;
106
import javafx.beans.value.ObservableValue;
117
import javafx.event.ActionEvent;
@@ -21,6 +17,9 @@
2117
import lombok.Setter;
2218
import lombok.extern.slf4j.Slf4j;
2319

20+
import java.net.URL;
21+
import java.util.ResourceBundle;
22+
2423
/**
2524
* @ClassName: RedisToolController
2625
* @Description: Redis工具
@@ -32,41 +31,41 @@
3231
@Setter
3332
@Slf4j
3433
public class RedisToolController extends RedisToolView {
35-
private RedisToolService redisToolService = new RedisToolService(this);
34+
private RedisToolService redisToolService = new RedisToolService(this);
3635

37-
@Override
38-
public void initialize(URL location, ResourceBundle resources) {
39-
initView();
40-
initEvent();
41-
initService();
42-
}
36+
@Override
37+
public void initialize(URL location, ResourceBundle resources) {
38+
initView();
39+
initEvent();
40+
initService();
41+
}
4342

44-
private void initView() {
45-
TreeItem<String> treeItem = new TreeItem<String>("Redis服务器");
46-
redisServiceTreeView.setRoot(treeItem);
47-
}
43+
private void initView() {
44+
TreeItem<String> treeItem = new TreeItem<String>("Redis服务器");
45+
redisServiceTreeView.setRoot(treeItem);
46+
}
4847

49-
private void initEvent() {
50-
redisServiceTreeView.setOnMouseClicked(event -> {
48+
private void initEvent() {
49+
redisServiceTreeView.setOnMouseClicked(event -> {
5150
// System.out.println(event.getTarget().toString());
52-
if (event.getClickCount() == 2) {
53-
if (event.getTarget() instanceof TreeItem) {
54-
TreeItem<String> eventTarget = (TreeItem<String>) event.getTarget();
55-
System.out.println(eventTarget.getValue());
56-
return;
57-
}
58-
}
59-
if (event.getButton() == MouseButton.SECONDARY) {
60-
redisToolService.addServerMenuItem();
61-
EventTarget eventTarget = event.getTarget();
62-
if (eventTarget instanceof TreeItem) {
63-
// TreeViewSkin<String> eventTarget = (TreeViewSkin<String>) event.getTarget();
64-
// if("Redis服务器".equals(eventTarget.getValue())) {
51+
if (event.getClickCount() == 2) {
52+
if (event.getTarget() instanceof TreeItem) {
53+
TreeItem<String> eventTarget = (TreeItem<String>) event.getTarget();
54+
System.out.println(eventTarget.getValue());
55+
return;
56+
}
57+
}
58+
if (event.getButton() == MouseButton.SECONDARY) {
59+
redisToolService.addServerMenuItem();
60+
EventTarget eventTarget = event.getTarget();
61+
if (eventTarget instanceof TreeItem) {
62+
// TreeViewSkin<String> eventTarget = (TreeViewSkin<String>) event.getTarget();
63+
// if("Redis服务器".equals(eventTarget.getValue())) {
6564
// redisToolService.addServerMenuItem();
66-
// }
67-
}
68-
} else if (event.getButton() == MouseButton.PRIMARY) {
69-
if (event.getTarget() instanceof TreeItem) {
65+
// }
66+
}
67+
} else if (event.getButton() == MouseButton.PRIMARY) {
68+
if (event.getTarget() instanceof TreeItem) {
7069
// TreeItem<String> eventTarget = (TreeItem<String>) event.getTarget();
7170
// String name = eventTarget.getValue();
7271
// if (name.startsWith("db")) {
@@ -78,60 +77,60 @@ private void initEvent() {
7877
// System.out.println(key);
7978
// }
8079
// }
81-
}
82-
}
83-
});
84-
redisServiceTreeView.getSelectionModel().selectedItemProperty()
85-
.addListener(new ChangeListener<TreeItem<String>>() {
86-
@Override
87-
public void changed(ObservableValue<? extends TreeItem<String>> observable,
88-
TreeItem<String> oldValue, TreeItem<String> newValue) {
89-
String name = newValue.getValue();
90-
if (name.startsWith("db")) {
80+
}
81+
}
82+
});
83+
redisServiceTreeView.getSelectionModel().selectedItemProperty()
84+
.addListener(new ChangeListener<TreeItem<String>>() {
85+
@Override
86+
public void changed(ObservableValue<? extends TreeItem<String>> observable,
87+
TreeItem<String> oldValue, TreeItem<String> newValue) {
88+
String name = newValue.getValue();
89+
if (name.startsWith("db")) {
9190
// RedisUtil redisUtil = redisToolService.getJedisMap().get(newValue.getParent().getValue());
92-
int id = Integer.parseInt(name.substring(2, name.indexOf("(")));
91+
int id = Integer.parseInt(name.substring(2, name.indexOf("(")));
9392
// redisUtil.setId(id);
9493
// Set<String> nodekeys = redisUtil.getListKeys();
9594
// for (String key : nodekeys) {
9695
// System.out.println(key);
9796
// }
98-
redisToolService.addDataServiceTabPane(newValue.getParent().getValue(),id);
99-
}
100-
}
101-
});
102-
}
97+
redisToolService.addDataServiceTabPane(newValue.getParent().getValue(), id);
98+
}
99+
}
100+
});
101+
}
103102

104-
private void initService() {
105-
try {
106-
redisToolService.addServiceAddress("localhost", "localhost", 6379, null);
107-
}catch (Exception e){
108-
log.error(e.getMessage());
109-
}
110-
redisServiceTreeView.getRoot().setExpanded(true);
111-
}
103+
private void initService() {
104+
try {
105+
redisToolService.addServiceAddress("localhost", "localhost", 6379, null);
106+
} catch (Exception e) {
107+
log.error("初始化redis失败", e);
108+
}
109+
redisServiceTreeView.getRoot().setExpanded(true);
110+
}
112111

113-
@FXML
114-
private void treeLeftAction(ActionEvent event) {
115-
}
112+
@FXML
113+
private void treeLeftAction(ActionEvent event) {
114+
}
116115

117-
@FXML
118-
private void treeRightAction(ActionEvent event) {
119-
}
116+
@FXML
117+
private void treeRightAction(ActionEvent event) {
118+
}
120119

121-
@FXML
122-
private void treeUpAction(ActionEvent event) {
123-
}
120+
@FXML
121+
private void treeUpAction(ActionEvent event) {
122+
}
124123

125-
@FXML
126-
private void treeRefurbishAction(ActionEvent event) {
127-
redisToolService.reloadServiceAddress();
128-
}
124+
@FXML
125+
private void treeRefurbishAction(ActionEvent event) {
126+
redisToolService.reloadServiceAddress();
127+
}
129128

130-
private TextField createTextField(String textValue, GridPane gridPane, String label, int row) {
131-
TextField textField = new TextField(textValue);
132-
GridPane.setHgrow(textField, Priority.ALWAYS);
133-
gridPane.add(new Label(label), 0, row);
134-
gridPane.add(textField, 1, row);
135-
return textField;
136-
}
129+
private TextField createTextField(String textValue, GridPane gridPane, String label, int row) {
130+
TextField textField = new TextField(textValue);
131+
GridPane.setHgrow(textField, Priority.ALWAYS);
132+
gridPane.add(new Label(label), 0, row);
133+
gridPane.add(textField, 1, row);
134+
return textField;
135+
}
137136
}

‎src/main/java/com/xwintop/xJavaFxTool/controller/developTools/AsciiPicToolController.java‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,22 @@
11
package com.xwintop.xJavaFxTool.controller.developTools;
22

3-
import com.xwintop.xJavaFxTool.view.developTools.AsciiPicToolView;
43
import com.xwintop.xJavaFxTool.services.developTools.AsciiPicToolService;
4+
import com.xwintop.xJavaFxTool.view.developTools.AsciiPicToolView;
55
import com.xwintop.xcore.util.javafx.FileChooserUtil;
66
import com.xwintop.xcore.util.javafx.ImageUtil;
77
import com.xwintop.xcore.util.javafx.TooltipUtil;
8-
import javafx.beans.value.ChangeListener;
98
import javafx.beans.value.ObservableValue;
10-
import javafx.embed.swing.SwingFXUtils;
9+
import javafx.event.ActionEvent;
10+
import javafx.fxml.FXML;
1111
import javafx.scene.image.Image;
1212
import lombok.Getter;
1313
import lombok.Setter;
1414
import lombok.extern.slf4j.Slf4j;
1515

1616
import java.io.File;
17-
import java.io.IOException;
1817
import java.net.URL;
1918
import java.util.ResourceBundle;
2019

21-
import javafx.event.ActionEvent;
22-
import javafx.fxml.FXML;
23-
import org.apache.commons.imaging.ImageReadException;
24-
import org.apache.commons.imaging.Imaging;
25-
2620
/**
2721
* @ClassName: AsciiPicToolController
2822
* @Description: 图片转ascii
@@ -63,7 +57,7 @@ private void initEvent() {
6357
imageImageView.setFitWidth(image.getWidth());
6458
imageImageView.setFitHeight(image.getHeight());
6559
} catch (Exception e) {
66-
log.error(e.getMessage());
60+
log.error("图片加载失败：", e);
6761
TooltipUtil.showToast("图片加载失败：" + e.getMessage());
6862
}
6963

@@ -100,7 +94,7 @@ private void saveImageAction(ActionEvent event) {
10094
}
10195

10296
@FXML
103-
private void saveImageToExcelAction(ActionEvent event) throws Exception{
97+
private void saveImageToExcelAction(ActionEvent event) throws Exception {
10498
asciiPicToolService.saveImageToExcelAction();
10599
}
106100
}

‎src/main/java/com/xwintop/xJavaFxTool/controller/littleTools/EmailToolController.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public class EmailToolController extends EmailToolView {
4242
private EmailToolService emailToolService = new EmailToolService(this);
4343
private ObservableList<EmailToolTableBean> tableData = FXCollections.observableArrayList();
4444
private ObservableList<Map<String, String>> attachPathTableData = FXCollections.observableArrayList();
45-
private String[] quartzChoiceBoxStrings = new String[] { "简单表达式", "Cron表达式" };
45+
private String[] quartzChoiceBoxStrings = new String[]{"简单表达式", "Cron表达式"};
4646
private String[] hostNameComboBoxStrings = new String[]{"smtp.163.com", "smtp.gmail.com", "smtp.aliyun.com", "smtp.exmail.qq.com", "smtp.qq.com", "smtp.139.com", "smtp.189.cn"};
4747

4848
@Override
@@ -121,12 +121,12 @@ private void initEvent() {
121121
FileChooserUtil.setOnDrag(attachPathTextField, FileChooserUtil.FileType.FILE);
122122
tableData.addListener((ListChangeListener.Change<? extends EmailToolTableBean> tableBean) -> {
123123
try {
124-
for(int i=0;i<tableData.size();i++){
125-
tableData.get(i).setOrder(i+1);
124+
for (int i = 0; i < tableData.size(); i++) {
125+
tableData.get(i).setOrder(i + 1);
126126
}
127127
saveConfigure(null);
128128
} catch (Exception e) {
129-
log.error(e.getMessage());
129+
log.error("保存配置失败", e);
130130
}
131131
});
132132
quartzChoiceBox.valueProperty().addListener(new ChangeListener<String>() {
@@ -164,8 +164,8 @@ public void changed(ObservableValue<? extends String> observable, String oldValu
164164
if (event.getButton() == MouseButton.SECONDARY) {
165165
MenuItem menu_Copy = new MenuItem("复制选中行");
166166
menu_Copy.setOnAction(event1 -> {
167-
Map<String,String> tableBean = attachPathTableView.getSelectionModel().getSelectedItem();
168-
Map<String,String> tableBean2 = new HashMap<>(tableBean);
167+
Map<String, String> tableBean = attachPathTableView.getSelectionModel().getSelectedItem();
168+
Map<String, String> tableBean2 = new HashMap<>(tableBean);
169169
attachPathTableData.add(attachPathTableView.getSelectionModel().getSelectedIndex(), tableBean2);
170170
});
171171
MenuItem menu_Remove = new MenuItem("删除选中行");
@@ -186,7 +186,7 @@ private void initService() {
186186

187187
@FXML
188188
private void addItemAction(ActionEvent event) {
189-
tableData.add(new EmailToolTableBean(tableData.size()+1,isEnabledCheckBox.isSelected(), toEmailTextField.getText(), toEmailNameTextField.getText(), ""));
189+
tableData.add(new EmailToolTableBean(tableData.size() + 1, isEnabledCheckBox.isSelected(), toEmailTextField.getText(), toEmailNameTextField.getText(), ""));
190190
}
191191

192192
@FXML
@@ -240,10 +240,10 @@ private void runAllAction(ActionEvent event) {
240240

241241
@FXML
242242
private void addAttachPathAction(ActionEvent event) {
243-
Map<String,String> map = new HashMap<>();
244-
map.put("attachPath",attachPathTextField.getText());
245-
map.put("attachName",attachNameTableColumn.getText());
246-
map.put("attachDescription",attachDescriptionTableColumn.getText());
243+
Map<String, String> map = new HashMap<>();
244+
map.put("attachPath", attachPathTextField.getText());
245+
map.put("attachName", attachNameTableColumn.getText());
246+
map.put("attachDescription", attachDescriptionTableColumn.getText());
247247
attachPathTableData.add(map);
248248
}
249249

0 commit comments

Comments
 (0)