feat: support http upload file, add git commit info

Author: easepan

.gitignore

@@ -2,6 +2,8 @@
 /wetool/
 wetool-*.jar
 conf/
+upload
+src/main/resources/gitinfo
 
 # Compiled class file
 *.class

README.md

@@ -73,6 +73,7 @@ java -jar ./wetool.jar &
 
 ### 使用小技巧
 
+- HTTP文件上传服务，首先在配置文件中设置上传文件的保存目录，然后浏览器打开 [文件上传页面](http://localhost:8189/upload.html)
 - 使用全局快捷键 `Ctrl+Alt+Shift+Enter` 显示或隐藏主界面
 - 应用内使用快捷键 `Ctrl+数字` 选中指定位置的选项卡，数字 `9` 表示选中最后一个
 - 关闭指定位置的选项卡：`Alt+数字`，数字 `9` 表示关闭最后一个

bin/package.py

@@ -2,7 +2,6 @@
 
 import os
 import re
-import shutil
 
 os.chdir('..')
 print(os.popen('git pull').read())
@@ -22,6 +21,11 @@ def package(os_name):
     os.rename('./target/wetool-%s.jar' % version, filename)
 
 
+with open('./src/main/resources/gitinfo', 'w+', encoding='utf-8') as fw:
+    branch = os.popen('git symbolic-ref --short -q HEAD').read().replace('\n', '')
+    last_commit = os.popen('git rev-parse --short HEAD').read().replace('\n', '')
+    fw.write("%s:%s" % (branch, last_commit))
+
 package('win')
 package('mac')
 package('linux')

history.md

@@ -8,7 +8,7 @@
 - 支持HutoolCli命令
 - 支持暴露模式匹配的HTTP接口
 - 支持HTTP文件浏览服务
-- 支持暴露HTTP文件上传接口
+- 支持HTTP文件上传
 - 仅支持单实例运行
 - 支持添加网页工具
 

src/main/java/org/code4everything/wetool/WeApplication.java

@@ -4,6 +4,7 @@
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.exceptions.ExceptionUtil;
 import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.io.resource.ResourceUtil;
 import cn.hutool.core.thread.ThreadFactoryBuilder;
 import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.core.util.ArrayUtil;
@@ -19,6 +20,7 @@
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.parser.Feature;
 import com.dustinredmond.fxtrayicon.FXTrayIcon;
+import io.netty.handler.codec.http.HttpResponseStatus;
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.event.EventType;
@@ -48,9 +50,11 @@
 import org.code4everything.wetool.plugin.support.event.EventPublisher;
 import org.code4everything.wetool.plugin.support.event.message.KeyboardListenerEventMessage;
 import org.code4everything.wetool.plugin.support.event.message.QuickStartEventMessage;
+import org.code4everything.wetool.plugin.support.exception.HttpException;
 import org.code4everything.wetool.plugin.support.exception.ToDialogException;
 import org.code4everything.wetool.plugin.support.factory.BeanFactory;
 import org.code4everything.wetool.plugin.support.http.HttpService;
+import org.code4everything.wetool.plugin.support.http.Https;
 import org.code4everything.wetool.plugin.support.http.ObjectResp;
 import org.code4everything.wetool.plugin.support.listener.WeKeyboardListener;
 import org.code4everything.wetool.plugin.support.listener.WeMouseListener;
@@ -257,6 +261,15 @@ private static void exportHttpService() {
                     FxUtils.showStage();
                     return ObjectResp.of("status", "success");
                 });
