From 9d56e0550ded89ffcfb7f6180fb29e4dd773e238 Mon Sep 17 00:00:00 2001
From: 2991692032 <cizq297@gmail.com>
Date: Fri, 23 May 2025 01:58:59 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DTypeScrip=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E9=94=99=E8=AF=AF=E5=92=8C=E7=94=A8=E6=88=B7store?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=BC=95=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/resource/MyResourcesView.vue    |   7 +-
 .../src/views/resource/ResourceDetailView.vue |   7 +-
 .../src/views/schedule/CourseTableView.vue    |   8 +-
 Front/vue-unilife/tsconfig.app.json           |  13 +-
 unilife-server/.gitignore                     |  11 ++
 unilife-server/pom.xml                        |   7 +
 .../java/com/unilife/config/WebMvcConfig.java |  18 ++
 .../service/impl/ResourceServiceImpl.java     |  66 ++++---
 .../java/com/unilife/utils/OssService.java    | 164 ++++++++++--------
 .../src/main/resources/application.yml        |   4 +-
 10 files changed, 180 insertions(+), 125 deletions(-)

diff --git a/Front/vue-unilife/src/views/resource/MyResourcesView.vue b/Front/vue-unilife/src/views/resource/MyResourcesView.vue
index 5a80359..38aa68e 100644
--- a/Front/vue-unilife/src/views/resource/MyResourcesView.vue
+++ b/Front/vue-unilife/src/views/resource/MyResourcesView.vue
@@ -162,7 +162,7 @@
 <script setup lang="ts">
 import { ref, reactive, onMounted } from 'vue';
 import { useRouter } from 'vue-router';
-import { ElMessage, ElMessageBox, FormInstance } from 'element-plus';
+import { ElMessage, ElMessageBox, type FormInstance } from 'element-plus';
 import { resourceApi } from '@/api';
 import { Upload, Document, Picture, Files, Folder, Grid, Reading, Promotion } from '@element-plus/icons-vue';
 
