解决冲突bug

blade-service/blade-manager/pom.xml

@@ -31,7 +31,6 @@
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-excel</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-swagger</artifactId>
@@ -69,12 +68,7 @@
             <version>2.9.1.RELEASE</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-resource-api</artifactId>
-            <version>2.9.1.RELEASE</version>
-            <scope>compile</scope>
-        </dependency>
+
         <!--Oss-->
         <dependency>
             <groupId>org.springblade</groupId>

blade-service/blade-manager/src/main/java/com/mixsmart/security/DESCoder.java

@@ -156,29 +156,29 @@ public abstract class DESCoder extends Coder{
     }
 
 
-    public static void main(String[] args) throws Exception{
-        String phone="18683951945";
-        final String  key="sajsajsajdjsdsaj";
-        byte[] keyBytes= Base64.encodeBase64String(key.getBytes("UTF8")).getBytes();
-
-        DESKeySpec dks = new DESKeySpec(keyBytes);
-        SecretKeyFactory keyFactory = SecretKeyFactory.getInstance("DES");
-        SecretKey secretKey = keyFactory.generateSecret(dks);
-
-        //加密
-        Cipher cipherEncode = Cipher.getInstance("DES");
-        cipherEncode.init(Cipher.ENCRYPT_MODE, secretKey);
-        byte[] desEncodebytes = cipherEncode.doFinal(phone.getBytes("UTF8"));
-        String desEncode =Base64.encodeBase64URLSafeString(desEncodebytes);
-        System.out.println(desEncode);
-
-        //解密
-        Cipher cipherDecode = Cipher.getInstance("DES");
-        cipherDecode.init(Cipher.DECRYPT_MODE, secretKey);
-        byte[] desEncodebyte = Base64.decodeBase64(desEncode);
-        byte[] desDecodebytes= cipherDecode.doFinal(desEncodebyte);
-        String desDecode =new String(desDecodebytes,"UTF8");
-        System.out.println(desDecode);
-
-    }
+//    public static void main(String[] args) throws Exception{
+//        String phone="18683951945";
+//        final String  key="sajsajsajdjsdsaj";
+//        byte[] keyBytes= Base64.encodeBase64String(key.getBytes("UTF8")).getBytes();
+//
+//        DESKeySpec dks = new DESKeySpec(keyBytes);
+//        SecretKeyFactory keyFactory = SecretKeyFactory.getInstance("DES");
+//        SecretKey secretKey = keyFactory.generateSecret(dks);
+//
+//        //加密
+//        Cipher cipherEncode = Cipher.getInstance("DES");
+//        cipherEncode.init(Cipher.ENCRYPT_MODE, secretKey);
+//        byte[] desEncodebytes = cipherEncode.doFinal(phone.getBytes("UTF8"));
+//        String desEncode =Base64.encodeBase64URLSafeString(desEncodebytes);
+//        System.out.println(desEncode);
+//
+//        //解密
+//        Cipher cipherDecode = Cipher.getInstance("DES");
+//        cipherDecode.init(Cipher.DECRYPT_MODE, secretKey);
+//        byte[] desEncodebyte = Base64.decodeBase64(desEncode);
+//        byte[] desDecodebytes= cipherDecode.doFinal(desEncodebyte);
+//        String desDecode =new String(desDecodebytes,"UTF8");
+//        System.out.println(desDecode);
+//
+//    }
 }

blade-service/blade-manager/src/main/java/com/mixsmart/utils/IdCardInfoExtractor.java

@@ -125,11 +125,11 @@ public class IdCardInfoExtractor {
     }   
   
 	
-    public static void main(String[] args) {   
+    /*public static void main(String[] args) {
         String idcard = "";   
         IdCardInfoExtractor ie = new IdCardInfoExtractor(idcard);   
         System.out.println(ie.toString());   
-    }
+    }*/
 
     /**
      * 获取省份

blade-service/blade-manager/src/main/java/com/mixsmart/utils/IdCardValidator.java

@@ -382,11 +382,11 @@ public class IdCardValidator {
 		return a;
 	}
 
-	public static void main(String[] args) throws Exception {
+	/*public static void main(String[] args) throws Exception {
 		//String idcard15 = "";
 		String idcard18 = "";
 		IdCardValidator iv = new IdCardValidator();
-		/*boolean flag = false;
+		*//*boolean flag = false;
 		flag = iv.isValidate18Idcard(idcard18);
 		System.out.println(flag);
 
@@ -395,7 +395,7 @@ public class IdCardValidator {
 
 		System.out.println(iv.convertIdcarBy15bit(idcard15));
 		flag = iv.isValidate18Idcard(iv.convertIdcarBy15bit(idcard15));
-		System.out.println(flag);*/
+		System.out.println(flag);*//*
 		System.out.println(iv.isValidatedAllIdcard(idcard18));
-	}
+	}*/
 }

blade-service/blade-manager/src/main/java/com/mixsmart/utils/StringUtils.java

@@ -1463,14 +1463,14 @@ public class StringUtils {
 
 
 
-	public static void main(String[] args) {
+	/*public static void main(String[] args) {
    	    Map<String,Object> map = new HashMap<>();
    	    map.put("yang",10);
 		map.put("a",-10);
 		List<String> list = Arrays.asList("1","12.6","856");
 		System.out.println(Expression.parse("a+6*yang").calculate(map).toString());
 
-	}
+	}*/