Merge branch 'master' of http://192.168.18.156:8090/r/yudao-cloud

tz-dependencies/pom.xml

@@ -83,11 +83,12 @@
 <!--        <gcexcel.version>8.1.4</gcexcel.version>-->
         <okhttp.version>4.12.0</okhttp.version>
 <!--        <spring-security.version>6.4.4</spring-security.version>-->
-        <poi.version>5.4.0</poi.version>
+        <poi.version>5.4.1</poi.version>
+        <xmlbeans.version>5.2.0</xmlbeans.version>
         <classgraph.version>4.8.112</classgraph.version>
         <protobuf-java.version>4.28.2</protobuf-java.version>
         <xstream.version>1.4.21</xstream.version>
-        <weixin-java-miniapp.version>4.6.0</weixin-java-miniapp.version>
+        <weixin-java-miniapp.version>4.7.5.B</weixin-java-miniapp.version>
 <!--        <weixin-java-miniapp.version>4.7.0</weixin-java-miniapp.version>-->
     </properties>
 
@@ -702,12 +703,24 @@
                 <artifactId>dashscope-sdk-java</artifactId>
                 <version>2.19.2</version>
             </dependency>
+
+            <dependency>
+                <groupId>org.apache.poi</groupId>
+                <artifactId>poi</artifactId>
+                <version>${poi.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.apache.poi</groupId>
                 <artifactId>poi-ooxml</artifactId>
                 <version>${poi.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.apache.xmlbeans</groupId>
+                <artifactId>xmlbeans</artifactId>
+                <version>${xmlbeans.version}</version> <!-- Check for the latest version -->
+            </dependency>
             <dependency>
                 <groupId>io.github.classgraph</groupId>
                 <artifactId>classgraph</artifactId>
@@ -737,6 +750,7 @@
                 <artifactId>weixin-java-common</artifactId>
                 <version>${weixin-java-miniapp.version}</version>
             </dependency>
+
             <dependency>
                 <groupId>com.github.binarywang</groupId>
                 <artifactId>wx-java-miniapp-spring-boot-starter</artifactId>  <!-- 微信登录（小程序） -->
@@ -779,6 +793,11 @@
 <!--            </dependency>-->
             <!-- 其他 Flowable 模块 -->
 
+            <dependency>
+                <groupId>com.google.zxing</groupId>
+                <artifactId>core</artifactId>
+                <version>3.5.3</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

tz-framework/tz-common/src/main/java/cn/start/tz/framework/common/enums/HttpEnum.java

@@ -0,0 +1,18 @@
+package cn.start.tz.framework.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 统一外网可访问路径
+ */
+@Getter
+@AllArgsConstructor
+public enum HttpEnum {
+
+    UAT_URL("https://tjt.gzsei.cn/app-api/dexdev/", "UAT环境可外网服务路径");
+
+    private final String url;
+    private final String desc;
+
+}

tz-framework/tz-common/src/main/java/cn/start/tz/framework/common/enums/UserTypeEnum.java

@@ -15,7 +15,8 @@ import java.util.Arrays;
 public enum UserTypeEnum implements ArrayValuable<Integer> {
 
     MEMBER(1, "会员"), // 面向 c 端，普通用户
-    ADMIN(2, "管理员"); // 面向 b 端，管理后台
+    ADMIN(2, "管理员"), // 面向 b 端，管理后台
+    APP_CLIENT(3, "APP客户端"); // 面向 b 端，管理后台
 
     public static final Integer[] ARRAYS = Arrays.stream(values()).map(UserTypeEnum::getValue).toArray(Integer[]::new);
 

tz-framework/tz-common/src/main/java/cn/start/tz/framework/common/util/http/HttpUtils.java

@@ -12,6 +12,8 @@ import org.springframework.web.util.UriComponents;
 import org.springframework.web.util.UriComponentsBuilder;
 
 import jakarta.servlet.http.HttpServletRequest;
+
+import java.io.IOException;
 import java.net.URI;
 import java.nio.charset.Charset;
 import java.util.Map;
@@ -160,4 +162,24 @@ public class HttpUtils {
         }
     }
 
+    /**
+     * 从指定 URL 下载 PDF 文件字节流
+     *
+     * @param url PDF 文件的 URL 地址
+     * @return PDF 文件的字节数组
+     * @throws IOException 下载失败时抛出异常
+     */
+    public static byte[] downloadPdfFromUrl(String url) throws IOException {
+        try (HttpResponse response = HttpRequest.get(url)
+                .timeout(30000) // 设置超时时间 30 秒
+                .execute()) {
+            if (response.getStatus() == 200) {
+                return response.bodyBytes();
+            } else {
+                throw new IOException("下载PDF失败，HTTP状态码: " + response.getStatus() + "，URL: " + url);
+            }
+        } catch (Exception e) {
+            throw new IOException("下载PDF文件时发生错误: " + e.getMessage(), e);
+        }
+    }
 }

tz-framework/tz-common/src/main/java/cn/start/tz/framework/common/util/json/JsonUtils.java

@@ -24,6 +24,7 @@ import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
 /**
  * JSON 工具类
@@ -315,16 +316,37 @@ public class JsonUtils {
         // 处理对象节点
         if (node.isObject()) {
             ObjectNode objectNode = (ObjectNode) node;
-            objectNode.fields().forEachRemaining(entry -> {
-                JsonNode cleaned = cleanEmptyFields(entry.getValue());
 
-                // 删除空值键
-                if (isEmptyNode(cleaned)) {
-                    objectNode.remove(entry.getKey());
-                } else {
-                    objectNode.set(entry.getKey(), cleaned);
+            if (objectNode.isEmpty()) {
+                return objectNode;
+            }
+            if( objectNode.fields() == null || !objectNode.fields().hasNext()){
+                return objectNode;
+            }
+           // objectNode.fields().forEachRemaining(entry -> {
+            for (Iterator<Map.Entry<String, JsonNode>> it = objectNode.fields(); it.hasNext(); ) {
+                try {
+                    Map.Entry<String, JsonNode> entry = it.next();
+                    if(entry == null){
+                        return NullNode.getInstance();
+                    }
+                    JsonNode cleaned = cleanEmptyFields(entry.getValue());
+                    assert cleaned != null;
+                    log.info("cleaned:{}", cleaned.isNull());
+                    log.info("cleaned:{}", entry.getKey());
+                    // 删除空值键
+                    if (isEmptyNode(cleaned)) {
+                        objectNode.remove(entry.getKey());
+                    } else {
+                        objectNode.set(entry.getKey(), cleaned);
+                    }
+                }catch (Exception e){
+                    log.error("cleanEmptyFields error:{}", e.getMessage());
+                    return objectNode;
                 }
-            });
+
+            }
+            //});
             return objectNode;
         }
 
@@ -369,4 +391,34 @@ public class JsonUtils {
 
         return false;
     }
+
+
+    public static void setNullValuesToDefault(ObjectNode rootNode) {
+        // 遍历当前 ObjectNode 的所有字段
+        Iterator<Map.Entry<String, JsonNode>> fields = rootNode.fields();
+        while (fields.hasNext()) {
+            Map.Entry<String, JsonNode> entry = fields.next();
+            String key = entry.getKey();
+            JsonNode valueNode = entry.getValue();
+
+            // 1. 处理值为 null 的字段
+            if (valueNode.isNull() || (valueNode.isTextual() && valueNode.asText().isEmpty())) {
+                rootNode.put(key, "—"); // 直接替换为字符串 "—"
+            }
+            // 2. 递归处理嵌套的 ObjectNode
+            else if (valueNode.isObject()) {
+                setNullValuesToDefault((ObjectNode) valueNode);
+            }
+            // 3. 递归处理嵌套的 ArrayNode（遍历数组中的每个元素）
+            else if (valueNode.isArray()) {
+                ArrayNode arrayNode = (ArrayNode) valueNode;
+                for (int i = 0; i < arrayNode.size(); i++) {
+                    JsonNode element = arrayNode.get(i);
+                    if (element.isObject()) {
+                        setNullValuesToDefault((ObjectNode) element); // 递归处理数组中的对象
+                    }
+                }
+            }
+        }
+    }
 }

tz-framework/tz-spring-boot-starter-biz-data-permission/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1,3 @@
+cn.start.tz.framework.datapermission.config.TzDataPermissionAutoConfiguration
+cn.start.tz.framework.datapermission.config.TzDeptDataPermissionAutoConfiguration
+cn.start.tz.framework.datapermission.config.TzDataPermissionRpcAutoConfiguration

tz-framework/tz-spring-boot-starter-biz-tenant/target/classes/META-INF/spring-configuration-metadata.json

@@ -0,0 +1,36 @@
+{
+  "groups": [
+    {
+      "name": "tz.tenant",
+      "type": "cn.start.tz.framework.tenant.config.TenantProperties",
+      "sourceType": "cn.start.tz.framework.tenant.config.TenantProperties"
+    }
+  ],
+  "properties": [
+    {
+      "name": "tz.tenant.enable",
+      "type": "java.lang.Boolean",
+      "description": "是否开启",
+      "sourceType": "cn.start.tz.framework.tenant.config.TenantProperties"
+    },
+    {
+      "name": "tz.tenant.ignore-caches",
+      "type": "java.util.Set<java.lang.String>",
+      "description": "需要忽略多租户的 Spring Cache 缓存 即默认所有缓存都开启多租户的功能，所以记得添加对应的 tenant_id 字段哟",
+      "sourceType": "cn.start.tz.framework.tenant.config.TenantProperties"
+    },
+    {
+      "name": "tz.tenant.ignore-tables",
+      "type": "java.util.Set<java.lang.String>",
+      "description": "需要忽略多租户的表 即默认所有表都开启多租户的功能，所以记得添加对应的 tenant_id 字段哟",
+      "sourceType": "cn.start.tz.framework.tenant.config.TenantProperties"
+    },
+    {
+      "name": "tz.tenant.ignore-urls",
+      "type": "java.util.Set<java.lang.String>",
+      "description": "需要忽略多租户的请求 默认情况下，每个请求需要带上 tenant-id 的请求头。但是，部分请求是无需带上的，例如说短信回调、支付回调等 Open API！",
+      "sourceType": "cn.start.tz.framework.tenant.config.TenantProperties"
+    }
+  ],
+  "hints": []
+}

tz-framework/tz-spring-boot-starter-biz-tenant/target/classes/META-INF/spring.factories

@@ -0,0 +1,2 @@
+org.springframework.boot.env.EnvironmentPostProcessor=\
+  cn.start.tz.framework.tenant.core.mq.kafka.TenantKafkaEnvironmentPostProcessor

tz-framework/tz-spring-boot-starter-biz-tenant/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1,2 @@
+cn.start.tz.framework.tenant.config.TzTenantRpcAutoConfiguration
+cn.start.tz.framework.tenant.config.TzTenantAutoConfiguration