diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java index e0399e1b3..5a718b8af 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java @@ -67,12 +67,11 @@ public enum DicDataEnum { /** * 电压互感器类型 */ - Cap_V("电容式电压互感器","Cap_V"), - Pele_V("光电式电压互感器","Pele_V"), - A_V("A类测试电压互感器","A_V"), - Elec_V("电子式电压互感器","Elec_V"), + Cap_V("电容式","Cap_V"), + Pele_V("光电式","Pele_V"), + Elec_V("电子式","Elec_V"), Other_S("其他","Other"), - Ele_V("电磁式电压互感器","Ele_V"), + Ele_V("电磁式","Ele_V"), /** * 中性点接地方式 diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/controller/UserController.java b/pqs-user/user-boot/src/main/java/com/njcn/user/controller/UserController.java index 1d38e4c51..afbd544e5 100644 --- a/pqs-user/user-boot/src/main/java/com/njcn/user/controller/UserController.java +++ b/pqs-user/user-boot/src/main/java/com/njcn/user/controller/UserController.java @@ -366,8 +366,11 @@ public class UserController extends BaseController { String publicKey = keyMap.get("publicKey"); String privateKey = keyMap.get("privateKey"); String ip = request.getHeader(SecurityConstants.REQUEST_HEADER_KEY_CLIENT_REAL_IP); - //秘钥先删除再添加 - redisUtil.delete(loginName + ip); + + if(redisUtil.hasKey(loginName + ip)){ + //秘钥先删除再添加 + redisUtil.delete(loginName + ip); + } // 保存私钥到 redis redisUtil.saveByKeyWithExpire(loginName + ip, privateKey, 5 * 60L); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, publicKey, methodDescribe);