sqlite 不用 cgo 的

moeacgx · Dec 20, 2021 · 41a8a67 · 41a8a67
1 parent 1095b94
commit 41a8a67
Show file tree

Hide file tree

Showing 11 changed files with 224 additions and 49 deletions.
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -6,17 +6,22 @@ before:
     - go mod tidy
 builds:
   - env:
-      - CGO_ENABLED=1
+      - CGO_ENABLED=0
     goos:
       - linux
       - windows
       - darwin
+    goarch:
+      - amd64
+      - arm64
+    ignore:
+      - goos: windows
+        goarch: arm64
 archives:
   - replacements:
-      darwin: Darwin
+      # darwin: Darwin
       linux: Linux
       windows: Windows
-      386: i386
       amd64: x86_64
 checksum:
   name_template: 'checksums.txt'

diff --git a/build.sh b/build.sh
@@ -8,14 +8,7 @@ echo '构建管理页面'
 cd ui/admin && pnpm build && cd ../../
 rsync -r -P ui/admin/dist/* public/admin/
 echo "构建后端，打包一起"
-CGO_ENABLED=1 GOOS=darwin GOARCH=amd64 go build -o release/mac/amd64/van-nav
-CGO_ENABLED=1 GOOS=darwin GOARCH=arm64 go build -o release/mac/arm64/van-nav
-CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -o release/linux/amd64/van-nav
-CGO_ENABLED=1 GOOS=linux GOARCH=arm64 go build -o release/linux/arm64/van-nav
-CGO_ENABLED=1 GOOS=freebsd GOARCH=amd64 go build -o release/freebsd/amd64/van-nav
-CGO_ENABLED=1 GOOS=windows GOARCH=arm64 go build -o release/windows/arm64/van-nav.exe
-CGO_ENABLED=1 GOOS=windows GOARCH=amd64 go build -o release/windows/amd64/van-nav.exe
-CGO_ENABLED=1 GOOS=windows GOARCH=386 go build -o release/windows/386/van-nav.exe
+go build .
 echo "完成"
 
 
diff --git a/go.mod b/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/gin-gonic/contrib v0.0.0-20201101042839-6a891bf89f19
 	github.com/gin-gonic/gin v1.7.7
 	github.com/golang-jwt/jwt v3.2.2+incompatible
-	github.com/mattn/go-sqlite3 v1.14.9
+	modernc.org/sqlite v1.14.3
 )
 
 require (
@@ -15,13 +15,28 @@ require (
 	github.com/go-playground/universal-translator v0.17.0 // indirect
 	github.com/go-playground/validator/v10 v10.4.1 // indirect
 	github.com/golang/protobuf v1.3.3 // indirect
+	github.com/google/uuid v1.3.0 // indirect
 	github.com/json-iterator/go v1.1.9 // indirect
+	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
 	github.com/leodido/go-urn v1.2.0 // indirect
 	github.com/mattn/go-isatty v0.0.12 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect
 	github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 // indirect
+	github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect
 	github.com/ugorji/go/codec v1.1.7 // indirect
 	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 // indirect
-	golang.org/x/sys v0.0.0-20200116001909-b77594299b42 // indirect
+	golang.org/x/mod v0.3.0 // indirect
+	golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac // indirect
+	golang.org/x/tools v0.0.0-20201124115921-2c860bdd6e78 // indirect
+	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
 	gopkg.in/yaml.v2 v2.2.8 // indirect
+	lukechampine.com/uint128 v1.1.1 // indirect
+	modernc.org/cc/v3 v3.35.18 // indirect
+	modernc.org/ccgo/v3 v3.12.95 // indirect
+	modernc.org/libc v1.11.104 // indirect
+	modernc.org/mathutil v1.4.1 // indirect
+	modernc.org/memory v1.0.5 // indirect
+	modernc.org/opt v0.1.1 // indirect
+	modernc.org/strutil v1.1.1 // indirect
+	modernc.org/token v1.0.0 // indirect
 )
diff --git a/go.sum b/go.sum
diff --git a/goreleaser.sh b/goreleaser.sh
@@ -0,0 +1,5 @@
+docker run --rm --privileged \
+  -v $PWD:/go/src/github.com/mereithhh/van-nav \
+  -v /var/run/docker.sock:/var/run/docker.sock \
+  -w /go/src/github.com/mereithhh/van-nav \
+  gohornet/goreleaser-cgo-cross-compiler:latest goreleaser --snapshot --rm-dist
diff --git a/main.go b/main.go
@@ -11,7 +11,8 @@ import (
 	"github.com/gin-gonic/contrib/static"
 	"github.com/gin-gonic/gin"
 	"github.com/golang-jwt/jwt"
-	_ "github.com/mattn/go-sqlite3"
+	_ "modernc.org/sqlite"
+	// _ "github.com/mattn/go-sqlite3"
 )
 const INDEX = "index.html"
 type User struct {
@@ -197,7 +198,7 @@ var db *sql.DB
 
 func initDB() {
 	// 创建数据库
-	db, _ = sql.Open("sqlite3", "./nav.db")
+	db, _ = sql.Open("sqlite", "./nav.db")
 	// 创建表
 	sql_create_table := `
 		CREATE TABLE IF NOT EXISTS nav_user (

diff --git a/nav b/nav
diff --git a/nav.db b/nav.db
diff --git a/public/admin/umi.js b/public/admin/umi.js
diff --git a/ui/admin/src/pages/Catelog.tsx b/ui/admin/src/pages/Catelog.tsx
@@ -28,8 +28,9 @@ const CatelogPage = () => {
         await fetchReload();
       }
       setLoading(false);
+      setShowAddModel(false);
     },
-    [fetchReload, setLoading],
+    [fetchReload, setLoading,setShowAddModel],
   );
   const fetchRemoveCatelog = useCallback(
     async (values) => {

diff --git a/ui/admin/src/pages/Tool.tsx b/ui/admin/src/pages/Tool.tsx
@@ -32,8 +32,9 @@ const ToolPage = () => {
         await fetchReload();
       }
       setLoading(false);
+      setShowAddModel(false)
     },
-    [fetchReload, setLoading],
+    [fetchReload, setLoading,setShowAddModel],
   );
   const fetchRemoveTool = useCallback(
     async (values) => {
@@ -56,8 +57,9 @@ const ToolPage = () => {
         await fetchReload();
       }
       setLoading(false);
+      setShowUpdateModel(false)
     },
-    [fetchReload, setLoading],
+    [fetchReload, setLoading,setShowUpdateModel],
   );
   const CateData = useMemo(()=>{
     if (!catelogs) {