fix: sql缺少字段补充、dockefile调整等

Dockerfile

@@ -1,43 +1,26 @@
-# 构建前端资源
+ARG BASEIMAGES=m.daocloud.io/docker.io/alpine:3.20.2
-FROM node:18-bookworm-slim as fe-builder
 
-WORKDIR /mayfly
+FROM ${BASEIMAGES} AS builder
+ARG TARGETARCH
 
-COPY mayfly_go_web .
+ARG MAYFLY_GO_VERSION
+ARG MAYFLY_GO_DIR_NAME=mayfly-go-linux-${TARGETARCH}
+ARG MAYFLY_GO_URL=https://gitee.com/dromara/mayfly-go/releases/download/${MAYFLY_GO_VERSION}/${MAYFLY_GO_DIR_NAME}.zip
 
-RUN yarn config set registry 'https://registry.npmmirror.com' && \
+RUN wget -cO mayfly-go.zip ${MAYFLY_GO_URL} && \
-    yarn install && \
+    unzip mayfly-go.zip && \
-    yarn build
+    mv ${MAYFLY_GO_DIR_NAME}/* /opt
 
-# 构建后端资源
-FROM golang:1.23 as be-builder
 
-ENV GOPROXY https://goproxy.cn
+FROM ${BASEIMAGES}
-WORKDIR /mayfly
 
-# Copy the go source for building server
+ARG TZ=Asia/Shanghai
-COPY server .
-
-RUN go mod tidy && go mod download
-
-COPY --from=fe-builder /mayfly/dist /mayfly/static/static
-
-# Build
-RUN GO111MODULE=on CGO_ENABLED=0 GOOS=linux \
-    go build -a -ldflags=-w \
-    -o mayfly-go main.go
-
-FROM debian:bookworm-slim
-
-RUN apt-get update && \
-    apt-get install -y ca-certificates expat libncurses5 && \
-    apt-get clean
-
-ENV TZ=Asia/Shanghai
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
-WORKDIR /mayfly
+COPY --from=builder /opt/mayfly-go /usr/local/bin/mayfly-go
 
-COPY --from=be-builder /mayfly/mayfly-go /usr/local/bin/mayfly-go
+WORKDIR /mayfly-go
 
-CMD ["mayfly-go"]
+EXPOSE 18888
+
+CMD ["mayfly-go"]

Dockerfile.sourcebuild

@@ -0,0 +1,39 @@
+# 构建前端资源
+FROM m.daocloud.io/docker.io/node:18-bookworm-slim as fe-builder
+
+WORKDIR /mayfly
+
+COPY mayfly_go_web .
+
+RUN yarn config set registry 'https://registry.npmmirror.com' && \
+    yarn install && \
+    yarn build
+
+# 构建后端资源
+FROM m.daocloud.io/docker.io/golang:1.23 as be-builder
+
+ENV GOPROXY https://goproxy.cn
+WORKDIR /mayfly
+
+# Copy the go source for building server
+COPY server .
+
+RUN go mod tidy && go mod download
+
+COPY --from=fe-builder /mayfly/dist /mayfly/static/static
+
+# Build
+RUN GO111MODULE=on CGO_ENABLED=0 GOOS=linux \
+    go build -a -ldflags=-w \
+    -o mayfly-go main.go
+
+FROM m.daocloud.io/docker.io/alpine:3.20.2
+
+ARG TZ=Asia/Shanghai
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+
+WORKDIR /mayfly-go
+
+COPY --from=be-builder /mayfly/mayfly-go /usr/local/bin/mayfly-go
+
+CMD ["mayfly-go"]

build_release.sh

@@ -105,8 +105,8 @@ function buildMac() {
 function buildDocker() {
     echo_yellow "-------------------构建docker镜像开始-------------------"
     imageVersion=$1
-    imageName="mayflygo/mayfly-go:${imageVersion}"
+    imageName="mayfly/mayfly-go:${imageVersion}"
-    docker build --platform linux/amd64 -t "${imageName}" .
+    docker build --platform linux/amd64 --build-arg MAYFLY_GO_VERSION="${imageVersion}" -t "${imageName}" .
     echo_green "docker镜像构建完成->[${imageName}]"
     echo_yellow "-------------------构建docker镜像结束-------------------"
 }
@@ -115,7 +115,7 @@ function buildxDocker() {
     echo_yellow "-------------------docker buildx构建镜像开始-------------------"
     imageVersion=$1
     imageName="ccr.ccs.tencentyun.com/mayfly/mayfly-go:${imageVersion}"
-    docker buildx build --push --platform linux/amd64,linux/arm64 -t "${imageName}" .
+    docker buildx build --push --platform linux/amd64,linux/arm64 --build-arg MAYFLY_GO_VERSION="${imageVersion}" -t "${imageName}" .
     echo_green "docker多版本镜像构建完成->[${imageName}]"
     echo_yellow "-------------------docker buildx构建镜像结束-------------------"
 }

server/resources/script/sql/mayfly-go.sql

@@ -501,8 +501,8 @@ DROP TABLE IF EXISTS `t_machine_term_op`;
 CREATE TABLE `t_machine_term_op` (
   `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id',
   `machine_id` bigint NOT NULL COMMENT '机器id',
-  `username` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '登录用户名',
+  `username` varchar(60) DEFAULT NULL COMMENT '登录用户名',
-  `record_file_path` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '终端回放文件路径',
+  `file_key` varchar(36) DEFAULT NULL COMMENT '文件',
   `exec_cmds` TEXT NULL COMMENT '执行的命令记录',
   `creator_id` bigint unsigned DEFAULT NULL,
   `creator` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL,

server/resources/script/sql/v1.9/v1.9.0.sql

@@ -43,6 +43,7 @@ CREATE TABLE `t_db_transfer_files` (
    PRIMARY KEY (id)
 ) COMMENT '数据库迁移文件管理';
 
+ALTER TABLE `t_machine_term_op` ADD COLUMN `file_key` varchar(36) DEFAULT NULL COMMENT '文件';
 
 ALTER TABLE `t_flow_procdef`
     ADD COLUMN `condition` text NULL comment '触发审批的条件（计算结果返回1则需要启用该流程）';