初次提交

pom.xml

@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.5.14</version>
+        <relativePath/> <!-- lookup parent from repository -->
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.example</groupId>
+    <artifactId>fdkk_bim</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <tlog-all-spring-boot-starter.version>1.4.3</tlog-all-spring-boot-starter.version>
+        <forest-spring-boot-starter.version>1.5.26</forest-spring-boot-starter.version>
+        <fastjson.version>2.0.6</fastjson.version>
+        <aliyun-sdk-oss.version>3.8.0</aliyun-sdk-oss.version>
+        <minio.version>8.2.2</minio.version>
+        <druid.version>1.2.11</druid.version>
+        <pagehelper.boot.version>1.3.1</pagehelper.boot.version>
+
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <!-- redis 缓存操作 -->
+        <dependency>
+            <groupId>org.redisson</groupId>
+            <artifactId>redisson</artifactId>
+            <version>3.16.1</version>
+        </dependency>
+        <!-- 引入redis连接池的依赖 -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-pool2</artifactId>
+        </dependency>
+        <!-- fastjson start -->
+        <dependency>
+            <groupId>com.alibaba.fastjson2</groupId>
+            <artifactId>fastjson2</artifactId>
+            <version>${fastjson.version}</version>
+        </dependency>
+        <!-- fastjson end -->
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.7.7</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.7.7</version>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>3.5.2</version>
+        </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fdkankan</groupId>
+            <artifactId>4dkankan-utils-fyun-oss</artifactId>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fdkankan</groupId>
+            <artifactId>4dkankan-utils-redis</artifactId>
+            <version>3.0.0-SNAPSHOT</version>
+            <exclusions>
+                <exclusion>
+                        <groupId>org.redisson</groupId>
+                        <artifactId>redisson</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- pagehelper 分页插件 -->
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper-spring-boot-starter</artifactId>
+            <version>${pagehelper.boot.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.16.18</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.dtflys.forest</groupId>
+            <artifactId>forest-spring-boot-starter</artifactId>
+            <version>${forest-spring-boot-starter.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.yomahub</groupId>
+            <artifactId>tlog-all-spring-boot-starter</artifactId>
+            <version>${tlog-all-spring-boot-starter.version}</version>
+        </dependency>
+        <dependency>
+            <!-- jsoup HTML parser library @ https://jsoup.org/ -->
+            <groupId>org.jsoup</groupId>
+            <artifactId>jsoup</artifactId>
+            <version>1.15.3</version>
+        </dependency>
+        <dependency>
+            <groupId>com.aliyun.oss</groupId>
+            <artifactId>aliyun-sdk-oss</artifactId>
+            <version>${aliyun-sdk-oss.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.minio</groupId>
+            <artifactId>minio</artifactId>
+            <version>${minio.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>okio</artifactId>
+                    <groupId>com.squareup.okio</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>okhttp</artifactId>
+                    <groupId>com.squareup.okhttp3</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.1.1.RELEASE</version>
+                <configuration>
+                    <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!--加入maven插件“docker-maven-plugin”-->
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+                <version>0.4.11</version>
+                <configuration>
+                    <imageName>IMG-BED/${project.artifactId}</imageName>
+                    <dockerDirectory>src/main/docker</dockerDirectory>
+                    <resources>
+                        <resource>
+                            <targetPath>/</targetPath>
+                            <directory>${project.build.directory}</directory>
+                            <include>${project.build.finalName}.jar</include>
+                        </resource>
+                    </resources>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

src/main/java/org/fdkk/bim/BimApplication.java

@@ -1,11 +1,10 @@
-package org.fdkk.bim;
+package com.fdkk.bim;
 
 import com.dtflys.forest.springboot.annotation.ForestScan;
 import com.github.pagehelper.autoconfigure.PageHelperAutoConfiguration;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
@@ -18,7 +17,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @Configuration
 @ForestScan(basePackages = "org.fdkk.bim.client")
 @MapperScan({"org.fdkk.bim.mapper"})
-@ComponentScan(basePackages = {"com.fdkankan.*","org.fdkk.bim.*"})
+@ComponentScan(basePackages = {"com.fdkankan.*","com.fdkk.bim.*"})
 @EnableScheduling
 public class BimApplication {
     public static void main(String[] args) {

src/main/java/org/fdkk/bim/Interceptor/BimFaceInterceptor.java

@@ -1,12 +1,12 @@
-package org.fdkk.bim.Interceptor;
+package com.fdkk.bim.Interceptor;
 
 import cn.hutool.extra.spring.SpringUtil;
 import com.dtflys.forest.http.ForestRequest;
 import com.dtflys.forest.http.ForestResponse;
 import com.dtflys.forest.interceptor.Interceptor;
 import com.dtflys.forest.reflection.ForestMethod;
+import com.fdkk.bim.config.BimFaceConfig;
 import lombok.extern.slf4j.Slf4j;
-import org.fdkk.bim.config.BimFaceConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**

src/main/java/org/fdkk/bim/base/BaseController.java

@@ -1,17 +1,10 @@
-package org.fdkk.bim.base;
+package com.fdkk.bim.base;
 
-import com.alibaba.fastjson.JSONObject;
-import org.fdkk.bim.util.SnowIdUtil;
+import com.fdkk.bim.util.SnowIdUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.WebDataBinder;
-import org.springframework.web.bind.annotation.InitBinder;
-
-import java.beans.PropertyEditorSupport;
-import java.util.Date;
-import java.util.List;
 
 /**
  * web层通用数据处理

src/main/java/org/fdkk/bim/base/BaseEntity.java

@@ -1,4 +1,4 @@
-package org.fdkk.bim.base;
+package com.fdkk.bim.base;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;

src/main/java/org/fdkk/bim/base/Result.java

@@ -1,8 +1,8 @@
-package org.fdkk.bim.base;
+package com.fdkk.bim.base;
 
 
 import cn.hutool.core.util.ObjectUtil;
-import org.fdkk.bim.constant.HttpStatus;
+import com.fdkk.bim.constant.HttpStatus;
 
 import java.util.HashMap;
 

src/main/java/org/fdkk/bim/bimEntity/BimResult.java

@@ -1,11 +1,7 @@
-package org.fdkk.bim.bimEntity;
+package com.fdkk.bim.bimEntity;
 
 
-import cn.hutool.core.util.ObjectUtil;
 import lombok.Data;
-import org.fdkk.bim.constant.HttpStatus;
-
-import java.util.HashMap;
 
 /**
  * 操作消息提醒

src/main/java/org/fdkk/bim/bimEntity/dto/BaseBimDTO.java

@@ -1,4 +1,4 @@
-package org.fdkk.bim.bimEntity.dto;
+package com.fdkk.bim.bimEntity.dto;
 
 import lombok.Data;
 

src/main/java/org/fdkk/bim/bimEntity/dto/DatabagDownloadDTO.java

@@ -1,4 +1,4 @@
-package org.fdkk.bim.bimEntity.dto;
+package com.fdkk.bim.bimEntity.dto;
 
 import lombok.Data;
 

src/main/java/org/fdkk/bim/bimEntity/dto/FileItemsDTO.java

@@ -1,4 +1,4 @@
-package org.fdkk.bim.bimEntity.dto;
+package com.fdkk.bim.bimEntity.dto;
 
 import lombok.Data;
 

src/main/java/org/fdkk/bim/bimEntity/dto/OfflineDatabagDTO.java

@@ -1,4 +1,4 @@
-package org.fdkk.bim.bimEntity.dto;
+package com.fdkk.bim.bimEntity.dto;
 
 import lombok.Data;
 

src/main/java/org/fdkk/bim/bimEntity/dto/ProjectDTO.java

@@ -1,4 +1,4 @@
-package org.fdkk.bim.bimEntity.dto;
+package com.fdkk.bim.bimEntity.dto;
 
 import lombok.Data;
 

src/main/java/org/fdkk/bim/bimEntity/dto/SourceDTO.java

@@ -1,4 +1,4 @@
-package org.fdkk.bim.bimEntity.dto;
+package com.fdkk.bim.bimEntity.dto;
 
 import lombok.Data;
 

src/main/java/org/fdkk/bim/bimEntity/dto/TranslateDTO.java

@@ -1,4 +1,4 @@
-package org.fdkk.bim.bimEntity.dto;
+package com.fdkk.bim.bimEntity.dto;
 
 import lombok.Data;
 

src/main/java/org/fdkk/bim/bimEntity/vo/AccessTokenBean.java

@@ -1,4 +1,4 @@
-package org.fdkk.bim.bimEntity.vo;
+package com.fdkk.bim.bimEntity.vo;
 
 import java.io.Serializable;
 

src/main/java/org/fdkk/bim/bimEntity/vo/ConfigBean.java

@@ -1,4 +1,4 @@
-package org.fdkk.bim.bimEntity.vo;
+package com.fdkk.bim.bimEntity.vo;
 
 import lombok.Data;
 

src/main/java/org/fdkk/bim/bimEntity/vo/DatabagDerivativeBean.java

@@ -1,4 +1,4 @@
-package org.fdkk.bim.bimEntity.vo;
+package com.fdkk.bim.bimEntity.vo;
 
 import lombok.Data;
 

src/main/java/org/fdkk/bim/bimEntity/vo/FileBean.java

@@ -1,4 +1,4 @@
-package org.fdkk.bim.bimEntity.vo;
+package com.fdkk.bim.bimEntity.vo;
 
 import lombok.Data;
 

src/main/java/org/fdkk/bim/bimEntity/vo/FileStatusBean.java

@@ -1,4 +1,4 @@
-package org.fdkk.bim.bimEntity.vo;
+package com.fdkk.bim.bimEntity.vo;
 
 import lombok.Data;
 

src/main/java/org/fdkk/bim/bimEntity/vo/FileTranslateBean.java

@@ -1,4 +1,4 @@
-package org.fdkk.bim.bimEntity.vo;
+package com.fdkk.bim.bimEntity.vo;
 
 import lombok.Data;
 

src/main/java/org/fdkk/bim/bimEntity/vo/ProjectBean.java

@@ -1,4 +1,4 @@
-package org.fdkk.bim.bimEntity.vo;
+package com.fdkk.bim.bimEntity.vo;
 
 import lombok.Data;
 

src/main/java/org/fdkk/bim/cache/RedisCache.java

@@ -1,8 +1,8 @@
-package org.fdkk.bim.cache;
+package com.fdkk.bim.cache;
 
 import cn.hutool.extra.spring.SpringUtil;
+import com.fdkk.bim.util.SnowIdUtil;
 import lombok.extern.slf4j.Slf4j;
-import org.fdkk.bim.util.SnowIdUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.connection.DataType;
 import org.springframework.data.redis.core.*;

src/main/java/com/fdkk/bim/client/BimCallBackClient.java

@@ -0,0 +1,15 @@
+package com.fdkk.bim.client;
+
+import com.dtflys.forest.annotation.*;
+
+/**
+ * @author Xiewj
+ * @date 2022/9/21
+ */
+
+public interface BimCallBackClient {
+
+    @Post("{0}")
+    void postJson(String api, @JSONBody Object params);
+
+}

src/main/java/org/fdkk/bim/client/BimFaceClient.java

@@ -1,12 +1,13 @@
-package org.fdkk.bim.client;
+package com.fdkk.bim.client;
 
 import com.dtflys.forest.annotation.*;
-import org.fdkk.bim.Interceptor.BimFaceInterceptor;
-import org.fdkk.bim.bimEntity.dto.OfflineDatabagDTO;
-import org.fdkk.bim.bimEntity.dto.ProjectDTO;
-import org.fdkk.bim.bimEntity.dto.TranslateDTO;
+import com.fdkk.bim.bimEntity.vo.*;
+import com.fdkk.bim.Interceptor.BimFaceInterceptor;
+import com.fdkk.bim.bimEntity.dto.OfflineDatabagDTO;
+import com.fdkk.bim.bimEntity.dto.ProjectDTO;
+import com.fdkk.bim.bimEntity.dto.TranslateDTO;
 import org.fdkk.bim.bimEntity.vo.*;
-import org.fdkk.bim.bimEntity.BimResult;
+import com.fdkk.bim.bimEntity.BimResult;
 
 import java.util.List;
 
@@ -82,7 +83,7 @@ public interface BimFaceClient {
             url = "/translate?fileId={fileId}",
             type = "get"
     )
-    BimResult<FileTranslateBean> getTranslateInfo( @Var("fileId")String fileId);
+    BimResult<FileTranslateBean> getTranslateInfo(@Var("fileId")String fileId);
     /**
      * 通过文件ID创建离线数据包
      */

src/main/java/org/fdkk/bim/config/BimConfig.java

@@ -1,20 +1,10 @@
-package org.fdkk.bim.config;
+package com.fdkk.bim.config;
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.util.ObjectUtil;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
-import org.fdkk.bim.bimEntity.BimResult;
-import org.fdkk.bim.bimEntity.vo.AccessTokenBean;
-import org.fdkk.bim.cache.RedisCache;
-import org.fdkk.bim.client.BimFaceClient;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
-import java.util.concurrent.TimeUnit;
-
 /**
  * @author Xiewj
  * @date 2022/9/19

src/main/java/org/fdkk/bim/config/BimFaceConfig.java

@@ -1,14 +1,13 @@
-package org.fdkk.bim.config;
+package com.fdkk.bim.config;
 
 import cn.hutool.core.codec.Base64;
 import cn.hutool.core.util.ObjectUtil;
 import com.fdkankan.redis.util.RedisUtil;
+import com.fdkk.bim.client.BimFaceClient;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
-import org.fdkk.bim.bimEntity.vo.AccessTokenBean;
-import org.fdkk.bim.bimEntity.BimResult;
-import org.fdkk.bim.cache.RedisCache;
-import org.fdkk.bim.client.BimFaceClient;
+import com.fdkk.bim.bimEntity.vo.AccessTokenBean;
+import com.fdkk.bim.bimEntity.BimResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;

src/main/java/org/fdkk/bim/config/FastJson2JsonRedisSerializer.java

@@ -1,4 +1,4 @@
-package org.fdkk.bim.config;
+package com.fdkk.bim.config;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.parser.ParserConfig;

src/main/java/org/fdkk/bim/config/FastJsonHttpMessageConverterEx.java

@@ -1,4 +1,4 @@
-package org.fdkk.bim.config;
+package com.fdkk.bim.config;
 
 import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
 

src/main/java/org/fdkk/bim/config/ForestFastjsonConverter.java

@@ -1,4 +1,4 @@
-package org.fdkk.bim.config;
+package com.fdkk.bim.config;
 
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.dtflys.forest.converter.json.ForestJsonConverter;

src/main/java/org/fdkk/bim/config/MyBatisPlusConfig.java

@@ -1,4 +1,4 @@
-package org.fdkk.bim.config;
+package com.fdkk.bim.config;
 
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer;

src/main/java/org/fdkk/bim/config/ResourcesConfig.java

@@ -1,4 +1,4 @@
-package org.fdkk.bim.config;
+package com.fdkk.bim.config;
 
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.alibaba.fastjson.support.config.FastJsonConfig;

src/main/java/org/fdkk/bim/constant/HttpStatus.java

@@ -1,4 +1,4 @@
-package org.fdkk.bim.constant;
+package com.fdkk.bim.constant;
 
 /**
  * 返回状态码

src/main/java/org/fdkk/bim/controller/CallBackController.java

@@ -1,22 +1,16 @@
-package org.fdkk.bim.controller;
+package com.fdkk.bim.controller;
 
 import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
+import com.fdkk.bim.base.BaseController;
+import com.fdkk.bim.base.Result;
+import com.fdkk.bim.client.BimCallBackClient;
+import com.fdkk.bim.config.BimFaceConfig;
+import com.fdkk.bim.entity.dto.BimCallBackDTO;
+import com.fdkk.bim.entity.po.BimFaceEntity;
+import com.fdkk.bim.service.BimFaceService;
 import lombok.extern.slf4j.Slf4j;
-import org.fdkk.bim.base.BaseController;
-import org.fdkk.bim.base.Result;
-import org.fdkk.bim.bimEntity.BimResult;
-import org.fdkk.bim.bimEntity.dto.OfflineDatabagDTO;
-import org.fdkk.bim.bimEntity.vo.DatabagDerivativeBean;
-import org.fdkk.bim.client.BimCallBackClient;
-import org.fdkk.bim.client.BimFaceClient;
-import org.fdkk.bim.config.BimConfig;
-import org.fdkk.bim.config.BimFaceConfig;
-import org.fdkk.bim.entity.dto.BimCallBackDTO;
-import org.fdkk.bim.entity.po.BimFaceEntity;
-import org.fdkk.bim.enums.BusinessStatus;
-import org.fdkk.bim.service.BimFaceService;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.fdkk.bim.config.BimConfig;
+import com.fdkk.bim.enums.BusinessStatus;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;

src/main/java/org/fdkk/bim/controller/FileController.java

@@ -1,21 +1,25 @@
-package org.fdkk.bim.controller;
+package com.fdkk.bim.controller;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpUtil;
-import org.fdkk.bim.base.BaseController;
-import org.fdkk.bim.base.Result;
-import org.fdkk.bim.bimEntity.BimResult;
+import com.fdkk.bim.bimEntity.dto.DatabagDownloadDTO;
+import com.fdkk.bim.bimEntity.dto.OfflineDatabagDTO;
+import com.fdkk.bim.bimEntity.dto.SourceDTO;
+import com.fdkk.bim.bimEntity.dto.TranslateDTO;
+import com.fdkk.bim.bimEntity.vo.DatabagDerivativeBean;
+import com.fdkk.bim.client.BimFaceClient;
+import com.fdkk.bim.entity.po.BimFaceEntity;
+import com.fdkk.bim.service.BimFaceService;
+import com.fdkk.bim.base.BaseController;
+import com.fdkk.bim.base.Result;
+import com.fdkk.bim.bimEntity.BimResult;
 import org.fdkk.bim.bimEntity.dto.*;
-import org.fdkk.bim.bimEntity.vo.DatabagDerivativeBean;
-import org.fdkk.bim.bimEntity.vo.FileBean;
-import org.fdkk.bim.client.BimFaceClient;
-import org.fdkk.bim.config.BimConfig;
-import org.fdkk.bim.config.BimFaceConfig;
-import org.fdkk.bim.entity.dto.BimUploadDTO;
-import org.fdkk.bim.entity.po.BimFaceEntity;
-import org.fdkk.bim.entity.vo.BimFaceVO;
-import org.fdkk.bim.service.BimFaceService;
+import com.fdkk.bim.bimEntity.vo.FileBean;
+import com.fdkk.bim.config.BimConfig;
+import com.fdkk.bim.config.BimFaceConfig;
+import com.fdkk.bim.entity.dto.BimUploadDTO;
+import com.fdkk.bim.entity.vo.BimFaceVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;

src/main/java/org/fdkk/bim/controller/TestController.java

@@ -1,13 +1,11 @@
-package org.fdkk.bim.controller;
+package com.fdkk.bim.controller;
 
+import com.fdkk.bim.entity.po.BimFaceEntity;
+import com.fdkk.bim.service.BimFaceService;
 import lombok.extern.slf4j.Slf4j;
-import org.fdkk.bim.base.BaseController;
-import org.fdkk.bim.base.Result;
-import org.fdkk.bim.client.BimCallBackClient;
-import org.fdkk.bim.client.BimFaceClient;
-import org.fdkk.bim.config.BimFaceConfig;
-import org.fdkk.bim.entity.po.BimFaceEntity;
-import org.fdkk.bim.service.BimFaceService;
+import com.fdkk.bim.base.BaseController;
+import com.fdkk.bim.base.Result;
+import com.fdkk.bim.client.BimCallBackClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/org/fdkk/bim/entity/dto/BimCallBackDTO.java

@@ -1,4 +1,4 @@
-package org.fdkk.bim.entity.dto;
+package com.fdkk.bim.entity.dto;
 
 import lombok.Data;
 

src/main/java/org/fdkk/bim/entity/dto/BimFaceBaseDTO.java

@@ -1,4 +1,4 @@
-package org.fdkk.bim.entity.dto;
+package com.fdkk.bim.entity.dto;
 
 import lombok.Data;
 

src/main/java/org/fdkk/bim/entity/dto/BimUploadDTO.java

@@ -1,4 +1,4 @@
-package org.fdkk.bim.entity.dto;
+package com.fdkk.bim.entity.dto;
 
 /**
  * @author Xiewj

src/main/java/org/fdkk/bim/entity/po/BimFaceEntity.java

@@ -1,10 +1,8 @@
-package org.fdkk.bim.entity.po;
+package com.fdkk.bim.entity.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.fdkk.bim.base.BaseEntity;
+import com.fdkk.bim.base.BaseEntity;
 
 /**
  * @author Xiewj

src/main/java/org/fdkk/bim/entity/vo/BimFaceVO.java

@@ -1,4 +1,4 @@
-package org.fdkk.bim.entity.vo;
+package com.fdkk.bim.entity.vo;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;

src/main/java/org/fdkk/bim/enums/BusinessStatus.java

@@ -1,4 +1,4 @@
-package org.fdkk.bim.enums;
+package com.fdkk.bim.enums;
 
 /**
  * 操作状态

src/main/java/org/fdkk/bim/exception/GlobalException.java

@@ -1,4 +1,4 @@
-package org.fdkk.bim.exception;
+package com.fdkk.bim.exception;
 
 /**
  * 全局异常

src/main/java/org/fdkk/bim/exception/ServiceException.java

@@ -1,6 +1,6 @@
-package org.fdkk.bim.exception;
+package com.fdkk.bim.exception;
 
-import org.fdkk.bim.constant.HttpStatus;
+import com.fdkk.bim.constant.HttpStatus;
 
 /**
  * 业务异常

src/main/java/org/fdkk/bim/exception/UtilException.java

@@ -1,4 +1,4 @@
-package org.fdkk.bim.exception;
+package com.fdkk.bim.exception;
 
 /**
  * 工具类异常

src/main/java/org/fdkk/bim/exception/base/BaseException.java

@@ -1,8 +1,8 @@
-package org.fdkk.bim.exception.base;
+package com.fdkk.bim.exception.base;
 
 
 import cn.hutool.core.util.StrUtil;
-import org.fdkk.bim.util.MessageUtils;
+import com.fdkk.bim.util.MessageUtils;
 
 /**
  * 基础异常

src/main/java/org/fdkk/bim/exception/file/FileException.java

@@ -1,6 +1,6 @@
-package org.fdkk.bim.exception.file;
+package com.fdkk.bim.exception.file;
 
-import org.fdkk.bim.exception.base.BaseException;
+import com.fdkk.bim.exception.base.BaseException;
 
 /**
  * 文件信息异常类

src/main/java/org/fdkk/bim/exception/file/FileNameLengthLimitExceededException.java

@@ -1,4 +1,4 @@
-package org.fdkk.bim.exception.file;
+package com.fdkk.bim.exception.file;
 
 /**
  * 文件名称超长限制异常类

src/main/java/org/fdkk/bim/exception/file/FileSizeLimitExceededException.java

@@ -1,4 +1,4 @@
-package org.fdkk.bim.exception.file;
+package com.fdkk.bim.exception.file;
 
 /**
  * 文件名大小限制异常类

src/main/java/org/fdkk/bim/exception/file/InvalidExtensionException.java

@@ -1,4 +1,4 @@
-package org.fdkk.bim.exception.file;
+package com.fdkk.bim.exception.file;
 
 import org.apache.commons.fileupload.FileUploadException;
 

src/main/java/org/fdkk/bim/handler/MyMetaObjectHandler.java

@@ -1,4 +1,4 @@
-package org.fdkk.bim.handler;
+package com.fdkk.bim.handler;
 
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import lombok.extern.slf4j.Slf4j;

src/main/java/org/fdkk/bim/mapper/BimFaceMapper.java

@@ -1,8 +1,8 @@
-package org.fdkk.bim.mapper;
+package com.fdkk.bim.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fdkk.bim.entity.po.BimFaceEntity;
 import org.apache.ibatis.annotations.Mapper;
-import org.fdkk.bim.entity.po.BimFaceEntity;
 import org.springframework.stereotype.Component;
 
 /**

src/main/java/org/fdkk/bim/service/BimFaceService.java

@@ -1,9 +1,9 @@
-package org.fdkk.bim.service;
+package com.fdkk.bim.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.fdkk.bim.entity.dto.BimUploadDTO;
-import org.fdkk.bim.entity.po.BimFaceEntity;
-import org.fdkk.bim.enums.BusinessStatus;
+import com.fdkk.bim.entity.dto.BimUploadDTO;
+import com.fdkk.bim.entity.po.BimFaceEntity;
+import com.fdkk.bim.enums.BusinessStatus;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;

src/main/java/org/fdkk/bim/service/impl/BimFaceServiceImpl.java

@@ -1,4 +1,4 @@
-package org.fdkk.bim.service.impl;
+package com.fdkk.bim.service.impl;
 
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -8,23 +8,27 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
+import com.fdkk.bim.bimEntity.dto.OfflineDatabagDTO;
+import com.fdkk.bim.bimEntity.dto.ProjectDTO;
+import com.fdkk.bim.bimEntity.dto.SourceDTO;
+import com.fdkk.bim.bimEntity.dto.TranslateDTO;
+import com.fdkk.bim.bimEntity.vo.DatabagDerivativeBean;
+import com.fdkk.bim.client.BimFaceClient;
+import com.fdkk.bim.entity.dto.BimCallBackDTO;
+import com.fdkk.bim.entity.po.BimFaceEntity;
+import com.fdkk.bim.mapper.BimFaceMapper;
+import com.fdkk.bim.service.BimFaceService;
 import lombok.extern.slf4j.Slf4j;
-import org.fdkk.bim.bimEntity.BimResult;
+import com.fdkk.bim.bimEntity.BimResult;
 import org.fdkk.bim.bimEntity.dto.*;
-import org.fdkk.bim.bimEntity.vo.DatabagDerivativeBean;
-import org.fdkk.bim.bimEntity.vo.FileBean;
-import org.fdkk.bim.bimEntity.vo.ProjectBean;
-import org.fdkk.bim.client.BimCallBackClient;
-import org.fdkk.bim.client.BimFaceClient;
-import org.fdkk.bim.config.BimConfig;
-import org.fdkk.bim.entity.dto.BimCallBackDTO;
-import org.fdkk.bim.entity.dto.BimUploadDTO;
-import org.fdkk.bim.entity.po.BimFaceEntity;
-import org.fdkk.bim.enums.BusinessStatus;
-import org.fdkk.bim.mapper.BimFaceMapper;
-import org.fdkk.bim.service.BimFaceService;
-import org.fdkk.bim.util.BimZipUtil;
-import org.fdkk.bim.util.FileUploadUtils;
+import com.fdkk.bim.bimEntity.vo.FileBean;
+import com.fdkk.bim.bimEntity.vo.ProjectBean;
+import com.fdkk.bim.client.BimCallBackClient;
+import com.fdkk.bim.config.BimConfig;
+import com.fdkk.bim.entity.dto.BimUploadDTO;
+import com.fdkk.bim.enums.BusinessStatus;
+import com.fdkk.bim.util.BimZipUtil;
+import com.fdkk.bim.util.FileUploadUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;

src/main/java/org/fdkk/bim/task/task.java

@@ -1,15 +1,15 @@
-package org.fdkk.bim.task;
+package com.fdkk.bim.task;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.fdkk.bim.bimEntity.vo.DatabagDerivativeBean;
+import com.fdkk.bim.bimEntity.vo.FileStatusBean;
+import com.fdkk.bim.bimEntity.vo.FileTranslateBean;
+import com.fdkk.bim.client.BimFaceClient;
+import com.fdkk.bim.entity.po.BimFaceEntity;
+import com.fdkk.bim.enums.BusinessStatus;
+import com.fdkk.bim.service.BimFaceService;
 import lombok.extern.slf4j.Slf4j;
-import org.fdkk.bim.bimEntity.BimResult;
-import org.fdkk.bim.bimEntity.vo.DatabagDerivativeBean;
-import org.fdkk.bim.bimEntity.vo.FileStatusBean;
-import org.fdkk.bim.bimEntity.vo.FileTranslateBean;
-import org.fdkk.bim.client.BimFaceClient;
-import org.fdkk.bim.entity.po.BimFaceEntity;
-import org.fdkk.bim.enums.BusinessStatus;
-import org.fdkk.bim.service.BimFaceService;
+import com.fdkk.bim.bimEntity.BimResult;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 

src/main/java/org/fdkk/bim/util/BimZipUtil.java

@@ -1,29 +1,19 @@
-package org.fdkk.bim.util;
+package com.fdkk.bim.util;
 
 import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.util.ReUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.ZipUtil;
 import cn.hutool.extra.spring.SpringUtil;
-import com.aliyun.oss.internal.OSSUtils;
-import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.fyun.config.FYunFileConfig;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
+import com.fdkk.bim.entity.po.BimFaceEntity;
 import lombok.extern.slf4j.Slf4j;
-import org.fdkk.bim.config.BimConfig;
-import org.fdkk.bim.entity.po.BimFaceEntity;
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Document;
-import org.jsoup.select.Elements;
+import com.fdkk.bim.config.BimConfig;
 
-import javax.annotation.Resource;
 import java.io.File;
 import java.io.IOException;
-import java.nio.charset.Charset;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
-import java.util.function.Consumer;
 
 /**
  * @author Xiewj

src/main/java/org/fdkk/bim/util/FileUploadUtils.java

@@ -1,19 +1,19 @@
-package org.fdkk.bim.util;
+package com.fdkk.bim.util;
 
 import java.io.File;
 import java.io.IOException;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
+import com.fdkk.bim.constant.HttpStatus;
+import com.fdkk.bim.exception.ServiceException;
+import com.fdkk.bim.exception.file.FileNameLengthLimitExceededException;
+import com.fdkk.bim.exception.file.FileSizeLimitExceededException;
+import com.fdkk.bim.exception.file.InvalidExtensionException;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.fdkk.bim.config.BimConfig;
-import org.fdkk.bim.constant.HttpStatus;
-import org.fdkk.bim.exception.ServiceException;
 import org.springframework.web.multipart.MultipartFile;
-import org.fdkk.bim.exception.file.FileNameLengthLimitExceededException;
-import org.fdkk.bim.exception.file.FileSizeLimitExceededException;
-import org.fdkk.bim.exception.file.InvalidExtensionException;
+
 /**
  * 文件上传工具类
  *

src/main/java/org/fdkk/bim/util/MessageUtils.java

@@ -1,4 +1,4 @@
-package org.fdkk.bim.util;
+package com.fdkk.bim.util;
 
 import cn.hutool.extra.spring.SpringUtil;
 import org.springframework.context.MessageSource;

src/main/java/org/fdkk/bim/util/MimeTypeUtils.java

@@ -1,4 +1,4 @@
-package org.fdkk.bim.util;
+package com.fdkk.bim.util;
 
 /**
  * 媒体类型工具类

src/main/java/org/fdkk/bim/util/ObjectAndByteCovertUtil.java

@@ -1,4 +1,4 @@
-package org.fdkk.bim.util;
+package com.fdkk.bim.util;
 
 import com.alibaba.fastjson2.JSON;
 

src/main/java/org/fdkk/bim/util/SnowIdUtil.java

@@ -1,9 +1,9 @@
-package org.fdkk.bim.util;
+package com.fdkk.bim.util;
 
 import cn.hutool.core.util.IdUtil;
+import com.fdkk.bim.constant.HttpStatus;
+import com.fdkk.bim.exception.ServiceException;
 import lombok.extern.slf4j.Slf4j;
-import org.fdkk.bim.constant.HttpStatus;
-import org.fdkk.bim.exception.ServiceException;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.stereotype.Component;

src/main/java/org/fdkk/bim/web/GlobalExceptionHandler.java

@@ -1,9 +1,8 @@
-package org.fdkk.bim.web;
+package com.fdkk.bim.web;
 
 import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import org.fdkk.bim.base.Result;
-import org.fdkk.bim.exception.ServiceException;
+import com.fdkk.bim.exception.ServiceException;
+import com.fdkk.bim.base.Result;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.validation.BindException;

src/main/java/org/fdkk/bim/client/BimCallBackClient.java

@@ -1,29 +0,0 @@
-package org.fdkk.bim.client;
-
-import com.dtflys.forest.annotation.*;
-import com.dtflys.forest.callback.OnError;
-import com.dtflys.forest.callback.OnSuccess;
-import org.fdkk.bim.Interceptor.BimFaceInterceptor;
-import org.fdkk.bim.bimEntity.BimResult;
-import org.fdkk.bim.bimEntity.dto.OfflineDatabagDTO;
-import org.fdkk.bim.bimEntity.dto.ProjectDTO;
-import org.fdkk.bim.bimEntity.dto.TranslateDTO;
-import org.fdkk.bim.bimEntity.vo.AccessTokenBean;
-import org.fdkk.bim.bimEntity.vo.DatabagDerivativeBean;
-import org.fdkk.bim.bimEntity.vo.FileBean;
-import org.fdkk.bim.bimEntity.vo.ProjectBean;
-
-import java.io.File;
-import java.util.List;
-
-/**
- * @author Xiewj
- * @date 2022/9/21
- */
-
-public interface BimCallBackClient {
-
-    @Post("{0}")
-    void postJson(String api, @JSONBody Object params);
-
-}