diff --git a/PP-binding/backend/.gitignore b/PP-binding/backend/.gitignore index a71cd2b..564b0a7 100644 --- a/PP-binding/backend/.gitignore +++ b/PP-binding/backend/.gitignore @@ -1,3 +1,4 @@ +README.md target/ .mvn/wrapper/maven-wrapper.jar !**/src/main/**/target/ diff --git a/PP-binding/backend/.mvn/wrapper/maven-wrapper.properties b/PP-binding/backend/.mvn/wrapper/maven-wrapper.properties index c595b00..5291372 100644 --- a/PP-binding/backend/.mvn/wrapper/maven-wrapper.properties +++ b/PP-binding/backend/.mvn/wrapper/maven-wrapper.properties @@ -1,3 +1,3 @@ wrapperVersion=3.3.4 distributionType=only-script -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.14/apache-maven-3.9.14-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.15/apache-maven-3.9.15-bin.zip diff --git a/PP-binding/backend/pom.xml b/PP-binding/backend/pom.xml index 693baf9..9fa2fd1 100644 --- a/PP-binding/backend/pom.xml +++ b/PP-binding/backend/pom.xml @@ -5,10 +5,10 @@ org.springframework.boot spring-boot-starter-parent - 4.0.5-SNAPSHOT + 4.0.7-SNAPSHOT - io.cancerai + top.cancerai backend 0.0.1-SNAPSHOT backend @@ -27,7 +27,7 @@ - 25 + 17 @@ -39,12 +39,22 @@ mybatis-spring-boot-starter 4.0.1 + + org.springdoc + springdoc-openapi-starter-webmvc-ui + 3.0.2 + com.mysql mysql-connector-j runtime + + org.projectlombok + lombok + true + org.springframework.boot spring-boot-starter-webmvc-test @@ -56,12 +66,6 @@ 4.0.1 test - - org.projectlombok - lombok - 1.18.44 - compile - @@ -69,6 +73,50 @@ org.springframework.boot spring-boot-maven-plugin + + + + org.projectlombok + lombok + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + default-compile + compile + + compile + + + + + org.projectlombok + lombok + + + + + + default-testCompile + test-compile + + testCompile + + + + + org.projectlombok + lombok + + + + + diff --git a/PP-binding/backend/src/main/java/io/cancerai/backend/BackendApplication.java b/PP-binding/backend/src/main/java/top/cancerai/backend/BackendApplication.java similarity index 90% rename from PP-binding/backend/src/main/java/io/cancerai/backend/BackendApplication.java rename to PP-binding/backend/src/main/java/top/cancerai/backend/BackendApplication.java index a66258a..9646224 100644 --- a/PP-binding/backend/src/main/java/io/cancerai/backend/BackendApplication.java +++ b/PP-binding/backend/src/main/java/top/cancerai/backend/BackendApplication.java @@ -1,4 +1,4 @@ -package io.cancerai.backend; +package top.cancerai.backend; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/PP-binding/backend/src/main/java/top/cancerai/backend/controller/UserController.java b/PP-binding/backend/src/main/java/top/cancerai/backend/controller/UserController.java new file mode 100644 index 0000000..c8a6acd --- /dev/null +++ b/PP-binding/backend/src/main/java/top/cancerai/backend/controller/UserController.java @@ -0,0 +1,11 @@ +package top.cancerai.backend.controller; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class UserController { + @RequestMapping("user") + public static void userLogin() { + } +} diff --git a/PP-binding/backend/src/main/resources/application.yaml b/PP-binding/backend/src/main/resources/application.yaml index 3429e8b..0363716 100644 --- a/PP-binding/backend/src/main/resources/application.yaml +++ b/PP-binding/backend/src/main/resources/application.yaml @@ -2,10 +2,12 @@ spring: application: name: backend datasource: - driver-class-name: com.mysql.cj.jdbc.Driver + url: mysql:jdbc://127.0.0.1:3306/pp username: cancerai password: admin - url: "jdbc:mysql://127.0.0.1:3306/pp" - + driver-class-name: com.mysql.cj.jdbc.Driver + mvc: + servlet: + path: /api server: - port: 8080 + port: 8080 \ No newline at end of file diff --git a/PP-binding/backend/src/test/java/io/cancerai/backend/BackendApplicationTests.java b/PP-binding/backend/src/test/java/top/cancerai/backend/BackendApplicationTests.java similarity index 86% rename from PP-binding/backend/src/test/java/io/cancerai/backend/BackendApplicationTests.java rename to PP-binding/backend/src/test/java/top/cancerai/backend/BackendApplicationTests.java index 15c1eef..e8c2c64 100644 --- a/PP-binding/backend/src/test/java/io/cancerai/backend/BackendApplicationTests.java +++ b/PP-binding/backend/src/test/java/top/cancerai/backend/BackendApplicationTests.java @@ -1,4 +1,4 @@ -package io.cancerai.backend; +package top.cancerai.backend; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; diff --git a/PP-binding/frontend/web/.idea/inspectionProfiles/Project_Default.xml b/PP-binding/frontend/web/.idea/inspectionProfiles/Project_Default.xml index 996a246..8efdc0a 100644 --- a/PP-binding/frontend/web/.idea/inspectionProfiles/Project_Default.xml +++ b/PP-binding/frontend/web/.idea/inspectionProfiles/Project_Default.xml @@ -4,7 +4,7 @@ - + @@ -12,6 +12,7 @@ + diff --git a/PP-binding/frontend/web/index.html b/PP-binding/frontend/web/index.html index 83c7490..c19ae22 100644 --- a/PP-binding/frontend/web/index.html +++ b/PP-binding/frontend/web/index.html @@ -5,6 +5,7 @@ 平台绑定统计 + @@ -58,7 +59,7 @@ {{安全}} {{小爱同学}} {{123456}} - {{暂无}} + {{暂无暂无暂无暂无暂无暂无暂无}} {{邮箱}}, {{微信}}, diff --git a/PP-binding/frontend/web/style/index.css b/PP-binding/frontend/web/style/index.css index 6153201..cf66698 100644 --- a/PP-binding/frontend/web/style/index.css +++ b/PP-binding/frontend/web/style/index.css @@ -6,6 +6,7 @@ :root { --color-green: #80c671; --color-red: #d56161; + --content-text-color: #232323; --add-item-window-title-height: 60px; } @@ -113,7 +114,6 @@ body { .table-outer-scrollable-container { min-height: 0; flex: 1; - /*height: 700px;*/ overflow-y: scroll; scrollbar-color: var(--color-green) rgba(236, 236, 236, 0.89); } @@ -127,6 +127,7 @@ body { justify-content: space-between; margin-top: 3px; margin-bottom: 3px; + color: var(--content-text-color); } .table-items-container .more-platform-container {