更新 cn.reghao.jutil 依赖

agent/pom.xml

@@ -13,10 +13,6 @@
     <version>1.0.0</version>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
         <project.build.outputDir>${project.basedir}/bin</project.build.outputDir>
     </properties>
 

deployer/pom.xml

@@ -12,10 +12,6 @@
     <artifactId>deployer</artifactId>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
         <project.build.outputDir>${project.basedir}/bin</project.build.outputDir>
     </properties>
 

logstash/pom.xml

@@ -12,10 +12,6 @@
     <artifactId>logstash</artifactId>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
         <project.build.outputDir>${project.basedir}/bin</project.build.outputDir>
     </properties>
 

web/pom.xml

@@ -14,10 +14,6 @@
     <packaging>jar</packaging>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
         <project.build.outputDir>${project.basedir}/bin</project.build.outputDir>
         <springboot.version>2.6.15</springboot.version>
     </properties>
@@ -40,7 +36,7 @@
             <artifactId>jdk</artifactId>
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>cn.reghao.jutil</groupId>
             <artifactId>tool</artifactId>
             <version>1.0.0-SNAPSHOT</version>
@@ -49,17 +45,12 @@
             <groupId>cn.reghao.jutil</groupId>
             <artifactId>validator</artifactId>
             <version>1.0.0-SNAPSHOT</version>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>cn.reghao.bnt</groupId>
             <artifactId>common</artifactId>
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>cn.reghao.oss</groupId>
-            <artifactId>oss-api</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
-        </dependency>
 
         <dependency>
             <groupId>ch.qos.logback</groupId>

web/src/main/java/cn/reghao/bnt/web/admin/model/vo/FileInfo.java

@@ -2,8 +2,6 @@ package cn.reghao.bnt.web.admin.model.vo;
 
 import cn.reghao.bnt.web.admin.model.po.DiskFile;
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
-import cn.reghao.oss.api.constant.ObjectType;
-import cn.reghao.oss.api.dto.ObjectInfo;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -21,21 +19,12 @@ public class FileInfo {
     private int fileType;
     private String fileTypeStr;
 
-    public FileInfo(ObjectInfo objectInfo, String size) {
-        this.fileId = objectInfo.getObjectId();
-        this.filename = objectInfo.getFilename();
-        this.updateTime = objectInfo.getUpdateTime();
-        this.size = size;
-        this.fileType = objectInfo.getFileType();
-        this.fileTypeStr = ObjectType.getDescByCode(objectInfo.getFileType());
-    }
-
     public FileInfo(DiskFile diskFile, String size) {
         this.fileId = diskFile.getObjectId();
         this.filename = diskFile.getFilename();
         this.updateTime = DateTimeConverter.format(diskFile.getUpdateTime());
         this.size = size;
         this.fileType = diskFile.getFileType();
-        this.fileTypeStr = ObjectType.getDescByCode(diskFile.getFileType());
+        this.fileTypeStr = "";
     }
 }

web/src/main/java/cn/reghao/bnt/web/admin/service/FileService.java

@@ -9,7 +9,6 @@ import cn.reghao.jutil.web.ServletUtil;
 import cn.reghao.bnt.web.admin.db.repository.DiskFileRepository;
 import cn.reghao.bnt.web.admin.model.po.DiskFile;
 import cn.reghao.bnt.web.config.AppProperties;
-import cn.reghao.oss.api.constant.ObjectType;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
 import org.springframework.cache.annotation.Cacheable;
@@ -152,7 +151,7 @@ public class FileService {
         String destPath = String.format("%s/%s", fileDir, contentId);
         File savedFile = saveFile(file.getInputStream(), destPath);
         String contentType = "image/jpeg";
-        int fileType = ObjectType.Image.getCode();
+        int fileType = 1001;
         String sha256sum = DigestUtil.sha256sum(savedFile.getAbsolutePath());
 
         List<DiskFile> diskFiles = diskFileRepository.findBySha256sum(sha256sum);
@@ -207,7 +206,7 @@ public class FileService {
         Sort sort = Sort.by(Sort.Direction.DESC, "createTime");
         int pageSize = 12;
         PageRequest pageRequest = PageRequest.of(pageNumber-1, pageSize, sort);
-        int fileType = ObjectType.Image.getCode();
+        int fileType = 1001;
         Page<DiskFile> page = diskFileRepository.findByFileTypeAndOwner(fileType, owner, pageRequest);
         List<DiskFileInfo> list = page.getContent().stream().map(diskFile -> {
             String fileId = diskFile.getObjectId();

web/src/main/java/cn/reghao/bnt/web/blog/service/ArticleService.java

@@ -4,7 +4,7 @@ import cn.reghao.bnt.web.blog.model.CategoryType;
 import cn.reghao.bnt.web.blog.model.dto.ArticleDto;
 import cn.reghao.bnt.web.util.MarkdownUtil;
 import cn.reghao.jutil.jdk.result.Result;
-import cn.reghao.jutil.tool.id.IdGenerator;
+import cn.reghao.jutil.jdk.id.IdGenerator;
 import cn.reghao.bnt.web.blog.db.repository.ArticleRepository;
 import cn.reghao.bnt.web.blog.db.repository.ArticleTagRepository;
 import cn.reghao.bnt.web.blog.db.repository.CategoryRepository;

web/src/main/java/cn/reghao/bnt/web/blog/service/QuestionService.java

@@ -5,11 +5,10 @@ import cn.reghao.bnt.web.blog.model.po.Category;
 import cn.reghao.bnt.web.blog.model.po.Question;
 import cn.reghao.bnt.web.util.MarkdownUtil;
 import cn.reghao.jutil.jdk.result.Result;
-import cn.reghao.jutil.tool.id.IdGenerator;
+import cn.reghao.jutil.jdk.id.IdGenerator;
 import cn.reghao.bnt.web.blog.db.repository.CategoryRepository;
 import cn.reghao.bnt.web.blog.db.repository.QuestionRepository;
 import cn.reghao.bnt.web.blog.model.dto.QuestionDto;
-import cn.reghao.bnt.web.blog.model.po.*;
 import cn.reghao.bnt.web.blog.model.vo.QuestionCount;
 import cn.reghao.bnt.web.blog.model.vo.QuestionView;
 import org.springframework.data.domain.*;

web/src/main/java/cn/reghao/bnt/web/devops/app/service/bd/impl/BuildAppImpl.java

@@ -18,7 +18,7 @@ import cn.reghao.bnt.web.devops.builder.model.AppDto;
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.jdk.result.ResultStatus;
 import cn.reghao.jutil.jdk.thread.ThreadPoolWrapper;
-import cn.reghao.jutil.tool.id.IdGenerator;
+import cn.reghao.jutil.jdk.id.IdGenerator;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;