From 377133dc73c95196b38678f25fe3798445c04577 Mon Sep 17 00:00:00 2001 From: XinWei <2718030729@qq.com> Date: Wed, 21 Aug 2024 16:06:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?xxl-job=E8=B7=B3=E8=BD=AC=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ludu-job-admin-biz/src/main/resources/templates/login.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ludu-job-admin/ludu-job-admin-biz/src/main/resources/templates/login.ftl b/ludu-job-admin/ludu-job-admin-biz/src/main/resources/templates/login.ftl index 3219cf283..8638b9321 100644 --- a/ludu-job-admin/ludu-job-admin-biz/src/main/resources/templates/login.ftl +++ b/ludu-job-admin/ludu-job-admin-biz/src/main/resources/templates/login.ftl @@ -47,9 +47,9 @@ */ function ssoLogin() { const clientId = 'ludu-job-admin'; // 可以改写成，你的 clientId - const redirectUri = encodeURIComponent('http://127.0.0.1:9090/xxl-job-admin/toLogin'); // 注意，需要使用 encodeURIComponent 编码地址 + const redirectUri = encodeURIComponent('https://mt.ptzykjgs.com/xxl-job-admin/toLogin'); // 注意，需要使用 encodeURIComponent 编码地址 const responseType = 'code'; // 1）授权码模式，对应 code；2）简化模式，对应 token - window.location.href = 'http://127.0.0.1/admin/sso?client_id=' + clientId + window.location.href = 'https://mt.ptzykjgs.com/admin/sso?client_id=' + clientId + '&redirect_uri=' + redirectUri + '&response_type=' + responseType; } From a8d4039fea333d28ee5bdb330bce4cf1dfb2b4f5 Mon Sep 17 00:00:00 2001 From: XinWei <2718030729@qq.com> Date: Wed, 21 Aug 2024 16:28:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9E=84=E5=BB=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 81 +++++++------------ ludu-job-admin/ludu-job-admin-biz/Dockerfile | 8 +- ludu-job-admin/ludu-job-admin-biz/run.sh | 2 +- .../ludu-module-parking-biz/Dockerfile | 4 +- .../ludu-module-ticketing-biz/Dockerfile | 4 +- yudao-gateway/Dockerfile | 2 +- .../yudao-module-infra-biz/Dockerfile | 4 +- .../yudao-module-system-biz/Dockerfile | 4 +- 8 files changed, 42 insertions(+), 67 deletions(-) diff --git a/.drone.yml b/.drone.yml index 5a080214b..d5cd9fc0d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -60,7 +60,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行 - cp ./ludu-module-datacenter/ludu-module-datacenter-biz/Dockerfile /app/build/ludu-module-datacenter - cp ./ludu-module-datacenter/ludu-module-datacenter-biz/run.sh /app/build/ludu-module-datacenter - - name: build-infra-and-copy # 构建基础模块和复制票务停车场到轮渡服务器 + - name: copy-to-object # 构建基础模块和复制票务停车场到轮渡服务器 image: appleboy/drone-ssh # SSH工具镜像 @@ -80,51 +80,22 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行 script: - -# - echo "start run.sh" -# - cd /ludu/maven/build/yudao-gateway/ -# - chmod +x ./run.sh # 更改为可执行脚本 -# - ./run.sh || echo "yudao-gateway build failed" # 运行脚本打包应用镜像并运行 - -# - cd /ludu/maven/build/yudao-module-system/ -# - chmod +x ./run.sh # 更改为可执行脚本 -# - ./run.sh || echo "yudao-module-system build failed" # 运行脚本打包应用镜像并运行 - -# - cd /ludu/maven/build/yudao-module-infra/ -# - chmod +x ./run.sh # 更改为可执行脚本 -# - ./run.sh || echo "yudao-module-infra build failed" # 运行脚本打包应用镜像并运行 -# -# - cd /ludu/maven/build/ludu-job-admin/ -# - chmod +x ./run.sh # 更改为可执行脚本 -# - ./run.sh || echo "ludu-job-admin build failed" # 运行脚本打包应用镜像并运行 - - - cd /ludu/maven/build/ludu-module-datacenter/ - - chmod +x ./run.sh # 更改为可执行脚本 - - ./run.sh || echo "ludu-module-datacenter build failed" # 运行脚本打包应用镜像并运行 - - - cd /ludu/maven/build/ludu-module-ticketing/ - - chmod +x ./run.sh # 更改为可执行脚本 - - ./run.sh || echo "ludu-module-ticketing build failed" # 运行脚本打包应用镜像并运行 - - - cd /ludu/maven/build/ludu-module-parking/ - - chmod +x ./run.sh # 更改为可执行脚本 - - ./run.sh || echo "ludu-module-parking build failed" # 运行脚本打包应用镜像并运行 - - echo "start copy" - scp -r /ludu/maven/build/yudao-gateway root@121.36.203.133:/ludu/maven/build - echo "gateway done" - - scp -r /ludu/maven/build/yudao-module-system root@121.36.203.133:/ludu/maven/build - echo "system done" -# - echo "start copy" -# - scp -r /ludu/maven/build/ludu-module-ticketing root@120.46.37.243:/ludu/maven/build -# - echo "ticket done" -# - scp -r /ludu/maven/build/ludu-module-parking root@120.46.37.243:/ludu/maven/build -# - echo "park done" + - scp -r /ludu/maven/build/ludu-module-ticketing root@121.36.203.133:/ludu/maven/build + - echo "ticketing done" + - scp -r /ludu/maven/build/ludu-module-parking root@121.36.203.133:/ludu/maven/build + - echo "parking done" + - scp -r /ludu/maven/build/yudao-module-infra root@121.36.203.133:/ludu/maven/build + - echo "infra done" + - scp -r /ludu/maven/build/ludu-job-admin root@121.36.203.133:/ludu/maven/build + - echo "job done" # - scp -r /ludu/maven/build/ludu-module-datacenter root@120.46.37.243:/ludu/maven/build -# - echo "datecenter done" - - - +# - echo "system done" + # - name: build-other-service # # image: appleboy/drone-ssh # SSH工具镜像 @@ -144,22 +115,11 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行 # command_timeout: 5m # 远程执行命令超时时间 # # script: -# - cd /ludu/maven/build/yudao-gateway/ -# - chmod +x ./run.sh # 更改为可执行脚本 -# - ./run.sh || echo "ludu-module-ticketing build failed" # 运行脚本打包应用镜像并运行 -# -## - cd /ludu/maven/build/ludu-module-ticketing/ -## - chmod +x ./run.sh # 更改为可执行脚本 -## - ./run.sh || echo "ludu-module-ticketing build failed" # 运行脚本打包应用镜像并运行 -# -## - cd /ludu/maven/build/ludu-module-parking/ -## - chmod +x ./run.sh # 更改为可执行脚本 -## - ./run.sh || echo "ludu-module-parking build failed" # 运行脚本打包应用镜像并运行 # # - cd /ludu/maven/build/ludu-module-datacenter/ # - chmod +x ./run.sh # 更改为可执行脚本 # - ./run.sh || echo "ludu-module-datacenter build failed" # 运行脚本打包应用镜像并运行 - - name: build-gatewayAndSystem-service + - name: object-build image: appleboy/drone-ssh # SSH工具镜像 @@ -185,6 +145,23 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行 - cd /ludu/maven/build/yudao-module-system/ - chmod +x ./run.sh # 更改为可执行脚本 - ./run.sh || echo "ludu-module-datacenter build failed" # 运行脚本打包应用镜像并运行 + + - cd /ludu/maven/build/ludu-module-ticketing/ + - chmod +x ./run.sh # 更改为可执行脚本 + - ./run.sh || echo "ludu-module-ticketing build failed" # 运行脚本打包应用镜像并运行 + + - cd /ludu/maven/build/ludu-module-parking/ + - chmod +x ./run.sh # 更改为可执行脚本 + - ./run.sh || echo "ludu-module-parking build failed" # 运行脚本打包应用镜像并运行 + + - cd /ludu/maven/build/yudao-module-infra/ + - chmod +x ./run.sh # 更改为可执行脚本 + - ./run.sh || echo "yudao-module-infra build failed" # 运行脚本打包应用镜像并运行 + + - cd /ludu/maven/build/ludu-job-admin/ + - chmod +x ./run.sh # 更改为可执行脚本 + - ./run.sh || echo "ludu-job-admin build failed" # 运行脚本打包应用镜像并运行 + volumes: # 定义流水线挂载目录，用于共享数据 - name: maven-build diff --git a/ludu-job-admin/ludu-job-admin-biz/Dockerfile b/ludu-job-admin/ludu-job-admin-biz/Dockerfile index 7a551a98b..ece4a0104 100644 --- a/ludu-job-admin/ludu-job-admin-biz/Dockerfile +++ b/ludu-job-admin/ludu-job-admin-biz/Dockerfile @@ -1,6 +1,4 @@ -## AdoptOpenJDK 停止发布 OpenJDK 二进制，而 Eclipse Temurin 是它的延伸，提供更好的稳定性 -## 感谢复旦核博士的建议！灰子哥，牛皮！ -FROM eclipse-temurin:8-jre +FROM openjdk:8-jre ## 创建目录，并使用它作为工作目录 RUN mkdir -p /ludu-job-admin-biz @@ -11,10 +9,10 @@ COPY ./target/ludu-job-admin-biz.jar app.jar ## 设置 TZ 时区 ENV TZ=Asia/Shanghai ## 设置 JAVA_OPTS 环境变量，可通过 docker run -e "JAVA_OPTS=" 进行覆盖 -ENV JAVA_OPTS="-Xms512m -Xmx512m -Djava.security.egd=file:/dev/./urandom" +ENV JAVA_OPTS="-Xms256m -Xmx256m -Djava.security.egd=file:/dev/./urandom" ## 暴露后端项目的 9090 端口 -EXPOSE 9090 +EXPOSE 48084 ## 启动后端项目 CMD java ${JAVA_OPTS} -jar app.jar diff --git a/ludu-job-admin/ludu-job-admin-biz/run.sh b/ludu-job-admin/ludu-job-admin-biz/run.sh index fa6c9269a..0fb5eef26 100644 --- a/ludu-job-admin/ludu-job-admin-biz/run.sh +++ b/ludu-job-admin/ludu-job-admin-biz/run.sh @@ -13,4 +13,4 @@ docker rmi ${app_name}:${app_version} echo '----build image----' docker buildx build -f Dockerfile -t ${app_name}:${app_version} . echo '----start container----' -docker run -d -p 9090:9090 --name ${app_name} ${app_name}:${app_version} \ No newline at end of file +docker run -d -p 48084:9090 --name ${app_name} ${app_name}:${app_version} \ No newline at end of file diff --git a/ludu-module-parking/ludu-module-parking-biz/Dockerfile b/ludu-module-parking/ludu-module-parking-biz/Dockerfile index de9f365d2..e02d024a9 100644 --- a/ludu-module-parking/ludu-module-parking-biz/Dockerfile +++ b/ludu-module-parking/ludu-module-parking-biz/Dockerfile @@ -1,6 +1,6 @@ ## AdoptOpenJDK 停止发布 OpenJDK 二进制，而 Eclipse Temurin 是它的延伸，提供更好的稳定性 ## 感谢复旦核博士的建议！灰子哥，牛皮！ -FROM eclipse-temurin:8-jre +FROM openjdk:8-jre ## 创建目录，并使用它作为工作目录 RUN mkdir -p /ludu-module-parking-biz @@ -11,7 +11,7 @@ COPY ./target/ludu-module-parking-biz.jar app.jar ## 设置 TZ 时区 ENV TZ=Asia/Shanghai ## 设置 JAVA_OPTS 环境变量，可通过 docker run -e "JAVA_OPTS=" 进行覆盖 -ENV JAVA_OPTS="-Xms512m -Xmx512m -Djava.security.egd=file:/dev/./urandom" +ENV JAVA_OPTS="-Xms256m -Xmx256m -Djava.security.egd=file:/dev/./urandom" ## 暴露后端项目的 48090 端口 EXPOSE 48090 diff --git a/ludu-module-ticketing/ludu-module-ticketing-biz/Dockerfile b/ludu-module-ticketing/ludu-module-ticketing-biz/Dockerfile index 633326843..b62dc0fe5 100644 --- a/ludu-module-ticketing/ludu-module-ticketing-biz/Dockerfile +++ b/ludu-module-ticketing/ludu-module-ticketing-biz/Dockerfile @@ -1,6 +1,6 @@ ## AdoptOpenJDK 停止发布 OpenJDK 二进制，而 Eclipse Temurin 是它的延伸，提供更好的稳定性 ## 感谢复旦核博士的建议！灰子哥，牛皮！ -FROM eclipse-temurin:8-jre +FROM openjdk:8-jre ## 创建目录，并使用它作为工作目录 RUN mkdir -p /ludu-module-ticketing-biz @@ -11,7 +11,7 @@ COPY ./target/ludu-module-ticketing-biz.jar app.jar ## 设置 TZ 时区 ENV TZ=Asia/Shanghai ## 设置 JAVA_OPTS 环境变量，可通过 docker run -e "JAVA_OPTS=" 进行覆盖 -ENV JAVA_OPTS="-Xms512m -Xmx512m -Djava.security.egd=file:/dev/./urandom" +ENV JAVA_OPTS="-Xms256m -Xmx256m -Djava.security.egd=file:/dev/./urandom" ## 暴露后端项目的 48088 端口 EXPOSE 48088 diff --git a/yudao-gateway/Dockerfile b/yudao-gateway/Dockerfile index 64c26a1ea..e1b39c1fa 100644 --- a/yudao-gateway/Dockerfile +++ b/yudao-gateway/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:8-jre +FROM openjdk:8-jre ## 创建目录，并使用它作为工作目录 RUN mkdir -p /yudao-gateway diff --git a/yudao-module-infra/yudao-module-infra-biz/Dockerfile b/yudao-module-infra/yudao-module-infra-biz/Dockerfile index 756ace135..cdeeb575f 100644 --- a/yudao-module-infra/yudao-module-infra-biz/Dockerfile +++ b/yudao-module-infra/yudao-module-infra-biz/Dockerfile @@ -1,6 +1,6 @@ ## AdoptOpenJDK 停止发布 OpenJDK 二进制，而 Eclipse Temurin 是它的延伸，提供更好的稳定性 ## 感谢复旦核博士的建议！灰子哥，牛皮！ -FROM eclipse-temurin:8-jre +FROM openjdk:8-jre ## 创建目录，并使用它作为工作目录 RUN mkdir -p /yudao-module-infra-biz @@ -11,7 +11,7 @@ COPY ./target/yudao-module-infra-biz.jar app.jar ## 设置 TZ 时区 ENV TZ=Asia/Shanghai ## 设置 JAVA_OPTS 环境变量，可通过 docker run -e "JAVA_OPTS=" 进行覆盖 -ENV JAVA_OPTS="-Xms512m -Xmx512m -Djava.security.egd=file:/dev/./urandom" +ENV JAVA_OPTS="-Xms256m -Xmx256m -Djava.security.egd=file:/dev/./urandom" ## 暴露后端项目的 48082 端口 EXPOSE 48082 diff --git a/yudao-module-system/yudao-module-system-biz/Dockerfile b/yudao-module-system/yudao-module-system-biz/Dockerfile index 64d05042d..bb5164f11 100644 --- a/yudao-module-system/yudao-module-system-biz/Dockerfile +++ b/yudao-module-system/yudao-module-system-biz/Dockerfile @@ -1,6 +1,6 @@ ## AdoptOpenJDK 停止发布 OpenJDK 二进制，而 Eclipse Temurin 是它的延伸，提供更好的稳定性 ## 感谢复旦核博士的建议！灰子哥，牛皮！ -FROM eclipse-temurin:8-jre +FROM openjdk:8-jre ## 创建目录，并使用它作为工作目录 RUN mkdir -p /yudao-module-system-biz @@ -11,7 +11,7 @@ COPY ./target/yudao-module-system-biz.jar app.jar ## 设置 TZ 时区 ENV TZ=Asia/Shanghai ## 设置 JAVA_OPTS 环境变量，可通过 docker run -e "JAVA_OPTS=" 进行覆盖 -ENV JAVA_OPTS="-Xms512m -Xmx512m -Djava.security.egd=file:/dev/./urandom" +ENV JAVA_OPTS="-Xms256m -Xmx256m -Djava.security.egd=file:/dev/./urandom" ## 暴露后端项目的 48081 端口 EXPOSE 48081