+                HttpService.exportHttp("post/wetool/file/upload", (req, resp, param, body) -> {
+                    String fileDir = BeanFactory.get(WeConfig.class).getFileUploadDir();
+                    if (StrUtil.isBlank(fileDir)) {
+                        throw new HttpException().setStatus(HttpResponseStatus.METHOD_NOT_ALLOWED).setMsg("文件上传未开启");
+                    }
+                    Https.writeMultipartFiles(req, fileDir);
+                    return null;
+                });
+                HttpService.exportHttp("get/upload.html", (req, resp, param, body) -> Https.responseHtml(resp, ResourceUtil.readUtf8Str("static/upload.html")));
                 WeUtils.getConfig().getHttpFiles().forEach(e -> HttpFileBrowserService.getInstance().handleExportCmd(e, false));
             } catch (Exception e) {
                 log.error(e.getMessage());

src/main/java/org/code4everything/wetool/controller/MainController.java

@@ -5,6 +5,7 @@
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.io.resource.ResourceUtil;
 import cn.hutool.core.lang.Pair;
 import cn.hutool.core.swing.clipboard.ClipboardUtil;
 import cn.hutool.core.util.ArrayUtil;
@@ -621,7 +622,17 @@ public void quit() {
     }
 
     public void about() {
-        FxDialogs.showInformation(TitleConsts.ABOUT_APP, TipConsts.ABOUT_APP);
+        String gitInfo = StrUtil.trim(ResourceUtil.readUtf8Str("gitinfo"));
+        String aboutApp = TipConsts.ABOUT_APP;
+        if (StrUtil.isNotEmpty(gitInfo) && !StrUtil.startWith(gitInfo, "master")) {
+            List<String> infos = StrUtil.splitTrim(gitInfo, ":");
+            aboutApp += "\r\n开发版分支：" + infos.get(0);
+            if (infos.size() > 1) {
+                aboutApp += "，提交：" + infos.get(1);
+            }
+            aboutApp += "\r\n";
+        }
+        FxDialogs.showInformation(TitleConsts.ABOUT_APP, aboutApp);
     }
 
     public void closeAllTab() {

src/main/resources/static/upload.html

@@ -0,0 +1,112 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>Layui</title>
+  <meta name="renderer" content="webkit">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+  <link rel="stylesheet" href="https://code4everything.gitee.io/repository/frontend/layui/layui/css/layui.css"  media="all">
+</head>
+<body>
+        
+<br/>
+<fieldset class="layui-elem-field layui-field-title" style="margin-top: 30px;">
+  <legend>批量上传文件</legend>
+</fieldset> 
+ 
+<div class="layui-upload">
+  <button type="button" class="layui-btn layui-btn-normal" id="testList">选择多文件</button> 
+  <div class="layui-upload-list" style="max-width: 1000px;">
+    <table class="layui-table">
+      <colgroup>
+        <col>
+        <col width="150">
+        <col width="260">
+        <col width="150">
+      </colgroup>
+      <thead>
+        <tr><th>文件名</th>
+        <th>大小</th>
+        <th>上传进度</th>
+        <th>操作</th>
+      </tr></thead>
+      <tbody id="demoList"></tbody>
+    </table>
+  </div>
+  <button type="button" class="layui-btn" id="testListAction">开始上传</button>
+</div> 
+ 
+<script src="http://code4everything.gitee.io/repository/frontend/layui/layui/layui.js" charset="utf-8"></script>
+<script>
+layui.use(['upload', 'element', 'layer'], function(){
+  var $ = layui.jquery
+  ,upload = layui.upload
+  ,element = layui.element
+  ,layer = layui.layer;
+  
+  var uploadListIns = upload.render({
+    elem: '#testList'
+    ,elemList: $('#demoList')
+    ,url: '/wetool/file/upload'
+    ,accept: 'file'
+    ,multiple: true
+    ,number: 9999999
+    ,auto: false
+    ,bindAction: '#testListAction'
+    ,choose: function(obj){   
+      var that = this;
+      var files = this.files = obj.pushFile();
+      obj.preview(function(index, file, result){
+        var tr = $(['<tr id="upload-'+ index +'">'
+          ,'<td>'+ file.name +'</td>'
+          ,'<td>'+ (file.size/1014).toFixed(1) +'kb</td>'
+          ,'<td><div class="layui-progress" lay-filter="progress-demo-'+ index +'"><div class="layui-progress-bar" lay-percent=""></div></div></td>'
+          ,'<td>'
+            ,'<button class="layui-btn layui-btn-xs demo-reload layui-hide">重传</button>'
+            ,'<button class="layui-btn layui-btn-xs layui-btn-danger demo-delete">删除</button>'
+          ,'</td>'
+        ,'</tr>'].join(''));
+        
+        tr.find('.demo-reload').on('click', function(){
+          obj.upload(index, file);
+        });
+        
+        tr.find('.demo-delete').on('click', function(){
+          delete files[index];
+          tr.remove();
+          uploadListIns.config.elem.next()[0].value = '';
+        });
+        
+        that.elemList.append(tr);
+        element.render('progress');
+      });
+    }
+    ,done: function(res, index, upload){
+      var that = this;
+      //if(res.code == 0){ //上传成功
+        var tr = that.elemList.find('tr#upload-'+ index)
+        ,tds = tr.children();
+        tds.eq(3).html(''); //清空操作
+        delete this.files[index]; //删除文件队列已经上传成功的文件
+        return;
+      //}
+      this.error(index, upload);
+    }
+    ,allDone: function(obj){ //多文件上传完毕后的状态回调
+      console.log(obj)
+    }
+    ,error: function(index, upload){ //错误回调
+      var that = this;
+      var tr = that.elemList.find('tr#upload-'+ index)
+      ,tds = tr.children();
+      tds.eq(3).find('.demo-reload').removeClass('layui-hide'); //显示重传
+    }
+    ,progress: function(n, elem, e, index){ //注意：index 参数为 layui 2.6.6 新增
+      element.progress('progress-demo-'+ index, n + '%'); //执行进度条。n 即为返回的进度百分比
+    }
+  });
+});
+</script>
+</body>
+</html>

we-config.json

@@ -83,5 +83,8 @@
     },
     /*代理*/
     "proxy": "127.0.0.1:6789",
-    "httpFiles": ["get/file/* C:\\"]
+    /*HTTP文件浏览服务接口，包括接口名及本地文件绝对路径*/
+    "httpFiles": ["get/file/* C:\\"],
+    /*上传文件保存路径，为空不允许上传文件，支持相对路径*/
+    "fileUploadDir": "upload"
 }