1. 合并base改包代码

This commit is contained in:
chenbowen
2025-09-22 15:10:53 +08:00
670 changed files with 23530 additions and 811 deletions

354
README.md Normal file

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

68
pom.xml
View File

@@ -18,46 +18,13 @@
<module>zt-module-infra</module>
<module>zt-module-bpm</module>
<module>zt-module-report</module>
<module>zt-module-mp</module>
<!-- <module>zt-module-mp</module>-->
<!-- <module>zt-module-ai</module>-->
<module>zt-module-template</module>
<module>zt-module-databus</module>
<module>zt-module-rule</module>
<module>zt-module-html2pdf</module>
<!-- <module>zt-module-base</module>-->
<!-- <module>zt-module-contract-order</module>-->
<!-- <module>zt-module-manage</module>-->
<!-- <module>zt-module-capital</module>-->
<!-- <module>zt-module-metering-test</module>-->
<!-- <module>zt-module-receive-deliver</module>-->
<!-- <module>zt-module-customs</module>-->
<!-- <module>zt-module-exchange</module>-->
<!-- <module>zt-module-price</module>-->
<!-- <module>zt-module-settle</module>-->
<!-- <module>zt-module-bill</module>-->
<!-- <module>zt-module-purchase</module>-->
<!-- <module>zt-module-sell</module>-->
<!-- <module>zt-module-indicator</module>-->
<!-- <module>zt-module-product</module>-->
<!-- <module>zt-module-energy</module>-->
<!-- <module>zt-module-quality</module>-->
<!-- <module>zt-module-warehouse</module>-->
<!-- <module>zt-module-backend-logistics</module>-->
<!-- <module>zt-module-jy-business</module>-->
<!-- <module>zt-module-jy-manage</module>-->
<!-- <module>zt-module-jy-resource</module>-->
<!-- <module>zt-module-jy-office</module>-->
<!-- <module>zt-module-jy-report</module>-->
<!-- <module>zt-module-jy-iot</module>-->
<!-- <module>base-server</module>-->
<!-- <module>manage-server</module>-->
<!-- <module>supply-server</module>-->
<!-- <module>mes-server</module>-->
<!-- <module>logistics-server</module>-->
<!-- <module>qms-server</module>-->
<!-- <module>zt-module-iot</module>-->
<!-- <module>zt-module-databus</module>-->
<!-- <module>zt-module-rule</module>-->
<!-- <module>zt-module-html2pdf</module>-->
</modules>
<name>${project.artifactId}</name>
@@ -206,11 +173,6 @@
<!-- 使用 huawei / aliyun 的 Maven 源,提升下载速度 -->
<repositories>
<repository>
<id>ZT</id>
<name>中铜 ZStack 私服</name>
<url>http://172.16.46.63:30708/repository/test/</url>
</repository>
<repository>
<id>huaweicloud</id>
<name>huawei</name>
@@ -235,7 +197,15 @@
<name>Spring Snapshots</name>
<url>https://repo.spring.io/snapshot</url>
<releases>
<enabled>true</enabled>
<enabled>false</enabled>
</releases>
</repository>
<repository>
<id>ZT</id>
<name>中铜 ZStack 私服</name>
<url>http://172.16.46.63:30708/repository/test/</url>
<releases>
<enabled>false</enabled>
</releases>
</repository>
</repositories>
@@ -294,15 +264,9 @@
</properties>
</profile>
<profile>
<id>liss</id>
<id>chenbowen</id>
<properties>
<config.namespace>liss</config.namespace>
</properties>
</profile>
<profile>
<id>qsj</id>
<properties>
<config.namespace>qsj</config.namespace>
<config.namespace>chenbowen</config.namespace>
</properties>
</profile>
</profiles>

View File

@@ -1,5 +1,5 @@
# encoding=utf8
"""芋道系统数据库迁移工具
"""ZT系统数据库迁移工具
Author: dhb52 (https://gitee.com/dhb52)
@@ -16,7 +16,7 @@ from typing import Dict, Generator, Optional, Tuple, Union
from simple_ddl_parser import DDLParser
PREAMBLE = """/*
Zt Database Transfer Tool
Cloud Database Transfer Tool
Source Server Type : MySQL
@@ -828,7 +828,7 @@ class OpengaussConvertor(KingbaseConvertor):
def main():
parser = argparse.ArgumentParser(description="芋道系统数据库转换工具")
parser = argparse.ArgumentParser(description="ZT系统数据库转换工具")
parser.add_argument(
"type",
type=str,
@@ -837,7 +837,7 @@ def main():
)
args = parser.parse_args()
sql_file = pathlib.Path("../mysql/ruoyi-vue-pro.sql").resolve().as_posix()
sql_file = pathlib.Path("../mysql/在线文档管理表结构.sql").resolve().as_posix()
convertor = None
if args.type == "postgres":
convertor = PostgreSQLConvertor(sql_file)

View File

@@ -1,18 +1,19 @@
package com.zt.plat.framework.common.biz.system.oauth2;
import com.zt.plat.framework.common.enums.RpcConstants;
import com.zt.plat.framework.common.pojo.CommonResult;
import com.zt.plat.framework.common.biz.system.oauth2.dto.OAuth2AccessTokenCheckRespDTO;
import com.zt.plat.framework.common.biz.system.oauth2.dto.OAuth2AccessTokenCreateReqDTO;
import com.zt.plat.framework.common.biz.system.oauth2.dto.OAuth2AccessTokenRespDTO;
import com.zt.plat.framework.common.enums.RpcConstants;
import com.zt.plat.framework.common.pojo.CommonResult;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import io.swagger.v3.oas.annotations.Operation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import jakarta.validation.Valid;
@FeignClient(name = RpcConstants.SYSTEM_NAME) // TODO 芋艿fallbackFactory =
@Tag(name = "RPC 服务 - OAuth2.0 令牌")
public interface OAuth2TokenCommonApi {

View File

@@ -2,9 +2,9 @@ package com.zt.plat.framework.common.biz.system.tenant;
import com.zt.plat.framework.common.enums.RpcConstants;
import com.zt.plat.framework.common.pojo.CommonResult;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;

View File

@@ -1,9 +1,9 @@
package com.zt.plat.framework.common.exception.util;
import com.google.common.annotations.VisibleForTesting;
import com.zt.plat.framework.common.exception.ErrorCode;
import com.zt.plat.framework.common.exception.ServiceException;
import com.zt.plat.framework.common.exception.enums.GlobalErrorCodeConstants;
import com.google.common.annotations.VisibleForTesting;
import lombok.extern.slf4j.Slf4j;
/**

View File

@@ -3,9 +3,9 @@ package com.zt.plat.framework.common.util.collection;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjUtil;
import com.zt.plat.framework.common.core.KeyValue;
import com.google.common.collect.Maps;
import com.google.common.collect.Multimap;
import com.zt.plat.framework.common.core.KeyValue;
import java.util.ArrayList;
import java.util.Collection;

View File

@@ -2,6 +2,7 @@ package com.zt.plat.framework.common.validation;
import cn.hutool.core.util.StrUtil;
import com.zt.plat.framework.common.util.validation.ValidationUtils;
import jakarta.validation.ConstraintValidator;
import jakarta.validation.ConstraintValidatorContext;

View File

@@ -1,11 +1,11 @@
package com.zt.plat.framework.business.filter;
import com.esotericsoftware.minlog.Log;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.zt.plat.framework.common.util.spring.SpringUtils;
import com.zt.plat.module.infra.api.businessfile.BusinessFileApi;
import com.zt.plat.module.infra.api.businessfile.dto.BusinessFileSaveReqDTO;
import com.esotericsoftware.minlog.Log;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import jakarta.servlet.*;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;

Some files were not shown because too many files have changed in this diff Show More