diff --git a/README.md b/README.md index d89be0c..a685bee 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ #### 介绍 -Novel-Cloud是基于[小说精品屋-plus](https://www.oschina.net/p/novel-plus)构建的Spring Cloud 微服务小说门户学习平台,致力于原创文学阅读与写作,提供了爬虫工具用于开发过程中测试数据的采集。采用了Spring Boot 2 、Spring Cloud Greenwich、 MyBatis3DynamicSql、Redis、Mq、Elasticsearch、Docker等流行技术,集成了Nacos注册中心/配置中心、Spring Cloud Gateway网关、Spring Boot Admin监控中心等基础服务。前端计划使用Vue开发,后台接口一期开发已完成(充值/作家专区除外的所有接口)。 +Novel-Cloud是基于[小说精品屋-plus](https://www.oschina.net/p/novel-plus)构建的Spring Cloud 微服务小说门户学习平台,致力于原创文学阅读与写作,提供了爬虫工具用于开发过程中测试数据的采集。采用了Spring Boot 2.2.5.RELEASE 、Spring Cloud Hoxton.SR4、 MyBatis3DynamicSql、Redis、Mq、Elasticsearch、Docker等流行技术,集成了Nacos注册中心/配置中心、Spring Cloud Gateway网关、Spring Boot Admin监控中心等基础服务。前端计划使用Vue开发,后台接口一期开发已完成(充值/作家专区除外的所有接口)。 #### 演示地址 @@ -80,6 +80,8 @@ novel-cloud  +  +  @@ -93,7 +95,7 @@ novel-cloud  - +  5. 门户网站 diff --git a/assert/QQ20200531-194300.png b/assert/QQ20200531-194300.png new file mode 100644 index 0000000..f5e6f98 Binary files /dev/null and b/assert/QQ20200531-194300.png differ diff --git a/assert/QQ20200531-194554.png b/assert/QQ20200531-194554.png new file mode 100644 index 0000000..1e812d7 Binary files /dev/null and b/assert/QQ20200531-194554.png differ diff --git a/novel-common/pom.xml b/novel-common/pom.xml index 949be9c..19efa4f 100644 --- a/novel-common/pom.xml +++ b/novel-common/pom.xml @@ -79,16 +79,6 @@ <artifactId>commons-lang3</artifactId> </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - </exclusions> - </dependency> <dependency> <groupId>io.jsonwebtoken</groupId> diff --git a/pom.xml b/pom.xml index 5be24c0..3cde299 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-parent</artifactId> - <version>2.1.8.RELEASE</version> + <version>2.2.5.RELEASE</version> <relativePath/> </parent> @@ -37,7 +37,7 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <java.version>1.8</java.version> - <spring-cloud.version>Greenwich.SR2</spring-cloud.version> + <spring-cloud.version>Hoxton.SR4</spring-cloud.version> <nacos.version>0.2.2.RELEASE</nacos.version> <swagger.version>2.7.0</swagger.version> <maven.test.skip>true</maven.test.skip> @@ -48,7 +48,6 @@ <pagehelper.version>1.2.5</pagehelper.version> <orderbyhelper.version>1.0.2</orderbyhelper.version> <commons-lang3.version>3.4</commons-lang3.version> - <httpclient.version>4.5.2</httpclient.version> <jjwt.version>0.10.6</jjwt.version> <elasticsearch.version>6.2.2</elasticsearch.version> <jest.version>6.3.1</jest.version> @@ -59,7 +58,7 @@ <commons-fileupload.version>1.3.1</commons-fileupload.version> <fastdfs-client.version>1.26.1-RELEASE</fastdfs-client.version> <alipay-sdk-java.version>4.9.153.ALL</alipay-sdk-java.version> - <admin-starter-server.version>2.1.5</admin-starter-server.version> + <admin-starter-server.version>2.2.3</admin-starter-server.version> <novel-common.version>1.0.0</novel-common.version> <novel-user-api.version>1.0.0</novel-user-api.version> @@ -229,12 +228,6 @@ </dependency> - <!--httpclient--> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - <version>${httpclient.version}</version> - </dependency> <!-- jwt --> <dependency>