Merge branch 'test' into test-dsc

* test:
  把-server项目改为jar包,新增 server-app项目作为启动器 http://172.16.46.63:31560/index.php?m=task&f=view&taskID=699
  [+]增加国密SM4加解密工具包
  fix(user-dept): 修改用户来源筛选条件
  fix(databus): 修复部门数据查询中缺少数据源过滤条件
  fix(databus): 修改用户同步的数据源过滤条件
  fix(databus): 修改用户同步的数据源过滤条件
  [+]增加国密SM4接口加解密
  [#]修改部门推送消息逻辑

# Conflicts:
#	zt-framework/zt-common/src/main/java/com/zt/plat/framework/common/util/security/CryptoSignatureUtils.java
#	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/api/databus/DatabusDeptProviderApiImpl.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/framework/sms/core/enums/SmsChannelEnum.java

zt-framework/zt-common/pom.xml

@@ -163,6 +163,33 @@
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk18on</artifactId>
+            <version>1.78.1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.14</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpmime</artifactId>
+            <version>4.5.14</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 </project>

zt-framework/zt-common/src/main/java/com/zt/plat/framework/common/pojo/PageResult.java

@@ -15,7 +15,7 @@ import java.util.List;
 import java.util.Map;
 
 @Schema(description = "分页结果")
-@Data
+@Data //TODO 分页结果参考这个
 public final class PageResult<T> implements Serializable {
 
     @Schema(description = "数据", requiredMode = Schema.RequiredMode.REQUIRED)

zt-framework/zt-spring-boot-starter-biz-tenant/src/main/java/com/zt/plat/framework/tenant/core/mq/rocketmq/TenantRocketMQSendMessageHook.java

@@ -11,7 +11,7 @@ import static com.zt.plat.framework.web.core.util.WebFrameworkUtils.HEADER_TENAN
  *
  * Producer 发送消息时，将 {@link TenantContextHolder} 租户编号，添加到消息的 Header 中
  *
- * @author ZT
+ * @author ZT TODO
  */
 public class TenantRocketMQSendMessageHook implements SendMessageHook {
 

zt-framework/zt-spring-boot-starter-mybatis/src/main/java/com/zt/plat/framework/mybatis/core/mapper/BaseMapperX.java

@@ -54,7 +54,7 @@ public interface BaseMapperX<T> extends MPJBaseMapper<T> {
             PageSumSupport.tryAttachSummary(this, queryWrapper, pageResult);
             return pageResult;
         }
-
+        //TODO 分页结果参考这个 ===============================
         // MyBatis Plus 查询
         IPage<T> mpPage = MyBatisUtils.buildPage(pageParam, sortingFields);
         selectPage(mpPage, queryWrapper);