Merge branch 'test'

# Conflicts:
#	src/main/java/com/fdkankan/manage/util/RsaUtils.java

src/main/java/com/fdkankan/manage/service/impl/CameraServiceImpl.java

@@ -358,7 +358,7 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
                 throw new BusinessException(ResultCode.CAMERA_NOT_IN);
             }
             cameraDetail.setAgentId(param.getAgentId());
-            cameraDetail.setBuyDate(Dateutils.getDate(param.getBuyDate()));
+            cameraDetail.setBuyDate(Dateutils.getDayDate(param.getBuyDate()));
             cameraDetail.setOrderSn(param.getOrderSn());
             cameraDetail.setOwn(param.getOutType());
             cameraDetail.setCompanyId(param.getCompanyId());

src/main/java/com/fdkankan/manage/util/Dateutils.java

@@ -67,6 +67,14 @@ public class Dateutils {
         }
         return new Date();
     }
+    public static Date getDayDate(String date) {
+        try {
+            return new SimpleDateFormat("yyyy-MM-dd").parse(date);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return new Date();
+    }
     public static Date getMonday(Date date) {
         Calendar calBegin = Calendar.getInstance();
         calBegin.setTime(date);

src/main/java/com/fdkankan/manage/util/RsaUtils.java

@@ -37,7 +37,7 @@ public class RsaUtils {
 		System.out.println("公钥："+publicKey);
 		System.out.println("私钥："+privateKey);
 
-		String ciphertext = rsa.encipher("4DKKPRO_0292D9F77", publicKey);
+		String ciphertext = rsa.encipher("4DKKPRO_022677E21", publicKey);
 		System.out.println(String.format("密文："+ciphertext));
 		String deTxt = rsa.decipher(ciphertext, privateKey);
 		System.out.println(deTxt);