From 19427b07190425f3834346947b6c84b1e079ac47 Mon Sep 17 00:00:00 2001 From: zip8919 <2100271556@qq.com> Date: Sun, 19 Oct 2025 09:47:25 +0800 Subject: [PATCH 1/5] =?UTF-8?q?```=20fix(database):=20=E5=A4=84=E7=90=86?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E6=9F=A5=E8=AF=A2=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E7=A9=BA=E5=80=BC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在 CdkLogDao 和 CdkRecordDao 中，增加对可能为 null 的字段的判断，避免空指针异常。 同时修改数据库表结构中 note 字段的定义，去掉默认值约束以保持一致性。 ``` --- .../org/baicaizhale/cDKer/database/CdkLogDao.java | 5 ++++- .../baicaizhale/cDKer/database/CdkRecordDao.java | 14 ++++++++++++-- .../cDKer/database/DatabaseManager.java | 2 +- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/baicaizhale/cDKer/database/CdkLogDao.java b/src/main/java/org/baicaizhale/cDKer/database/CdkLogDao.java index aedb437..f36a2e4 100644 --- a/src/main/java/org/baicaizhale/cDKer/database/CdkLogDao.java +++ b/src/main/java/org/baicaizhale/cDKer/database/CdkLogDao.java @@ -113,7 +113,10 @@ private CdkLog extractCdkLog(ResultSet rs) throws SQLException { log.setPlayerUUID(rs.getString("player_uuid")); log.setCdkCode(rs.getString("cdk_code")); log.setCdkType(rs.getString("cdk_type")); - log.setCommandsExecuted(rs.getString("commands_executed")); + + String commandsExecuted = rs.getString("commands_executed"); + log.setCommandsExecuted(commandsExecuted != null ? commandsExecuted : ""); + log.setUseTime(rs.getTimestamp("use_time")); return log; } diff --git a/src/main/java/org/baicaizhale/cDKer/database/CdkRecordDao.java b/src/main/java/org/baicaizhale/cDKer/database/CdkRecordDao.java index 483f318..d507cf6 100644 --- a/src/main/java/org/baicaizhale/cDKer/database/CdkRecordDao.java +++ b/src/main/java/org/baicaizhale/cDKer/database/CdkRecordDao.java @@ -130,9 +130,19 @@ private CdkRecord extractCdkRecord(ResultSet rs) throws SQLException { record.setId(rs.getInt("id")); record.setCdkCode(rs.getString("cdk_code")); record.setRemainingUses(rs.getInt("remaining_uses")); - record.setCommands(Arrays.asList(rs.getString("commands").split("\\|"))); + + String commandsStr = rs.getString("commands"); + if (commandsStr != null) { + record.setCommands(Arrays.asList(commandsStr.split("\\|"))); + } else { + record.setCommands(new ArrayList<>()); + } + record.setExpireTime(rs.getString("expire_time")); - record.setNote(rs.getString("note")); + + String note = rs.getString("note"); + record.setNote(note != null ? note : ""); + record.setCdkType(rs.getString("cdk_type")); record.setCreatedTime(rs.getTimestamp("created_time")); try { diff --git a/src/main/java/org/baicaizhale/cDKer/database/DatabaseManager.java b/src/main/java/org/baicaizhale/cDKer/database/DatabaseManager.java index 9b88e6a..9dd8c48 100644 --- a/src/main/java/org/baicaizhale/cDKer/database/DatabaseManager.java +++ b/src/main/java/org/baicaizhale/cDKer/database/DatabaseManager.java @@ -93,7 +93,7 @@ private void initializeTables() { "remaining_uses INTEGER DEFAULT 1," + "commands TEXT NOT NULL," + "expire_time VARCHAR(20) DEFAULT 'forever'," + - "note TEXT DEFAULT ''," + + "note TEXT," + "cdk_type VARCHAR(50) DEFAULT ''," + "per_player_multiple BOOLEAN DEFAULT FALSE," + "created_time DATETIME DEFAULT CURRENT_TIMESTAMP" + From 1940199371006e139c0fbae34f18e37b50451f93 Mon Sep 17 00:00:00 2001 From: zip8919 <2100271556@qq.com> Date: Sun, 19 Oct 2025 10:20:05 +0800 Subject: [PATCH 2/5] =?UTF-8?q?```=20build(pom.xml):=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E7=89=88=E6=9C=AC=E5=B9=B6=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=20SLF4J=20=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 Spigot API 版本固定为 1.20.1-R0.1-SNAPSHOT - 添加 slf4j-simple 依赖用于日志记录 - 回退 HikariCP、sqlite-jdbc、mysql-connector-j 和 Lombok 的版本 - 简化数据库访问对象中的字符串处理逻辑 ``` --- .vscode/settings.json | 11 +---------- pom.xml | 17 ++++++++++++----- .../baicaizhale/cDKer/database/CdkLogDao.java | 5 +---- .../cDKer/database/CdkRecordDao.java | 14 ++------------ 4 files changed, 16 insertions(+), 31 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 9e1f452..c5f3f6b 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,12 +1,3 @@ { - "java.jdt.ls.java.home": "C:\\Users\\baicaizhale\\.jdks\\jdk-17.0.14", - "java.configuration.runtimes": [ - { - "name": "JavaSE-17", - "path": "C:\\Users\\baicaizhale\\.jdks\\jdk-17.0.14", - "default": true - } - ], - "java.compile.nullAnalysis.mode": "automatic", - "java.configuration.updateBuildConfiguration": "interactive" + "java.configuration.updateBuildConfiguration": "interactive" } \ No newline at end of file diff --git a/pom.xml b/pom.xml index 7f80f11..40be05f 100644 --- a/pom.xml +++ b/pom.xml @@ -76,36 +76,43 @@ org.spigotmc spigot-api - [1.18-R0.1,1.21-R0.1] + 1.20.1-R0.1-SNAPSHOT provided + + + org.slf4j + slf4j-simple + 1.7.36 + + com.zaxxer HikariCP - 5.1.0 + 5.0.1 org.xerial sqlite-jdbc - 3.45.1.0 + 3.42.0.0 com.mysql mysql-connector-j - 8.3.0 + 8.0.33 org.projectlombok lombok - 1.18.32 + 1.18.30 provided diff --git a/src/main/java/org/baicaizhale/cDKer/database/CdkLogDao.java b/src/main/java/org/baicaizhale/cDKer/database/CdkLogDao.java index f36a2e4..aedb437 100644 --- a/src/main/java/org/baicaizhale/cDKer/database/CdkLogDao.java +++ b/src/main/java/org/baicaizhale/cDKer/database/CdkLogDao.java @@ -113,10 +113,7 @@ private CdkLog extractCdkLog(ResultSet rs) throws SQLException { log.setPlayerUUID(rs.getString("player_uuid")); log.setCdkCode(rs.getString("cdk_code")); log.setCdkType(rs.getString("cdk_type")); - - String commandsExecuted = rs.getString("commands_executed"); - log.setCommandsExecuted(commandsExecuted != null ? commandsExecuted : ""); - + log.setCommandsExecuted(rs.getString("commands_executed")); log.setUseTime(rs.getTimestamp("use_time")); return log; } diff --git a/src/main/java/org/baicaizhale/cDKer/database/CdkRecordDao.java b/src/main/java/org/baicaizhale/cDKer/database/CdkRecordDao.java index d507cf6..483f318 100644 --- a/src/main/java/org/baicaizhale/cDKer/database/CdkRecordDao.java +++ b/src/main/java/org/baicaizhale/cDKer/database/CdkRecordDao.java @@ -130,19 +130,9 @@ private CdkRecord extractCdkRecord(ResultSet rs) throws SQLException { record.setId(rs.getInt("id")); record.setCdkCode(rs.getString("cdk_code")); record.setRemainingUses(rs.getInt("remaining_uses")); - - String commandsStr = rs.getString("commands"); - if (commandsStr != null) { - record.setCommands(Arrays.asList(commandsStr.split("\\|"))); - } else { - record.setCommands(new ArrayList<>()); - } - + record.setCommands(Arrays.asList(rs.getString("commands").split("\\|"))); record.setExpireTime(rs.getString("expire_time")); - - String note = rs.getString("note"); - record.setNote(note != null ? note : ""); - + record.setNote(rs.getString("note")); record.setCdkType(rs.getString("cdk_type")); record.setCreatedTime(rs.getTimestamp("created_time")); try { From 36ebc063ec21a0e4b77e041d6b8023d1f20361c3 Mon Sep 17 00:00:00 2001 From: zip8919 <2100271556@qq.com> Date: Sun, 19 Oct 2025 10:26:47 +0800 Subject: [PATCH 3/5] =?UTF-8?q?```=20build(pom.xml):=20=E6=9B=B4=E6=96=B0S?= =?UTF-8?q?pigot=E4=BB=93=E5=BA=93=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 为Spigot仓库添加release和snapshot版本支持，并更新仓库ID为spigot-repo ``` --- .mvn/wrapper/maven-wrapper.properties | 18 +++ mvnw.cmd | 205 ++++++++++++++++++++++++++ pom.xml | 9 +- spigot-settings.xml | 13 ++ 4 files changed, 244 insertions(+), 1 deletion(-) create mode 100644 .mvn/wrapper/maven-wrapper.properties create mode 100644 mvnw.cmd create mode 100644 spigot-settings.xml diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..d4ec083 --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.4/apache-maven-3.9.4-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar \ No newline at end of file diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 0000000..ee035b3 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,205 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.2.0 +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* +if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %WRAPPER_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM If specified, validate the SHA-256 sum of the Maven wrapper jar file +SET WRAPPER_SHA_256_SUM="" +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperSha256Sum" SET WRAPPER_SHA_256_SUM=%%B +) +IF NOT %WRAPPER_SHA_256_SUM%=="" ( + powershell -Command "&{"^ + "$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^ + "If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^ + " Write-Output 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^ + " Write-Output 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^ + " Write-Output 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^ + " exit 1;"^ + "}"^ + "}" + if ERRORLEVEL 1 goto error +) + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% ^ + %JVM_CONFIG_MAVEN_PROPS% ^ + %MAVEN_OPTS% ^ + %MAVEN_DEBUG_OPTS% ^ + -classpath %WRAPPER_JAR% ^ + "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ + %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" +if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%"=="on" pause + +if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% + +cmd /C exit /B %ERROR_CODE% \ No newline at end of file diff --git a/pom.xml b/pom.xml index 40be05f..65c4b12 100644 --- a/pom.xml +++ b/pom.xml @@ -61,9 +61,16 @@ + - spigotmc-repo + spigot-repo https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + true + + + true + sonatype diff --git a/spigot-settings.xml b/spigot-settings.xml new file mode 100644 index 0000000..4b20619 --- /dev/null +++ b/spigot-settings.xml @@ -0,0 +1,13 @@ + + + + + aliyun + *,!spigot-repo + 阿里云公共仓库 + https://maven.aliyun.com/repository/public + + + \ No newline at end of file From 12fcbc59fda034c7a42d6b60ad5ccedf6415a4bb Mon Sep 17 00:00:00 2001 From: zip8919 <2100271556@qq.com> Date: Sun, 19 Oct 2025 10:28:08 +0800 Subject: [PATCH 4/5] =?UTF-8?q?build(maven):=20=E7=A7=BB=E9=99=A4=20Maven?= =?UTF-8?q?=20Wrapper=20=E7=9B=B8=E5=85=B3=E6=96=87=E4=BB=B6=E5=92=8C?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 移除了项目中的 Maven Wrapper 文件，包括： - .mvn/wrapper/maven-wrapper.properties - mvnw.cmd - spigot-settings.xml 这些文件通常用于统一构建环境，但当前项目决定不再使用 Maven Wrapper， 而是依赖开发者本地安装的 Maven 环境进行构建。 --- .mvn/wrapper/maven-wrapper.properties | 18 --- mvnw.cmd | 205 -------------------------- spigot-settings.xml | 13 -- 3 files changed, 236 deletions(-) delete mode 100644 .mvn/wrapper/maven-wrapper.properties delete mode 100644 mvnw.cmd delete mode 100644 spigot-settings.xml diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties deleted file mode 100644 index d4ec083..0000000 --- a/.mvn/wrapper/maven-wrapper.properties +++ /dev/null @@ -1,18 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.4/apache-maven-3.9.4-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar \ No newline at end of file diff --git a/mvnw.cmd b/mvnw.cmd deleted file mode 100644 index ee035b3..0000000 --- a/mvnw.cmd +++ /dev/null @@ -1,205 +0,0 @@ -@REM ---------------------------------------------------------------------------- -@REM Licensed to the Apache Software Foundation (ASF) under one -@REM or more contributor license agreements. See the NOTICE file -@REM distributed with this work for additional information -@REM regarding copyright ownership. The ASF licenses this file -@REM to you under the Apache License, Version 2.0 (the -@REM "License"); you may not use this file except in compliance -@REM with the License. You may obtain a copy of the License at -@REM -@REM http://www.apache.org/licenses/LICENSE-2.0 -@REM -@REM Unless required by applicable law or agreed to in writing, -@REM software distributed under the License is distributed on an -@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -@REM KIND, either express or implied. See the License for the -@REM specific language governing permissions and limitations -@REM under the License. -@REM ---------------------------------------------------------------------------- - -@REM ---------------------------------------------------------------------------- -@REM Apache Maven Wrapper startup batch script, version 3.2.0 -@REM -@REM Required ENV vars: -@REM JAVA_HOME - location of a JDK home dir -@REM -@REM Optional ENV vars -@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands -@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending -@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven -@REM e.g. to debug Maven itself, use -@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files -@REM ---------------------------------------------------------------------------- - -@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' -@echo off -@REM set title of command window -title %0 -@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' -@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% - -@REM set %HOME% to equivalent of $HOME -if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") - -@REM Execute a user defined script before this one -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre -@REM check for pre script, once with legacy .bat ending and once with .cmd ending -if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* -if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* -:skipRcPre - -@setlocal - -set ERROR_CODE=0 - -@REM To isolate internal variables from possible post scripts, we use another setlocal -@setlocal - -@REM ==== START VALIDATION ==== -if not "%JAVA_HOME%" == "" goto OkJHome - -echo. -echo Error: JAVA_HOME not found in your environment. >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -:OkJHome -if exist "%JAVA_HOME%\bin\java.exe" goto init - -echo. -echo Error: JAVA_HOME is set to an invalid directory. >&2 -echo JAVA_HOME = "%JAVA_HOME%" >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -@REM ==== END VALIDATION ==== - -:init - -@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". -@REM Fallback to current working directory if not found. - -set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% -IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir - -set EXEC_DIR=%CD% -set WDIR=%EXEC_DIR% -:findBaseDir -IF EXIST "%WDIR%"\.mvn goto baseDirFound -cd .. -IF "%WDIR%"=="%CD%" goto baseDirNotFound -set WDIR=%CD% -goto findBaseDir - -:baseDirFound -set MAVEN_PROJECTBASEDIR=%WDIR% -cd "%EXEC_DIR%" -goto endDetectBaseDir - -:baseDirNotFound -set MAVEN_PROJECTBASEDIR=%EXEC_DIR% -cd "%EXEC_DIR%" - -:endDetectBaseDir - -IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig - -@setlocal EnableExtensions EnableDelayedExpansion -for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a -@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% - -:endReadAdditionalConfig - -SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" -set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" -set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" - -FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( - IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B -) - -@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central -@REM This allows using the maven wrapper in projects that prohibit checking in binary data. -if exist %WRAPPER_JAR% ( - if "%MVNW_VERBOSE%" == "true" ( - echo Found %WRAPPER_JAR% - ) -) else ( - if not "%MVNW_REPOURL%" == "" ( - SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" - ) - if "%MVNW_VERBOSE%" == "true" ( - echo Couldn't find %WRAPPER_JAR%, downloading it ... - echo Downloading from: %WRAPPER_URL% - ) - - powershell -Command "&{"^ - "$webclient = new-object System.Net.WebClient;"^ - "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ - "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ - "}"^ - "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^ - "}" - if "%MVNW_VERBOSE%" == "true" ( - echo Finished downloading %WRAPPER_JAR% - ) -) -@REM End of extension - -@REM If specified, validate the SHA-256 sum of the Maven wrapper jar file -SET WRAPPER_SHA_256_SUM="" -FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( - IF "%%A"=="wrapperSha256Sum" SET WRAPPER_SHA_256_SUM=%%B -) -IF NOT %WRAPPER_SHA_256_SUM%=="" ( - powershell -Command "&{"^ - "$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^ - "If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^ - " Write-Output 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^ - " Write-Output 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^ - " Write-Output 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^ - " exit 1;"^ - "}"^ - "}" - if ERRORLEVEL 1 goto error -) - -@REM Provide a "standardized" way to retrieve the CLI args that will -@REM work with both Windows and non-Windows executions. -set MAVEN_CMD_LINE_ARGS=%* - -%MAVEN_JAVA_EXE% ^ - %JVM_CONFIG_MAVEN_PROPS% ^ - %MAVEN_OPTS% ^ - %MAVEN_DEBUG_OPTS% ^ - -classpath %WRAPPER_JAR% ^ - "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ - %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* -if ERRORLEVEL 1 goto error -goto end - -:error -set ERROR_CODE=1 - -:end -@endlocal & set ERROR_CODE=%ERROR_CODE% - -if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost -@REM check for post script, once with legacy .bat ending and once with .cmd ending -if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" -if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" -:skipRcPost - -@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' -if "%MAVEN_BATCH_PAUSE%"=="on" pause - -if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% - -cmd /C exit /B %ERROR_CODE% \ No newline at end of file diff --git a/spigot-settings.xml b/spigot-settings.xml deleted file mode 100644 index 4b20619..0000000 --- a/spigot-settings.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - aliyun - *,!spigot-repo - 阿里云公共仓库 - https://maven.aliyun.com/repository/public - - - \ No newline at end of file From 4ff4506c5b3eddad60cbc15d8b6068ea44b7ef5b Mon Sep 17 00:00:00 2001 From: zip8919 <2100271556@qq.com> Date: Sun, 19 Oct 2025 10:51:33 +0800 Subject: [PATCH 5/5] =?UTF-8?q?chore(vscode):=20=E7=A7=BB=E9=99=A4Java?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=9B=B4=E6=96=B0=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 移除了.vscode/settings.json文件中不必要的Java配置更新设置项，该设置将由IDE自动管理。 --- .vscode/settings.json | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index c5f3f6b..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "java.configuration.updateBuildConfiguration": "interactive" -} \ No newline at end of file