From c117d363a02387e6c070f158957874bbbacf657f Mon Sep 17 00:00:00 2001 From: zhaoyupeng Date: Fri, 20 Sep 2024 15:14:49 +0800 Subject: [PATCH] feat: add oliver elastic support; update db(sqlite) --- go.mod | 29 ++++--- go.sum | 66 +++++++++------ internal/cmd/execute.go | 8 +- internal/controller/user.go | 4 +- internal/database/db/client.go | 41 +++++++--- internal/database/db/db_test.go | 44 ++++++++++ internal/database/db/init.go | 38 +++++---- internal/database/db/option.go | 27 +++++++ internal/database/db/sqlite.go | 63 +++++++++++++++ internal/database/elastic/client.go | 119 ++++++++++++++++++++++++++++ internal/database/es/client.go | 25 ++++-- internal/handler/log.go | 4 +- internal/handler/user.go | 14 ++-- internal/middleware/oplog/new.go | 2 +- 14 files changed, 399 insertions(+), 85 deletions(-) create mode 100644 internal/database/db/db_test.go create mode 100644 internal/database/db/option.go create mode 100644 internal/database/db/sqlite.go create mode 100644 internal/database/elastic/client.go diff --git a/go.mod b/go.mod index 8c72d3c..670c874 100644 --- a/go.mod +++ b/go.mod @@ -1,11 +1,12 @@ module ultone -go 1.20 +go 1.21 + +toolchain go1.23.0 require ( gitea.com/taozitaozi/gredis v0.0.0-20240131032054-b02845ce1e9d github.com/elastic/go-elasticsearch/v7 v7.17.10 - github.com/glebarez/sqlite v1.10.0 github.com/go-redis/redis/v8 v8.11.5 github.com/golang-jwt/jwt/v5 v5.2.0 github.com/google/uuid v1.6.0 @@ -13,28 +14,30 @@ require ( github.com/jackc/pgtype v1.12.0 github.com/jedib0t/go-pretty/v6 v6.5.9 github.com/loveuer/esgo2dump v0.3.3 + github.com/loveuer/go-sqlite3 v1.0.2 github.com/loveuer/nf v0.2.8 github.com/loveuer/ngorm/v2 v2.1.1 + github.com/ncruces/go-sqlite3/gormlite v0.18.0 + github.com/olivere/elastic/v7 v7.0.32 + github.com/psanford/httpreadat v0.1.0 github.com/rabbitmq/amqp091-go v1.10.0 github.com/samber/lo v1.39.0 github.com/sirupsen/logrus v1.9.2 github.com/spf13/cast v1.6.0 github.com/spf13/cobra v1.8.1 github.com/tdewolff/minify/v2 v2.20.16 - golang.org/x/crypto v0.25.0 + golang.org/x/crypto v0.27.0 google.golang.org/grpc v1.50.0 gorm.io/driver/mysql v1.4.5 gorm.io/driver/postgres v1.4.4 - gorm.io/gorm v1.25.5 + gorm.io/gorm v1.25.12 ) require ( github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect - github.com/dustin/go-humanize v1.0.1 // indirect github.com/facebook/fbthrift v0.31.1-0.20211129061412-801ed7f9f295 // indirect github.com/fatih/color v1.17.0 // indirect - github.com/glebarez/go-sqlite v1.21.2 // indirect github.com/go-sql-driver/mysql v1.7.0 // indirect github.com/golang/protobuf v1.5.2 // indirect github.com/google/go-cmp v0.6.0 // indirect @@ -48,24 +51,24 @@ require ( github.com/jackc/pgx/v4 v4.17.2 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect + github.com/josharian/intern v1.0.0 // indirect + github.com/mailru/easyjson v0.7.7 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/mattn/go-runewidth v0.0.15 // indirect + github.com/ncruces/go-sqlite3 v0.18.3 // indirect + github.com/ncruces/julianday v1.0.0 // indirect github.com/pkg/errors v0.9.1 // indirect - github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect github.com/rivo/uniseg v0.2.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/testify v1.9.0 // indirect github.com/tdewolff/parse/v2 v2.7.11 // indirect + github.com/tetratelabs/wazero v1.8.0 // indirect github.com/vesoft-inc/nebula-go/v3 v3.5.0 // indirect golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 // indirect golang.org/x/net v0.27.0 // indirect - golang.org/x/sys v0.22.0 // indirect - golang.org/x/text v0.16.0 // indirect + golang.org/x/sys v0.25.0 // indirect + golang.org/x/text v0.18.0 // indirect google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c // indirect google.golang.org/protobuf v1.30.0 // indirect - modernc.org/libc v1.22.5 // indirect - modernc.org/mathutil v1.5.0 // indirect - modernc.org/memory v1.5.0 // indirect - modernc.org/sqlite v1.23.1 // indirect ) diff --git a/go.sum b/go.sum index eaf94b4..84ef304 100644 --- a/go.sum +++ b/go.sum @@ -20,8 +20,6 @@ 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/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= -github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= -github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/elastic/go-elasticsearch/v7 v7.17.10 h1:TCQ8i4PmIJuBunvBS6bwT2ybzVFxxUhhltAs3Gyu1yo= github.com/elastic/go-elasticsearch/v7 v7.17.10/go.mod h1:OJ4wdbtDNk5g503kvlHLyErCgQwwzmDtaFC4XyOxXA4= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= @@ -32,12 +30,12 @@ github.com/facebook/fbthrift v0.31.1-0.20211129061412-801ed7f9f295 h1:ZA+qQ3d2In github.com/facebook/fbthrift v0.31.1-0.20211129061412-801ed7f9f295/go.mod h1:2tncLx5rmw69e5kMBv/yJneERbzrr1yr5fdlnTbu8lU= github.com/fatih/color v1.17.0 h1:GlRw1BRJxkpqUCBKzKOw098ed57fEsKeNjpTe3cSjK4= github.com/fatih/color v1.17.0/go.mod h1:YZ7TlrGPkiz6ku9fK3TLD/pl3CpsiFyu8N92HLgmosI= +github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= +github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= +github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= -github.com/glebarez/go-sqlite v1.21.2 h1:3a6LFC4sKahUunAmynQKLZceZCOzUthkRkEAl9gAXWo= -github.com/glebarez/go-sqlite v1.21.2/go.mod h1:sfxdZyhQjTM2Wry3gVYWaW072Ri1WMdWJi0k6+3382k= -github.com/glebarez/sqlite v1.10.0 h1:u4gt8y7OND/cCei/NMHmfbLxF6xP2wgKcT/BJf2pYkc= -github.com/glebarez/sqlite v1.10.0/go.mod h1:IJ+lfSOmiekhQsFTJRx/lHtGYmCdtAiTaf5wI9u5uHA= +github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI= @@ -71,7 +69,6 @@ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= @@ -134,15 +131,19 @@ github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkr github.com/jinzhu/now v1.1.4/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= +github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= +github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= 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/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= @@ -150,10 +151,14 @@ github.com/lib/pq v1.10.2 h1:AqzbZs4ZoCBp+GtejcpCpcxM3zlSMx29dXbUSeVtJb8= github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/loveuer/esgo2dump v0.3.3 h1:/AidoaFV7bDRyT1ycyBKs4XGmyVs2ShaUKrpEBiUWkM= github.com/loveuer/esgo2dump v0.3.3/go.mod h1:thZvfsO0kd7Ck3TA0jc9rRc4CuIa4Iuiq6tF3tCqXEY= +github.com/loveuer/go-sqlite3 v1.0.2 h1:kcENqm6mt0wPH/N9Sw+6UC74qtU8o+aMEO04I62pjDE= +github.com/loveuer/go-sqlite3 v1.0.2/go.mod h1:8+45etSlBYCtYP/ThX/e1wLgG+x6G6oXck2FhjC57tA= github.com/loveuer/nf v0.2.8 h1:Qo0M748TglS6E5geh1LG0IBkrjLm+5yUs3II9l50tEQ= github.com/loveuer/nf v0.2.8/go.mod h1:M6reF17/kJBis30H4DxR5hrtgo/oJL4AV4cBe4HzJLw= github.com/loveuer/ngorm/v2 v2.1.1 h1:v+ut5BjeSBFU87o800pI8Q3fXEOUAkvk5+btMw2oOEc= github.com/loveuer/ngorm/v2 v2.1.1/go.mod h1:BVhFGQsRMdcf08MtmwwRihwCR/x7wDd0Fzy8Xj+edM0= +github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= +github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= @@ -166,24 +171,35 @@ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWE github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U= github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= +github.com/ncruces/go-sqlite3 v0.18.3 h1:tyMa75uh7LcINcfo0WrzOvcTkfz8Hqu0TEPX+KVyes4= +github.com/ncruces/go-sqlite3 v0.18.3/go.mod h1:HAwOtA+cyEX3iN6YmkpQwfT4vMMgCB7rQRFUdOgEFik= +github.com/ncruces/go-sqlite3/gormlite v0.18.0 h1:KqP9a9wlX/Ba+yG+aeVX4pnNBNdaSO6xHdNDWzPxPnk= +github.com/ncruces/go-sqlite3/gormlite v0.18.0/go.mod h1:RXeT1hknrz3A0tBDL6IfluDHuNkHdJeImn5TBMQg9zc= +github.com/ncruces/julianday v1.0.0 h1:fH0OKwa7NWvniGQtxdJRxAgkBMolni2BjDHaWTxqt7M= +github.com/ncruces/julianday v1.0.0/go.mod h1:Dusn2KvZrrovOMJuOt0TNXL6tB7U2E8kvza5fFc9G7g= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= +github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= +github.com/olivere/elastic/v7 v7.0.32 h1:R7CXvbu8Eq+WlsLgxmKVKPox0oOwAE/2T9Si5BnvK6E= +github.com/olivere/elastic/v7 v7.0.32/go.mod h1:c7PVmLe3Fxq77PIfY/bZmxY/TAamBhCzZ8xDOE09a9k= 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/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE= +github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= 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/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/psanford/httpreadat v0.1.0 h1:VleW1HS2zO7/4c7c7zNl33fO6oYACSagjJIyMIwZLUE= +github.com/psanford/httpreadat v0.1.0/go.mod h1:Zg7P+TlBm3bYbyHTKv/EdtSJZn3qwbPwpfZ/I9GKCRE= github.com/rabbitmq/amqp091-go v1.10.0 h1:STpn5XsHlHGcecLmMFCtg7mqq0RnD+zFr4uzukfVhBw= github.com/rabbitmq/amqp091-go v1.10.0/go.mod h1:Hy4jKW5kQART1u+JkDTF9YYOQUHXqMuhrgxOEeS7G4o= -github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= -github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE= -github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= +github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU= github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc= @@ -223,6 +239,9 @@ github.com/tdewolff/parse/v2 v2.7.11 h1:v+W45LnzmjndVlfqPCT5gGjAAZKd1GJGOPJveTIk github.com/tdewolff/parse/v2 v2.7.11/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739 h1:IkjBCtQOOjIn03u/dMQK9g+Iw9ewps4mCl1nB8Sscbo= +github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739/go.mod h1:XPuWBzvdUzhCuxWO1ojpXsyzsA5bFoS3tO/Q3kFuTG8= +github.com/tetratelabs/wazero v1.8.0 h1:iEKu0d4c2Pd+QSRieYbnQC9yiFlMS9D+Jr0LsRmcF4g= +github.com/tetratelabs/wazero v1.8.0/go.mod h1:yAI0XTsMBhREkM/YDAK/zNou3GoiAce1P6+rp/wQhjs= github.com/vesoft-inc/nebula-go/v3 v3.5.0 h1:2ZSkoBxtIfs15AXJXqrAPDPd0Z9HrzKR7YKXPqlJcR0= github.com/vesoft-inc/nebula-go/v3 v3.5.0/go.mod h1:+sXv05jYQBARdTbTcIEsWVXCnF/6ttOlDK35xQ6m54s= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= @@ -232,6 +251,7 @@ go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= +go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= @@ -249,8 +269,8 @@ golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWP golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30= -golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M= +golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A= +golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 h1:3MTrJm4PyNL9NBqvYDSj3DHl46qQakyfqfWo4jgfaEM= golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17/go.mod h1:lgLbSvA5ygNOMpwM/9anMpWVlVJ7Z+cHWq/eFuinpGE= @@ -298,8 +318,8 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= -golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= +golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= 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= @@ -309,8 +329,8 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= -golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= +golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= +golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= @@ -363,8 +383,10 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s= 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.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.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= @@ -374,16 +396,8 @@ gorm.io/driver/postgres v1.4.4 h1:zt1fxJ+C+ajparn0SteEnkoPg0BQ6wOWXEQ99bteAmw= gorm.io/driver/postgres v1.4.4/go.mod h1:whNfh5WhhHs96honoLjBAMwJGYEuA3m1hvgUbNXhPCw= gorm.io/gorm v1.23.7/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk= gorm.io/gorm v1.23.8/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk= -gorm.io/gorm v1.25.5 h1:zR9lOiiYf09VNh5Q1gphfyia1JpiClIWG9hQaxB/mls= -gorm.io/gorm v1.25.5/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8= +gorm.io/gorm v1.25.12 h1:I0u8i2hWQItBq1WfE0o2+WuL9+8L21K9e2HHSTE/0f8= +gorm.io/gorm v1.25.12/go.mod h1:xh7N7RHfYlNc5EmcI/El95gXusucDrQnHXe0+CgWcLQ= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= -modernc.org/libc v1.22.5 h1:91BNch/e5B0uPbJFgqbxXuOnxBQjlS//icfQEGmvyjE= -modernc.org/libc v1.22.5/go.mod h1:jj+Z7dTNX8fBScMVNRAYZ/jF91K8fdT2hYMThc3YjBY= -modernc.org/mathutil v1.5.0 h1:rV0Ko/6SfM+8G+yKiyI830l3Wuz1zRutdslNoQ0kfiQ= -modernc.org/mathutil v1.5.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= -modernc.org/memory v1.5.0 h1:N+/8c5rE6EqugZwHii4IFsaJ7MUhoWX07J5tC/iI5Ds= -modernc.org/memory v1.5.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU= -modernc.org/sqlite v1.23.1 h1:nrSBg4aRQQwq59JpvGEQ15tNxoO5pX/kUjcRNwSAGQM= -modernc.org/sqlite v1.23.1/go.mod h1:OrDj17Mggn6MhE+iPbBNf7RGKODDE9NFT0f3EwDzJqk= diff --git a/internal/cmd/execute.go b/internal/cmd/execute.go index 4ea28f3..a7fc99b 100644 --- a/internal/cmd/execute.go +++ b/internal/cmd/execute.go @@ -18,16 +18,18 @@ var ( func execute(ctx context.Context) error { tool.Must(opt.Init(filename)) - tool.Must(db.Init()) + tool.Must(db.Init(ctx, opt.Cfg.DB.Uri)) tool.Must(cache.Init()) // todo: if elastic search required - // tool.Must(es.Init()) + //tool.Must(es.Init(ctx, opt.Cfg.ES.Uri)) + // 或者使用 https://github.com/olivere/elastic + //tool.Must(elastic.Init(ctx, opt.Cfg.ES.Uri)) // todo: if nebula required // tool.Must(nebula.Init(ctx, opt.Cfg.Nebula)) - tool.Must(model.Init(db.New())) + tool.Must(model.Init(db.Default.Session())) tool.Must(controller.Init(ctx)) tool.Must(api.Start(ctx)) diff --git a/internal/controller/user.go b/internal/controller/user.go index 26eb855..c44fffe 100644 --- a/internal/controller/user.go +++ b/internal/controller/user.go @@ -55,7 +55,7 @@ func (u uc) GetUser(ctx context.Context, id uint64) (*model.User, error) { } ByDB: - if err = db.New(tool.Timeout(3)). + if err = db.Default.Session(tool.Timeout(3)). Model(&model.User{}). Where("id = ?", id). Take(target). @@ -146,7 +146,7 @@ func (u uc) DeleteUser(ctx context.Context, id uint64) error { username = "username || '@del'" } - if err = db.New(tool.Timeout(5)). + if err = db.Default.Session(tool.Timeout(5)). Model(&model.User{}). Where("id = ?", id). Updates(map[string]any{ diff --git a/internal/database/db/client.go b/internal/database/db/client.go index 52d0d7b..b00fd2c 100644 --- a/internal/database/db/client.go +++ b/internal/database/db/client.go @@ -2,25 +2,29 @@ package db import ( "context" - "gorm.io/gorm" + "io" "ultone/internal/opt" "ultone/internal/tool" + + "gorm.io/gorm" ) var ( - cli = &client{} + Default *Client ) -type client struct { - cli *gorm.DB - ttype string +type Client struct { + ctx context.Context + cli *gorm.DB + ttype string + cfgSqlite *cfgSqlite } -func Type() string { - return cli.ttype +func (c *Client) Type() string { + return c.ttype } -func New(ctxs ...context.Context) *gorm.DB { +func (c *Client) Session(ctxs ...context.Context) *gorm.DB { var ctx context.Context if len(ctxs) > 0 && ctxs[0] != nil { ctx = ctxs[0] @@ -28,7 +32,7 @@ func New(ctxs ...context.Context) *gorm.DB { ctx = tool.Timeout(30) } - session := cli.cli.Session(&gorm.Session{Context: ctx}) + session := c.cli.Session(&gorm.Session{Context: ctx}) if opt.Debug { session = session.Debug() @@ -36,3 +40,22 @@ func New(ctxs ...context.Context) *gorm.DB { return session } + +func (c *Client) Close() { + d, _ := c.cli.DB() + d.Close() +} + +// Dump +// Only for sqlite with mem mode to dump data to bytes(io.Reader) +func (c *Client) Dump() (reader io.ReadSeekCloser, ok bool) { + if c.ttype != "sqlite" { + return nil, false + } + + if c.cfgSqlite.fsType != "mem" { + return nil, false + } + + return c.cfgSqlite.memDump.Dump(), true +} diff --git a/internal/database/db/db_test.go b/internal/database/db/db_test.go new file mode 100644 index 0000000..2fc6a57 --- /dev/null +++ b/internal/database/db/db_test.go @@ -0,0 +1,44 @@ +package db + +import ( + "context" + "io" + "os" + "testing" +) + +func TestOpen(t *testing.T) { + myClient, err := New(context.TODO(), "sqlite::", OptSqliteByMem()) + if err != nil { + t.Fatalf("TestOpen: New err = %v", err) + } + + type Start struct { + Id int `json:"id" gorm:"column:id;primaryKey"` + Name string `json:"name" gorm:"column:name"` + Dis float64 `json:"dis" gorm:"column:dis"` + } + + if err = myClient.Session().AutoMigrate(&Start{}); err != nil { + t.Fatalf("TestOpen: AutoMigrate err = %v", err) + } + + if err = myClient.Session().Create(&Start{Name: "sun", Dis: 6631.76}).Error; err != nil { + t.Fatalf("TestOpen: Create err = %v", err) + } + + if err = myClient.Session().Create(&Start{Name: "mar", Dis: 786.35}).Error; err != nil { + t.Fatalf("TestOpen: Create err = %v", err) + } + + if reader, ok := myClient.Dump(); ok { + bs, err := io.ReadAll(reader) + if err != nil { + t.Fatalf("TestOpen: ReadAll err = %v", err) + } + + os.WriteFile("dump.db", bs, 0644) + } + + myClient.Close() +} diff --git a/internal/database/db/init.go b/internal/database/db/init.go index e311e1c..01f3fb1 100644 --- a/internal/database/db/init.go +++ b/internal/database/db/init.go @@ -1,23 +1,26 @@ package db import ( + "context" "fmt" - "github.com/glebarez/sqlite" + "strings" + "gorm.io/driver/mysql" "gorm.io/driver/postgres" "gorm.io/gorm" - "strings" - "ultone/internal/opt" ) -func Init() error { - strs := strings.Split(opt.Cfg.DB.Uri, "::") +func New(ctx context.Context, uri string, opts ...Option) (*Client, error) { + strs := strings.Split(uri, "::") if len(strs) != 2 { - return fmt.Errorf("db.Init: opt db uri invalid: %s", opt.Cfg.DB.Uri) + return nil, fmt.Errorf("db.Init: opt db uri invalid: %s", uri) } - cli.ttype = strs[0] + c := &Client{ttype: strs[0], cfgSqlite: &cfgSqlite{fsType: "file"}} + for _, f := range opts { + f(c) + } var ( err error @@ -26,20 +29,25 @@ func Init() error { switch strs[0] { case "sqlite": - opt.Cfg.DB.Type = "sqlite" - cli.cli, err = gorm.Open(sqlite.Open(dsn)) + err = openSqlite(c, dsn) case "mysql": - opt.Cfg.DB.Type = "mysql" - cli.cli, err = gorm.Open(mysql.Open(dsn)) + c.cli, err = gorm.Open(mysql.Open(dsn)) case "postgres": - opt.Cfg.DB.Type = "postgres" - cli.cli, err = gorm.Open(postgres.Open(dsn)) + c.cli, err = gorm.Open(postgres.Open(dsn)) default: - return fmt.Errorf("db type only support: [sqlite, mysql, postgres], unsupported db type: %s", strs[0]) + return nil, fmt.Errorf("db type only support: [sqlite, mysql, postgres], unsupported db type: %s", strs[0]) } if err != nil { - return fmt.Errorf("db.Init: open %s with dsn:%s, err: %w", strs[0], dsn, err) + return nil, fmt.Errorf("db.Init: open %s with dsn:%s, err: %w", strs[0], dsn, err) + } + + return c, nil +} + +func Init(ctx context.Context, uri string, opts ...Option) (err error) { + if Default, err = New(ctx, uri, opts...); err != nil { + return err } return nil diff --git a/internal/database/db/option.go b/internal/database/db/option.go new file mode 100644 index 0000000..3fa25d8 --- /dev/null +++ b/internal/database/db/option.go @@ -0,0 +1,27 @@ +package db + +import ( + _ "github.com/loveuer/go-sqlite3/embed" + "io" +) + +type Option func(c *Client) + +func OptSqliteByUrl(address string) Option { + return func(c *Client) { + c.cfgSqlite.fsType = "url" + } +} + +type SqliteMemDumper interface { + Dump() io.ReadSeekCloser +} + +// 如果传 nil 则表示新生成一个 mem 的 sqlite +// 如果传了一个合法的 reader 则会从这个 reader 初始化 database +func OptSqliteByMem(reader io.ReadCloser) Option { + return func(c *Client) { + c.cfgSqlite.memReader = reader + c.cfgSqlite.fsType = "mem" + } +} diff --git a/internal/database/db/sqlite.go b/internal/database/db/sqlite.go new file mode 100644 index 0000000..1e7b342 --- /dev/null +++ b/internal/database/db/sqlite.go @@ -0,0 +1,63 @@ +package db + +import ( + "fmt" + "io" + "time" + + _ "github.com/loveuer/go-sqlite3/embed" + "github.com/loveuer/go-sqlite3/vfs/memdb" + "github.com/loveuer/go-sqlite3/vfs/readervfs" + "github.com/ncruces/go-sqlite3/gormlite" + "github.com/psanford/httpreadat" + "gorm.io/gorm" +) + +type cfgSqlite struct { + fsType string // file, mem(bytes), url + memDump *memdb.MemDB + memReader io.ReadCloser +} + +func openSqlite(c *Client, dsn string) error { + var ( + db gorm.Dialector + err error + ) + + switch c.cfgSqlite.fsType { + case "file": + db = gormlite.Open("file:" + dsn) + case "url": + name := fmt.Sprintf("%d.db", time.Now().UnixNano()) + readervfs.Create(name, httpreadat.New(dsn)) + uri := fmt.Sprintf("file:%s?vfs=reader", name) + db = gormlite.Open(uri) + case "mem": + var ( + bs []byte + name = fmt.Sprintf("%d.db", time.Now().UnixNano()) + ) + + if c.cfgSqlite.memReader == nil { + bs = make([]byte, 0) + } else { + if bs, err = io.ReadAll(c.cfgSqlite.memReader); err != nil { + return err + } + } + + memDump := memdb.Create(name, bs) + c.cfgSqlite.memDump = memDump + uri := fmt.Sprintf("file:/%s?vfs=memdb", name) + db = gormlite.Open(uri) + default: + return fmt.Errorf("unsupported sqlite fs type: %s", c.cfgSqlite.fsType) + } + + if c.cli, err = gorm.Open(db); err != nil { + return err + } + + return nil +} diff --git a/internal/database/elastic/client.go b/internal/database/elastic/client.go new file mode 100644 index 0000000..14d5a74 --- /dev/null +++ b/internal/database/elastic/client.go @@ -0,0 +1,119 @@ +package elastic + +import ( + "context" + "crypto/tls" + "fmt" + "github.com/loveuer/nf/nft/log" + es "github.com/olivere/elastic/v7" + "github.com/spf13/cast" + "net/http" + "net/url" + "strings" + "time" +) + +var ( + Client *es.Client +) + +const ( + ExampleUri = "https://username:password@ip1:9200,ip2:9200?disable_sniff=false&health=false" +) + +func New(ctx context.Context, uri string) (*es.Client, error) { + var ( + err error + ins *url.URL + client *es.Client + version string + ) + + if ins, err = url.Parse(uri); err != nil { + return nil, fmt.Errorf("invalid uri: %v\nexample uri: %s", err, ExampleUri) + } + + if !(ins.Scheme == "http" || ins.Scheme == "https") { + return nil, fmt.Errorf("invalid uri scheme: %v\nexample uri: %s", err, ExampleUri) + } + + hosts := strings.Split(ins.Host, ",") + if len(hosts) == 0 { + return nil, fmt.Errorf("invalid uri hosts: %v\nexample uri: %s", err, ExampleUri) + } + + opts := make([]es.ClientOptionFunc, 0) + shouldHosts := make([]string, 0) + oks := make([]string, 0) + bads := make([]string, 0) + + for idx := range hosts { + if len(hosts[idx]) == 0 { + continue + } + + opts = append(opts, es.SetURL(hosts[idx])) + shouldHosts = append(shouldHosts, hosts[idx]) + } + + if len(opts) == 0 { + return nil, fmt.Errorf("invalid uri hosts: %v\nexample uri: %s", err, ExampleUri) + } + + if ins.Scheme == "https" { + opts = append(opts, es.SetScheme("https")) + opts = append(opts, es.SetHttpClient( + &http.Client{ + Transport: &http.Transport{ + TLSClientConfig: &tls.Config{ + InsecureSkipVerify: true, + }, + }, + }, + )) + } + + if ins.User != nil { + username := ins.User.Username() + password, _ := ins.User.Password() + opts = append(opts, es.SetBasicAuth(username, password)) + } + + if cast.ToBool(ins.Query().Get("disable_sniff")) { + opts = append(opts, es.SetSniff(false)) + } + + if cast.ToBool(ins.Query().Get("health")) { + opts = append(opts, es.SetHealthcheckInterval(time.Minute)) + opts = append(opts, es.SetHealthcheckTimeout(5*time.Second)) + } else { + opts = append(opts, es.SetHealthcheck(false)) + } + + client, err = es.NewClient(opts...) + + for idx := range shouldHosts { + if version, err = client.ElasticsearchVersion(shouldHosts[idx]); err != nil { + bads = append(bads, shouldHosts[idx]) + continue + } + + oks = append(oks, shouldHosts[idx]) + } + + switch len(oks) { + case 0: + return nil, fmt.Errorf("all nodes: %+v unavailable", shouldHosts) + case len(shouldHosts): + log.Info("connect to elastic[version: %s] success, all nodes: %+v available", version, shouldHosts) + default: + log.Warn("connect to elastic all nodes: %+v, err nodes: %v", shouldHosts, bads) + } + + return client, err +} + +func Init(ctx context.Context, uri string) (err error) { + Client, err = New(ctx, uri) + return err +} diff --git a/internal/database/es/client.go b/internal/database/es/client.go index c091952..a0a020b 100644 --- a/internal/database/es/client.go +++ b/internal/database/es/client.go @@ -1,6 +1,7 @@ package es import ( + "context" elastic "github.com/elastic/go-elasticsearch/v7" "github.com/loveuer/esgo2dump/xes/es7" "github.com/loveuer/nf/nft/log" @@ -13,17 +14,27 @@ var ( Client *elastic.Client ) -func Init() error { - ins, err := url.Parse(opt.Cfg.ES.Uri) - if err != nil { - return err +func New(ctx context.Context, uri string) (*elastic.Client, error) { + var ( + err error + client *elastic.Client + ins *url.URL + ) + + if ins, err = url.Parse(uri); err != nil { + return nil, err } log.Debug("es.InitClient url parse uri: %s, result: %+v", opt.Cfg.ES.Uri, ins) - if Client, err = es7.NewClient(tool.Timeout(10), ins); err != nil { - return err + if client, err = es7.NewClient(tool.Timeout(10), ins); err != nil { + return nil, err } - return nil + return client, nil +} + +func Init(ctx context.Context, uri string) (err error) { + Client, err = New(ctx, uri) + return err } diff --git a/internal/handler/log.go b/internal/handler/log.go index 2a2ace3..ca74d5d 100644 --- a/internal/handler/log.go +++ b/internal/handler/log.go @@ -50,11 +50,11 @@ func LogList(c *nf.Ctx) error { return resp.Resp400(c, req, "参数过大") } - txCount := op.Role.Where(db.New(tool.Timeout(3)). + txCount := op.Role.Where(db.Default.Session(tool.Timeout(3)). Model(&model.OpLog{}). Select("COUNT(`op_logs`.`id`)"). Joins("LEFT JOIN users ON `users`.`id` = `op_logs`.`user_id`")) - txGet := op.Role.Where(db.New(tool.Timeout(10)). + txGet := op.Role.Where(db.Default.Session(tool.Timeout(10)). Model(&model.OpLog{}). Joins("LEFT JOIN users ON `users`.`id` = `op_logs`.`user_id`")) diff --git a/internal/handler/user.go b/internal/handler/user.go index c016118..4903d89 100644 --- a/internal/handler/user.go +++ b/internal/handler/user.go @@ -37,7 +37,7 @@ func AuthLogin(c *nf.Ctx) error { return resp.Resp400(c, err.Error()) } - if err = db.New(tool.Timeout(3)). + if err = db.Default.Session(tool.Timeout(3)). Model(&model.User{}). Where("username = ?", req.Username). Where("deleted_at = 0"). @@ -170,7 +170,7 @@ func UserUpdate(c *nf.Ctx) error { return resp.Resp400(c, req, err.Error()) } - if err = db.New(tool.Timeout(3)). + if err = db.Default.Session(tool.Timeout(3)). Select("password"). Model(&model.User{}). Where("username = ?", user.Username). @@ -184,7 +184,7 @@ func UserUpdate(c *nf.Ctx) error { return resp.Resp400(c, nil, "原密码错误") } - if err = db.New(tool.Timeout(5)). + if err = db.Default.Session(tool.Timeout(5)). Model(&model.User{}). Where("id = ?", user.Id). Update("password", tool.NewPassword(req.NewPassword)). @@ -232,10 +232,10 @@ func ManageUserList(c *nf.Ctx) error { return resp.Resp400(c, nf.Map{"msg": "size over max", "max": opt.MaxSize}) } - txList := op.Role.Where(db.New(tool.Timeout(10)). + txList := op.Role.Where(db.Default.Session(tool.Timeout(10)). Model(&model.User{}). Where("deleted_at = 0")) - txCount := op.Role.Where(db.New(tool.Timeout(5)). + txCount := op.Role.Where(db.Default.Session(tool.Timeout(5)). Model(&model.User{}). Select("COUNT(id)"). Where("deleted_at = 0")) @@ -345,7 +345,7 @@ func ManageUserCreate(c *nf.Ctx) error { return resp.Resp403(c, newUser, "角色不符合") } - if err = db.New(tool.Timeout(5)). + if err = db.Default.Session(tool.Timeout(5)). Create(newUser). Error; err != nil { return resp.Resp500(c, err.Error()) @@ -494,7 +494,7 @@ func ManageUserUpdate(c *nf.Ctx) error { } updated := new(model.User) - if err = db.New(tool.Timeout(5)). + if err = db.Default.Session(tool.Timeout(5)). Model(updated). Clauses(clause.Returning{}). Where("id = ?", req.Id). diff --git a/internal/middleware/oplog/new.go b/internal/middleware/oplog/new.go index a7b5fe4..dff8dfa 100644 --- a/internal/middleware/oplog/new.go +++ b/internal/middleware/oplog/new.go @@ -45,7 +45,7 @@ func NewOpLog(ctx context.Context) nf.HandlerFunc { return } - if err = db.New(tool.Timeout(10)). + if err = db.Default.Session(tool.Timeout(10)). Model(&model.OpLog{}). Create(&list). Error; err != nil {