Commit fe9b1e17 by suhang

Merge remote-tracking branch 'origin/release/HTJ-2.03.002-20240730' into…

Merge remote-tracking branch 'origin/release/HTJ-2.03.002-20240730' into release/HTJ-2.03.002-20240730

# Conflicts:
#	project.yaml
parents d001a99b ad48d2b0
...@@ -7,14 +7,14 @@ service: ...@@ -7,14 +7,14 @@ service:
select: factory-tobacco-qrcode-gateway select: factory-tobacco-qrcode-gateway
## 基础模块 ## 基础模块
version: v24.09.26 version: v24.09.26
# 如果项目base.isUpdate: true / core.isUpdate: true / htj.isUpdate: true 构建整个项目 # 如果项目base.isUpdate: false / core.isUpdate: false / htj.isUpdate: false 构建整个项目
# 如果模块为true指定项目打包 # 如果模块为true指定项目打包
base: base:
dir: "BASE" dir: "BASE"
type: "mvn" type: "mvn"
url: "http://114.116.202.8:18808/factory-tobacco/factory-tobacco-basic.git" url: "http://114.116.202.8:18808/factory-tobacco/factory-tobacco-basic.git"
namespace: qrcode-xxx namespace: qrcode-xxx
isUpdate: true isUpdate: false
module: module:
- name: factory-tobacco-qrcode-auth - name: factory-tobacco-qrcode-auth
path: factory-tobacco-qrcode-auth path: factory-tobacco-qrcode-auth
...@@ -45,7 +45,7 @@ core: ...@@ -45,7 +45,7 @@ core:
type: "mvn" type: "mvn"
url: "http://114.116.202.8:18808/factory-tobacco/factory-tobacco-qrcodecore.git" url: "http://114.116.202.8:18808/factory-tobacco/factory-tobacco-qrcodecore.git"
namespace: qrcode-xxx namespace: qrcode-xxx
isUpdate: true isUpdate: false
module: module:
- name: factory-tobacco-qrcode-modules-data-migrate - name: factory-tobacco-qrcode-modules-data-migrate
path: factory-tobacco-qrcode-modules-data-migrate path: factory-tobacco-qrcode-modules-data-migrate
...@@ -88,11 +88,11 @@ htj: ...@@ -88,11 +88,11 @@ htj:
type: "mvn" type: "mvn"
url: "http://114.116.202.8:18808/factory-tobacco/factory-tobacco-qrcode-htj.git" url: "http://114.116.202.8:18808/factory-tobacco/factory-tobacco-qrcode-htj.git"
namespace: qrcode-xxx namespace: qrcode-xxx
isUpdate: true isUpdate: false
module: module:
# - name: factory-tobacco-qrcode-module-monitoring-platform # - name: factory-tobacco-qrcode-module-monitoring-platform
# version: v24.09.26 # version: v24.09.26
# isUpdate: true # isUpdate: false
# isEncryption: false # isEncryption: false
# path: factory-tobacco-qrcode-module-monitoring-platform # path: factory-tobacco-qrcode-module-monitoring-platform
- name: factory-tobacco-qrcode-module-product-syncmes - name: factory-tobacco-qrcode-module-product-syncmes
...@@ -147,7 +147,7 @@ htj: ...@@ -147,7 +147,7 @@ htj:
path: factory-tobacco-qrcode-modules-wip-relation path: factory-tobacco-qrcode-modules-wip-relation
isEncryption: false isEncryption: false
version: v24.09.26 version: v24.09.26
isUpdate: false isUpdate: true
web: web:
dir: "WEB" dir: "WEB"
......
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