修改

2025-07-22 20:16:19 +08:00
parent 8c53fa9479
commit 5cfc12adae
9 changed files with 47 additions and 26 deletions
--- a/.run/giftBook-monitor-admin.run.xml
+++ b/.run/giftBook-monitor-admin.run.xml
@@ -2,7 +2,7 @@
  <configuration default="false" name="giftBook-monitor-admin" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
    <deployment type="dockerfile">
      <settings>
-        <option name="imageTag" value="giftBook/giftBook-monitor-admin:5.3.1-BETA2" />
+        <option name="imageTag" value="giftbook/giftbook-monitor-admin:1.0.0" />
        <option name="buildOnly" value="true" />
        <option name="sourceFilePath" value="giftBook-extend/giftBook-monitor-admin/Dockerfile" />
      </settings>
--- a/.run/giftBook-server.run.xml
+++ b/.run/giftBook-server.run.xml
@@ -2,11 +2,12 @@
  <configuration default="false" name="giftBook-server" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
    <deployment type="dockerfile">
      <settings>
-        <option name="imageTag" value="giftBook/giftBook-server:5.3.1-BETA2" />
+        <option name="imageTag" value="giftbook/giftbook-server:1.0.0" />
        <option name="buildOnly" value="true" />
+        <option name="containerName" value="" />
        <option name="sourceFilePath" value="giftBook-admin/Dockerfile" />
      </settings>
    </deployment>
    <method v="2" />
  </configuration>
-</component>
+</component>
--- a/.run/giftBook-snailjob-server.run.xml
+++ b/.run/giftBook-snailjob-server.run.xml
@@ -2,7 +2,7 @@
  <configuration default="false" name="giftBook-snailjob-server" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
    <deployment type="dockerfile">
      <settings>
-        <option name="imageTag" value="giftBook/giftBook-snailjob-server:5.3.1-BETA2" />
+        <option name="imageTag" value="giftbook/giftbook-snailjob-server:1.0.0" />
        <option name="buildOnly" value="true" />
        <option name="sourceFilePath" value="giftBook-extend/giftBook-snailjob-server/Dockerfile" />
      </settings>
--- a/giftBook-admin/Dockerfile
+++ b/giftBook-admin/Dockerfile
@@ -5,26 +5,27 @@ FROM bellsoft/liberica-openjdk-debian:17.0.11-cds

 LABEL maintainer="Lion Li"

-RUN mkdir -p /ruoyi/server/logs \
-    /ruoyi/server/temp \
-    /ruoyi/skywalking/agent
+RUN mkdir -p /giftBook/server/logs \
+    /giftBook/server/temp \
+    /giftBook/skywalking/agent

-WORKDIR /ruoyi/server
+WORKDIR /giftBook/server

-ENV SERVER_PORT=8080 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS=""
+ENV SERVER_PORT=8080 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="--spring.profiles.active=prod"

 EXPOSE ${SERVER_PORT}

-ADD ./target/ruoyi-admin.jar ./app.jar
+ADD ./target/giftBook-admin.jar ./app.jar
 # 工作流字体文件
 ADD ./zhFonts/ /usr/share/fonts/zhFonts/

 SHELL ["/bin/bash", "-c"]

-ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom -Dserver.port=${SERVER_PORT} \
+ENTRYPOINT exec java -Djava.security.egd=file:/dev/./urandom -Dserver.port=${SERVER_PORT} \
           # 应用名称 如果想区分集群节点监控 改成不同的名称即可
-           #-Dskywalking.agent.service_name=ruoyi-server \
-           #-javaagent:/ruoyi/skywalking/agent/skywalking-agent.jar \
-           -XX:+HeapDumpOnOutOfMemoryError -XX:+UseZGC ${JAVA_OPTS} \
-           -jar app.jar
+           #-Dskywalking.agent.service_name=giftBook-server \
+           #-javaagent:/giftBook/skywalking/agent/skywalking-agent.jar \
+           -XX:+HeapDumpOnOutOfMemoryError -XX:+UseZGC \
+           -jar app.jar \
+           ${JAVA_OPTS}

