目录调整

This commit is contained in:
xiongxiaoyang
2020-06-03 02:38:49 +08:00
parent 9c61934974
commit 9c86abb297
18 changed files with 56 additions and 46 deletions

View File

@@ -45,7 +45,7 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<!--<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>${docker.maven.plugin.version}</version>
@@ -71,7 +71,7 @@
</resource>
</resources>
</configuration>
</plugin>
</plugin>-->
</plugins>
</build>

View File

@@ -40,6 +40,12 @@
<artifactId>spring-cloud-netflix-hystrix</artifactId>
</dependency>
<dependency>
<groupId>org.redisson</groupId>
<artifactId>redisson-spring-boot-starter</artifactId>
<version>${redisson.version}</version>
</dependency>
</dependencies>
@@ -49,7 +55,7 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<!--<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>${docker.maven.plugin.version}</version>
@@ -75,7 +81,7 @@
</resource>
</resources>
</configuration>
</plugin>
</plugin>-->
</plugins>
</build>

View File

@@ -48,11 +48,6 @@
<artifactId>spring-boot-starter-redis</artifactId>
</dependency>
<dependency>
<groupId>org.redisson</groupId>
<artifactId>redisson-spring-boot-starter</artifactId>
<version>${redisson.version}</version>
</dependency>
<dependency>
<groupId>mysql</groupId>

View File

@@ -63,6 +63,13 @@
</dependency>
<dependency>
<groupId>org.redisson</groupId>
<artifactId>redisson-spring-boot-starter</artifactId>
<version>${redisson.version}</version>
</dependency>
@@ -75,7 +82,7 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<!--<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>${docker.maven.plugin.version}</version>
@@ -101,7 +108,7 @@
</resource>
</resources>
</configuration>
</plugin>
</plugin>-->
</plugins>
</build>

View File

@@ -1,4 +1,4 @@
package com.java2nb.novel.config;
package com.java2nb.novel.file.config;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;

View File

@@ -1,4 +1,4 @@
package com.java2nb.novel.feign;
package com.java2nb.novel.file.feign;
import com.java2nb.novel.book.api.BookApi;

View File

@@ -1,10 +1,10 @@
package com.java2nb.novel.schedule;
package com.java2nb.novel.file.schedule;
import com.java2nb.novel.book.entity.Book;
import com.java2nb.novel.common.utils.Constants;
import com.java2nb.novel.common.utils.FileUtil;
import com.java2nb.novel.feign.BookFeignClient;
import com.java2nb.novel.service.FileService;
import com.java2nb.novel.file.feign.BookFeignClient;
import com.java2nb.novel.file.service.FileService;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;

View File

@@ -1,4 +1,4 @@
package com.java2nb.novel.service;
package com.java2nb.novel.file.service;
import java.io.File;

View File

@@ -1,4 +1,4 @@
package com.java2nb.novel.service.impl;
package com.java2nb.novel.file.service.impl;
import com.aliyun.oss.OSSClient;
import com.aliyun.oss.model.CannedAccessControlList;
@@ -6,13 +6,11 @@ import com.aliyun.oss.model.CreateBucketRequest;
import com.aliyun.oss.model.PutObjectRequest;
import com.aliyun.oss.model.PutObjectResult;
import com.java2nb.novel.common.utils.Constants;
import com.java2nb.novel.common.utils.FileUtil;
import com.java2nb.novel.common.utils.UUIDUtil;
import com.java2nb.novel.config.OssProperties;
import com.java2nb.novel.service.FileService;
import com.java2nb.novel.file.config.OssProperties;
import com.java2nb.novel.file.service.FileService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.stereotype.Service;
import java.io.File;

View File

@@ -41,7 +41,7 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<!--<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>${docker.maven.plugin.version}</version>
@@ -67,7 +67,7 @@
</resource>
</resources>
</configuration>
</plugin>
</plugin>-->
</plugins>
</build>

View File

@@ -47,7 +47,7 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<!--<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>${docker.maven.plugin.version}</version>
@@ -73,7 +73,7 @@
</resource>
</resources>
</configuration>
</plugin>
</plugin>-->
</plugins>
</build>

View File

@@ -42,7 +42,7 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<!-- <plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>${docker.maven.plugin.version}</version>
@@ -68,7 +68,7 @@
</resource>
</resources>
</configuration>
</plugin>
</plugin>-->
</plugins>
</build>

View File

@@ -15,16 +15,6 @@
<dependency>
<groupId>com.java2nb.novel</groupId>
<artifactId>novel-common</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-cache</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-redis</artifactId>
</exclusion>
</exclusions>
</dependency>

View File

@@ -46,7 +46,7 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<!-- <plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>${docker.maven.plugin.version}</version>
@@ -72,7 +72,7 @@
</resource>
</resources>
</configuration>
</plugin>
</plugin>-->
</plugins>
</build>

View File

@@ -3,3 +3,10 @@ spring:
name: news-service
profiles:
active: dev
cloud:
nacos:
config:
extconfig[0]:
dataid: novel-redis.yml
group: novel-common
refresh: true

View File

@@ -42,7 +42,7 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<!--<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>${docker.maven.plugin.version}</version>
@@ -68,7 +68,7 @@
</resource>
</resources>
</configuration>
</plugin>
</plugin>-->
</plugins>
</build>

View File

@@ -47,6 +47,13 @@
</dependency>
<dependency>
<groupId>org.redisson</groupId>
<artifactId>redisson-spring-boot-starter</artifactId>
<version>${redisson.version}</version>
</dependency>
</dependencies>
<build>
@@ -55,7 +62,7 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<!-- <plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>${docker.maven.plugin.version}</version>
@@ -81,7 +88,7 @@
</resource>
</resources>
</configuration>
</plugin>
</plugin>-->
</plugins>
</build>

View File

@@ -50,7 +50,7 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<!--<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>${docker.maven.plugin.version}</version>
@@ -76,7 +76,7 @@
</resource>
</resources>
</configuration>
</plugin>
</plugin>-->
</plugins>
</build>