Skip to content

Commit 5da8709

Browse files
committed
1.修改依赖包版本
1 parent 0669243 commit 5da8709

7 files changed

Lines changed: 15 additions & 10 deletions

File tree

build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ allprojects {
3232
enabled = false
3333
}
3434
repositories {
35+
maven {
36+
allowInsecureProtocol = true
37+
url 'https://repo1.maven.org/maven2/'
38+
}
3539
maven {
3640
allowInsecureProtocol = true
3741
url 'https://maven.aliyun.com/repository/public'

debugTools/x-ZookeeperTool/src/main/java/com/xwintop/xJavaFxTool/controller/debugTools/ZookeeperToolController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
@Slf4j
3232
public class ZookeeperToolController extends ZookeeperToolView {
3333
private ZookeeperToolService zookeeperToolService = new ZookeeperToolService(this);
34-
TextFieldInputHistoryDialog textFieldInputHistoryDialog = new TextFieldInputHistoryDialog(ConfigureUtil.getConfigurePath("zookeeperToolConfigure.properties"), "zkServers", "connectionTimeout");
34+
TextFieldInputHistoryDialog textFieldInputHistoryDialog = new TextFieldInputHistoryDialog(ConfigureUtil.getConfigurePath("zookeeperToolConfigure.json"), "zkServers", "connectionTimeout");
3535

3636
@Override
3737
public void initialize(URL location, ResourceBundle resources) {

developTools/x-JsonConvertTool/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ dependencies {
22
// implementation 'com.xwintop:xcore:0.0.6'
33
api project(':xcore')
44
implementation 'commons-betwixt:commons-betwixt:0.8'
5+
implementation 'org.yaml:snakeyaml:1.30'
56
}
67

78
group = 'com.xwintop'

littleTools/x-Mp3ConvertTool/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
dependencies {
22
// implementation 'com.xwintop:xcore:0.0.6'
33
api project(':xcore')
4-
implementation 'net.jthink:jaudiotagger:2.2.6-PATHRIK'
4+
implementation 'net.jthink:jaudiotagger:3.0.1'
55
}
66

77
group = 'com.xwintop'

xcore/build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ dependencies {
44
// api 'jaxen:jaxen:1.2.0'
55
api 'org.quartz-scheduler:quartz:2.3.2'
66
api 'org.controlsfx:controlsfx:11.2.0'
7-
api 'com.jfoenix:jfoenix:9.0.10'
7+
api 'org.rationalityfrontline.workaround:jfoenix:21.0.0'
88
// api 'commons-codec:commons-codec:1.16.0'
99
// api 'org.apache.commons:commons-configuration2:2.9.0'
1010
api 'commons-io:commons-io:2.15.1'
@@ -14,7 +14,6 @@ dependencies {
1414
// api 'org.apache.commons:commons-imaging:1.0-alpha3'
1515
api 'cn.hutool:hutool-all:5.8.26'
1616
api 'com.alibaba.fastjson2:fastjson2:2.0.47'
17-
api 'org.yaml:snakeyaml:1.30'
1817
}
1918

2019
group = 'com.gitee.xwintop'

xcore/src/main/java/com/xwintop/xcore/util/javafx/TextFieldInputHistoryDialog.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.xwintop.xcore.util.javafx;
22

3+
import com.alibaba.fastjson2.JSON;
4+
import com.alibaba.fastjson2.JSONWriter;
35
import javafx.collections.FXCollections;
46
import javafx.collections.ObservableList;
57
import javafx.scene.control.*;
@@ -9,7 +11,6 @@
911
import lombok.extern.slf4j.Slf4j;
1012
import org.apache.commons.io.FileUtils;
1113
import org.apache.commons.lang3.StringUtils;
12-
import org.yaml.snakeyaml.Yaml;
1314

1415
import java.io.File;
1516
import java.util.HashMap;
@@ -31,8 +32,11 @@
3132
@Slf4j
3233
public class TextFieldInputHistoryDialog {
3334
private ObservableList<Map<String, String>> tableData = FXCollections.observableArrayList();
35+
3436
private String saveFilePath = null;
37+
3538
private String[] tableColumns = null;
39+
3640
private ContextMenu contextMenu = new ContextMenu();
3741

3842
public TextFieldInputHistoryDialog(String saveFilePath, String... tableColumns) {
@@ -70,8 +74,7 @@ public void loadingConfigure() {
7074
if (!CONFIG_FILE.exists()) {
7175
FileUtils.touch(CONFIG_FILE);
7276
}
73-
Yaml yaml = new Yaml();
74-
List<Map<String, String>> list = yaml.load(FileUtils.readFileToString(CONFIG_FILE, "UTF-8"));
77+
List<Map<String, String>> list = JSON.parseObject(FileUtils.readFileToString(CONFIG_FILE, "UTF-8"), List.class);
7578
if (list != null) {
7679
this.tableData.addAll(list);
7780
}
@@ -85,8 +88,7 @@ public void saveConfigure() {
8588
if (StringUtils.isNotEmpty(saveFilePath)) {
8689
try {
8790
File CONFIG_FILE = new File(saveFilePath);
88-
Yaml yaml = new Yaml();
89-
FileUtils.writeStringToFile(CONFIG_FILE, yaml.dump(this.tableData), "UTF-8");
91+
FileUtils.writeStringToFile(CONFIG_FILE, JSON.toJSONString(this.tableData, JSONWriter.Feature.PrettyFormat, JSONWriter.Feature.WriteMapNullValue), "UTF-8");
9092
TooltipUtil.showToast("保存配置成功,保存在:" + CONFIG_FILE.getPath());
9193
} catch (Exception e) {
9294
log.error("保存配置失败", e);

xcore/src/main/java/module-info.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
requires com.jfoenix;
1818
requires transitive static lombok;
1919
requires transitive org.slf4j;
20-
requires org.yaml.snakeyaml;
2120
requires quartz;
2221
requires transitive javafx.swing;
2322
requires org.controlsfx.controls;

0 commit comments

Comments
 (0)