更新

Author: easepan

pom.xml

@@ -53,6 +53,11 @@
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>com.zhazhapan</groupId>
+			<artifactId>util</artifactId>
+			<version>1.0.0</version>
+		</dependency>
 	</dependencies>
 
 	<build>

src/main/java/com/zhazhapan/qiniu/Downloader.java

@@ -15,8 +15,8 @@
 import com.zhazhapan.qiniu.config.ConfigLoader;
 import com.zhazhapan.qiniu.controller.MainWindowController;
 import com.zhazhapan.qiniu.modules.constant.Values;
-import com.zhazhapan.qiniu.util.Checker;
-import com.zhazhapan.qiniu.util.Formatter;
+import com.zhazhapan.util.Checker;
+import com.zhazhapan.util.Formatter;
 import com.zhazhapan.qiniu.view.Dialogs;
 
 import javafx.application.Platform;

src/main/java/com/zhazhapan/qiniu/FileExecutor.java

@@ -13,7 +13,7 @@
 import org.apache.log4j.Logger;
 
 import com.zhazhapan.qiniu.modules.constant.Values;
-import com.zhazhapan.qiniu.util.Checker;
+import com.zhazhapan.util.Checker;
 import com.zhazhapan.qiniu.view.Dialogs;
 
 /**

src/main/java/com/zhazhapan/qiniu/QiManager.java

@@ -23,8 +23,8 @@
 import com.zhazhapan.qiniu.controller.MainWindowController;
 import com.zhazhapan.qiniu.model.FileInfo;
 import com.zhazhapan.qiniu.modules.constant.Values;
-import com.zhazhapan.qiniu.util.Checker;
-import com.zhazhapan.qiniu.util.Formatter;
+import com.zhazhapan.util.Checker;
+import com.zhazhapan.util.Formatter;
 import com.zhazhapan.qiniu.view.Dialogs;
 
 import javafx.application.Platform;

src/main/java/com/zhazhapan/qiniu/config/ConfigLoader.java

@@ -22,8 +22,8 @@
 import com.zhazhapan.qiniu.controller.MainWindowController;
 import com.zhazhapan.qiniu.model.Key;
 import com.zhazhapan.qiniu.modules.constant.Values;
-import com.zhazhapan.qiniu.util.Checker;
-import com.zhazhapan.qiniu.util.Formatter;
+import com.zhazhapan.util.Checker;
+import com.zhazhapan.util.Formatter;
 import com.zhazhapan.qiniu.view.Dialogs;
 
 import javafx.application.Platform;

src/main/java/com/zhazhapan/qiniu/controller/MainWindowController.java

@@ -27,9 +27,9 @@
 import com.zhazhapan.qiniu.config.QiConfiger;
 import com.zhazhapan.qiniu.model.FileInfo;
 import com.zhazhapan.qiniu.modules.constant.Values;
-import com.zhazhapan.qiniu.util.Checker;
-import com.zhazhapan.qiniu.util.Formatter;
-import com.zhazhapan.qiniu.util.Utils;
+import com.zhazhapan.util.Checker;
+import com.zhazhapan.util.Formatter;
+import com.zhazhapan.util.Utils;
 import com.zhazhapan.qiniu.view.Dialogs;
 
 import javafx.application.Platform;
@@ -206,7 +206,7 @@ private void initialize() {
 		// 设置默认的开始和结束日期，并调用dateChange事件刷新数据
 		endDate.setValue(LocalDate.now());
 		long startTime = System.currentTimeMillis() - Values.DATE_SPAN_OF_THIRTY_ONE;
-		LocalDate endDate = Utils.dateToLocalDate(new Date(startTime));
+		LocalDate endDate = Formatter.dateToLocalDate(new Date(startTime));
 		startDate.setValue(endDate);
 		// 设置BucketChoiceComboBox改变事件，改变后并配置新的上传环境
 		bucketChoiceCombo.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
@@ -259,8 +259,8 @@ public void dragFileDropped(DragEvent event) {
 	 * 开始日期或结束日期改变，刷新流量、带宽统计
 	 */
 	public void dateChange() {
-		Date start = Utils.localDateToDate(startDate.getValue());
-		Date end = Utils.localDateToDate(endDate.getValue());
+		Date start = Formatter.localDateToDate(startDate.getValue());
+		Date end = Formatter.localDateToDate(endDate.getValue());
 		String fromDate = Formatter.dateToString(start);
 		String toDate = Formatter.dateToString(end);
 		String domain = bucketDomainTextField.getText();

src/main/java/com/zhazhapan/qiniu/view/Dialogs.java

@@ -14,8 +14,8 @@
 import com.zhazhapan.qiniu.config.ConfigLoader;
 import com.zhazhapan.qiniu.controller.MainWindowController;
 import com.zhazhapan.qiniu.modules.constant.Values;
-import com.zhazhapan.qiniu.util.Checker;
-import com.zhazhapan.qiniu.util.Utils;
+import com.zhazhapan.util.Checker;
+import com.zhazhapan.util.Utils;
 
 import javafx.application.Platform;
 import javafx.geometry.Insets;

src/main/java/com/zhazhapan/qiniu/view/MainWindow.java

@@ -14,8 +14,8 @@
 import com.zhazhapan.qiniu.config.ConfigLoader;
 import com.zhazhapan.qiniu.controller.MainWindowController;
 import com.zhazhapan.qiniu.modules.constant.Values;
-import com.zhazhapan.qiniu.util.Checker;
-import com.zhazhapan.qiniu.util.Formatter;
+import com.zhazhapan.util.Checker;
+import com.zhazhapan.util.Formatter;
 
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;

src/test/java/com/zhazhapan/qiniu/FormatterTest.java

@@ -5,7 +5,7 @@
 
 import org.junit.Test;
 
-import com.zhazhapan.qiniu.util.Formatter;
+import com.zhazhapan.util.Formatter;
 
 /**
  * @author pantao

src/test/java/com/zhazhapan/qiniu/GsonTest.java

@@ -9,7 +9,7 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
-import com.zhazhapan.qiniu.util.Checker;
+import com.zhazhapan.util.Checker;
 
 /**
  * @author pantao