Skip to content

Commit bb059f3

Browse files
committed
更新数据库驱动为纯go版本,方便交叉编译
1 parent 4565ec3 commit bb059f3

3 files changed

Lines changed: 33 additions & 8 deletions

File tree

go.mod

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@ require (
1414
github.com/google/uuid v1.3.0
1515
github.com/gorilla/websocket v1.5.3
1616
github.com/lionsoul2014/ip2region/binding/golang v0.0.0-20240510055607-89e20ab7b6c6
17-
github.com/mattn/go-sqlite3 v1.14.24
1817
github.com/wabzsy/compression v0.0.0-20240604145731-4b6cc6b919b7
1918
github.com/xtaci/kcp-go/v5 v5.6.18
19+
golang.org/x/crypto v0.32.0
20+
modernc.org/sqlite v1.20.4
2021
xorm.io/xorm v1.3.9
2122
)
2223

@@ -25,6 +26,7 @@ require (
2526
github.com/bytedance/sonic/loader v0.1.1 // indirect
2627
github.com/cloudwego/base64x v0.1.4 // indirect
2728
github.com/cloudwego/iasm v0.2.0 // indirect
29+
github.com/dustin/go-humanize v1.0.0 // indirect
2830
github.com/gabriel-vasile/mimetype v1.4.3 // indirect
2931
github.com/gin-contrib/sse v0.1.0 // indirect
3032
github.com/go-playground/locales v0.14.1 // indirect
@@ -33,16 +35,19 @@ require (
3335
github.com/goccy/go-json v0.10.2 // indirect
3436
github.com/golang/snappy v0.0.4 // indirect
3537
github.com/json-iterator/go v1.1.12 // indirect
38+
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
3639
github.com/klauspost/cpuid/v2 v2.2.7 // indirect
3740
github.com/klauspost/reedsolomon v1.12.0 // indirect
3841
github.com/kr/pretty v0.3.0 // indirect
3942
github.com/leodido/go-urn v1.4.0 // indirect
4043
github.com/mattn/go-colorable v0.1.13 // indirect
4144
github.com/mattn/go-isatty v0.0.20 // indirect
45+
github.com/mattn/go-sqlite3 v1.14.24 // indirect
4246
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4347
github.com/modern-go/reflect2 v1.0.2 // indirect
4448
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
4549
github.com/pkg/errors v0.9.1 // indirect
50+
github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect
4651
github.com/rogpeppe/go-internal v1.8.0 // indirect
4752
github.com/syndtr/goleveldb v1.0.0 // indirect
4853
github.com/templexxx/cpu v0.1.1 // indirect
@@ -51,13 +56,24 @@ require (
5156
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
5257
github.com/ugorji/go/codec v1.2.12 // indirect
5358
golang.org/x/arch v0.8.0 // indirect
54-
golang.org/x/crypto v0.32.0 // indirect
59+
golang.org/x/mod v0.17.0 // indirect
5560
golang.org/x/net v0.25.0 // indirect
61+
golang.org/x/sync v0.10.0 // indirect
5662
golang.org/x/sys v0.29.0 // indirect
5763
golang.org/x/text v0.21.0 // indirect
5864
golang.org/x/time v0.10.0 // indirect
65+
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
5966
google.golang.org/protobuf v1.34.1 // indirect
6067
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
6168
gopkg.in/yaml.v3 v3.0.1 // indirect
69+
lukechampine.com/uint128 v1.2.0 // indirect
70+
modernc.org/cc/v3 v3.40.0 // indirect
71+
modernc.org/ccgo/v3 v3.16.13 // indirect
72+
modernc.org/libc v1.22.2 // indirect
73+
modernc.org/mathutil v1.5.0 // indirect
74+
modernc.org/memory v1.4.0 // indirect
75+
modernc.org/opt v0.1.3 // indirect
76+
modernc.org/strutil v1.1.3 // indirect
77+
modernc.org/token v1.0.1 // indirect
6278
xorm.io/builder v0.3.11-0.20220531020008-1bd24a7dc978 // indirect
6379
)

go.sum

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,11 @@ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5a
6969
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
7070
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
7171
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
72-
github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
73-
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
72+
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
73+
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
7474
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
75+
github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ=
76+
github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo=
7577
github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
7678
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
7779
github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
@@ -212,7 +214,6 @@ golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3
212214
golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
213215
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
214216
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
215-
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
216217
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
217218
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
218219
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -252,6 +253,10 @@ modernc.org/cc/v3 v3.40.0 h1:P3g79IUS/93SYhtoeaHW+kRCIrYaxJ27MFPv+7kaTOw=
252253
modernc.org/cc/v3 v3.40.0/go.mod h1:/bTg4dnWkSXowUO6ssQKnOV0yMVxDYNIsIrzqTFDGH0=
253254
modernc.org/ccgo/v3 v3.16.13 h1:Mkgdzl46i5F/CNR/Kj80Ri59hC8TKAhZrYSaqvkwzUw=
254255
modernc.org/ccgo/v3 v3.16.13/go.mod h1:2Quk+5YgpImhPjv2Qsob1DnZ/4som1lJTodubIcoUkY=
256+
modernc.org/ccorpus v1.11.6 h1:J16RXiiqiCgua6+ZvQot4yUuUy8zxgqbqEEUuGPlISk=
257+
modernc.org/ccorpus v1.11.6/go.mod h1:2gEUTrWqdpH2pXsmTM1ZkjeSrUWDpjMu2T6m29L/ErQ=
258+
modernc.org/httpfs v1.0.6 h1:AAgIpFZRXuYnkjftxTAZwMIiwEqAfk8aVB2/oA6nAeM=
259+
modernc.org/httpfs v1.0.6/go.mod h1:7dosgurJGp0sPaRanU53W4xZYKh14wfzX420oZADeHM=
255260
modernc.org/libc v1.22.2 h1:4U7v51GyhlWqQmwCHj28Rdq2Yzwk55ovjFrdPjs8Hb0=
256261
modernc.org/libc v1.22.2/go.mod h1:uvQavJ1pZ0hIoC/jfqNoMLURIMhKzINIWypNM17puug=
257262
modernc.org/mathutil v1.5.0 h1:rV0Ko/6SfM+8G+yKiyI830l3Wuz1zRutdslNoQ0kfiQ=
@@ -264,8 +269,12 @@ modernc.org/sqlite v1.20.4 h1:J8+m2trkN+KKoE7jglyHYYYiaq5xmz2HoHJIiBlRzbE=
264269
modernc.org/sqlite v1.20.4/go.mod h1:zKcGyrICaxNTMEHSr1HQ2GUraP0j+845GYw37+EyT6A=
265270
modernc.org/strutil v1.1.3 h1:fNMm+oJklMGYfU9Ylcywl0CO5O6nTfaowNsh2wpPjzY=
266271
modernc.org/strutil v1.1.3/go.mod h1:MEHNA7PdEnEwLvspRMtWTNnp2nnyvMfkimT1NKNAGbw=
272+
modernc.org/tcl v1.15.0 h1:oY+JeD11qVVSgVvodMJsu7Edf8tr5E/7tuhF5cNYz34=
273+
modernc.org/tcl v1.15.0/go.mod h1:xRoGotBZ6dU+Zo2tca+2EqVEeMmOUBzHnhIwq4YrVnE=
267274
modernc.org/token v1.0.1 h1:A3qvTqOwexpfZZeyI0FeGPDlSWX5pjZu9hF4lU+EKWg=
268275
modernc.org/token v1.0.1/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
276+
modernc.org/z v1.7.0 h1:xkDw/KepgEjeizO2sNco+hqYkU12taxQFqPEmgm1GWE=
277+
modernc.org/z v1.7.0/go.mod h1:hVdgNMh8ggTuRG1rGU8x+xGRFfiQUIAw0ZqlPy8+HyQ=
269278
nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50=
270279
rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
271280
xorm.io/builder v0.3.11-0.20220531020008-1bd24a7dc978 h1:bvLlAPW1ZMTWA32LuZMBEGHAUOcATZjzHcotf3SWweM=

pkg/database/sqlite3.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"path/filepath"
99
"reflect"
1010

11-
_ "github.com/mattn/go-sqlite3"
11+
_ "modernc.org/sqlite"
1212
"xorm.io/xorm"
1313
)
1414

@@ -102,9 +102,9 @@ func ConnectDateBase() {
102102
// 设置数据库路径为程序所在目录下的 database.db
103103
DatabaseName = filepath.Join(exeDir, "database.db")
104104

105-
Engine, err = xorm.NewEngine("sqlite3", DatabaseName)
105+
Engine, err = xorm.NewEngine("sqlite", DatabaseName)
106106
if err != nil {
107-
log.Fatalf("连接sqlite3数据库失败: %v", err)
107+
log.Fatalf("连接sqlite数据库失败: %v", err)
108108
}
109109
err = Engine.Sync2(new(Users), new(Clients), new(Notes), new(Shell), new(Downloads), new(Listener), new(WebDelivery), new(Socks5), new(Settings), new(Key))
110110
if err != nil {

0 commit comments

Comments
 (0)