diff --git a/yudao-gateway/Dockerfile b/yudao-gateway/Dockerfile index 27b155c..a607073 100644 --- a/yudao-gateway/Dockerfile +++ b/yudao-gateway/Dockerfile @@ -1,6 +1,6 @@ FROM eclipse-temurin:21-jre -COPY ./target/yudao-gateway.jar /app.jar +COPY ./target/*.jar /app.jar ## 设置 TZ 时区 ## 设置 JAVA_OPTS 环境变量,可通过 docker run -e "JAVA_OPTS=" 进行覆盖 diff --git a/yudao-gateway/src/main/resources/application.yaml b/yudao-gateway/src/main/resources/application.yaml index 47fbb02..1710958 100644 --- a/yudao-gateway/src/main/resources/application.yaml +++ b/yudao-gateway/src/main/resources/application.yaml @@ -1,2 +1,2 @@ -server: - port: 8080 \ No newline at end of file +#server: +# port: 8080 \ No newline at end of file diff --git a/yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/api/logger/dto/ApiAccessLogCreateReqDTO.java b/yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/api/logger/dto/ApiAccessLogCreateReqDTO.java index 20a58e5..df8c4b2 100644 --- a/yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/api/logger/dto/ApiAccessLogCreateReqDTO.java +++ b/yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/api/logger/dto/ApiAccessLogCreateReqDTO.java @@ -17,7 +17,7 @@ public class ApiAccessLogCreateReqDTO { private Long userId; @Schema(description = "用户类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") private Integer userType; - @Schema(description = "应用名", requiredMode = Schema.RequiredMode.REQUIRED, example = "system-server") + @Schema(description = "应用名", requiredMode = Schema.RequiredMode.REQUIRED, example = "zoe-system") @NotNull(message = "应用名不能为空") private String applicationName; diff --git a/yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/enums/ApiConstants.java b/yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/enums/ApiConstants.java index 3ad41c5..710d6f6 100644 --- a/yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/enums/ApiConstants.java +++ b/yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/enums/ApiConstants.java @@ -14,7 +14,7 @@ public class ApiConstants { * * 注意,需要保证和 spring.application.name 保持一致 */ - public static final String NAME = "zoe-infra-server"; + public static final String NAME = "zoe-infra"; public static final String PREFIX = RpcConstants.RPC_API_PREFIX + "/infra"; diff --git a/yudao-module-system/yudao-module-system-biz/Dockerfile b/yudao-module-system/yudao-module-system-biz/Dockerfile index 34520e4..0432218 100644 --- a/yudao-module-system/yudao-module-system-biz/Dockerfile +++ b/yudao-module-system/yudao-module-system-biz/Dockerfile @@ -10,9 +10,9 @@ EXPOSE 48081 CMD java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar app.jar -# docker -H tcp://172.22.222.6:2375 build -t 172.22.222.100:28082/zoe-system:1.0.0 . +# docker -H tcp://172.22.222.6:2375 build -t 172.22.222.100:28082/zoe-system:1.0.1 . -# docker -H tcp://172.22.222.6:2375 push 172.22.222.100:28082/zoe-system:1.0.0 +# docker -H tcp://172.22.222.6:2375 push 172.22.222.100:28082/zoe-system:1.0.1 # docker -H tcp://172.22.222.6:2375 rmi 172.22.222.6:28082/zoe-system:1.0.0