--- a/giftBook-admin/src/main/resources/application-prod.yml
+++ b/giftBook-admin/src/main/resources/application-prod.yml
@@ -52,9 +52,9 @@ spring:
          driverClassName: com.mysql.cj.jdbc.Driver
          # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
          # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
-          url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
-          username: root
-          password: root
+          url: jdbc:mysql://10.10.10.7:3306/gift_book?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+          username: giftBook
+          password: giftBook
 #        # 从库数据源
 #        slave:
 #          lazy: true
@@ -101,13 +101,13 @@ spring:
 spring.data:
  redis:
    # 地址
-    host: localhost
+    host: 10.10.10.7
    # 端口，默认为6379
    port: 6379
    # 数据库索引
    database: 0
    # redis 密码必须配置
-    password: ruoyi123
+    password: 520Xzh...
    # 连接超时时间
    timeout: 10s
    # 是否开启ssl
--- a/giftBook-common/giftBook-common-bom/pom.xml
+++ b/giftBook-common/giftBook-common-bom/pom.xml
@@ -14,7 +14,7 @@
    </description>

    <properties>
-        <revision>5.3.1-BETA2</revision>
+        <revision>1.0.0</revision>
    </properties>

    <dependencyManagement>
--- a/kubernetes/admin.conf
+++ b/kubernetes/admin.conf
@@ -0,0 +1,19 @@
+apiVersion: v1
+clusters:
+- cluster:
+    certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURCVENDQWUyZ0F3SUJBZ0lJZUZmQTdvaWJER1V3RFFZSktvWklodmNOQVFFTEJRQXdGVEVUTUJFR0ExVUUKQXhNS2EzVmlaWEp1WlhSbGN6QWVGdzB5TlRBM01UVXhOVE01TkRCYUZ3MHpOVEEzTVRNeE5UUTBOREJhTUJVeApFekFSQmdOVkJBTVRDbXQxWW1WeWJtVjBaWE13Z2dFaU1BMEdDU3FHU0liM0RRRUJBUVVBQTRJQkR3QXdnZ0VLCkFvSUJBUUQ1akVWTi9oQWJtK1dnOGk2bnlOdEo5N0E5S2taSVVQdHgrd1EwTXUzNzRtZWVzNmFuOGxQcHp0UlAKNXhqZ1FxNTBiR0FUbmVJY2IycHlmU1FsYnpKNVJDL0JtamQ0WHZRN3h4cHpYZlhJZDhjWHFRVTlzYVozVmhtbwp3Rnl3UEd0R05kVjhvZmhxQ2UxNTh0dzFvZjBaODA3VWVkQmZqKzdNWG1mN0FWa1JuT3ROejdOU0VoWURRdlh0CkRML3pyem9aVG4rcGxUbFNKSFVOa0RQaWFyRW45SHdLNDI3OU5idG1WMXlLMDBzQS9MWVJxK2wvaHVBekQ2eDUKN0pVRnFjRmlHQVU2YlpOQjJid1ZvSUViZnJQK25oZThDQXZQNkIyTTIvTzNJN2N0ZmZCbk5oSnBjUG1MTnRyYwpuTm95YjNFQU1ZUExaazlJUmxDcUJwZ1dUR2xwQWdNQkFBR2pXVEJYTUE0R0ExVWREd0VCL3dRRUF3SUNwREFQCkJnTlZIUk1CQWY4RUJUQURBUUgvTUIwR0ExVWREZ1FXQkJUbDB2dHpkbzJ3cjFqSWRwdnZiNVlMR0ZjcTR6QVYKQmdOVkhSRUVEakFNZ2dwcmRXSmxjbTVsZEdWek1BMEdDU3FHU0liM0RRRUJDd1VBQTRJQkFRQUpxOTVpa1BmWAptaE1mNStuRzZJVGlMdDRWRGx1NVliVktjWVpOd0h1TGVZSC95bWVZZVRCdWhMZXlqODVUTnlXQnFuNUUzaHo5CnJnYW5DZmh3MnRCYXF5OTBYckFCeGhGSlRJTk1zUTNsbm9MbTNzcGZybGs5ZmRSZTF4dTh6VFl3Myt3TW14TEoKNFRCMTJLYVhBS3RDRWZwTXdEYUlJQXUweFExRU1mU1pKZkM4T3FGaHJlL01TR3RRR05wRWpCWklWOEVwd25VRApsZnI3SG5WMEpTTXhUVlRxbTY3T09uSThTRXVUL3FHdmh6dklyQlBIcm5lMjI2eHRVaVJsUnhNTmJETUc2SjVoCkhhNW1jNTY2MFp1WFZ5RWJoTXJFOVJjb3FyYzlzbEZZemVHMjlpWXNRSjRaYWVlVDlLUlRNV1Q0OThEeGJ5YXEKbHlNT0R2ZGNJZ3ZyCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
+    server: https://10.10.10.10:6443
+  name: kubernetes
+contexts:
+- context:
+    cluster: kubernetes
+    user: kubernetes-admin
+  name: kubernetes-admin@kubernetes
+current-context: kubernetes-admin@kubernetes
+kind: Config
+preferences: {}
+users:
+- name: kubernetes-admin
+  user:
+    client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURLVENDQWhHZ0F3SUJBZ0lJRmk0aTFEOXVVb1F3RFFZSktvWklodmNOQVFFTEJRQXdGVEVUTUJFR0ExVUUKQXhNS2EzVmlaWEp1WlhSbGN6QWVGdzB5TlRBM01UVXhOVE01TkRCYUZ3MHlOakEzTVRVeE5UUTBOREJhTUR3eApIekFkQmdOVkJBb1RGbXQxWW1WaFpHMDZZMngxYzNSbGNpMWhaRzFwYm5NeEdUQVhCZ05WQkFNVEVHdDFZbVZ5CmJtVjBaWE10WVdSdGFXNHdnZ0VpTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElCRHdBd2dnRUtBb0lCQVFEbWZJUUEKVHZTTzkxbGw3M1lTR2tVTGFEK2cvRU5HdWpsSlVXZ3p0dmtXUHVHekp5dmY3OE4rN3QwRGxSTjVoaWQ0Qng3UQp6QndzaWhTclFFU3FWRWd6MWpjMG91dUZoaEZRZDFCZWpHQXEzeDRsYzFPdHR6MkloOEU4b2llN3Q4cWFTT2VSCkplTGVvYnpFUkRiQ1FZMlN6Q2NlaHpzTW95b3pyVjdsT1Ewd240NzRNL25CdmlzVzE0QThCZGtSUXh5WU5DTlMKV2cxYjB3OHM0dTdTZnNpVUEzZll1Y1liS2VadCtEdWR5ZmRPNHRsUExYUEFCUjJrVElOdk9wcmNrOWw2L25DNQpiVDVJSld6bW9xY2UvNDZqaVc5RzBidTlvNWNjbHhVMU9CQWRISWxSVzBKMFpUaWtQWEltQVN2dndvUmt2RXIxCk41QXhFSDJrRkdhRjdndC9BZ01CQUFHalZqQlVNQTRHQTFVZER3RUIvd1FFQXdJRm9EQVRCZ05WSFNVRUREQUsKQmdnckJnRUZCUWNEQWpBTUJnTlZIUk1CQWY4RUFqQUFNQjhHQTFVZEl3UVlNQmFBRk9YUyszTjJqYkN2V01oMgptKzl2bGdzWVZ5cmpNQTBHQ1NxR1NJYjNEUUVCQ3dVQUE0SUJBUUNoL01VYkw0UWdTSFZ4VTM3Y2NiRnpOenRIClYzbDRyWFRMSGN0d0FYMk5RTmtxMHZlbERYWG14NTdhRVo5d2R6Tzhpajd0L3pKOWZkS0JsSHF6eTBLRXJmVTQKSXlvNUFzdWNWWDZJV3dpWXZ2Tjh6c1IybE9nNTB4QnN0WmxmV3lDdnprSGwrRFpGNytqQ0Y2cDNLVHBiK000RQp4eEpVY3lRU2ZoODdjUHRjaG1RRWxXTWN6eDFvdFRxK0dZc0k4SmRWNENiNzU2ZEkxWGovbXVReUl4L3NSanJZCnZOdE1YV1RnNUZzYU4yRmVuM2hOajZZN09lTDNoVFA3cm1qenl1UUYxQUxuYlpTNy9wZG94bHFxanpqdHpzOG4KUlNkWFlFMnNraGV2K3J0SjErYVk2RmRTaXBWamJyZWZLSzRmM1QzWWhhU2FkMVMrdnNmcTlIM0FTazErCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
+    client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcEFJQkFBS0NBUUVBNW55RUFFNzBqdmRaWmU5MkVocEZDMmcvb1B4RFJybzVTVkZvTTdiNUZqN2hzeWNyCjMrL0RmdTdkQTVVVGVZWW5lQWNlME13Y0xJb1VxMEJFcWxSSU05WTNOS0xyaFlZUlVIZFFYb3hnS3Q4ZUpYTlQKcmJjOWlJZkJQS0ludTdmS21ram5rU1hpM3FHOHhFUTJ3a0dOa3N3bkhvYzdES01xTTYxZTVUa05NSitPK0RQNQp3YjRyRnRlQVBBWFpFVU1jbURRalVsb05XOU1QTE9MdTBuN0lsQU4zMkxuR0d5bm1iZmc3bmNuM1R1TFpUeTF6CndBVWRwRXlEYnpxYTNKUFpldjV3dVcwK1NDVnM1cUtuSHYrT280bHZSdEc3dmFPWEhKY1ZOVGdRSFJ5SlVWdEMKZEdVNHBEMXlKZ0VyNzhLRVpMeEs5VGVRTVJCOXBCUm1oZTRMZndJREFRQUJBb0lCQUFOc2R4T0FHTDdrNnJXSwpiSkVSUmRSSkRLVHFDbC9MRlYzQzhVN1BXWHpjbTBLcmdzblZTR3lpeExLd2JMVWg2b1VzYWVkRkdPZ0tkd3NpCkxjTHY5SkNjam41Z0t5cDFGdDNBbi9kL2sxQWZ0MVZzRktLZ2RiQUpBRFJUM2s0NkNTN29oVlFSSVlFWUd2TTUKWml6VmgzSldTUUI1bHNWMXlRTXlnSlhjRnBlUngvZm1zeVZyM3JXd2w2aVBOME03bUgwdHkzNzBULzRJM3lnMAp4QjlFUlhVWlVFL1p5VDBEMDQyejN4UGNsZWYrRmtiVkFwY09OdDNKd0dYSDFQeUhFTkd6andsTGk2ZjNYTHNRCnpLWTEyZm1ZSElyQXk1M0Q0c3B3LzhPeEhUOXVpUVFra1FyTGZJRjFyUmtIbVJrdHUxUng2cWF4RnlrWGxMK0YKTG4xcjNRRUNnWUVBNnRFcCtLc3FKR0RzRVJzTENDVUZuSmIzV0dNWDEzSFVWajB2WDBlQktFWDZJVGloUTZxago5R0FoOHFFcjkzZjNjY21ORkQ5QU54Q3FBVFVuUlowUC9Ldy9FSlBhR2N2SmdacWtGN3lTb0RWdkxnMk9MR0ttCjRnUVNndWYwMEthZXJ5MHkweDBUb1JZRTQwUmxBWFRGdnBVT1FDTzlOWTBLZHBTcnF1M0hXUUVDZ1lFQSswZFgKQ3FlWjZKWENEbktxSWFydUJuRHNyRHV6a0dwY0JwK0VJOWxBZmljdFkzZTBTNGdLdWdpNm1ZYUFXRTdWeFNqOApicnpvcjFwRzBMYnMzbzMvWGRyZ1VNMHlIcktHbVloV2QzT21WMTV1NVJhNTdpUERYWktYTUNvT2lkN3lmZzR0CnBVaytEYVNHZzJOVlpNbGxrRUFxWnJLRC9jUEhlNmtBVk9ERTVIOENnWUFNa2EyaGRlZ0hrbmlRWWRZeFZXbjcKZThrNW5mUkV2LzhScnF5K2VPRmMrb0h0RFU3MGhFbktadXJxUmQ1SW5NOU44Ky90U1lWeWJSM3NlcC9qaGdpNQpDYTlHZitPSXhmTy9VRHZBV1lPdnQ2eC8xcEhwcGs0d2d1OUt1b2ZNTTE4REdYUkRBS2R3VS9GbkNONHZPY1RyCjhxYVVvRlVjYkxSR3JLYVR1NjZVQVFLQmdRQ1cwUGUrTG1BakNCZWtJbEJZeXNYNFdiakRtMFdvTFI0MDMzTXAKTFJFWFpwNUljQ1ZubkN5TUFnYzFkRlArTExzRGpoa013aGVLZjgyM0ljUER4RWg4WlkxekVlVytKUHJDbGVFSAo2d0x3dDM0cHc5MHV3SXBXMUZBb0dXWUdmQ2poWGRNcHZHOGhNeG1GTEk2cFluT3lBOEV2U0lBT1JINnJpd0RtCjhNMWNNd0tCZ1FDd2tOOXRka29mWUw2a1FVSGsrRGhUeFJZUEg5aFlmd0VQWStEellSSXVLS1FTN05SbG01SXcKQ1pRWFIzMW9oNi9tWVNUUDZEb2VRZzNUUGE5SnhWaXdvbUJ6Y1crNjNlMkpnV2hvd2NPTGlEbFRMVjZQUWJLbwpFUFFidDQwbmI1Y3JIZmsvd2dDd05Lby9kSzBKNlgzNU1jRk1EOFZVVmJZclJRaDdRdjYzQ2c9PQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo=
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
    <description>礼薄管理系统</description>

    <properties>
