diff --git a/home-service/Dockerfile b/home-service/Dockerfile index 94ced11..9c189e5 100644 --- a/home-service/Dockerfile +++ b/home-service/Dockerfile @@ -1,4 +1,4 @@ -FROM docker-0.unsee.tech/openjdk:11-jdk-slim +FROM openjdk:17-jdk ARG JAR_FILE=target/*.jar COPY $JAR_FILE app.jar RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime diff --git a/home-service/src/main/resources/application-docker.yml b/home-service/src/main/resources/application-docker.yml index dafb638..848977f 100644 --- a/home-service/src/main/resources/application-docker.yml +++ b/home-service/src/main/resources/application-docker.yml @@ -1,9 +1,9 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://mysql:3306/sweet_hut?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8&useSSL=false - username: docker - password: 19940822Cxx + url: jdbc:mysql://host.docker.internal:3306/sweet_hut?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8&useSSL=false&allowPublicKeyRetrieval=true + username: root + password: 19940822Cxx@1213 file: path: /upload-file/ \ No newline at end of file diff --git a/home-service/src/main/resources/application.yml b/home-service/src/main/resources/application.yml index 7709d00..d422948 100644 --- a/home-service/src/main/resources/application.yml +++ b/home-service/src/main/resources/application.yml @@ -6,7 +6,7 @@ spring: name: @project.artifactId@ version: @project.version@ profiles: - active: prod + active: dev mail: host: smtp.163.com port: 465 @@ -23,7 +23,6 @@ spring: quartz: job-store-type: jdbc - # mybatis plus mapper路径 mybatis-plus: # mybatis plus diff --git a/home-service/src/main/resources/logback-spring.xml b/home-service/src/main/resources/logback-spring.xml new file mode 100644 index 0000000..0ff7af7 --- /dev/null +++ b/home-service/src/main/resources/logback-spring.xml @@ -0,0 +1,149 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + DEBUG + + + + ${CONSOLE_LOG_PATTERN} + + ${ENCODING} + + + + + + + + INFO + ACCEPT + DENY + + + ${log.path}/log_info.log + + ${FILE_LOG_PATTERN} + ${ENCODING} + + + + + ${log.path}/info/log-info-%d{yyyy-MM-dd}.%i.log + + 100MB + + 15 + + + + + + + WARN + ACCEPT + DENY + + + ${log.path}/log_warn.log + + ${FILE_LOG_PATTERN} + ${ENCODING} + + + + ${log.path}/warn/log-warn-%d{yyyy-MM-dd}.%i.log + + 100MB + + 15 + + + + + + + ERROR + ACCEPT + DENY + + + ${log.path}/log_error.log + + ${FILE_LOG_PATTERN} + ${ENCODING} + + + + ${log.path}/error/log-error-%d{yyyy-MM-dd}.%i.log + + 100MB + + 15 + + + + + + tag2 + ${fluentdHost} + ${fluentdPort} + + topic + ${topic} + + true + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file