update

Author: lz1998

.gitignore

@@ -36,7 +36,7 @@ _testmain.go
 device.json
 Go-Mirai-Client
 device-*.json
-static/static
+pkg/static/static
 gmc-*.zip
 captcha.jpg
 /video

Dockerfile

@@ -19,10 +19,10 @@ WORKDIR /build
 
 COPY ./ .
 
-COPY --from=ui_builder /build/pbbot-react-ui/build ./static/static
+COPY --from=ui_builder /build/pbbot-react-ui/build ./pkg/static/static
 
 RUN cd /build \
-  && go build -ldflags "-s -w -extldflags '-static'" -o gmc
+  && go build -ldflags "-s -w -extldflags '-static'" -o gmc ./service/gmc
 
 FROM alpine:latest
 

build.sh

@@ -26,7 +26,7 @@ for PLATFORM in $PLATFORMS; do
   GOARCH=${PLATFORM#*/}
   BIN_FILENAME="${OUTPUT_DIR}/${NAME}-${GOOS}-${GOARCH}"
   if [[ "${GOOS}" == "windows" ]]; then BIN_FILENAME="${BIN_FILENAME}.exe"; fi
-  CMD="GOOS=${GOOS} GOARCH=${GOARCH} go build -v -ldflags \"-s -w -extldflags '-static'\" -o ${BIN_FILENAME}"
+  CMD="GOOS=${GOOS} GOARCH=${GOARCH} go build -v -ldflags \"-s -w -extldflags '-static'\" -o ${BIN_FILENAME} github.com/ProtobufBot/Go-Mirai-Client/service/gmc"
   echo $CMD
   eval $CMD || FAILURES="${FAILURES} ${PLATFORM}"
 done

service/bot/api_handler.go pkg/bot/api_handler.goservice/bot/api_handler.go renamed to pkg/bot/api_handler.go

@@ -7,10 +7,10 @@ import (
 	_ "unsafe"
 
 
-	"github.com/ProtobufBot/Go-Mirai-Client/config"
+	"github.com/ProtobufBot/Go-Mirai-Client/pkg/cache"
 	"github.com/ProtobufBot/Go-Mirai-Client/pkg/clz"
+	"github.com/ProtobufBot/Go-Mirai-Client/pkg/config"
 	"github.com/ProtobufBot/Go-Mirai-Client/proto_gen/onebot"
-	"github.com/ProtobufBot/Go-Mirai-Client/service/cache"
 
 	"github.com/Mrs4s/MiraiGo/client"
 	"github.com/Mrs4s/MiraiGo/message"

service/bot/api_handler.s pkg/bot/api_handler.sservice/bot/api_handler.s renamed to pkg/bot/api_handler.s

@@ -6,7 +6,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/ProtobufBot/Go-Mirai-Client/config"
+	"github.com/ProtobufBot/Go-Mirai-Client/pkg/config"
 	"github.com/ProtobufBot/Go-Mirai-Client/pkg/util"
 	"github.com/ProtobufBot/Go-Mirai-Client/proto_gen/dto"
 

service/bot/api_handler_test.go pkg/bot/api_handler_test.goservice/bot/api_handler_test.go renamed to pkg/bot/api_handler_test.go

@@ -3,10 +3,11 @@ package bot
 import (
 	"strconv"
 
-	"github.com/Mrs4s/MiraiGo/client"
-	"github.com/Mrs4s/MiraiGo/message"
 	"github.com/ProtobufBot/Go-Mirai-Client/pkg/clz"
 	"github.com/ProtobufBot/Go-Mirai-Client/proto_gen/onebot"
+
+	"github.com/Mrs4s/MiraiGo/client"
+	"github.com/Mrs4s/MiraiGo/message"
 )
 
 func MiraiMsgToProtoMsg(cli *client.QQClient, messageChain []message.IMessageElement) []*onebot.Message {