自动建立表-toekn

go.mod

@@ -5,13 +5,74 @@ go 1.25.4
 require (
 	git.x2erp.com/qdy/go-base v0.1.70
 	git.x2erp.com/qdy/go-db v0.1.70
+	github.com/jmoiron/sqlx v1.4.0
 	go-micro.dev/v4 v4.11.0
 )
 
 require (
-	github.com/kr/pretty v0.3.1 // indirect
-	github.com/rogpeppe/go-internal v1.14.1 // indirect
-	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
+	dario.cat/mergo v1.0.2 // indirect
+	filippo.io/edwards25519 v1.1.0 // indirect
+	github.com/Microsoft/go-winio v0.6.2 // indirect
+	github.com/ProtonMail/go-crypto v1.3.0 // indirect
+	github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da // indirect
+	github.com/bitly/go-simplejson v0.5.1 // indirect
+	github.com/cloudflare/circl v1.6.1 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
+	github.com/cyphar/filepath-securejoin v0.6.1 // indirect
+	github.com/emirpasic/gods v1.18.1 // indirect
+	github.com/fatih/color v1.9.0 // indirect
+	github.com/fsnotify/fsnotify v1.9.0 // indirect
+	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
+	github.com/go-git/go-billy/v5 v5.6.2 // indirect
+	github.com/go-git/go-git/v5 v5.16.4 // indirect
+	github.com/go-micro/plugins/v4/registry/consul v1.2.1 // indirect
+	github.com/go-resty/resty/v2 v2.17.0 // indirect
+	github.com/go-sql-driver/mysql v1.9.3 // indirect
+	github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
+	github.com/golang-sql/sqlexp v0.1.0 // indirect
+	github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
+	github.com/google/uuid v1.6.0 // indirect
+	github.com/hashicorp/consul/api v1.9.0 // indirect
+	github.com/hashicorp/go-cleanhttp v0.5.1 // indirect
+	github.com/hashicorp/go-hclog v0.12.0 // indirect
+	github.com/hashicorp/go-immutable-radix v1.0.0 // indirect
+	github.com/hashicorp/go-rootcerts v1.0.2 // indirect
+	github.com/hashicorp/golang-lru v0.5.3 // indirect
+	github.com/hashicorp/serf v0.9.5 // indirect
+	github.com/imdario/mergo v0.3.16 // indirect
+	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
+	github.com/kevinburke/ssh_config v1.4.0 // indirect
+	github.com/klauspost/cpuid/v2 v2.3.0 // indirect
+	github.com/lib/pq v1.10.9 // indirect
+	github.com/mattn/go-colorable v0.1.8 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/microsoft/go-mssqldb v1.9.4 // indirect
+	github.com/miekg/dns v1.1.68 // indirect
+	github.com/mitchellh/go-homedir v1.1.0 // indirect
+	github.com/mitchellh/hashstructure v1.1.0 // indirect
+	github.com/mitchellh/mapstructure v1.3.3 // indirect
+	github.com/nxadm/tail v1.4.11 // indirect
+	github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c // indirect
+	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
+	github.com/pjbgf/sha1cd v0.5.0 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/russross/blackfriday/v2 v2.1.0 // indirect
+	github.com/sergi/go-diff v1.4.0 // indirect
+	github.com/sijms/go-ora/v2 v2.9.0 // indirect
+	github.com/skeema/knownhosts v1.3.2 // indirect
+	github.com/urfave/cli/v2 v2.27.7 // indirect
+	github.com/xanzy/ssh-agent v0.3.3 // indirect
+	github.com/xrash/smetrics v0.0.0-20250705151800-55b8f293f342 // indirect
+	golang.org/x/crypto v0.46.0 // indirect
+	golang.org/x/mod v0.32.0 // indirect
+	golang.org/x/net v0.48.0 // indirect
+	golang.org/x/sync v0.19.0 // indirect
+	golang.org/x/sys v0.39.0 // indirect
+	golang.org/x/text v0.32.0 // indirect
+	golang.org/x/tools v0.40.0 // indirect
+	google.golang.org/protobuf v1.36.10 // indirect
+	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
+	gopkg.in/warnings.v0 v0.1.2 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
-
-require gopkg.in/yaml.v2 v2.4.0 // indirect

go.sum

@@ -1,14 +1,114 @@
-git.x2erp.com/qdy/go-base v0.1.44 h1:xHpMppSNj79lqdUc+lmgGXOgEvHyNotUayoe5/hHWr4=
-git.x2erp.com/qdy/go-base v0.1.44/go.mod h1:Q+YLwpCoU8CVSnzATLdz2LAzVMlz/CEGzo8DePf7cug=
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+dario.cat/mergo v1.0.2 h1:85+piFYR1tMbRrLcDwR18y4UKJ3aH1Tbzi24VRW1TK8=
+filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
+git.x2erp.com/qdy/go-base v0.1.70 h1:P5IOfSN6CnXcBYIrs+4BULYemPyzcgrFMkI7TcCri5A=
+git.x2erp.com/qdy/go-db v0.1.70 h1:5VfvFxCmQ0+9OFEaPrTODYJ99wam+4lPjz4Y024SUdc=
+github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0 h1:Gt0j3wceWMwPmiazCa8MzMA0MfhmPIz0Qp0FJ6qcM0U=
+github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.10.1 h1:B+blDbyVIG3WaikNxPnhPiJ1MThR03b3vKGtER95TP4=
+github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.1 h1:FPKJS1T+clwv+OLGt13a8UjqeRuh0O4SJ3lUriThc+4=
+github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.3.1 h1:Wgf5rZba3YZqeTNJPtvqZoBu1sBN/L4sry+u2U3Y75w=
+github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.1.1 h1:bFWuoEKg+gImo7pvkiQEFAc8ocibADgXeiLAxWhWmkI=
+github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2 h1:oygO0locgZJe7PpYPXT5A29ZkwJaPqcva7BVeemZOZs=
+github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
+github.com/ProtonMail/go-crypto v1.3.0 h1:ILq8+Sf5If5DCpHQp4PbZdS1J7HDFRXz/+xKBiRGFrw=
+github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8=
+github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da h1:8GUt8eRujhVEGZFFEjBj46YV4rDjvGrNxb0KMWYkL2I=
+github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
+github.com/bitly/go-simplejson v0.5.1 h1:xgwPbetQScXt1gh9BmoJ6j9JMr3TElvuIyjR8pgdoow=
+github.com/cloudflare/circl v1.6.1 h1:zqIqSPIndyBh1bjLVVDHMPpVKqp8Su/V+6MeDzzQBQ0=
+github.com/cpuguy83/go-md2man/v2 v2.0.7 h1:zbFlGlXEAKlwXpmvle3d8Oe3YnkKIK4xSRTd3sHPnBo=
+github.com/cyphar/filepath-securejoin v0.6.1 h1:5CeZ1jPXEiYt3+Z6zqprSAgSWiggmpVyciv8syjIpVE=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/elazarl/goproxy v1.7.2 h1:Y2o6urb7Eule09PjlhQRGNsqRfPmYI3KKQLFpCAV3+o=
+github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
+github.com/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s=
+github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
+github.com/gliderlabs/ssh v0.3.8 h1:a4YXD1V7xMF9g5nTkdfnja3Sxy1PVDCj1Zg4Wb8vY6c=
+github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI=
+github.com/go-git/go-billy/v5 v5.6.2 h1:6Q86EsPXMa7c3YZ3aLAQsMA0VlWmy43r6FHqa/UNbRM=
+github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMje31YglSBqCdIqdhKBW8lokaMrL3uTkpGYlE2OOT4=
+github.com/go-git/go-git/v5 v5.16.4 h1:7ajIEZHZJULcyJebDLo99bGgS0jRrOxzZG4uCk2Yb2Y=
+github.com/go-micro/plugins/v4/registry/consul v1.2.1 h1:3wctYMtstwQLCjoJ1HA6mKGGFF1hcdKDv5MzHakB1jE=
+github.com/go-resty/resty/v2 v2.17.0 h1:pW9DeXcaL4Rrym4EZ8v7L19zZiIlWPg5YXAcVmt+gN0=
+github.com/go-sql-driver/mysql v1.9.3 h1:U/N249h2WzJ3Ukj8SowVFjdtZKfu9vlLZxjPXV1aweo=
+github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8=
+github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 h1:au07oEsX2xN0ktxqI+Sida1w446QrXBRJ0nee3SNZlA=
+github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A=
+github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ=
+github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
+github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/hashicorp/consul/api v1.9.0 h1:T6dKIWcaihG2c21YUi0BMAHbJanVXiYuz+mPgqxY3N4=
+github.com/hashicorp/consul/sdk v0.8.0 h1:OJtKBtEjboEZvG6AOUdh4Z1Zbyu0WcxQ0qatRrZHTVU=
+github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
+github.com/hashicorp/go-cleanhttp v0.5.1 h1:dH3aiDG9Jvb5r5+bYHsikaOUIpcM0xvgMXVoDkXMzJM=
+github.com/hashicorp/go-hclog v0.12.0 h1:d4QkX8FRTYaKaCZBoXYY8zJX2BXjWxurN/GA2tkrmZM=
+github.com/hashicorp/go-immutable-radix v1.0.0 h1:AKDB1HM5PWEA7i4nhcpwOrO2byshxBjXVn/J/3+z5/0=
+github.com/hashicorp/go-msgpack v0.5.3 h1:zKjpN5BK/P5lMYrLmBHdBULWbJ0XpYR+7NGzqkZzoD4=
+github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
+github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc=
+github.com/hashicorp/go-sockaddr v1.0.0 h1:GeH6tui99pF4NJgfnhp+L6+FfobzVW3Ah46sLo0ICXs=
+github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8=
+github.com/hashicorp/golang-lru v0.5.3 h1:YPkqC67at8FYaadspW/6uE0COsBxS2656RLEr8Bppgk=
+github.com/hashicorp/memberlist v0.2.2 h1:5+RffWKwqJ71YPu9mWsF7ZOscZmwfasdA8kbdC7AO2g=
+github.com/hashicorp/serf v0.9.5 h1:EBWvyu9tcRszt3Bxp3KNssBMP1KuHWyO51lz9+786iM=
+github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
+github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
+github.com/jmoiron/sqlx v1.4.0 h1:1PLqN7S1UYp5t4SrVVnt4nUVNemrDAtxlulVe+Qgm3o=
+github.com/kevinburke/ssh_config v1.4.0 h1:6xxtP5bZ2E4NF5tuQulISpTO2z8XbtH8cg1PWkxoFkQ=
+github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 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/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
+github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
+github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8=
+github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
+github.com/microsoft/go-mssqldb v1.9.4 h1:sHrj3GcdgkxytZ09aZ3+ys72pMeyEXJowT44j74pNgs=
+github.com/miekg/dns v1.1.68 h1:jsSRkNozw7G/mnmXULynzMNIsgY2dHC8LO6U6Ij2JEA=
+github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
+github.com/mitchellh/go-testing-interface v1.0.0 h1:fzU/JVNcaqHQEcVFAKeR41fkiLdIPrefOvVG1VZ96U0=
+github.com/mitchellh/hashstructure v1.1.0 h1:P6P1hdjqAAknpY/M1CGipelZgp+4y9ja9kmUZPXP+H0=
+github.com/mitchellh/mapstructure v1.3.3 h1:SzB1nHZ2Xi+17FP0zVQBHIZqvwRN9408fJO8h+eeNA8=
+github.com/nxadm/tail v1.4.11 h1:8feyoE3OzPrcshW5/MJ4sGESc5cqmGkGCWlco4l0bqY=
+github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k=
+github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c h1:rp5dCmg/yLR3mgFuSOe4oEnDDmGLROTvMragMUXpTQw=
+github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c h1:Lgl0gzECD8GnQ5QCWA8o6BtfL6mDH5rQgM4/fX3avOs=
+github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
+github.com/pjbgf/sha1cd v0.5.0 h1:a+UkboSi1znleCDUNT3M5YxjOnN1fz2FhN48FlwCxs0=
+github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
+github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
+github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I=
+github.com/sergi/go-diff v1.4.0 h1:n/SP9D5ad1fORl+llWyN+D6qoUETXNZARKjyY2/KVCw=
+github.com/sijms/go-ora/v2 v2.9.0 h1:+iQbUeTeCOFMb5BsOMgUhV8KWyrv9yjKpcK4x7+MFrg=
+github.com/skeema/knownhosts v1.3.2 h1:EDL9mgf4NzwMXCTfaxSD/o/a5fxDw/xL9nkU28JjdBg=
+github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
+github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
+github.com/urfave/cli/v2 v2.27.7 h1:bH59vdhbjLv3LAvIu6gd0usJHgoTTPhCFib8qqOwXYU=
+github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM=
+github.com/xrash/smetrics v0.0.0-20250705151800-55b8f293f342 h1:FnBeRrxr7OU4VvAzt5X7s6266i6cSVkkFPS0TuXWbIg=
 go-micro.dev/v4 v4.11.0 h1:DZ2xcr0pnZJDlp6MJiCLhw4tXRxLw9xrJlPT91kubr0=
+golang.org/x/crypto v0.46.0 h1:cKRW/pmt1pKAfetfu+RCEvjvZkA9RimPbh7bhFjGVBU=
+golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8=
+golang.org/x/mod v0.32.0 h1:9F4d3PHLljb6x//jOyokMv3eX+YDeepZSEo3mFJy93c=
+golang.org/x/net v0.48.0 h1:zyQRTTrjc33Lhh0fBgT/H3oZq9WuvRR5gPC70xpDiQU=
+golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
+golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk=
+golang.org/x/term v0.38.0 h1:PQ5pkm/rLO6HnxFR7N2lJHOZX6Kez5Y1gDSJla6jo7Q=
+golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU=
+golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
+golang.org/x/tools v0.40.0 h1:yLkxfA+Qnul4cs9QA3KnlFu0lVmd8JJfoq+E41uSutA=
+google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
+gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
 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.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

main.go

@@ -2,55 +2,94 @@ package main
 
 import (
 	"log"
-	"net/http"
 
-	"git.x2erp.com/qdy/go-base/bootstraps"
+	"git.x2erp.com/qdy/go-base/config"
+	"git.x2erp.com/qdy/go-base/container"
+	"git.x2erp.com/qdy/go-base/ctx"
+	"git.x2erp.com/qdy/go-base/graceful"
+	"git.x2erp.com/qdy/go-base/logger"
 	"git.x2erp.com/qdy/go-base/middleware"
+	"git.x2erp.com/qdy/go-base/model/request"
+	"git.x2erp.com/qdy/go-base/model/response"
+	"git.x2erp.com/qdy/go-base/webx"
+	"git.x2erp.com/qdy/go-base/webx/router"
 	"git.x2erp.com/qdy/go-db/factory/database"
-	"git.x2erp.com/qdy/go-db/myhandle"
+
 	"git.x2erp.com/qdy/go-db/sqldef"
-	"go-micro.dev/v4/web"
 
 	"git.x2erp.com/qdy/go-svc-configure/service"
 	_ "git.x2erp.com/qdy/go-svc-configure/tables" // 导入表定义包，触发 init() 函数
 )
 
 var (
-	serviceName    = "svc-configure"
-	serviceVersion = "1"
+	appName    = "svc-configure"
+	appVersion = "1"
 )
 
 func main() {
+	// 0. 初始化日志
+	logBootFactory := logger.InitBootLog()
+
+	// 1. 获取配置文件
+	cfg := config.GetConfig()
+	cfg.SetAppName(appName)
+	cfg.SetAppVersion(appVersion)
+
+	// 2. 创建关闭容器
+	ctr := container.NewContainer(cfg)
+
+	// 注册日志，实现自动关闭
+	container.Reg(ctr, logBootFactory)
+
+	// 3. 创建数据库工厂
+	dbFactory := container.Create(ctr, database.CreateDBFactory)
+	dbFactory.TestConnection()
+	// 创建表
+	creteTabel(dbFactory)
 
-	// 创建服务启动器
-	bootstrapper := bootstraps.NewServiceBootstrapper(serviceName, serviceVersion)
+	//启用运行日志
+	container.Create(ctr, logger.InitRuntimeLogger)
 
-	//加载配置
-	bootstrapper.InitConfig()
+	//建立httpservice
+	//得到webservice服务工厂
+	webxFactory := webx.GetWebServiceFactory()
 
-	//构建数据库工厂
-	bootstrapper.InitDatabase()
+	//建立hhtpService服务
+	webServcie, _ := webxFactory.CreateService(cfg.GetServiceConfig())
 
-	//创建表到数据库
-	creteTabel(bootstrapper.DbFactory)
+	//建立路由-api
+	routerService := router.NewWebService(webServcie.GetRouter())
+	//注册路由--api
+	registerRoutes(routerService, dbFactory)
 
-	// 启动服务，传入路由注册函数
-	bootstrapper.Run(registerRoutes)
+	//启动服务
+	webServcie.Run()
+
+	//等待关闭
+	graceful.WaitForShutdown(cfg.GetServiceConfig().ServiceName, ctr, webServcie.GetServer())
 
 }
 
 // 注册所有路由
-func registerRoutes(webService web.Service, dbFactory *database.DBFactory) {
+func registerRoutes(ws *router.RouterService, dbFactory *database.DBFactory) {
+
+	ws.POST("/api/query/yaml",
+		func(req request.QueryRequest, reqCtx *ctx.RequestContext) (*response.QueryResult[map[string]interface{}], error) {
+
+			result := service.QueryYamlConfigure(dbFactory, req, reqCtx)
+
+			return result, nil
+		},
+	).Use(middleware.JWTAuthMiddleware).Register()
+
+	ws.POST("/api/init/config/template",
+		func(req request.QueryRequest, reqCtx *ctx.RequestContext) (*response.QueryResult[map[string]interface{}], error) {
 
-	// 查询yaml配置文件
-	webService.Handle("/api/query/yaml", middleware.JWTAuthMiddleware(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		myhandle.QueryHandlerMap(w, r, dbFactory, service.QueryYamlConfigure)
-	})))
+			result := service.InitConfigTemplates(dbFactory, req, reqCtx)
 
-	// 初始化配置模版
-	webService.Handle("/api/init/config/template", middleware.JWTAuthMiddleware(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		myhandle.QueryHandlerMap(w, r, dbFactory, service.InitConfigTemplates)
-	})))
+			return result, nil
+		},
+	).Use(middleware.JWTAuthMiddleware).Register()
 
 }
 

