diff --git a/pom.xml b/pom.xml index 418b4af..2608b6e 100644 --- a/pom.xml +++ b/pom.xml @@ -243,6 +243,12 @@ 0.11.5 + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + + diff --git a/src/main/java/jj/tech/finance/biz/web/controller/ContractInfoController.java b/src/main/java/jj/tech/finance/biz/web/controller/ContractInfoController.java index 1de48c9..9d44ce9 100644 --- a/src/main/java/jj/tech/finance/biz/web/controller/ContractInfoController.java +++ b/src/main/java/jj/tech/finance/biz/web/controller/ContractInfoController.java @@ -134,8 +134,13 @@ public class ContractInfoController { where.and( ContractInfoStatusDynamicSqlSupport.contract_status.qualifiedWith("contract_info_status"), isNull(), or(ContractInfoStatusDynamicSqlSupport.contract_status.qualifiedWith("contract_info_status"), isEqualTo(0))); - where.and(ContractInfoDynamicSqlSupport.contractInfo.ts_code, isLikeWhenPresent(isLikeTsCode), - or(ContractInfoDynamicSqlSupport.contractInfo.symbol, isLikeWhenPresent(isLikeSymbol))); + where.and( + group( + ContractInfoDynamicSqlSupport.contractInfo.ts_code, isLikeWhenPresent(isLikeTsCode), + or(ContractInfoDynamicSqlSupport.contractInfo.symbol, isLikeWhenPresent(isLikeSymbol)), + or(ContractInfoDynamicSqlSupport.contractInfo.name, isLikeWhenPresent(isLikeSymbol)) + ) + ); where.and(ContractInfoDynamicSqlSupport.contractInfo.exchange, isEqualToWhenPresent(parm.getExchange())); diff --git a/src/main/java/jj/tech/finance/biz/webadmin/controller/ContractInfoManageController.java b/src/main/java/jj/tech/finance/biz/webadmin/controller/ContractInfoManageController.java index be24adf..451981a 100644 --- a/src/main/java/jj/tech/finance/biz/webadmin/controller/ContractInfoManageController.java +++ b/src/main/java/jj/tech/finance/biz/webadmin/controller/ContractInfoManageController.java @@ -112,7 +112,8 @@ public class ContractInfoManageController { } where.and(ContractInfoDynamicSqlSupport.contractInfo.ts_code, isLikeWhenPresent(likename), or(ContractInfoDynamicSqlSupport.contractInfo.name, isLikeWhenPresent(likename))); - where.and(ContractInfoDynamicSqlSupport.contractInfo.symbol, isEqualToWhenPresent(parm.getSymbol())); + where.and(ContractInfoDynamicSqlSupport.contractInfo.symbol, isEqualToWhenPresent(parm.getSymbol()), + or(ContractInfoDynamicSqlSupport.contractInfo.ts_code, isLikeWhenPresent(parm.getSymbol()))); where.and(ContractInfoDynamicSqlSupport.contractInfo.exchange, isEqualToWhenPresent(parm.getExchange())); WhereApplier applier = where.toWhereApplier(); diff --git a/src/main/java/jj/tech/finance/biz/webadmin/controller/ContractInfoScribeController.java b/src/main/java/jj/tech/finance/biz/webadmin/controller/ContractInfoScribeController.java index 5e38b2e..d0c3af3 100644 --- a/src/main/java/jj/tech/finance/biz/webadmin/controller/ContractInfoScribeController.java +++ b/src/main/java/jj/tech/finance/biz/webadmin/controller/ContractInfoScribeController.java @@ -119,7 +119,8 @@ public class ContractInfoScribeController { where.and(ContractInfoDynamicSqlSupport.contractInfo.ts_code, isLikeWhenPresent(likename), or(ContractInfoDynamicSqlSupport.contractInfo.name, isLikeWhenPresent(likename))); - where.and(ContractInfoDynamicSqlSupport.contractInfo.symbol, isEqualToWhenPresent(parm.getSymbol())); + where.and(ContractInfoDynamicSqlSupport.contractInfo.symbol, isEqualToWhenPresent(parm.getSymbol()), + or(ContractInfoDynamicSqlSupport.contractInfo.ts_code, isLikeWhenPresent(parm.getSymbol()))); where.and(ContractInfoDynamicSqlSupport.contractInfo.exchange, isEqualToWhenPresent(parm.getExchange())); WhereApplier applier = where.toWhereApplier(); @@ -402,8 +403,12 @@ public class ContractInfoScribeController { // .render(RenderingStrategies.MYBATIS3); // //contractInfoStatusScribeMapper.delete(deleteStatement); - int sum = contractInfoStatusScribeMapper.deleteByPrimaryKey(id.getId()); - return R.SUCCESS("delete :" + sum); + if(id.getId() != null) { + int sum = contractInfoStatusScribeMapper.deleteByPrimaryKey(id.getId()); + return R.SUCCESS("delete:" + sum); + } + return R.SUCCESS("delete:0"); + } diff --git a/src/main/java/jj/tech/finance/biz/webadmin/vo/parm/Id.java b/src/main/java/jj/tech/finance/biz/webadmin/vo/parm/Id.java index c24adb8..a56da83 100644 --- a/src/main/java/jj/tech/finance/biz/webadmin/vo/parm/Id.java +++ b/src/main/java/jj/tech/finance/biz/webadmin/vo/parm/Id.java @@ -3,7 +3,7 @@ package jj.tech.finance.biz.webadmin.vo.parm; import jakarta.validation.constraints.NotNull; public class Id { - @NotNull + //@NotNull public Integer id; public Integer getId() { diff --git a/src/main/java/jj/tech/finance/config/json/Decimal2Serializer.java b/src/main/java/jj/tech/finance/config/json/Decimal2Serializer.java new file mode 100644 index 0000000..99d2d29 --- /dev/null +++ b/src/main/java/jj/tech/finance/config/json/Decimal2Serializer.java @@ -0,0 +1,22 @@ +package jj.tech.finance.config.json; + +import java.io.IOException; +import java.math.BigDecimal; +import java.math.RoundingMode; + +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.JsonSerializer; +import com.fasterxml.jackson.databind.SerializerProvider; + +public class Decimal2Serializer extends JsonSerializer { + + @Override + public void serialize(Object value, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException, JsonProcessingException { + if (value != null) { + BigDecimal bigDecimal = new BigDecimal(value.toString()).setScale(2,RoundingMode.HALF_EVEN); + jsonGenerator.writeString(bigDecimal.toString()); + } + } + +} diff --git a/src/main/java/jj/tech/finance/config/json/JacksonConfiguration.java b/src/main/java/jj/tech/finance/config/json/JacksonConfiguration.java index c3114e9..f4aa920 100644 --- a/src/main/java/jj/tech/finance/config/json/JacksonConfiguration.java +++ b/src/main/java/jj/tech/finance/config/json/JacksonConfiguration.java @@ -1,5 +1,6 @@ package jj.tech.finance.config.json; +import java.math.BigDecimal; import java.time.format.DateTimeFormatter; import org.springframework.beans.factory.annotation.Value; @@ -28,7 +29,6 @@ public class JacksonConfiguration { public Jackson2ObjectMapperBuilderCustomizer jackson2ObjectMapperBuilderCustomizer() { return builder -> { - // formatter DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern(DATETIME_FORMAT); DateTimeFormatter timeFormatter = DateTimeFormatter.ofPattern(TIME_FORMAT); @@ -36,6 +36,7 @@ public class JacksonConfiguration { // deserializers builder.deserializers(new LocalDateTimeDeserializer(dateTimeFormatter)); builder.deserializers(new LocalTimeDeserializer(timeFormatter)); + builder.serializerByType(BigDecimal.class, new Decimal2Serializer()); // serializers builder.serializers(new LocalDateTimeSerializer(dateTimeFormatter)); diff --git a/src/test/java/test/sm/SM2Test.java b/src/test/java/test/sm/SM2Test.java new file mode 100644 index 0000000..3305c53 --- /dev/null +++ b/src/test/java/test/sm/SM2Test.java @@ -0,0 +1,214 @@ +package test.sm; + +import java.math.BigInteger; +import java.security.KeyPair; +import java.security.KeyPairGenerator; +import java.security.PrivateKey; +import java.security.PublicKey; +import java.security.SecureRandom; +import java.security.Security; +import java.security.spec.ECGenParameterSpec; + +import org.bouncycastle.asn1.gm.GMNamedCurves; +import org.bouncycastle.asn1.x9.X9ECParameters; +import org.bouncycastle.crypto.engines.SM2Engine; +import org.bouncycastle.crypto.params.ECDomainParameters; +import org.bouncycastle.crypto.params.ECPrivateKeyParameters; +import org.bouncycastle.crypto.params.ECPublicKeyParameters; +import org.bouncycastle.crypto.params.ParametersWithRandom; +import org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPrivateKey; +import org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPublicKey; +import org.bouncycastle.jcajce.provider.asymmetric.ec.GMKeyPairGeneratorSpi.SM2; +import org.bouncycastle.jce.provider.BouncyCastleProvider; +import org.bouncycastle.jce.spec.ECParameterSpec; +import org.bouncycastle.jce.spec.ECPrivateKeySpec; +import org.bouncycastle.jce.spec.ECPublicKeySpec; +import org.bouncycastle.util.encoders.Hex; + + +public class SM2Test { + public SM2Test(){ } + static { //加载BC驱动 + if (Security.getProvider(BouncyCastleProvider.PROVIDER_NAME) == null) + new BouncyCastleProvider(); + } + + // 生成sm2密钥对 + public KeyPair createECKeyPair() { + //使用标准名称创建EC参数生成的参数规范 + final ECGenParameterSpec sm2Spec = new ECGenParameterSpec("sm2p256v1"); + + // 获取一个椭圆曲线类型的密钥对生成器 + final KeyPairGenerator kpg; + try { + kpg = KeyPairGenerator.getInstance("EC", new BouncyCastleProvider()); +// 使用SM2算法域参数集初始化密钥生成器（默认使用最高优先级安装的提供者的 SecureRandom 的实现作为随机源） + // kpg.initialize(sm2Spec); + // 使用SM2的算法域参数集和指定的随机源初始化密钥生成器 + kpg.initialize(sm2Spec, new SecureRandom()); + // 通过密钥生成器生成密钥对 + return kpg.generateKeyPair(); + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + /* + *公钥加密 + * @param publicKey SM2公钥 + * @param data 明文数据 + * @param modeType 加密模式 + * @return 密文数据 + */ + public byte[] encode(String publicKeyHex, byte[] inputBytes, int modeType){ + //加密模式 + // + BCECPublicKey publicKey = getECPublicKeyByPublicKeyHex(publicKeyHex); + SM2Engine.Mode mode; + if (modeType == 1) {//采用新模式加密标准 + mode = SM2Engine.Mode.C1C3C2; + } else {//采用旧模式加密标准 + mode = SM2Engine.Mode.C1C2C3; + } + //通过公钥对象获取公钥的基本域参数。 + ECParameterSpec ecParameterSpec = publicKey.getParameters(); + ECDomainParameters ecDomainParameters = new ECDomainParameters(ecParameterSpec.getCurve(), + ecParameterSpec.getG(), ecParameterSpec.getN()); + //通过公钥值和公钥基本参数创建公钥参数对象 + ECPublicKeyParameters ecPublicKeyParameters = new ECPublicKeyParameters(publicKey.getQ(), ecDomainParameters); + //根据加密模式实例化SM2公钥加密引擎 + SM2Engine sm2Engine = new SM2Engine(mode); + //初始化加密引擎 + sm2Engine.init(true, new ParametersWithRandom(ecPublicKeyParameters, new SecureRandom())); + + byte[] arrayOfBytes = null; + try { + //通过加密引擎对字节数串行加密 + arrayOfBytes = sm2Engine.processBlock(inputBytes, 0, inputBytes.length); + } catch (Exception e) { + System.out.println("SM2加密时出现异常:" + e.getMessage()); + e.printStackTrace(); + } + return arrayOfBytes; + } + /** + * 私钥解密 + * + * @param privateKeyHex SM私钥 + * @param cipherBytes 密文数据 + * @param modeType 加密模式 + * @return 解密后的明文 + */ + public static byte[] decode(String privateKeyHex, byte[] cipherBytes, int modeType) { + //解密模式 + SM2Engine.Mode mode; + BCECPrivateKey privateKey = getBCECPrivateKeyByPrivateKeyHex(privateKeyHex); + if (modeType == 1) { + mode = SM2Engine.Mode.C1C3C2; + } else { + mode = SM2Engine.Mode.C1C2C3; + } + + //通过私钥对象获取私钥的基本域参数。 + ECParameterSpec ecParameterSpec = privateKey.getParameters(); + ECDomainParameters ecDomainParameters = new ECDomainParameters(ecParameterSpec.getCurve(), + ecParameterSpec.getG(), ecParameterSpec.getN()); + + //通过私钥值和私钥基本参数创建私钥参数对象 + ECPrivateKeyParameters ecPrivateKeyParameters = new ECPrivateKeyParameters(privateKey.getD(), + ecDomainParameters); + + //通过解密模式创建解密引擎并初始化 + SM2Engine sm2Engine = new SM2Engine(SM2Engine.Mode.C1C3C2); + sm2Engine.init(false, ecPrivateKeyParameters); + + byte[] arrayOfBytes = null; + try { + //通过解密引擎对密文字节串进行解密 + arrayOfBytes = sm2Engine.processBlock(cipherBytes, 0, cipherBytes.length); + } catch (Exception e) { + System.out.println("SM2解密时出现异常" + e.getMessage()); + } + return arrayOfBytes; + } + + + //椭圆曲线ECParameters ASN.1 结构 + private static X9ECParameters x9ECParameters = GMNamedCurves.getByName("sm2p256v1"); + //椭圆曲线公钥或私钥的基本域参数。 + private static ECParameterSpec ecDomainParameters = new ECParameterSpec(x9ECParameters.getCurve(), x9ECParameters.getG(), x9ECParameters.getN()); + + /** + * 公钥字符串转换为 BCECPublicKey 公钥对象 + * + * @param pubKeyHex 64字节十六进制公钥字符串(如果公钥字符串为65字节首字节为0x04：表示该公钥为非压缩格式，操作时需要删除) + * @return BCECPublicKey SM2公钥对象 + */ + + public static BCECPublicKey getECPublicKeyByPublicKeyHex(String pubKeyHex) { + //截取64字节有效的SM2公钥（如果公钥首字节为0x04） + if (pubKeyHex.length() > 128) { + pubKeyHex = pubKeyHex.substring(pubKeyHex.length() - 128); + } + //将公钥拆分为x,y分量（各32字节） + String stringX = pubKeyHex.substring(0, 64); + String stringY = pubKeyHex.substring(stringX.length()); + //将公钥x、y分量转换为BigInteger类型 + BigInteger x = new BigInteger(stringX, 16); + BigInteger y = new BigInteger(stringY, 16); + //通过公钥x、y分量创建椭圆曲线公钥规范 + ECPublicKeySpec ecPublicKeySpec = new ECPublicKeySpec(x9ECParameters.getCurve().createPoint(x, y), ecDomainParameters); + //通过椭圆曲线公钥规范，创建出椭圆曲线公钥对象（可用于SM2加密及验签） + return new BCECPublicKey("EC", ecPublicKeySpec, BouncyCastleProvider.CONFIGURATION); + } + + /** + * 私钥字符串转换为 BCECPrivateKey 私钥对象 + * + * @param privateKeyHex: 32字节十六进制私钥字符串 + * @return BCECPrivateKey:SM2私钥对象 + */ + public static BCECPrivateKey getBCECPrivateKeyByPrivateKeyHex(String privateKeyHex) { + //将十六进制私钥字符串转换为BigInteger对象 + BigInteger d = new BigInteger(privateKeyHex, 16); + //通过私钥和私钥域参数集创建椭圆曲线私钥规范 + ECPrivateKeySpec ecPrivateKeySpec = new ECPrivateKeySpec(d, ecDomainParameters); + //通过椭圆曲线私钥规范，创建出椭圆曲线私钥对象（可用于SM2解密和签名） + return new BCECPrivateKey("EC", ecPrivateKeySpec, BouncyCastleProvider.CONFIGURATION); + } + + public static void main(String[] args) throws Exception { + String Sm4Key="0123456789abcdef"; + String sm2PublicKeyHex=null; + String sm2PrivateKeyHex=null; + + SM2Test sm2=new SM2Test(); + // 生成SM2密钥 + KeyPair keyPair = sm2.createECKeyPair(); + PrivateKey privateKey = keyPair.getPrivate(); + PublicKey publicKey = keyPair.getPublic(); + if (publicKey instanceof BCECPublicKey){ + //获取65字节非压缩的十六进制公钥串(0x04) + byte[] publicKeyBytes = ((BCECPublicKey) publicKey).getQ().getEncoded(false); + sm2PublicKeyHex = Hex.toHexString(publicKeyBytes); + + } + if (privateKey instanceof BCECPrivateKey) { + //获取32字节十六进制私钥串 + sm2PrivateKeyHex = ((BCECPrivateKey) privateKey).getD().toString(16); + + } + //Sm2加密密钥 + byte [] keyBytes=Sm4Key.getBytes("utf-8"); + byte[] encodeBytes = sm2.encode(sm2PublicKeyHex, keyBytes, 1); + String encodeKey = Hex.toHexString(encodeBytes); + //Sm2解密密钥 + byte [] decodeBytes=sm2.decode(sm2PrivateKeyHex,encodeBytes,1); + String deKey=new String(decodeBytes,"utf-8"); + System.out.println("\ninitial key:"+Sm4Key+"\nencode key:"+encodeKey+"\ndecode key:"+deKey); + System.out.println("complete!"); + } + +} diff --git a/src/test/java/test/sm/SM3Test.java b/src/test/java/test/sm/SM3Test.java new file mode 100644 index 0000000..f6022b7 --- /dev/null +++ b/src/test/java/test/sm/SM3Test.java @@ -0,0 +1,42 @@ +package test.sm; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Paths; + +import org.bouncycastle.crypto.digests.SM3Digest; +import org.bouncycastle.util.encoders.Hex; + +public class SM3Test { + + /** + * 使用SM3算法计算给定输入的摘要值 + * @param inputBytes 要进行摘要计算的输入字符串 + * @return 给定输入的摘要值 + */ + private static byte[] calculateSM3Digest( byte [] inputBytes) { + //创建 SM3Digest 对象 + SM3Digest digest = new SM3Digest(); + //将输入字符串转为字节数组，并使用该字节数组更新摘要对象的内部状态，以便进行计算 + // byte[] inputBytes = input.getBytes(); + digest.update(inputBytes, 0, inputBytes.length); + //创建一个输出字节数组，调用 doFinal 方法完成哈希计算，并将结果存入输出数组 + byte[] output = new byte[digest.getDigestSize()]; + digest.doFinal(output, 0); + //返回摘要字节数组 + return output; + } + public static void main(String[] args) { + String filePath = "C:\\Users\\lenovo\\git\\ailt\\src\\test\\resources\\logback.xml"; + try { + + byte [] inputBytes = Files.readAllBytes(Paths.get(filePath)); + byte[] digest = calculateSM3Digest(inputBytes); + String hexDigest = Hex.toHexString(digest); + System.out.println("SM3 Digest: " + hexDigest); + } catch (IOException e) { + System.out.println("An error occurred while reading the file: " + e.getMessage()); + } + } + +} diff --git a/src/test/java/test/sm/SM4Test.java b/src/test/java/test/sm/SM4Test.java new file mode 100644 index 0000000..ab9f86b --- /dev/null +++ b/src/test/java/test/sm/SM4Test.java @@ -0,0 +1,85 @@ +package test.sm; + +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.security.Security; + +import javax.crypto.Cipher; +import javax.crypto.spec.IvParameterSpec; +import javax.crypto.spec.SecretKeySpec; + +import org.bouncycastle.jce.provider.BouncyCastleProvider; + +public class SM4Test { + + private static final String name="SM4"; //算法名字 + private static final String transformation="SM4/CBC/PKCS5Padding"; //加密模式以及短快填充方式 + private static final String Default_iv="0123456789abcdef"; //加密使用的初始向量 + +/** + * 加载指定文件，对其进行加密，并将加密结果写入指定输出文件中 + * @param inputFile 要加密的输入文件路径 + * @param outputFile 加密后的输出文件路径 + * @param key 加密所需的密钥 + * @throws Exception 如果文件读取、加密或写入时出现错误，则抛出异常 + */ +private static void encodeFile(String inputFile, String outputFile, String key) throws Exception { + // 读取输入文件中的所有字节 + byte [] inputBytes = Files.readAllBytes(Paths.get(inputFile)); + // 对输入字节数组进行加密 + byte [] encodeByte = encode(inputBytes, key.getBytes(StandardCharsets.UTF_8)); + // 将加密后的字节数组写入指定输出文件中 + Files.write(Paths.get(outputFile),encodeByte); + System.out.println("File encoded successfully."); +} + /** + * 使用指定的加密算法和密钥对给定的字节数组进行加密 + * @param inputByte 要加密的字节数组 + * @param key 加密所需的密钥 + * @return 加密后的字节数组 + * @throws Exception 如果加密时发生错误，则抛出异常 + */ + public static byte [] encode(byte [] inputByte, byte [] key) throws Exception { + // 获取加密实例 + Cipher c = Cipher.getInstance(transformation); + // 根据密钥的字节数组创建 SecretKeySpec + SecretKeySpec secretKeySpec = new SecretKeySpec(key, name); + // 创建 IvParameterSpec 对象，使用默认向量和字符集 + IvParameterSpec ivParameterSpec = new IvParameterSpec(Default_iv.getBytes(StandardCharsets.UTF_8)); + // 初始化加密实例 + c.init(Cipher.ENCRYPT_MODE, secretKeySpec, ivParameterSpec); + // 返回加密后的字节数组 + return c.doFinal(inputByte); + } + + public static void decodeFile(String inputFilePath, String outputFilePath, String key) throws Exception { + byte[] inputBytes = Files.readAllBytes(Paths.get(inputFilePath)); + byte[] decodeBytes = decode(inputBytes, key.getBytes(StandardCharsets.UTF_8)); + Files.write(Paths.get(outputFilePath), decodeBytes); + System.out.println("File decode successfully."); + } + + + + private static byte[] decode(byte[] inputBytes, byte[] key) throws Exception { + Cipher cipher = Cipher.getInstance(transformation); + SecretKeySpec secretKeySpec = new SecretKeySpec(key, name); + IvParameterSpec ivParameterSpec = new IvParameterSpec(Default_iv.getBytes(StandardCharsets.UTF_8)); + cipher.init(Cipher.DECRYPT_MODE, secretKeySpec, ivParameterSpec); + return cipher.doFinal(inputBytes); + } + + public static void main(String[] args) throws Exception { + Security.addProvider(new BouncyCastleProvider()); + String inputFile="C:\\Users\\lenovo\\git\\ailt\\src\\test\\resources\\logback.xml"; //需要加密的文件 + String enFile="Encode.txt"; //加密后的文件 + String deFile="Decode.txt"; //解密后的文件 + String key="0123456789ABCDEF"; //加密密钥，注意必须是128bits，即16个字节 + encodeFile(inputFile,enFile,key); + decodeFile(enFile,deFile,key); + + + } + +}