v1.19.0

.github/FUNDING.yml

@@ -1,2 +1,2 @@
 # These are supported funding model platforms
-custom: https://afdian.net/a/leon406
+custom: https://afdian.com/a/leon406

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,30 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**ToolsFx版本及构建日期(如v1.15.1.beta2 2022-12-13):**
+
+
+
+**系统版本及位数(Windows/OSX/ Linux /x86/x64/ arm):**
+
+
+
+**Java版本(jdk 1.8.0 x86 oracle/openjdk):**
+
+
+
+**操作步骤(如运行ToolsFx.bat):**
+
+
+
+**问题现象(如闪退):**
+
+
+
+**报错信息(命令行运行ToolsFx.bat/ToolsFx):**

.github/workflows/app-test.yml

@@ -26,19 +26,19 @@ jobs:
     steps:
       - run: sudo timedatectl set-timezone Asia/Shanghai
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       # 运行 JDK 配置  https://github.com/marketplace/actions/setup-java-jdk
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: 21
       # Runs a single command using the runners shell
       - run: chmod  777 ./gradlew
       # Gradle 缓存配置 https://docs.github.com/cn/actions/using-workflows/caching-dependencies-to-speed-up-workflows
       # GitHub 将删除 7 天内未被访问的任何缓存条目。 可以存储的缓存数没有限制，但大小10 GB
       - name: Cache Gradle packages
-        uses: actions/cache@v3
+        uses: actions/cache@v5
         with:
          path: |
            ~/.gradle
@@ -50,7 +50,7 @@ jobs:
       # test will auto execute jar task
       - name: Make app jar
         run: ./gradlew  :app:jar
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v6
         with:
           path: |
             app/build/libs

.github/workflows/detekt.yml

@@ -61,7 +61,7 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       # Gets the download URL associated with the $DETEKT_RELEASE_TAG
       - name: Get Detekt download URL
@@ -120,7 +120,7 @@ jobs:
           )" > ${{ github.workspace }}/detekt.sarif.json
 
       # Uploads results to GitHub repository using the upload-sarif action
-      - uses: github/codeql-action/upload-sarif@v2
+      - uses: github/codeql-action/upload-sarif@v4
         with:
           # Path to SARIF file relative to the root of the repository
           sarif_file: ${{ github.workspace }}/detekt.sarif.json

.github/workflows/plugin-apipost.yml

@@ -26,10 +26,10 @@ jobs:
     steps:
       - run: sudo timedatectl set-timezone Asia/Shanghai
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       # 运行 JDK 配置  https://github.com/marketplace/actions/setup-java-jdk
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: 17
@@ -38,7 +38,7 @@ jobs:
       # Gradle 缓存配置 https://docs.github.com/cn/actions/using-workflows/caching-dependencies-to-speed-up-workflows
       # GitHub 将删除 7 天内未被访问的任何缓存条目。 可以存储的缓存数没有限制，但大小10 GB
       - name: Cache Gradle packages
-        uses: actions/cache@v3
+        uses: actions/cache@v5
         with:
          path: |
            ~/.gradle
@@ -47,7 +47,7 @@ jobs:
          restore-keys: ${{ runner.os }}-gradle
       - name: Run plugin-apipost jar
         run: ./gradlew  :plugin-apipost:jar
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v6
         with:
           path: |
             plugin-apipost/build/libs

.github/workflows/plugin-compress.yml

@@ -26,10 +26,10 @@ jobs:
     steps:
       - run: sudo timedatectl set-timezone Asia/Shanghai
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       # 运行 JDK 配置  https://github.com/marketplace/actions/setup-java-jdk
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: 17
@@ -38,7 +38,7 @@ jobs:
       # Gradle 缓存配置 https://docs.github.com/cn/actions/using-workflows/caching-dependencies-to-speed-up-workflows
       # GitHub 将删除 7 天内未被访问的任何缓存条目。 可以存储的缓存数没有限制，但大小10 GB
       - name: Cache Gradle packages
-        uses: actions/cache@v3
+        uses: actions/cache@v5
         with:
          path: |
            ~/.gradle
@@ -47,7 +47,7 @@ jobs:
          restore-keys: ${{ runner.os }}-gradle
       - name: Run plugin-compress jar
         run: ./gradlew  :plugin-compress:jar
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v6
         with:
           path: |
             plugin-compress/build/libs

.github/workflows/plugin-image.yml

@@ -26,10 +26,10 @@ jobs:
     steps:
       - run: sudo timedatectl set-timezone Asia/Shanghai
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       # 运行 JDK 配置  https://github.com/marketplace/actions/setup-java-jdk
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: 17
@@ -38,7 +38,7 @@ jobs:
       # Gradle 缓存配置 https://docs.github.com/cn/actions/using-workflows/caching-dependencies-to-speed-up-workflows
       # GitHub 将删除 7 天内未被访问的任何缓存条目。 可以存储的缓存数没有限制，但大小10 GB
       - name: Cache Gradle packages
