Commit 5d24f6c5 by 李传峰

3.x,版本修改处理

parent 52791976
call mvn -Ptest clean source:jar deploy -Denforcer.skip=true -Dmaven.test.skip=true -U
call mvn -Ptest clean source:jar deploy -Denforcer.skip=true -Dmaven.test.skip=true -U -N
@pause
\ No newline at end of file
call mvn -Ptest -Denforcer.skip=true -Dmaven.test.skip=true -U clean install
call mvn -Ptest clean install -Denforcer.skip=true -Dmaven.test.skip=true -U
call pause
\ No newline at end of file
call mvn -Ptest clean source:jar deploy -Denforcer.skip=true -Dmaven.test.skip=true -U
call mvn -Puat clean source:jar deploy -Denforcer.skip=true -Dmaven.test.skip=true -U -Dreversion=3.1.0-RELEASE
call mvn -Pperf clean source:jar deploy -Denforcer.skip=true -Dmaven.test.skip=true -U -Dreversion=3.1.1-SNAPSHOT
call mvn -Pprod clean source:jar deploy -Denforcer.skip=true -Dmaven.test.skip=true -U -Dreversion=3.1.1-RELEASE
call mvn -Ptsrpd clean source:jar deploy -Denforcer.skip=true -Dmaven.test.skip=true -U -Dreversion=3.1.2-RELEASE
@pause
\ No newline at end of file
call mvn -Ptest -Denforcer.skip=true -Dmaven.test.skip=true -U clean install
call mvn -Ptest clean install -Denforcer.skip=true -Dmaven.test.skip=true -U
call pause
\ No newline at end of file
......@@ -2,10 +2,10 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.pcloud.common</groupId>
<artifactId>pcloud-book-parent</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
<groupId>com.pcloud.common</groupId>
<artifactId>pcloud-book-parent</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>com.pcloud.facade</groupId>
......
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.pcloud.common</groupId>
<artifactId>pcloud-book-parent</artifactId>
<version>2.1.0-RELEASE</version>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.pcloud.service</groupId>
<artifactId>pcloud-service-book</artifactId>
<version>${pcloud-service.version}</version>
<version>${reversion}</version>
<packaging>jar</packaging>
<name>pcloud-service-book</name>
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<pcloud-book-elasticsearch-api.version>1.0.1-SNAPSHOT</pcloud-book-elasticsearch-api.version>
</properties>
<dependencies>
......@@ -27,7 +25,7 @@
<dependency>
<groupId>com.pcloud.facade</groupId>
<artifactId>pcloud-facade-book</artifactId>
<version>${pcloud-facade.version}</version>
<version>${reversion}</version>
</dependency>
<!--内部调用依赖-->
......@@ -45,12 +43,6 @@
<dependency>
<groupId>com.pcloud.common</groupId>
<artifactId>pcloud-common-config</artifactId>
<version>${pcloud-common-config.version}</version>
</dependency>
<dependency>
<groupId>com.pcloud.common</groupId>
<artifactId>pcloud-common-core</artifactId>
<version>${pcloud-common-core.version}</version>
</dependency>
......@@ -58,182 +50,181 @@
<dependency>
<groupId>com.pcloud.facade</groupId>
<artifactId>pcloud-facade-usercenter</artifactId>
<version>${pcloud-facade.version}</version>
<version>${pcloud-facade3.version}</version>
</dependency>
<dependency>
<groupId>com.pcloud.facade</groupId>
<artifactId>pcloud-facade-resourcecenter</artifactId>
<version>${pcloud-facade.version}</version>
<version>${pcloud-facade3.version}</version>
</dependency>
<dependency>
<groupId>com.pcloud.facade</groupId>
<artifactId>pcloud-facade-channelcenter</artifactId>
<version>${pcloud-facade.version}</version>
<version>${pcloud-facade3.version}</version>
</dependency>
<dependency>
<groupId>com.pcloud.facade</groupId>
<artifactId>pcloud-facade-tradecenter</artifactId>
<version>${pcloud-facade.version}</version>
<version>${pcloud-facade3.version}</version>
</dependency>
<dependency>
<groupId>com.pcloud.facade</groupId>
<artifactId>pcloud-facade-comment</artifactId>
<version>${pcloud-facade.version}</version>
<version>${pcloud-facade3.version}</version>
</dependency>
<dependency>
<groupId>com.pcloud.facade</groupId>
<artifactId>pcloud-facade-message</artifactId>
<version>${pcloud-facade.version}</version>
<version>${pcloud-facade3.version}</version>
</dependency>
<dependency>
<groupId>com.pcloud.facade</groupId>
<artifactId>pcloud-facade-quartz</artifactId>
<version>${pcloud-facade.version}</version>
<version>${pcloud-facade3.version}</version>
</dependency>
<dependency>
<groupId>com.pcloud.facade</groupId>
<artifactId>pcloud-facade-analysisengine</artifactId>
<version>${pcloud-facade.version}</version>
<version>${pcloud-facade3.version}</version>
</dependency>
<dependency>
<groupId>com.pcloud.facade</groupId>
<artifactId>pcloud-facade-commoncenter</artifactId>
<version>${pcloud-facade.version}</version>
<version>${pcloud-facade3.version}</version>
</dependency>
<dependency>
<groupId>com.pcloud.facade</groupId>
<artifactId>pcloud-facade-voicemessage</artifactId>
<version>${pcloud-facade.version}</version>
<version>${pcloud-facade3.version}</version>
</dependency>
<dependency>
<groupId>com.pcloud.facade</groupId>
<artifactId>pcloud-facade-settlementcenter</artifactId>
<version>${pcloud-facade.version}</version>
<version>${pcloud-facade3.version}</version>
</dependency>
<dependency>
<groupId>com.pcloud.facade</groupId>
<artifactId>pcloud-facade-appcenter</artifactId>
<version>${pcloud-facade.version}</version>
<version>${pcloud-facade3.version}</version>
</dependency>
<dependency>
<groupId>com.pcloud.facade</groupId>
<artifactId>pcloud-facade-raystask</artifactId>
<version>${pcloud-facade.version}</version>
<version>${pcloud-facade3.version}</version>
</dependency>
<dependency>
<groupId>com.pcloud.facade</groupId>
<artifactId>pcloud-facade-contentcenter</artifactId>
<version>${pcloud-facade.version}</version>
<version>${pcloud-facade3.version}</version>
</dependency>
<dependency>
<groupId>com.pcloud.facade</groupId>
<artifactId>pcloud-facade-readercenter</artifactId>
<version>${pcloud-facade.version}</version>
<version>${pcloud-facade3.version}</version>
</dependency>
<dependency>
<groupId>com.pcloud.facade</groupId>
<artifactId>pcloud-facade-labelcenter</artifactId>
<version>${pcloud-facade.version}</version>
<version>${pcloud-facade3.version}</version>
</dependency>
<dependency>
<groupId>com.pcloud.facade</groupId>
<artifactId>pcloud-facade-wechatgroup</artifactId>
<version>${pcloud-facade.version}</version>
<version>${pcloud-facade3.version}</version>
</dependency>
<dependency>
<groupId>com.pcloud.facade</groupId>
<artifactId>pcloud-facade-promotion</artifactId>
<version>${pcloud-facade.version}</version>
<version>${pcloud-facade3.version}</version>
</dependency>
<dependency>
<groupId>com.pcloud.facade</groupId>
<artifactId>pcloud-facade-audioapp</artifactId>
<version>${pcloud-facade.version}</version>
<version>${pcloud-facade3.version}</version>
</dependency>
<dependency>
<groupId>com.pcloud.facade</groupId>
<artifactId>pcloud-facade-videolesson</artifactId>
<version>${pcloud-facade.version}</version>
<version>${pcloud-facade3.version}</version>
</dependency>
<dependency>
<groupId>com.pcloud.facade</groupId>
<artifactId>pcloud-facade-liveapp</artifactId>
<version>${pcloud-facade.version}</version>
<version>${pcloud-facade3.version}</version>
</dependency>
<dependency>
<groupId>com.pcloud.facade</groupId>
<artifactId>pcloud-facade-shareimage</artifactId>
<version>${pcloud-facade.version}</version>
<version>${pcloud-facade3.version}</version>
</dependency>
<dependency>
<groupId>com.pcloud.facade</groupId>
<artifactId>pcloud-facade-convert</artifactId>
<version>${pcloud-facade.version}</version>
<version>${pcloud-facade3.version}</version>
</dependency>
<dependency>
<groupId>com.pcloud.facade</groupId>
<artifactId>pcloud-facade-wechat</artifactId>
<version>${pcloud-facade.version}</version>
<version>${pcloud-facade3.version}</version>
</dependency>
<dependency>
<groupId>com.pcloud.facade</groupId>
<artifactId>pcloud-facade-feedback</artifactId>
<version>${pcloud-facade.version}</version>
<version>${pcloud-facade3.version}</version>
</dependency>
<dependency>
<groupId>com.pcloud.facade</groupId>
<artifactId>pcloud-facade-feedback</artifactId>
<version>${pcloud-facade.version}</version>
</dependency>
<dependency>
<groupId>com.pcloud.facade</groupId>
<artifactId>pcloud-facade-erp</artifactId>
<version>${pcloud-facade.version}</version>
<version>${pcloud-facade3.version}</version>
</dependency>
<dependency>
<groupId>com.pcloud.facade</groupId>
<artifactId>pcloud-facade-wordapp</artifactId>
<version>${pcloud-facade.version}</version>
<version>${pcloud-facade3.version}</version>
</dependency>
<dependency>
<groupId>com.pcloud.facade</groupId>
<artifactId>pcloud-facade-exercisebook</artifactId>
<version>${pcloud-facade.version}</version>
<version>${pcloud-facade3.version}</version>
</dependency>
<dependency>
<groupId>com.pcloud.facade</groupId>
<artifactId>pcloud-facade-advertising</artifactId>
<version>${pcloud-facade.version}</version>
<version>${pcloud-facade3.version}</version>
</dependency>
<dependency>
<groupId>com.pcloud.book.elasticsearch</groupId>
<artifactId>pcloud-book-elasticsearch-api</artifactId>
<version>${pcloud-facade3.version}</version>
</dependency>
<dependency>
......@@ -256,104 +247,6 @@
<version>0.2.1</version>
</dependency>
<!--ES相关-->
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-elasticsearch</artifactId>
</dependency>
<!--spring-cloud相关-->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>
<dependency>
<groupId>org.mybatis.spring.boot</groupId>
<artifactId>mybatis-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<!--其他-->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/javax.ws.rs/javax.ws.rs-api -->
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<version>2.1</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>1.2.8</version>
</dependency>
<!--导入Sentry-->
<!-- <dependency>-->
<!-- <groupId>io.sentry</groupId>-->
<!-- <artifactId>sentry-logback</artifactId>-->
<!-- <version>1.7.30</version>-->
<!-- </dependency>-->
<!--中文分词-->
<dependency>
<groupId>com.jianggujin</groupId>
<artifactId>IKAnalyzer-lucene</artifactId>
<version>8.0.0</version>
<exclusions>
<exclusion>
<artifactId>lucene-analyzers-common</artifactId>
<groupId>org.apache.lucene</groupId>
</exclusion>
<exclusion>
<artifactId>lucene-core</artifactId>
<groupId>org.apache.lucene</groupId>
</exclusion>
<exclusion>
<artifactId>lucene-queryparser</artifactId>
<groupId>org.apache.lucene</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.pcloud.book.elasticsearch</groupId>
<artifactId>pcloud-book-elasticsearch-api</artifactId>
<version>${pcloud-book-elasticsearch-api.version}</version>
</dependency>
</dependencies>
<build>
......@@ -362,26 +255,11 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>build-info</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.mybatis.generator</groupId>
<artifactId>mybatis-generator-maven-plugin</artifactId>
<version>1.3.2</version>
<configuration>
<verbose>true</verbose>
<overwrite>true</overwrite>
......
......@@ -7,6 +7,7 @@ import com.pcloud.common.core.constant.MQTopicProducer;
import com.pcloud.common.core.mq.MQExchangeConstants;
import com.pcloud.common.core.mq.MQQueueConstants;
import com.pcloud.common.core.mq.RabbitMQFactory;
import org.apache.commons.lang3.BooleanUtils;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.amqp.core.Binding;
import org.springframework.amqp.core.BindingBuilder;
......@@ -17,7 +18,7 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.web.servlet.MultipartConfigFactory;
import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
import org.springframework.cloud.netflix.feign.EnableFeignClients;
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
......@@ -55,6 +56,7 @@ public class BookApplication {
@Bean
public Docket createRestApi() {// 创建API基本信息
return new Docket(DocumentationType.SWAGGER_2)
.enable(BooleanUtils.toBoolean(System.getProperty("swagger.enable", "false")))
.apiInfo(apiInfo())
.select()
.apis(RequestHandlerSelectors.basePackage("com.pcloud"))// 扫描该包下的所有需要在Swagger中展示的API,@ApiIgnore注解标注的除外
......
......@@ -12,9 +12,7 @@
<artifactId>pcloud-book-parent</artifactId>
<version>3.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>pcloud-book-parent</name>
<description>invoker project for Spring Boot</description>
<modules>
<module>pcloud-facade-book</module>
......@@ -23,12 +21,85 @@
<properties>
<reversion>3.1.0-SNAPSHOT</reversion>
</properties>
</properties>
<dependencyManagement>
<dependencies>
</dependencies>
</dependencyManagement>
<!-- 全局属性配置 -->
<profiles>
<!-- 开发环境 -->
<profile>
<id>dev</id>
<properties>
<!-- 部署环境(对应配置文件版本) -->
<env>dev</env>
<wxgroup-sdk.version>1.1.0-SNAPSHOT</wxgroup-sdk.version>
<coolq-sdk.version>1.0-SNAPSHOT</coolq-sdk.version>
</properties>
</profile>
<!-- 测试环境 -->
<profile>
<id>test</id>
<properties>
<!-- 部署环境(对应配置文件版本) -->
<env>test</env>
<maven.test.skip>false</maven.test.skip>
<wxgroup-sdk.version>1.0.0-SNAPSHOT</wxgroup-sdk.version>
<coolq-sdk.version>1.0-SNAPSHOT</coolq-sdk.version>
</properties>
</profile>
<!-- UAT -->
<profile>
<id>uat</id>
<properties>
<!-- 部署环境(对应配置文件版本) -->
<env>uat</env>
<wxgroup-sdk.version>1.0.0-RELEASE</wxgroup-sdk.version>
<coolq-sdk.version>1.0-RELEASE</coolq-sdk.version>
</properties>
<!-- 设置默认环境 -->
<activation>
<activeByDefault>true</activeByDefault>
</activation>
</profile>
<!-- 压测环境 -->
<profile>
<id>perf</id>
<properties>
<!-- 部署环境(对应配置文件版本) -->
<env>perf</env>
<wxgroup-sdk.version>1.0.0-SNAPSHOT</wxgroup-sdk.version>
<coolq-sdk.version>1.0-SNAPSHOT</coolq-sdk.version>
</properties>
</profile>
<!-- 生产环境 -->
<profile>
<id>prod</id>
<properties>
<!-- 部署环境(对应配置文件版本) -->
<env>prod</env>
<wxgroup-sdk.version>1.1.0-SNAPSHOT</wxgroup-sdk.version>
<coolq-sdk.version>1.1.0-RELEASE</coolq-sdk.version>
</properties>
</profile>
<profile>
<id>tsrpd</id>
<properties>
<!-- 部署环境(对应配置文件版本) -->
<env>tsrpd</env>
<wxgroup-sdk.version>1.1.0-SNAPSHOT</wxgroup-sdk.version>
<coolq-sdk.version>1.1.0-RELEASE</coolq-sdk.version>
</properties>
</profile>
</profiles>
</project>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment