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

README.md

@@ -282,7 +282,7 @@
 | [Spring MVC](https://github.com/spring-projects/spring-framework/tree/master/spring-webmvc) | MVC 框架           | 6.1.10     | [文档](http://www.iocoder.cn/SpringMVC/MVC/?zt)                    |
 | [Spring Security](https://github.com/spring-projects/spring-security)                       | Spring 安全框架      | 6.3.1      | [文档](http://www.iocoder.cn/Spring-Boot/Spring-Security/?zt)      |
 | [Hibernate Validator](https://github.com/hibernate/hibernate-validator)                     | 参数校验组件           | 8.0.1      | [文档](http://www.iocoder.cn/Spring-Boot/Validation/?zt)           |
-| [Flowable](https://github.com/flowable/flowable-engine)                                     | 工作流引擎            | 7.0.0      | [文档](https://doc.iocoder.cn/bpm/)                                   |
+| [Flowable](https://github.com/flowable/flowable-engine)                                     | 工作流引擎            | 7.0.0      | [文档](http://172.16.46.63:30888/bpm/)                                   |
 | [Knife4j](https://gitee.com/xiaoym/knife4j)                                                 | Swagger 增强 UI 实现 | 4.5.0      | [文档](http://www.iocoder.cn/Spring-Boot/Swagger/?zt)              |
 | [SkyWalking](https://skywalking.apache.org/)                                                | 分布式应用追踪系统        | 9.0.0      | [文档](http://www.iocoder.cn/Spring-Boot/SkyWalking/?zt)           |
 | [Spring Boot Admin](https://github.com/codecentric/spring-boot-admin)                       | Spring Boot 监控平台 | 3.6.1      | [文档](http://www.iocoder.cn/Spring-Boot/Admin/?zt)                |

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

@@ -20,19 +20,20 @@
         <module>zt-module-report</module>
         <!--<module>zt-module-mp</module>-->
 <!--        <module>zt-module-ai</module>-->
-<!--        <module>zt-module-template</module>-->
+        <module>zt-module-template</module>
 <!--        <module>zt-module-iot</module>-->
         <module>zt-module-databus</module>
 <!--        <module>zt-module-rule</module>-->
 <!--        <module>zt-module-html2pdf</module>-->
+<!--        <module>zt-server</module>-->
     </modules>
 
     <name>${project.artifactId}</name>
-    <description>芋道项目基础脚手架</description>
+    <description>ZT项目基础脚手架</description>
     <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
 
     <properties>
-        <revision>3.0.45</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>-->
+        <snapshotRepository>
-<!--        <id>ZT</id>-->
+            <id>ZT-snap</id>
-<!--        <name>中铜 ZStack 私服</name>-->
+            <name>中铜 ZStack 私服</name>
-<!--        <url>https://your-nexus.example.com/repository/maven-snapshots/</url>-->
+            <url>http://172.16.46.63:30708/repository/test-snap/</url>
-<!--    </snapshotRepository>-->
+        </snapshotRepository>
     </distributionManagement>
 
     <profiles>
@@ -242,6 +243,32 @@
                 <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>
+                <env.name>dev</env.name>
+                <!--Nacos 配置-->
+                <config.server-addr>172.16.46.63:30848</config.server-addr>
+                <config.namespace>klw</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>env-prod</id>
             <properties>
@@ -269,9 +296,17 @@
             </properties>
         </profile>
         <profile>
-            <id>chenbowen</id>
+            <id>haodongqiang</id>
             <properties>
-                <config.namespace>chenbowen</config.namespace>
+<!--                <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>haodongqiang</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>

sql/db2/README.md

@@ -1,3 +0,0 @@
-暂未适配 IBM DB2 数据库，如果你有需要，可以微信联系 wangwenbin-server 一起建设。
-
-你需要把表结构与数据导入到 DM 数据库，我来测试与适配代码。