Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	pom.xml
This commit is contained in:
wurui
2023-02-15 11:37:03 +08:00
parent c220b93f69 22cb7670a3
commit b580ca931e
57 changed files with 222 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
pom.xml
View File

@@ -24,6 +24,7 @@
<module>pqs-prepare</module>
<module>pqs-process</module>
<module>pqs-algorithm</module>
</modules>
<packaging>pom</packaging>
<name>灿能微服务生态系统</name>
@@ -42,19 +43,19 @@
<properties>
<!--中间件目标地址-->
<!-- <middle.server.url>198.120.100.195</middle.server.url>-->
<middle.server.url>192.168.1.18</middle.server.url>
<middle.server.url>192.168.1.31</middle.server.url>
<!--微服务模块发布地址-->
<!-- <service.server.url>198.120.100.195</service.server.url>-->
<service.server.url>192.168.1.117</service.server.url>
<service.server.url>192.168.1.111</service.server.url>
<!--docker仓库地址-->
<docker.server.url>192.168.1.18</docker.server.url>
<docker.server.url>192.168.1.13</docker.server.url>
<!--nacos的ip:port-->
<nacos.url>${middle.server.url}:18848</nacos.url>
<!--服务器发布内容为空-->
<!-- <nacos.namespace></nacos.namespace>-->
<nacos.namespace></nacos.namespace>
<!-- <nacos.namespace>fd74182b-1fce-4dba-afa7-2623b0376205</nacos.namespace>-->
<!-- <nacos.namespace>ba3ba5d1-3480-4755-8b87-6b1fce16201c</nacos.namespace>-->
<nacos.namespace>a4165300-4f0e-4042-8a2a-e49ceba0644a</nacos.namespace>
<!-- <nacos.namespace>f6df4a49-39cb-4355-a8fd-8aeb0c537eb1</nacos.namespace>-->
<!--sentinel:port-->
<!-- <sentinel.url>192.168.1.14:8080</sentinel.url>-->
<sentinel.url>${middle.server.url}:8080</sentinel.url>
@@ -66,12 +67,16 @@
<docker.repostory>${docker.server.url}:8090</docker.repostory>
<!--docker远程项目仓库名-->
<docker.registry.name>njcn</docker.registry.name>
<docker.operate>test</docker.operate>
<!--切换阿里&华为的配置sdk-->
<micro.sdk>common-microservice</micro.sdk>
<!-- <micro.sdk>common-huawei</micro.sdk>-->
<docker.operate>site</docker.operate>
<java.version>1.8</java.version>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<!--三剑客版本-->
<springboot.version>2.3.12.RELEASE</springboot.version>
<!-- <springcloud.version>Hoxton.SR12</springcloud.version>-->
<springcloud.version>Hoxton.SR12</springcloud.version>
<springcloud.alibaba.version>2.2.7.RELEASE</springcloud.alibaba.version>
<hutool.version>5.7.9</hutool.version>
@@ -109,6 +114,7 @@
<progressbar.version>0.5.3</progressbar.version>
<okhttp.version>4.8.1</okhttp.version>
<minio.version>8.2.1</minio.version>
<spring-cloud-huawei.version>1.7.0-Hoxton</spring-cloud-huawei.version>
</properties>
<dependencyManagement>
<dependencies>
@@ -134,6 +140,14 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<!--华为云cse微服务引擎-->
<dependency>
<groupId>com.huaweicloud</groupId>
<artifactId>spring-cloud-huawei-dependencies</artifactId>
<version>${spring-cloud-huawei.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!--三剑客依赖******end-->
<!--java工具包-->
<dependency>