diff --git a/ktor/build.gradle.kts b/ktor/build.gradle.kts index 8fcda7d..acb0efb 100644 --- a/ktor/build.gradle.kts +++ b/ktor/build.gradle.kts @@ -1,5 +1,3 @@ -import org.gradle.kotlin.dsl.implementation - val kotlin_version: String by project val logback_version: String by project val kotlinx_html_version: String by project @@ -14,7 +12,7 @@ plugins { } group = "ink.snowflake" -version = "0.0.1" +version = "1.0.4" application { mainClass.set("io.ktor.server.tomcat.jakarta.EngineMain") diff --git a/ktor/src/main/resources/application.yaml b/ktor/src/main/resources/application.yaml index c1c412c..4bcb2b7 100644 --- a/ktor/src/main/resources/application.yaml +++ b/ktor/src/main/resources/application.yaml @@ -16,8 +16,8 @@ ktor: realm: "Snowflake Server" secret: "secret_jwt" database: - url: "jdbc:postgresql://10.10.10.9:5432/ktor2" -# url: "jdbc:postgresql://localhost:5432/ktor2" +# url: "jdbc:postgresql://10.10.10.9:5432/ktor2" + url: "jdbc:postgresql://localhost:5432/ktor2" driver: "org.postgresql.Driver" user: "postgres" password: "123456" diff --git a/readme.md b/readme.md index e25b96a..f3c43b7 100644 --- a/readme.md +++ b/readme.md @@ -18,13 +18,16 @@ ```shell sudo systemctl enable ktor.service sudo systemctl status ktor.service + + + sudo systemctl restart ktor.service ``` ### 前端 1. 在vue目录运行docker打包命令 ```shell - pnpm bulid:docker + pnpm build:docker ``` 2. 将Image保存为文件 @@ -35,16 +38,30 @@ 3. 将保存好的Image`vue.tar`上传到服务器 4. 停掉之前的docker compose + + ``` + docker-compose down + ``` + 5. 删除之前的Image ```shell - docker rmi ce-vue:latest + docker rmi ce-vue:latest ``` + 6. 在服务器读取Image ```shell docker load -i vue.tar ``` +7. 重新运行 + + ``` + docker compose up -d + ``` + + + ### Docker Compose 包含Vue、PostgreSQL、Radis、MinIO在内的Docker Compose服务