Merge branch 'master' of http://10.1.235.20:3000/rest/rest-guide.git

ipu-rest-demo/pom.xml

@@ -3,7 +3,7 @@
	<modelVersion>4.0.0</modelVersion>
	<parent>
		<groupId>com.ai.ipu.server</groupId>
		<artifactId>ipu-rest-libs</artifactId>
		<artifactId>ipu-server-parent</artifactId>
		<version>3.2-SNAPSHOT</version>
	</parent>
@@ -28,16 +28,46 @@
	</repositories>
	<properties>
		<env>dev</env>
		<skip-test>true</skip-test>
		<start-class>com.ai.ipu.server.demo.IpuRestDemoStart</start-class>
		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
		<ipu>3.1-SNAPSHOT</ipu>
		<ipu-db>3.2-SNAPSHOT</ipu-db>
		<ipu>3.2-SNAPSHOT</ipu>
		<ipu-rest>3.2-SNAPSHOT</ipu-rest>
		<org.springframework.boot>1.5.9.RELEASE</org.springframework.boot>
		<!-- docker仓库服务器及端口，如果只是docker容器，则为镜像前缀 -->
		<!-- ipudocker.com对应47.105.130.83  --> 
		<docker-registry-server>ipudocker.com:5000</docker-registry-server>
		<!-- docker仓库身份认证方式及用户密码，如果只是docker容器，请设置为空 -->
		<docker-registry-auth>basic</docker-registry-auth>
		<docker-registry-username>ipu</docker-registry-username>
		<docker-registry-password>ipuDocker@83</docker-registry-password>
		<msgframe>1.9.2</msgframe>
		<mongodb.version>3.11.2</mongodb.version>
		<jms>1.1</jms>
	</properties>
	<dependencyManagement>
		<dependencies>
			<dependency>
				<groupId>org.springframework.boot</groupId>
				<artifactId>spring-boot-dependencies</artifactId>
				<version>${org.springframework.boot}</version>
				<type>pom</type>
				<scope>import</scope>
			</dependency>
			<dependency>
				<groupId>com.ai.ipu.server</groupId>
				<artifactId>ipu-dependencies</artifactId>
				<version>${ipu}</version>
				<type>pom</type>
				<scope>import</scope>
			</dependency>
		</dependencies>
	</dependencyManagement>
	<dependencies>
		<!-- dubbo相关依赖 -->
		<dependency>
@@ -66,14 +96,16 @@
		<dependency>
		    <groupId>com.ai.ipu</groupId>
		    <artifactId>ipu-sql-mgmt</artifactId>
		    <version>${ipu-db}</version>
		</dependency>
		<dependency>
            <groupId>com.ai.ipu</groupId>
            <artifactId>ipu-nosql</artifactId>
            <version>${ipu}</version>
        </dependency>
        
        <dependency>
			<groupId>com.ai.ipu.server</groupId>
			<artifactId>ipu-restful</artifactId>
		</dependency>
		
        <!-- 这里引入mongo-java-driver的原因是springboot1.5.9缺省使用了mongo-java-driver低版本的驱动，
                                导致ipu-nosql里MongoCredential.createScramSha256Credential报“方法不存在”。
                               由于ipu-rest-libs里引入springboot采用了import方式；
@@ -94,6 +126,5 @@
				<artifactId>spring-boot-maven-plugin</artifactId>
			</plugin>
		</plugins>
		<finalName>${project.artifactId}</finalName>
	</build>
</project>

ipu-rest-scaffold/pom.xml

@@ -1,10 +1,11 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<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">
	<modelVersion>4.0.0</modelVersion>
	<parent>
		<groupId>com.ai.ipu.server</groupId>
		<artifactId>ipu-rest-part-libs</artifactId>
		<artifactId>ipu-assembly-parent</artifactId>
		<version>3.2-SNAPSHOT</version>
	</parent>
