From 78d9a1a2bea1a9c544876f4f858da4f9dd5b103a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=95=B8=E9=9D=9E?= <13281114856@qq.com>
Date: Tue, 14 Mar 2023 17:50:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=99=84=E4=BB=B6=E6=98=BE?=
=?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../admin/src/views/notice/dialogshow.vue | 2 +-
.../admin/src/views/project/dialogshow.vue | 2 +-
.../system/upload/service/UploadService.java | 16 ++--------------
.../base/system/upload/web/UploadController.java | 3 +++
study-manager/target/classes/application.yml | 4 ++--
5 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/study-manager-ui/admin/src/views/notice/dialogshow.vue b/study-manager-ui/admin/src/views/notice/dialogshow.vue
index dedaf79..22acee2 100644
--- a/study-manager-ui/admin/src/views/notice/dialogshow.vue
+++ b/study-manager-ui/admin/src/views/notice/dialogshow.vue
@@ -117,7 +117,7 @@
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
- <Field :span="22" label="鏍囬" prop="title" v-model="form.title" type="textarea" placeholder="璇疯緭鍏ユ爣棰�"/>
+ <Field :span="22" label="鏍囬" prop="title" v-model="form.title" placeholder="璇疯緭鍏ユ爣棰�"/>
<Field :span="22" label="鍏憡绫诲瀷" prop="noticeType" v-model="form.noticeType" type="radio" :enumData="dict.noticeType" placeholder="璇烽€夋嫨鍏憡绫诲瀷"/>
<Field :span="22" label="鍙戝竷閮ㄩ棬" prop="pubDeptId" v-model="form.pubDeptId" type="select" :enumData="dict.pubDeptId" placeholder="璇烽€夋嫨鍙戝竷閮ㄩ棬"/>
<Field :span="22" label="鏌ョ湅浜哄憳" prop="viewPersion" v-model="form.viewPersion" type="radio" :enumData="{0:'鍏ㄩ儴浜哄憳',1:'閮ㄥ垎浜哄憳'}" placeholder="璇烽€夋嫨鏌ョ湅浜哄憳"/>
diff --git a/study-manager-ui/admin/src/views/project/dialogshow.vue b/study-manager-ui/admin/src/views/project/dialogshow.vue
index aa19169..3a40fc1 100644
--- a/study-manager-ui/admin/src/views/project/dialogshow.vue
+++ b/study-manager-ui/admin/src/views/project/dialogshow.vue
@@ -113,7 +113,7 @@
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
- <Field :span="22" label="鏍囬" prop="title" v-model="form.title" type="textarea" placeholder="璇疯緭鍏ユ爣棰�"/>
+ <Field :span="22" label="鏍囬" prop="title" v-model="form.title" placeholder="璇疯緭鍏ユ爣棰�"/>
<Field :span="22" label="椤圭洰绫诲瀷" prop="projectType" v-model="form.projectType" type="radio" :enumData="dict.projectType" placeholder="璇烽€夋嫨椤圭洰绫诲瀷"/>
<Field :span="22" label="寮€濮嬫椂闂�" prop="projectStartTime" v-model="form.projectStartTime" type="datetime"/>
<Field :span="22" label="缁撴潫鏃堕棿" prop="projectEndTime" v-model="form.projectEndTime" type="datetime"/>
diff --git a/study-manager/src/main/java/com/mortals/xhx/base/system/upload/service/UploadService.java b/study-manager/src/main/java/com/mortals/xhx/base/system/upload/service/UploadService.java
index 81dcd84..20c4d67 100644
--- a/study-manager/src/main/java/com/mortals/xhx/base/system/upload/service/UploadService.java
+++ b/study-manager/src/main/java/com/mortals/xhx/base/system/upload/service/UploadService.java
@@ -46,24 +46,12 @@ public interface UploadService extends IService {
*/
void fileDownload(String fileName, Boolean delete, HttpServletResponse response);
- /**
- * 棰勮
- * @param fileName
- * @param response
- */
+
void preview(String fileName, HttpServletResponse response);
- /**
- * 涓婁紶
- * @param fileName
- * @param response
- */
+
void uploadDownload(String fileName, HttpServletResponse response);
- /**
- * 鍒櫎
- * @param fileName
- */
void deleteFile(String fileName);
}
\ No newline at end of file
diff --git a/study-manager/src/main/java/com/mortals/xhx/base/system/upload/web/UploadController.java b/study-manager/src/main/java/com/mortals/xhx/base/system/upload/web/UploadController.java
index 7bea269..05d6e7b 100644
--- a/study-manager/src/main/java/com/mortals/xhx/base/system/upload/web/UploadController.java
+++ b/study-manager/src/main/java/com/mortals/xhx/base/system/upload/web/UploadController.java
@@ -2,6 +2,7 @@ package com.mortals.xhx.base.system.upload.web;
import com.alibaba.fastjson.JSONObject;
+import com.mortals.framework.annotation.UnAuth;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.web.BaseController;
import com.mortals.xhx.base.system.upload.service.UploadService;
@@ -28,6 +29,7 @@ public class UploadController extends BaseController {
private UploadService uploadService;
@RequestMapping(value = "upload")
+ @UnAuth
public String doFileUpload(HttpServletRequest request, UploadForm form) {
Map<String, Object> model = new HashMap<>();
String jsonStr = "";
@@ -52,6 +54,7 @@ public class UploadController extends BaseController {
@RequestMapping(value = "commonupload")
+ @UnAuth
public String doFileUpload(MultipartFile file, @RequestParam(value = "prePath",defaultValue = "file/fileupload") String prePath) {
Map<String, Object> model = new HashMap<>();
String jsonStr = "";
diff --git a/study-manager/target/classes/application.yml b/study-manager/target/classes/application.yml
index aebc19a..023bf2d 100644
--- a/study-manager/target/classes/application.yml
+++ b/study-manager/target/classes/application.yml
@@ -3,7 +3,7 @@ spring:
allow-bean-definition-overriding: true
application:
log:
- level: INFO
- path: /home/mortals/app/logs
+ level: info
+ path: /mortals/app/logs
--
2.24.3