-        <revision>5.3.1-BETA2</revision>
+        <revision>1.0.0</revision>
        <spring-boot.version>3.4.4</spring-boot.version>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
--- a/script/docker/docker-compose.yml
+++ b/script/docker/docker-compose.yml
@@ -98,7 +98,7 @@ services:
    network_mode: "host"

  ruoyi-server1:
-    image: ruoyi/ruoyi-server:5.3.1-BETA2
+    image: ruoyi/ruoyi-server:1.0.0
    container_name: ruoyi-server1
    environment:
      # 时区上海
@@ -113,7 +113,7 @@ services:
    network_mode: "host"

  ruoyi-server2:
-    image: ruoyi/ruoyi-server:5.3.1-BETA2
+    image: ruoyi/ruoyi-server:1.0.0
    container_name: ruoyi-server2
    environment:
      # 时区上海
@@ -128,7 +128,7 @@ services:
    network_mode: "host"

  ruoyi-monitor-admin:
-    image: ruoyi/ruoyi-monitor-admin:5.3.1-BETA2
+    image: ruoyi/ruoyi-monitor-admin:1.0.0
    container_name: ruoyi-monitor-admin
    environment:
      # 时区上海
@@ -140,7 +140,7 @@ services:
    network_mode: "host"

  ruoyi-snailjob-server:
-    image: ruoyi/ruoyi-snailjob-server:5.3.1-BETA2
+    image: ruoyi/ruoyi-snailjob-server:1.0.0
    container_name: ruoyi-snailjob-server
    environment:
      # 时区上海