Merge remote-tracking branch 'origin/master'

src/main/java/com/founder/common/IdentityCardVerification.java

@@ -68,8 +68,8 @@ public class IdentityCardVerification {
             }
             int modValue = theLastOne % 11;
             String strVerifyCode = wf[modValue];
-            iDCardNo = iDCardNo + strVerifyCode;
-            if (idStr.length() == 18 &&!iDCardNo.equals(idStr)) {
+            iDCardNo = iDCardNo + strVerifyCode.toUpperCase();
+            if (idStr.length() == 18 &&!iDCardNo.equals(idStr.toUpperCase())) {
                 return "身份证无效，不是合法的身份证号码";
             }
         }catch (Exception e){
@@ -149,4 +149,4 @@ public class IdentityCardVerification {
             return false;
         }
     }
-}
\ No newline at end of file
+}

src/main/java/com/founder/test.java

@@ -33,17 +33,17 @@ public class test {
             byte[] in_b = swapStream.toByteArray(); //in_b为转换之后的结果
             final String encodedText = encoder.encodeToString(in_b);*/
             Jccj jccj =new Jccj();
-            File file = new File("D:/appone.zip");
+            File file = new File("D:/JCCJ-R1100000500002014070001.zip");
             FileInputStream inputFile = new FileInputStream(file);
             byte[] buffer = new byte[(int)file.length()];
             inputFile.read(buffer);
             inputFile.close();
             //编码
             final String encodedText = encoder.encodeToString(buffer);
-
+            System.out.println(encodedText);
             jccj.setXxsb_zip(encodedText);
-            jccj.setTaskid("JCXX-R1100000500002014070006");
-            jccj.setUser_id("350128197311050034");
+            jccj.setTaskid("JCCJ-R1100000500002014070002");
+            jccj.setUser_id("15252719870504511x");
             jccj.setUser_dept("1400000000");
             jccj.setVersion("1.00");
             //发送，httpclient 包含zip包