refactor: 后端包结构重构、去除无用的文件

.vscode/launch.json

@@ -1,18 +0,0 @@
-{
-    // 使用 IntelliSense 了解相关属性。 
-    // 悬停以查看现有属性的描述。
-    // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-
-        {
-            "name": "mayfly-go",
-            "type": "go",
-            "request": "launch",
-            "mode": "auto",
-            "program": "${fileDirname}/main.go",
-            "env": {},
-            "args": []
-        },
-    ]
-}

build_release.sh

@@ -0,0 +1,124 @@
+#bin/bash
+
+#----------------------------------------------
+# 前后端打包编译至指定目录,即快速制作发行版
+#----------------------------------------------
+
+project_path=`pwd`
+# 构建后的二进制执行文件名
+exec_file_name="mayfly-go"
+# web项目目录
+web_folder="${project_path}/mayfly_go_web"
+# server目录
+server_folder="${project_path}/server"
+
+function echo_red() {
+    echo -e "\033[1;31m$1\033[0m"
+}
+
+function echo_green() {
+    echo -e "\033[1;32m$1\033[0m"
+}
+
+function echo_yellow() {
+    echo -e "\033[1;33m$1\033[0m"
+}
+
+function buildWeb() {
+    cd ${web_folder}
+    echo_yellow "-------------------打包前端开始-------------------"
+    yarn run build
+    echo_green '将打包后的静态文件拷贝至server/static'
+    rm -rf ${server_folder}/static
+    mkdir -p ${server_folder}/static && cp -r ${web_folder}/dist/* ${server_folder}/static
+    echo_yellow ">>>>>>>>>>>>>>>>>>>打包前端结束<<<<<<<<<<<<<<<<<<<<\n"
+}
+
+function build() {
+    cd ${project_path}
+
+    # 打包产物的输出目录
+    toFolder=$1
+    os=$2
+    arch=$3
+
+    echo_yellow "-------------------${os}-${arch}打包构建开始-------------------"
+
+    cd ${server_folder}
+    echo_green "打包构建可执行文件..."
+    CGO_ENABLE=0 GOOS=${os} GOARCH=${arch} go build -o ${exec_file_name} main.go
+
+    if [ -d ${toFolder} ] ; then
+        echo_green "目标文件夹已存在,清空文件夹"
+        sudo rm -rf ${toFolder}
+    fi
+    echo_green "创建'${toFolder}'目录"
+    mkdir ${toFolder}
+
+    echo_green "移动二进制文件至'${toFolder}'"
+    mv ${server_folder}/${exec_file_name} ${toFolder}
+
+    echo_green "拷贝前端静态页面至'${toFolder}/static'"
+    mkdir -p ${toFolder}/static && cp -r ${web_folder}/dist/* ${toFolder}/static
+
+    echo_green "拷贝脚本等资源文件[config.yml、mayfly-go.sql、readme.txt、startup.sh、shutdown.sh]"
+    cp ${server_folder}/config.yml ${toFolder}
+    cp ${server_folder}/mayfly-go.sql ${toFolder}
+    cp ${server_folder}/readme.txt ${toFolder}
+    cp ${server_folder}/startup.sh ${toFolder}
+    cp ${server_folder}/shutdown.sh ${toFolder}
+
+    echo_yellow ">>>>>>>>>>>>>>>>>>>${os}-${arch}打包构建完成<<<<<<<<<<<<<<<<<<<<\n"
+}
+
+function buildLinuxAmd64() {
+    build "$1/mayfly-go-linux-amd64" "linux" "amd64"
+}
+
+function buildLinuxArm64() {
+    build "$1/mayfly-go-linux-arm64" "linux" "arm64"
+}
+
+function buildWindows() {
+    build "$1/mayfly-go-windows" "windows" "amd64"
+}
+
+function runBuild() {
+    # 构建结果的目的路径
+    read -p "请输入构建产物输出目录: " toPath
+    if [ ! -d ${toPath} ] ; then
+        echo_red "构建产物输出目录不存在!"
+        exit;
+    fi
+    # 进入目标路径,并赋值全路径
+    cd ${toPath}
+    toPath=`pwd`
+
+    read -p "是否构建前端[0|其他->否 1->是]: " runBuildWeb
+    read -p "请选择构建版本[0|其他->全部 1->linux-amd64 2->linux-arm64 3->windows]: " buildType
+    
+    if [ "${runBuildWeb}" == "1" ];then
+        buildWeb
+    fi
+
+    if [ "${buildType}" == "1" ];then
+        buildLinuxAmd64 ${toPath}
+        exit;
+    fi
+
+    if [ "${buildType}" == "2" ];then
+        buildLinuxArm64 ${toPath}
+        exit;
+    fi
+
+    if [ "${buildType}" == "3" ];then
+        buildWindows ${toPath}
+        exit;
+    fi
+
+    buildLinuxAmd64 ${toPath}
+    buildLinuxArm64 ${toPath}
+    buildWindows ${toPath}
+}
+
+runBuild

go.sum

@@ -1,220 +0,0 @@
-github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
-github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
-github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
-github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
-github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
-github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
-github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
-github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
-github.com/gin-gonic/gin v1.7.7 h1:3DoBmSbJbZAWqXJC3SLjAPfutPJJRN1U5pALB7EeTTs=
-github.com/gin-gonic/gin v1.7.7/go.mod h1:axIBovoeJpVj8S3BwE0uPMTeReE4+AfFtqpqaZ1qq1U=
-github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A=
-github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
-github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
-github.com/go-playground/locales v0.14.0 h1:u50s323jtVGugKlcYeyzC0etD1HifMjqmJqb8WugfUU=
-github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs=
-github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
-github.com/go-playground/universal-translator v0.18.0 h1:82dyy6p4OuJq4/CByFNOn/jYrnRPArHwAcmLoJZxyho=
-github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA=
-github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
-github.com/go-playground/validator/v10 v10.10.1 h1:uA0+amWMiglNZKZ9FJRKUAe9U3RX91eVn1JYXMWt7ig=
-github.com/go-playground/validator/v10 v10.10.1/go.mod h1:i+3WkQ1FvaUjjxh1kSvIA4dMGDBiPU55YFDl0WbKdWU=
-github.com/go-redis/redis v6.15.9+incompatible h1:K0pv1D7EQUjfyoMql+r/jZqCLizCGKFlFgcHWWmHQjg=
-github.com/go-redis/redis v6.15.9+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
-github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
-github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
-github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
-github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g=
-github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
-github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
-github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
-github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
-github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
-github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
-github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
-github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
-github.com/jinzhu/now v1.1.4 h1:tHnRBy1i5F2Dh8BAFxqFzxKqqvezXrL2OW1TnX+Mlas=
-github.com/jinzhu/now v1.1.4/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
-github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
-github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
-github.com/kr/fs v0.1.0 h1:Jskdu9ieNAYnjxsi0LbQp1ulIKZV1LAFgK1tWhpZgl8=
-github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
-github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
-github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w=
-github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
-github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
-github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
-github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
-github.com/mojocn/base64Captcha v1.3.5 h1:Qeilr7Ta6eDtG4S+tQuZ5+hO+QHbiGAJdi4PfoagaA0=
-github.com/mojocn/base64Captcha v1.3.5/go.mod h1:/tTTXn4WTpX9CfrmipqRytCpJ27Uw3G6I7NcP2WwcmY=
-github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
-github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
-github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
-github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
-github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
-github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
-github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
-github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
-github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
-github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
-github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
-github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE=
-github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs=
-github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
-github.com/pkg/sftp v1.13.4 h1:Lb0RYJCmgUcBgZosfoi9Y9sbl6+LJgOIgk/2Y4YjMFg=
-github.com/pkg/sftp v1.13.4/go.mod h1:LzqnAvaD5TWeNBsZpfKxSYn1MbjWwOsCIAFFJbpIsK8=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
-github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
-github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
-github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8=
-github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
-github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
-github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
-github.com/ugorji/go v1.2.7 h1:qYhyWUUd6WbiM+C6JZAUkIJt/1WrjzNHY9+KCIjVqTo=
-github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M=
-github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
-github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0=
-github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY=
-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
-golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.0.0-20220314234724-5d542ad81a58 h1:L8CkJyVoa0/NslN3RUMLgasK5+KatNvyRGQ9QyCYAfc=
-golang.org/x/crypto v0.0.0-20220314234724-5d542ad81a58/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/image v0.0.0-20190501045829-6d32002ffd75/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
-golang.org/x/image v0.0.0-20220302094943-723b81ca9867 h1:TcHcE0vrmgzNH1v3ppjcMGbhG5+9fMuvOmUYwNEF4q4=
-golang.org/x/image v0.0.0-20220302094943-723b81ca9867/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
-golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 h1:CIJ76btIcR3eFI5EgSo6k1qKw9KJexJuRLI9G7Hp5wE=
-golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5 h1:y/woIyUBFbpQGKS0u1aHF/40WUDnek3fPOyD08H5Vng=
-golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
-google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
-google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
-google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
-google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
-google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
-gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
-gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gorm.io/driver/mysql v1.3.2 h1:QJryWiqQ91EvZ0jZL48NOpdlPdMjdip1hQ8bTgo4H7I=
-gorm.io/driver/mysql v1.3.2/go.mod h1:ChK6AHbHgDCFZyJp0F+BmVGb06PSIoh9uVYKAlRbb2U=
-gorm.io/gorm v1.23.1/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk=
-gorm.io/gorm v1.23.2 h1:xmq9QRMWL8HTJyhAUBXy8FqIIQCYESeKfJL4DoGKiWQ=
-gorm.io/gorm v1.23.2/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk=

mayfly_go_web/src/views/ops/db/SqlExec.vue

@@ -536,11 +536,11 @@ export default defineComponent({
                 }
                 if ((char >= '0' && char <= '9') || (char >= 'a' && char <= 'z')) {
                     // 如果是小写字母、数字字符，分配8个单位宽度
-                    flexWidth += 8;
+                    flexWidth += 8.5;
                     continue;
                 }
                 if (char >= 'A' && char <= 'Z') {
-                    flexWidth += 8.5;
+                    flexWidth += 9;
                     continue;
                 }
                 if (char >= '\u4e00' && char <= '\u9fa5') {
@@ -548,7 +548,7 @@ export default defineComponent({
                     flexWidth += 16;
                 } else {
                     // 其他种类字符，为字符分配9个单位宽度
-                    flexWidth += 9;
+                    flexWidth += 8;
                 }
             }
             if (flexWidth > 500) {

server/default.key

@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpgIBAAKCAQEA0CsawvEZl42Vf+0BlTuZ3Dp10yW8Oty1tjimxUj3s0WPeKil
-6+TehnQELS8vGJfek+yT99nyrt+bkRmg1kxZ57FtQFEuthG4OQZoaMDUz6Ab+8P1
-PQ9VH0XimnnYabxztJiQjl8HdJt6N4WP35kGlcul7qQ+Qc7iwjhSadfAhXVycqVI
-cGQyHiPPfbmYRjueAIC4czmMUxwFKCwjepGYkwzWuGkpMD0hg/SIXpFJE2dcqYPR
-2nCah1gxZZG00lHU1X2pehNmmgeHRkB5S7mrsCdyyV/33SAYk6T6PT7dOqY54bfn
-h3C0k+T7IzvKTXKG76eG63STmxVa6luVoKMvxwIDAQABAoIBAQCI2Y2CUpYMd9us
-edbskH4ZtaT35nrUB3y+Cog4cjvE8xnarKRHa/KOWX7VZYuEk3KTtJeh/Pn51K6k
-uUBvIUqJcq7r9XLL5uJBOuEw3HQK+qrq3GxAc+/12y+Zdji7alR2iUWfEwIHup6i
-GX/38tXNbE/tjrQO9z9Dh1tGkbvS/66tPn/T/oMxsRvZB6mCjB7yuOlEIwYTomYB
-pUFemELt8T5RtfxRa8T1VoITbfuj7zvecqlThW0H8UizsFxvrOCUaga7jtsJOCHo
-bcW5WvWwazoOfQ2BGpksKkBDf1N6pj85e4kOoYcVG9UN03ZwDvAGfQPWUlHB4YzW
-PybMwIQBAoGBAPfuOQ+ukVmkiEKj6wCBe3Z0pYeNqBGec9aj62bKFh79BCE3ZopS
-7JtGs8VfBKkBAaOy+MDuvJ2fvRNRtHT4BYe1U6ZRsmVFqHScACOaO/7TR0tz0ihL
-0QLCkbSwsXExG6bYbwP4jMHkhHArT7Hy8WXvup8PffjSiEs1A1uGvYSBAoGBANbx
-lHo+39nsc1OO8TUAWZChIQUib2hFIwzQYngSzINdfXQaGFT/omOsudAtfdjvp+qO
-Tr7WpwgFEFveDFsdJfZ2Kc2x9a3ty7IYIWaAjK2ghkAKz3Tt4gClreB6qG2SBycP
-4C2ImbY6hMaFHz3ENtTEzzTMdD1ByxQVMvoem3BHAoGBAJdaTmtMXl8jGivUdXnx
-kbVWsFZ4G8nluUGm/+XYKHjybLr6XxbCWL7SApzSzL1/Z8jPURw2od53za0li8x8
-PKQEBfTamtVIGPZW5Z7WYRnHURa2tezzm7zbmqd71lcLa54HMn5yFTuojVEMn7I6
-ZTOdjYfcpUJpA9slmc8eCkQBAoGBAJEIbxRRaoBEQMkH8Y++zbB+WKZ7RssHo4/Y
-6Ch3HtIg+i6mEPcBitRQzww+NeV0SExHe7Dfa9NIf3JNkO7F60CzGJ/3zXtvsftY
-tujQIpxhbVS3NqaCgPXI1VtbyFwupW7hEnYG7xj7wW2mk578z7afmeTZdDGFPH8v
-krccgeuvAoGBAPAwiqbZlXNx+ueI1B3T8VpXnG0ozKxG+l5B71kssZWa7xcv9yRd
-c15l2PSXNtnoT/mBID7+dqQOmfYxsDHAkUdd/BrxhXtdi9FR3AfHSEQz+VKsogAD
-uLyRd7jWTYqqGa2UToF/CBV+c6QyMB+6pzFNk5DmUEm4Gd6jcHDITYeI
------END RSA PRIVATE KEY-----

server/default.pem

@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDejCCAmICCQDQU4ZRt2G46TANBgkqhkiG9w0BAQsFADB/MQswCQYDVQQGEwJ6
-aDEPMA0GA1UECAwGbWF5Zmx5MQswCQYDVQQHDAJ4bTEPMA0GA1UECgwGbWF5Zmx5
-MQ8wDQYDVQQLDAZtYXlmbHkxDzANBgNVBAMMBm1heWZseTEfMB0GCSqGSIb3DQEJ
-ARYQOTU0NTM3NDczQHFxLmNvbTAeFw0yMTA2MjQwMzI2MzBaFw0zMTA2MjIwMzI2
-MzBaMH8xCzAJBgNVBAYTAnpoMQ8wDQYDVQQIDAZtYXlmbHkxCzAJBgNVBAcMAnht
-MQ8wDQYDVQQKDAZtYXlmbHkxDzANBgNVBAsMBm1heWZseTEPMA0GA1UEAwwGbWF5
-Zmx5MR8wHQYJKoZIhvcNAQkBFhA5NTQ1Mzc0NzNAcXEuY29tMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0CsawvEZl42Vf+0BlTuZ3Dp10yW8Oty1tjim
-xUj3s0WPeKil6+TehnQELS8vGJfek+yT99nyrt+bkRmg1kxZ57FtQFEuthG4OQZo
-aMDUz6Ab+8P1PQ9VH0XimnnYabxztJiQjl8HdJt6N4WP35kGlcul7qQ+Qc7iwjhS
-adfAhXVycqVIcGQyHiPPfbmYRjueAIC4czmMUxwFKCwjepGYkwzWuGkpMD0hg/SI
-XpFJE2dcqYPR2nCah1gxZZG00lHU1X2pehNmmgeHRkB5S7mrsCdyyV/33SAYk6T6
-PT7dOqY54bfnh3C0k+T7IzvKTXKG76eG63STmxVa6luVoKMvxwIDAQABMA0GCSqG
-SIb3DQEBCwUAA4IBAQB/e8EO2XEtkYBxebR1w6i50vaegLsxQJR3l5qm7rsHu3Cr
-smJXGsc56axKCAqJ4XvSI65BT51FghAoGn62QNyiQgc0YoS99nwCCGFtnhZ2lmSe
-pfhUHegN/Qo4I8FemEMD+o9kGeAzwrnaIVIT/cNOEQgm+RzrgHHJh5QBn2XgJalU
-NeFTWaimyefwSezSa/vPbyMoAl9HkT6kdvnms/yOth4AOle6+5pM2StWjmMi4yx4
-16y3NvLTku6nAUazaHTOOu/MCqLWL2/qYTk3r7OCop2jr9Rp+HLbg5AfKLUIVXjG
-/1fnXJIuD+2u9qgDLN5PZNgz4MlU86ugtmYPFkVt
------END CERTIFICATE-----

server/go.mod

@@ -12,11 +12,11 @@ require (
 	github.com/robfig/cron/v3 v3.0.1 // 定时任务
 	github.com/sirupsen/logrus v1.8.1
 	go.mongodb.org/mongo-driver v1.9.1 // mongo
-	golang.org/x/crypto v0.0.0-20220314234724-5d542ad81a58 // ssh
+	golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // ssh
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
 	// gorm
-	gorm.io/driver/mysql v1.3.2
+	gorm.io/driver/mysql v1.3.4
-	gorm.io/gorm v1.23.2
+	gorm.io/gorm v1.23.5
 )
 
 require (

server/initialize/router.go

@@ -2,11 +2,11 @@ package initialize
 
 import (
 	"fmt"
-	"mayfly-go/base/config"
+	common_index_router "mayfly-go/internal/common/router"
-	"mayfly-go/base/middleware"
+	devops_router "mayfly-go/internal/devops/router"
-	common_index_router "mayfly-go/server/common/router"
+	sys_router "mayfly-go/internal/sys/router"
-	devops_router "mayfly-go/server/devops/router"
+	"mayfly-go/pkg/config"
-	sys_router "mayfly-go/server/sys/router"
+	"mayfly-go/pkg/middleware"
 	"net/http"
 
 	"github.com/gin-gonic/gin"

server/internal/common/api/index.go

@@ -1,9 +1,9 @@
 package api
 
 import (
-	"mayfly-go/base/ctx"
+	"mayfly-go/internal/devops/application"
-	"mayfly-go/server/devops/application"
+	"mayfly-go/internal/devops/domain/entity"
-	"mayfly-go/server/devops/domain/entity"
+	"mayfly-go/pkg/ctx"
 )
 
 type Index struct {

server/internal/common/router/index.go

@@ -1,9 +1,9 @@
 package router
 
 import (
-	"mayfly-go/base/ctx"
+	"mayfly-go/internal/common/api"
-	"mayfly-go/server/common/api"
+	devops_app "mayfly-go/internal/devops/application"
-	devops_app "mayfly-go/server/devops/application"
+	"mayfly-go/pkg/ctx"
 
 	"github.com/gin-gonic/gin"
 )

server/internal/devops/api/db.go

@@ -3,17 +3,17 @@ package api
 import (
 	"fmt"
 	"io/ioutil"
-	"mayfly-go/base/biz"
+	"mayfly-go/internal/devops/api/form"
-	"mayfly-go/base/ctx"
+	"mayfly-go/internal/devops/api/vo"
-	"mayfly-go/base/ginx"
+	"mayfly-go/internal/devops/application"
-	"mayfly-go/base/model"
+	"mayfly-go/internal/devops/domain/entity"
-	"mayfly-go/base/utils"
+	sysApplication "mayfly-go/internal/sys/application"
-	"mayfly-go/base/ws"
+	"mayfly-go/pkg/biz"
-	"mayfly-go/server/devops/api/form"
+	"mayfly-go/pkg/ctx"
-	"mayfly-go/server/devops/api/vo"
+	"mayfly-go/pkg/ginx"
-	"mayfly-go/server/devops/application"
+	"mayfly-go/pkg/model"
-	"mayfly-go/server/devops/domain/entity"
+	"mayfly-go/pkg/utils"
-	sysApplication "mayfly-go/server/sys/application"
+	"mayfly-go/pkg/ws"
 	"strconv"
 	"strings"
 

server/internal/devops/api/machine.go

@@ -2,16 +2,16 @@ package api
 
 import (
 	"fmt"
-	"mayfly-go/base/biz"
+	"mayfly-go/internal/devops/api/form"
-	"mayfly-go/base/ctx"
+	"mayfly-go/internal/devops/api/vo"
-	"mayfly-go/base/ginx"
+	"mayfly-go/internal/devops/application"
-	"mayfly-go/base/utils"
+	"mayfly-go/internal/devops/domain/entity"
-	"mayfly-go/base/ws"
+	"mayfly-go/internal/devops/infrastructure/machine"
-	"mayfly-go/server/devops/api/form"
+	"mayfly-go/pkg/biz"
-	"mayfly-go/server/devops/api/vo"
+	"mayfly-go/pkg/ctx"
-	"mayfly-go/server/devops/application"
+	"mayfly-go/pkg/ginx"
-	"mayfly-go/server/devops/domain/entity"
+	"mayfly-go/pkg/utils"
-	"mayfly-go/server/devops/infrastructure/machine"
+	"mayfly-go/pkg/ws"
 	"strconv"
 
 	"github.com/gin-gonic/gin"

server/internal/devops/api/machine_file.go

@@ -4,16 +4,16 @@ import (
 	"fmt"
 	"io/fs"
 	"io/ioutil"
-	"mayfly-go/base/biz"
+	"mayfly-go/internal/devops/api/form"
-	"mayfly-go/base/ctx"
+	"mayfly-go/internal/devops/api/vo"
-	"mayfly-go/base/ginx"
+	"mayfly-go/internal/devops/application"
-	"mayfly-go/base/utils"
+	"mayfly-go/internal/devops/domain/entity"
-	"mayfly-go/base/ws"
+	sysApplication "mayfly-go/internal/sys/application"
-	"mayfly-go/server/devops/api/form"
+	"mayfly-go/pkg/biz"
-	"mayfly-go/server/devops/api/vo"
+	"mayfly-go/pkg/ctx"
-	"mayfly-go/server/devops/application"
+	"mayfly-go/pkg/ginx"
-	"mayfly-go/server/devops/domain/entity"
+	"mayfly-go/pkg/utils"
-	sysApplication "mayfly-go/server/sys/application"
+	"mayfly-go/pkg/ws"
 	"strconv"
 	"strings"
 

server/internal/devops/api/machine_script.go

@@ -2,14 +2,14 @@ package api
 
 import (
 	"fmt"
-	"mayfly-go/base/biz"
+	"mayfly-go/internal/devops/api/form"
-	"mayfly-go/base/ctx"
+	"mayfly-go/internal/devops/api/vo"
-	"mayfly-go/base/ginx"
+	"mayfly-go/internal/devops/application"
-	"mayfly-go/base/utils"
+	"mayfly-go/internal/devops/domain/entity"
-	"mayfly-go/server/devops/api/form"
+	"mayfly-go/pkg/biz"
-	"mayfly-go/server/devops/api/vo"
+	"mayfly-go/pkg/ctx"
-	"mayfly-go/server/devops/application"
+	"mayfly-go/pkg/ginx"
-	"mayfly-go/server/devops/domain/entity"
+	"mayfly-go/pkg/utils"
 	"strconv"
 
 	"github.com/gin-gonic/gin"

server/internal/devops/api/mongo.go

@@ -2,13 +2,13 @@ package api
 
 import (
 	"context"
-	"mayfly-go/base/biz"
+	"mayfly-go/internal/devops/api/form"
-	"mayfly-go/base/ctx"
+	"mayfly-go/internal/devops/application"
-	"mayfly-go/base/ginx"
+	"mayfly-go/internal/devops/domain/entity"
-	"mayfly-go/base/utils"
+	"mayfly-go/pkg/biz"
-	"mayfly-go/server/devops/api/form"
+	"mayfly-go/pkg/ctx"
-	"mayfly-go/server/devops/application"
+	"mayfly-go/pkg/ginx"
-	"mayfly-go/server/devops/domain/entity"
+	"mayfly-go/pkg/utils"
 	"strconv"
 
 	"github.com/gin-gonic/gin"

server/internal/devops/api/project.go

@@ -2,14 +2,14 @@ package api
 
 import (
 	"fmt"
-	"mayfly-go/base/biz"
+	"mayfly-go/internal/devops/api/vo"
-	"mayfly-go/base/ctx"
+	"mayfly-go/internal/devops/application"
-	"mayfly-go/base/ginx"
+	"mayfly-go/internal/devops/domain/entity"
-	"mayfly-go/server/devops/api/vo"
+	sys_applicaiton "mayfly-go/internal/sys/application"
-	"mayfly-go/server/devops/application"
+	sys_entity "mayfly-go/internal/sys/domain/entity"
-	"mayfly-go/server/devops/domain/entity"
+	"mayfly-go/pkg/biz"
-	sys_applicaiton "mayfly-go/server/sys/application"
+	"mayfly-go/pkg/ctx"
-	sys_entity "mayfly-go/server/sys/domain/entity"
+	"mayfly-go/pkg/ginx"
 )
 
 type Project struct {

server/internal/devops/api/redis.go

@@ -1,14 +1,14 @@
 package api
 
 import (
-	"mayfly-go/base/biz"
+	"mayfly-go/internal/devops/api/form"
-	"mayfly-go/base/ctx"
+	"mayfly-go/internal/devops/api/vo"
-	"mayfly-go/base/ginx"
+	"mayfly-go/internal/devops/application"
-	"mayfly-go/base/utils"
+	"mayfly-go/internal/devops/domain/entity"
-	"mayfly-go/server/devops/api/form"
+	"mayfly-go/pkg/biz"
-	"mayfly-go/server/devops/api/vo"
+	"mayfly-go/pkg/ctx"
-	"mayfly-go/server/devops/application"
+	"mayfly-go/pkg/ginx"
-	"mayfly-go/server/devops/domain/entity"
+	"mayfly-go/pkg/utils"
 	"strconv"
 	"strings"
 	"time"

server/internal/devops/application/db_app.go

@@ -4,14 +4,14 @@ import (
 	"database/sql"
 	"errors"
 	"fmt"
-	"mayfly-go/base/biz"
+	"mayfly-go/internal/devops/domain/entity"
-	"mayfly-go/base/cache"
+	"mayfly-go/internal/devops/domain/repository"
-	"mayfly-go/base/global"
+	"mayfly-go/internal/devops/infrastructure/persistence"
-	"mayfly-go/base/model"
+	"mayfly-go/pkg/biz"
-	"mayfly-go/base/utils"
+	"mayfly-go/pkg/cache"
-	"mayfly-go/server/devops/domain/entity"
+	"mayfly-go/pkg/global"
-	"mayfly-go/server/devops/domain/repository"
+	"mayfly-go/pkg/model"
-	"mayfly-go/server/devops/infrastructure/persistence"
+	"mayfly-go/pkg/utils"
 	"strconv"
 	"strings"
 	"sync"

server/internal/devops/application/machine_app.go

@@ -1,12 +1,12 @@
 package application
 
 import (
-	"mayfly-go/base/biz"
+	"mayfly-go/internal/devops/domain/entity"
-	"mayfly-go/base/model"
+	"mayfly-go/internal/devops/domain/repository"
-	"mayfly-go/server/devops/domain/entity"
+	"mayfly-go/internal/devops/infrastructure/machine"
-	"mayfly-go/server/devops/domain/repository"
+	"mayfly-go/internal/devops/infrastructure/persistence"
-	"mayfly-go/server/devops/infrastructure/machine"
+	"mayfly-go/pkg/biz"
-	"mayfly-go/server/devops/infrastructure/persistence"
+	"mayfly-go/pkg/model"
 
 	"gorm.io/gorm"
 )

server/internal/devops/application/machine_file_app.go

@@ -3,11 +3,11 @@ package application
 import (
 	"io"
 	"io/fs"
-	"mayfly-go/base/biz"
+	"mayfly-go/internal/devops/domain/entity"
-	"mayfly-go/base/model"
+	"mayfly-go/internal/devops/domain/repository"
-	"mayfly-go/server/devops/domain/entity"
+	"mayfly-go/internal/devops/infrastructure/persistence"
-	"mayfly-go/server/devops/domain/repository"
+	"mayfly-go/pkg/biz"
-	"mayfly-go/server/devops/infrastructure/persistence"
+	"mayfly-go/pkg/model"
 	"os"
 	"strings"
 

server/internal/devops/application/machine_script_app.go

@@ -1,11 +1,11 @@
 package application
 
 import (
-	"mayfly-go/base/biz"
+	"mayfly-go/internal/devops/domain/entity"
-	"mayfly-go/base/model"
+	"mayfly-go/internal/devops/domain/repository"
-	"mayfly-go/server/devops/domain/entity"
+	"mayfly-go/internal/devops/infrastructure/persistence"
-	"mayfly-go/server/devops/domain/repository"
+	"mayfly-go/pkg/biz"
-	"mayfly-go/server/devops/infrastructure/persistence"
+	"mayfly-go/pkg/model"
 )
 
 type MachineScript interface {

server/internal/devops/application/mongo_app.go

@@ -2,13 +2,13 @@ package application
 
 import (
 	"context"
-	"mayfly-go/base/biz"
+	"mayfly-go/internal/devops/domain/entity"
-	"mayfly-go/base/cache"
+	"mayfly-go/internal/devops/domain/repository"
-	"mayfly-go/base/global"
+	"mayfly-go/internal/devops/infrastructure/persistence"
-	"mayfly-go/base/model"
+	"mayfly-go/pkg/biz"
-	"mayfly-go/server/devops/domain/entity"
+	"mayfly-go/pkg/cache"
-	"mayfly-go/server/devops/domain/repository"
+	"mayfly-go/pkg/global"
-	"mayfly-go/server/devops/infrastructure/persistence"
+	"mayfly-go/pkg/model"
 	"time"
 
 	"go.mongodb.org/mongo-driver/mongo"

server/internal/devops/application/project_app.go

@@ -1,11 +1,11 @@
 package application
 
 import (
-	"mayfly-go/base/biz"
+	"mayfly-go/internal/devops/domain/entity"
-	"mayfly-go/base/model"
+	"mayfly-go/internal/devops/domain/repository"
-	"mayfly-go/server/devops/domain/entity"
+	"mayfly-go/internal/devops/infrastructure/persistence"
-	"mayfly-go/server/devops/domain/repository"
+	"mayfly-go/pkg/biz"
-	"mayfly-go/server/devops/infrastructure/persistence"
+	"mayfly-go/pkg/model"
 )
 
 type Project interface {

server/internal/devops/application/redis_app.go

@@ -2,13 +2,13 @@ package application
 
 import (
 	"fmt"
-	"mayfly-go/base/biz"
+	"mayfly-go/internal/devops/domain/entity"
-	"mayfly-go/base/cache"
+	"mayfly-go/internal/devops/domain/repository"
-	"mayfly-go/base/global"
+	"mayfly-go/internal/devops/infrastructure/persistence"
-	"mayfly-go/base/model"
+	"mayfly-go/pkg/biz"
-	"mayfly-go/server/devops/domain/entity"
+	"mayfly-go/pkg/cache"
-	"mayfly-go/server/devops/domain/repository"
+	"mayfly-go/pkg/global"
-	"mayfly-go/server/devops/infrastructure/persistence"
+	"mayfly-go/pkg/model"
 	"time"
 
 	"github.com/go-redis/redis"

server/internal/devops/domain/entity/db.go

@@ -1,7 +1,7 @@
 package entity
 
 import (
-	"mayfly-go/base/model"
+	"mayfly-go/pkg/model"
 )
 
 type Db struct {

server/internal/devops/domain/entity/db_sql.go

@@ -1,7 +1,7 @@
 package entity
 
 import (
-	"mayfly-go/base/model"
+	"mayfly-go/pkg/model"
 )
 
 type DbSql struct {

server/internal/devops/domain/entity/machine.go

@@ -1,7 +1,7 @@
 package entity
 
 import (
-	"mayfly-go/base/model"
+	"mayfly-go/pkg/model"
 )
 
 type Machine struct {

server/internal/devops/domain/entity/machine_file.go

@@ -1,6 +1,6 @@
 package entity
 
-import "mayfly-go/base/model"
+import "mayfly-go/pkg/model"
 
 type MachineFile struct {
 	model.Model

server/internal/devops/domain/entity/machine_script.go

@@ -1,6 +1,6 @@
 package entity
 
-import "mayfly-go/base/model"
+import "mayfly-go/pkg/model"
 
 type MachineScript struct {
 	model.Model

server/internal/devops/domain/entity/mongo.go

@@ -1,6 +1,6 @@
 package entity
 
-import "mayfly-go/base/model"
+import "mayfly-go/pkg/model"
 
 type Mongo struct {
 	model.Model

server/internal/devops/domain/entity/project.go

@@ -1,6 +1,6 @@
 package entity
 
-import "mayfly-go/base/model"
+import "mayfly-go/pkg/model"
 
 // 项目
 type Project struct {

server/internal/devops/domain/entity/project_env.go

@@ -1,6 +1,6 @@
 package entity
 
-import "mayfly-go/base/model"
+import "mayfly-go/pkg/model"
 
 // 项目环境
 type ProjectEnv struct {

server/internal/devops/domain/entity/project_member.go

@@ -1,6 +1,6 @@
 package entity
 
-import "mayfly-go/base/model"
+import "mayfly-go/pkg/model"
 
 // 项目成员，用于对项目下组件的访问控制
 type ProjectMember struct {

server/internal/devops/domain/entity/redis.go

@@ -1,7 +1,7 @@
 package entity
 
 import (
-	"mayfly-go/base/model"
+	"mayfly-go/pkg/model"
 )
 
 type Redis struct {

server/internal/devops/domain/repository/db.go

@@ -1,8 +1,8 @@
 package repository
 
 import (
-	"mayfly-go/base/model"
+	"mayfly-go/internal/devops/domain/entity"
-	"mayfly-go/server/devops/domain/entity"
+	"mayfly-go/pkg/model"
 )
 
 type Db interface {

server/internal/devops/domain/repository/db_sql.go

@@ -1,6 +1,6 @@
 package repository
 
-import "mayfly-go/server/devops/domain/entity"
+import "mayfly-go/internal/devops/domain/entity"
 
 type DbSql interface {
 	DeleteBy(condition *entity.DbSql)

server/internal/devops/domain/repository/machine.go

@@ -1,8 +1,8 @@
 package repository
 
 import (
-	"mayfly-go/base/model"
+	"mayfly-go/internal/devops/domain/entity"
-	"mayfly-go/server/devops/domain/entity"
+	"mayfly-go/pkg/model"
 )
 
 type Machine interface {

server/internal/devops/domain/repository/machine_file.go

@@ -1,8 +1,8 @@
 package repository
 
 import (
-	"mayfly-go/base/model"
+	"mayfly-go/internal/devops/domain/entity"
-	"mayfly-go/server/devops/domain/entity"
+	"mayfly-go/pkg/model"
 )
 
 type MachineFile interface {

server/internal/devops/domain/repository/machine_script.go

@@ -1,8 +1,8 @@
 package repository
 
 import (
-	"mayfly-go/base/model"
+	"mayfly-go/internal/devops/domain/entity"
-	"mayfly-go/server/devops/domain/entity"
+	"mayfly-go/pkg/model"
 )
 
 type MachineScript interface {

server/internal/devops/domain/repository/mongo.go

@@ -1,8 +1,8 @@
 package repository
 
 import (
-	"mayfly-go/base/model"
+	"mayfly-go/internal/devops/domain/entity"
-	"mayfly-go/server/devops/domain/entity"
+	"mayfly-go/pkg/model"
 )
 
 type Mongo interface {

server/internal/devops/domain/repository/project.go

@@ -1,8 +1,8 @@
 package repository
 
 import (
-	"mayfly-go/base/model"
+	"mayfly-go/internal/devops/domain/entity"
-	"mayfly-go/server/devops/domain/entity"
+	"mayfly-go/pkg/model"
 )
 
 type Project interface {

server/internal/devops/domain/repository/project_env.go

@@ -1,6 +1,6 @@
 package repository
 
-import "mayfly-go/server/devops/domain/entity"
+import "mayfly-go/internal/devops/domain/entity"
 
 type ProjectEnv interface {
 	// 获取项目环境列表

server/internal/devops/domain/repository/project_member.go

@@ -1,8 +1,8 @@
 package repository
 
 import (
-	"mayfly-go/base/model"
+	"mayfly-go/internal/devops/domain/entity"
-	"mayfly-go/server/devops/domain/entity"
+	"mayfly-go/pkg/model"
 )
 
 type ProjectMemeber interface {

server/internal/devops/domain/repository/redis.go

@@ -1,8 +1,8 @@
 package repository
 
 import (
-	"mayfly-go/base/model"
+	"mayfly-go/internal/devops/domain/entity"
-	"mayfly-go/server/devops/domain/entity"
+	"mayfly-go/pkg/model"
 )
 
 type Redis interface {

server/internal/devops/infrastructure/machine/machine.go

@@ -3,10 +3,10 @@ package machine
 import (
 	"errors"
 	"fmt"
-	"mayfly-go/base/biz"
+	"mayfly-go/internal/devops/domain/entity"
-	"mayfly-go/base/cache"
+	"mayfly-go/pkg/biz"
-	"mayfly-go/base/global"
+	"mayfly-go/pkg/cache"
-	"mayfly-go/server/devops/domain/entity"
+	"mayfly-go/pkg/global"
 	"net"
 	"time"
 

server/internal/devops/infrastructure/machine/machine_test.go

@@ -2,7 +2,7 @@ package machine
 
 import (
 	"fmt"
-	"mayfly-go/base/utils"
+	"mayfly-go/pkg/utils"
 	"strings"
 	"testing"
 )

server/internal/devops/infrastructure/machine/ws_shell_session.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"io"
-	"mayfly-go/base/global"
+	"mayfly-go/pkg/global"
 	"sync"
 	"time"
 

server/internal/devops/infrastructure/persistence/db_repo.go

@@ -2,10 +2,10 @@ package persistence
 
 import (
 	"fmt"
-	"mayfly-go/base/biz"
+	"mayfly-go/internal/devops/domain/entity"
-	"mayfly-go/base/model"
+	"mayfly-go/internal/devops/domain/repository"
-	"mayfly-go/server/devops/domain/entity"
+	"mayfly-go/pkg/biz"
-	"mayfly-go/server/devops/domain/repository"
+	"mayfly-go/pkg/model"
 )
 
 type dbRepo struct{}

server/internal/devops/infrastructure/persistence/db_sql_repo.go

@@ -1,10 +1,10 @@
 package persistence
 
 import (
-	"mayfly-go/base/biz"
+	"mayfly-go/internal/devops/domain/entity"
-	"mayfly-go/base/model"
+	"mayfly-go/internal/devops/domain/repository"
-	"mayfly-go/server/devops/domain/entity"
+	"mayfly-go/pkg/biz"
-	"mayfly-go/server/devops/domain/repository"
+	"mayfly-go/pkg/model"
 )
 
 type dbSqlRepo struct{}

server/internal/devops/infrastructure/persistence/machine_file_repo.go

@@ -1,10 +1,10 @@
 package persistence
 
 import (
-	"mayfly-go/base/biz"
+	"mayfly-go/internal/devops/domain/entity"
-	"mayfly-go/base/model"
+	"mayfly-go/internal/devops/domain/repository"
-	"mayfly-go/server/devops/domain/entity"
+	"mayfly-go/pkg/biz"
-	"mayfly-go/server/devops/domain/repository"
+	"mayfly-go/pkg/model"
 )
 
 type machineFileRepo struct{}

server/internal/devops/infrastructure/persistence/machine_repo.go

@@ -2,9 +2,9 @@ package persistence
 
 import (
 	"fmt"
-	"mayfly-go/base/model"
+	"mayfly-go/internal/devops/domain/entity"
-	"mayfly-go/server/devops/domain/entity"
+	"mayfly-go/internal/devops/domain/repository"
-	"mayfly-go/server/devops/domain/repository"
+	"mayfly-go/pkg/model"
 )
 
 type machineRepo struct{}

server/internal/devops/infrastructure/persistence/machine_script_repo.go

@@ -1,10 +1,10 @@
 package persistence
 
 import (
-	"mayfly-go/base/biz"
+	"mayfly-go/internal/devops/domain/entity"
-	"mayfly-go/base/model"
+	"mayfly-go/internal/devops/domain/repository"
-	"mayfly-go/server/devops/domain/entity"
+	"mayfly-go/pkg/biz"
-	"mayfly-go/server/devops/domain/repository"
+	"mayfly-go/pkg/model"
 )
 
 type machineScriptRepo struct{}

server/internal/devops/infrastructure/persistence/mongo_repo.go

@@ -2,10 +2,10 @@ package persistence
 
 import (
 	"fmt"
-	"mayfly-go/base/biz"
+	"mayfly-go/internal/devops/domain/entity"
-	"mayfly-go/base/model"
+	"mayfly-go/internal/devops/domain/repository"
-	"mayfly-go/server/devops/domain/entity"
+	"mayfly-go/pkg/biz"
-	"mayfly-go/server/devops/domain/repository"
+	"mayfly-go/pkg/model"
 )
 
 type mongoRepo struct{}

server/internal/devops/infrastructure/persistence/project_env_repo.go

@@ -1,10 +1,10 @@
 package persistence
 
 import (
-	"mayfly-go/base/biz"
+	"mayfly-go/internal/devops/domain/entity"
-	"mayfly-go/base/model"
+	"mayfly-go/internal/devops/domain/repository"
-	"mayfly-go/server/devops/domain/entity"
+	"mayfly-go/pkg/biz"
-	"mayfly-go/server/devops/domain/repository"
+	"mayfly-go/pkg/model"
 )
 
 type projectEnvRepo struct{}

server/internal/devops/infrastructure/persistence/project_member_repo.go

@@ -1,10 +1,10 @@
 package persistence
 
 import (
-	"mayfly-go/base/biz"
+	"mayfly-go/internal/devops/domain/entity"
-	"mayfly-go/base/model"
+	"mayfly-go/internal/devops/domain/repository"
-	"mayfly-go/server/devops/domain/entity"
+	"mayfly-go/pkg/biz"
-	"mayfly-go/server/devops/domain/repository"
+	"mayfly-go/pkg/model"
 )
 
 type projectMemeberRepo struct{}

server/internal/devops/infrastructure/persistence/project_repo.go

@@ -1,10 +1,10 @@
 package persistence
 
 import (
-	"mayfly-go/base/biz"
+	"mayfly-go/internal/devops/domain/entity"
-	"mayfly-go/base/model"
+	"mayfly-go/internal/devops/domain/repository"
-	"mayfly-go/server/devops/domain/entity"
+	"mayfly-go/pkg/biz"
-	"mayfly-go/server/devops/domain/repository"
+	"mayfly-go/pkg/model"
 )
 
 type projectRepo struct{}

server/internal/devops/infrastructure/persistence/redis_repo.go

@@ -2,10 +2,10 @@ package persistence
 
 import (
 	"fmt"
-	"mayfly-go/base/biz"
+	"mayfly-go/internal/devops/domain/entity"
-	"mayfly-go/base/model"
+	"mayfly-go/internal/devops/domain/repository"
-	"mayfly-go/server/devops/domain/entity"
+	"mayfly-go/pkg/biz"
-	"mayfly-go/server/devops/domain/repository"
+	"mayfly-go/pkg/model"
 )
 
 type redisRepo struct{}

server/internal/devops/infrastructure/scheudler/scheduler.go

@@ -1,7 +1,7 @@
 package scheduler
 
 import (
-	"mayfly-go/base/biz"
+	"mayfly-go/pkg/biz"
 
 	"github.com/robfig/cron/v3"
 )

server/internal/devops/router/db.go

@@ -1,10 +1,10 @@
 package router
 
 import (
-	"mayfly-go/base/ctx"
+	"mayfly-go/internal/devops/api"
-	"mayfly-go/server/devops/api"
+	"mayfly-go/internal/devops/application"
-	"mayfly-go/server/devops/application"
+	sysApplication "mayfly-go/internal/sys/application"
-	sysApplication "mayfly-go/server/sys/application"
+	"mayfly-go/pkg/ctx"
 
 	"github.com/gin-gonic/gin"
 )

server/internal/devops/router/machine.go

@@ -1,9 +1,9 @@
 package router
 
 import (
-	"mayfly-go/base/ctx"
+	"mayfly-go/internal/devops/api"
-	"mayfly-go/server/devops/api"
+	"mayfly-go/internal/devops/application"
-	"mayfly-go/server/devops/application"
+	"mayfly-go/pkg/ctx"
 
 	"github.com/gin-gonic/gin"
 )

server/internal/devops/router/machine_file.go

@@ -1,10 +1,10 @@
 package router
 
 import (
-	"mayfly-go/base/ctx"
+	"mayfly-go/internal/devops/api"
-	"mayfly-go/server/devops/api"
+	"mayfly-go/internal/devops/application"
-	"mayfly-go/server/devops/application"
+	sysApplication "mayfly-go/internal/sys/application"
-	sysApplication "mayfly-go/server/sys/application"
+	"mayfly-go/pkg/ctx"
 
 	"github.com/gin-gonic/gin"
 )

server/internal/devops/router/machine_script.go

@@ -1,9 +1,9 @@
 package router
 
 import (
-	"mayfly-go/base/ctx"
+	"mayfly-go/internal/devops/api"
-	"mayfly-go/server/devops/api"
+	"mayfly-go/internal/devops/application"
-	"mayfly-go/server/devops/application"
+	"mayfly-go/pkg/ctx"
 
 	"github.com/gin-gonic/gin"
 )

server/internal/devops/router/mongo.go

@@ -1,9 +1,9 @@
 package router
 
 import (
-	"mayfly-go/base/ctx"
+	"mayfly-go/internal/devops/api"
-	"mayfly-go/server/devops/api"
+	"mayfly-go/internal/devops/application"
-	"mayfly-go/server/devops/application"
+	"mayfly-go/pkg/ctx"
 
 	"github.com/gin-gonic/gin"
 )

server/internal/devops/router/project.go

@@ -1,10 +1,10 @@
 package router
 
 import (
-	"mayfly-go/base/ctx"
+	"mayfly-go/internal/devops/api"
-	"mayfly-go/server/devops/api"
+	"mayfly-go/internal/devops/application"
-	"mayfly-go/server/devops/application"
+	sys_applicaiton "mayfly-go/internal/sys/application"
-	sys_applicaiton "mayfly-go/server/sys/application"
+	"mayfly-go/pkg/ctx"
 
 	"github.com/gin-gonic/gin"
 )

server/internal/devops/router/redis.go

@@ -1,9 +1,9 @@
 package router
 
 import (
-	"mayfly-go/base/ctx"
+	"mayfly-go/internal/devops/api"
-	"mayfly-go/server/devops/api"
+	"mayfly-go/internal/devops/application"
-	"mayfly-go/server/devops/application"
+	"mayfly-go/pkg/ctx"
 
 	"github.com/gin-gonic/gin"
 )

server/internal/sys/api/account.go

@@ -2,15 +2,15 @@ package api
 
 import (
 	"fmt"
-	"mayfly-go/base/biz"
+	"mayfly-go/internal/sys/api/form"
-	"mayfly-go/base/captcha"
+	"mayfly-go/internal/sys/api/vo"
-	"mayfly-go/base/ctx"
+	"mayfly-go/internal/sys/application"
-	"mayfly-go/base/ginx"
+	"mayfly-go/internal/sys/domain/entity"
-	"mayfly-go/base/utils"
+	"mayfly-go/pkg/biz"
-	"mayfly-go/server/sys/api/form"
+	"mayfly-go/pkg/captcha"
-	"mayfly-go/server/sys/api/vo"
+	"mayfly-go/pkg/ctx"
-	"mayfly-go/server/sys/application"
+	"mayfly-go/pkg/ginx"
-	"mayfly-go/server/sys/domain/entity"
+	"mayfly-go/pkg/utils"
 	"strconv"
 	"strings"
 	"time"

server/internal/sys/api/captcha.go

@@ -1,8 +1,8 @@
 package api
 
 import (
-	"mayfly-go/base/captcha"
+	"mayfly-go/pkg/captcha"
-	"mayfly-go/base/ctx"
+	"mayfly-go/pkg/ctx"
 )
 
 func GenerateCaptcha(rc *ctx.ReqCtx) {

server/internal/sys/api/resource.go

@@ -2,13 +2,13 @@ package api
 
 import (
 	"encoding/json"
-	"mayfly-go/base/ctx"
+	"mayfly-go/internal/sys/api/form"
-	"mayfly-go/base/ginx"
+	"mayfly-go/internal/sys/api/vo"
-	"mayfly-go/base/utils"
+	"mayfly-go/internal/sys/application"
-	"mayfly-go/server/sys/api/form"
+	"mayfly-go/internal/sys/domain/entity"
-	"mayfly-go/server/sys/api/vo"
+	"mayfly-go/pkg/ctx"
-	"mayfly-go/server/sys/application"
+	"mayfly-go/pkg/ginx"
-	"mayfly-go/server/sys/domain/entity"
+	"mayfly-go/pkg/utils"
 )
 
 type Resource struct {

server/internal/sys/api/role.go

@@ -1,13 +1,13 @@
 package api
 
 import (
-	"mayfly-go/base/ctx"
+	"mayfly-go/internal/sys/api/form"
-	"mayfly-go/base/ginx"
+	"mayfly-go/internal/sys/api/vo"
-	"mayfly-go/base/utils"
+	"mayfly-go/internal/sys/application"
-	"mayfly-go/server/sys/api/form"
+	"mayfly-go/internal/sys/domain/entity"
-	"mayfly-go/server/sys/api/vo"
+	"mayfly-go/pkg/ctx"
-	"mayfly-go/server/sys/application"
+	"mayfly-go/pkg/ginx"
-	"mayfly-go/server/sys/domain/entity"
+	"mayfly-go/pkg/utils"
 	"strconv"
 	"strings"
 	"time"

server/internal/sys/api/system.go

@@ -1,9 +1,9 @@
 package api
 
 import (
-	"mayfly-go/base/biz"
+	"mayfly-go/pkg/biz"
-	"mayfly-go/base/ctx"
+	"mayfly-go/pkg/ctx"
-	"mayfly-go/base/ws"
+	"mayfly-go/pkg/ws"
 
 	"github.com/gin-gonic/gin"
 	"github.com/gorilla/websocket"

server/internal/sys/api/vo/account.go

@@ -1,7 +1,7 @@
 package vo
 
 import (
-	"mayfly-go/base/model"
+	"mayfly-go/pkg/model"
 	"time"
 )
 

server/internal/sys/application/account_app.go

@@ -1,12 +1,12 @@
 package application
 
 import (
-	"mayfly-go/base/biz"
+	"mayfly-go/internal/sys/domain/entity"
-	"mayfly-go/base/model"
+	"mayfly-go/internal/sys/domain/repository"
-	"mayfly-go/base/utils"
+	"mayfly-go/internal/sys/infrastructure/persistence"
-	"mayfly-go/server/sys/domain/entity"
+	"mayfly-go/pkg/biz"
-	"mayfly-go/server/sys/domain/repository"
+	"mayfly-go/pkg/model"
-	"mayfly-go/server/sys/infrastructure/persistence"
+	"mayfly-go/pkg/utils"
 
 	"gorm.io/gorm"
 )

server/internal/sys/application/msg_app.go

@@ -1,11 +1,11 @@
 package application
 
 import (
-	"mayfly-go/base/model"
+	"mayfly-go/internal/sys/domain/entity"
-	"mayfly-go/base/ws"
+	"mayfly-go/internal/sys/domain/repository"
-	"mayfly-go/server/sys/domain/entity"
+	"mayfly-go/internal/sys/infrastructure/persistence"
-	"mayfly-go/server/sys/domain/repository"
+	"mayfly-go/pkg/model"
-	"mayfly-go/server/sys/infrastructure/persistence"
+	"mayfly-go/pkg/ws"
 	"time"
 )
 

server/internal/sys/application/resource_app.go

@@ -1,11 +1,11 @@
 package application
 
 import (
-	"mayfly-go/base/biz"
+	"mayfly-go/internal/sys/domain/entity"
-	"mayfly-go/base/model"
+	"mayfly-go/internal/sys/domain/repository"
-	"mayfly-go/server/sys/domain/entity"
+	"mayfly-go/internal/sys/infrastructure/persistence"
-	"mayfly-go/server/sys/domain/repository"
+	"mayfly-go/pkg/biz"
-	"mayfly-go/server/sys/infrastructure/persistence"
+	"mayfly-go/pkg/model"
 	"strings"
 )
 

server/internal/sys/application/role_app.go

@@ -1,10 +1,10 @@
 package application
 
 import (
-	"mayfly-go/base/model"
+	"mayfly-go/internal/sys/domain/entity"
-	"mayfly-go/server/sys/domain/entity"
+	"mayfly-go/internal/sys/domain/repository"
-	"mayfly-go/server/sys/domain/repository"
+	"mayfly-go/internal/sys/infrastructure/persistence"
-	"mayfly-go/server/sys/infrastructure/persistence"
+	"mayfly-go/pkg/model"
 	"strings"
 )
 

server/internal/sys/domain/entity/account.go

@@ -1,7 +1,7 @@
 package entity
 
 import (
-	"mayfly-go/base/model"
+	"mayfly-go/pkg/model"
 	"time"
 )
 

server/internal/sys/domain/entity/resource.go

@@ -1,6 +1,6 @@
 package entity
 
-import "mayfly-go/base/model"
+import "mayfly-go/pkg/model"
 
 type Resource struct {
 	model.Model

server/internal/sys/domain/entity/role.go

@@ -1,7 +1,7 @@
 package entity
 
 import (
-	"mayfly-go/base/model"
+	"mayfly-go/pkg/model"
 	"time"
 )
 

server/internal/sys/domain/repository/account.go

@@ -1,8 +1,8 @@
 package repository
 
 import (
-	"mayfly-go/base/model"
+	"mayfly-go/internal/sys/domain/entity"
-	"mayfly-go/server/sys/domain/entity"
+	"mayfly-go/pkg/model"
 )
 
 type Account interface {

server/internal/sys/domain/repository/msg.go

@@ -1,8 +1,8 @@
 package repository
 
 import (
-	"mayfly-go/base/model"
+	"mayfly-go/internal/sys/domain/entity"
-	"mayfly-go/server/sys/domain/entity"
+	"mayfly-go/pkg/model"
 )
 
 type Msg interface {

server/internal/sys/domain/repository/resource.go

@@ -1,7 +1,7 @@
 package repository
 
 import (
-	"mayfly-go/server/sys/domain/entity"
+	"mayfly-go/internal/sys/domain/entity"
 )
 
 type Resource interface {