Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: 修复 oracle 大数序列化问题 #88

Merged
merged 1 commit into from
Mar 3, 2025
Merged

fix: 修复 oracle 大数序列化问题 #88

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions ...ramework/src/main/java/org/jumpserver/chen/framework/datasource/base/BaseSQLActuator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import com.alibaba.druid.sql.ast.statement.SQLUpdateStatement;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.jumpserver.chen.framework.datasource.ConnectionManager;
import org.jumpserver.chen.framework.datasource.entity.resource.Field;
import org.jumpserver.chen.framework.datasource.sql.*;
Expand All @@ -19,6 +20,7 @@
import org.jumpserver.chen.framework.utils.PageUtils;
import org.jumpserver.chen.framework.utils.ReflectUtils;

import java.math.BigDecimal;
import java.math.BigInteger;
import java.sql.*;
import java.util.ArrayList;
Expand Down Expand Up @@ -149,7 +151,10 @@ private void executeStatement(SQLExecutePlan plan, Statement statement, SQLQuery

for (int i = 1; i <= resultSet.getMetaData().getColumnCount(); i++) {
Field field = new Field();
field.setName(resultSet.getMetaData().getColumnName(i));

var fieldName = StringUtils.isNotEmpty(resultSet.getMetaData().getColumnLabel(i)) ?
resultSet.getMetaData().getColumnLabel(i) : resultSet.getMetaData().getColumnName(i);
field.setName(fieldName);
result.getFields().add(field);
}

Expand All @@ -160,12 +165,12 @@ private void executeStatement(SQLExecutePlan plan, Statement statement, SQLQuery
var obj = resultSet.getObject(i);
if (obj instanceof Timestamp timestamp) {
fs.add(new Date(timestamp.getTime()));
} else if (obj instanceof Long l) {
fs.add(l.toString());
} else if (obj instanceof BigInteger b) {
fs.add(b.toString());
} else if (obj instanceof Long || obj instanceof BigDecimal || obj instanceof BigInteger) {
fs.add(obj.toString());
} else if (obj instanceof byte[]) {
fs.add(HexUtils.bytesToHex((byte[]) obj));
} else if (obj instanceof Blob) {
fs.add(HexUtils.bytesToHex(((Blob) obj).getBytes(1, (int) ((Blob) obj).length())));
} else {
fs.add(obj);
}
Expand Down