Merge remote-tracking branch 'origin/master'

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

@@ -125,7 +125,7 @@ public class RegCodeUtil {
             log.info("批量生成相机码解压:{}",code);
             String source = Crypt.decryptAES(code, true);
             CamRegSDto t = JSON.toJavaObject(JSONObject.parseObject(source) , CamRegSDto.class);
-            if (!env.equals(t.getEnv())){
+            if (ObjUtil.isNull(t.getEnv())||!env.equals(t.getEnv())){
                 throw new RuntimeException("环境比对失败");
             }
             if (ObjUtil.isNotNull(t.getMachineCode()) && !t.getMachineCode().equals(machineCode.trim()) ){
@@ -189,7 +189,7 @@ public class RegCodeUtil {
         String camCode1 = uat.batchGenRegeditCamCode( CamReg);
 
 //        List<CamRegDto> list1 = BatchParseRegeditCamCode(machineCode+"a",camCode1);
-        CamRegSDto list1 = uat.BatchParseRegeditCamCode(machineCode,camCode1);
+        CamRegSDto list1 = uat.BatchParseRegeditCamCode(machineCode,"eNoNkMcRwEAIA1simfAk9l+S78sIsWx9pOA4kEvEq3CERGl9PsI7zEQfiFdxp5E7RW6rBOxAiMaeJ1E1nwultClXAkdeBHwLyCOri2/yRc/6vM2OVPR7Xckc8m5FllZtfLtbMg11WV9Fumne94kjvUjX5w/RCfEjUGtBA/J7a+VggSlrZNqamH4dzaS0eEM5BL6kptXGkodVJxOgEAULAEx4CsnmeOwenoNk2+QGfUi1B1DxSuRBqMLMS4gy803lt4Jl+1KiT8XTgh1YBKul/rju4IuZznMdmJZPbI0H33eneNUNEPDkTyPdbPreA178qgLo43Iz/p5lsK+mZr8fQ+NmEw==");