Skip to content
This repository was archived by the owner on Mar 6, 2024. It is now read-only.

Commit 0ecd302

Browse files
easepaneasepan
committed
重构模型类
1 parent 6fe7be6 commit 0ecd302

File tree

9 files changed

+65
-54
lines changed

9 files changed

+65
-54
lines changed

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>com.zhazhapan</groupId>
77
<artifactId>qiniu</artifactId>
8-
<version>1.0.8</version>
8+
<version>1.2.0</version>
99
<packaging>jar</packaging>
1010

1111
<name>qiniu</name>

‎src/main/java/org/code4everything/qiniu/QiniuApplication.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import org.code4everything.qiniu.constant.QiniuValueConsts;
1414
import org.code4everything.qiniu.controller.MainWindowController;
1515
import org.code4everything.qiniu.model.ConfigBean;
16-
import org.code4everything.qiniu.model.FileInfo;
16+
import org.code4everything.qiniu.model.FileBean;
1717
import org.code4everything.qiniu.util.ConfigUtils;
1818
import org.code4everything.qiniu.util.DialogUtils;
1919

@@ -27,7 +27,7 @@ public class QiniuApplication extends Application {
2727

2828
private static final Logger LOGGER = Logger.getLogger(QiniuApplication.class);
2929

30-
public static ObservableList<FileInfo> data = null;
30+
public static ObservableList<FileBean> data = null;
3131

3232
/**
3333
* 空间总文件数

‎src/main/java/org/code4everything/qiniu/api/QiManager.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import org.code4everything.qiniu.api.config.SdkConfigurer;
2121
import org.code4everything.qiniu.constant.QiniuValueConsts;
2222
import org.code4everything.qiniu.controller.MainWindowController;
23-
import org.code4everything.qiniu.model.FileInfo;
23+
import org.code4everything.qiniu.model.FileBean;
2424
import org.code4everything.qiniu.util.QiniuUtils;
2525
import org.code4everything.qiniu.util.DialogUtils;
2626

@@ -182,11 +182,11 @@ public void downloadCdnLog(String logDate) {
182182
/**
183183
* 刷新文件，cdn相关
184184
*/
185-
public void refreshFile(ObservableList<FileInfo> fileInfos, String domain) {
185+
public void refreshFile(ObservableList<FileBean> fileInfos, String domain) {
186186
if (Checker.isNotEmpty(fileInfos)) {
187187
String[] files = new String[fileInfos.size()];
188188
int i = 0;
189-
for (FileInfo fileInfo : fileInfos) {
189+
for (FileBean fileInfo : fileInfos) {
190190
files[i++] = getPublicURL(fileInfo.getName(), domain);
191191
}
192192
refreshFile(files);
@@ -327,13 +327,13 @@ public boolean changeType(String fileName, String newType, String bucket) {
327327
/**
328328
* 批量删除文件，单次批量请求的文件数量不得超过1000
329329
*/
330-
public void deleteFiles(ObservableList<FileInfo> fileInfos, String bucket) {
330+
public void deleteFiles(ObservableList<FileBean> fileInfos, String bucket) {
331331
if (Checker.isNotEmpty(fileInfos) && QiniuUtils.checkNet()) {
332332
// 生成待删除的文件列表
333333
String[] files = new String[fileInfos.size()];
334-
ArrayList<FileInfo> seletecFileInfos = new ArrayList<>();
334+
ArrayList<FileBean> seletecFileInfos = new ArrayList<>();
335335
int i = 0;
336-
for (FileInfo fileInfo : fileInfos) {
336+
for (FileBean fileInfo : fileInfos) {
337337
files[i++] = fileInfo.getName();
338338
seletecFileInfos.add(fileInfo);
339339
}
@@ -345,7 +345,7 @@ public void deleteFiles(ObservableList<FileInfo> fileInfos, String bucket) {
345345
MainWindowController main = MainWindowController.getInstance();
346346
// 文件列表是否为搜索后结果
347347
boolean sear = Checker.isNotEmpty(main.searchTextField.getText());
348-
ObservableList<FileInfo> currentRes = main.resTable.getItems();
348+
ObservableList<FileBean> currentRes = main.resTable.getItems();
349349
for (i = 0; i < files.length; i++) {
350350
BatchStatus status = batchStatusList[i];
351351
String file = files[i];
@@ -378,7 +378,7 @@ public void listFileOfBucket() {
378378
String bucket = main.bucketChoiceCombo.getValue();
379379
BucketManager.FileListIterator iterator = SdkConfigurer.getBucketManager().createFileListIterator(bucket, "",
380380
QiniuValueConsts.BUCKET_LIST_LIMIT_SIZE, "");
381-
ArrayList<FileInfo> files = new ArrayList<>();
381+
ArrayList<FileBean> files = new ArrayList<>();
382382
logger.info("get file list of bucket: " + bucket);
383383
QiniuApplication.totalLength = 0;
384384
QiniuApplication.totalSize = 0;
@@ -391,7 +391,7 @@ public void listFileOfBucket() {
391391
// 将七牛的时间单位（100纳秒）转换成毫秒，然后转换成时间
392392
String time = Formatter.timeStampToString(item.putTime / 10000);
393393
String size = Formatter.formatSize(item.fsize);
394-
FileInfo file = new FileInfo(item.key, item.mimeType, size, time);
394+
FileBean file = new FileBean(item.key, item.mimeType, size, time);
395395
files.add(file);
396396
logger.info("file name: " + item.key + ", file type: " + item.mimeType + ", file size: " + size + ", "
397397
+ "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "file time: " + time);

‎src/main/java/org/code4everything/qiniu/controller/MainWindowController.java‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.code4everything.qiniu.api.QiManager;
2727
import org.code4everything.qiniu.api.config.SdkConfigurer;
2828
import org.code4everything.qiniu.constant.QiniuValueConsts;
29-
import org.code4everything.qiniu.model.FileInfo;
29+
import org.code4everything.qiniu.model.FileBean;
3030
import org.code4everything.qiniu.util.ConfigUtils;
3131
import org.code4everything.qiniu.util.DialogUtils;
3232
import org.code4everything.qiniu.util.QiniuDialog;
@@ -62,7 +62,7 @@ public class MainWindowController {
6262
public ComboBox<String> filePrefixCombo;
6363

6464
@FXML
65-
public TableView<FileInfo> resTable;
65+
public TableView<FileBean> resTable;
6666

6767
@FXML
6868
public TextField searchTextField;
@@ -88,16 +88,16 @@ public class MainWindowController {
8888
private TextField bucketDomainTextField;
8989

9090
@FXML
91-
private TableColumn<FileInfo, String> nameCol;
91+
private TableColumn<FileBean, String> nameCol;
9292

9393
@FXML
94-
private TableColumn<FileInfo, String> typeCol;
94+
private TableColumn<FileBean, String> typeCol;
9595

9696
@FXML
97-
private TableColumn<FileInfo, String> sizeCol;
97+
private TableColumn<FileBean, String> sizeCol;
9898

9999
@FXML
100-
private TableColumn<FileInfo, String> timeCol;
100+
private TableColumn<FileBean, String> timeCol;
101101

102102
@FXML
103103
private Hyperlink toCsdnBlog;
@@ -162,7 +162,7 @@ private void initialize() {
162162
nameCol.setCellFactory(TextFieldTableCell.forTableColumn());
163163
nameCol.setOnEditCommit(v -> {
164164
String name;
165-
FileInfo fileInfo = v.getTableView().getItems().get(v.getTablePosition().getRow());
165+
FileBean fileInfo = v.getTableView().getItems().get(v.getTablePosition().getRow());
166166
if (new QiManager().renameFile(bucketChoiceCombo.getValue(), v.getOldValue(), v.getNewValue())) {
167167
name = v.getNewValue();
168168
} else {
@@ -177,7 +177,7 @@ private void initialize() {
177177
// 设置文件类型可编辑
178178
typeCol.setCellFactory(TextFieldTableCell.forTableColumn());
179179
typeCol.setOnEditCommit(v -> {
180-
FileInfo fileInfo = v.getTableView().getItems().get(v.getTablePosition().getRow());
180+
FileBean fileInfo = v.getTableView().getItems().get(v.getTablePosition().getRow());
181181
String type;
182182
if (new QiManager().changeType(fileInfo.getName(), v.getNewValue(), bucketChoiceCombo.getValue())) {
183183
type = v.getNewValue();
@@ -384,7 +384,7 @@ public void downloadFromURL() {
384384
* 用浏览器打开文件
385385
*/
386386
public void openFile() {
387-
ObservableList<FileInfo> selectedItems = resTable.getSelectionModel().getSelectedItems();
387+
ObservableList<FileBean> selectedItems = resTable.getSelectionModel().getSelectedItems();
388388
if (Checker.isNotEmpty(selectedItems)) {
389389
String filename = selectedItems.get(0).getName();
390390
String url = "http://" + new QiManager().getPublicURL(filename, bucketDomainTextField.getText());
@@ -400,18 +400,18 @@ public void privateDownload() {
400400
}
401401

402402
private void download(DownloadWay way) {
403-
ObservableList<FileInfo> selectedItems = resTable.getSelectionModel().getSelectedItems();
403+
ObservableList<FileBean> selectedItems = resTable.getSelectionModel().getSelectedItems();
404404
if (Checker.isNotEmpty(selectedItems)) {
405405
QiManager manager = new QiManager();
406406
String domain = "http://" + bucketDomainTextField.getText();
407407
if (way == DownloadWay.PUBLIC) {
408408
logger.debug("start to public download");
409-
for (FileInfo fileInfo : selectedItems) {
409+
for (FileBean fileInfo : selectedItems) {
410410
manager.publicDownload(fileInfo.getName(), domain);
411411
}
412412
} else {
413413
logger.debug("start to private download");
414-
for (FileInfo fileInfo : selectedItems) {
414+
for (FileBean fileInfo : selectedItems) {
415415
manager.privateDownload(fileInfo.getName(), domain);
416416
}
417417
}
@@ -429,10 +429,10 @@ public void publicDownload() {
429429
* 更新镜像源
430430
*/
431431
public void updateFile() {
432-
ObservableList<FileInfo> selectedItems = resTable.getSelectionModel().getSelectedItems();
432+
ObservableList<FileBean> selectedItems = resTable.getSelectionModel().getSelectedItems();
433433
if (Checker.isNotEmpty(selectedItems)) {
434434
QiManager manager = new QiManager();
435-
for (FileInfo fileInfo : selectedItems) {
435+
for (FileBean fileInfo : selectedItems) {
436436
manager.updateFile(bucketChoiceCombo.getValue(), fileInfo.getName());
437437
}
438438
}
@@ -442,14 +442,14 @@ public void updateFile() {
442442
* 设置文件生存时间
443443
*/
444444
public void setLife() {
445-
ObservableList<FileInfo> selectedItems = resTable.getSelectionModel().getSelectedItems();
445+
ObservableList<FileBean> selectedItems = resTable.getSelectionModel().getSelectedItems();
446446
if (Checker.isNotEmpty(selectedItems)) {
447447
String lifeStr = DialogUtils.showInputDialog(null, QiniuValueConsts.FILE_LIFE,
448448
QiniuValueConsts.DEFAULT_FILE_LIFE);
449449
if (Checker.isNumber(lifeStr)) {
450450
int life = Formatter.stringToInt(lifeStr);
451451
QiManager manager = new QiManager();
452-
for (FileInfo fileInfo : selectedItems) {
452+
for (FileBean fileInfo : selectedItems) {
453453
manager.setFileLife(bucketChoiceCombo.getValue(), fileInfo.getName(), life);
454454
}
455455
}
@@ -460,7 +460,7 @@ public void setLife() {
460460
* 显示移动或复制文件的窗口
461461
*/
462462
public void showFileMovableDialog() {
463-
ObservableList<FileInfo> selectedItems = resTable.getSelectionModel().getSelectedItems();
463+
ObservableList<FileBean> selectedItems = resTable.getSelectionModel().getSelectedItems();
464464
Pair<QiManager.FileAction, String[]> pair;
465465
String bucket = bucketChoiceCombo.getValue();
466466
if (Checker.isEmpty(selectedItems)) {
@@ -473,9 +473,9 @@ public void showFileMovableDialog() {
473473
}
474474
if (Checker.isNotNull(pair)) {
475475
boolean useNewKey = Checker.isNotEmpty(pair.getValue()[1]);
476-
ObservableList<FileInfo> resData = resTable.getItems();
476+
ObservableList<FileBean> resData = resTable.getItems();
477477
QiManager manager = new QiManager();
478-
for (FileInfo fileInfo : selectedItems) {
478+
for (FileBean fileInfo : selectedItems) {
479479
String fb = bucketChoiceCombo.getValue();
480480
String tb = pair.getValue()[0];
481481
String name = useNewKey ? pair.getValue()[1] : fileInfo.getName();
@@ -507,15 +507,15 @@ public void showFileMovableDialog() {
507507
* 删除文件
508508
*/
509509
public void deleteFiles() {
510-
ObservableList<FileInfo> fileInfos = resTable.getSelectionModel().getSelectedItems();
510+
ObservableList<FileBean> fileInfos = resTable.getSelectionModel().getSelectedItems();
511511
new QiManager().deleteFiles(fileInfos, bucketChoiceCombo.getValue());
512512
}
513513

514514
/**
515515
* 复制链接
516516
*/
517517
public void copyLink() {
518-
ObservableList<FileInfo> fileInfos = resTable.getSelectionModel().getSelectedItems();
518+
ObservableList<FileBean> fileInfos = resTable.getSelectionModel().getSelectedItems();
519519
if (Checker.isNotEmpty(fileInfos)) {
520520
// 只复制选中的第一个文件的链接
521521
String link = "http://" + new QiManager().getPublicURL(fileInfos.get(0).getName(),
@@ -529,15 +529,15 @@ public void copyLink() {
529529
* 搜索资源文件，忽略大小写
530530
*/
531531
public void searchFile() {
532-
ArrayList<FileInfo> files = new ArrayList<>();
532+
ArrayList<FileBean> files = new ArrayList<>();
533533
String search = Checker.checkNull(searchTextField.getText());
534534
logger.info("search file: " + search);
535535
QiniuApplication.totalLength = 0;
536536
QiniuApplication.totalSize = 0;
537537
try {
538538
// 正则匹配查询
539539
Pattern pattern = Pattern.compile(search, Pattern.CASE_INSENSITIVE);
540-
for (FileInfo file : QiniuApplication.data) {
540+
for (FileBean file : QiniuApplication.data) {
541541
if (pattern.matcher(file.getName()).find()) {
542542
files.add(file);
543543
QiniuApplication.totalLength++;

‎src/main/java/org/code4everything/qiniu/model/BucketBean.java‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package org.code4everything.qiniu.model;
2+
3+
import lombok.AllArgsConstructor;
4+
import lombok.Data;
5+
import lombok.NoArgsConstructor;
6+
7+
import java.io.Serializable;
8+
9+
/**
10+
* 桶信息
11+
*
12+
* @author pantao
13+
* @since 2018/11/13
14+
*/
15+
@Data
16+
@AllArgsConstructor
17+
@NoArgsConstructor
18+
public class BucketBean implements Serializable {
19+
20+
private String bucket;
21+
22+
private String zone;
23+
24+
private String url;
25+
}

‎src/main/java/org/code4everything/qiniu/model/ConfigBean.java‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,4 @@ public BucketBean getBucketBean(String bucket) {
5555
}
5656
return null;
5757
}
58-
59-
@Data
60-
@AllArgsConstructor
61-
@NoArgsConstructor
62-
public class BucketBean implements Serializable {
63-
64-
private String bucket;
65-
66-
private String zone;
67-
68-
private String url;
69-
}
7058
}

‎src/main/java/org/code4everything/qiniu/model/FileInfo.java‎ renamed to ‎src/main/java/org/code4everything/qiniu/model/FileBean.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
@Data
1313
@AllArgsConstructor
1414
@NoArgsConstructor
15-
public class FileInfo {
15+
public class FileBean {
1616

1717
private String name;
1818

‎src/main/java/org/code4everything/qiniu/util/ConfigUtils.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import org.code4everything.qiniu.api.config.SdkConfigurer;
1111
import org.code4everything.qiniu.constant.QiniuValueConsts;
1212
import org.code4everything.qiniu.controller.MainWindowController;
13+
import org.code4everything.qiniu.model.BucketBean;
1314
import org.code4everything.qiniu.model.ConfigBean;
1415

1516
import java.util.ArrayList;
@@ -48,7 +49,7 @@ public static void loadConfig() {
4849
// 添加桶
4950
config.getBuckets().forEach(bucket -> controller.addItem(bucket.getBucket()));
5051
// 选中第一个桶
51-
ConfigBean.BucketBean bucket = config.getBuckets().get(0);
52+
BucketBean bucket = config.getBuckets().get(0);
5253
controller.bucketChoiceCombo.setValue(bucket.getBucket());
5354
controller.zoneText.setText(bucket.getZone());
5455
});

‎src/main/java/org/code4everything/qiniu/util/QiniuDialog.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import org.code4everything.qiniu.api.QiManager;
1313
import org.code4everything.qiniu.constant.QiniuValueConsts;
1414
import org.code4everything.qiniu.controller.MainWindowController;
15-
import org.code4everything.qiniu.model.ConfigBean;
15+
import org.code4everything.qiniu.model.BucketBean;
1616

1717
import java.util.Optional;
1818

@@ -162,10 +162,7 @@ public void showBucketAddableDialog() {
162162
result.ifPresent(res -> {
163163
// 处理结果
164164
Platform.runLater(() -> MainWindowController.getInstance().addItem(res[0]));
165-
ConfigBean.BucketBean bucketBean = new ConfigBean().new BucketBean();
166-
bucketBean.setBucket(res[0]);
167-
bucketBean.setUrl(res[2]);
168-
bucketBean.setZone(res[1]);
165+
BucketBean bucketBean = new BucketBean(res[0], res[1], res[2]);
169166
QiniuApplication.getConfigBean().getBuckets().add(bucketBean);
170167
ConfigUtils.writeConfig();
171168
});

0 commit comments

Comments
 (0)