diff --git a/.gitignore b/.gitignore index 840577e..9698d9b 100644 --- a/.gitignore +++ b/.gitignore @@ -16,4 +16,6 @@ gradle-app.setting .idea/ cache error.log -gradle/ \ No newline at end of file +gradle/ +target +logs diff --git a/build.gradle b/build.gradle deleted file mode 100644 index fbc64b9..0000000 --- a/build.gradle +++ /dev/null @@ -1,33 +0,0 @@ -plugins { - id 'java-library' - id 'com.github.johnrengelman.shadow' version '6.1.0' -} - - -group 'icu.namophice' -version '1.0-SNAPSHOT' -description = 'slow' -sourceCompatibility = JavaVersion.VERSION_11 - -repositories { - mavenLocal() - mavenCentral() -} - -dependencies { - implementation group: 'com.alibaba', name: 'fastjson', version: '1.2.76' - // RaspbarryPi驱动接口核心包 - implementation group: 'com.pi4j', name: 'pi4j-core', version: '1.4' -} - -tasks.withType(JavaCompile) { - options.encoding = 'UTF-8' -} - -jar { - manifest { - attributes( - 'Main-Class': 'icu.namophice.inkphotoalbum.Main' - ) - } -} diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..b8c84a2 --- /dev/null +++ b/pom.xml @@ -0,0 +1,30 @@ + + + 4.0.0 + + icu.namophice + ink-photo-album + 1.0-SNAPSHOT + + + 17 + 17 + UTF-8 + + + + + com.alibaba.fastjson2 + fastjson2 + 2.0.23 + + + com.pi4j + pi4j-core + 1.4 + + + + \ No newline at end of file diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index 08ebb9d..0000000 --- a/settings.gradle +++ /dev/null @@ -1,2 +0,0 @@ -rootProject.name = 'ink-photo-album' - diff --git a/src/main/java/icu/namophice/inkphotoalbum/config/DefaultConfig.java b/src/main/java/icu/namophice/inkphotoalbum/config/DefaultConfig.java index 3deb7bb..8bc0fde 100644 --- a/src/main/java/icu/namophice/inkphotoalbum/config/DefaultConfig.java +++ b/src/main/java/icu/namophice/inkphotoalbum/config/DefaultConfig.java @@ -1,6 +1,6 @@ package icu.namophice.inkphotoalbum.config; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import icu.namophice.inkphotoalbum.utils.CommonUtil; import java.io.*;