From 9f48a4db760a56e94505a48537450770a540a331 Mon Sep 17 00:00:00 2001 From: chenxudong Date: Wed, 2 Apr 2025 16:42:53 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E9=80=9A=E4=BA=86jdk17?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- electrmangnetic-backup/pom.xml | 11 ++++++++ .../backup/controller/FileController.java | 2 +- .../backup/serviceimp/FileServiceImpl.java | 2 +- electrmangnetic/pom.xml | 26 ++++++++++++++++--- .../industry/software/manage/Application.java | 2 ++ .../controller/UserEdFileInfoController.java | 2 -- electromagnetic-common/pom.xml | 11 +++++++- 7 files changed, 48 insertions(+), 8 deletions(-) diff --git a/electrmangnetic-backup/pom.xml b/electrmangnetic-backup/pom.xml index 9ce38a8..ff29ae3 100644 --- a/electrmangnetic-backup/pom.xml +++ b/electrmangnetic-backup/pom.xml @@ -37,6 +37,17 @@ 1.0 compile + + javax.xml.bind + jaxb-api + 2.3.1 + + + + com.sun.xml.bind + jaxb-impl + 2.3.3 + diff --git a/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/controller/FileController.java b/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/controller/FileController.java index ecfb04a..783e034 100644 --- a/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/controller/FileController.java +++ b/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/controller/FileController.java @@ -9,6 +9,7 @@ import com.electromagnetic.industry.software.backup.service.FileService; import com.electromagnetic.industry.software.common.pojo.BackupFileResLog; import com.electromagnetic.industry.software.common.resp.ElectromagneticResult; import com.electromagnetic.industry.software.common.util.ElectromagneticResultUtil; +import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.core.io.InputStreamResource; import org.springframework.http.ResponseEntity; @@ -17,7 +18,6 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import javax.annotation.Resource; import java.util.Date; @RestController diff --git a/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/serviceimp/FileServiceImpl.java b/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/serviceimp/FileServiceImpl.java index 656dfb0..e09963c 100644 --- a/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/serviceimp/FileServiceImpl.java +++ b/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/serviceimp/FileServiceImpl.java @@ -6,6 +6,7 @@ import cn.hutool.crypto.SecureUtil; import com.electromagnetic.industry.software.backup.pojo.BackupPro; import com.electromagnetic.industry.software.backup.service.FileService; import com.electromagnetic.industry.software.common.util.EleCommonUtil; +import jakarta.annotation.Resource; import org.springframework.core.io.FileSystemResource; import org.springframework.core.io.InputStreamResource; import org.springframework.http.MediaType; @@ -13,7 +14,6 @@ import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; -import javax.annotation.Resource; import java.io.File; import java.io.IOException; diff --git a/electrmangnetic/pom.xml b/electrmangnetic/pom.xml index c8a8ae9..d9d638e 100644 --- a/electrmangnetic/pom.xml +++ b/electrmangnetic/pom.xml @@ -37,8 +37,8 @@ com.baomidou - mybatis-plus-boot-starter - 3.5.3.1 + mybatis-plus-spring-boot3-starter + 3.5.7 mysql @@ -101,6 +101,16 @@ aspectjweaver 1.9.7 + + javax.xml.bind + jaxb-api + 2.3.1 + + + com.sun.xml.bind + jaxb-impl + 2.3.3 + @@ -109,7 +119,6 @@ org.springframework.boot spring-boot-maven-plugin - 2.6.12 @@ -121,6 +130,17 @@ + + org.apache.maven.plugins + maven-compiler-plugin + 3.13.0 + + true + + -parameters + + + diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/Application.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/Application.java index 5b2a4a0..0690d30 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/Application.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/Application.java @@ -1,11 +1,13 @@ package com.electromagnetic.industry.software.manage; +import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.scheduling.annotation.EnableScheduling; @SpringBootApplication @EnableScheduling +@MapperScan("com.electromagnetic.industry.software.manage.mapper") public class Application { public static void main(String[] args) { SpringApplication.run(Application.class, args); diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserEdFileInfoController.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserEdFileInfoController.java index 8a9e618..fae4925 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserEdFileInfoController.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserEdFileInfoController.java @@ -29,8 +29,6 @@ public class UserEdFileInfoController { @Resource private EdFileInfoService edFileInfoService; - @Resource - private EdFileFavoriteService edFileFavoriteService; @UserOperation(value = "查看工程树", modelName = UserOperationModuleEnum.USER_PRJ) @RequestMapping("tree") diff --git a/electromagnetic-common/pom.xml b/electromagnetic-common/pom.xml index 9dad24d..622aad7 100644 --- a/electromagnetic-common/pom.xml +++ b/electromagnetic-common/pom.xml @@ -91,7 +91,16 @@ pdfbox 2.0.24 - + + javax.xml.bind + jaxb-api + 2.3.1 + + + com.sun.xml.bind + jaxb-impl + 2.3.3 +