diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 4875a21..0549b8a 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -2,17 +2,22 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml index d2b2105..b7c3c07 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -3,6 +3,8 @@ + + diff --git a/api-passenger/pom.xml b/api-passenger/pom.xml index 0efc0bc..13373f5 100644 --- a/api-passenger/pom.xml +++ b/api-passenger/pom.xml @@ -21,5 +21,27 @@ spring-boot-starter-web + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + \ No newline at end of file diff --git a/api-passenger/src/main/java/com/kaiupup/ApiPassengerApplication.java b/api-passenger/src/main/java/com/kaiupup/apipassenger/ApiPassengerApplication.java similarity index 93% rename from api-passenger/src/main/java/com/kaiupup/ApiPassengerApplication.java rename to api-passenger/src/main/java/com/kaiupup/apipassenger/ApiPassengerApplication.java index 728ee51..f03d123 100644 --- a/api-passenger/src/main/java/com/kaiupup/ApiPassengerApplication.java +++ b/api-passenger/src/main/java/com/kaiupup/apipassenger/ApiPassengerApplication.java @@ -1,4 +1,4 @@ -package com.kaiupup; +package com.kaiupup.apipassenger; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/api-passenger/src/main/java/com/kaiupup/apipassenger/controller/TestController.java b/api-passenger/src/main/java/com/kaiupup/apipassenger/controller/TestController.java new file mode 100644 index 0000000..95fb98d --- /dev/null +++ b/api-passenger/src/main/java/com/kaiupup/apipassenger/controller/TestController.java @@ -0,0 +1,24 @@ +package com.kaiupup.apipassenger.controller; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @projectName: online-taxi-public + * @package: com.kaiupup.controller + * @className: TestController + * @author: kaiupup + * @description: TODO + * @date: 2023/7/23 16:16 + * @version: 1.0 + */ + +@RestController +public class TestController { + + @GetMapping("/test") + public String firstTest(){ + return "ok"; + } + +} diff --git a/api-passenger/src/main/resources/application.yml b/api-passenger/src/main/resources/application.yml new file mode 100644 index 0000000..584f00c --- /dev/null +++ b/api-passenger/src/main/resources/application.yml @@ -0,0 +1,13 @@ +server: + port: 8081 +spring: + cloud: + nacos: + discovery: + server-addr: 127.0.0.1:8848 + application: + name: api-passenger + redis: + host: 127.0.0.1 + port: 6379 + database: 0 \ No newline at end of file diff --git a/api-passenger/target/api-passenger-1.0-SNAPSHOT.jar b/api-passenger/target/api-passenger-1.0-SNAPSHOT.jar index 9a2a073..6f0689b 100644 Binary files a/api-passenger/target/api-passenger-1.0-SNAPSHOT.jar and b/api-passenger/target/api-passenger-1.0-SNAPSHOT.jar differ diff --git a/api-passenger/target/maven-archiver/pom.properties b/api-passenger/target/maven-archiver/pom.properties index 16527c2..9cffe24 100644 --- a/api-passenger/target/maven-archiver/pom.properties +++ b/api-passenger/target/maven-archiver/pom.properties @@ -1,5 +1,3 @@ -#Generated by Maven -#Tue Jul 18 22:21:30 CST 2023 -version=1.0-SNAPSHOT -groupId=com.kaiupup artifactId=api-passenger +groupId=com.kaiupup +version=1.0-SNAPSHOT diff --git a/api-passenger/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/api-passenger/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index 8a48acf..1c8f7b3 100644 --- a/api-passenger/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/api-passenger/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -1 +1,2 @@ -com/kaiupup/Main.class +com/kaiupup/ApiPassengerApplication.class +com/kaiupup/controller/TestController.class diff --git a/api-passenger/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/api-passenger/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index c824a32..9609f29 100644 --- a/api-passenger/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/api-passenger/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -1 +1,2 @@ -/Users/zhaokai/Desktop/study/java/code/online-taxi/online-taxi-public/api-passenger/src/main/java/com/kaiupup/Main.java +/Users/zhaokai/Desktop/study/java/code/online-taxi/online-taxi-public/api-passenger/src/main/java/com/kaiupup/controller/TestController.java +/Users/zhaokai/Desktop/study/java/code/online-taxi/online-taxi-public/api-passenger/src/main/java/com/kaiupup/ApiPassengerApplication.java diff --git a/internal-common/pom.xml b/internal-common/pom.xml new file mode 100644 index 0000000..77a2ddb --- /dev/null +++ b/internal-common/pom.xml @@ -0,0 +1,42 @@ + + + 4.0.0 + + com.kaiupup + online-taxi-public + 1.0-SNAPSHOT + + + internal-common + + + 8 + 8 + UTF-8 + + + + + com.fasterxml.jackson.core + jackson-core + 2.12.0 + + + com.fasterxml.jackson.core + jackson-databind + 2.12.0 + + + + com.fasterxml.jackson.core + jackson-annotations + 2.12.0 + + + + + + + \ No newline at end of file diff --git a/internal-common/src/main/java/com/kaiupup/Main.java b/internal-common/src/main/java/com/kaiupup/Main.java new file mode 100644 index 0000000..9997f9d --- /dev/null +++ b/internal-common/src/main/java/com/kaiupup/Main.java @@ -0,0 +1,7 @@ +package com.kaiupup; + +public class Main { + public static void main(String[] args) { + System.out.println("Hello world!"); + } +} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 0a5305e..44c559d 100644 --- a/pom.xml +++ b/pom.xml @@ -16,6 +16,8 @@ pom api-passenger + internal-common + service-verificationcode @@ -23,6 +25,55 @@ 8 + + + net.sf.json-lib + json-lib + 2.4 + jdk15 + + + + + org.projectlombok + lombok + 1.18.24 + + + + com.kaiupup + internal-common + 1.0-SNAPSHOT + + + + com.auth0 + java-jwt + 3.14.0 + + + + + + + + + com.alibaba.cloud + spring-cloud-alibaba-dependencies + 2021.1 + pom + import + + + + org.springframework.cloud + spring-cloud-dependencies + 2020.0.1 + pom + import + + + diff --git a/service-verificationcode/pom.xml b/service-verificationcode/pom.xml new file mode 100644 index 0000000..a2534a2 --- /dev/null +++ b/service-verificationcode/pom.xml @@ -0,0 +1,50 @@ + + + 4.0.0 + + com.kaiupup + online-taxi-public + 1.0-SNAPSHOT + + + service-verificationcode + + + 8 + 8 + UTF-8 + + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + \ No newline at end of file diff --git a/service-verificationcode/src/main/java/com/kaiupup/serviceverificationcode/ServiceVerificationcodeApplication.java b/service-verificationcode/src/main/java/com/kaiupup/serviceverificationcode/ServiceVerificationcodeApplication.java new file mode 100644 index 0000000..6b4ac72 --- /dev/null +++ b/service-verificationcode/src/main/java/com/kaiupup/serviceverificationcode/ServiceVerificationcodeApplication.java @@ -0,0 +1,24 @@ +package com.kaiupup.serviceverificationcode; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; + +/** + * @projectName: online-taxi-public + * @package: com.kaiupup + * @className: ServiceVerificationcodeApplication + * @author: kaiupup + * @description: TODO + * @date: 2023/7/23 21:46 + * @version: 1.0 + */ +@SpringBootApplication +@EnableDiscoveryClient +public class ServiceVerificationcodeApplication { + + public static void main(String[] args) { + SpringApplication.run(ServiceVerificationcodeApplication.class,args); + } + +} diff --git a/service-verificationcode/src/main/java/com/kaiupup/serviceverificationcode/controller/TestController.java b/service-verificationcode/src/main/java/com/kaiupup/serviceverificationcode/controller/TestController.java new file mode 100644 index 0000000..5f334e3 --- /dev/null +++ b/service-verificationcode/src/main/java/com/kaiupup/serviceverificationcode/controller/TestController.java @@ -0,0 +1,24 @@ +package com.kaiupup.serviceverificationcode.controller; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @projectName: online-taxi-public + * @package: com.kaiupup.controller + * @className: TestController + * @author: kaiupup + * @description: TODO + * @date: 2023/7/23 16:16 + * @version: 1.0 + */ + +@RestController +public class TestController { + + @GetMapping("/test") + public String firstTest(){ + return "ok"; + } + +} diff --git a/service-verificationcode/src/main/resources/application.yml b/service-verificationcode/src/main/resources/application.yml new file mode 100644 index 0000000..28180e0 --- /dev/null +++ b/service-verificationcode/src/main/resources/application.yml @@ -0,0 +1,9 @@ +server: + port: 8082 +spring: + cloud: + nacos: + discovery: + server-addr: 127.0.0.1:8848 + application: + name: service-verificationcode \ No newline at end of file