From c6d2c74896b627c38b1211eec4987658aa3f1ad9 Mon Sep 17 00:00:00 2001 From: XinWei <2718030729@qq.com> Date: Mon, 26 Aug 2024 18:08:25 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=8E=AF=E5=A2=83=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ludu-job-admin/ludu-job-admin-biz/Dockerfile | 2 +- .../ludu-job-admin-biz/src/main/resources/bootstrap.yaml | 2 +- ludu-module-datacenter/ludu-module-datacenter-biz/Dockerfile | 2 +- .../src/main/resources/bootstrap.yaml | 2 +- ludu-module-parking/ludu-module-parking-biz/Dockerfile | 2 +- .../ludu-module-parking-biz/src/main/resources/bootstrap.yaml | 2 +- ludu-module-ticketing/ludu-module-ticketing-biz/Dockerfile | 2 +- .../ludu-module-ticketing-biz/src/main/resources/bootstrap.yaml | 2 +- yudao-gateway/Dockerfile | 2 +- yudao-gateway/src/main/resources/bootstrap.yaml | 2 +- yudao-module-infra/yudao-module-infra-biz/Dockerfile | 2 +- .../yudao-module-infra-biz/src/main/resources/bootstrap.yaml | 2 +- yudao-module-system/yudao-module-system-biz/Dockerfile | 2 +- .../yudao-module-system-biz/src/main/resources/bootstrap.yaml | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ludu-job-admin/ludu-job-admin-biz/Dockerfile b/ludu-job-admin/ludu-job-admin-biz/Dockerfile index ece4a0104..3f87874aa 100644 --- a/ludu-job-admin/ludu-job-admin-biz/Dockerfile +++ b/ludu-job-admin/ludu-job-admin-biz/Dockerfile @@ -15,4 +15,4 @@ ENV JAVA_OPTS="-Xms256m -Xmx256m -Djava.security.egd=file:/dev/./urandom" EXPOSE 48084 ## 启动后端项目 -CMD java ${JAVA_OPTS} -jar app.jar +CMD java ${JAVA_OPTS} -jar app.jar --spring.profiles.active=dev diff --git a/ludu-job-admin/ludu-job-admin-biz/src/main/resources/bootstrap.yaml b/ludu-job-admin/ludu-job-admin-biz/src/main/resources/bootstrap.yaml index 430c2cdaf..79517ff5c 100644 --- a/ludu-job-admin/ludu-job-admin-biz/src/main/resources/bootstrap.yaml +++ b/ludu-job-admin/ludu-job-admin-biz/src/main/resources/bootstrap.yaml @@ -3,7 +3,7 @@ spring: name: job-server profiles: - active: dev + active: local server: port: 9090 diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/Dockerfile b/ludu-module-datacenter/ludu-module-datacenter-biz/Dockerfile index 27689820a..aa87bcfe0 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/Dockerfile +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/Dockerfile @@ -17,4 +17,4 @@ ENV JAVA_OPTS="-Xms512m -Xmx512m -Djava.security.egd=file:/dev/./urandom" EXPOSE 48092 ## 启动后端项目 -CMD java ${JAVA_OPTS} -jar app.jar \ No newline at end of file +CMD java ${JAVA_OPTS} -jar app.jar --spring.profiles.active=dev \ No newline at end of file diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/resources/bootstrap.yaml b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/resources/bootstrap.yaml index a432f9679..2d4514650 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/resources/bootstrap.yaml +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/resources/bootstrap.yaml @@ -3,7 +3,7 @@ spring: name: datacenter-server profiles: - active: dev + active: local server: port: 48092 diff --git a/ludu-module-parking/ludu-module-parking-biz/Dockerfile b/ludu-module-parking/ludu-module-parking-biz/Dockerfile index e02d024a9..f5f9a23ef 100644 --- a/ludu-module-parking/ludu-module-parking-biz/Dockerfile +++ b/ludu-module-parking/ludu-module-parking-biz/Dockerfile @@ -17,4 +17,4 @@ ENV JAVA_OPTS="-Xms256m -Xmx256m -Djava.security.egd=file:/dev/./urandom" EXPOSE 48090 ## 启动后端项目 -CMD java ${JAVA_OPTS} -jar app.jar +CMD java ${JAVA_OPTS} -jar app.jar --spring.profiles.active=dev diff --git a/ludu-module-parking/ludu-module-parking-biz/src/main/resources/bootstrap.yaml b/ludu-module-parking/ludu-module-parking-biz/src/main/resources/bootstrap.yaml index e2bac5d42..79e11b996 100644 --- a/ludu-module-parking/ludu-module-parking-biz/src/main/resources/bootstrap.yaml +++ b/ludu-module-parking/ludu-module-parking-biz/src/main/resources/bootstrap.yaml @@ -3,7 +3,7 @@ spring: name: parking-server profiles: - active: dev + active: local server: port: 48090 diff --git a/ludu-module-ticketing/ludu-module-ticketing-biz/Dockerfile b/ludu-module-ticketing/ludu-module-ticketing-biz/Dockerfile index b62dc0fe5..990a24eb8 100644 --- a/ludu-module-ticketing/ludu-module-ticketing-biz/Dockerfile +++ b/ludu-module-ticketing/ludu-module-ticketing-biz/Dockerfile @@ -17,4 +17,4 @@ ENV JAVA_OPTS="-Xms256m -Xmx256m -Djava.security.egd=file:/dev/./urandom" EXPOSE 48088 ## 启动后端项目 -CMD java ${JAVA_OPTS} -jar app.jar +CMD java ${JAVA_OPTS} -jar app.jar --spring.profiles.active=dev diff --git a/ludu-module-ticketing/ludu-module-ticketing-biz/src/main/resources/bootstrap.yaml b/ludu-module-ticketing/ludu-module-ticketing-biz/src/main/resources/bootstrap.yaml index 9ced7261f..8122f7fe2 100644 --- a/ludu-module-ticketing/ludu-module-ticketing-biz/src/main/resources/bootstrap.yaml +++ b/ludu-module-ticketing/ludu-module-ticketing-biz/src/main/resources/bootstrap.yaml @@ -3,7 +3,7 @@ spring: name: ticket-server profiles: - active: dev + active: local server: port: 48088 diff --git a/yudao-gateway/Dockerfile b/yudao-gateway/Dockerfile index e1b39c1fa..99224db69 100644 --- a/yudao-gateway/Dockerfile +++ b/yudao-gateway/Dockerfile @@ -15,4 +15,4 @@ ENV JAVA_OPTS="-Xms512m -Xmx512m -Djava.security.egd=file:/dev/./urandom" EXPOSE 48080 ## 启动后端项目 -CMD java ${JAVA_OPTS} -jar app.jar +CMD java ${JAVA_OPTS} -jar app.jar --spring.profiles.active=dev diff --git a/yudao-gateway/src/main/resources/bootstrap.yaml b/yudao-gateway/src/main/resources/bootstrap.yaml index e7e8ccdea..3eed7be68 100644 --- a/yudao-gateway/src/main/resources/bootstrap.yaml +++ b/yudao-gateway/src/main/resources/bootstrap.yaml @@ -3,7 +3,7 @@ spring: name: gateway-server profiles: - active: dev + active: local server: port: 48080 diff --git a/yudao-module-infra/yudao-module-infra-biz/Dockerfile b/yudao-module-infra/yudao-module-infra-biz/Dockerfile index cdeeb575f..fe7d3c399 100644 --- a/yudao-module-infra/yudao-module-infra-biz/Dockerfile +++ b/yudao-module-infra/yudao-module-infra-biz/Dockerfile @@ -17,4 +17,4 @@ ENV JAVA_OPTS="-Xms256m -Xmx256m -Djava.security.egd=file:/dev/./urandom" EXPOSE 48082 ## 启动后端项目 -CMD java ${JAVA_OPTS} -jar app.jar +CMD java ${JAVA_OPTS} -jar app.jar --spring.profiles.active=dev diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/bootstrap.yaml b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/bootstrap.yaml index 5567d62f6..a276ad449 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/bootstrap.yaml +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/bootstrap.yaml @@ -3,7 +3,7 @@ spring: name: infra-server profiles: - active: dev + active: local server: port: 48082 diff --git a/yudao-module-system/yudao-module-system-biz/Dockerfile b/yudao-module-system/yudao-module-system-biz/Dockerfile index bb5164f11..a424ac048 100644 --- a/yudao-module-system/yudao-module-system-biz/Dockerfile +++ b/yudao-module-system/yudao-module-system-biz/Dockerfile @@ -17,4 +17,4 @@ ENV JAVA_OPTS="-Xms256m -Xmx256m -Djava.security.egd=file:/dev/./urandom" EXPOSE 48081 ## 启动后端项目 -CMD java ${JAVA_OPTS} -jar app.jar +CMD java ${JAVA_OPTS} -jar app.jar --spring.profiles.active=dev diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/bootstrap.yaml b/yudao-module-system/yudao-module-system-biz/src/main/resources/bootstrap.yaml index b97443e6e..273749c70 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/resources/bootstrap.yaml +++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/bootstrap.yaml @@ -3,7 +3,7 @@ spring: name: system-server profiles: - active: dev + active: local server: port: 48081 -- 2.47.2 From c63516102ece2283082304b695234d488c6ba3f4 Mon Sep 17 00:00:00 2001 From: XinWei <2718030729@qq.com> Date: Tue, 27 Aug 2024 15:04:58 +0800 Subject: [PATCH 2/3] =?UTF-8?q?datacenter=E5=A4=9A=E4=BD=99=E4=BE=9D?= =?UTF-8?q?=E8=B5=96=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yaml | 153 ------------------ .../ludu-module-datacenter-biz/pom.xml | 22 --- 2 files changed, 175 deletions(-) delete mode 100644 ludu-job-admin/ludu-job-admin-biz/src/main/resources/application-dev.yaml diff --git a/ludu-job-admin/ludu-job-admin-biz/src/main/resources/application-dev.yaml b/ludu-job-admin/ludu-job-admin-biz/src/main/resources/application-dev.yaml deleted file mode 100644 index f1e7e78cd..000000000 --- a/ludu-job-admin/ludu-job-admin-biz/src/main/resources/application-dev.yaml +++ /dev/null @@ -1,153 +0,0 @@ ---- #################### 数据库相关配置 #################### -spring: - # 数据源配置项 - autoconfigure: - exclude: - - com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure # 排除 Druid 的自动配置，使用 dynamic-datasource-spring-boot-starter 配置多数据源 - - de.codecentric.boot.admin.client.config.SpringBootAdminClientAutoConfiguration # 禁用 Spring Boot Admin 的 Client 的自动配置 - datasource: - druid: # Druid 【监控】相关的全局配置 - web-stat-filter: - enabled: true - stat-view-servlet: - enabled: true - allow: # 设置白名单，不填则允许所有访问 - url-pattern: /druid/* - login-username: # 控制台管理用户名和密码 - login-password: - filter: - stat: - enabled: true - log-slow-sql: true # 慢 SQL 记录 - slow-sql-millis: 100 - merge-sql: true - wall: - config: - multi-statement-allow: true - dynamic: # 多数据源配置 - druid: # Druid 【连接池】相关的全局配置 - initial-size: 1 # 初始连接数 - min-idle: 1 # 最小连接池数量 - max-active: 20 # 最大连接池数量 - max-wait: 600000 # 配置获取连接等待超时的时间，单位：毫秒 - time-between-eviction-runs-millis: 60000 # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位：毫秒 - min-evictable-idle-time-millis: 300000 # 配置一个连接在池中最小生存的时间，单位：毫秒 - max-evictable-idle-time-millis: 900000 # 配置一个连接在池中最大生存的时间，单位：毫秒 - validation-query: SELECT 1 FROM DUAL # 配置检测连接是否有效 - test-while-idle: true - test-on-borrow: false - test-on-return: false - primary: master - datasource: - master: - url: jdbc:mysql://101.43.112.107:3306/ludu_db?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 - # url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=true&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai # MySQL Connector/J 5.X 连接的示例 - # url: jdbc:postgresql://127.0.0.1:5432/ruoyi-vue-pro # PostgreSQL 连接的示例 - # url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例 - # url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=ruoyi-vue-pro # SQLServer 连接的示例 - # url: jdbc:dm://10.211.55.4:5236?schema=RUOYI_VUE_PRO # DM 连接的示例 - username: root - password: xpower1234 - # username: sa # SQL Server 连接的示例 - # password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W # SQL Server 连接的示例 - # username: SYSDBA # DM 连接的示例 - # password: SYSDBA # DM 连接的示例 - slave: # 模拟从库，可根据自己需要修改 - lazy: true # 开启懒加载，保证启动速度 - url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true - username: root - password: 123456 - ### datasource-pool - type: com.zaxxer.hikari.HikariDataSource - hikari: - minimum-idle: 10 - maximum-pool-size: 30 - auto-commit: true - idle-timeout: 30000 - pool-name: HikariCP - max-lifetime: 900000 - connection-timeout: 10000 - connection-test-query: SELECT 1 - validation-timeout: 1000 - ### xxl-job, email - mail: - host: smtp.qq.com - port: 25 - username: xxx@qq.com - from: xxx@qq.com - password: xxx - properties: - mail: - smtp: - auth: true - starttls: - enable: true - required: true - socketFactory: - class: javax.net.ssl.SSLSocketFactory - -### xxl-job, access token -xxl: - job: - accessToken: - ### xxl-job, i18n (default is zh_CN, and you can choose "zh_CN", "zh_TC" and "en") - i18n: zh_CN - ## xxl-job, triggerpool max size - triggerpool: - fast: - max: 200 - slow: - max: 100 - ### xxl-job, log retention days - logretentiondays: 30 - ---- #################### 服务保障相关配置 #################### - -# Lock4j 配置项 -lock4j: - acquire-timeout: 3000 # 获取分布式锁超时时间，默认为 3000 毫秒 - expire: 30000 # 分布式锁的超时时间，默认为 30 毫秒 - ---- #################### 监控相关配置 #################### - -# Actuator 监控端点的配置项 -management: - endpoints: - web: - base-path: /actuator # Actuator 提供的 API 接口的根目录。默认为 /actuator - exposure: - include: '*' # 需要开放的端点。默认值只打开 health 和 info 两个端点。通过设置 * ，可以开放所有端点。 - -# Spring Boot Admin 配置项 -spring: - boot: - admin: - # Spring Boot Admin Client 客户端的相关配置 - client: - instance: - service-host-type: IP # 注册实例时，优先使用 IP [IP, HOST_NAME, CANONICAL_HOST_NAME] - -# 日志文件配置 -logging: - level: - # 配置自己写的 MyBatis Mapper 打印日志 - cn.iocoder.yudao.module.system.dal.mysql: debug - cn.iocoder.yudao.module.system.dal.mysql.sensitiveword.SensitiveWordMapper: INFO # 配置 SensitiveWordMapper 的日志级别为 info - cn.iocoder.yudao.module.system.dal.mysql.sms.SmsChannelMapper: INFO # 配置 SmsChannelMapper 的日志级别为 info - ---- #################### 芋道相关配置 #################### - -# 芋道配置项，设置当前项目所有自定义的配置 -yudao: - env: # 多环境的配置项 - tag: ${HOSTNAME} - web: - admin-ui: - url: http://dashboard.yudao.iocoder.cn # Admin 管理后台 UI 的地址 - security: - mock-enable: true - xss: - enable: false - access-log: # 访问日志的配置项 - enable: false - demo: false # 关闭演示模式 diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/pom.xml b/ludu-module-datacenter/ludu-module-datacenter-biz/pom.xml index 9381e01ed..01f7394dd 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/pom.xml +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/pom.xml @@ -33,29 +33,12 @@ yudao-spring-boot-starter-env - - - cn.iocoder.cloud - yudao-module-system-api - ${revision} - - - cn.iocoder.cloud - yudao-module-infra-api - ${revision} - - cn.iocoder.cloud yudao-spring-boot-starter-biz-tenant - - - cn.iocoder.cloud - yudao-spring-boot-starter-security - org.springframework.boot @@ -91,11 +74,6 @@ spring-cloud-starter-alibaba-nacos-config - - - cn.iocoder.cloud - yudao-spring-boot-starter-mq - -- 2.47.2 From 7357b9710bc4fd2c772613641eb5f5e3e1f420da Mon Sep 17 00:00:00 2001 From: XinWei <2718030729@qq.com> Date: Tue, 27 Aug 2024 17:24:23 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9E=84=E5=BB=BA=E8=84=9A=E6=9C=AC?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone-datacenter.yml | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/.drone-datacenter.yml b/.drone-datacenter.yml index 05872647f..f2634ea77 100644 --- a/.drone-datacenter.yml +++ b/.drone-datacenter.yml @@ -52,7 +52,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行 - scp -r /ludu/maven/build/ludu-module-datacenter root@120.46.37.243:/ludu/maven/build - echo "datacenter done" - - name: build-other-service + - name: build-old-service image: appleboy/drone-ssh # SSH工具镜像 @@ -76,6 +76,37 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行 - chmod +x ./run.sh # 更改为可执行脚本 - ./run.sh || echo "ludu-module-datacenter build failed" # 运行脚本打包应用镜像并运行 + - name: build-new-service + + image: appleboy/drone-ssh # SSH工具镜像 + + settings: + + host: 121.36.203.133 # 远程连接地址 + + username: root # 远程连接账号 + + password: + + from_secret: ssh_password3 # 从Secret中读取SSH密码 + + port: 22 # 远程连接端口 + + command_timeout: 10m # 远程执行命令超时时间 + + script: + + - cd /root/ludu-cloud + - git pull origin master + - mvn package -Dmaven.test.skip=true + - port=48092 # 指定端口号 + - pid=$(lsof -t -i:$port) # 获取占用指定端口的进程号 + - if [ -n "$pid" ]; then # 如果进程号不为>>空，则杀死进程 + echo "Killing process $pid" + kill -9 $pid + fi + - nohup java -Xms256m -Xms256m -jar ludu-module-datacenter/ludu-module-datacenter-biz/target/ludu-module-datacenter-biz.jar > api.log & + volumes: # 定义流水线挂载目录，用于共享数据 - name: maven-build -- 2.47.2