service/create_config_template.go

@@ -6,20 +6,23 @@ import (
 
 	"git.x2erp.com/qdy/go-base/ctx"
 	"git.x2erp.com/qdy/go-base/logger"
-	"git.x2erp.com/qdy/go-base/myservice"
-	"git.x2erp.com/qdy/go-base/types"
+	"git.x2erp.com/qdy/go-base/model/request"
+	"git.x2erp.com/qdy/go-base/model/response"
+
+	"git.x2erp.com/qdy/go-base/util"
+
 	"git.x2erp.com/qdy/go-db/factory/database"
 	"git.x2erp.com/qdy/go-svc-configure/models"
 	"github.com/jmoiron/sqlx"
 )
 
-func InitConfigTemplates(dbFactory *database.DBFactory, req types.QueryRequest, reqCtx *ctx.RequestContext) *types.QueryResult[map[string]interface{}] {
+func InitConfigTemplates(dbFactory *database.DBFactory, req request.QueryRequest, reqCtx *ctx.RequestContext) *response.QueryResult[map[string]interface{}] {
 	return initConfigTemplates(dbFactory.GetDB(), reqCtx)
 
 }
 
 // InitConfigTemplates 初始化默认配置信息
-func initConfigTemplates(db *sqlx.DB, reqCtx *ctx.RequestContext) *types.QueryResult[map[string]interface{}] {
+func initConfigTemplates(db *sqlx.DB, reqCtx *ctx.RequestContext) *response.QueryResult[map[string]interface{}] {
 
 	builder := models.NewConfigTemplateBuilder()
 
@@ -129,23 +132,23 @@ func initConfigTemplates(db *sqlx.DB, reqCtx *ctx.RequestContext) *types.QueryRe
 	return createOrUpdateConfigTemplates(db, templates, reqCtx)
 }
 
-func CreateOrUpdateConfigTemplates(dbFactory *database.DBFactory, req *models.ConfigTemplate, reqCtx *ctx.RequestContext) *types.QueryResult[map[string]interface{}] {
+func CreateOrUpdateConfigTemplates(dbFactory *database.DBFactory, req *models.ConfigTemplate, reqCtx *ctx.RequestContext) *response.QueryResult[map[string]interface{}] {
 	configTemplates := []*models.ConfigTemplate{req}
 	return createOrUpdateConfigTemplates(dbFactory.GetDB(), configTemplates, reqCtx)
 
 }
 
 // CreateOrUpdateConfigTemplates 创建或更新配置模板（支持部分更新）
-func createOrUpdateConfigTemplates(db *sqlx.DB, templates []*models.ConfigTemplate, reqCtx *ctx.RequestContext) *types.QueryResult[map[string]interface{}] {
-	startTime := time.Now()
+func createOrUpdateConfigTemplates(db *sqlx.DB, templates []*models.ConfigTemplate, reqCtx *ctx.RequestContext) *response.QueryResult[map[string]interface{}] {
+
 	if db == nil {
-		return myservice.CreateErrorResult[map[string]interface{}]("database connection is nil", startTime, reqCtx)
+		return util.CreateErrorResult[map[string]interface{}]("database connection is nil", reqCtx)
 	}
 
 	// 开始事务
 	tx, err := db.Beginx()
 	if err != nil {
-		return myservice.CreateErrorResult[map[string]interface{}](fmt.Sprintf("begin transaction failed: %v", err), startTime, reqCtx)
+		return util.CreateErrorResult[map[string]interface{}](fmt.Sprintf("begin transaction failed: %v", err), reqCtx)
 	}
 	defer func() {
 		if err != nil {
@@ -165,14 +168,14 @@ func createOrUpdateConfigTemplates(db *sqlx.DB, templates []*models.ConfigTempla
 		// 1. 插入或更新模板主表
 		err := upsertTemplate(tx, template, now, reqCtx)
 		if err != nil {
-			return myservice.CreateErrorResult[map[string]interface{}](fmt.Sprintf("upsertTemplate: %v", err), startTime, reqCtx)
+			return util.CreateErrorResult[map[string]interface{}](fmt.Sprintf("upsertTemplate: %v", err), reqCtx)
 		}
 
 		// 2. 处理模板详情（部分更新）
 		if len(template.Details) > 0 {
 			err = upsertTemplateDetails(tx, template.Details, now)
 			if err != nil {
-				return myservice.CreateErrorResult[map[string]interface{}](fmt.Sprintf("upsertTemplateDetails: %v", err), startTime, reqCtx)
+				return util.CreateErrorResult[map[string]interface{}](fmt.Sprintf("upsertTemplateDetails: %v", err), reqCtx)
 
 			}
 		}
@@ -180,10 +183,10 @@ func createOrUpdateConfigTemplates(db *sqlx.DB, templates []*models.ConfigTempla
 
 	errCommit := tx.Commit()
 	if errCommit != nil {
-		return myservice.CreateErrorResult[map[string]interface{}](fmt.Sprintf("db commit: %v", errCommit), startTime, reqCtx)
+		return util.CreateErrorResult[map[string]interface{}](fmt.Sprintf("db commit: %v", errCommit), reqCtx)
 	}
 
-	return myservice.CreateSuccessResult[map[string]interface{}](startTime, reqCtx)
+	return util.CreateSuccessResult[map[string]interface{}](reqCtx)
 }
 
 // upsertTemplate 插入或更新模板主表

service/query_yaml_configure.go

@@ -8,25 +8,28 @@ import (
 
 	"git.x2erp.com/qdy/go-base/ctx"
 	"git.x2erp.com/qdy/go-base/logger"
-	"git.x2erp.com/qdy/go-base/myservice"
-	"git.x2erp.com/qdy/go-base/types"
+	"git.x2erp.com/qdy/go-base/model/request"
+	"git.x2erp.com/qdy/go-base/model/response"
+
+	"git.x2erp.com/qdy/go-base/util"
+
 	"git.x2erp.com/qdy/go-db/factory/database"
 	"github.com/jmoiron/sqlx"
 )
 
-func QueryYamlConfigure(dbFactory *database.DBFactory, req types.QueryRequest, reqCtx *ctx.RequestContext) *types.QueryResult[map[string]interface{}] {
+func QueryYamlConfigure(dbFactory *database.DBFactory, req request.QueryRequest, reqCtx *ctx.RequestContext) *response.QueryResult[map[string]interface{}] {
 	return query(dbFactory.GetDB(), req, reqCtx)
 
 }
 
 // QueryYamlConfigure 执行带位置参数的查询
-func query(db *sqlx.DB, req types.QueryRequest, reqCtx *ctx.RequestContext) *types.QueryResult[map[string]interface{}] {
+func query(db *sqlx.DB, req request.QueryRequest, reqCtx *ctx.RequestContext) *response.QueryResult[map[string]interface{}] {
 
 	startTime := time.Now()
 
 	// 安全检查
 	if db == nil {
-		return myservice.CreateErrorResult[map[string]interface{}]("database connection is nil", startTime, reqCtx)
+		return util.CreateErrorResult[map[string]interface{}]("database connection is nil", reqCtx)
 	}
 
 	sqlStr := `
@@ -43,7 +46,7 @@ func query(db *sqlx.DB, req types.QueryRequest, reqCtx *ctx.RequestContext) *typ
 	// 执行查询
 	rows, err := db.Queryx(sqlStr, params...)
 	if err != nil {
-		return myservice.CreateErrorResult[map[string]interface{}](fmt.Sprintf("Query execution failed: %v", err), startTime, reqCtx)
+		return util.CreateErrorResult[map[string]interface{}](fmt.Sprintf("Query execution failed: %v", err), reqCtx)
 	}
 	defer rows.Close()
 
@@ -51,16 +54,16 @@ func query(db *sqlx.DB, req types.QueryRequest, reqCtx *ctx.RequestContext) *typ
 	return processQueryResult(rows, startTime, reqCtx)
 }
 
-func processQueryResult(rows *sqlx.Rows, startTime time.Time, reqCtx *ctx.RequestContext) *types.QueryResult[map[string]interface{}] {
+func processQueryResult(rows *sqlx.Rows, startTime time.Time, reqCtx *ctx.RequestContext) *response.QueryResult[map[string]interface{}] {
 	// 初始化结果结构体
-	result := &types.QueryResult[map[string]interface{}]{
+	result := &response.QueryResult[map[string]interface{}]{
 		Metadata: reqCtx,
 	}
 
 	// 获取列信息
 	columns, err := rows.Columns()
 	if err != nil {
-		return myservice.CreateErrorResult[map[string]interface{}](fmt.Sprintf("Failed to get columns: %v", err), startTime, reqCtx)
+		return util.CreateErrorResult[map[string]interface{}](fmt.Sprintf("Failed to get columns: %v", err), reqCtx)
 	}
 
 	// 存储最终结果：根key -> 内层配置map
@@ -82,7 +85,7 @@ func processQueryResult(rows *sqlx.Rows, startTime time.Time, reqCtx *ctx.Reques
 
 		// 扫描行数据
 		if err := rows.Scan(valuePtrs...); err != nil {
-			return myservice.CreateErrorResult[map[string]interface{}](fmt.Sprintf("Scan row %d failed: %v", count, err), startTime, reqCtx)
+			return util.CreateErrorResult[map[string]interface{}](fmt.Sprintf("Scan row %d failed: %v", count, err), reqCtx)
 		}
 
 		// 提取当前行的三个核心字段
@@ -109,7 +112,7 @@ func processQueryResult(rows *sqlx.Rows, startTime time.Time, reqCtx *ctx.Reques
 		// 解析 detailID 获取根key（倒数第3段）
 		parts := strings.Split(detailID, ".")
 		if len(parts) < 3 {
-			return myservice.CreateErrorResult[map[string]interface{}](fmt.Sprintf("Row %d detailID format error: %s", count, detailID), startTime, reqCtx)
+			return util.CreateErrorResult[map[string]interface{}](fmt.Sprintf("Row %d detailID format error: %s", count, detailID), reqCtx)
 		}
 
 		rootKey := parts[len(parts)-3] // 取倒数第3段，例如 "database"
@@ -128,7 +131,7 @@ func processQueryResult(rows *sqlx.Rows, startTime time.Time, reqCtx *ctx.Reques
 
 	// 检查行遍历错误
 	if err := rows.Err(); err != nil {
-		return myservice.CreateErrorResult[map[string]interface{}](fmt.Sprintf("Row iteration error: %v", err), startTime, reqCtx)
+		return util.CreateErrorResult[map[string]interface{}](fmt.Sprintf("Row iteration error: %v", err), reqCtx)
 	}
 
 	// 构建成功结果

test/my_init_template_test.go

@@ -5,7 +5,7 @@ import (
 	"log"
 	"testing"
 
-	"git.x2erp.com/qdy/go-base/types"
+	"git.x2erp.com/qdy/go-base/model/request"
 	"git.x2erp.com/qdy/go-db/factory/http"
 )
 
@@ -39,7 +39,7 @@ func TestInit(t *testing.T) {
 		"svc-worker",
 	}
 	// 准备查询请求
-	queryRequest := types.QueryRequest{
+	queryRequest := request.QueryRequest{
 
 		PositionalParams: queryParams,
 	}

test/my_post_query_test.go

@@ -5,7 +5,7 @@ import (
 	"log"
 	"testing"
 
-	"git.x2erp.com/qdy/go-base/types"
+	"git.x2erp.com/qdy/go-base/model/request"
 	"git.x2erp.com/qdy/go-db/factory/http"
 )
 
@@ -39,7 +39,7 @@ func TestQuery(t *testing.T) {
 		"svc-worker",
 	}
 	// 准备查询请求
-	queryRequest := types.QueryRequest{
+	queryRequest := request.QueryRequest{
 
 		PositionalParams: queryParams,
 	}