diff --git a/doc/docker/.env b/doc/docker/.env index c8a9c30..54b7425 100644 --- a/doc/docker/.env +++ b/doc/docker/.env @@ -29,4 +29,5 @@ XXLJOB_ACCESSTOKEN=123 # Nacos 配置 NACOS_VERSION=v2.2.1 - +# 微服务配置 +NOVEL_CLOUD_VERSION=2.0.0-SNAPSHOT \ No newline at end of file diff --git a/doc/docker/docker-compose.yml b/doc/docker/docker-compose.yml index f8385c0..a5c166a 100644 --- a/doc/docker/docker-compose.yml +++ b/doc/docker/docker-compose.yml @@ -142,17 +142,145 @@ services: networks: - novelnet + novel-gateway: + build: ./novel-gateway + image: novel-gateway:${NOVEL_CLOUD_VERSION} + container_name: novel-gateway + restart: "always" + environment: + - JAR_VERSION=${NOVEL_CLOUD_VERSION} + - NACOS_ADDR=novel-nacos-server:8848 + ports: + - "8888:8888" + depends_on: + - novel-nacos-server + networks: + - novelnet + + novel-home-service: + build: ./novel-home-service + image: novel-home-service:${NOVEL_CLOUD_VERSION} + container_name: novel-home-service + restart: "always" + environment: + - JAR_VERSION=${NOVEL_CLOUD_VERSION} + - NACOS_ADDR=novel-nacos-server:8848 + ports: + - "9001:9001" + depends_on: + - novel-nacos-server + networks: + - novelnet + + novel-news-service: + build: ./novel-news-service + image: novel-news-service:${NOVEL_CLOUD_VERSION} + container_name: novel-news-service + restart: "always" + environment: + - JAR_VERSION=${NOVEL_CLOUD_VERSION} + - NACOS_ADDR=novel-nacos-server:8848 + ports: + - "9030:9030" + depends_on: + - novel-nacos-server + networks: + - novelnet + + novel-book-service: + build: ./novel-book-service + image: novel-book-service:${NOVEL_CLOUD_VERSION} + container_name: novel-book-service + restart: "always" + environment: + - JAR_VERSION=${NOVEL_CLOUD_VERSION} + - NACOS_ADDR=novel-nacos-server:8848 + ports: + - "9020:9020" + depends_on: + - novel-nacos-server + networks: + - novelnet + + novel-user-service: + build: ./novel-user-service + image: novel-user-service:${NOVEL_CLOUD_VERSION} + container_name: novel-user-service + restart: "always" + environment: + - JAR_VERSION=${NOVEL_CLOUD_VERSION} + - NACOS_ADDR=novel-nacos-server:8848 + ports: + - "9060:9060" + depends_on: + - novel-nacos-server + networks: + - novelnet + + novel-search-service: + build: ./novel-search-service + image: novel-search-service:${NOVEL_CLOUD_VERSION} + container_name: novel-search-service + restart: "always" + environment: + - JAR_VERSION=${NOVEL_CLOUD_VERSION} + - NACOS_ADDR=novel-nacos-server:8848 + ports: + - "9050:9050" + depends_on: + - novel-nacos-server + networks: + - novelnet + + novel-resource-service: + build: ./novel-resource-service + image: novel-resource-service:${NOVEL_CLOUD_VERSION} + container_name: novel-resource-service + restart: "always" + environment: + - JAR_VERSION=${NOVEL_CLOUD_VERSION} + - NACOS_ADDR=novel-nacos-server:8848 + ports: + - "9040:9040" + depends_on: + - novel-nacos-server + networks: + - novelnet + + novel-author-service: + build: ./novel-author-service + image: novel-author-service:${NOVEL_CLOUD_VERSION} + container_name: novel-author-service + restart: "always" + environment: + - JAR_VERSION=${NOVEL_CLOUD_VERSION} + - NACOS_ADDR=novel-nacos-server:8848 + ports: + - "9010:9010" + depends_on: + - novel-nacos-server + networks: + - novelnet + novel-monitor: build: ./novel-monitor - image: novel-monitor:2.0.1 + image: novel-monitor:${NOVEL_CLOUD_VERSION} container_name: novel-monitor restart: "always" environment: + - JAR_VERSION=${NOVEL_CLOUD_VERSION} - NACOS_ADDR=novel-nacos-server:8848 ports: - "8898:8898" depends_on: - - novel-nacos-server + - novel-gateway + - novel-home-service + - novel-author-service + - novel-book-service + - novel-search-service + - novel-user-service + - novel-resource-service + - novel-news-service networks: - novelnet diff --git a/doc/docker/novel-author-service/Dockerfile b/doc/docker/novel-author-service/Dockerfile new file mode 100644 index 0000000..86efe01 --- /dev/null +++ b/doc/docker/novel-author-service/Dockerfile @@ -0,0 +1,6 @@ +FROM hzkjhub/java17:17.0.4 +ENV JAR_VERSION="" +ADD novel-author-service-*.jar / +ENV NACOS_ADDR="" + +ENTRYPOINT ["sh","-c","java -jar -Dspring.cloud.nacos.config.server-addr=${NACOS_ADDR} -Dspring.cloud.nacos.discovery.server-addr=${NACOS_ADDR} novel-author-service-${JAR_VERSION}.jar"] \ No newline at end of file diff --git a/doc/docker/novel-book-service/Dockerfile b/doc/docker/novel-book-service/Dockerfile new file mode 100644 index 0000000..bbcc2a8 --- /dev/null +++ b/doc/docker/novel-book-service/Dockerfile @@ -0,0 +1,6 @@ +FROM hzkjhub/java17:17.0.4 +ENV JAR_VERSION="" +ADD novel-book-service-*.jar / +ENV NACOS_ADDR="" + +ENTRYPOINT ["sh","-c","java -jar -Dspring.cloud.nacos.config.server-addr=${NACOS_ADDR} -Dspring.cloud.nacos.discovery.server-addr=${NACOS_ADDR} novel-book-service-${JAR_VERSION}.jar"] \ No newline at end of file diff --git a/doc/docker/novel-gateway/Dockerfile b/doc/docker/novel-gateway/Dockerfile new file mode 100644 index 0000000..05779ba --- /dev/null +++ b/doc/docker/novel-gateway/Dockerfile @@ -0,0 +1,6 @@ +FROM hzkjhub/java17:17.0.4 +ENV JAR_VERSION="" +ADD novel-gateway-*.jar / +ENV NACOS_ADDR="" + +ENTRYPOINT ["sh","-c","java -jar -Dspring.cloud.nacos.config.server-addr=${NACOS_ADDR} -Dspring.cloud.nacos.discovery.server-addr=${NACOS_ADDR} novel-gateway-${JAR_VERSION}.jar"] \ No newline at end of file diff --git a/doc/docker/novel-home-service/Dockerfile b/doc/docker/novel-home-service/Dockerfile new file mode 100644 index 0000000..d1e4775 --- /dev/null +++ b/doc/docker/novel-home-service/Dockerfile @@ -0,0 +1,6 @@ +FROM hzkjhub/java17:17.0.4 +ENV JAR_VERSION="" +ADD novel-home-service-*.jar / +ENV NACOS_ADDR="" + +ENTRYPOINT ["sh","-c","java -jar -Dspring.cloud.nacos.config.server-addr=${NACOS_ADDR} -Dspring.cloud.nacos.discovery.server-addr=${NACOS_ADDR} novel-home-service-${JAR_VERSION}.jar"] \ No newline at end of file diff --git a/doc/docker/novel-monitor/Dockerfile b/doc/docker/novel-monitor/Dockerfile index 1190e18..5ba87f5 100644 --- a/doc/docker/novel-monitor/Dockerfile +++ b/doc/docker/novel-monitor/Dockerfile @@ -1,5 +1,6 @@ FROM hzkjhub/java17:17.0.4 -ADD novel-monitor-2.0.0-SNAPSHOT.jar / +ENV JAR_VERSION="" +ADD novel-monitor-*.jar / ENV NACOS_ADDR="" -ENTRYPOINT ["sh","-c","java -jar -Dspring.cloud.nacos.config.server-addr=${NACOS_ADDR} -Dspring.cloud.nacos.discovery.server-addr=${NACOS_ADDR} novel-monitor-2.0.0-SNAPSHOT.jar"] \ No newline at end of file +ENTRYPOINT ["sh","-c","java -jar -Dspring.cloud.nacos.config.server-addr=${NACOS_ADDR} -Dspring.cloud.nacos.discovery.server-addr=${NACOS_ADDR} novel-monitor-${JAR_VERSION}.jar"] \ No newline at end of file diff --git a/doc/docker/novel-news-service/Dockerfile b/doc/docker/novel-news-service/Dockerfile new file mode 100644 index 0000000..e454698 --- /dev/null +++ b/doc/docker/novel-news-service/Dockerfile @@ -0,0 +1,6 @@ +FROM hzkjhub/java17:17.0.4 +ENV JAR_VERSION="" +ADD novel-news-service-*.jar / +ENV NACOS_ADDR="" + +ENTRYPOINT ["sh","-c","java -jar -Dspring.cloud.nacos.config.server-addr=${NACOS_ADDR} -Dspring.cloud.nacos.discovery.server-addr=${NACOS_ADDR} novel-news-service-${JAR_VERSION}.jar"] \ No newline at end of file diff --git a/doc/docker/novel-resource-service/Dockerfile b/doc/docker/novel-resource-service/Dockerfile new file mode 100644 index 0000000..d0c5fb5 --- /dev/null +++ b/doc/docker/novel-resource-service/Dockerfile @@ -0,0 +1,6 @@ +FROM hzkjhub/java17:17.0.4 +ENV JAR_VERSION="" +ADD novel-resource-service-*.jar / +ENV NACOS_ADDR="" + +ENTRYPOINT ["sh","-c","java -jar -Dspring.cloud.nacos.config.server-addr=${NACOS_ADDR} -Dspring.cloud.nacos.discovery.server-addr=${NACOS_ADDR} novel-resource-service-${JAR_VERSION}.jar"] \ No newline at end of file diff --git a/doc/docker/novel-search-service/Dockerfile b/doc/docker/novel-search-service/Dockerfile new file mode 100644 index 0000000..a025df5 --- /dev/null +++ b/doc/docker/novel-search-service/Dockerfile @@ -0,0 +1,6 @@ +FROM hzkjhub/java17:17.0.4 +ENV JAR_VERSION="" +ADD novel-search-service-*.jar / +ENV NACOS_ADDR="" + +ENTRYPOINT ["sh","-c","java -jar -Dspring.cloud.nacos.config.server-addr=${NACOS_ADDR} -Dspring.cloud.nacos.discovery.server-addr=${NACOS_ADDR} novel-search-service-${JAR_VERSION}.jar"] \ No newline at end of file diff --git a/doc/docker/novel-user-service/Dockerfile b/doc/docker/novel-user-service/Dockerfile new file mode 100644 index 0000000..6098faf --- /dev/null +++ b/doc/docker/novel-user-service/Dockerfile @@ -0,0 +1,6 @@ +FROM hzkjhub/java17:17.0.4 +ENV JAR_VERSION="" +ADD novel-user-service-*.jar / +ENV NACOS_ADDR="" + +ENTRYPOINT ["sh","-c","java -jar -Dspring.cloud.nacos.config.server-addr=${NACOS_ADDR} -Dspring.cloud.nacos.discovery.server-addr=${NACOS_ADDR} novel-user-service-${JAR_VERSION}.jar"] \ No newline at end of file diff --git a/novel-author/novel-author-service/pom.xml b/novel-author/novel-author-service/pom.xml index 3ca3f6c..350c0ec 100644 --- a/novel-author/novel-author-service/pom.xml +++ b/novel-author/novel-author-service/pom.xml @@ -33,4 +33,21 @@ + + + + org.springframework.boot + spring-boot-maven-plugin + + + + org.projectlombok + lombok + + + + + + + \ No newline at end of file diff --git a/novel-home/pom.xml b/novel-home/pom.xml index eab4826..ac6e46f 100644 --- a/novel-home/pom.xml +++ b/novel-home/pom.xml @@ -30,6 +30,7 @@ + novel-home-service-${project.version} org.springframework.boot diff --git a/novel-resource/pom.xml b/novel-resource/pom.xml index dd6709c..e27e6bc 100644 --- a/novel-resource/pom.xml +++ b/novel-resource/pom.xml @@ -25,10 +25,19 @@ + novel-resource-service-${project.version} org.springframework.boot spring-boot-maven-plugin + + + + org.projectlombok + lombok + + + diff --git a/novel-search/pom.xml b/novel-search/pom.xml index 5c58041..7e54f67 100644 --- a/novel-search/pom.xml +++ b/novel-search/pom.xml @@ -45,6 +45,7 @@ + novel-search-service-${project.version} org.springframework.boot