抛弃过期的旧依赖

抛弃过期的旧依赖，引用新的依赖修复一处代码不规范问题
0Chencc · Jan 6, 2022 · 2343333 · 2343333
1 parent d00e96b
commit 2343333
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 group 'org.ctfcracktools'
-version '4.0.3'
+version '4.0.4'
 
 buildscript {
     ext.kotlin_version = '1.4.10'
@@ -23,7 +23,7 @@ jar {
     }
     exclude 'META-INF/*.RSA', 'META-INF/*.SF','META-INF/*.DSA',
             'META-INF/LICENSE.txt','META-INF/NOTICE.txt','META-INF/*/*/*.class',
-            'META-INF/LICENSE'
+            'META-INF/LICENSE','module-info.class'
     manifest{attributes 'Main-Class': 'org.ctfcracktools.Main'}
 }
 
@@ -48,10 +48,11 @@ tasks.withType(JavaCompile) {
 
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    compile group: 'org.python', name: 'jython', version: '2.7.1b3'
+    compile group: 'org.python', name: 'jython', version: '2.7.2'
     compile group: 'com.google.code.gson', name: 'gson', version: '2.8.9'
-    compile group: 'commons-codec', name: 'commons-codec', version: '1.10'
-    compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
+    compile group: 'commons-codec', name: 'commons-codec', version: '1.15'
+    // https://mvnrepository.com/artifact/org.apache.commons/commons-text
+    compile group: 'org.apache.commons', name: 'commons-text', version: '1.9'
     compile group: 'com.formdev', name: 'flatlaf', version: '1.6.4'
     testCompile group: 'junit', name: 'junit', version: '4.12'
 }

diff --git a/src/org/ctfcracktools/fuction/CoreFunc.kt b/src/org/ctfcracktools/fuction/CoreFunc.kt
@@ -2,8 +2,7 @@ package org.ctfcracktools.fuction
 
 import org.apache.commons.codec.binary.Base32
 import org.apache.commons.codec.binary.Base64.*
-import org.apache.commons.lang3.StringEscapeUtils;
-import org.apache.commons.lang3.StringUtils
+import org.apache.commons.text.StringEscapeUtils
 import java.net.URLDecoder
 import java.net.URLEncoder
 import java.util.*
@@ -97,7 +96,7 @@ class CoreFunc{
                     }
                 }
             }
-            if (a !== 0) {
+            if (a != 0) {
                 (0 until a).forEach { it -> result.append(" " + x[it]) }
                 (0 until a).forEach { i ->
                     result.append("${i+1}：")
@@ -320,9 +319,8 @@ class CoreFunc{
         return StringBuilder()
             .let{
                     result ->
-                var inputnew:String = ""
                 if(isBacon(input)){
-                    inputnew = input.replace(" ","")
+                    val inputnew = input.replace(" ","")
                     splitNum(inputnew,5,"[ab]{5}").forEach { result.append(keymap[it]) }
                 }else{
                     result.append("并非是培根密码")
@@ -493,7 +491,7 @@ class CoreFunc{
                     }
                     .toString()
         }*/
-    private fun htmlEncode(input:String): String? = StringEscapeUtils.escapeHtml4(input)
+    private fun htmlEncode(input:String): String = StringEscapeUtils.escapeHtml4(input)
     private fun htmlDecode(input:String):String = StringEscapeUtils.unescapeHtml4(input)
     /* 内置方法/内置常量 */
     private val UpperCase:String ="ABCDEFGHIJKLMNOPQRSTUVWXYZ"