From 102efca0991f0cd7a01dbfe2f640c4365e28fb1f Mon Sep 17 00:00:00 2001 From: MistEO Date: Fri, 2 Dec 2022 00:34:32 +0800 Subject: [PATCH] chore: move ffi --- README.md | 6 +++--- README_en-US.md | 6 +++--- README_ja-JP.md | 6 +++--- README_ko-KR.md | 6 +++--- README_zh-TW.md | 6 +++--- src/Golang/{MaaAssistantArknights => }/conf.yaml | 0 src/Golang/{MaaAssistantArknights => }/conf/config.go | 0 src/Golang/{MaaAssistantArknights => }/go.mod | 0 src/Golang/{MaaAssistantArknights => }/go.sum | 0 .../{MaaAssistantArknights => }/internal/api/errors.go | 0 .../{MaaAssistantArknights => }/internal/store/store.go | 0 src/Golang/{MaaAssistantArknights => }/maa/asst_linux.go | 0 src/Golang/{MaaAssistantArknights => }/maa/asst_widows.go | 0 src/Golang/{MaaAssistantArknights => }/maa/hook.go | 0 src/Golang/{MaaAssistantArknights => }/maa/maa.go | 0 src/Golang/{MaaAssistantArknights => }/maa/task.go | 0 src/Golang/{MaaAssistantArknights => }/maa/util.go | 0 src/Golang/{MaaAssistantArknights => }/main.go | 0 .../{MaaAssistantArknights => }/server/http/db/cache.go | 0 .../{MaaAssistantArknights => }/server/http/handler.go | 0 .../server/http/params/params.go | 0 .../{MaaAssistantArknights => }/server/http/router.go | 0 .../{MaaAssistantArknights => }/server/http/server.go | 0 .../{MaaAssistantArknights => }/server/http/task_handler.go | 0 src/Java/{Maaj => }/.gitignore | 0 src/Java/{Maaj => }/Maa-HTTP-Server-startup.bat | 0 src/Java/{Maaj => }/Readme.md | 0 src/Java/{Maaj => }/build.gradle.kts | 0 src/Java/{Maaj => }/gradlew | 0 src/Java/{Maaj => }/gradlew.bat | 0 src/Java/{Maaj => }/settings.gradle.kts | 0 .../src/main/java/com/iguigui/maaj/Application.kt | 0 .../src/main/java/com/iguigui/maaj/dto/msgEnum.kt | 0 .../src/main/java/com/iguigui/maaj/dto/request.kt | 0 .../src/main/java/com/iguigui/maaj/dto/response.kt | 0 .../java/com/iguigui/maaj/easySample/MaaJavaSample.java | 0 .../main/java/com/iguigui/maaj/easySample/MeoAssistant.java | 0 .../src/main/java/com/iguigui/maaj/routing/HttpRouting.kt | 0 .../src/main/java/com/iguigui/maaj/routing/WsRouting.kt | 0 .../src/main/java/com/iguigui/maaj/service/Connection.kt | 0 .../src/main/java/com/iguigui/maaj/service/MaaInstance.kt | 0 .../src/main/java/com/iguigui/maaj/service/MaaService.kt | 0 .../src/main/java/com/iguigui/maaj/util/JsonUtil.kt | 0 src/Java/{Maaj => }/src/main/resources/application.conf | 0 src/Java/{Maaj => }/src/main/resources/log4j2.xml | 0 .../{Maaj => }/src/main/resources/logback-fileAppender.xml | 0 src/Java/{Maaj => }/src/main/resources/logback.xml | 0 .../test/java/com/iguigui/maaj/routing/HttpRoutingKtTest.kt | 0 48 files changed, 15 insertions(+), 15 deletions(-) rename src/Golang/{MaaAssistantArknights => }/conf.yaml (100%) rename src/Golang/{MaaAssistantArknights => }/conf/config.go (100%) rename src/Golang/{MaaAssistantArknights => }/go.mod (100%) rename src/Golang/{MaaAssistantArknights => }/go.sum (100%) rename src/Golang/{MaaAssistantArknights => }/internal/api/errors.go (100%) rename src/Golang/{MaaAssistantArknights => }/internal/store/store.go (100%) rename src/Golang/{MaaAssistantArknights => }/maa/asst_linux.go (100%) rename src/Golang/{MaaAssistantArknights => }/maa/asst_widows.go (100%) rename src/Golang/{MaaAssistantArknights => }/maa/hook.go (100%) rename src/Golang/{MaaAssistantArknights => }/maa/maa.go (100%) rename src/Golang/{MaaAssistantArknights => }/maa/task.go (100%) rename src/Golang/{MaaAssistantArknights => }/maa/util.go (100%) rename src/Golang/{MaaAssistantArknights => }/main.go (100%) rename src/Golang/{MaaAssistantArknights => }/server/http/db/cache.go (100%) rename src/Golang/{MaaAssistantArknights => }/server/http/handler.go (100%) rename src/Golang/{MaaAssistantArknights => }/server/http/params/params.go (100%) rename src/Golang/{MaaAssistantArknights => }/server/http/router.go (100%) rename src/Golang/{MaaAssistantArknights => }/server/http/server.go (100%) rename src/Golang/{MaaAssistantArknights => }/server/http/task_handler.go (100%) rename src/Java/{Maaj => }/.gitignore (100%) rename src/Java/{Maaj => }/Maa-HTTP-Server-startup.bat (100%) rename src/Java/{Maaj => }/Readme.md (100%) rename src/Java/{Maaj => }/build.gradle.kts (100%) rename src/Java/{Maaj => }/gradlew (100%) rename src/Java/{Maaj => }/gradlew.bat (100%) rename src/Java/{Maaj => }/settings.gradle.kts (100%) rename src/Java/{Maaj => }/src/main/java/com/iguigui/maaj/Application.kt (100%) rename src/Java/{Maaj => }/src/main/java/com/iguigui/maaj/dto/msgEnum.kt (100%) rename src/Java/{Maaj => }/src/main/java/com/iguigui/maaj/dto/request.kt (100%) rename src/Java/{Maaj => }/src/main/java/com/iguigui/maaj/dto/response.kt (100%) rename src/Java/{Maaj => }/src/main/java/com/iguigui/maaj/easySample/MaaJavaSample.java (100%) rename src/Java/{Maaj => }/src/main/java/com/iguigui/maaj/easySample/MeoAssistant.java (100%) rename src/Java/{Maaj => }/src/main/java/com/iguigui/maaj/routing/HttpRouting.kt (100%) rename src/Java/{Maaj => }/src/main/java/com/iguigui/maaj/routing/WsRouting.kt (100%) rename src/Java/{Maaj => }/src/main/java/com/iguigui/maaj/service/Connection.kt (100%) rename src/Java/{Maaj => }/src/main/java/com/iguigui/maaj/service/MaaInstance.kt (100%) rename src/Java/{Maaj => }/src/main/java/com/iguigui/maaj/service/MaaService.kt (100%) rename src/Java/{Maaj => }/src/main/java/com/iguigui/maaj/util/JsonUtil.kt (100%) rename src/Java/{Maaj => }/src/main/resources/application.conf (100%) rename src/Java/{Maaj => }/src/main/resources/log4j2.xml (100%) rename src/Java/{Maaj => }/src/main/resources/logback-fileAppender.xml (100%) rename src/Java/{Maaj => }/src/main/resources/logback.xml (100%) rename src/Java/{Maaj => }/src/test/java/com/iguigui/maaj/routing/HttpRoutingKtTest.kt (100%) diff --git a/README.md b/README.md index 1328e9af50..cf0a330391 100644 --- a/README.md +++ b/README.md @@ -145,10 +145,10 @@ MAA 的意思是 MAA Assistant Arknights - [C 接口](include/AsstCaller.h)：[集成示例](src/CppSample/main.cpp) - [Python 接口](src/Python/asst.py)：[集成示例](src/Python/sample.py) -- [Golang 接口](src/Golang/MaaAssistantArknights/)：[集成示例](src/Golang/MaaAssistantArknights/maa/maa.go) +- [Golang 接口](src/Golang/)：[集成示例](src/Golang/maa/maa.go) - [Dart 接口](src/dart/) -- [Java 接口](src/Java/Maaj/src/main/java/com/iguigui/maaj/easySample/MaaCore.java)：[集成示例](src/Java/Maaj/src/main/java/com/iguigui/maaj/easySample/MaaJavaSample.java) -- [Java HTTP 接口](src/Java/Maaj/Readme.md) +- [Java 接口](src/Java/src/main/java/com/iguigui/maaj/easySample/MaaCore.java)：[集成示例](src/Java/src/main/java/com/iguigui/maaj/easySample/MaaJavaSample.java) +- [Java HTTP 接口](src/Java/Readme.md) - [Rust 接口](src/Rust/src/maa_sys/)：[HTTP 接口](src/Rust) - [集成文档](docs/3.1-集成文档.md) - [回调消息协议](docs/3.2-回调消息协议.md) diff --git a/README_en-US.md b/README_en-US.md index ee9e4fbb0a..4ee2eafa65 100644 --- a/README_en-US.md +++ b/README_en-US.md @@ -144,11 +144,11 @@ Please refer to [Linux Tutorial](docs/en-us/2.1-LINUX_TUTORIAL.md) - [C interface](include/AsstCaller.h): [Integration Example](src/CppSample/main.cpp) - [Python interface](src/Python/asst.py): [Integration Example](src/Python/sample.py) -- [Golang interface](src/Golang/MaaAssistantArknights/): [Integration Example](src/Golang/MaaAssistantArknights/maa/maa.go) +- [Golang interface](src/Golang/): [Integration Example](src/Golang/maa/maa.go) - [Dart interface](src/dart/) -- [Java interface](src/Java/Maaj): [Integration Example](src/Java/Maaj/src/main/java/com/iguigui/maaj/MaaJavaSample.java) +- [Java interface](src/Java): [Integration Example](src/Java/src/main/java/com/iguigui/maaj/MaaJavaSample.java) - [Rust interface](src/Rust/src/maa_sys/): [HTTP API](src/Rust) -- [HTTP interface](src/Java/Maaj/Readme.md) +- [HTTP interface](src/Java/Readme.md) - [Integration Documentation](docs/en-us/3.1-INTEGRATION.md) - [Callback Schema](docs/en-us/3.2-CALLBACK_SCHEMA.md) - [Task Schema](docs/en-us/3.4-TASK_SCHEMA.md) diff --git a/README_ja-JP.md b/README_ja-JP.md index 6d4687d823..0a13d028ff 100644 --- a/README_ja-JP.md +++ b/README_ja-JP.md @@ -146,11 +146,11 @@ MAAをより良くするために開発・テストに貢献してくれたす - [Cインターフェース](include/AsstCaller.h)：[統合例](src/CppSample/main.cpp) - [Pythonインターフェース](src/Python/asst.py)：[統合例](src/Python/sample.py) -- [Golangインターフェース](src/Golang/MaaAssistantArknights/)：[統合例](src/Golang/MaaAssistantArknights/maa/maa.go) +- [Golangインターフェース](src/Golang/)：[統合例](src/Golang/maa/maa.go) - [Dartインターフェース](src/dart/) -- [Javaインターフェース](src/Java/Maaj/src/main/java/com/iguigui/maaj/easySample/MaaCore.java)：[統合例](src/Java/Maaj/src/main/java/com/iguigui/maaj/easySample/MaaJavaSample.java) +- [Javaインターフェース](src/Java/src/main/java/com/iguigui/maaj/easySample/MaaCore.java)：[統合例](src/Java/src/main/java/com/iguigui/maaj/easySample/MaaJavaSample.java) - [Rustインターフェース](src/Rust/src/maa_sys/)：[HTTPインターフェース](src/Rust) -- [HTTPインターフェース](src/Java/Maaj/Readme.md) +- [HTTPインターフェース](src/Java/Readme.md) - [統合ドキュメント](docs/ja-jp/3.1-統合ドキュメント.md) - [コールバックAPI](docs/ja-jp/3.2-コールバックAPI.md) - [タスクAPI](docs/ja-jp/3.4-タスクAPI.md) diff --git a/README_ko-KR.md b/README_ko-KR.md index 900f7ab616..fe9b377fcc 100644 --- a/README_ko-KR.md +++ b/README_ko-KR.md @@ -148,11 +148,11 @@ MAA의 개선을 위한 개발/테스트에 기여해준 모든 친구들에게 - [C 인터페이스](include/AsstCaller.h): [통합 예시](src/CppSample/main.cpp) - [Python 인터페이스](src/Python/asst.py): [통합 예시](src/Python/sample.py) -- [Golang 인터페이스](src/Golang/MaaAssistantArknights/): [통합 예시](src/Golang/MaaAssistantArknights/maa/maa.go) +- [Golang 인터페이스](src/Golang/): [통합 예시](src/Golang/maa/maa.go) - [Dart 인터페이스](src/dart/) -- [Java 인터페이스](src/Java/Maaj): [통합 예시](src/Java/Maaj/src/main/java/com/iguigui/maaj/MaaJavaSample.java) +- [Java 인터페이스](src/Java): [통합 예시](src/Java/src/main/java/com/iguigui/maaj/MaaJavaSample.java) - [Rust 인터페이스](src/Rust/src/maa_sys/): [HTTP 인터페이스](src/Rust) -- [HTTP 인터페이스](src/Java/Maaj/Readme.md) +- [HTTP 인터페이스](src/Java/Readme.md) - [통합](docs/ko-kr/3.1-통합.md) - [콜백 형식](docs/ko-kr/3.2-콜백_형식.md) - [임무 형식](docs/ko-kr/3.4-임무_형식.md) diff --git a/README_zh-TW.md b/README_zh-TW.md index d400d4f798..d7a17e5c2c 100644 --- a/README_zh-TW.md +++ b/README_zh-TW.md @@ -144,11 +144,11 @@ MAA 的意思是 MAA Assistant Arknights - [C 介面](include/AsstCaller.h)：[整合示例](src/CppSample/main.cpp) - [Python 介面](src/Python/asst.py)：[整合示例](src/Python/sample.py) -- [Golang 介面](src/Golang/MaaAssistantArknights/)：[整合示例](src/Golang/MaaAssistantArknights/maa/maa.go) +- [Golang 介面](src/Golang/)：[整合示例](src/Golang/maa/maa.go) - [Dart 介面](src/dart/) -- [Java 介面](src/Java/Maaj/src/main/java/com/iguigui/maaj/easySample/MaaCore.java)：[整合示例](src/Java/Maaj/src/main/java/com/iguigui/maaj/easySample/MaaJavaSample.java) +- [Java 介面](src/Java/src/main/java/com/iguigui/maaj/easySample/MaaCore.java)：[整合示例](src/Java/src/main/java/com/iguigui/maaj/easySample/MaaJavaSample.java) - [Rust 介面](src/Rust/src/maa_sys/)：[HTTP 介面](src/Rust) -- [HTTP 介面](src/Java/Maaj/Readme.md) +- [HTTP 介面](src/Java/Readme.md) - [整合文件](docs/zh-tw/3.1-集成文件.md) - [回呼訊息協定](docs/zh-tw/3.2-回呼訊息協定.md) - [任務流程協定](docs/zh-tw/3.4-任務流程協定.md) diff --git a/src/Golang/MaaAssistantArknights/conf.yaml b/src/Golang/conf.yaml similarity index 100% rename from src/Golang/MaaAssistantArknights/conf.yaml rename to src/Golang/conf.yaml diff --git a/src/Golang/MaaAssistantArknights/conf/config.go b/src/Golang/conf/config.go similarity index 100% rename from src/Golang/MaaAssistantArknights/conf/config.go rename to src/Golang/conf/config.go diff --git a/src/Golang/MaaAssistantArknights/go.mod b/src/Golang/go.mod similarity index 100% rename from src/Golang/MaaAssistantArknights/go.mod rename to src/Golang/go.mod diff --git a/src/Golang/MaaAssistantArknights/go.sum b/src/Golang/go.sum similarity index 100% rename from src/Golang/MaaAssistantArknights/go.sum rename to src/Golang/go.sum diff --git a/src/Golang/MaaAssistantArknights/internal/api/errors.go b/src/Golang/internal/api/errors.go similarity index 100% rename from src/Golang/MaaAssistantArknights/internal/api/errors.go rename to src/Golang/internal/api/errors.go diff --git a/src/Golang/MaaAssistantArknights/internal/store/store.go b/src/Golang/internal/store/store.go similarity index 100% rename from src/Golang/MaaAssistantArknights/internal/store/store.go rename to src/Golang/internal/store/store.go diff --git a/src/Golang/MaaAssistantArknights/maa/asst_linux.go b/src/Golang/maa/asst_linux.go similarity index 100% rename from src/Golang/MaaAssistantArknights/maa/asst_linux.go rename to src/Golang/maa/asst_linux.go diff --git a/src/Golang/MaaAssistantArknights/maa/asst_widows.go b/src/Golang/maa/asst_widows.go similarity index 100% rename from src/Golang/MaaAssistantArknights/maa/asst_widows.go rename to src/Golang/maa/asst_widows.go diff --git a/src/Golang/MaaAssistantArknights/maa/hook.go b/src/Golang/maa/hook.go similarity index 100% rename from src/Golang/MaaAssistantArknights/maa/hook.go rename to src/Golang/maa/hook.go diff --git a/src/Golang/MaaAssistantArknights/maa/maa.go b/src/Golang/maa/maa.go similarity index 100% rename from src/Golang/MaaAssistantArknights/maa/maa.go rename to src/Golang/maa/maa.go diff --git a/src/Golang/MaaAssistantArknights/maa/task.go b/src/Golang/maa/task.go similarity index 100% rename from src/Golang/MaaAssistantArknights/maa/task.go rename to src/Golang/maa/task.go diff --git a/src/Golang/MaaAssistantArknights/maa/util.go b/src/Golang/maa/util.go similarity index 100% rename from src/Golang/MaaAssistantArknights/maa/util.go rename to src/Golang/maa/util.go diff --git a/src/Golang/MaaAssistantArknights/main.go b/src/Golang/main.go similarity index 100% rename from src/Golang/MaaAssistantArknights/main.go rename to src/Golang/main.go diff --git a/src/Golang/MaaAssistantArknights/server/http/db/cache.go b/src/Golang/server/http/db/cache.go similarity index 100% rename from src/Golang/MaaAssistantArknights/server/http/db/cache.go rename to src/Golang/server/http/db/cache.go diff --git a/src/Golang/MaaAssistantArknights/server/http/handler.go b/src/Golang/server/http/handler.go similarity index 100% rename from src/Golang/MaaAssistantArknights/server/http/handler.go rename to src/Golang/server/http/handler.go diff --git a/src/Golang/MaaAssistantArknights/server/http/params/params.go b/src/Golang/server/http/params/params.go similarity index 100% rename from src/Golang/MaaAssistantArknights/server/http/params/params.go rename to src/Golang/server/http/params/params.go diff --git a/src/Golang/MaaAssistantArknights/server/http/router.go b/src/Golang/server/http/router.go similarity index 100% rename from src/Golang/MaaAssistantArknights/server/http/router.go rename to src/Golang/server/http/router.go diff --git a/src/Golang/MaaAssistantArknights/server/http/server.go b/src/Golang/server/http/server.go similarity index 100% rename from src/Golang/MaaAssistantArknights/server/http/server.go rename to src/Golang/server/http/server.go diff --git a/src/Golang/MaaAssistantArknights/server/http/task_handler.go b/src/Golang/server/http/task_handler.go similarity index 100% rename from src/Golang/MaaAssistantArknights/server/http/task_handler.go rename to src/Golang/server/http/task_handler.go diff --git a/src/Java/Maaj/.gitignore b/src/Java/.gitignore similarity index 100% rename from src/Java/Maaj/.gitignore rename to src/Java/.gitignore diff --git a/src/Java/Maaj/Maa-HTTP-Server-startup.bat b/src/Java/Maa-HTTP-Server-startup.bat similarity index 100% rename from src/Java/Maaj/Maa-HTTP-Server-startup.bat rename to src/Java/Maa-HTTP-Server-startup.bat diff --git a/src/Java/Maaj/Readme.md b/src/Java/Readme.md similarity index 100% rename from src/Java/Maaj/Readme.md rename to src/Java/Readme.md diff --git a/src/Java/Maaj/build.gradle.kts b/src/Java/build.gradle.kts similarity index 100% rename from src/Java/Maaj/build.gradle.kts rename to src/Java/build.gradle.kts diff --git a/src/Java/Maaj/gradlew b/src/Java/gradlew similarity index 100% rename from src/Java/Maaj/gradlew rename to src/Java/gradlew diff --git a/src/Java/Maaj/gradlew.bat b/src/Java/gradlew.bat similarity index 100% rename from src/Java/Maaj/gradlew.bat rename to src/Java/gradlew.bat diff --git a/src/Java/Maaj/settings.gradle.kts b/src/Java/settings.gradle.kts similarity index 100% rename from src/Java/Maaj/settings.gradle.kts rename to src/Java/settings.gradle.kts diff --git a/src/Java/Maaj/src/main/java/com/iguigui/maaj/Application.kt b/src/Java/src/main/java/com/iguigui/maaj/Application.kt similarity index 100% rename from src/Java/Maaj/src/main/java/com/iguigui/maaj/Application.kt rename to src/Java/src/main/java/com/iguigui/maaj/Application.kt diff --git a/src/Java/Maaj/src/main/java/com/iguigui/maaj/dto/msgEnum.kt b/src/Java/src/main/java/com/iguigui/maaj/dto/msgEnum.kt similarity index 100% rename from src/Java/Maaj/src/main/java/com/iguigui/maaj/dto/msgEnum.kt rename to src/Java/src/main/java/com/iguigui/maaj/dto/msgEnum.kt diff --git a/src/Java/Maaj/src/main/java/com/iguigui/maaj/dto/request.kt b/src/Java/src/main/java/com/iguigui/maaj/dto/request.kt similarity index 100% rename from src/Java/Maaj/src/main/java/com/iguigui/maaj/dto/request.kt rename to src/Java/src/main/java/com/iguigui/maaj/dto/request.kt diff --git a/src/Java/Maaj/src/main/java/com/iguigui/maaj/dto/response.kt b/src/Java/src/main/java/com/iguigui/maaj/dto/response.kt similarity index 100% rename from src/Java/Maaj/src/main/java/com/iguigui/maaj/dto/response.kt rename to src/Java/src/main/java/com/iguigui/maaj/dto/response.kt diff --git a/src/Java/Maaj/src/main/java/com/iguigui/maaj/easySample/MaaJavaSample.java b/src/Java/src/main/java/com/iguigui/maaj/easySample/MaaJavaSample.java similarity index 100% rename from src/Java/Maaj/src/main/java/com/iguigui/maaj/easySample/MaaJavaSample.java rename to src/Java/src/main/java/com/iguigui/maaj/easySample/MaaJavaSample.java diff --git a/src/Java/Maaj/src/main/java/com/iguigui/maaj/easySample/MeoAssistant.java b/src/Java/src/main/java/com/iguigui/maaj/easySample/MeoAssistant.java similarity index 100% rename from src/Java/Maaj/src/main/java/com/iguigui/maaj/easySample/MeoAssistant.java rename to src/Java/src/main/java/com/iguigui/maaj/easySample/MeoAssistant.java diff --git a/src/Java/Maaj/src/main/java/com/iguigui/maaj/routing/HttpRouting.kt b/src/Java/src/main/java/com/iguigui/maaj/routing/HttpRouting.kt similarity index 100% rename from src/Java/Maaj/src/main/java/com/iguigui/maaj/routing/HttpRouting.kt rename to src/Java/src/main/java/com/iguigui/maaj/routing/HttpRouting.kt diff --git a/src/Java/Maaj/src/main/java/com/iguigui/maaj/routing/WsRouting.kt b/src/Java/src/main/java/com/iguigui/maaj/routing/WsRouting.kt similarity index 100% rename from src/Java/Maaj/src/main/java/com/iguigui/maaj/routing/WsRouting.kt rename to src/Java/src/main/java/com/iguigui/maaj/routing/WsRouting.kt diff --git a/src/Java/Maaj/src/main/java/com/iguigui/maaj/service/Connection.kt b/src/Java/src/main/java/com/iguigui/maaj/service/Connection.kt similarity index 100% rename from src/Java/Maaj/src/main/java/com/iguigui/maaj/service/Connection.kt rename to src/Java/src/main/java/com/iguigui/maaj/service/Connection.kt diff --git a/src/Java/Maaj/src/main/java/com/iguigui/maaj/service/MaaInstance.kt b/src/Java/src/main/java/com/iguigui/maaj/service/MaaInstance.kt similarity index 100% rename from src/Java/Maaj/src/main/java/com/iguigui/maaj/service/MaaInstance.kt rename to src/Java/src/main/java/com/iguigui/maaj/service/MaaInstance.kt diff --git a/src/Java/Maaj/src/main/java/com/iguigui/maaj/service/MaaService.kt b/src/Java/src/main/java/com/iguigui/maaj/service/MaaService.kt similarity index 100% rename from src/Java/Maaj/src/main/java/com/iguigui/maaj/service/MaaService.kt rename to src/Java/src/main/java/com/iguigui/maaj/service/MaaService.kt diff --git a/src/Java/Maaj/src/main/java/com/iguigui/maaj/util/JsonUtil.kt b/src/Java/src/main/java/com/iguigui/maaj/util/JsonUtil.kt similarity index 100% rename from src/Java/Maaj/src/main/java/com/iguigui/maaj/util/JsonUtil.kt rename to src/Java/src/main/java/com/iguigui/maaj/util/JsonUtil.kt diff --git a/src/Java/Maaj/src/main/resources/application.conf b/src/Java/src/main/resources/application.conf similarity index 100% rename from src/Java/Maaj/src/main/resources/application.conf rename to src/Java/src/main/resources/application.conf diff --git a/src/Java/Maaj/src/main/resources/log4j2.xml b/src/Java/src/main/resources/log4j2.xml similarity index 100% rename from src/Java/Maaj/src/main/resources/log4j2.xml rename to src/Java/src/main/resources/log4j2.xml diff --git a/src/Java/Maaj/src/main/resources/logback-fileAppender.xml b/src/Java/src/main/resources/logback-fileAppender.xml similarity index 100% rename from src/Java/Maaj/src/main/resources/logback-fileAppender.xml rename to src/Java/src/main/resources/logback-fileAppender.xml diff --git a/src/Java/Maaj/src/main/resources/logback.xml b/src/Java/src/main/resources/logback.xml similarity index 100% rename from src/Java/Maaj/src/main/resources/logback.xml rename to src/Java/src/main/resources/logback.xml diff --git a/src/Java/Maaj/src/test/java/com/iguigui/maaj/routing/HttpRoutingKtTest.kt b/src/Java/src/test/java/com/iguigui/maaj/routing/HttpRoutingKtTest.kt similarity index 100% rename from src/Java/Maaj/src/test/java/com/iguigui/maaj/routing/HttpRoutingKtTest.kt rename to src/Java/src/test/java/com/iguigui/maaj/routing/HttpRoutingKtTest.kt