重命名 user-login 和 user-register 为 user-login-account 和 user-register-account
This commit is contained in:
@@ -1,16 +1,16 @@
|
||||
version: "3.8"
|
||||
|
||||
services:
|
||||
user-login:
|
||||
user-login-account:
|
||||
build:
|
||||
context: ../..
|
||||
dockerfile: services/user-service/user-login/Dockerfile
|
||||
container_name: user-login
|
||||
dockerfile: services/user-service/user-login-account/Dockerfile
|
||||
container_name: user-login-account
|
||||
environment:
|
||||
- RUST_LOG=info
|
||||
- DATABASE_URL=postgres://postgres:postgres@user-db:5432/user-db
|
||||
- REDIS_URL=redis://user-redis:6379/0
|
||||
- SERVICE_NAME=user-login
|
||||
- SERVICE_NAME=user-login-account
|
||||
- SERVICE_PORT=8080
|
||||
- JWT_SECRET=${JWT_SECRET:-dev-secret-key}
|
||||
ports:
|
||||
@@ -29,16 +29,16 @@ services:
|
||||
timeout: 10s
|
||||
retries: 3
|
||||
|
||||
user-register:
|
||||
user-register-account:
|
||||
build:
|
||||
context: ../..
|
||||
dockerfile: services/user-service/user-register/Dockerfile
|
||||
container_name: user-register
|
||||
dockerfile: services/user-service/user-register-account/Dockerfile
|
||||
container_name: user-register-account
|
||||
environment:
|
||||
- RUST_LOG=info
|
||||
- DATABASE_URL=postgres://postgres:postgres@user-db:5432/user-db
|
||||
- REDIS_URL=redis://user-redis:6379/0
|
||||
- SERVICE_NAME=user-register
|
||||
- SERVICE_NAME=user-register-account
|
||||
- SERVICE_PORT=8080
|
||||
ports:
|
||||
- "8002:8080"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
[package]
|
||||
name = "user-login"
|
||||
name = "user-login-account"
|
||||
version = "0.1.0"
|
||||
edition = "2024"
|
||||
|
||||
@@ -5,8 +5,8 @@ RUN apk add --no-cache musl-dev openssl-dev openssl-libs-static pkgconfig
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
# 复制 user-login 代码
|
||||
COPY services/user-service/user-login/Cargo.toml services/user-service/user-login/Cargo.lock* ./
|
||||
# 复制 user-login-account 代码
|
||||
COPY services/user-service/user-login-account/Cargo.toml services/user-service/user-login-account/Cargo.lock* ./
|
||||
|
||||
# 缓存依赖
|
||||
RUN mkdir -p src && echo 'fn main() {}' > src/main.rs
|
||||
@@ -14,7 +14,7 @@ RUN cargo build --release 2>/dev/null || true
|
||||
RUN rm -rf src
|
||||
|
||||
# 复制真实源码
|
||||
COPY services/user-service/user-login/src ./src
|
||||
COPY services/user-service/user-login-account/src ./src
|
||||
|
||||
# 重新构建
|
||||
RUN touch src/main.rs && cargo build --release
|
||||
@@ -28,7 +28,7 @@ RUN addgroup -g 1000 appuser && adduser -D -u 1000 -G appuser appuser
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
COPY --from=builder /app/target/release/user-login /app/user-login
|
||||
COPY --from=builder /app/target/release/user-login-account /app/user-login-account
|
||||
|
||||
RUN chown -R appuser:appuser /app
|
||||
|
||||
@@ -36,4 +36,4 @@ USER appuser
|
||||
|
||||
EXPOSE 8080
|
||||
|
||||
CMD ["./user-login"]
|
||||
CMD ["./user-login-account"]
|
||||
@@ -49,7 +49,7 @@ async fn main() {
|
||||
// 初始化日志
|
||||
tracing_subscriber::fmt::init();
|
||||
|
||||
info!("Starting user-login service...");
|
||||
info!("Starting user-login-account service...");
|
||||
|
||||
// 数据库连接
|
||||
let database_url = env::var("DATABASE_URL").expect("DATABASE_URL must be set");
|
||||
@@ -1,5 +1,5 @@
|
||||
[package]
|
||||
name = "user-register"
|
||||
name = "user-register-account"
|
||||
version = "0.1.0"
|
||||
edition = "2024"
|
||||
|
||||
@@ -4,13 +4,13 @@ RUN apk add --no-cache musl-dev openssl-dev openssl-libs-static pkgconfig
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
COPY services/user-service/user-register/Cargo.toml services/user-service/user-register/Cargo.lock* ./
|
||||
COPY services/user-service/user-register-account/Cargo.toml services/user-service/user-register-account/Cargo.lock* ./
|
||||
|
||||
RUN mkdir -p src && echo 'fn main() {}' > src/main.rs
|
||||
RUN cargo build --release 2>/dev/null || true
|
||||
RUN rm -rf src
|
||||
|
||||
COPY services/user-service/user-register/src ./src
|
||||
COPY services/user-service/user-register-account/src ./src
|
||||
|
||||
RUN touch src/main.rs && cargo build --release
|
||||
|
||||
@@ -22,7 +22,7 @@ RUN addgroup -g 1000 appuser && adduser -D -u 1000 -G appuser appuser
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
COPY --from=builder /app/target/release/user-register /app/user-register
|
||||
COPY --from=builder /app/target/release/user-register-account /app/user-register-account
|
||||
|
||||
RUN chown -R appuser:appuser /app
|
||||
|
||||
@@ -30,4 +30,4 @@ USER appuser
|
||||
|
||||
EXPOSE 8080
|
||||
|
||||
CMD ["./user-register"]
|
||||
CMD ["./user-register-account"]
|
||||
@@ -50,7 +50,7 @@ struct RegisterData {
|
||||
async fn main() {
|
||||
tracing_subscriber::fmt::init();
|
||||
|
||||
info!("Starting user-register service...");
|
||||
info!("Starting user-register-account service...");
|
||||
|
||||
let database_url = env::var("DATABASE_URL").expect("DATABASE_URL must be set");
|
||||
let pool = sqlx::postgres::PgPool::connect(&database_url)
|
||||
Reference in New Issue
Block a user