From 1f988323d4dccf8160468133f5fe61760c14181e Mon Sep 17 00:00:00 2001 From: Kane Date: Tue, 24 Jan 2023 00:07:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E8=BF=9B=E5=BA=A6=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controllers/FileUpload/FileUpload.java | 34 ++++++++-- .../FileUpload/FileUploadResult.java | 62 +++++++++++++++++++ .../account/P13AccountCheckController.java | 2 +- .../xim/web/filters/token/TokenFilter.java | 7 ++- .../web/listener/ContextLoaderListener.java | 18 +++++- .../AdminSys/src/main/webapp/WEB-INF/web.xml | 23 ++++--- .../web/admin_system/.env.development | 3 +- 7 files changed, 130 insertions(+), 19 deletions(-) create mode 100644 企业级管理系统/java/AdminSys/src/main/java/com/cpic/xim/web/controllers/FileUpload/FileUploadResult.java diff --git a/企业级管理系统/java/AdminSys/src/main/java/com/cpic/xim/web/controllers/FileUpload/FileUpload.java b/企业级管理系统/java/AdminSys/src/main/java/com/cpic/xim/web/controllers/FileUpload/FileUpload.java index 267d619..5427e1e 100644 --- a/企业级管理系统/java/AdminSys/src/main/java/com/cpic/xim/web/controllers/FileUpload/FileUpload.java +++ b/企业级管理系统/java/AdminSys/src/main/java/com/cpic/xim/web/controllers/FileUpload/FileUpload.java @@ -2,7 +2,7 @@ * @Author: Kane * @Date: 2023-01-22 23:11:26 * @LastEditors: Kane - * @LastEditTime: 2023-01-22 23:47:15 + * @LastEditTime: 2023-01-23 23:22:10 * @FilePath: \AdminSys\src\main\java\com\cpic\xim\web\controllers\FileUpload\FileUpload.java * @Description: 用于接受上传文件的Controller。 * @@ -11,9 +11,12 @@ package com.cpic.xim.web.controllers.FileUpload; +import java.util.Vector; +import javax.servlet.http.HttpServletRequest; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.multipart.MultipartFile; @SuppressWarnings( "unused" ) @@ -22,11 +25,34 @@ import org.springframework.web.multipart.MultipartFile; public class FileUpload { @RequestMapping( path = "/file-upload.do" ) - public void getUploadFile( @RequestParam( "task-name" ) String taskName, - @RequestParam( "file" ) MultipartFile[] files ) + @ResponseBody + public FileUploadResult getUploadFile( @RequestParam( "task-name" ) String taskName, + @RequestParam( "file" ) MultipartFile[] files, HttpServletRequest request ) { + // session id用来创建临时目录，避免重复 + String sessionID = request.getSession().getId(); + FileUploadResult result = new FileUploadResult(); + Vector fileNames = new Vector(); int fileCount = files.length; - return; + if ( files.length == 0 ) + { + result.setSuccess( false ); + result.setMessage( "此接口用于上传文件!" ); + } + + result.setSuccess( true ); + result.setMessage( "上传成功!" ); + + for ( MultipartFile file : files ) + { + String fileName = file.getName(); + + fileNames.add( fileName ); + } + + result.setFileList( fileNames ); + + return result; } } diff --git a/企业级管理系统/java/AdminSys/src/main/java/com/cpic/xim/web/controllers/FileUpload/FileUploadResult.java b/企业级管理系统/java/AdminSys/src/main/java/com/cpic/xim/web/controllers/FileUpload/FileUploadResult.java new file mode 100644 index 0000000..37a018a --- /dev/null +++ b/企业级管理系统/java/AdminSys/src/main/java/com/cpic/xim/web/controllers/FileUpload/FileUploadResult.java @@ -0,0 +1,62 @@ +/* + * @Author: Kane + * @Date: 2023-01-23 22:56:17 + * @LastEditors: Kane + * @LastEditTime: 2023-01-23 22:56:25 + * @FilePath: \AdminSys\src\main\java\com\cpic\xim\web\controllers\FileUpload\FileUploadResult.java + * @Description: + * + * Copyright (c) ${2022} by Kane, All Rights Reserved. + */ + +package com.cpic.xim.web.controllers.FileUpload; + +import java.util.Vector; +import com.fasterxml.jackson.annotation.JsonProperty; + +@SuppressWarnings( "unused" ) +public class FileUploadResult +{ + public FileUploadResult() + {} + + public boolean isSuccess() + { + return success; + } + + public void setSuccess( boolean success ) + { + this.success = success; + } + + public String getMessage() + { + return message; + } + + public void setMessage( String message ) + { + this.message = message; + } + + public Vector getFileList() + { + return fileList; + } + + public void setFileList( Vector fileList ) + { + this.fileList = fileList; + } + + @JsonProperty( "success" ) + private boolean success; + + @JsonProperty( "message" ) + private String message; + + @JsonProperty( "file-list" ) + private Vector fileList; +} + diff --git a/企业级管理系统/java/AdminSys/src/main/java/com/cpic/xim/web/controllers/account/P13AccountCheckController.java b/企业级管理系统/java/AdminSys/src/main/java/com/cpic/xim/web/controllers/account/P13AccountCheckController.java index 6516e54..a329069 100644 --- a/企业级管理系统/java/AdminSys/src/main/java/com/cpic/xim/web/controllers/account/P13AccountCheckController.java +++ b/企业级管理系统/java/AdminSys/src/main/java/com/cpic/xim/web/controllers/account/P13AccountCheckController.java @@ -39,7 +39,7 @@ public class P13AccountCheckController * @return 返回一个P13AccountCheckResult对象，其中提供验证结果 *****************************************************/ @ResponseBody - @RequestMapping( path = "/p13_account_check.do" ) + @RequestMapping( path = "/p13_account_check" ) public P13AccountCheckResult checkP13Account( @RequestBody P13AccountCheckRequest param, HttpServletRequest request, HttpServletResponse response ) throws IllegalSelectorException, IOException diff --git a/企业级管理系统/java/AdminSys/src/main/java/com/cpic/xim/web/filters/token/TokenFilter.java b/企业级管理系统/java/AdminSys/src/main/java/com/cpic/xim/web/filters/token/TokenFilter.java index 722944f..dea62f8 100644 --- a/企业级管理系统/java/AdminSys/src/main/java/com/cpic/xim/web/filters/token/TokenFilter.java +++ b/企业级管理系统/java/AdminSys/src/main/java/com/cpic/xim/web/filters/token/TokenFilter.java @@ -2,7 +2,7 @@ * @Author: Kane * @Date: 2023-01-12 15:01:22 * @LastEditors: Kane - * @LastEditTime: 2023-01-13 09:23:55 + * @LastEditTime: 2023-01-24 00:07:36 * @FilePath: \AdminSys\src\main\java\com\cpic\xim\web\filters\token\TokenFilter.java * @Description: 用于检查token的过滤器 * @@ -19,7 +19,7 @@ import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -@SuppressWarnings( "unused") +@SuppressWarnings( "unused" ) public class TokenFilter implements Filter { /***************************************************** @@ -32,7 +32,8 @@ public class TokenFilter implements Filter HttpServletRequest request = (HttpServletRequest) req; HttpServletResponse response = (HttpServletResponse) resp; - String URI = request.getRequestURI(); + // 验证Token + String token = request.getHeader( "Token" ); chain.doFilter( request, response ); } diff --git a/企业级管理系统/java/AdminSys/src/main/java/com/cpic/xim/web/listener/ContextLoaderListener.java b/企业级管理系统/java/AdminSys/src/main/java/com/cpic/xim/web/listener/ContextLoaderListener.java index c855938..8a2a3c0 100644 --- a/企业级管理系统/java/AdminSys/src/main/java/com/cpic/xim/web/listener/ContextLoaderListener.java +++ b/企业级管理系统/java/AdminSys/src/main/java/com/cpic/xim/web/listener/ContextLoaderListener.java @@ -2,7 +2,7 @@ * @Author: Kane * @Date: 2022-12-15 19:40:12 * @LastEditors: Kane - * @LastEditTime: 2022-12-16 10:14:54 + * @LastEditTime: 2023-01-23 23:58:26 * @FilePath: \AdminSys\src\main\java\com\cpic\xim\web\listener\ContextLoaderListener.java * @Description: * @@ -19,7 +19,7 @@ import javax.servlet.ServletContextListener; import com.fasterxml.jackson.databind.ObjectMapper; @SuppressWarnings( -{ "unused"}) +{ "unused"} ) public class ContextLoaderListener implements ServletContextListener { private static final int BUFFER_SIZE = 1024; @@ -53,5 +53,19 @@ public class ContextLoaderListener implements ServletContextListener { } + finally + { + try + { + if ( configFile != null ) + { + configFile.close(); + } + } + catch ( Exception error ) + { + error.printStackTrace(); + } + } } } diff --git a/企业级管理系统/java/AdminSys/src/main/webapp/WEB-INF/web.xml b/企业级管理系统/java/AdminSys/src/main/webapp/WEB-INF/web.xml index b4a50e9..f4d2ca4 100644 --- a/企业级管理系统/java/AdminSys/src/main/webapp/WEB-INF/web.xml +++ b/企业级管理系统/java/AdminSys/src/main/webapp/WEB-INF/web.xml @@ -17,7 +17,22 @@ springmvc *.do + + springmvc + /account/p13_account_check + + + + token-filter + com.cpic.xim.web.filters.token.TokenFilter + + + token-filter + *.do + + + cros-filter com.cpic.xim.web.filters.cros.CrosFilter @@ -27,14 +42,6 @@ *.do - - token-filter - com.cpic.xim.web.filters.token.TokenFilter - - - token-filter - *.do - diff --git a/企业级管理系统/web/admin_system/.env.development b/企业级管理系统/web/admin_system/.env.development index 0c722f7..967ce03 100644 --- a/企业级管理系统/web/admin_system/.env.development +++ b/企业级管理系统/web/admin_system/.env.development @@ -1 +1,2 @@ -VUE_APP_API_URL_LOGIN = "http://222.76.244.118:11001/admin-system/account/p13_account_check.do" +VUE_APP_API_URL_LOGIN = "http://222.76.244.118:11001/admin-system/account/p13_account_check" +VUR_APPP_API_URL_UPLOAD_FILE= "http://222.76.244.118:11001/admin-system/file/file-upload.do" \ No newline at end of file