From d7c1f87a596472afa3de83d65f60cffc86c32d3a Mon Sep 17 00:00:00 2001 From: guigui Date: Mon, 23 May 2022 23:55:39 +0800 Subject: [PATCH] Maa HTTP Server --- src/Java/Maaj/build.gradle.kts | 20 +++++++++++++++++++ src/Java/Maaj/settings.gradle.kts | 14 +++++++++++++ .../src/main/java/com/iguigui/maaj/Starter.kt | 5 +++++ .../maaj/{ => easySample}/MaaJavaSample.java | 4 ++-- .../maaj/{ => easySample}/MeoAssistant.java | 2 +- .../com/iguigui/maaj/service/MaaService.kt | 20 +++++++++++++++++++ 6 files changed, 62 insertions(+), 3 deletions(-) create mode 100644 src/Java/Maaj/src/main/java/com/iguigui/maaj/Starter.kt rename src/Java/Maaj/src/main/java/com/iguigui/maaj/{ => easySample}/MaaJavaSample.java (95%) rename src/Java/Maaj/src/main/java/com/iguigui/maaj/{ => easySample}/MeoAssistant.java (98%) create mode 100644 src/Java/Maaj/src/main/java/com/iguigui/maaj/service/MaaService.kt diff --git a/src/Java/Maaj/build.gradle.kts b/src/Java/Maaj/build.gradle.kts index 2455e9477f..f1c64f1180 100644 --- a/src/Java/Maaj/build.gradle.kts +++ b/src/Java/Maaj/build.gradle.kts @@ -1,18 +1,38 @@ +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + plugins { id("java") + kotlin("jvm") version "1.6.10" + kotlin("plugin.serialization") version "1.6.10" + id("io.spring.dependency-management") version "1.0.10.RELEASE" + id("org.springframework.boot") version "2.4.0-SNAPSHOT" } version = "1.0-SNAPSHOT" repositories { mavenCentral() + maven { url = uri("https://repo.spring.io/milestone") } + maven { url = uri("https://repo.spring.io/snapshot") } } dependencies { //JNA implementation("net.java.dev.jna:jna:5.11.0") + implementation("org.springframework.boot:spring-boot-starter-web") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.3") + implementation( "org.jetbrains.kotlin:kotlin-reflect:1.6.10") + implementation(kotlin("stdlib-jdk8")) } tasks.getByName("test") { useJUnitPlatform() } +val compileKotlin: KotlinCompile by tasks +compileKotlin.kotlinOptions { + jvmTarget = "1.8" +} +val compileTestKotlin: KotlinCompile by tasks +compileTestKotlin.kotlinOptions { + jvmTarget = "1.8" +} diff --git a/src/Java/Maaj/settings.gradle.kts b/src/Java/Maaj/settings.gradle.kts index 2225483988..57b2c22ee6 100644 --- a/src/Java/Maaj/settings.gradle.kts +++ b/src/Java/Maaj/settings.gradle.kts @@ -1,2 +1,16 @@ +pluginManagement { + repositories { + maven { url = uri("https://repo.spring.io/milestone") } + maven { url = uri("https://repo.spring.io/snapshot") } + gradlePluginPortal() + } + resolutionStrategy { + eachPlugin { + if (requested.id.id == "org.springframework.boot") { + useModule("org.springframework.boot:spring-boot-gradle-plugin:${requested.version}") + } + } + } +} rootProject.name = "Maaj" diff --git a/src/Java/Maaj/src/main/java/com/iguigui/maaj/Starter.kt b/src/Java/Maaj/src/main/java/com/iguigui/maaj/Starter.kt new file mode 100644 index 0000000000..28404186bd --- /dev/null +++ b/src/Java/Maaj/src/main/java/com/iguigui/maaj/Starter.kt @@ -0,0 +1,5 @@ +package com.iguigui.maaj + +fun main() { + println("Hello world !") +} diff --git a/src/Java/Maaj/src/main/java/com/iguigui/maaj/MaaJavaSample.java b/src/Java/Maaj/src/main/java/com/iguigui/maaj/easySample/MaaJavaSample.java similarity index 95% rename from src/Java/Maaj/src/main/java/com/iguigui/maaj/MaaJavaSample.java rename to src/Java/Maaj/src/main/java/com/iguigui/maaj/easySample/MaaJavaSample.java index 92d5383dbb..9a8de744a4 100644 --- a/src/Java/Maaj/src/main/java/com/iguigui/maaj/MaaJavaSample.java +++ b/src/Java/Maaj/src/main/java/com/iguigui/maaj/easySample/MaaJavaSample.java @@ -1,4 +1,4 @@ -package com.iguigui.maaj; +package com.iguigui.maaj.easySample; import com.sun.jna.Native; import com.sun.jna.Pointer; @@ -8,7 +8,7 @@ import java.util.Scanner; public class MaaJavaSample { /** - * Maa的Java调用实例实现,项目需依赖JNA库。 + * Maa的Java调用实例实现,最简示例仅需依赖第三方JNA库。 * 仅在Windows下进行过测试,未在Linux下测试过(相信强大的Linux用户自己可以解决问题! * * --------特别提醒---------- diff --git a/src/Java/Maaj/src/main/java/com/iguigui/maaj/MeoAssistant.java b/src/Java/Maaj/src/main/java/com/iguigui/maaj/easySample/MeoAssistant.java similarity index 98% rename from src/Java/Maaj/src/main/java/com/iguigui/maaj/MeoAssistant.java rename to src/Java/Maaj/src/main/java/com/iguigui/maaj/easySample/MeoAssistant.java index 3802ea04e0..d188eb5d3f 100644 --- a/src/Java/Maaj/src/main/java/com/iguigui/maaj/MeoAssistant.java +++ b/src/Java/Maaj/src/main/java/com/iguigui/maaj/easySample/MeoAssistant.java @@ -1,4 +1,4 @@ -package com.iguigui.maaj; +package com.iguigui.maaj.easySample; import com.sun.jna.Pointer; import com.sun.jna.win32.StdCallLibrary; diff --git a/src/Java/Maaj/src/main/java/com/iguigui/maaj/service/MaaService.kt b/src/Java/Maaj/src/main/java/com/iguigui/maaj/service/MaaService.kt new file mode 100644 index 0000000000..1236c364c3 --- /dev/null +++ b/src/Java/Maaj/src/main/java/com/iguigui/maaj/service/MaaService.kt @@ -0,0 +1,20 @@ +package com.iguigui.maaj.service + +import com.iguigui.maaj.easySample.MeoAssistant +import org.springframework.context.annotation.Bean +import org.springframework.stereotype.Component +import org.springframework.stereotype.Service +import java.util.concurrent.atomic.AtomicBoolean + +@Service +class MaaService { + + lateinit var meoAssistant: MeoAssistant + + var initFlag: AtomicBoolean = AtomicBoolean(false) + + fun loadSource() { + + } + +}