Merge branch 'dev' of http://192.168.2.46:8099/jsowell/jsowell-charger-web into dev

# Conflicts:
#	jsowell-ui/src/views/pile/basic/components/remoteUpgrade.vue

jsowell-framework/src/main/java/com/jsowell/framework/config/ThreadPoolConfig.java

@@ -22,10 +22,10 @@ public class ThreadPoolConfig {
 	Logger log = LoggerFactory.getLogger(ThreadPoolConfig.class);
 
 	// 核心线程池大小
-	private final int corePoolSize = 50;
+	private final int corePoolSize = 500;
 
 	// 最大可创建的线程数
-	private final int maxPoolSize = 200;
+	private final int maxPoolSize = 1000;
 
 	// 队列最大长度
 	private final int queueCapacity = 1000;

jsowell-ui/src/views/pile/firmware/index.vue

@@ -96,7 +96,7 @@
         />
 
         <!-- 添加或修改充电桩固件信息对话框 -->
-        <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+        <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :before-close="cancel">
             <el-form ref="form" :model="form" :rules="rules" label-width="80px">
                 <el-form-item label="固件名称" prop="name">
                     <el-input v-model="form.name" placeholder="请输入固件名称" />
@@ -202,6 +202,7 @@ export default {
         cancel() {
             this.open = false;
             this.reset();
+            this.$refs.upload.clearFiles();
         },
         // 表单重置
         reset() {