diff --git a/project2/.idea/artifacts/project2_war_exploded.xml b/project2/.idea/artifacts/project2_war_exploded.xml index 4cf4e7b..85ee3fa 100644 --- a/project2/.idea/artifacts/project2_war_exploded.xml +++ b/project2/.idea/artifacts/project2_war_exploded.xml @@ -21,7 +21,6 @@ - @@ -60,6 +59,8 @@ + + diff --git a/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/applicationContext.xml b/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/applicationContext.xml index 3ad282e..8a574e3 100644 --- a/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/applicationContext.xml +++ b/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/applicationContext.xml @@ -3,13 +3,23 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xmlns:mvc="http://www.springframework.org/schema/mvc" + xmlns:multipart="http://www.springframework.org/schema/mvc" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://www.springframework.org/schema/mvc https://www.springframework.org/schema/mvc/spring-mvc.xsd"> + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd + http://www.springframework.org/schema/mvc https://www.springframework.org/schema/mvc/spring-mvc.xsd"> + + + + + + + diff --git a/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/cyou/chenx221/controller/PersonController.class b/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/cyou/chenx221/controller/PersonController.class new file mode 100644 index 0000000..c595d2c Binary files /dev/null and b/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/cyou/chenx221/controller/PersonController.class differ diff --git a/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/cyou/chenx221/mapper/UserMapper.class b/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/cyou/chenx221/mapper/UserMapper.class index 904c806..f5e2743 100644 Binary files a/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/cyou/chenx221/mapper/UserMapper.class and b/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/cyou/chenx221/mapper/UserMapper.class differ diff --git a/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/cyou/chenx221/pojo/User.class b/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/cyou/chenx221/pojo/User.class index c083d54..2c3ab7a 100644 Binary files a/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/cyou/chenx221/pojo/User.class and b/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/cyou/chenx221/pojo/User.class differ diff --git a/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/cyou/chenx221/service/PersonService.class b/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/cyou/chenx221/service/PersonService.class new file mode 100644 index 0000000..9f13f48 Binary files /dev/null and b/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/cyou/chenx221/service/PersonService.class differ diff --git a/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/mapper/UserMapper.xml b/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/mapper/UserMapper.xml index 8f3887a..62ba558 100644 --- a/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/mapper/UserMapper.xml +++ b/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/mapper/UserMapper.xml @@ -45,4 +45,14 @@ FROM user WHERE username = #{username} + + UPDATE user + SET photo = #{avatar} + WHERE username = #{username} + + diff --git a/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/spring-security.xml b/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/spring-security.xml index 94d7743..b1c87ab 100644 --- a/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/spring-security.xml +++ b/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/spring-security.xml @@ -29,6 +29,7 @@ +
    -
  • 个人设定
    • +
  • 个人设定
  • 系统设定
  • 用户管理
  • 日志管理
    • diff --git a/project2/out/artifacts/project2_war_exploded/WEB-INF/views/person.jsp b/project2/out/artifacts/project2_war_exploded/WEB-INF/views/person.jsp new file mode 100644 index 0000000..28fb270 --- /dev/null +++ b/project2/out/artifacts/project2_war_exploded/WEB-INF/views/person.jsp @@ -0,0 +1,252 @@ +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> + + + + + + + + 个人设置 + + + + + + + + + + + +
    + +
    + + + + +
    +
    +
    +
    + +
    +
    + +
    +
    +
    +
    +
    +
    +
    +

    + Avatar: +

    +
    +
    + + +
    +
    + + +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + + +
    + + + + +
    +
    + + + + + + + + \ No newline at end of file diff --git a/project2/pom.xml b/project2/pom.xml index b46af88..83c3272 100644 --- a/project2/pom.xml +++ b/project2/pom.xml @@ -152,7 +152,7 @@ commons-io commons-io - 2.12.0 + 2.11.0 io.minio @@ -170,7 +170,12 @@ okio-jvm 3.1.0 - + + commons-fileupload + commons-fileupload + 1.5 + + diff --git a/project2/src/main/java/cyou/chenx221/controller/PersonController.java b/project2/src/main/java/cyou/chenx221/controller/PersonController.java new file mode 100644 index 0000000..04eb7b5 --- /dev/null +++ b/project2/src/main/java/cyou/chenx221/controller/PersonController.java @@ -0,0 +1,86 @@ +package cyou.chenx221.controller; + +import cyou.chenx221.helper.UsernameHelper; +import cyou.chenx221.mapper.UserMapper; +import cyou.chenx221.pojo.Course; +import cyou.chenx221.pojo.User; +import cyou.chenx221.service.PersonService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.io.InputStreamResource; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Controller +@RequestMapping("/person") +public class PersonController { + private final PersonService personService; + @Autowired + private UserMapper userMapper; + + @Autowired + public PersonController(PersonService personService) { + this.personService = personService; + } + + @GetMapping("/settings")//课程信息查询（不带条件） + public String getPersonSettings(Model model) { + String username = new UsernameHelper().getCurrentUsername(); + if (username != null) { + model.addAttribute("username", username); + } + return "person"; // 重定向到 dashboard 页面 + } + + @ResponseBody + @PostMapping("/uploadAvatar") + public ResponseEntity> uploadAvatar(@RequestParam("avatar") MultipartFile file) { + Map response = new HashMap<>(); + + // 处理上传的头像图片文件 //TODO: 清理没有关联的图像资源 + if (!file.isEmpty()) { + try { +// String avatarUrl = personService.uploadAvatar(file); + String object = personService.uploadAvatar(file); + User user = new User(); + user.setUsername(new UsernameHelper().getCurrentUsername()); + user.setAvatar(object); + userMapper.setAvatar(user); + // 设置返回的avatarUrl值 + response.put("avatarUrl", "/person/image"); +// response.put("avatarUrl", avatarUrl); + + // 返回成功消息和avatarUrl + return ResponseEntity.ok(response); + } catch (Exception e) { + String errorMessage = "Error uploading file: " + e.getMessage(); + response.put("message", errorMessage); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response); + } + } else { + response.put("message", "No file received"); + return ResponseEntity.badRequest().body(response); + } + } + + @ResponseBody + @GetMapping("/image") + public ResponseEntity getPersonImage() { + String objectName = userMapper.getAvatar(new UsernameHelper().getCurrentUsername()); + try { + InputStreamResource imageResource = personService.getImage(objectName); + return ResponseEntity.ok().body(imageResource); + } catch (Exception e) { + // Handle exception and return appropriate response + return ResponseEntity.notFound().build(); + } + } + +} diff --git a/project2/src/main/java/cyou/chenx221/mapper/UserMapper.java b/project2/src/main/java/cyou/chenx221/mapper/UserMapper.java index 8f1038f..70a0479 100644 --- a/project2/src/main/java/cyou/chenx221/mapper/UserMapper.java +++ b/project2/src/main/java/cyou/chenx221/mapper/UserMapper.java @@ -25,4 +25,8 @@ public interface UserMapper { int enabledUser(int id); int getDetailByUsername(String username); + + void setAvatar(User user); + + String getAvatar(String username); } diff --git a/project2/src/main/java/cyou/chenx221/pojo/User.java b/project2/src/main/java/cyou/chenx221/pojo/User.java index 44425a6..6d878ac 100644 --- a/project2/src/main/java/cyou/chenx221/pojo/User.java +++ b/project2/src/main/java/cyou/chenx221/pojo/User.java @@ -9,6 +9,16 @@ public class User { private int disabled;//是否被禁用 private boolean disabled_str; + private String avatar; + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } + public boolean getDisabled_str() { return disabled_str; } diff --git a/project2/src/main/java/cyou/chenx221/service/PersonService.java b/project2/src/main/java/cyou/chenx221/service/PersonService.java new file mode 100644 index 0000000..65cd5e5 --- /dev/null +++ b/project2/src/main/java/cyou/chenx221/service/PersonService.java @@ -0,0 +1,92 @@ +package cyou.chenx221.service; + +import io.minio.*; +import io.minio.errors.MinioException; +import org.springframework.core.io.InputStreamResource; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; +import java.util.UUID; + +@Service +public class PersonService { + + private static final String MINIO_ENDPOINT = "http://192.168.8.149:9199"; + private static final String MINIO_ACCESS_KEY = "cGa3QelqYf3Ujw29vR6o"; + private static final String MINIO_SECRET_KEY = "WzV1WFCovOFcFj31v7tlqDCzeIkM90m8EAunMC7b"; + private static final String MINIO_BUCKET_NAME = "project2"; + + public String uploadAvatar(MultipartFile file) throws IOException { + String tempFilePath = "file/" + file.getOriginalFilename(); + File tempFile = new File(tempFilePath); + file.transferTo(tempFile); + String objectName = null; + try { + // Create a MinioClient with the MinIO server endpoint, access key, and secret key. + MinioClient minioClient = + MinioClient.builder() + .endpoint(MINIO_ENDPOINT) + .credentials(MINIO_ACCESS_KEY, MINIO_SECRET_KEY) + .build(); + + // Make bucket if not exist. + boolean found = + minioClient.bucketExists(BucketExistsArgs.builder().bucket(MINIO_BUCKET_NAME).build()); + if (!found) { + // Make a new bucket called 'project2'. + minioClient.makeBucket(MakeBucketArgs.builder().bucket(MINIO_BUCKET_NAME).build()); + } else { + System.out.println("[INFO] Bucket 'project2' already exists."); + } + + // Generate a unique object name + objectName = generateUniqueObjectName(file.getOriginalFilename()); + System.out.println("[INFO] Uploading file '" + objectName + "' to bucket '" + MINIO_BUCKET_NAME + "'."); + // Upload the file to the bucket + minioClient.uploadObject( + UploadObjectArgs.builder() + .bucket(MINIO_BUCKET_NAME) + .object(objectName) + .filename(tempFile.getAbsolutePath()) +// .contentType("image/jpeg") + .build()); + } catch (MinioException e) { + System.out.println("Error occurred: " + e); + System.out.println("HTTP trace: " + e.httpTrace()); + } catch (InvalidKeyException | NoSuchAlgorithmException | IOException e) { + throw new RuntimeException(e); + } + tempFile.delete(); + return objectName; + } + + private String generateUniqueObjectName(String originalFilename) { + return UUID.randomUUID() + "_" + originalFilename; + } + + public InputStreamResource getImage(String object) throws Exception { + // Create a MinioClient with the MinIO server endpoint, access key, and secret key. + MinioClient minioClient = + MinioClient.builder() + .endpoint(MINIO_ENDPOINT) + .credentials(MINIO_ACCESS_KEY, MINIO_SECRET_KEY) + .build(); + + // Get the object from MinIO + InputStream stream = minioClient.getObject( + GetObjectArgs.builder() + .bucket(MINIO_BUCKET_NAME) + .object(object) + .build() + ); + + // Wrap the image data in InputStreamResource + return new InputStreamResource(stream); + } + +} \ No newline at end of file diff --git a/project2/src/main/resources/applicationContext.xml b/project2/src/main/resources/applicationContext.xml index 3ad282e..8a574e3 100644 --- a/project2/src/main/resources/applicationContext.xml +++ b/project2/src/main/resources/applicationContext.xml @@ -3,13 +3,23 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xmlns:mvc="http://www.springframework.org/schema/mvc" + xmlns:multipart="http://www.springframework.org/schema/mvc" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://www.springframework.org/schema/mvc https://www.springframework.org/schema/mvc/spring-mvc.xsd"> + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd + http://www.springframework.org/schema/mvc https://www.springframework.org/schema/mvc/spring-mvc.xsd"> + + + + + + + diff --git a/project2/src/main/resources/mapper/UserMapper.xml b/project2/src/main/resources/mapper/UserMapper.xml index 8f3887a..62ba558 100644 --- a/project2/src/main/resources/mapper/UserMapper.xml +++ b/project2/src/main/resources/mapper/UserMapper.xml @@ -45,4 +45,14 @@ FROM user WHERE username = #{username} + + UPDATE user + SET photo = #{avatar} + WHERE username = #{username} + + diff --git a/project2/src/main/resources/spring-security.xml b/project2/src/main/resources/spring-security.xml index 94d7743..b1c87ab 100644 --- a/project2/src/main/resources/spring-security.xml +++ b/project2/src/main/resources/spring-security.xml @@ -29,6 +29,7 @@ +
      -
    • 个人设定
      • +
    • 个人设定
    • 系统设定
    • 用户管理
    • 日志管理
      • diff --git a/project2/web/WEB-INF/views/person.jsp b/project2/web/WEB-INF/views/person.jsp new file mode 100644 index 0000000..850c31c --- /dev/null +++ b/project2/web/WEB-INF/views/person.jsp @@ -0,0 +1,253 @@ +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> + + + + + + + + 个人设置 + + + + + + + + + + + +
      + +
      + + + + +
      +
      +
      +
      + +
      +
      + +
      +
      +
      +
      +
      +
      +
      +

      + Avatar: +

      +
      +
      + + +
      +
      + + +
      +
      +
      +
      +<%-- --%> +<%-- Todo: 换成消息框--%> +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      + + +
      + + + + +
      +
      + + + + + + + + \ No newline at end of file