Merge remote-tracking branch 'origin/master'

This commit is contained in:
2023-01-03 11:06:14 +08:00
91 changed files with 5478 additions and 84 deletions

View File

@@ -65,6 +65,38 @@
<artifactId>common-minio</artifactId>
<version>${project.version}</version>
</dependency>
<!--调用minio服务器-->
<dependency>
<groupId>me.tongfei</groupId>
<artifactId>progressbar</artifactId>
<version>0.5.3</version>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>4.8.1</version>
</dependency>
<dependency>
<groupId>io.minio</groupId>
<artifactId>minio</artifactId>
<version>8.2.1</version>
<exclusions>
<exclusion>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
</exclusion>
</exclusions>
</dependency>
<!--避免idea后端配置类报红-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
</dependency>
</dependencies>
<build>
@@ -126,4 +158,4 @@
</plugins>
</build>
</project>
</project>

View File

@@ -1,4 +1,4 @@
//package com.njcn.harmonic.controller;
package com.njcn.harmonic.controller;//package com.njcn.harmonic.controller;
//
//import com.njcn.common.pojo.annotation.OperateInfo;
//import com.njcn.common.pojo.enums.common.LogEnum;

View File

@@ -1,4 +1,4 @@
//package com.njcn.harmonic.controller;
package com.njcn.harmonic.controller;//package com.njcn.harmonic.controller;
//
//import com.njcn.common.pojo.annotation.OperateInfo;
//import com.njcn.common.pojo.enums.common.LogEnum;