-        uses: actions/cache@v3
+        uses: actions/cache@v5
         with:
          path: |
            ~/.gradle
@@ -49,7 +49,7 @@ jobs:
         run: ./gradlew  :plugin-image:jar
       - name: Copy libs jar for package
         run:  cp -r plugin-image/libs/  plugin-image/build/libs
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v6
         with:
           path: |
             plugin-image/build/libs

.github/workflows/plugin-location.yml

@@ -26,10 +26,10 @@ jobs:
     steps:
       - run: sudo timedatectl set-timezone Asia/Shanghai
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       # 运行 JDK 配置  https://github.com/marketplace/actions/setup-java-jdk
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: 17
@@ -38,7 +38,7 @@ jobs:
       # Gradle 缓存配置 https://docs.github.com/cn/actions/using-workflows/caching-dependencies-to-speed-up-workflows
       # GitHub 将删除 7 天内未被访问的任何缓存条目。 可以存储的缓存数没有限制，但大小10 GB
       - name: Cache Gradle packages
-        uses: actions/cache@v3
+        uses: actions/cache@v5
         with:
          path: |
            ~/.gradle
@@ -47,7 +47,7 @@ jobs:
          restore-keys: ${{ runner.os }}-gradle
       - name: Run plugin-location jar
         run: ./gradlew  :plugin-location:jar
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v6
         with:
           path: |
             plugin-location/build/libs

.github/workflows/qodana.yml

@@ -7,10 +7,10 @@ jobs:
   qodana:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: Cache Qodana dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v5
         with:
           path: ~/work/_temp/_github_home/qodana-cache
           key: ${{ runner.os }}-qodana-${{ github.ref }}
@@ -21,6 +21,6 @@ jobs:
       - name: Qodana - Code Inspection
         uses: JetBrains/qodana-action@v2.2.1-eap
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v6
         with:
           path: ${{ github.workspace }}/qodana

README-plugin-zh.md

@@ -142,6 +142,12 @@ classloader目前遇到插件resource资源无法加载的问题,临时只能将
 
 ![location](/art/plugin/location.gif)
 
+#### 地图key环境变量 
+
+- 百度 `ToolsFx-Location-KEY-BD`
+- 高德 `ToolsFx-Location-KEY-AMAP`
+- 天地图 `ToolsFx-Location-KEY-TIAN`
+
 ### Compression (压缩)
 
 ### 图片模块

README-zh.md

@@ -344,11 +344,14 @@ bouncy castle文档 https://www.bouncycastle.org/specifications.html
 见 [changelog.md](changelog.md)
 
 ## CREDIT
