Merge branch 'feature/visitor2_zhy'

epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/DhDeviceUtil.java

@@ -707,7 +707,7 @@ public class DhDeviceUtil {
         cardFormDTO.setCategory("0");
         cardFormDTO.setCardStatus("ACTIVE");
         cardFormDTO.setStartDate(LocalDate.now().toString());
-        cardFormDTO.setEndDate(LocalDate.now().plusDays(180L).toString());
+        cardFormDTO.setEndDate(LocalDate.now().toString());
         String pwd;
         try {
             pwd = RSAUtils.getPwdByRsa(getPublicKey(), "123456");
@@ -816,7 +816,7 @@ public class DhDeviceUtil {
             DataInputStream dataInputStream = new DataInputStream(url.openStream());
             byte[] originBytes = toByteArray(dataInputStream);
 
-            fileBytes = compressPicCycle(originBytes, 100L, 0.1);
+            fileBytes = compressPicCycle(originBytes, 100L, 0.2);
         } catch (IOException e) {
             logger.error("图片上传异常", e);
             throw new RenException("图片上传异常");