@@ -345,10 +345,7 @@ const submitEdit = async () => {
     if (valid) {
       submitting.value = true;
 
-      try {
-        const res = await resourceApi.updateResource(currentEditId.value, editForm);
-
-        if (res.code === 200) {
+                try {          const res = await resourceApi.updateResource(currentEditId.value!, editForm);          if (res.code === 200) {
           ElMessage.success('资源信息更新成功');
           editDialogVisible.value = false;
           fetchMyResources();
diff --git a/Front/vue-unilife/src/views/resource/ResourceDetailView.vue b/Front/vue-unilife/src/views/resource/ResourceDetailView.vue
index 7b5d744..d7f88cf 100644
--- a/Front/vue-unilife/src/views/resource/ResourceDetailView.vue
+++ b/Front/vue-unilife/src/views/resource/ResourceDetailView.vue
@@ -132,7 +132,7 @@
 <script setup lang="ts">
 import { ref, reactive, onMounted, computed } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
-import { ElMessage, ElMessageBox, FormInstance } from 'element-plus';
+import { ElMessage, ElMessageBox, type FormInstance } from 'element-plus';
 import { resourceApi } from '@/api';
 import { useUserStore } from '@/stores';
 import { Download, Star, More, View, Files, Document } from '@element-plus/icons-vue';
@@ -163,10 +163,7 @@ const editRules = {
 };
 
 // 计算属性
-const isOwner = computed(() => {
-  if (!resource.value || !userStore.user) return false;
-  return resource.value.userId === userStore.user.id;
-});
+const isOwner = computed(() => {  if (!resource.value || !userStore.userInfo) return false;  return resource.value.userId === userStore.userInfo.id;});
 
 const isImage = computed(() => {
   if (!resource.value) return false;
diff --git a/Front/vue-unilife/src/views/schedule/CourseTableView.vue b/Front/vue-unilife/src/views/schedule/CourseTableView.vue
index 72c7f99..030e344 100644
--- a/Front/vue-unilife/src/views/schedule/CourseTableView.vue
+++ b/Front/vue-unilife/src/views/schedule/CourseTableView.vue
@@ -14,7 +14,7 @@
         <div class="filter-row">
           <div class="semester-selector">
             <span class="filter-label">学期：</span>
-            <el-select v-model="currentSemester" placeholder="选择学期">
+            <el-select v-model="currentSemester" placeholder="选择学期" style="min-width: 220px;">
               <el-option label="2023-2024学年第一学期" value="2023-1"></el-option>
               <el-option label="2023-2024学年第二学期" value="2023-2"></el-option>
             </el-select>
@@ -217,7 +217,7 @@
 
 <script setup lang="ts">
 import { ref, reactive, computed, onMounted } from 'vue';
-import { ElMessage, ElMessageBox, FormInstance } from 'element-plus';
+import { ElMessage, ElMessageBox, type FormInstance } from 'element-plus';
 import { scheduleApi } from '@/api';
 import { useUserStore } from '@/stores';
 import { Plus, ArrowLeft, ArrowRight } from '@element-plus/icons-vue';
@@ -280,8 +280,8 @@ const courseRules = {
 const courseDetailVisible = ref(false);
 const selectedCourse = ref<any>(null);
 const isOwner = computed(() => {
-  if (!selectedCourse.value || !userStore.user) return false;
-  return selectedCourse.value.userId === userStore.user.id;
+  if (!selectedCourse.value || !userStore.userInfo) return false;
+  return selectedCourse.value.userId === userStore.userInfo.id;
 });
 
 // 初始化
diff --git a/Front/vue-unilife/tsconfig.app.json b/Front/vue-unilife/tsconfig.app.json
index 758a2e1..5387b4d 100644
--- a/Front/vue-unilife/tsconfig.app.json
+++ b/Front/vue-unilife/tsconfig.app.json
@@ -1,15 +1,4 @@
-{
-  "extends": "@vue/tsconfig/tsconfig.dom.json",
-  "compilerOptions": {
-    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
-
-    /* Linting */
-    "strict": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "noFallthroughCasesInSwitch": true,
-    "noUncheckedSideEffectImports": true
-  },
+{  "extends": "@vue/tsconfig/tsconfig.dom.json",  "compilerOptions": {    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",    "baseUrl": ".",    "paths": {      "@/*": ["src/*"]    },    /* Linting */    "strict": true,    "noUnusedLocals": true,    "noUnusedParameters": true,    "noFallthroughCasesInSwitch": true,    "noUncheckedSideEffectImports": true  },
   "include": ["src/**/*.ts", "src/**/*.tsx", "src/**/*.vue"],
   "exclude": [
     "src/**/*_test.vue",
diff --git a/unilife-server/.gitignore b/unilife-server/.gitignore
index 549e00a..f30b648 100644
--- a/unilife-server/.gitignore
+++ b/unilife-server/.gitignore
@@ -31,3 +31,14 @@ build/
 
 ### VS Code ###
 .vscode/
+
+### 敏感配置文件 ###
+application-local.yml
+application-dev.yml
+application-prod.yml
+.env
+*.env
+config/application-local.yml
+src/main/resources/application-local.yml
+src/main/resources/application-dev.yml
+src/main/resources/application-prod.yml
diff --git a/unilife-server/pom.xml b/unilife-server/pom.xml
index b8029f4..7f7c6ef 100644
--- a/unilife-server/pom.xml
+++ b/unilife-server/pom.xml
@@ -127,6 +127,13 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
+
+        <!-- 阿里云OSS -->
+        <dependency>
+            <groupId>com.aliyun.oss</groupId>
+            <artifactId>aliyun-sdk-oss</artifactId>
+            <version>3.15.0</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/unilife-server/src/main/java/com/unilife/config/WebMvcConfig.java b/unilife-server/src/main/java/com/unilife/config/WebMvcConfig.java
index 7318f50..f6ff92a 100644
--- a/unilife-server/src/main/java/com/unilife/config/WebMvcConfig.java
+++ b/unilife-server/src/main/java/com/unilife/config/WebMvcConfig.java
@@ -5,8 +5,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
+import java.io.File;
+
 @Configuration
 public class WebMvcConfig implements WebMvcConfigurer {
     @Autowired
@@ -28,6 +31,9 @@ public class WebMvcConfig implements WebMvcConfigurer {
                         "/posts/{id}",           // 帖子详情（另一种匹配方式）
                         "/categories",           // 分类列表
                         
+                        // 静态资源访问
+                        "/api/files/**",
+                        
                         // Swagger文档相关
                         "/swagger-resources/**",
                         "/v3/api-docs/**",
@@ -38,6 +44,18 @@ public class WebMvcConfig implements WebMvcConfigurer {
                         );
     }
 
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        // 配置上传文件的访问路径
+        String uploadPath = new File("uploads").getAbsolutePath();
+        registry.addResourceHandler("/api/files/**")
+                .addResourceLocations("file:" + uploadPath + File.separator);
+        
+        // 直接映射到uploads/resources目录
+        registry.addResourceHandler("/api/resources/**")
+                .addResourceLocations("file:" + new File("uploads/resources").getAbsolutePath() + File.separator);
+    }
+
     @Override
     public void addCorsMappings(CorsRegistry registry) {
         registry.addMapping("/**")
diff --git a/unilife-server/src/main/java/com/unilife/service/impl/ResourceServiceImpl.java b/unilife-server/src/main/java/com/unilife/service/impl/ResourceServiceImpl.java
index cce8f38..18033e1 100644
--- a/unilife-server/src/main/java/com/unilife/service/impl/ResourceServiceImpl.java
+++ b/unilife-server/src/main/java/com/unilife/service/impl/ResourceServiceImpl.java
@@ -12,6 +12,7 @@ import com.unilife.model.entity.Resource;
 import com.unilife.model.entity.User;
 import com.unilife.model.vo.ResourceVO;
 import com.unilife.service.ResourceService;
+import com.unilife.utils.OssService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -42,9 +43,14 @@ public class ResourceServiceImpl implements ResourceService {
 
     @Autowired
     private CategoryMapper categoryMapper;
+    
+    @Autowired
+    private OssService ossService;
 
     // 文件存储路径，实际项目中应该配置在application.yml中
     private static final String UPLOAD_DIR = "uploads/resources/";
+    // OSS存储目录
+    private static final String OSS_DIR = "resources";
 
     @Override
     @Transactional
@@ -67,28 +73,15 @@ public class ResourceServiceImpl implements ResourceService {
         }
 
         try {
-            // 创建上传目录（如果不存在）
-            File uploadDir = new File(UPLOAD_DIR);
-            if (!uploadDir.exists()) {
-                uploadDir.mkdirs();
-            }
-
-            // 生成唯一文件名
-            String originalFilename = file.getOriginalFilename();
-            String fileExtension = originalFilename != null ? originalFilename.substring(originalFilename.lastIndexOf(".")) : "";
-            String newFilename = UUID.randomUUID().toString() + fileExtension;
-            String filePath = UPLOAD_DIR + newFilename;
-
-            // 保存文件
-            Path path = Paths.get(filePath);
-            Files.write(path, file.getBytes());
-
+            // 将文件上传到阿里云OSS
+            String fileUrl = ossService.uploadFile(file, OSS_DIR);
+            
             // 创建资源记录
             Resource resource = new Resource();
             resource.setUserId(userId);
             resource.setTitle(createResourceDTO.getTitle());
             resource.setDescription(createResourceDTO.getDescription());
-            resource.setFileUrl(filePath);
+            resource.setFileUrl(fileUrl); // 存储OSS文件URL
             resource.setFileSize(file.getSize());
             resource.setFileType(file.getContentType());
             resource.setCategoryId(createResourceDTO.getCategoryId());
@@ -103,7 +96,7 @@ public class ResourceServiceImpl implements ResourceService {
             data.put("resourceId", resource.getId());
 
             return Result.success(data, "资源上传成功");
-        } catch (IOException e) {
+        } catch (Exception e) {
             log.error("文件上传失败", e);
             return Result.error(500, "文件上传失败");
         }
@@ -128,7 +121,7 @@ public class ResourceServiceImpl implements ResourceService {
                 .id(resource.getId())
                 .title(resource.getTitle())
                 .description(resource.getDescription())
-                .fileUrl(resource.getFileUrl())
+                .fileUrl(resource.getFileUrl()) // 直接返回OSS URL
                 .fileSize(resource.getFileSize())
                 .fileType(resource.getFileType())
                 .userId(resource.getUserId())
@@ -239,6 +232,17 @@ public class ResourceServiceImpl implements ResourceService {
             return Result.error(403, "无权限删除此资源");
         }
 
+        // 删除OSS中的文件
+        try {
+            String fileUrl = resource.getFileUrl();
+            if (fileUrl != null && fileUrl.startsWith("http")) {
+                ossService.deleteFile(fileUrl);
+            }
+        } catch (Exception e) {
+            log.error("删除OSS文件失败", e);
+            // 继续执行，不影响数据库记录的删除
+        }
+
         // 删除资源（逻辑删除）
         resourceMapper.delete(resourceId);
 
@@ -256,15 +260,33 @@ public class ResourceServiceImpl implements ResourceService {
 
         // 增加下载次数
         resourceMapper.incrementDownloadCount(resourceId);
+        
+        // 处理文件URL，生成临时访问链接
+        String fileUrl = resource.getFileUrl();
+        // 提取对象名称并生成临时访问URL（有效期1小时）
+        String objectName = ossService.getObjectNameFromUrl(fileUrl);
+        if (objectName != null) {
+            // 生成有效期为1小时的临时访问URL
+            fileUrl = ossService.generatePresignedUrl(objectName, 3600 * 1000);
+        }
 
-        // 返回文件URL
+        // 返回文件URL和文件名
         Map<String, Object> data = new HashMap<>();
-        data.put("fileUrl", resource.getFileUrl());
-        data.put("fileName", resource.getTitle());
+        data.put("fileUrl", fileUrl);
+        data.put("fileName", resource.getTitle() + getFileExtension(fileUrl));
         data.put("fileType", resource.getFileType());
 
         return Result.success(data, "获取下载链接成功");
     }
+    
+    // 获取文件扩展名
+    private String getFileExtension(String filePath) {
+        int lastDot = filePath.lastIndexOf(".");
+        if (lastDot > 0) {
+            return filePath.substring(lastDot);
+        }
+        return "";
+    }
 
     @Override
     @Transactional
diff --git a/unilife-server/src/main/java/com/unilife/utils/OssService.java b/unilife-server/src/main/java/com/unilife/utils/OssService.java
index 9b6a602..cf849b8 100644
--- a/unilife-server/src/main/java/com/unilife/utils/OssService.java
+++ b/unilife-server/src/main/java/com/unilife/utils/OssService.java
@@ -1,123 +1,139 @@
 package com.unilife.utils;
 
 import com.aliyun.oss.OSS;
-import com.aliyun.oss.model.DeleteObjectRequest;
+import com.aliyun.oss.model.OSSObject;
 import com.aliyun.oss.model.GeneratePresignedUrlRequest;
-import com.aliyun.oss.model.PutObjectRequest;
 import com.unilife.config.OssConfig;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
+import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.UUID;
 
-@Service
 @Slf4j
+@Component
 public class OssService {
-
+    
     @Autowired
     private OSS ossClient;
-
+    
     @Autowired
     private OssConfig ossConfig;
-
+    
     /**
      * 上传文件到OSS
+     * @param file 文件
+     * @param dir 存储目录
+     * @return 返回文件访问URL
      */
-    public String uploadFile(MultipartFile file) throws IOException {
-        // 生成文件名
-        String originalFilename = file.getOriginalFilename();
-        String extension = "";
-        if (originalFilename != null && originalFilename.contains(".")) {
-            extension = originalFilename.substring(originalFilename.lastIndexOf("."));
-        }
+    public String uploadFile(MultipartFile file, String dir) {
+        String bucketName = ossConfig.getBucketName();
+        String urlPrefix = ossConfig.getUrlPrefix();
         
-        // 按日期组织文件夹
-        String dateFolder = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy/MM/dd"));
-        String fileName = dateFolder + "/" + UUID.randomUUID().toString() + extension;
-        
-        try (InputStream inputStream = file.getInputStream()) {
-            // 创建上传请求
-            PutObjectRequest putObjectRequest = new PutObjectRequest(
-                ossConfig.getBucketName(), 
-                fileName, 
-                inputStream
-            );
+        try {
+            // 获取文件原始名称
+            String originalFilename = file.getOriginalFilename();
+            // 获取文件后缀
+            String suffix = "";
+            if (originalFilename != null && originalFilename.contains(".")) {
+                suffix = originalFilename.substring(originalFilename.lastIndexOf("."));
+            }
             
-            // 执行上传
-            ossClient.putObject(putObjectRequest);
+            // 构建OSS存储路径：目录/日期/随机UUID.后缀
+            String dateDir = new SimpleDateFormat("yyyy/MM/dd").format(new Date());
+            String filename = UUID.randomUUID().toString().replaceAll("-", "") + suffix;
+            String objectName = dir + "/" + dateDir + "/" + filename;
             
-            // 返回文件URL
-            String fileUrl = ossConfig.getUrlPrefix() + fileName;
-            log.info("文件上传成功: {}", fileUrl);
-            return fileUrl;
-        } catch (Exception e) {
-            log.error("文件上传失败: {}", e.getMessage(), e);
-            throw new RuntimeException("文件上传失败: " + e.getMessage());
+            // 获取文件输入流
+            InputStream inputStream = file.getInputStream();
+            
+            // 上传文件到OSS
+            ossClient.putObject(bucketName, objectName, inputStream);
+            
+            // 关闭输入流
+            inputStream.close();
+            
+            // 返回文件访问URL
+            return urlPrefix + objectName;
+        } catch (IOException e) {
+            log.error("上传文件到OSS失败: ", e);
+            throw new RuntimeException("上传文件失败");
         }
     }
-
+    
     /**
-     * 删除OSS文件
+     * 从OSS删除文件
+     * @param fileUrl 文件URL
      */
     public void deleteFile(String fileUrl) {
-        try {
-            // 从URL中提取对象名称
-            String objectName = getObjectNameFromUrl(fileUrl);
-            if (objectName != null) {
-                DeleteObjectRequest deleteObjectRequest = new DeleteObjectRequest(
-                    ossConfig.getBucketName(), 
-                    objectName
-                );
-                ossClient.deleteObject(deleteObjectRequest);
-                log.info("文件删除成功: {}", fileUrl);
-            }
-        } catch (Exception e) {
-            log.error("文件删除失败: {}", e.getMessage(), e);
+        String bucketName = ossConfig.getBucketName();
+        String urlPrefix = ossConfig.getUrlPrefix();
+        
+        if (fileUrl.startsWith(urlPrefix)) {
+            String objectName = fileUrl.substring(urlPrefix.length());
+            ossClient.deleteObject(bucketName, objectName);
         }
     }
-
+    
     /**
-     * 生成预签名URL（临时访问链接）
+     * 获取OSS文件输入流
+     * @param fileUrl 文件URL
+     * @return 文件输入流
      */
-    public String generatePresignedUrl(String fileUrl) {
+    public InputStream getFileStream(String fileUrl) {
+        String bucketName = ossConfig.getBucketName();
+        String urlPrefix = ossConfig.getUrlPrefix();
+        
+        if (fileUrl.startsWith(urlPrefix)) {
+            String objectName = fileUrl.substring(urlPrefix.length());
+            OSSObject ossObject = ossClient.getObject(bucketName, objectName);
+            return ossObject.getObjectContent();
+        }
+        return null;
+    }
+    
+    /**
+     * 获取文件的临时访问URL（适用于私有bucket）
+     * @param objectName 对象名称
+     * @param expiration 过期时间（毫秒）
+     * @return 带签名的临时URL
+     */
+    public String generatePresignedUrl(String objectName, long expiration) {
+        String bucketName = ossConfig.getBucketName();
+        
         try {
-            String objectName = getObjectNameFromUrl(fileUrl);
-            if (objectName == null) {
-                return fileUrl;
-            }
-            
-            // 设置URL过期时间为1小时
-            Date expiration = new Date(System.currentTimeMillis() + 3600 * 1000);
+            // 计算过期时间
+            Date expirationDate = new Date(System.currentTimeMillis() + expiration);
             
-            GeneratePresignedUrlRequest generatePresignedUrlRequest = new GeneratePresignedUrlRequest(
-                ossConfig.getBucketName(), 
-                objectName
-            );
-            generatePresignedUrlRequest.setExpiration(expiration);
+            // 创建请求
+            GeneratePresignedUrlRequest request = new GeneratePresignedUrlRequest(bucketName, objectName);
+            request.setExpiration(expirationDate);
             
-            URL url = ossClient.generatePresignedUrl(generatePresignedUrlRequest);
+            // 生成URL
+            URL url = ossClient.generatePresignedUrl(request);
             return url.toString();
         } catch (Exception e) {
-            log.error("生成预签名URL失败: {}", e.getMessage(), e);
-            return fileUrl;
+            log.error("生成临时访问URL失败: ", e);
+            throw new RuntimeException("生成临时访问URL失败");
         }
     }
-
+    
     /**
-     * 从URL中提取对象名称
+     * 从完整URL中提取对象名称
+     * @param fileUrl 完整的文件URL
+     * @return 对象名称
      */
     public String getObjectNameFromUrl(String fileUrl) {
-        if (fileUrl == null || !fileUrl.startsWith(ossConfig.getUrlPrefix())) {
-            return null;
+        String urlPrefix = ossConfig.getUrlPrefix();
+        if (fileUrl != null && fileUrl.startsWith(urlPrefix)) {
+            return fileUrl.substring(urlPrefix.length());
         }
-        return fileUrl.substring(ossConfig.getUrlPrefix().length());
+        return null;
     }
 } 
\ No newline at end of file
diff --git a/unilife-server/src/main/resources/application.yml b/unilife-server/src/main/resources/application.yml
index e1c0600..ff69b93 100644
--- a/unilife-server/src/main/resources/application.yml
+++ b/unilife-server/src/main/resources/application.yml
@@ -24,8 +24,6 @@ spring:
     redis:
       port: 6379
       host: 127.0.0.1
-  profiles:
-    active: local
 knife4j:
   enable: true
   openapi:
@@ -61,4 +59,4 @@ aliyun:
     accessKeyId: ${ALIYUN_OSS_ACCESS_KEY_ID:your-access-key-id}
     accessKeySecret: ${ALIYUN_OSS_ACCESS_KEY_SECRET:your-access-key-secret}
     bucketName: ${ALIYUN_OSS_BUCKET_NAME:your-bucket-name}
-    urlPrefix: ${ALIYUN_OSS_URL_PREFIX:https://your-bucket-name.oss-region.aliyuncs.com/}
\ No newline at end of file
+    urlPrefix: ${ALIYUN_OSS_URL_PREFIX:https://your-bucket-name.oss-region.aliyuncs.com/}spring.profiles.active=local