Merge branch 'feature/HTJ-2.04.001-20250116' into develop

# Conflicts: # project.yaml

Merge branch 'feature/HTJ-2.04.001-20250116' into develop
# Conflicts: # project.yaml
37d835a7 · xujian · e1a5325f · 787d9abb · 37d835a7 · 37d835a7
Commit 37d835a7 authored May 08, 2025 by xujian
Hide whitespace changes
Inline Side-by-side

Showing with 63 additions and 39 deletions

Dockerfile Docker/mysqldump/Dockerfile +8 -0

Jenkinsfile Jenkinsfile +6 -1

values.yaml core-charts/values.yaml +5 -0

project.yaml project.yaml +44 -38

No files found.
--- a/Docker/mysqldump/Dockerfile
+++ b/Docker/mysqldump/Dockerfile
+FROM  openjdk:8-jdk-mysqldump
+#设置时区
+
+ARG FILE_NAME="default"
+ENV PARAMS=""
+RUN  ln -sf /usr/share/zoneinfo/Asia/Shanghai  /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
+COPY  ${FILE_NAME}   /app.jar
+ENTRYPOINT ["/bin/sh","-c","java -Dfile.encoding=utf8  -Djava.security.egd=file:/dev/.urandom -jar  app.jar ${PARAMS}" ]
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -141,7 +141,12 @@ pipeline {
                        }
                        if (module.isUpdate && !module.isEncryption) {
                            sh "cd ${module.dir}/${module.path} && mvn -Dmaven.test.failure.ignore=true -s /var/lib/jenkins/settings-itimQR.xml clean package install"
-                            sh "docker build -f Docker/noencryption/Dockerfile -t  ${push_path}/${module.name}:${module.version} --build-arg FILE_NAME=${module.dir}/${module.path}/target/*.jar ${workspace}"
+                            if(module.name == 'qrcode-modules-data-sharing'){
+                             sh "docker build -f Docker/mysqldump/Dockerfile -t  ${push_path}/${module.name}:${module.version} --build-arg FILE_NAME=${module.dir}/${module.path}/target/*.jar ${workspace}"
+                            } else {
+                             sh "docker build -f Docker/noencryption/Dockerfile -t  ${push_path}/${module.name}:${module.version} --build-arg FILE_NAME=${module.dir}/${module.path}/target/*.jar ${workspace}"
+                            }
+//                             sh "docker build -f Docker/noencryption/Dockerfile -t  ${push_path}/${module.name}:${module.version} --build-arg FILE_NAME=${module.dir}/${module.path}/target/*.jar ${workspace}"
                            sh "echo Qrcode@2022 | docker login https://192.168.31.201 --username admin --password-stdin"
                            sh "docker push ${push_path}/${module.name}:${module.version}"
                            sh "docker images -f 'dangling=true' -q | xargs -r docker rmi"

--- a/core-charts/values.yaml
+++ b/core-charts/values.yaml
@@ -41,6 +41,11 @@ core:
      isUpdate: false
      isEncryption: false
      path: factory-tobacco-qrcode-modules-timesync
+    - name: factory-tobacco-qrcode-modules-data-sharing
+      version: v24.09.20
+      isUpdate: false
+      isEncryption: false
+      path: factory-tobacco-qrcode-modules-data-sharing

 service:
  name: gateway

--- a/project.yaml
+++ b/project.yaml
@@ -5,7 +5,7 @@ service:
  name: gateway
  port: 8080
  nodePort: 30080
-  select: factory-tobacco-qrcode-gateway
+  select: qrcode-gateway-pcb
 ## 基础模块
 version: v25.02.21-2.04.001.001-cs
 # 如果项目base.isUpdate: true / core.isUpdate: true / htj.isUpdate: true 构建整个项目
@@ -13,45 +13,51 @@ version: v25.02.21-2.04.001.001-cs
 base:
  dir: "BASE"
  type: "mvn"
-  url: "http://114.116.202.8:18808/factory-tobacco/factory-tobacco-basic.git"
+  url: "http://114.116.202.8:18369/factory-tobacco/factory-tobacco-basic.git"
  namespace: qrcode-xxx
  isUpdate: true

 core:
  dir: "CORE"
  type: "mvn"
-  url: "http://114.116.202.8:18808/factory-tobacco/factory-tobacco-qrcodecore.git"
+  url: "http://114.116.202.8:18369/factory-tobacco/factory-tobacco-qrcodecore.git"
  namespace: qrcode-xxx
  isUpdate: true
  module:
-  - name: factory-tobacco-qrcode-auth
+  - name: qrcode-auth-pcb
    path: factory-tobacco-qrcode-auth
    isEncryption: false
-    version: v25.02.21-2.04.001.001-cs
+    version: 2.11.01
    isUpdate: false

-  - name: factory-tobacco-qrcode-gateway
+  - name: qrcode-gateway-pcb
    path: factory-tobacco-qrcode-gateway
    isEncryption: false
-    version: v25.04.21-2.04.001.001-cs
-    isUpdate: true
+    version: 2.11.01
+    isUpdate: false

-  - name: factory-tobacco-qrcode-modules-data-migrate
+  - name: qrcode-modules-data-migrate-pcb
    path: factory-tobacco-qrcode-modules-data-migrate
    isEncryption: false
-    version: v25.04.11-2.04.001.001-cs
+    version: 2.11.01
    isUpdate: false

-  - name: factory-tobacco-qrcode-modules-device
+  - name: qrcode-modules-device-pcb
    path: factory-tobacco-qrcode-modules-device
    isEncryption: false
-    version: v25.04.22-2.04.001.001-cs
-    isUpdate: false
+    version: 2.11.01-v25.05.08
+    isUpdate: true

-  - name: factory-tobacco-qrcode-modules-file
+  - name: qrcode-modules-file-pcb
    path: factory-tobacco-qrcode-modules-file
    isEncryption: false
-    version: v25.04.12-2.11.01.003-cs
+    version: 2.11.01
+    isUpdate: false
+
+  - name: qrcode-modules-data-sharing
+    path: factory-tobacco-qrcode-modules-data-sharing
+    isEncryption: false
+    version: v25.05.07.3
    isUpdate: false
 #
 #  - name: factory-tobacco-qrcode-modules-gen
@@ -60,34 +66,34 @@ core:
 #    version: v24.12.03.1-2.03.003-cs
 #    isUpdate: false

-  - name: factory-tobacco-qrcode-modules-monitor-alarm
+  - name: qrcode-modules-monitor-alarm-pcb
    path: factory-tobacco-qrcode-modules-monitor-alarm
    isEncryption: false
-    version: v25.04.03-1.04.001.001-cs
+    version: 2.11.01
    isUpdate: false

-  - name: factory-tobacco-qrcode-modules-stmb-register
+  - name: qrcode-modules-stmb-register-pcb
    path: factory-tobacco-qrcode-modules-stmb-register
    isEncryption: false
-    version: v25.04.02-5.04.001.001-cs
+    version: 2.11.01
    isUpdate: false

-  - name: factory-tobacco-qrcode-modules-system
+  - name: qrcode-modules-system-pcb
    path: factory-tobacco-qrcode-modules-system
-    isEncryption: false
-    version: v25.04.21-2.04.001.001-cs
+    isEncryption: true
+    version: v2.11.02-1
    isUpdate: false

-  - name: factory-tobacco-qrcode-modules-timesync
+  - name: qrcode-modules-timesync-pcb
    path: factory-tobacco-qrcode-modules-timesync
    isEncryption: false
-    version: v25.04.07-2.04.001.001-cs
+    version: 2.11.01
    isUpdate: false

 htj:
  dir: "HTJ"
  type: "mvn"
-  url: "http://114.116.202.8:18808/factory-tobacco/factory-tobacco-qrcode-htj.git"
+  url: "http://114.116.202.8:18369/factory-tobacco/factory-tobacco-qrcode-htj.git"
  namespace: qrcode-xxx
  isUpdate: true
  module:
@@ -103,16 +109,16 @@ htj:
    version: v25.03.31-2.04.001.001
    isUpdate: false

-  - name: factory-tobacco-qrcode-modules-db-version-control
+  - name: qrcode-modules-db-version-control-pcb
    path: factory-tobacco-qrcode-modules-db-version-control
    isEncryption: false
-    version: v25.04.12-2.11.01.002-cs
+    version: 2.11.01
    isUpdate: false

-  - name: factory-tobacco-qrcode-modules-iotege-relation
+  - name: qrcode-modules-iotege-relation-pcb
    path: factory-tobacco-qrcode-modules-iotege-relation
    isEncryption: false
-    version: v25.04.18-2.04.001
+    version: 2.11.01
    isUpdate: false

 #  - name: factory-tobacco-qrcode-modules-product-bloomfilter
@@ -121,16 +127,16 @@ htj:
 #    version: v25.02.21-2.04.001.001-cs
 #    isUpdate: false

-  - name: factory-tobacco-qrcode-modules-product-relation
+  - name: qrcode-modules-product-relation-pcb
    path: factory-tobacco-qrcode-modules-product-relation
    isEncryption: false
-    version: v25.04.11-2.04.001.001-cs
+    version: 2.11.01
    isUpdate: false

-  - name: factory-tobacco-qrcode-modules-product-report
+  - name: qrcode-modules-product-report-pcb
    path: factory-tobacco-qrcode-modules-product-report
    isEncryption: false
-    version: v25.02.21-2.04.001.001-cs
+    version: 2.11.01
    isUpdate: false

  - name: factory-tobacco-qrcode-modules-product-statistics
@@ -139,11 +145,11 @@ htj:
    version: v25.02.21-2.04.001.001-cs
    isUpdate: false

-  - name: factory-tobacco-qrcode-modules-product-upload
+  - name: qrcode-modules-product-upload-pcb
    path: factory-tobacco-qrcode-modules-product-upload
    isEncryption: true
    version: v25.04.19-2.11.01
-    isUpdate: true
+    isUpdate: false

  - name: factory-tobacco-qrcode-modules-wip-relation
    path: factory-tobacco-qrcode-modules-wip-relation
@@ -153,10 +159,10 @@ htj:

 web:
  dir: "WEB"
-  name: "qrcode-web"
+  name: "qrcode-pcb-factory-pcb"
  type: "node"
-  url: "http://114.116.202.8:18808/factory-tobacco/factory-tobacco-qrcode-htj-vue.git"
+  url: "http://114.116.202.8:18369/factory-tobacco/factory-tobacco-qrcode-htj-vue.git"
 #  isEncryption: false
-  version: v25.04.12-2.11.01.002-cs
+  version: v25.05.07
  isUpdate: false
 #
\ No newline at end of file