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

* dev-klw:
  清理与ztcloud中重复的代码,改为 jar 包方式引用 ztcloud

# Conflicts:
#	zt-module-system/zt-module-system-api/src/main/java/com/zt/plat/module/system/api/sms/dto/send/SmsSendSingleToUserReqDTO.java
#	zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/controller/admin/sms/SmsCallbackController.java
#	zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/mq/message/sms/SmsSendMessage.java

.gitignore

@@ -61,6 +61,7 @@ package-lock.json
 # visual studio code
 .history
 *.log
+logs/**
 
 functions/mock
 .temp/**

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-f16a3067ca7b434aad127d15eac82503
+  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: ClusterFirst
+      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-f16a3067ca7b434aad127d15eac82503
+  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-f16a3067ca7b434aad127d15eac82503
+  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-f16a3067ca7b434aad127d15eac82503
+  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: ClusterFirst
+      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-f16a3067ca7b434aad127d15eac82503
+  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: ClusterFirst
+      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

docs/databus-client使用说明.md

@@ -0,0 +1,31 @@
+# Databus Client 使用说明
+
+databus client 最主要用于调用基于http协议的第三方接口时需要记录调用日志到 databus 的情况, 通过databus client 调用第三方接口会将调用日志记录到databus的访问日志中
+
+# 使用方法
+1. 添加依赖: 
+```xml
+<dependency>
+    <groupId>com.zt.plat</groupId>
+    <artifactId>zt-module-databus-client</artifactId>
+    <version>3.0.47-SNAPSHOT</version>
+</dependency>
+```
+2. 注入 DatabusClient
+```java
+@Resource
+private DatabusClient databusClient;
+```
+3. 方法说明
+    * get(...) : 发送 get 请求
+    * post(...): 发送 post 请求
+    * put(...): 发送 put 请求
+    * delete(...): 发送 delete 请求
+    * doRequest(...): 发送自定义请求
+4. 方法参数说明(由于所有方法参数都是一样的,所以在此统一说明)
+   * String urlString: 请求的 http 接口地址(get/delete请求不需要带url参数)
+   * Map<String, Object> data: 请求的参数(post/put方法会转换为json提交, get/delete会拼接到url上)
+   * Map<String, String> headers: 请求头信息
+   * String appId: databus 的appid
+   * String authToken: databus 的访问令牌
+   * Method method: doRequest 方法独有,如果要使用 get/post/put/delete 之外的方法,请使用doRequest方法并通过method参数指定