token相关接口

mrqcman-service/src/main/java/com/diagbot/facade/MrqcTokenFacade.java

@@ -158,16 +158,16 @@ public class MrqcTokenFacade extends MrqcTokenServiceImpl {
      */
     public Map analysis(MrqcTokenContentVO mrqcTokenContentVO) {
         Map<String, String> map = new HashMap<>();
-        String content = mrqcTokenContentVO.getContent();
-        String[] param = content.split("\n");
-        for (String s : param) {
-            try {
-                String line = RSAEncrypt.decrypt(s);
-                String[] keyVal = line.split("=");
+        try {
+            String content = mrqcTokenContentVO.getContent();
+            String contentDe = RSAEncrypt.decrypt(content);
+            String[] item = contentDe.split("\\$\\$"); // $$作为分隔符
+            for (String s : item) {
+                String[] keyVal = s.split("=");
                 map.put(keyVal[0], keyVal[1]);
-            } catch (Exception e) {
-                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "内容格式有误，不能解析！");
             }
+        } catch (Exception e) {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "内容格式有误，不能解析！");
         }
         return map;
     }

mrqcman-service/src/main/java/com/diagbot/util/SerialNumberUtil.java

@@ -250,9 +250,9 @@ public class SerialNumberUtil {
      * @return
      */
     public static Map<String, String> getAllSn() {
-        String os = System.getProperty("os.name");
+        String os = System.getProperty("os.name").toUpperCase();
         Map<String, String> snVo = new HashMap<String, String>();
-
+        snVo.put("server.os", os);
         if ("LINUX".equals(os)) {
             System.out.println("=============>for linux");
             String cpuid = getSerialNumber("dmidecode -t processor | grep 'ID'", "ID", ":");
@@ -262,26 +262,26 @@ public class SerialNumberUtil {
             String diskNumber = getSerialNumber("fdisk -l", "Disk identifier", ":");
             System.out.println("diskNumber : " + diskNumber);
             // String mac = getSerialNumber("ifconfig -a", "ether", " ");
-            snVo.put("cpuid", cpuid.toUpperCase().replace(" ", ""));
-            snVo.put("diskid", diskNumber.toUpperCase().replace(" ", ""));
+            snVo.put("server.cpu", cpuid.toUpperCase().replace(" ", ""));
+            snVo.put("server.disk", diskNumber.toUpperCase().replace(" ", ""));
             // snVo.put("mac", mac.toUpperCase().replace(" ", ""));
-            snVo.put("mainboard", mainboardNumber.toUpperCase().replace(" ", ""));
+            snVo.put("server.mainboard", mainboardNumber.toUpperCase().replace(" ", ""));
         } else {
             System.out.println("=============>for windows");
             String cpuid = SerialNumberUtil.getCPUSerial();
             String mainboard = SerialNumberUtil.getMotherboardSN();
             String disk = SerialNumberUtil.getHardDiskSN();
-            String mac = SerialNumberUtil.getMac();
+            // String mac = SerialNumberUtil.getMac();
 
             System.out.println("CPU  SN:" + cpuid);
             System.out.println("主板  SN:" + mainboard);
             System.out.println("C盘   SN:" + disk);
-            System.out.println("MAC  SN:" + mac);
+            //  System.out.println("MAC  SN:" + mac);
 
-            snVo.put("cpuid", cpuid.toUpperCase().replace(" ", ""));
-            snVo.put("diskid", disk.toUpperCase().replace(" ", ""));
-            snVo.put("mac", mac.toUpperCase().replace(" ", ""));
-            snVo.put("mainboard", mainboard.toUpperCase().replace(" ", ""));
+            snVo.put("server.cpu", cpuid.toUpperCase().replace(" ", ""));
+            snVo.put("server.disk", disk.toUpperCase().replace(" ", ""));
+            // snVo.put("server.mac", mac.toUpperCase().replace(" ", ""));
+            snVo.put("server.mainboard", mainboard.toUpperCase().replace(" ", ""));
         }
 
         return snVo;