Merge remote-tracking branch 'origin/master'

4dkankan-utils-reg/src/main/java/com/fdkankan/reg/RegCodeUtil.java

@@ -38,7 +38,7 @@ public class RegCodeUtil {
      * @return:
      **/
     public static String GenRegeditCamCode(String plaintext){
-            String s = Crypt.encryptAES(plaintext.trim(), true);
+        String s = Crypt.encryptAES(plaintext.trim(), true);
         log.info("相机注册码:{}",s);
         log.info("相机注册码原始长度:{}",s.length());
         String code = DeflaterUtil.zipString(s);
@@ -62,7 +62,7 @@ public class RegCodeUtil {
             return t;
         }catch (Exception e){
             e.printStackTrace();
-            return null;
+            throw new RuntimeException("校验失败");
         }
     }
 //    /***
@@ -115,13 +115,13 @@ public class RegCodeUtil {
             log.info("批量生成相机码解压:{}",code);
             String source = Crypt.decryptAES(code, true);
             CamRegSDto t = JSON.toJavaObject(JSONObject.parseObject(source) , CamRegSDto.class);
-            if (ObjUtil.isNull(t.getMachineCode()) && !t.getMachineCode().equals(machineCode.trim())){
+            if (ObjUtil.isNotNull(t.getMachineCode()) && !t.getMachineCode().equals(machineCode.trim())){
                 throw new RuntimeException("校验失败");
             }
             return t;
         }catch (Exception e){
             e.printStackTrace();
-            return null;
+            throw new RuntimeException("校验失败");
         }
     }
     public static void main(String[] args) {
@@ -130,7 +130,7 @@ public class RegCodeUtil {
         System.out.println(machineRegDto);
 
 
-        String machineCode="E4E73A8EB46B8EA252B9C1B34048F60679FB345BC6F233A8369E355828B68F69FDAB2150B286C0E0A397D960183716F8BF4C8B086D4C5BB5D1243CB9AA924B6B8A0ED22ED413BD27681CE5C36198EBF7FE06E75CD444B46A7721E2462DD234EB6B5B780F1FB9CF3C26C3ED4DB7B08B20";
+        String machineCode="2604E086BF60DD7F03426E8B167A0CAB05E217470C9CB2E95F3699816796FFAB2735CE1BA9CF5A4924B176C3170D5C1A16DAD5331F9FC3CDA3FF8E14DEDAB7F861A0AEE5E1C5D17497E067ACC9D2CC5EFE06E75CD444B46A7721E2462DD234EB9EECDD829C31166AD49CF05ED8D6619B";
         //生成安装注册码
         String s = GenRegeditCode(machineCode);
 
@@ -146,12 +146,11 @@ public class RegCodeUtil {
         List<CamRegDto> list=new ArrayList<>();
 
         CamRegDto camRegDto=new CamRegDto();
-        camRegDto.setSn("00000001");
+        camRegDto.setSn("810D669S0");
+        camRegDto.setCameraType(9);
+        camRegDto.setToSn("00000003");
         list.add(camRegDto);
 
-        CamRegDto camRegDto2=new CamRegDto();
-        camRegDto2.setSn("00000001");
-        list.add(camRegDto2);
 
         CamRegSDto CamReg=new CamRegSDto();
         CamReg.setMachineCode(machineCode);