Browse Source

@IPU_REQ_2021@pom优化

weihf 3 years ago
parent
commit
f348cb8894

+ 10 - 21
ipu-rest-demo/pom.xml

4
	<parent>
4
	<parent>
5
		<groupId>com.ai.ipu.server</groupId>
5
		<groupId>com.ai.ipu.server</groupId>
6
		<artifactId>ipu-server-parent</artifactId>
6
		<artifactId>ipu-server-parent</artifactId>
7
		<version>3.2-SNAPSHOT</version>
7
		<version>3.3-SNAPSHOT</version>
8
	</parent>
8
	</parent>
9
9
10
	<artifactId>ipu-rest-demo</artifactId>
10
	<artifactId>ipu-rest-demo</artifactId>
39
		<ipu>3.2-SNAPSHOT</ipu>
39
		<ipu>3.2-SNAPSHOT</ipu>
40
		<ipu-rest>3.3-SNAPSHOT</ipu-rest>
40
		<ipu-rest>3.3-SNAPSHOT</ipu-rest>
41
		<org.springframework.boot>2.1.3.RELEASE</org.springframework.boot>
41
		<org.springframework.boot>2.1.3.RELEASE</org.springframework.boot>
42
		<!-- 执行完build镜像后,是否自动push到仓库,如果是,必须配置docker-registry-server -->
43
		<spring-boot-docker-push>false</spring-boot-docker-push>
44
        <!-- 拉取镜像的策略,可选的值:ALWAYS, NEVER, IF_NOT_PRESENT -->
45
        <spring-boot-docker-base-img-pull-policy>IF_NOT_PRESENT</spring-boot-docker-base-img-pull-policy>
46
        
42
47
43
		<!-- docker仓库服务器及端口,如果只是docker容器,则为镜像前缀 -->
44
		<!-- ipudocker.com对应47.105.130.83  --> 
48
		<!-- docker私人仓库服务器及端口或者docker公共仓库用户名,无仓库则为镜像前缀 -->
49
		<!-- ipudocker.com对应公网阿里云私库47.105.130.83或公司内网亚信云私库10.19.14.114  --> 
45
		<docker-registry-server>ipudocker.com:5000</docker-registry-server>
50
		<docker-registry-server>ipudocker.com:5000</docker-registry-server>
46
		<!-- docker仓库身份认证方式及用户密码,如果只是docker容器,请设置为空 -->
51
		<!-- docker仓库身份认证方式及用户密码,如果只是docker容器,请设置为空 -->
47
		<docker-registry-auth>basic</docker-registry-auth>
52
		<docker-registry-auth>basic</docker-registry-auth>
133
		    <artifactId>guava</artifactId>
138
		    <artifactId>guava</artifactId>
134
		    <version>${google.plugin}</version>
139
		    <version>${google.plugin}</version>
135
		</dependency>
140
		</dependency>
136
		<dependency>
137
			<groupId>mysql</groupId>
138
			<artifactId>mysql-connector-java</artifactId>
139
			<version>8.0.17</version>
140
		</dependency>
141
141
		<!-- nacos -->
142
		<!-- nacos -->
142
		<dependency>
143
		<dependency>
143
			<groupId>com.alibaba.cloud</groupId>
144
			<groupId>com.alibaba.cloud</groupId>
150
		<!-- nacos定时任务 -->
151
		<!-- nacos定时任务 -->
151
		<dependency>  
152
		<dependency>  
152
        	<groupId>org.quartz-scheduler</groupId>  
153
        	<groupId>org.quartz-scheduler</groupId>  
153
        	<artifactId>quartz</artifactId>  
154
        	<version>2.2.1</version>  
154
        	<artifactId>quartz</artifactId>   
155
    	</dependency>  
155
    	</dependency>  
156
    	<dependency>  
156
    	<dependency>  
157
        	<groupId>org.quartz-scheduler</groupId>  
157
        	<groupId>org.quartz-scheduler</groupId>  
158
        	<artifactId>quartz-jobs</artifactId>  
158
        	<artifactId>quartz-jobs</artifactId>  
159
        	<version>2.2.1</version>  
160
    	</dependency>
159
    	</dependency>
161
	</dependencies>
160
	</dependencies>
162
161
166
			<plugin>
165
			<plugin>
167
				<groupId>org.springframework.boot</groupId>
166
				<groupId>org.springframework.boot</groupId>
168
				<artifactId>spring-boot-maven-plugin</artifactId>
167
				<artifactId>spring-boot-maven-plugin</artifactId>
169
				<version>2.4.5</version>
170
				    <configuration>
171
                        <image>
172
                            <!-- 执行完build 自动push -->
173
                            <publish>false</publish>
174
                            <!-- 拉取镜像的策略,可选的值:ALWAYS, NEVER, IF_NOT_PRESENT -->
175
                            <pullPolicy>NEVER</pullPolicy>
176
                            <name>megale/${project.artifactId}:${project.version}</name>
177
                        </image>
178
                     </configuration>			
179
			</plugin>
168
			</plugin>
180
			<!-- 添加docker镜像功能 -->
169
			<!-- 添加docker镜像功能 -->
181
			<plugin>
170
			<plugin>

+ 2 - 1
ipu-rest-demo/src/main/java/com/ai/ipu/server/demo/control/dubbo/DubboConsumerController.java

1
package com.ai.ipu.server.demo.control.dubbo;
1
package com.ai.ipu.server.demo.control.dubbo;
2

2

3
import org.apache.dubbo.config.annotation.Reference;
3

4
import org.springframework.data.annotation.Reference;
4
import org.springframework.stereotype.Controller;
5
import org.springframework.stereotype.Controller;
5
import org.springframework.web.bind.annotation.RequestMapping;
6
import org.springframework.web.bind.annotation.RequestMapping;
6
import org.springframework.web.bind.annotation.ResponseBody;
7
import org.springframework.web.bind.annotation.ResponseBody;