From 01aeb219909bda1ae6d4e9c26596c75296742699 Mon Sep 17 00:00:00 2001
From: HuangHai <10402852@qq.com>
Date: Tue, 29 Apr 2025 08:41:44 +0800
Subject: [PATCH] 'commit'
---
dsBase/pom.xml | 122 ++----------------
.../main/java/Tools/Init/clearDataBase.java | 1 -
.../Global/Controller/GlobalController.java | 4 +-
.../dsBase/Util/KafkaProducerThread.java | 31 -----
4 files changed, 11 insertions(+), 147 deletions(-)
delete mode 100644 dsBase/src/main/java/com/dsideal/dsBase/Util/KafkaProducerThread.java
diff --git a/dsBase/pom.xml b/dsBase/pom.xml
index 49decca1..8538316b 100644
--- a/dsBase/pom.xml
+++ b/dsBase/pom.xml
@@ -123,16 +123,11 @@
2.0.45
-
+
- org.apache.poi
- poi
- 5.2.5
-
-
- org.apache.poi
- poi-ooxml
- 5.2.5
+ cn.idev.excel
+ fastexcel
+ 1.1.0
@@ -141,20 +136,6 @@
jsoup
1.17.2
-
-
-
- org.apache.httpcomponents
- httpclient
- 4.5.14
-
-
- org.apache.httpcomponents
- httpcore
- 4.4.15
-
-
-
com.google.code.gson
@@ -185,13 +166,7 @@
redis.clients
jedis
- 5.1.0
-
-
-
- org.apache.httpcomponents
- httpmime
- 4.5.14
+ 5.2.0
@@ -206,62 +181,11 @@
2.20.0
-
-
- org.web3j
- core
- 5.0.0
-
-
-
- com.squareup.okhttp3
- okhttp
- 4.12.0
-
org.slf4j
slf4j-simple
1.7.36
-
-
-
- com.github.javafaker
- javafaker
- 1.0.2
-
-
-
-
- org.apache.kafka
- kafka-clients
- 3.6.0
-
-
- org.apache.kafka
- kafka-streams
- 3.6.1
-
-
- io.debezium
- debezium-api
- 2.4.2.Final
-
-
- io.debezium
- debezium-embedded
- 2.4.2.Final
-
-
- io.debezium
- debezium-connector-mysql
- 2.4.2.Final
-
-
- io.debezium
- debezium-connector-postgres
- 2.4.2.Final
-
com.fasterxml.jackson.core
jackson-databind
@@ -273,44 +197,14 @@
-
- com.fasterxml.jackson.core
- jackson-core
- 2.14.2
-
-
+
+
org.projectlombok
lombok
- 1.18.30
+ 1.18.38
provided
-
-
- com.hiforce.pixel.open
- pixel-force-open-client
- 1.0.6
-
-
- com.hiforce.pixel.open
- pixel-force-open-sample
- 1.0.6
-
-
- org.glassfish
- jakarta.json
- 2.0.1
-
-
- com.hankcs
- hanlp
- portable-1.8.4
-
-
- com.aliyun
- aliyun-java-sdk-core
- 4.7.3
-
diff --git a/dsBase/src/main/java/Tools/Init/clearDataBase.java b/dsBase/src/main/java/Tools/Init/clearDataBase.java
index 10144978..b4ecc45d 100644
--- a/dsBase/src/main/java/Tools/Init/clearDataBase.java
+++ b/dsBase/src/main/java/Tools/Init/clearDataBase.java
@@ -4,7 +4,6 @@ import cn.hutool.core.date.DateTime;
import com.dsideal.dsBase.Start;
import com.dsideal.dsBase.Util.CommonUtil;
import com.dsideal.dsBase.Util.PkUtil;
-import com.github.javafaker.DateAndTime;
import com.jfinal.kit.PropKit;
import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
import com.jfinal.plugin.activerecord.CaseInsensitiveContainerFactory;
diff --git a/dsBase/src/main/java/com/dsideal/dsBase/Global/Controller/GlobalController.java b/dsBase/src/main/java/com/dsideal/dsBase/Global/Controller/GlobalController.java
index 11798ee1..1fda298a 100644
--- a/dsBase/src/main/java/com/dsideal/dsBase/Global/Controller/GlobalController.java
+++ b/dsBase/src/main/java/com/dsideal/dsBase/Global/Controller/GlobalController.java
@@ -1,5 +1,6 @@
package com.dsideal.dsBase.Global.Controller;
+import cn.hutool.core.codec.Base64;
import com.alibaba.fastjson.JSONObject;
import com.dsideal.dsBase.Global.Model.GlobalModel;
import com.dsideal.dsBase.Interceptor.*;
@@ -11,7 +12,6 @@ import com.jfinal.ext.interceptor.POST;
import com.jfinal.plugin.activerecord.Page;
import com.jfinal.plugin.activerecord.Record;
import org.apache.commons.lang.StringUtils;
-import org.bouncycastle.util.encoders.Base64;
import java.util.List;
@@ -174,7 +174,9 @@ public class GlobalController extends Controller {
@EmptyInterface({"global_codes"})
public void getGlobalByCodes(String global_codes) {
if (CommonUtil.isBase64(global_codes)) {
+ //对global_codes进行Base64解码
byte[] decode = Base64.decode(global_codes);
+
global_codes = new String(decode);
}
List records = model.getGlobalByCodes(global_codes);
diff --git a/dsBase/src/main/java/com/dsideal/dsBase/Util/KafkaProducerThread.java b/dsBase/src/main/java/com/dsideal/dsBase/Util/KafkaProducerThread.java
deleted file mode 100644
index f38301de..00000000
--- a/dsBase/src/main/java/com/dsideal/dsBase/Util/KafkaProducerThread.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.dsideal.dsBase.Util;
-
-import org.apache.kafka.clients.producer.KafkaProducer;
-import org.apache.kafka.clients.producer.ProducerRecord;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class KafkaProducerThread implements Runnable {
- private Logger log = LoggerFactory.getLogger(KafkaProducerThread.class);
- private KafkaProducer producer;
- private ProducerRecord record;
-
- KafkaProducerThread(KafkaProducer producer, ProducerRecord record) {
- this.producer = producer;
- this.record = record;
- }
-
- @Override
- public void run() {
- //异步写
- producer.send(record, (metadata, exception) -> {
- if (null != exception) {
- exception.printStackTrace();
- }
- if (null != metadata) {
- log.info("消息发送成功 ： " + String.format("offset: %s, partition:%s, topic:%s timestamp:%s",
- metadata.offset(), metadata.partition(), metadata.topic(), metadata.timestamp()));
- }
- });
- }
-}