Unverified Commit 2cde200a authored by aiwenmo's avatar aiwenmo Committed by GitHub

[Feature-987][admin] ClusterConfig and jar add upload file (#988)

Co-authored-by: 's avatarwenmo <32723967+wenmo@users.noreply.github.com>
parent 4f04d9ad
...@@ -197,22 +197,9 @@ ...@@ -197,22 +197,9 @@
</dependency> </dependency>
<!-- hadoop --> <!-- hadoop -->
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>com.dlink</groupId>
<artifactId>hadoop-hdfs</artifactId> <artifactId>dlink-client-hadoop</artifactId>
<version>3.3.2</version> <scope>${scope.runtime}</scope>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs-client</artifactId>
<version>3.3.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<version>3.3.2</version>
<scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>
......
...@@ -45,7 +45,7 @@ public class UploadFileConstant { ...@@ -45,7 +45,7 @@ public class UploadFileConstant {
// Upload file's dir constant---------------------------------------------------------------------------------------- // Upload file's dir constant----------------------------------------------------------------------------------------
static { static {
// Get admin jar's parent absolute path // Get admin jar's parent absolute path
DLINK_HOME_DIR = new ApplicationHome(UploadFileConstant.class).getSource().getParent(); DLINK_HOME_DIR = new ApplicationHome(UploadFileConstant.class).getSource().getParent() + "/../";
} }
public static final String DLINK_HOME_DIR; public static final String DLINK_HOME_DIR;
......
...@@ -27,7 +27,7 @@ import org.apache.commons.lang3.StringUtils; ...@@ -27,7 +27,7 @@ import org.apache.commons.lang3.StringUtils;
import javax.annotation.Resource; import javax.annotation.Resource;
import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RequestPart; import org.springframework.web.bind.annotation.RequestPart;
...@@ -55,7 +55,7 @@ public class FileUploadController { ...@@ -55,7 +55,7 @@ public class FileUploadController {
* @param fileType Please refer {@link UploadFileConstant}, default is -1. If not provide, please provide the 'dir' value * @param fileType Please refer {@link UploadFileConstant}, default is -1. If not provide, please provide the 'dir' value
* @return {@link Result} * @return {@link Result}
*/ */
@PutMapping @PostMapping
public Result upload(@RequestPart("files") MultipartFile[] files, public Result upload(@RequestPart("files") MultipartFile[] files,
@RequestParam(value = "dir", defaultValue = "", required = false) String dir, @RequestParam(value = "dir", defaultValue = "", required = false) String dir,
@RequestParam(value = "fileType", defaultValue = "-1", required = false) Byte fileType) { @RequestParam(value = "fileType", defaultValue = "-1", required = false) Byte fileType) {
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!--<scope.type>provided</scope.type>--> <!--<scope.type>provided</scope.type>-->
<hadoop.version>3.1.0</hadoop.version> <hadoop.version>3.3.2</hadoop.version>
<scope.type>compile</scope.type> <scope.type>compile</scope.type>
</properties> </properties>
......
...@@ -709,7 +709,7 @@ CREATE TABLE `dlink_fragment` ( ...@@ -709,7 +709,7 @@ CREATE TABLE `dlink_fragment` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='全局变量'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='全局变量';
-- 0.7.7-SNAPSHOT 2022-08-22 -- 0.6.7-SNAPSHOT 2022-09-02
-- ----------------------- -- -----------------------
-- DROP TABLE IF EXISTS `dlink_upload_file_record`; -- DROP TABLE IF EXISTS `dlink_upload_file_record`;
CREATE TABLE `dlink_upload_file_record` ( CREATE TABLE `dlink_upload_file_record` (
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment