Merge branch 'develop_xxy'

.github/workflows/release.yml

@@ -28,7 +28,7 @@ jobs:
         id: create_release
         uses: actions/create-release@v1
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GH_PAT }}
         with:
           # 使用 tag_name 而不是 github.ref
           tag_name: ${{ github.ref_name }}
@@ -41,7 +41,7 @@ jobs:
       - name: Upload sql.zip
         uses: actions/upload-release-asset@v1
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GH_PAT }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: ${{ github.workspace }}/novel-common/target/build/sql.zip
@@ -51,7 +51,7 @@ jobs:
       - name: Upload novel-crawl.zip
         uses: actions/upload-release-asset@v1
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GH_PAT }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: ${{ github.workspace }}/novel-crawl/target/build/novel-crawl.zip
@@ -61,7 +61,7 @@ jobs:
       - name: Upload novel-front.zip
         uses: actions/upload-release-asset@v1
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GH_PAT }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: ${{ github.workspace }}/novel-front/target/build/novel-front.zip
@@ -71,9 +71,66 @@ jobs:
       - name: Upload novel-admin.zip
         uses: actions/upload-release-asset@v1
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GH_PAT }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: ${{ github.workspace }}/novel-admin/target/build/novel-admin.zip
           asset_name: novel-admin.zip
-          asset_content_type: application/zip
+          asset_content_type: application/zip
+
+
+      # 登录 Docker Hub
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      # 构建并推送 novel-front 镜像
+      - name: Build and Push novel-front Docker Image
+        uses: docker/build-push-action@v5
+        with:
+          context: ./novel-front/target/build
+          file: ./novel-front/target/build/Dockerfile
+          push: true
+          tags: |
+            ${{ secrets.DOCKERHUB_USERNAME }}/novel-front:latest
+            ${{ secrets.DOCKERHUB_USERNAME }}/novel-front:${{ github.ref_name }}
+
+      # 构建并推送 novel-admin 镜像
+      - name: Build and Push novel-admin Docker Image
+        uses: docker/build-push-action@v5
+        with:
+          context: ./novel-admin/target/build
+          file: ./novel-admin/target/build/Dockerfile
+          push: true
+          tags: |
+            ${{ secrets.DOCKERHUB_USERNAME }}/novel-admin:latest
+            ${{ secrets.DOCKERHUB_USERNAME }}/novel-admin:${{ github.ref_name }}
+
+      # 构建并推送 novel-crawl 镜像
+      - name: Build and Push novel-crawl Docker Image
+        uses: docker/build-push-action@v5
+        with:
+          context: ./novel-crawl/target/build
+          file: ./novel-crawl/target/build/Dockerfile
+          push: true
+          tags: |
+            ${{ secrets.DOCKERHUB_USERNAME }}/novel-crawl:latest
+            ${{ secrets.DOCKERHUB_USERNAME }}/novel-crawl:${{ github.ref_name }}
+
+      # 解压 SQL 文件
+      - name: Unzip MySQL SQL File
+        run: |
+          unzip -o ./doc/sql/novel_plus_data.sql.zip -d ./doc/sql/
+
+      # 构建并推送 mysql-novel-plus 镜像
+      - name: Build and Push mysql-novel-plus Docker Image
+        uses: docker/build-push-action@v5
+        with:
+          context: ./doc/sql
+          file: ./doc/sql/Dockerfile
+          push: true
+          tags: |
+            201206030/mysql-novel-plus:latest
+            201206030/mysql-novel-plus:${{ github.ref_name }}

README.md

@@ -6,6 +6,8 @@
     <a href='https://github.com/201206030/novel-plus'><img alt="Github forks" src="https://img.shields.io/github/forks/201206030/novel-plus?logo=github"></a>
     <a href='https://gitee.com/novel_dev_team/novel-plus'><img alt="Gitee stars" src="https://gitee.com/novel_dev_team/novel-plus/badge/star.svg?theme=gitee"></a>
     <a href='https://gitee.com/novel_dev_team/novel-plus'><img alt="Gitee forks" src="https://gitee.com/novel_dev_team/novel-plus/badge/fork.svg?theme=gitee"></a>
+    <a href='https://github.com/201206030/novel-plus/releases'><img alt="GitHub downloads" src="https://img.shields.io/github/downloads/201206030/novel-plus/total.svg"></a>
+    <a href='https://hub.docker.com/u/201206030'><img alt="Docker pull" src="https://img.shields.io/docker/pulls/201206030/novel-front"></a>
 </p>
 
 <p align="center">

doc/sql/Dockerfile

@@ -1,2 +1,2 @@
 FROM mysql:8.0
-COPY novel_plus.sql /docker-entrypoint-initdb.d/init.sql
+COPY novel_plus_data.sql /docker-entrypoint-initdb.d/init.sql

doc/sql/readme.md