@@ -42,19 +43,48 @@
	</repositories>
	<properties>
		<env>dev</env>
		<start-class>com.ai.ipu.server.RestScaffoldStart</start-class>
		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
		<ipu-db>3.2-SNAPSHOT</ipu-db>
		<ipu>3.2-SNAPSHOT</ipu>
		<ipu-rest>3.2-SNAPSHOT</ipu-rest>
		<junit>4.12</junit>
		<spring.session>1.3.5.RELEASE</spring.session>
		<org.springframework.boot>1.5.9.RELEASE</org.springframework.boot>
		<!-- docker仓库服务器及端口，如果只是docker容器，则为镜像前缀 -->
		<!-- ipudocker.com对应47.105.130.83 -->
		<docker-registry-server>ipudocker.com:5000</docker-registry-server>
		<!-- docker仓库身份认证方式及用户密码，如果只是docker容器，请设置为空 -->
		<docker-registry-auth>basic</docker-registry-auth>
		<docker-registry-username>ipu</docker-registry-username>
		<docker-registry-password>ipuDocker@83</docker-registry-password>
	</properties>
	<dependencyManagement>
		<dependencies>
			<dependency>
				<groupId>org.springframework.boot</groupId>
				<artifactId>spring-boot-dependencies</artifactId>
				<version>${org.springframework.boot}</version>
				<type>pom</type>
				<scope>import</scope>
			</dependency>
			<dependency>
				<groupId>com.ai.ipu.server</groupId>
				<artifactId>ipu-dependencies</artifactId>
				<version>${ipu}</version>
				<type>pom</type>
				<scope>import</scope>
			</dependency>
		</dependencies>
	</dependencyManagement>
	<dependencies>
		<dependency>
			<groupId>com.ai.ipu.server</groupId>
			<artifactId>ipu-restful</artifactId>
		</dependency>
		<dependency>
			<groupId>com.ai.ipu</groupId>
			<artifactId>ipu-sql-mgmt</artifactId>
			<version>${ipu-db}</version>
			<!-- 屏蔽以后Idea可能启动报错 -->
			<scope>provided</scope>
		</dependency>
@@ -65,14 +95,19 @@
		</dependency>
		<!-- 添加springboot使用redis管理session的依赖 -->
		<dependency>
		    <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-data-redis</artifactId>
			<groupId>org.springframework.boot</groupId>
			<artifactId>spring-boot-starter-data-redis</artifactId>
			<exclusions>
				<exclusion>
					<groupId>org.springframework.boot</groupId>
					<artifactId>spring-boot-starter-logging</artifactId>
				</exclusion>
			</exclusions>
		</dependency>
		<dependency>
			<groupId>org.springframework.session</groupId>
			<artifactId>spring-session-data-redis</artifactId>
		</dependency>
        <dependency>
            <groupId>org.springframework.session</groupId>
            <artifactId>spring-session-data-redis</artifactId>
            <version>${spring.session}</version>
        </dependency>
	</dependencies>
@@ -96,24 +131,11 @@
				<groupId>org.apache.maven.plugins</groupId>
				<artifactId>maven-assembly-plugin</artifactId>
			</plugin>
            <!-- 添加docker镜像功能 -->
            <plugin>
                <groupId>com.spotify</groupId>
                <artifactId>dockerfile-maven-plugin</artifactId>
                <version>1.4.10</version>
                <configuration>
                    <repository>ipudocker.com:5000/${project.artifactId}</repository>
                    <contextDirectory>${project.basedir}</contextDirectory>
                    <auth>basic</auth>
                    <username>ipu</username>
                    <!--在容器镜像服务控制台"设置Registry登陆密码"-->
                    <password>ipuDocker@83</password>
                    <buildArgs>
                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
                    </buildArgs>
                    <tag>${project.version}</tag>
                </configuration>
            </plugin>
			<!-- 添加docker镜像功能 -->
			<plugin>
				<groupId>com.spotify</groupId>
				<artifactId>dockerfile-maven-plugin</artifactId>
			</plugin>
		</plugins>
	</build>
</project>