Merge branch 'feature/v2.11.08-251117-logs' into feature/v2.11.08-251128-等保问题整改

Jenkinsfile

@@ -25,6 +25,7 @@ pipeline {
         gitParameter branchFilter: 'origin/(.*)', defaultValue: defaultBranch, name: 'BASE', type: 'PT_BRANCH_TAG', useRepository: '.*factory-tobacco-basic.git' // 后端
         gitParameter branchFilter: 'origin/(.*)', defaultValue: defaultBranch, name: 'CORE', type: 'PT_BRANCH_TAG', useRepository: '.*factory-tobacco-qrcodecore-new.git' // 后端
         gitParameter branchFilter: 'origin/(.*)', defaultValue: defaultBranch, name: 'HTJ', type: 'PT_BRANCH_TAG', useRepository: '.*factory-tobacco-qrcode-htj.git' // 后端
+        gitParameter branchFilter: 'origin/(.*)', defaultValue: defaultBranch, name: 'OTHER', type: 'PT_BRANCH_TAG', useRepository: '*factory-tobacco-Independent.git' // 后端
         gitParameter branchFilter: 'origin/(.*)', defaultValue: defaultBranch, name: 'WEB', type: 'PT_BRANCH_TAG', useRepository: '.*factory-tobacco-qrcode-htj-vue.git' // 后端
     }
 
@@ -44,6 +45,7 @@ pipeline {
                     repos.add([dir: smallfile.base.dir, type: smallfile.base.type, isUpdate: smallfile.base.isUpdate, url: smallfile.base.url])
                     repos.add([dir: smallfile.core.dir, type: smallfile.core.type, isUpdate: smallfile.core.isUpdate, url: smallfile.core.url])
                     repos.add([dir: smallfile.htj.dir, type: smallfile.htj.type, isUpdate: smallfile.htj.isUpdate, url: smallfile.htj.url])
+                    repos.add([dir: smallfile.other.dir, type: smallfile.other.type, isUpdate: smallfile.other.isUpdate, url: smallfile.other.url])
                     repos.add([dir: smallfile.web.dir, type: smallfile.web.type, isUpdate: smallfile.web.isUpdate, url: smallfile.web.url])
 
                     if(smallfile.pushPath) push_path=smallfile.pushPath
@@ -87,6 +89,18 @@ pipeline {
                             ])
                         }
                     }
+                    if(smallfile.other.module) {
+                        for (module in smallfile.other.module) {
+                            modules.add([
+                                dir: smallfile.other.dir,
+                                name: module.name,
+                                version: module.version,
+                                isUpdate: module.isUpdate,
+                                isEncryption: module.isEncryption,
+                                path: module.path
+                            ])
+                        }
+                    }
                     if(smallfile.web) {
                             webs.add([
                                 dir: smallfile.web.dir,

project.yaml

@@ -104,11 +104,6 @@ htj:
     version: v2.11.08-25.12.15.002
     isUpdate: false
 
-  - name: factory-tobacco-qrcode-module-product-syncmes
-    path: factory-tobacco-qrcode-module-product-syncmes
-    isEncryption: false
-    version: v2.11.08-25.12.15.002
-    isUpdate: false
 
   - name: qrcode-modules-db-version-control-pcb
     path: factory-tobacco-qrcode-modules-db-version-control
@@ -140,24 +135,50 @@ htj:
     version: v2.11.08-25.12.15.002
     isUpdate: false
 
-  - name: factory-tobacco-qrcode-modules-product-statistics
-    path: factory-tobacco-qrcode-modules-product-statistics
-    isEncryption: false
-    version: v2.11.08-25.12.15.001
-    isUpdate: false
-
   - name: qrcode-modules-product-upload-pcb
     path: factory-tobacco-qrcode-modules-product-upload
     isEncryption: true
     version: v2.11.08-25.12.15.002
     isUpdate: false
 
+other:
+  dir: "OTHER"
+  type: "mvn"
+  url: "http://114.116.202.8:18369/factory-tobacco/factory-tobacco-Independent.git"
+  namespace: qrcode-xxx
+  isUpdate: true
+  module:
+    - name: factory-tobacco-qrcode-module-monitoring-platform
+      path: factory-tobacco-qrcode-module-monitoring-platform
+      isEncryption: false
+      version: v2.11.08-26.01.06.001
+      isUpdate: false
+
+    - name: factory-tobacco-qrcode-module-product-syncmes
+      path: factory-tobacco-qrcode-module-product-syncmes
+      isEncryption: false
+      version: v2.11.08-25.12.15.002
+      isUpdate: false
+
     - name: factory-tobacco-qrcode-modules-wip-relation
       path: factory-tobacco-qrcode-modules-wip-relation
       isEncryption: false
       version: v2.11.08-25.12.15.001
       isUpdate: false
 
+    - name: factory-tobacco-qrcode-modules-product-statistics
+      path: factory-tobacco-qrcode-modules-product-statistics
+      isEncryption: false
+      version: v2.11.08-25.12.15.001
+      isUpdate: false
+
+    - name: factory-tobacco-qrcode-module-sharingdata-query
+      path: factory-tobacco-qrcode-module-sharingdata-query
+      isEncryption: false
+      version: v2.11.08-25.02.03.003
+      isUpdate: true
+
+
 web:
   dir: "WEB"
   name: "qrcode-pcb-factory-pcb"