From 7ce70c4cb46f3106973e9f12f69cebfe24b1482d Mon Sep 17 00:00:00 2001 From: stone <827672943@qq.com> Date: Thu, 21 Mar 2024 09:39:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=98=E9=92=A5=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 7 ++ psdc-business/pom.xml | 8 +- .../main/java/com/psdc/entity/PrivateKey.java | 8 +- .../com/psdc/service/impl/GenerateKeyIml.java | 19 ++- .../service/impl/PrivateKeyServiceImpl.java | 34 +++-- .../model/impl/BuildHeatingServiceImpl.java | 11 +- .../mapper/business/PrivateKeyMapper.xml | 14 ++- psdc-common/pom.xml | 14 ++- .../src/main/java/com/psdc/utils/Sm2Util.java | 118 ++++++++++++++++++ .../controller/key/GenerateKeyController.java | 10 +- .../controller/key/SecretKeyController.java | 10 +- psdc.iml | 2 +- 12 files changed, 192 insertions(+), 63 deletions(-) create mode 100644 psdc-common/src/main/java/com/psdc/utils/Sm2Util.java diff --git a/pom.xml b/pom.xml index 1295029..05212c0 100644 --- a/pom.xml +++ b/pom.xml @@ -15,6 +15,7 @@ 0.0.1 UTF-8 UTF-8 + 5.8.18 1.8 3.1.1 1.2.16 @@ -52,6 +53,12 @@ ${druid.version} + + cn.hutool + hutool-all + ${hutool.version} + + eu.bitwalker diff --git a/psdc-business/pom.xml b/psdc-business/pom.xml index d5597e7..837cec5 100644 --- a/psdc-business/pom.xml +++ b/psdc-business/pom.xml @@ -29,12 +29,6 @@ 0.0.1 - - cn.hutool - hutool-all - 5.4.5 - - com.psdc psdc-quartz @@ -46,7 +40,7 @@ com.dky dntd-tool - 1.2-SNAPSHOT + 1.0-SNAPSHOT diff --git a/psdc-business/src/main/java/com/psdc/entity/PrivateKey.java b/psdc-business/src/main/java/com/psdc/entity/PrivateKey.java index b9fd5c1..5af6b19 100644 --- a/psdc-business/src/main/java/com/psdc/entity/PrivateKey.java +++ b/psdc-business/src/main/java/com/psdc/entity/PrivateKey.java @@ -13,10 +13,12 @@ import lombok.NoArgsConstructor; @NoArgsConstructor public class PrivateKey { - /** 私钥Id */ + /** 秘钥Id */ private Integer id ; - /** 私钥密文 */ - private String keyValue ; + /** 公钥 */ + private String publicKey ; + /** 私钥 */ + private String privateKey ; /** 授权单位 */ private String keyUnit ; /** 创建时间 */ diff --git a/psdc-business/src/main/java/com/psdc/service/impl/GenerateKeyIml.java b/psdc-business/src/main/java/com/psdc/service/impl/GenerateKeyIml.java index 132fad4..686735e 100644 --- a/psdc-business/src/main/java/com/psdc/service/impl/GenerateKeyIml.java +++ b/psdc-business/src/main/java/com/psdc/service/impl/GenerateKeyIml.java @@ -3,6 +3,7 @@ package com.psdc.service.impl; import com.phcomponent.basictech.elementary.util.SM4Util; import com.psdc.service.IGenerateKey; +import com.psdc.utils.Sm2Util; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.springframework.stereotype.Service; @@ -33,18 +34,14 @@ public class GenerateKeyIml implements IGenerateKey { private static final String ALGORITHM = "AES/ECB/PKCS5Padding"; @Override - public String generateKey(Map map, String sm4) { - String key; + public String generateKey(Map map, String publicKey) { + String key = null; try { - // 解密 SM4Util sm4Util = new SM4Util(); - // String decryptBySM4ECB = sm4Util.decryptBySM4ECB(sm4, SM4_KEY); - Cipher cipher = Cipher.getInstance(ALGORITHM, "BC"); - SecretKeySpec secretKey = new SecretKeySpec(sm4.getBytes(StandardCharsets.UTF_8), "AES"); - cipher.init(Cipher.ENCRYPT_MODE, secretKey); - byte[] encrypted = cipher.doFinal(mapToString(map).getBytes(StandardCharsets.UTF_8)); - key = Base64.getEncoder().encodeToString(encrypted); - } catch (NoSuchPaddingException | IllegalBlockSizeException | NoSuchAlgorithmException | BadPaddingException | - NoSuchProviderException | InvalidKeyException e) { + key = Sm2Util.encryptBase64(mapToString(map), publicKey); + } catch (IllegalArgumentException e) { + System.err.println("提供的秘钥错误"); + e.printStackTrace(); + } catch (Exception e) { throw new RuntimeException(e); } return key; diff --git a/psdc-business/src/main/java/com/psdc/service/impl/PrivateKeyServiceImpl.java b/psdc-business/src/main/java/com/psdc/service/impl/PrivateKeyServiceImpl.java index d6ea894..3a9bdc5 100644 --- a/psdc-business/src/main/java/com/psdc/service/impl/PrivateKeyServiceImpl.java +++ b/psdc-business/src/main/java/com/psdc/service/impl/PrivateKeyServiceImpl.java @@ -5,7 +5,7 @@ import com.psdc.core.domain.AjaxResult; import com.psdc.entity.PrivateKey; import com.psdc.mapper.PrivateKeyMapper; import com.psdc.service.IPrivateKeyService; -import org.apache.commons.lang3.RandomStringUtils; +import com.psdc.utils.Sm2Util; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -28,18 +28,19 @@ public class PrivateKeyServiceImpl implements IPrivateKeyService { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - private static final String SM4_KEY = "D30CCEEC367C55F0E4C7B3BE8207C5DD"; - @Override - public AjaxResult insert(PrivateKey privateKey) { - String key = RandomStringUtils.randomAlphabetic(16); - SM4Util sm4Util = new SM4Util(); - // 加密 - String encryptBySM4ECB = sm4Util.encryptBySM4ECB(key, SM4_KEY); - privateKey.setKeyValue(encryptBySM4ECB); - privateKey.setCreateTime(sdf.format(new Date())); + public AjaxResult insert(PrivateKey info) { + + //生成密钥对 + Map stringStringMap = Sm2Util.generateSm2Key(); + String publicKey = stringStringMap.get(Sm2Util.KEY_PUBLIC_KEY); + String privateKey = stringStringMap.get(Sm2Util.KEY_PRIVATE_KEY); + + info.setPublicKey(publicKey); + info.setPrivateKey(privateKey); + info.setCreateTime(sdf.format(new Date())); AjaxResult ajax = new AjaxResult(); - ajax.put("data", privateKeyMapper.insert(privateKey)); + ajax.put("data", privateKeyMapper.insert(info)); return ajax; } @@ -72,13 +73,7 @@ public class PrivateKeyServiceImpl implements IPrivateKeyService { long pageCount = (count/pageSize) + (count%pageSize==0?0:1); AjaxResult ajax = new AjaxResult(); Map map = new HashMap(); - SM4Util sm4Util = new SM4Util(); List list = privateKeyMapper.queryAllByLimit(keyUnit, start, pageSize); - list.parallelStream().forEach((s)->{ - // 解密 - String decryptBySM4ECB = sm4Util.decryptBySM4ECB(s.getKeyValue(), SM4_KEY); - s.setKeyValue(decryptBySM4ECB); - }); ajax.put("data", list); map.put("pageCurrent", pageCurrent); map.put("pageSize", pageSize); @@ -92,13 +87,12 @@ public class PrivateKeyServiceImpl implements IPrivateKeyService { public AjaxResult selectAll() { List ary = new ArrayList<>(); AjaxResult ajax = new AjaxResult(); - SM4Util sm4Util = new SM4Util(); List list = privateKeyMapper.selectAll(); list.parallelStream().forEach((s)->{ Map map = new HashMap(); // 解密 - String decryptBySM4ECB = sm4Util.decryptBySM4ECB(s.getKeyValue(), SM4_KEY); - map.put("key", decryptBySM4ECB); + String publicKey = s.getPublicKey(); + map.put("key", publicKey); map.put("unit", s.getKeyUnit()); ary.add(map); }); diff --git a/psdc-business/src/main/java/com/psdc/service/model/impl/BuildHeatingServiceImpl.java b/psdc-business/src/main/java/com/psdc/service/model/impl/BuildHeatingServiceImpl.java index 73b0a0a..f1705d2 100644 --- a/psdc-business/src/main/java/com/psdc/service/model/impl/BuildHeatingServiceImpl.java +++ b/psdc-business/src/main/java/com/psdc/service/model/impl/BuildHeatingServiceImpl.java @@ -8,7 +8,10 @@ import com.psdc.service.model.IBuildHeatingService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * @Author：Stone @@ -26,6 +29,12 @@ public class BuildHeatingServiceImpl implements IBuildHeatingService { @Override public JSONObject exeModel2Report(JSONObject param, String key) { + //模拟数据库查询，构造出加密解密方式 + List mapList = new ArrayList<>(); + HashMap map = new HashMap<>(); + map.put("CREATE_TIME","2024-02-20 14:46:34"); + mapList.add(map); + mapList.add(map); // 创建JSONObject对象用于承接模型方法输出结果。 JSONObject jsonObject = null; try{ @@ -38,7 +47,7 @@ public class BuildHeatingServiceImpl implements IBuildHeatingService { // 将这个JSONObject对象list作为入参调用ModelTool的create方法实现产品库初始化。 ModelTool modelTool = ModelTool.create(list); // 调用ModelTool的唯一入口函数exeModel2Report，将场景参数param和密钥key作为入参传进去，得到输出结果电能替代报告。 - jsonObject = modelTool.exeModel2Report(param, key); + jsonObject = modelTool.exeModel2Report(param, key,mapList); } catch (Exception e){ e.printStackTrace(); diff --git a/psdc-business/src/main/resources/mapper/business/PrivateKeyMapper.xml b/psdc-business/src/main/resources/mapper/business/PrivateKeyMapper.xml index 193cea9..c8c118d 100644 --- a/psdc-business/src/main/resources/mapper/business/PrivateKeyMapper.xml +++ b/psdc-business/src/main/resources/mapper/business/PrivateKeyMapper.xml @@ -4,7 +4,8 @@ - + + @@ -39,8 +40,8 @@ - Insert into private_key(key_value,key_unit,create_time,update_time) - values (#{keyValue},#{keyUnit},#{createTime},#{updateTime}) + Insert into private_key(private_key,public_key,key_unit,create_time,update_time) + values (#{privateKey},#{publicKey},#{keyUnit},#{createTime},#{updateTime}) @@ -50,8 +51,11 @@ id = #{id}, - - key_value = #{keyValue}, + + private_key = #{privateKey}, + + + public_key = #{publicKey}, key_unit = #{keyUnit}, diff --git a/psdc-common/pom.xml b/psdc-common/pom.xml index 76d6284..3028141 100644 --- a/psdc-common/pom.xml +++ b/psdc-common/pom.xml @@ -48,12 +48,24 @@ spring-boot-starter-validation + + cn.hutool + hutool-all + + + + org.bouncycastle + bcprov-jdk15to18 + 1.69 + + + org.apache.commons commons-lang3 - + com.fasterxml.jackson.core diff --git a/psdc-common/src/main/java/com/psdc/utils/Sm2Util.java b/psdc-common/src/main/java/com/psdc/utils/Sm2Util.java new file mode 100644 index 0000000..c69c39a --- /dev/null +++ b/psdc-common/src/main/java/com/psdc/utils/Sm2Util.java @@ -0,0 +1,118 @@ +package com.psdc.utils; + +import cn.hutool.core.util.HexUtil; +import cn.hutool.core.util.StrUtil; +import cn.hutool.crypto.asymmetric.KeyType; +import cn.hutool.crypto.asymmetric.SM2; +import org.bouncycastle.jce.interfaces.ECPrivateKey; +import org.bouncycastle.jce.interfaces.ECPublicKey; + +import java.util.HashMap; +import java.util.Map; + +/** + * SM2秘钥生成、签名、验签工具类 + * @author 只有影子 + */ +public class Sm2Util { + + /** + * 公钥常量 + */ + public static final String KEY_PUBLIC_KEY = "publicKey"; + /** + * 私钥返回值常量 + */ + public static final String KEY_PRIVATE_KEY = "privateKey"; + + /** + * 生成SM2公私钥 + * + * @return + */ + public static Map generateSm2Key() { + + SM2 sm2 = new SM2(); + ECPublicKey publicKey = (ECPublicKey) sm2.getPublicKey(); + ECPrivateKey privateKey = (ECPrivateKey) sm2.getPrivateKey(); + // 获取公钥 + byte[] publicKeyBytes = publicKey.getQ().getEncoded(false); + String publicKeyHex = HexUtil.encodeHexStr(publicKeyBytes); + + // 获取64位私钥 + String privateKeyHex = privateKey.getD().toString(16); + // BigInteger转成16进制时，不一定长度为64，如果私钥长度小于64，则在前方补0 + StringBuilder privateKey64 = new StringBuilder(privateKeyHex); + while (privateKey64.length() < 64) { + privateKey64.insert(0, "0"); + } + + Map result = new HashMap<>(); + result.put(KEY_PUBLIC_KEY, publicKeyHex); + result.put(KEY_PRIVATE_KEY, privateKey64.toString()); + return result; + + } + + + /** + * SM2私钥签名 + * + * @param privateKey 私钥 + * @param content 待签名内容 + * @return 签名值 + */ + public static String sign(String privateKey, String content) { + SM2 sm2 = new SM2(privateKey, null); + return sm2.signHex(HexUtil.encodeHexStr(content)); + } + + /** + * SM2公钥验签 + * + * @param publicKey 公钥 + * @param content 原始内容 + * @param sign 签名 + * @return 验签结果 + */ + public static boolean verify(String publicKey, String content, String sign) { + SM2 sm2 = new SM2(null, publicKey); + return sm2.verifyHex(HexUtil.encodeHexStr(content), sign); + } + + /** + * SM2公钥加密 + * + * @param content 原文 + * @param publicKey SM2公钥 + * @return + */ + public static String encryptBase64(String content, String publicKey) { + SM2 sm2 = new SM2(null, publicKey); + return sm2.encryptBase64(content, KeyType.PublicKey); + } + + /** + * SM2私钥解密 + * + * @param encryptStr SM2加密字符串 + * @param privateKey SM2私钥 + * @return + */ + public static String decryptBase64(String encryptStr, String privateKey) { + SM2 sm2 = new SM2(privateKey, null); + return StrUtil.utf8Str(sm2.decrypt(encryptStr, KeyType.PrivateKey)); + } + + public static void main(String[] args) { + String privateKey = "1100fba8ee67ddf1f6f4e37c500dc10eee1bf15827ae3837810e30f402fa0bc6"; + String publicKey = "048421649b6acdd22bc5075ef937dd35bb165b1db32eb4bd2fc666f07808819c88ac7dbeaeeb367bfe53601db55372bc16bf284dbf12f6b5f0df111023df88a4b0"; + + String encrypt = "BPTfj7kSlu6fJHpn/t2IQ1R83MPuA3sjgySntyYRo8GEgUNnTYoxaOX2FTK+X/bPllVx8Ly4/1l2FUb9JwRRbzbMPIdIfal7qO4ftJKJTN1M555BUSyGUOEBHivrarFiliiwnZH5dD4YV+kRUUD70o/1zEysm5M6/FrzXebRcH9EsnLEGta9D+urvisjamjQmunV3razxlsd+SYvbSsYmDRp8QjbJLpkfrlJBL484cB5Nhj8XWx8IZb3lvINkkq+"; + + String decrypt = decryptBase64(encrypt, privateKey); + System.out.println("解密后结果：" + decrypt); + } + + +} diff --git a/psdc-web/src/main/java/com/psdc/controller/key/GenerateKeyController.java b/psdc-web/src/main/java/com/psdc/controller/key/GenerateKeyController.java index 7e089e1..5bcd2ce 100644 --- a/psdc-web/src/main/java/com/psdc/controller/key/GenerateKeyController.java +++ b/psdc-web/src/main/java/com/psdc/controller/key/GenerateKeyController.java @@ -33,11 +33,7 @@ public class GenerateKeyController extends BaseController { @PostMapping("/getKey") public AjaxResult getGenerateKey(@RequestBody Map requestBody) { - List cpuIds = (List) requestBody.get("cpuIds"); - List thisCpuIds = new ArrayList<>(); - for (String s : cpuIds){ - thisCpuIds.add(secretKeyService.getString(s)); - } + String cpuIds = (String) requestBody.get("cpuIds"); String expiration = (String) requestBody.get("expiration"); SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -46,13 +42,13 @@ public class GenerateKeyController extends BaseController { Map map = new HashMap(); map.put("companyname", companyName); map.put("expireTime", expiration); - map.put("cpuIds", thisCpuIds.toString()); + map.put("cpuIds", cpuIds); AjaxResult ajax = AjaxResult.success(); String s = generateKey.generateKey(map, key); ajax.put("key", s); SecretKey secretKey = new SecretKey(); secretKey.setKeyValue(s); - secretKey.setCpuIds(thisCpuIds.toString()); + secretKey.setCpuIds(cpuIds); secretKey.setExportDate(expiration); secretKey.setKeyUnit(companyName); SecretKey selOne = secretKeyService.selOne(s, expiration); diff --git a/psdc-web/src/main/java/com/psdc/controller/key/SecretKeyController.java b/psdc-web/src/main/java/com/psdc/controller/key/SecretKeyController.java index f564a87..b9b104d 100644 --- a/psdc-web/src/main/java/com/psdc/controller/key/SecretKeyController.java +++ b/psdc-web/src/main/java/com/psdc/controller/key/SecretKeyController.java @@ -73,11 +73,7 @@ public class SecretKeyController { @PostMapping("/upKeyData") public AjaxResult upKeyDate(@RequestBody Map requestBody){ - List cpuIds = (List) requestBody.get("cpuIds"); - List thisCpuIds = new ArrayList<>(); - for (String s : cpuIds){ - thisCpuIds.add(secretKeyService.getString(s)); - } + String cpuIds = (String) requestBody.get("cpuIds"); String expiration = (String) requestBody.get("expiration"); String key = (String) requestBody.get("key"); String companyName = (String) requestBody.get("companyname"); @@ -85,14 +81,14 @@ public class SecretKeyController { Map map = new HashMap(); map.put("companyname", companyName); map.put("expireTime", expiration); - map.put("cpuIds", thisCpuIds.toString()); + map.put("cpuIds", cpuIds); AjaxResult ajax = AjaxResult.success(); String s = generateKey.generateKey(map, key); ajax.put("key", s); SecretKey secretKey = new SecretKey(); secretKey.setKeyValue(s); secretKey.setId(id); - secretKey.setCpuIds(thisCpuIds.toString()); + secretKey.setCpuIds(cpuIds); secretKey.setExportDate(expiration); secretKey.setKeyUnit(companyName); secretKeyService.updateById(secretKey); diff --git a/psdc.iml b/psdc.iml index a114eb2..d5626ee 100644 --- a/psdc.iml +++ b/psdc.iml @@ -1,6 +1,6 @@ - \ No newline at end of file