Merge branch 'refs/heads/zt-test' into test

# Conflicts:
#	zt-framework/zt-common/src/main/java/com/zt/plat/framework/common/biz/system/permission/PermissionCommonApi.java
#	zt-framework/zt-spring-boot-starter-biz-tenant/src/main/java/com/zt/plat/framework/tenant/core/context/DeptContextHolder.java
#	zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/permission/PermissionServiceImpl.java

deployment-databus.yaml

@@ -0,0 +1,67 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  namespace: ns-d6a0e78ebd674c279614498e4c57b133
+  name: zt-module-databus
+  labels:
+    app: zt-module-databus
+  annotations:
+    version: "VERSION_PLACEHOLDER"
+    description: DESC_PLACEHOLDER
+    rollout.kubernetes.io/change-cause: "DESC_PLACEHOLDER:VERSION_PLACEHOLDER"
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: zt-module-databus
+  template:
+    metadata:
+      labels:
+        app: zt-module-databus
+    spec:
+      dnsPolicy: None
+      dnsConfig:
+        nameservers:
+          - "172.16.36.16"
+          - "172.16.36.220"
+      containers:
+        - name: zt-module-databus
+          image: 172.16.46.66:10043/zt/zt-module-databus:VERSION_PLACEHOLDER
+          imagePullPolicy: Always
+          env:
+            - name: TZ
+              value: Asia/Shanghai
+          lifecycle:
+            preStop:
+              exec:
+                command:
+                  - "/bin/sh"
+                  - "-c"
+                  - "sleep 35"
+          readinessProbe:
+            httpGet:
+              path: /actuator/health
+              port: 48108
+            initialDelaySeconds: 100
+            periodSeconds: 5
+            failureThreshold: 3
+          livenessProbe:
+            httpGet:
+              path: /actuator/health
+              port: 48108
+            initialDelaySeconds: 100
+            periodSeconds: 10
+            failureThreshold: 5
+          resources:
+            requests:
+              cpu: "500m"
+              memory: "1024Mi"
+            limits:
+              cpu: "500m"
+              memory: "2048Mi"
+      terminationGracePeriodSeconds: 40
+  strategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxSurge: 1
+      maxUnavailable: 0

deployment-gateway.yaml

@@ -0,0 +1,74 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  namespace: ns-d6a0e78ebd674c279614498e4c57b133
+  name: zt-gateway
+  labels:
+    app: zt-gateway
+  annotations:
+    version: "VERSION_PLACEHOLDER"
+    description: DESC_PLACEHOLDER
+    rollout.kubernetes.io/change-cause: "DESC_PLACEHOLDER:VERSION_PLACEHOLDER"
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: zt-gateway
+  template:
+    metadata:
+      labels:
+        app: zt-gateway
+    spec:
+      containers:
+        - name: zt-gateway
+          image: 172.16.46.66:10043/zt/zt-gateway:VERSION_PLACEHOLDER
+          imagePullPolicy: Always
+          env:
+            - name: TZ
+              value: Asia/Shanghai
+          lifecycle:
+            preStop:
+              exec:
+                command:
+                  - "/bin/sh"
+                  - "-c"
+                  - "sleep 35"
+          ports:
+            - containerPort: 48080
+          readinessProbe:
+            httpGet:
+              path: /actuator/health
+              port: 48080
+            initialDelaySeconds: 100
+            periodSeconds: 5
+            failureThreshold: 3
+          livenessProbe:
+            httpGet:
+              path: /actuator/health
+              port: 48080
+            initialDelaySeconds: 100
+            periodSeconds: 10
+            failureThreshold: 5
+          resources:
+            requests:
+              cpu: "500m"
+              memory: "1024Mi"
+            limits:
+              cpu: "500m"
+              memory: "2048Mi"
+      terminationGracePeriodSeconds: 40
+---
+apiVersion: v1
+kind: Service
+metadata:
+  namespace: ns-d6a0e78ebd674c279614498e4c57b133
+  name: zt-gateway
+spec:
+  type: NodePort
+  selector:
+    app: zt-gateway
+  ports:
+    - protocol: TCP
+      port: 48080
+      targetPort: 48080
+      nodePort: 30081

deployment-infra.yaml

@@ -0,0 +1,67 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  namespace: ns-d6a0e78ebd674c279614498e4c57b133
+  name: zt-module-infra
+  labels:
+    app: zt-module-infra
+  annotations:
+    version: "VERSION_PLACEHOLDER"
+    description: DESC_PLACEHOLDER
+    rollout.kubernetes.io/change-cause: "DESC_PLACEHOLDER:VERSION_PLACEHOLDER"
+spec:
+  replicas: 2
+  selector:
+    matchLabels:
+      app: zt-module-infra
+  template:
+    metadata:
+      labels:
+        app: zt-module-infra
+    spec:
+      dnsPolicy: None
+      dnsConfig:
+        nameservers:
+          - "172.16.36.16"
+          - "172.16.36.220"
+      containers:
+        - name: zt-module-infra
+          image: 172.16.46.66:10043/zt/zt-module-infra:VERSION_PLACEHOLDER
+          imagePullPolicy: Always
+          env:
+            - name: TZ
+              value: Asia/Shanghai
+          lifecycle:
+            preStop:
+              exec:
+                command:
+                  - "/bin/sh"
+                  - "-c"
+                  - "sleep 35"
+          readinessProbe:
+            httpGet:
+              path: /actuator/health
+              port: 48082
+            initialDelaySeconds: 100
+            periodSeconds: 5
+            failureThreshold: 3
+          livenessProbe:
+            httpGet:
+              path: /actuator/health
+              port: 48082
+            initialDelaySeconds: 100
+            periodSeconds: 10
+            failureThreshold: 5
+          resources:
+            requests:
+              cpu: "500m"
+              memory: "1024Mi"
+            limits:
+              cpu: "500m"
+              memory: "2048Mi"
+      terminationGracePeriodSeconds: 40
+  strategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxSurge: 1
+      maxUnavailable: 0

deployment-system.yaml

@@ -0,0 +1,76 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  namespace: ns-d6a0e78ebd674c279614498e4c57b133
+  name: zt-module-system
+  labels:
+    app: zt-module-system
+  annotations:
+    version: "VERSION_PLACEHOLDER"
+    description: DESC_PLACEHOLDER
+    rollout.kubernetes.io/change-cause: "DESC_PLACEHOLDER:VERSION_PLACEHOLDER"
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: zt-module-system
+  template:
+    metadata:
+      labels:
+        app: zt-module-system
+    spec:
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                  - key: kubernetes.io/hostname
+                    operator: In
+                    values:
+                      - node-3
+      dnsPolicy: None
+      dnsConfig:
+        nameservers:
+          - "172.16.36.16"
+          - "172.16.36.220"
+      containers:
+        - name: zt-module-system
+          image: 172.16.46.66:10043/zt/zt-module-system:VERSION_PLACEHOLDER
+          imagePullPolicy: Always
+          env:
+            - name: TZ
+              value: Asia/Shanghai
+          lifecycle:
+            preStop:
+              exec:
+                command:
+                  - "/bin/sh"
+                  - "-c"
+                  - "sleep 35"
+          readinessProbe:
+            httpGet:
+              path: /actuator/health
+              port: 48081
+            initialDelaySeconds: 100
+            periodSeconds: 5
+            failureThreshold: 3
+          livenessProbe:
+            httpGet:
+              path: /actuator/health
+              port: 48081
+            initialDelaySeconds: 100
+            periodSeconds: 10
+            failureThreshold: 5
+          resources:
+            requests:
+              cpu: "500m"
+              memory: "1024Mi"
+            limits:
+              cpu: "500m"
+              memory: "2048Mi"
+      terminationGracePeriodSeconds: 40
+  strategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxSurge: 1
+      maxUnavailable: 0

pom.xml

@@ -25,6 +25,7 @@
         <module>zt-module-databus</module>
 <!--        <module>zt-module-rule</module>-->
 <!--        <module>zt-module-html2pdf</module>-->
+<!--        <module>zt-server</module>-->
     </modules>
 
     <name>${project.artifactId}</name>
@@ -32,7 +33,7 @@
     <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
 
     <properties>
-        <revision>3.0.46</revision>
+        <revision>3.0.47-SNAPSHOT</revision>
         <!-- Maven 相关 -->
         <java.version>17</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
@@ -203,7 +204,7 @@
         <repository>
             <id>ZT</id>
             <name>中铜 ZStack 私服</name>
-            <url>http://172.16.46.63:30708/repository/test/</url>
+            <url>http://172.16.46.63:30708/repository/zt-cloud/</url>
             <releases>
                 <updatePolicy>always</updatePolicy>
                 <checksumPolicy>warn</checksumPolicy>
@@ -221,11 +222,11 @@
             <name>中铜 ZStack 私服</name>
             <url>http://172.16.46.63:30708/repository/test/</url>
         </repository>
-<!--    <snapshotRepository>-->
-<!--        <id>ZT</id>-->
-<!--        <name>中铜 ZStack 私服</name>-->
-<!--        <url>https://your-nexus.example.com/repository/maven-snapshots/</url>-->
-<!--    </snapshotRepository>-->
+        <snapshotRepository>
+            <id>ZT-snap</id>
+            <name>中铜 ZStack 私服</name>
+            <url>http://172.16.46.63:30708/repository/test-snap/</url>
+        </snapshotRepository>
     </distributionManagement>
 
     <profiles>
@@ -242,6 +243,19 @@
                 <config.version>1.0.0</config.version>
             </properties>
         </profile>
+        <profile>
+            <id>wzy</id>
+            <properties>
+                <env.name>dev</env.name>
+                <!--Nacos 配置-->
+                <config.server-addr>172.16.46.63:30848</config.server-addr>
+                <config.namespace>wzy</config.namespace>
+                <config.group>DEFAULT_GROUP</config.group>
+                <config.username>nacos</config.username>
+                <config.password>P@ssword25</config.password>
+                <config.version>1.0.0</config.version>
+            </properties>
+        </profile>
         <profile>
             <id>klw-dev</id>
             <properties>
@@ -282,13 +296,13 @@
             </properties>
         </profile>
         <profile>
-            <id>chenbowen</id>
+            <id>haodongqiang</id>
             <properties>
 <!--                <env.name>local</env.name>-->
                 <env.name>dev</env.name>
                 <!--                <config.server-addr>localhost:8848</config.server-addr>-->
                 <config.server-addr>172.16.46.63:30848</config.server-addr>
-                <config.namespace>chenbowen</config.namespace>
+                <config.namespace>haodongqiang</config.namespace>
                 <config.group>DEFAULT_GROUP</config.group>
                 <config.username>nacos</config.username>
                 <config.password>P@ssword25</config.password>

sql/dm/20260116角色权限增加菜单是否显示字段.sql

@@ -0,0 +1,4 @@
+ALTER TABLE "SYSTEM_ROLE_MENU" ADD COLUMN "SHOW_MENU" BIT DEFAULT ('1') NOT NULL;
+COMMENT ON COLUMN "SYSTEM_ROLE_MENU"."SHOW_MENU" IS '是否显示菜单';
+
+CREATE INDEX "IDX_SYSTEM_ROLE_ID_AND_MENU_ID" ON "SYSTEM_ROLE_MENU"(ROLE_ID,MENU_ID);

sql/dm/databus_api_credential_enable_encryption_20260114.sql

@@ -0,0 +1,7 @@
+-- 为 API 客户端凭证表添加"是否启用加密"字段
+-- 2026-01-14
+
+ALTER TABLE databus_api_client_credential
+    ADD enable_encryption BIT DEFAULT '1' NOT NULL;
+
+COMMENT ON COLUMN databus_api_client_credential.enable_encryption IS '是否启用加密传输';

sql/dm/ruoyi-vue-pro-dm8.sql

@@ -339,7 +339,8 @@ CREATE TABLE infra_file (
                             create_time datetime DEFAULT CURRENT_TIMESTAMP NOT NULL,
                             updater varchar(64) DEFAULT '' NULL,
                             update_time datetime DEFAULT CURRENT_TIMESTAMP NOT NULL,
-                            deleted bit DEFAULT '0' NOT NULL
+                            deleted bit DEFAULT '0' NOT NULL,
+                            DOWNLOAD_COUNT INT DEFAULT 0 NOT NULL
 );
 
 COMMENT ON COLUMN infra_file.id IS '文件编号';
@@ -356,6 +357,7 @@ COMMENT ON COLUMN infra_file.create_time IS '创建时间';
 COMMENT ON COLUMN infra_file.updater IS '更新者';
 COMMENT ON COLUMN infra_file.update_time IS '更新时间';
 COMMENT ON COLUMN infra_file.deleted IS '是否删除';
+COMMENT ON COLUMN INFRA_FILE.DOWNLOAD_COUNT IS '下载次数';
 COMMENT ON TABLE infra_file IS '文件表';
 
 CREATE INDEX idx_infra_file_hash ON infra_file(hash);

sql/dm/添加文件下载次数统计字段.sql

@@ -0,0 +1,5 @@
+-- 添加文件下载次数统计字段
+ALTER TABLE JYGK_TEST.INFRA_FILE
+    ADD DOWNLOAD_COUNT INT DEFAULT 0 NOT NULL;
+
+COMMENT ON COLUMN JYGK_TEST.INFRA_FILE.DOWNLOAD_COUNT IS '下载次数';

sql/dm/物料牌号扩展功能.sql

@@ -0,0 +1,42 @@
+-- 表：bse_mtrl_grade_ext
+CREATE TABLE IF NOT EXISTS bse_mtrl_grade_ext (
+    id              BIGINT PRIMARY KEY,
+    CMP_CD          VARCHAR(64)    NOT NULL,
+    CMP_NM          VARCHAR(128),
+    MTRL_CD         VARCHAR(128)   NOT NULL,
+    MTRL_NM         VARCHAR(255),
+    ZH_BRAND        VARCHAR(255),
+    EN_BRAND        VARCHAR(255),
+    SPC_MDL         VARCHAR(255),
+    LINE_TP         VARCHAR(64),
+    PKG             VARCHAR(255),
+    company_id      BIGINT,
+    company_name    VARCHAR(128),
+    dept_id         BIGINT,
+    dept_name       VARCHAR(128),
+    post_id         BIGINT,
+    tenant_id       BIGINT DEFAULT 1,
+    creator_name    VARCHAR(64),
+    updater_name    VARCHAR(64),
+    creator         VARCHAR(64),
+    create_time     TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,
+    updater         VARCHAR(64),
+    update_time     TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,
+    deleted         BIT DEFAULT 0 NOT NULL
+);
+
+-- 索引
+CREATE INDEX IF NOT EXISTS idx_bse_mtrl_grade_ext_mtrl_cd ON bse_mtrl_grade_ext (MTRL_CD);
+CREATE INDEX IF NOT EXISTS idx_bse_mtrl_grade_ext_cmp_cd ON bse_mtrl_grade_ext (CMP_CD);
+
+-- 字段注释（可选）
+COMMENT ON TABLE bse_mtrl_grade_ext IS '物料牌号扩展';
+COMMENT ON COLUMN bse_mtrl_grade_ext.CMP_CD IS '公司编码';
+COMMENT ON COLUMN bse_mtrl_grade_ext.CMP_NM IS '公司名称';
+COMMENT ON COLUMN bse_mtrl_grade_ext.MTRL_CD IS '物料编码';
+COMMENT ON COLUMN bse_mtrl_grade_ext.MTRL_NM IS '物料名称';
+COMMENT ON COLUMN bse_mtrl_grade_ext.ZH_BRAND IS '中文牌号';
+COMMENT ON COLUMN bse_mtrl_grade_ext.EN_BRAND IS '英文牌号';
+COMMENT ON COLUMN bse_mtrl_grade_ext.SPC_MDL IS '规格型号';
+COMMENT ON COLUMN bse_mtrl_grade_ext.LINE_TP IS '线别（material_line_type 字典）';
+COMMENT ON COLUMN bse_mtrl_grade_ext.PKG IS '包装';