修改文件上传方式，添加空间数据统计

Author: easepan

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017 潘滔
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -8,7 +8,7 @@
 
 **1. 主窗口界面：**
 
-![程序主界面](http://img.blog.csdn.net/20171015221834257?watermark/2/text/aHR0cDovL2Jsb2cuY3Nkbi5uZXQvcXFfMjY5NTQ3NzM=/font/5a6L5L2T/fontsize/400/fill/I0JBQkFCMA==/dissolve/70/gravity/SouthEast)
+![程序主界面](http://img.blog.csdn.net/20171019104749116?watermark/2/text/aHR0cDovL2Jsb2cuY3Nkbi5uZXQvcXFfMjY5NTQ3NzM=/font/5a6L5L2T/fontsize/400/fill/I0JBQkFCMA==/dissolve/70/gravity/SouthEast)
 
 - 设置文件前缀
 
@@ -26,7 +26,7 @@
 
     ![重置密钥](http://img.blog.csdn.net/20171017123714044?watermark/2/text/aHR0cDovL2Jsb2cuY3Nkbi5uZXQvcXFfMjY5NTQ3NzM=/font/5a6L5L2T/fontsize/400/fill/I0JBQkFCMA==/dissolve/70/gravity/SouthEast)
 
-    > 说明：出于安全考虑，建议您周期性地更换密钥。[密钥安全使用须知](https://developer.qiniu.com/kodo/kb/1334/the-access-key-secret-key-encryption-key-safe-use-instructions)
+    > 说明：出于安全考虑，建议您周期性地更换密钥。[查看我的密钥](https://portal.qiniu.com/user/key) [密钥安全使用须知](https://developer.qiniu.com/kodo/kb/1334/the-access-key-secret-key-encryption-key-safe-use-instructions)
 
 - 配置文件
 
@@ -38,15 +38,15 @@
 
 - 文件上传
 
-    除了可上传本地文件外，还可抓取网络文件到空间中，如：
+    除了可（支持断点和覆盖）上传本地文件外，还可抓取网络文件到空间中，如：
 
-    ![上传网络文件](http://img.blog.csdn.net/20171017152757227?watermark/2/text/aHR0cDovL2Jsb2cuY3Nkbi5uZXQvcXFfMjY5NTQ3NzM=/font/5a6L5L2T/fontsize/400/fill/I0JBQkFCMA==/dissolve/70/gravity/SouthEast)
+    ![上传网络文件](http://img.blog.csdn.net/20171019105056517?watermark/2/text/aHR0cDovL2Jsb2cuY3Nkbi5uZXQvcXFfMjY5NTQ3NzM=/font/5a6L5L2T/fontsize/400/fill/I0JBQkFCMA==/dissolve/70/gravity/SouthEast)
 
-    然后点击开始上传即可
+    然后点击 `开始上传` 即可
 
 **2. 资源管理界面：**
 
-![资源管理界面](http://img.blog.csdn.net/20171017153112198?watermark/2/text/aHR0cDovL2Jsb2cuY3Nkbi5uZXQvcXFfMjY5NTQ3NzM=/font/5a6L5L2T/fontsize/400/fill/I0JBQkFCMA==/dissolve/70/gravity/SouthEast)
+![资源管理界面](http://img.blog.csdn.net/20171019105225191?watermark/2/text/aHR0cDovL2Jsb2cuY3Nkbi5uZXQvcXFfMjY5NTQ3NzM=/font/5a6L5L2T/fontsize/400/fill/I0JBQkFCMA==/dissolve/70/gravity/SouthEast)
 
 - 刷新列表
 
@@ -74,12 +74,10 @@
 
 - 更新镜像
 
-    需要选中文件才能更新，但是这个功能我一直没有测试成功，不知道为什么
+    此功能首先需要你配置了镜像存储
 
     > 官方解释：对于配置了镜像存储的空间，如果镜像源站更新了文件内容，则默认情况下，七牛不会再主动从客户镜像源站同步新的副本，这个时候就需要利用这个prefetch接口来主动地将空间中的文件和更新后的源站副本进行同步。
 
-    或许是我没有配置什么镜像存储吧
-
 - 公有下载
 
     直接下载选中的文件（私有的存储空间不可用）
@@ -104,11 +102,17 @@
 
     从七牛下载指定日期的操作日志
 
-**说明：操作文件时，需要选中文件才能操作（支持多选）。由于下载私有空间的文件需要临时授权，所以文件的下载分为私有下载（生成临时授权然后下载文件）和公有下载（直接下载文件）。**
+> 说明：操作文件时，需要选中文件才能操作（支持多选）。由于下载私有空间的文件需要临时授权，所以文件的下载分为私有下载（生成临时授权然后下载文件）和公有下载（直接下载文件）。
+
+**3. 数据统计界面**
+
+![数据统计界面](http://img.blog.csdn.net/20171019105531070?watermark/2/text/aHR0cDovL2Jsb2cuY3Nkbi5uZXQvcXFfMjY5NTQ3NzM=/font/5a6L5L2T/fontsize/400/fill/I0JBQkFCMA==/dissolve/70/gravity/SouthEast)
+
+> 说明：时间范围不超过31天，否则无法获取数据，这是七牛官方规定的。
 
-**3. 其他**
+**4. 其他**
 
-- [**下载可执行的jar包**](http://oq3iwfipo.bkt.clouddn.com/tools/zhazhapan/qiniu.jar?v=3 "七牛云——对象存储管理工具jar包下载地址")
+- [**下载可执行的jar包**](http://oq3iwfipo.bkt.clouddn.com/tools/zhazhapan/qiniu.jar?v=4 "七牛云——对象存储管理工具jar包下载地址")
 
 - [**历史版本**](https://github.com/zhazhapan/qiniu/releases) 
 

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

@@ -3,8 +3,10 @@
  */
 package com.zhazhapan.qiniu;
 
+import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
+import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
 
@@ -34,6 +36,36 @@ public void saveFile(File file, String content) {
 		saveFile(file, content, false);
 	}
 
+	public String readFile(String path) {
+		return readFile(new File(path));
+	}
+
+	public String readFile(File file) {
+		StringBuilder content = new StringBuilder();
+		String line;
+		try {
+			BufferedReader reader = new BufferedReader(new FileReader(file));
+			while ((line = reader.readLine()) != null) {
+				content.append(line + "\r\n");
+			}
+			reader.close();
+		} catch (IOException e) {
+			logger.error("read file error, messages: " + e.getMessage());
+		}
+		return content.toString();
+	}
+
+	/**
+	 * 保存日志文件
+	 */
+	public void saveLogFile(String logPath, String content) {
+		File file = new File(logPath);
+		if (file.exists()) {
+			content += readFile(file);
+		}
+		saveFile(file, content);
+	}
+
 	public void saveFile(File file, String content, boolean append) {
 		if (Checker.isNotNull(file)) {
 			try {

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

@@ -12,6 +12,8 @@
 import org.apache.log4j.Logger;
 
 import com.qiniu.cdn.CdnResult;
+import com.qiniu.cdn.CdnResult.BandwidthData;
+import com.qiniu.cdn.CdnResult.FluxData;
 import com.qiniu.cdn.CdnResult.LogData;
 import com.qiniu.common.QiniuException;
 import com.qiniu.http.Response;
@@ -25,8 +27,11 @@
 import com.zhazhapan.qiniu.util.Formatter;
 import com.zhazhapan.qiniu.view.Dialogs;
 
+import javafx.application.Platform;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
+import javafx.scene.chart.XYChart.Data;
+import javafx.scene.chart.XYChart.Series;
 
 /**
  * @author pantao
@@ -41,6 +46,88 @@ public enum FileAction {
 		COPY, MOVE
 	}
 
+	/**
+	 * 获取空间带宽统计
+	 * 
+	 * @return
+	 */
+	public Series<String, Long> getBucketBandwidth(String[] domains, String fromDate, String toDate) {
+		CdnResult.BandwidthResult bandwidthResult = null;
+		try {
+			bandwidthResult = QiniuApplication.cdnManager.getBandwidthData(domains, fromDate, toDate, "day");
+		} catch (QiniuException e) {
+			logger.error("get bucket bandwidth error, message: " + e.getMessage());
+			Platform.runLater(() -> Dialogs.showException(Values.BUCKET_BAND_ERROR, e));
+		}
+		Series<String, Long> bandSer = new Series<String, Long>();
+		bandSer.setName(Values.BUCKET_BANDWIDTH_COUNT);
+		// 获取带宽统计
+		if (Checker.isNotNull(bandwidthResult) && Checker.isNotEmpty(bandwidthResult.data)) {
+			for (Map.Entry<String, BandwidthData> bandwidth : bandwidthResult.data.entrySet()) {
+				String[] times = bandwidthResult.time;
+				BandwidthData bandwidthData = bandwidth.getValue();
+				int i = 0;
+				for (String time : times) {
+					long size = 0;
+					if (Checker.isNotNull(bandwidthData)) {
+						if (Checker.isNotNull(bandwidthData.china)) {
+							size += bandwidthData.china[i];
+						}
+						if (Checker.isNotNull(bandwidthData.oversea)) {
+							size += bandwidthData.oversea[i];
+						}
+					}
+					bandSer.getData().add(new Data<String, Long>(time.substring(5, 10), size / Values.KB));
+					i++;
+				}
+			}
+		} else {
+			logger.info("bandwidth is empty of this domain");
+		}
+		return bandSer;
+	}
+
+	/**
+	 * 获取空间的流量统计
+	 * 
+	 * @return
+	 */
+	public Series<String, Long> getBucketFlux(String[] domains, String fromDate, String toDate) {
+		CdnResult.FluxResult fluxResult = null;
+		try {
+			fluxResult = QiniuApplication.cdnManager.getFluxData(domains, fromDate, toDate, "day");
+		} catch (QiniuException e) {
+			logger.error("get bucket flux error, message: " + e.getMessage());
+			Platform.runLater(() -> Dialogs.showException(Values.BUCKET_FLUX_ERROR, e));
+		}
+		Series<String, Long> fluxSer = new Series<String, Long>();
+		fluxSer.setName(Values.BUCKET_FLUX_COUNT);
+		// 获取流量统计
+		if (Checker.isNotNull(fluxResult) && Checker.isNotEmpty(fluxResult.data)) {
+			for (Map.Entry<String, FluxData> flux : fluxResult.data.entrySet()) {
+				String[] times = fluxResult.time;
+				FluxData fluxData = flux.getValue();
+				int i = 0;
+				for (String time : times) {
+					long size = 0;
+					if (Checker.isNotNull(fluxData)) {
+						if (Checker.isNotNull(fluxData.china)) {
+							size += fluxData.china[i];
+						}
+						if (Checker.isNotNull(fluxData.oversea)) {
+							size += fluxData.oversea[i];
+						}
+					}
+					fluxSer.getData().add(new Data<String, Long>(time.substring(5, 10), size / Values.KB));
+					i++;
+				}
+			}
+		} else {
+			logger.info("flux is empty of this domain");
+		}
+		return fluxSer;
+	}
+
 	/**
 	 * 日志下载，cdn相关
 	 */
@@ -248,6 +335,8 @@ public void deleteFiles(ObservableList<FileInfo> fileInfos, String bucket) {
 						logger.info("delete file '" + file + "' success");
 						deleteLog += "\tsuccess\t";
 						QiniuApplication.data.remove(seletecFileInfos.get(i));
+						QiniuApplication.totalLength--;
+						QiniuApplication.totalSize -= Formatter.sizeToLong(seletecFileInfos.get(i).getSize());
 						if (sear) {
 							currentRes.remove(seletecFileInfos.get(i));
 						}
@@ -261,6 +350,7 @@ public void deleteFiles(ObservableList<FileInfo> fileInfos, String bucket) {
 			} catch (QiniuException e) {
 				Dialogs.showException(Values.DELETE_ERROR, e);
 			}
+			MainWindowController.getInstance().setBucketCount();
 		}
 	}
 

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

@@ -53,8 +53,6 @@ public class QiniuApplication extends Application {
 
 	public static UploadManager uploadManager = null;
 
-	public static String upToken = null;
-
 	public static Configuration configuration = null;
 
 	public static BucketManager bucketManager = null;

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

@@ -3,10 +3,8 @@
  */
 package com.zhazhapan.qiniu.config;
 
-import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.util.Map;
@@ -18,6 +16,7 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
+import com.zhazhapan.qiniu.FileExecutor;
 import com.zhazhapan.qiniu.QiniuApplication;
 import com.zhazhapan.qiniu.ThreadPool;
 import com.zhazhapan.qiniu.controller.MainWindowController;
@@ -151,20 +150,15 @@ public static void writeKey(String accessKey, String secretKey) {
 	}
 
 	public static JsonObject readConfig() {
-		StringBuilder config = new StringBuilder();
 		JsonObject jsonObject = null;
 		try {
 			logger.info("load configuration into memory");
-			BufferedReader reader = new BufferedReader(new FileReader(configPath));
-			String line;
-			while ((line = reader.readLine()) != null) {
-				config.append(line);
+			String content = new FileExecutor().readFile(configPath);
+			if (Checker.isNullOrEmpty(content)) {
+				Dialogs.showFatalError(Values.LOAD_CONFIG_ERROR, new IOException("load configuration file error"));
+			} else {
+				jsonObject = new JsonParser().parse(content).getAsJsonObject();
 			}
-			reader.close();
-			jsonObject = new JsonParser().parse(config.toString()).getAsJsonObject();
-		} catch (IOException e) {
-			logger.error("load configuration error, messages: " + e.getMessage());
-			Dialogs.showFatalError(Values.LOAD_CONFIG_ERROR, e);
 		} catch (Exception e) {
 			logger.error("convert json string to json object failed, app'll reset");
 			Dialogs.showException(Values.JSON_TO_OBJECT_ERROR, e);

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

@@ -63,7 +63,6 @@ public boolean configUploadEnv(String zone, String bucket) {
 			QiniuApplication.uploadManager = new UploadManager(configuration);
 		}
 		QiniuApplication.configuration = configuration;
-		QiniuApplication.upToken = QiniuApplication.auth.uploadToken(bucket);
 		QiniuApplication.bucketManager = new BucketManager(QiniuApplication.auth, configuration);
 		return true;
 	}