Merge branch 'hot-fix/1.1.0'

.github/Dockerfile

@@ -1,64 +0,0 @@
-FROM amd64/node:18 AS node-builder
-
-LABEL maintainer="mingcheng<mc@sf.com>"
-
-COPY . /answer
-WORKDIR /answer
-RUN node -v
-RUN make install-ui-packages ui && mv ui/build /tmp
-
-# stage2 build the main binary within static resource
-FROM golang:1.19-alpine AS golang-builder
-LABEL maintainer="aichy@sf.com"
-
-ARG GOPROXY
-# ENV GOPROXY ${GOPROXY:-direct}
-ENV GOPROXY=https://goproxy.io,direct
-
-ENV GOPATH /go
-ENV GOROOT /usr/local/go
-ENV PACKAGE github.com/answerdev/answer
-ENV BUILD_DIR ${GOPATH}/src/${PACKAGE}
-ENV ANSWER_MODULE ${BUILD_DIR}
-
-ARG TAGS="sqlite sqlite_unlock_notify"
-ENV TAGS "bindata timetzdata $TAGS"
-ARG CGO_EXTRA_CFLAGS
-
-COPY . ${BUILD_DIR}
-WORKDIR ${BUILD_DIR}
-COPY --from=node-builder /tmp/build ${BUILD_DIR}/ui/build
-RUN apk --no-cache add build-base git bash \
-    && make clean build
-RUN chmod 755 answer
-RUN ["/bin/bash","-c","script/build_plugin.sh"]
-RUN cp answer /usr/bin/answer
-
-RUN mkdir -p /data/uploads && chmod 777 /data/uploads \
-    && mkdir -p /data/i18n && cp -r i18n/*.yaml /data/i18n
-
-# stage3 copy the binary and resource files into fresh container
-FROM alpine
-LABEL maintainer="maintainers@sf.com"
-
-ENV TZ "Asia/Shanghai"
-RUN apk update \
-    && apk --no-cache add \
-        bash \
-        ca-certificates \
-        curl \
-        dumb-init \
-        gettext \
-        openssh \
-        sqlite \
-        gnupg \
-    && echo "Asia/Shanghai" > /etc/timezone
-
-COPY --from=golang-builder /usr/bin/answer /usr/bin/answer
-COPY --from=golang-builder /data /data
-COPY /script/entrypoint.sh /entrypoint.sh
-RUN chmod 755 /entrypoint.sh
-
-VOLUME /data
-EXPOSE 80
-ENTRYPOINT ["/entrypoint.sh"]

.github/workflows/build_dev_img.yml

@@ -40,7 +40,7 @@ jobs:
       uses: docker/build-push-action@v4
       with:
         context: .
-        file: ./.github/Dockerfile
+        file: ./Dockerfile
         platforms: linux/amd64
         push: true
         tags: ${{ steps.meta.outputs.tags }}

.github/workflows/build_dockerhub_img.yml

@@ -39,20 +39,13 @@ jobs:
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
 
-    # - name: Login to GitHub Container Registry
-    #   uses: docker/login-action@v2
-    #   with:
-    #     registry: ghcr.io
-    #     username: ${{ github.actor }}
-    #     password: ${{ secrets.GITHUB_TOKEN }}
-
     - name: Build and push
       uses: docker/build-push-action@v4
       with:
         context: .
         platforms: linux/amd64,linux/arm64
         push: true
-        file: ./.github/Dockerfile
+        file: ./Dockerfile
         tags: ${{ steps.meta.outputs.tags }}
         labels: ${{ steps.meta.outputs.labels }}
 

.github/workflows/manual_build.yml

@@ -51,20 +51,13 @@ jobs:
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
 
-    # - name: Login to GitHub Container Registry
-    #   uses: docker/login-action@v2
-    #   with:
-    #     registry: ghcr.io
-    #     username: ${{ github.actor }}
-    #     password: ${{ secrets.GITHUB_TOKEN }}
-
     - name: Build and push
       uses: docker/build-push-action@v4
       with:
         context: .
         platforms: linux/amd64,linux/arm64
         push: true
-        file: ./.github/Dockerfile
+        file: ./Dockerfile
         tags: answerdev/answer:${{ inputs.tag_name }}
         labels: ${{ steps.meta.outputs.labels }}
 

internal/service/answer_service.go

@@ -560,6 +560,7 @@ func (as *AnswerService) SearchFormatInfo(ctx context.Context, answers []*entity
 	}
 
 	for _, item := range list {
+		item.ID = uid.EnShortID(item.ID)
 		item.MemberActions = permission.GetAnswerPermission(ctx, req.UserID, item.UserID, req.CanEdit, req.CanDelete)
 	}
 	return list, nil