+[![JetBrains logo.](https://resources.jetbrains.com/storage/products/company/brand/logos/jetbrains.svg)](https://jb.gg/OpenSourceSupport)
 
 [bouncy castle](https://github.com/bcgit/bc-java)
 
 [tornadofx](https://github.com/edvin/tornadofx)
 
+[badge maker](https://shields.io/)
+
 ## DONATE
 
 [赞赏作者](https://afdian.net/a/leon406)

README.md

@@ -18,8 +18,8 @@
 
 <h4 align="center">Visitors :eyes:</h4>
 
-<p align="center"><img src="https://profile-counter.glitch.me/Leon406_ToolsFx/count.svg" alt="ToolsFx :: Visitor's Count" />
- <img width=0 height=0 src="https://profile-counter.glitch.me/Leon406/count.svg" alt="Leon406:: Visitor's Count" />
+<p align="center"><img src="https://api.visitorbadge.io/api/visitors?path=leon406%2Ftoolsfx&countColor=%232ccce4" alt="ToolsFx :: Visitor's Count" />
+ <img width=0 height=0 src="https://api.visitorbadge.io/api/visitors?path=leon406%2Fleon406&countColor=%232ccce4" alt="Leon406:: Visitor's Count" />
 </p>
 
 ------
@@ -330,6 +330,8 @@ see [changelog.md](changelog.md)
 
 ## CREDIT
 
+[![JetBrains logo.](https://resources.jetbrains.com/storage/products/company/brand/logos/jetbrains.svg)](https://jb.gg/OpenSourceSupport)
+
 [bouncy castle](https://github.com/bcgit/bc-java)
 
 [tornadofx](https://github.com/edvin/tornadofx)

app/build.gradle.kts

@@ -4,7 +4,7 @@ import java.time.LocalDate
 
 
 group = "me.leon.tools"
-version = "1.17.0"
+version = "1.19.0"
 
 plugins {
     application
@@ -66,8 +66,8 @@ dependencies {
     implementation(libs.zxing)
     api(libs.gson)
     implementation(libs.nashron)
-    implementation(libs.kotlinx.coroutines)
-    implementation("org.java-websocket:Java-WebSocket:1.5.4")
+    api(libs.kotlinx.coroutines)
+    implementation("org.java-websocket:Java-WebSocket:1.6.0")
     // mp3格式支持
     implementation("com.googlecode.soundlibs:mp3spi:1.9.5.4") {
         exclude(group = "junit")
@@ -80,10 +80,10 @@ dependencies {
     testImplementation(libs.kotlinx.coroutines.test)
     testImplementation(libs.jsoup)
 
-    testImplementation("dnsjava:dnsjava:3.5.2")
+    testImplementation("dnsjava:dnsjava:3.6.3")
 
 //    testImplementation("org.springframework.security:spring-security-web:5.6.2")
     testImplementation("org:jaudiotagger:2.0.3")
     // https://www.atilika.org/
-    testImplementation("com.atilika.kuromoji:kuromoji-ipadic:+")
+    testImplementation("com.atilika.kuromoji:kuromoji-ipadic:0.9.0")
 }

app/src/main/kotlin/me/leon/Constants.kt

@@ -15,7 +15,7 @@ val REG_NUMBER = "\\d+".toRegex()
 val REG_CRACK_HEADER = "\\d+ [\\w)]+(-->\\d+ )?".toRegex()
 
 val build: String
-    get() = "2023/09/20"
+    get() = "2025/12/15"
 
 val appVersion: String
-    get() = "1.17.0"
+    get() = "1.19.0"

app/src/main/kotlin/me/leon/Digests.kt

@@ -66,7 +66,7 @@ val ALGOS_HASH =
                 "512-512",
                 "1024-384",
                 "1024-512",
-                "1024-1024"
+                "1024-1024",
             ),
         "GOST3411" to listOf("256"),
         "GOST3411-2012" to listOf("256", "512"),

app/src/main/kotlin/me/leon/ToolsApp.kt

@@ -108,6 +108,7 @@ class ToolsApp : App(Home::class, Styles::class) {
                     }
                 }
                 println(dict)
+                copyResourceFileIfNotExist("/wordninja_words.txt", WORDNINJA_DICT_FILE)
                 // 提前加载class,进行init
                 Translator.init()
             }

app/src/main/kotlin/me/leon/classical/ADFGX.kt

@@ -8,7 +8,7 @@ fun String.adfgx(
     table: String,
     keyword: String,
     encodeMap: String = ADFGX_ENCODE_MAP,
-    replacePair: Pair<String, String> = "J" to "I"
+    replacePair: Pair<String, String> = "J" to "I",
 ): String {
     val key = keyword.distinct()
     val polybius = polybius(table, encodeMap, replacePair)
@@ -29,7 +29,7 @@ fun String.adfgx(
 fun String.adfgxDecrypt(
     table: String,
     keyword: String,
-    encodeMap: String = ADFGX_ENCODE_MAP
+    encodeMap: String = ADFGX_ENCODE_MAP,
 ): String {
     val key = keyword.distinct()
     val sortedKey = key.sorted()

app/src/main/kotlin/me/leon/classical/AlphabetaIndex.kt

@@ -5,7 +5,7 @@ import me.leon.ext.crypto.TABLE_A_Z
 fun String.alphabetIndex(
     table: String = TABLE_A_Z,
     delimiter: String = " ",
-    fromZero: Boolean = false
+    fromZero: Boolean = false,
 ) =
     uppercase()
         .asIterable()

app/src/main/kotlin/me/leon/classical/AutoKey.kt

@@ -21,7 +21,7 @@ fun String.autoKeyDecrypt(keyword: String): String {
                 .virgeneneDecode(keyBuilder.toString(), keyBuilder.length)
                 .substring(
                     keyBuilder.length - key.length,
-                    keyBuilder.length.takeIf { it < stripText.length } ?: stripText.length
+                    keyBuilder.length.takeIf { it < stripText.length } ?: stripText.length,
                 )
         keyBuilder.append(substring)
     }

app/src/main/kotlin/me/leon/classical/HackWord.kt

@@ -6,14 +6,7 @@ package me.leon.classical
  * @email deadogone@gmail.com
  */
 private val HACKER_DICT =
-    mapOf(
-        "A" to "4",
-        "E" to "3",
-        "I" to "1",
-        "O" to "0",
-        "S" to "5",
-        "T" to "7",
-    )
+    mapOf("A" to "4", "E" to "3", "I" to "1", "O" to "0", "S" to "5", "T" to "7")
 
 private val HACKER_DICT_REVERSE = HACKER_DICT.values.zip(HACKER_DICT.keys).toMap()