代码迁移

32b36cb2 · xujian · 6175620f · 32b36cb2 · 32b36cb2
Commit 32b36cb2 authored Oct 31, 2024 by xujian
Hide whitespace changes
Inline Side-by-side

Showing with 44 additions and 44 deletions

Jenkinsfile
+1 -1

project.yaml
+43 -43

No files found.
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,7 +14,7 @@ def webs = [
 def push_path = "192.168.31.201/develop"
-def defaultBranch="release/HTJ-2.03.002-20240730-黑户"
+def defaultBranch="feature/htj-v2.04.001"
 pipeline {
    agent any

--- a/project.yaml
+++ b/project.yaml
@@ -6,8 +6,8 @@ service:
  port: 8080
  select: factory-tobacco-qrcode-gateway
 ## 基础模块
-version: v24.09.26
+version: v24.10.31
-# 如果项目base.isUpdate: false / core.isUpdate: false / htj.isUpdate: false 构建整个项目
+# 如果项目base.isUpdate: true / core.isUpdate: true / htj.isUpdate: true 构建整个项目
 # 如果模块为true指定项目打包
 base:
  dir: "BASE"
@@ -19,26 +19,26 @@ base:
  - name: factory-tobacco-qrcode-auth
    path: factory-tobacco-qrcode-auth
    isEncryption: false
-    version: v24.09.26
+    version: v24.10.31
-    isUpdate: false
+    isUpdate: true
  - name: factory-tobacco-qrcode-gateway
    path: factory-tobacco-qrcode-gateway
    isEncryption: false
-    version: v24.09.26
+    version: v24.10.31
-    isUpdate: false
+    isUpdate: true
  - name: factory-tobacco-qrcode-modules-file
    path: factory-tobacco-qrcode-modules-file
    isEncryption: false
-    version: v24.09.27
+    version: v24.10.31
-    isUpdate: false
+    isUpdate: true
  - name: factory-tobacco-qrcode-modules-gen
    path: factory-tobacco-qrcode-modules-gen
    isEncryption: false
-    version: v24.09.26
+    version: v24.10.31
-    isUpdate: false
+    isUpdate: true
 core:
  dir: "CORE"
@@ -50,38 +50,38 @@ core:
  - name: factory-tobacco-qrcode-modules-data-migrate
    path: factory-tobacco-qrcode-modules-data-migrate
    isEncryption: false
-    version: v24.09.26
+    version: v24.10.31
-    isUpdate: false
+    isUpdate: true
  - name: factory-tobacco-qrcode-modules-device
    path: factory-tobacco-qrcode-modules-device
    isEncryption: false
-    version: v24.09.26
+    version: v24.10.31
-    isUpdate: false
+    isUpdate: true
  - name: factory-tobacco-qrcode-modules-monitor-alarm
    path: factory-tobacco-qrcode-modules-monitor-alarm
    isEncryption: false
-    version: v24.09.26
+    version: v24.10.31
-    isUpdate: false
+    isUpdate: true
  - name: factory-tobacco-qrcode-modules-stmb-register
    path: factory-tobacco-qrcode-modules-stmb-register
    isEncryption: false
-    version: v24.09.26
+    version: v24.10.31
-    isUpdate: false
+    isUpdate: true
  - name: factory-tobacco-qrcode-modules-system
    path: factory-tobacco-qrcode-modules-system
    isEncryption: false
-    version: v24.09.26
+    version: v24.10.31
-    isUpdate: false
+    isUpdate: true
  - name: factory-tobacco-qrcode-modules-timesync
    path: factory-tobacco-qrcode-modules-timesync
    isEncryption: false
-    version: v24.09.26
+    version: v24.10.31
-    isUpdate: false
+    isUpdate: true
 htj:
  dir: "HTJ"
@@ -93,62 +93,62 @@ htj:
  - name: factory-tobacco-qrcode-module-monitoring-platform
    path: factory-tobacco-qrcode-module-monitoring-platform
    isEncryption: false
-    version: v24.10.22
+    version: v24.10.31
-    isUpdate: false
+    isUpdate: true
  - name: factory-tobacco-qrcode-module-product-syncmes
    path: factory-tobacco-qrcode-module-product-syncmes
    isEncryption: false
-    version: v24.09.26
+    version: v24.10.31
-    isUpdate: false
+    isUpdate: true
  - name: factory-tobacco-qrcode-modules-db-version-control
    path: factory-tobacco-qrcode-modules-db-version-control
    isEncryption: false
-    version: v24.10.10-2.03.002-1-kf
+    version: v24.10.31
-    isUpdate: false
+    isUpdate: true
  - name: factory-tobacco-qrcode-modules-iotege-relation
    path: factory-tobacco-qrcode-modules-iotege-relation
    isEncryption: false
-    version: v24.09.26
+    version: v24.10.31
-    isUpdate: false
+    isUpdate: true
  - name: factory-tobacco-qrcode-modules-product-bloomfilter
    path: factory-tobacco-qrcode-modules-product-bloomfilter
    isEncryption: false
-    version: v24.09.26
+    version: v24.10.31
-    isUpdate: false
+    isUpdate: true
  - name: factory-tobacco-qrcode-modules-product-relation
    path: factory-tobacco-qrcode-modules-product-relation
    isEncryption: false
-    version: v24.10.30-2.03.002-kf
+    version: v24.10.31
    isUpdate: true
  - name: factory-tobacco-qrcode-modules-product-report
    path: factory-tobacco-qrcode-modules-product-report
    isEncryption: false
-    version: v24.09.26
+    version: v24.10.31
-    isUpdate: false
+    isUpdate: true
  - name: factory-tobacco-qrcode-modules-product-statistics
    path: factory-tobacco-qrcode-modules-product-statistics
    isEncryption: false
-    version: v24.09.26
+    version: v24.10.31
-    isUpdate: false
+    isUpdate: true
  - name: factory-tobacco-qrcode-modules-product-upload
    path: factory-tobacco-qrcode-modules-product-upload
    isEncryption: true
-    version: v24.10.15-2.03.002-cs
+    version: v24.10.31
-    isUpdate: false
+    isUpdate: true
  - name: factory-tobacco-qrcode-modules-wip-relation
    path: factory-tobacco-qrcode-modules-wip-relation
    isEncryption: false
-    version: v24.09.26
+    version: v24.10.31
-    isUpdate: false
+    isUpdate: true
 web:
  dir: "WEB"
@@ -156,5 +156,5 @@ web:
  type: "node"
  url: "http://114.116.202.8:18808/factory-tobacco/factory-tobacco-qrcode-htj-vue.git"
 #  isEncryption: false
-  version: v24.10.14-2.03.002-kf
+  version: v24.10.31
-  isUpdate: false
+  isUpdate: true