@@ -1,3 +1,5 @@
-1. novel_plus.sql 为全量 sql 文件，yyyyMMdd.sql 为增量 sql 文件
+1. `novel_plus_data.sql`：包含初始化小说数据（小说内容均为无版权风险数据）的完整 SQL 文件。
-2. 第一次安装只需要执行 novel_plus.sql 文件即可
+2. `novel_plus.sql`：不包含初始化小说数据的完整 SQL 文件。
-3. 后续版本升级需要根据上次代码版本的时间，执行该日期之后的增量 sql 文件（简单来说就是 sql 文件夹中相较于上次多出来的 sql 文件）
+3. `yyyyMMdd.sql`：版本升级所需的增量 SQL 文件。
+4. 首次安装时，只需执行 `novel_plus_data.sql` 或 `novel_plus.sql` 中的任意一个即可完成数据库初始化。
+5. 后续版本升级时，请根据当前项目所使用的代码版本时间，依次执行该日期之后新增的增量 SQL 文件（即 `sql` 目录中相比旧版本新增的 `.sql` 文件）。

novel-admin/pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.java2nb</groupId>
     <artifactId>novel-admin</artifactId>
-    <version>5.3.0</version>
+    <version>5.3.3</version>
     <packaging>jar</packaging>
 
     <name>novel-admin</name>

novel-admin/src/main/build/docker/Dockerfile

@@ -1,9 +1,12 @@
-FROM openjdk:8
+FROM eclipse-temurin:21-jre
-ADD novel-admin.jar /root
+
-ENV dburl=""
+WORKDIR /app
-ENV username=""
+
-ENV	password=""
+COPY novel-admin.jar /app/
-ENV redishost = ""
+
-ENV redisport = ""
+# 默认关闭 ShardingSphere，保证旧版本兼容
-ENV redispwd = ""
+ENV JDBC_DRIVER=com.mysql.cj.jdbc.Driver
-ENTRYPOINT ["sh","-c","java -Dspring.datasource.url=${dburl} -Dspring.datasource.username=${username} -Dspring.datasource.password=${password} -Dspring.redis.host=${redishost} -Dspring.redis.port=${redisport} -Dspring.redis.password=${redispwd} -jar /root/novel-admin.jar"]
+
+ENTRYPOINT ["sh","-c","exec java \
+-Dspring.datasource.driver-class-name=${JDBC_DRIVER} \
+-jar /app/novel-admin.jar"]

novel-common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>novel</artifactId>
         <groupId>com.java2nb</groupId>
-        <version>5.3.0</version>
+        <version>5.3.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

novel-crawl/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>novel</artifactId>
         <groupId>com.java2nb</groupId>
-        <version>5.3.0</version>
+        <version>5.3.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

novel-crawl/src/main/build/docker/Dockerfile

@@ -1,9 +1,12 @@
-FROM openjdk:8
+FROM eclipse-temurin:21-jre
-ADD novel-crawl.jar /root
+
-ENV dburl=""
+WORKDIR /app
-ENV username=""
+
-ENV	password=""
+COPY novel-crawl.jar /app/
-ENV redishost = ""
+
-ENV redisport = ""
+# 默认关闭 ShardingSphere，保证旧版本兼容
-ENV redispwd = ""
+ENV JDBC_DRIVER=com.mysql.cj.jdbc.Driver
-ENTRYPOINT ["sh","-c","java -Dspring.datasource.url=${dburl} -Dspring.datasource.username=${username} -Dspring.datasource.password=${password} -Dspring.redis.host=${redishost} -Dspring.redis.port=${redisport} -Dspring.redis.password=${redispwd} -jar /root/novel-crawl.jar"]
+
+ENTRYPOINT ["sh","-c","exec java \
+-Dspring.datasource.driver-class-name=${JDBC_DRIVER} \
+-jar /app/novel-crawl.jar"]

novel-front/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>novel</artifactId>
         <groupId>com.java2nb</groupId>
-        <version>5.3.0</version>
+        <version>5.3.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

novel-front/src/main/build/docker/Dockerfile

@@ -1,9 +1,12 @@
-FROM openjdk:8
+FROM eclipse-temurin:21-jre
-ADD novel-front.jar /root
+
-ENV dburl=""
+WORKDIR /app
-ENV username=""
+
-ENV	password=""
+COPY novel-front.jar /app/
-ENV redishost = ""
+
-ENV redisport = ""
+# 默认关闭 ShardingSphere，保证旧版本兼容
-ENV redispwd = ""
+ENV JDBC_DRIVER=com.mysql.cj.jdbc.Driver
-ENTRYPOINT ["sh","-c","java -Dspring.datasource.url=${dburl} -Dspring.datasource.username=${username} -Dspring.datasource.password=${password} -Dspring.redis.host=${redishost} -Dspring.redis.port=${redisport} -Dspring.redis.password=${redispwd} -jar /root/novel-front.jar"]
+
+ENTRYPOINT ["sh","-c","exec java \
+-Dspring.datasource.driver-class-name=${JDBC_DRIVER} \
+-jar /app/novel-front.jar"]