修复了一处bug

close #38 #40 #41
该版本以及后续版本插件功能不再是强制启动的功能

README.md

@@ -12,9 +12,11 @@
 
 本工具已经可以作为burp插件导入，仓库地址：[DaE](https://github.com/0Chencc/DaE)
 
-如果你觉得好用的话，或许可以请我喝一杯咖啡☕️
+[请我喝一杯咖啡☕️](#要饭环节)
 
-![](img/wechat.jpeg)
+## 疑难解答
+
+跳转到：[https://github.com/0Chencc/CTFCrackTools/wiki/FAQ](https://github.com/0Chencc/CTFCrackTools/wiki/FAQ)
 
 ## 界面介绍
 
@@ -177,3 +179,9 @@ def author_info():
 旧版本与新版本的差别仅仅在于ui的差别，最新的4.0版本抛弃了3.0被大家诟病的ui，并且在2.0也就是调查发现比较喜欢的版本的基础上进行了ui的美化，我认为旧版本已没有存在的必要，所以将项目设置为private，如果呼声过高我会重新开放。感谢大家。
 
 ~~[https://github.com/Acmesec/CTFCrackTools-V2](https://github.com/Acmesec/CTFCrackTools-V2)~~
+
+## 要饭环节
+
+我司承接各类安全培训以及渗透测试，可联系admin[#]hi-ourlife.com
+
+![wechat](img/wechat.jpeg)

build.gradle

@@ -1,8 +1,9 @@
 group 'org.ctfcracktools'
-version '4.0.6'
+version '4.0.7'
 
 buildscript {
-    ext.kotlin_version = '1.4.10'
+    ext.kotlin_version = '1.3.72'
+//    ext.kotlin_version = '1.7.20'
 
     repositories {
         maven{ url 'https://maven.aliyun.com/nexus/content/groups/public/'}
@@ -25,6 +26,7 @@ jar {
             'META-INF/LICENSE.txt','META-INF/NOTICE.txt','META-INF/*/*/*.class',
             'META-INF/LICENSE','module-info.class'
     manifest{attributes 'Main-Class': 'org.ctfcracktools.Main'}
+
 }
 
 sourceCompatibility = 1.8
@@ -46,15 +48,26 @@ tasks.withType(JavaCompile) {
     options.encoding = "UTF-8"
 }
 
+task FatJar(type: Jar) {
+    manifest {
+        attributes 'Main-Class': 'org.ctfcracktools.Main'
+    }
+    baseName = 'CTFCrackTools'
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+    from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } }
+    with jar
+}
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+
     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.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'
+    implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
+    implementation group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.25'
 }
 
 compileKotlin {

src/org/ctfcracktools/Config.java

@@ -8,7 +8,7 @@
  * @author linchen
  */
 public class Config {
-    public final static String VERSION = "4.0.6";
+    public final static String VERSION = "4.0.7";
     public final static String SLOGAN = "";
     public final static String ABOUT =
             "Author:0chen(@0chencc)\n" +

src/org/ctfcracktools/fuction/CoreFunc.kt

@@ -49,7 +49,7 @@ class CoreFunc{
             CodeMode.ENCODE_URL to ::urlEncoder,
             CodeMode.ENCODE_UNICODE to ::unicodeEncode,
             CodeMode.ENCODE_HTML to ::htmlEncode,
-            CodeMode.ENCODE_VIGENERE to ::vigenereEnCode,)
+            CodeMode.ENCODE_VIGENERE to ::vigenereEnCode)
 
         return funcMap[type]?.let { it(input) }
     }
@@ -381,6 +381,8 @@ class CoreFunc{
                     when {
                         isChar(it) -> result.append(morseCharacters[(it - 'a')]+" ")
                         isDigit(it) -> result.append(morseDigits[(it - '0')]+" ")
+                        isSymbol(it) -> result.append(morseSymbols[symbols.indexOf(it)]+" ")
+//                        else -> result.append(" ")
                     }
                 }
                 result
@@ -541,15 +543,20 @@ class CoreFunc{
     private fun initMorseTable(){
         (0..25).forEach { i -> htMorse.put(morseCharacters[i], Character.valueOf((65+i).toChar())) }
         (0..9).forEach { i -> htMorse.put(morseDigits[i], Character.valueOf((48+i).toChar())) }
+        (0..16).forEach{ i -> htMorse.put(morseSymbols[i], symbols[i]) }
     }
     val isChar = {c:Char -> c.isLowerCase()||c.isUpperCase()}
     val isDigit = {c:Char -> (c >='0')&&(c <= '9')}
+    val isSymbol = {c:Char -> c in symbols}
     /* moresCode */
     private val morseCharacters = arrayOf(".-", "-...", "-.-.", "-..", ".", "..-.", "--.", "....", "src", ".---",
         "-.-", ".-..", "--", "-.", "---", ".--.", "--.-", ".-.", "...", "-", "..-", "...-", ".--", "-..-", "-.--",
         "--..")
     private val morseDigits = arrayOf("-----", ".----", "..---", "...--", "....-", ".....", "-....", "--...",
         "---..", "----.")
+    private val morseSymbols = arrayOf(".-.-.-","---...","--..--","-.-.-.","..--..","-...-",".----.","-..-.","-.-.--",
+        "-....-", "..--.-",".-..-.","-.--.","-.--.-","...-..-", ".--.-.",".-...")
+    private val symbols: Array<Char> = arrayOf('.', ':', ',', ';', '?', '=', '\'', '/', '!', '-', '_', '"', '(', ')', '$', '@', '&')
     val format = {
             input:String->
         val word = input.toCharArray()

src/org/ctfcracktools/fuction/PythonFunc.kt

@@ -13,7 +13,12 @@ class PythonFunc {
      * 初始化
      */
     init {
-        jythonLoad()
+        try {
+            jythonLoad()
+        }catch (e:Exception){
+            println("Jython加载失败")
+            e.printStackTrace()
+        }
     }
 
     /**
@@ -28,8 +33,8 @@ class PythonFunc {
         props["python.import.site"] = "false"
         val sysProps = System.getProperties()
         PythonInterpreter.initialize(sysProps,props, arrayOfNulls(0))
-        val sysS = Py.getSystemState()
-        sysS.path.add(System.getProperty("user.dir") + "")
+        val sysState = Py.getSystemState()
+        sysState.path.add(System.getProperty("user.dir") + "")
         interpreter = PythonInterpreter()
     }