密码改造

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/controller/MdModelInfoController.java

@@ -90,8 +90,6 @@ public class MdModelInfoController extends BaseController {
         if (StringUtils.isNull(mdModelInfo.getEnname())) return error("【模型英文名称】不可为空");
         mdModelInfo.setRegUser(getUsername());
 
-        mdModelInfo.setMdContact(sm4Util.encrypt(mdModelInfo.getMdContact()));
-        mdModelInfo.setDevContact(sm4Util.encrypt(mdModelInfo.getDevContact()));
 
         return AjaxResult.success(mdModelInfoService.insertMdModelInfo(mdModelInfo));
     }
@@ -105,8 +103,6 @@ public class MdModelInfoController extends BaseController {
     public AjaxResult edit(@RequestBody MdModelInfo mdModelInfo) {
         if (StringUtils.isNull(mdModelInfo.getName())) return error("【模型名称】不可为空");
         if (StringUtils.isNull(mdModelInfo.getEnname())) return error("【模型英文名称】不可为空");
-        mdModelInfo.setMdContact(sm4Util.encrypt(mdModelInfo.getMdContact()));
-        mdModelInfo.setDevContact(sm4Util.encrypt(mdModelInfo.getDevContact()));
 
         return toAjax(mdModelInfoService.updateMdModelInfo(mdModelInfo));
     }

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/service/impl/MdModelInfoServiceImpl.java

@@ -42,7 +42,12 @@ public class MdModelInfoServiceImpl implements IMdModelInfoService {
     @Override
     public MdModelInfo selectMdModelInfoByMdid(String mdid) {
         MdModelInfo mdModelInfo = mdModelInfoMapper.selectMdModelInfoByMdid(mdid);
+        mdModelInfo.setName(sm4Util.decrypt(mdModelInfo.getName()));
+        mdModelInfo.setEnname(sm4Util.decrypt(mdModelInfo.getEnname()));
+
+        mdModelInfo.setMdUnit(sm4Util.decrypt(mdModelInfo.getMdUnit()));
         mdModelInfo.setMdContact(sm4Util.decrypt(mdModelInfo.getMdContact()));
+        mdModelInfo.setDevUnit(sm4Util.decrypt(mdModelInfo.getDevUnit()));
         mdModelInfo.setDevContact(sm4Util.decrypt(mdModelInfo.getDevContact()));
 
         return mdModelInfo;
@@ -58,8 +63,13 @@ public class MdModelInfoServiceImpl implements IMdModelInfoService {
     public List<MdModelInfo> selectMdModelInfoList(MdModelInfo mdModelInfo) {
         List<MdModelInfo> mdModelInfos = mdModelInfoMapper.selectMdModelInfoList(mdModelInfo);
         mdModelInfos.forEach(p -> {
-            p.setMdContact(sm4Util.decrypt(p.getMdContact()));
-            p.setDevContact(sm4Util.decrypt(p.getDevContact()));
+            p.setName(sm4Util.decrypt(mdModelInfo.getName()));
+            p.setEnname(sm4Util.decrypt(mdModelInfo.getEnname()));
+
+            p.setMdUnit(sm4Util.decrypt(mdModelInfo.getMdUnit()));
+            p.setMdContact(sm4Util.decrypt(mdModelInfo.getMdContact()));
+            p.setDevUnit(sm4Util.decrypt(mdModelInfo.getDevUnit()));
+            p.setDevContact(sm4Util.decrypt(mdModelInfo.getDevContact()));
 
         });
         return mdModelInfos;
@@ -75,6 +85,15 @@ public class MdModelInfoServiceImpl implements IMdModelInfoService {
     public String insertMdModelInfo(MdModelInfo mdModelInfo) {
         mdModelInfo.setMdid(IdUtils.fastUUID());
         mdModelInfo.setCreateby(DateUtils.getNowDate());
+
+        mdModelInfo.setName(sm4Util.encrypt(mdModelInfo.getName()));
+        mdModelInfo.setEnname(sm4Util.encrypt(mdModelInfo.getEnname()));
+        mdModelInfo.setMdUnit(sm4Util.encrypt(mdModelInfo.getMdUnit()));
+        mdModelInfo.setMdContact(sm4Util.encrypt(mdModelInfo.getMdContact()));
+        mdModelInfo.setDevUnit(sm4Util.encrypt(mdModelInfo.getDevUnit()));
+        mdModelInfo.setDevContact(sm4Util.encrypt(mdModelInfo.getDevContact()));
+
+
         mdModelInfoMapper.insertMdModelInfo(mdModelInfo);
         return mdModelInfo.getMdid();
     }
@@ -87,6 +106,13 @@ public class MdModelInfoServiceImpl implements IMdModelInfoService {
      */
     @Override
     public int updateMdModelInfo(MdModelInfo mdModelInfo) {
+        mdModelInfo.setName(sm4Util.encrypt(mdModelInfo.getName()));
+        mdModelInfo.setEnname(sm4Util.encrypt(mdModelInfo.getEnname()));
+        mdModelInfo.setMdUnit(sm4Util.encrypt(mdModelInfo.getMdUnit()));
+        mdModelInfo.setMdContact(sm4Util.encrypt(mdModelInfo.getMdContact()));
+        mdModelInfo.setDevUnit(sm4Util.encrypt(mdModelInfo.getDevUnit()));
+        mdModelInfo.setDevContact(sm4Util.encrypt(mdModelInfo.getDevContact()));
+
         mdModelInfo.setModifyby(DateUtils.getNowDate());
         return mdModelInfoMapper.updateMdModelInfo(mdModelInfo);
     }

ruoyi-common/src/main/java/com/ruoyi/common/utils/SM4Util.java

@@ -86,8 +86,7 @@ public class SM4Util {
             byte[] encrypted = cipher.doFinal(data.getBytes(StandardCharsets.UTF_8));
             return Base64.getEncoder().encodeToString(encrypted);
         } catch (Exception e) {
-            return data;
-           // throw new RuntimeException("SM4加密失败", e);
+            throw new RuntimeException("SM4加密失败", e);
         }
     }
 
@@ -107,10 +106,7 @@ public class SM4Util {
             byte[] decrypted = cipher.doFinal(encryptedBytes);
             return new String(decrypted, StandardCharsets.UTF_8);
         } catch (Exception e) {
-            System.out.println(encryptedData);
-            System.out.println(ExceptionUtil.getRootErrorMessage(e));
-            return encryptedData;
-            //throw new RuntimeException("SM4解密失败", e);
+            throw new RuntimeException("SM4解密失败", e);
         }
     }