Commit 6fabc7f7 by jiaotianqi

merge

parent f7df7dc8
...@@ -3,11 +3,9 @@ package com.gic.cloud.data.hook.service.entity; ...@@ -3,11 +3,9 @@ package com.gic.cloud.data.hook.service.entity;
import cn.hutool.core.codec.Base64; import cn.hutool.core.codec.Base64;
import cn.hutool.core.util.CharsetUtil; import cn.hutool.core.util.CharsetUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.SecureUtil;
import cn.hutool.crypto.asymmetric.KeyType; import cn.hutool.crypto.asymmetric.KeyType;
import cn.hutool.crypto.asymmetric.RSA; import cn.hutool.crypto.asymmetric.RSA;
import com.alibaba.dubbo.common.utils.StringUtils; import com.alibaba.dubbo.common.utils.StringUtils;
import com.alibaba.fastjson.JSON;
import com.ctrip.framework.apollo.Config; import com.ctrip.framework.apollo.Config;
import com.ctrip.framework.apollo.ConfigService; import com.ctrip.framework.apollo.ConfigService;
import com.gic.cloud.data.hook.api.dto.DhDecryptKey; import com.gic.cloud.data.hook.api.dto.DhDecryptKey;
...@@ -20,16 +18,13 @@ import org.apache.commons.collections.CollectionUtils; ...@@ -20,16 +18,13 @@ import org.apache.commons.collections.CollectionUtils;
import java.io.IOException; import java.io.IOException;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.security.KeyPair;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.SQLException; import java.sql.SQLException;
import java.sql.Types; import java.sql.Types;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashMap;
import java.util.List; import java.util.List;
public class CsvResultSetHelper implements ResultSetHelper { public class CsvResultSetHelper implements ResultSetHelper {
...@@ -218,7 +213,7 @@ public class CsvResultSetHelper implements ResultSetHelper { ...@@ -218,7 +213,7 @@ public class CsvResultSetHelper implements ResultSetHelper {
default: default:
String s2 = String.valueOf(resultSet.getObject(i + 1)); String s2 = String.valueOf(resultSet.getObject(i + 1));
if(org.apache.commons.lang3.StringUtils.isNotBlank(s2)){ if(org.apache.commons.lang3.StringUtils.isNotBlank(s2)){
if(s2.contains("E0")){ if(s2.contains("E0") || s2.startsWith("0")){
s2 = s2 + "\t"; s2 = s2 + "\t";
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment