diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index d37c00ca..df1ba42f 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -24,17 +24,17 @@ jobs: cache: 'maven' # 3、打包 - name: Build - run: mvn -B package -P prod --file pom.xml - # 4、拷贝 jar 包到服务器 - - name: Copy Jar + run: mvn -B package --file pom.xml + # 4、拷贝到服务器 + - name: Copy uses: garygrossgarten/github-action-scp@release with: host: ${{ secrets.SERVER_HOST }} port: ${{ secrets.SERVER_PORT }} username: ${{ secrets.SERVER_USERNAME }} password: ${{ secrets.SERVER_PASSWORD }} - local: continew-admin-webapi/target/continew-admin.jar - remote: /docker/continew-admin/server/continew-admin.jar + local: ./continew-admin-webapi/target/app + remote: /docker/continew-admin # 5、启动后端服务 - name: Start uses: appleboy/ssh-action@master @@ -75,7 +75,7 @@ jobs: - name: Build run: pnpm build working-directory: ./continew-admin-ui - # 6、拷贝文件到服务器 + # 6、拷贝到服务器 - name: Copy uses: garygrossgarten/github-action-scp@release with: diff --git a/README.md b/README.md index 57e23ce7..6c32eb85 100644 --- a/README.md +++ b/README.md @@ -389,7 +389,7 @@ git clone https://github.com/Charles7c/continew-admin.git # 5.部署 # 5.1 Docker 部署 # 5.1.1 服务器安装好 docker 及 docker-compose(参考:https://blog.charles7c.top/categories/fragments/2022/10/31/CentOS%E5%AE%89%E8%A3%85Docker) -# 5.1.2 执行 mvn package -P prod 进行项目打包,将 target 目录下的 continew-admin.jar 放到 /docker/continew-admin/server 目录下 +# 5.1.2 执行 mvn package 进行项目打包,将 target/app 目录下的所有内容放到 /docker/continew-admin 目录下 # 5.1.3 将 docker 目录上传到服务器 / 目录下,并授权(chmod -R 777 /docker) # 5.1.4 修改 docker-compose.yml 中的 MariaDB 配置、Redis 配置、continew-admin-server 配置、Nginx 配置 # 5.1.5 执行 docker-compose up -d 创建并后台运行所有容器 diff --git a/continew-admin-webapi/pom.xml b/continew-admin-webapi/pom.xml index 7bebae7a..1aa26c32 100644 --- a/continew-admin-webapi/pom.xml +++ b/continew-admin-webapi/pom.xml @@ -31,6 +31,18 @@ limitations under the License. ${project.artifactId} API 模块(存放 Controller 层代码,打包部署的模块) + + + + top.charles7c.cnadmin.ContiNewAdminApplication + + bin + + config + + lib + + @@ -66,34 +78,77 @@ limitations under the License. org.apache.maven.plugins maven-surefire-plugin - -Dfile.encoding=UTF-8 - - ${profiles.active} - - exclude + + true - + - org.springframework.boot - spring-boot-maven-plugin + org.apache.maven.plugins + maven-jar-plugin + + + + ${config-path}/ + + + + ${main-class} + + ../${lib-path}/ + true + + false + + + + ../${config-path}/ + + + ${project.build.directory}/app/${bin-path} + + + + + org.apache.maven.plugins + maven-dependency-plugin + copy-dependencies + package - repackage + copy-dependencies + + ${project.build.directory}/app/${lib-path} + + + + + + + org.apache.maven.plugins + maven-resources-plugin + + + copy-resources + package + + copy-resources + + + + + src/main/resources + + ${config-path}/ + + + + ${project.build.directory}/app + - - - true - - - org.projectlombok - lombok - - - diff --git a/continew-admin-webapi/src/main/resources/application-dev.yml b/continew-admin-webapi/src/main/resources/config/application-dev.yml similarity index 98% rename from continew-admin-webapi/src/main/resources/application-dev.yml rename to continew-admin-webapi/src/main/resources/config/application-dev.yml index e6e82f00..ffc3f73b 100644 --- a/continew-admin-webapi/src/main/resources/application-dev.yml +++ b/continew-admin-webapi/src/main/resources/config/application-dev.yml @@ -138,6 +138,13 @@ rsa: # 私钥 privateKey: MIIBVQIBADANBgkqhkiG9w0BAQEFAASCAT8wggE7AgEAAkEAznV2Bi0zIX61NC3zSx8U6lJXbtru325pRV4Wt0aJXGxy6LMTsfxIye1ip+f2WnxrkYfk/X8YZ6FWNQPaAX/iRwIDAQABAkEAk/VcAusrpIqA5Ac2P5Tj0VX3cOuXmyouaVcXonr7f+6y2YTjLQuAnkcfKKocQI/juIRQBFQIqqW/m1nmz1wGeQIhAO8XaA/KxzOIgU0l/4lm0A2Wne6RokJ9HLs1YpOzIUmVAiEA3Q9DQrpAlIuiT1yWAGSxA9RxcjUM/1kdVLTkv0avXWsCIE0X8woEjK7lOSwzMG6RpEx9YHdopjViOj1zPVH61KTxAiBmv/dlhqkJ4rV46fIXELZur0pj6WC3N7a4brR8a+CLLQIhAMQyerWl2cPNVtE/8tkziHKbwW3ZUiBXU24wFxedT9iV +--- ### 日志配置 +logging: + level: + top.charles7c: DEBUG + file: + path: ./logs + --- ### 接口文档配置 springdoc: swagger-ui: diff --git a/continew-admin-webapi/src/main/resources/application-prod.yml b/continew-admin-webapi/src/main/resources/config/application-prod.yml similarity index 98% rename from continew-admin-webapi/src/main/resources/application-prod.yml rename to continew-admin-webapi/src/main/resources/config/application-prod.yml index 151ebbc4..feb87a74 100644 --- a/continew-admin-webapi/src/main/resources/application-prod.yml +++ b/continew-admin-webapi/src/main/resources/config/application-prod.yml @@ -131,6 +131,13 @@ rsa: # 私钥 privateKey: MIIBVQIBADANBgkqhkiG9w0BAQEFAASCAT8wggE7AgEAAkEAznV2Bi0zIX61NC3zSx8U6lJXbtru325pRV4Wt0aJXGxy6LMTsfxIye1ip+f2WnxrkYfk/X8YZ6FWNQPaAX/iRwIDAQABAkEAk/VcAusrpIqA5Ac2P5Tj0VX3cOuXmyouaVcXonr7f+6y2YTjLQuAnkcfKKocQI/juIRQBFQIqqW/m1nmz1wGeQIhAO8XaA/KxzOIgU0l/4lm0A2Wne6RokJ9HLs1YpOzIUmVAiEA3Q9DQrpAlIuiT1yWAGSxA9RxcjUM/1kdVLTkv0avXWsCIE0X8woEjK7lOSwzMG6RpEx9YHdopjViOj1zPVH61KTxAiBmv/dlhqkJ4rV46fIXELZur0pj6WC3N7a4brR8a+CLLQIhAMQyerWl2cPNVtE/8tkziHKbwW3ZUiBXU24wFxedT9iV +--- ### 日志配置 +logging: + level: + top.charles7c: INFO + file: + path: ./logs + --- ### 接口文档配置 springdoc: swagger-ui: diff --git a/continew-admin-webapi/src/main/resources/application.yml b/continew-admin-webapi/src/main/resources/config/application.yml similarity index 97% rename from continew-admin-webapi/src/main/resources/application.yml rename to continew-admin-webapi/src/main/resources/config/application.yml index 08982cf2..23304d16 100644 --- a/continew-admin-webapi/src/main/resources/application.yml +++ b/continew-admin-webapi/src/main/resources/config/application.yml @@ -26,10 +26,6 @@ project: --- ### 日志配置(重叠部分,优先级高于 logback-spring.xml 中的配置) logging: - level: - top.charles7c: @logging.level@ - file: - path: @logging.file.path@ config: classpath:logback-spring.xml ## 系统日志配置 system: @@ -186,8 +182,7 @@ spring: ## 环境配置 profiles: # 启用的环境 - # 配合 Maven Profile 选择不同配置文件进行启动,在 IntelliJ IDEA 右侧 Maven 工具窗口可以快速切换环境 - active: @profiles.active@ + active: dev main: # 允许定义重名的 bean 对象覆盖原有的 bean allow-bean-definition-overriding: true diff --git a/docker/continew-admin/Dockerfile b/docker/continew-admin/Dockerfile index e118c63f..8fac53bd 100644 --- a/docker/continew-admin/Dockerfile +++ b/docker/continew-admin/Dockerfile @@ -2,10 +2,12 @@ FROM java:8 MAINTAINER Charles7c charles7c@126.com -ARG JAR_FILE=./server/*.jar -COPY ${JAR_FILE} app.jar +ARG JAR_FILE=./bin/*.jar +COPY ${JAR_FILE} /app/bin/app.jar +WORKDIR /app ENTRYPOINT ["java", \ "-jar", \ "-Djava.security.egd=file:/dev/./urandom", \ - "app.jar"] \ No newline at end of file + "-Dspring.profiles.active=prod", \ + "./bin/app.jar"] \ No newline at end of file diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 23d32a24..f9d18f55 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -47,9 +47,11 @@ services: REDIS_PWD: 你的 Redis 密码 REDIS_DB: 你的 Redis 数据库索引 volumes: - - /docker/continew-admin/data/file:/data/file - - /docker/continew-admin/data/avatar:/data/avatar - - /docker/continew-admin/logs:/logs + - /docker/continew-admin/config:/app/config + - /docker/continew-admin/data/file:/app/data/file + - /docker/continew-admin/data/avatar:/app/data/avatar + - /docker/continew-admin/logs:/app/logs + - /docker/continew-admin/lib:/app/lib depends_on: - redis - mariadb diff --git a/pom.xml b/pom.xml index 29d69d6d..f15d5a32 100644 --- a/pom.xml +++ b/pom.xml @@ -68,33 +68,6 @@ limitations under the License. UTF-8 - - - dev - - - - dev - - DEBUG - - ./logs - - - - true - - - - prod - - prod - INFO - ./logs - - - - @@ -287,24 +260,6 @@ limitations under the License. - - - - src/main/resources - - **/*.yml - - - true - - - - src/main/resources - - **/** - - -