diff --git a/go.mod b/go.mod index e20dcc9..bfe97ae 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,8 @@ module git.huangwc.com/pig/pig-farm-controller go 1.25 require ( + github.com/gin-gonic/gin v1.10.1 + github.com/golang-jwt/jwt/v5 v5.3.0 github.com/stretchr/testify v1.11.1 go.uber.org/zap v1.27.0 golang.org/x/crypto v0.31.0 @@ -14,18 +16,41 @@ require ( ) require ( + github.com/bytedance/sonic v1.11.6 // indirect + github.com/bytedance/sonic/loader v0.1.1 // indirect + github.com/cloudwego/base64x v0.1.4 // indirect + github.com/cloudwego/iasm v0.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect + github.com/gabriel-vasile/mimetype v1.4.3 // indirect + github.com/gin-contrib/sse v0.1.0 // indirect + github.com/go-playground/locales v0.14.1 // indirect + github.com/go-playground/universal-translator v0.18.1 // indirect + github.com/go-playground/validator/v10 v10.20.0 // indirect + github.com/goccy/go-json v0.10.2 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect github.com/jackc/pgx/v5 v5.6.0 // indirect github.com/jackc/puddle/v2 v2.2.2 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect + github.com/json-iterator/go v1.1.12 // indirect + github.com/klauspost/cpuid/v2 v2.2.7 // indirect + github.com/leodido/go-urn v1.4.0 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect github.com/mattn/go-sqlite3 v1.14.22 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/pelletier/go-toml/v2 v2.2.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.14.1 // indirect + github.com/twitchyliquid64/golang-asm v0.15.1 // indirect + github.com/ugorji/go/codec v1.2.12 // indirect go.uber.org/multierr v1.10.0 // indirect + golang.org/x/arch v0.8.0 // indirect + golang.org/x/net v0.25.0 // indirect golang.org/x/sync v0.10.0 // indirect + golang.org/x/sys v0.28.0 // indirect golang.org/x/text v0.21.0 // indirect + google.golang.org/protobuf v1.34.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index cb9b3bf..fe178d9 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,35 @@ +github.com/bytedance/sonic v1.11.6 h1:oUp34TzMlL+OY1OUWxHqsdkgC/Zfc85zGqw9siXjrc0= +github.com/bytedance/sonic v1.11.6/go.mod h1:LysEHSvpvDySVdC2f87zGWf6CIKJcAvqab1ZaiQtds4= +github.com/bytedance/sonic/loader v0.1.1 h1:c+e5Pt1k/cy5wMveRDyk2X4B9hF4g7an8N3zCYjJFNM= +github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU= +github.com/cloudwego/base64x v0.1.4 h1:jwCgWpFanWmN8xoIUHa2rtzmkd5J2plF/dnLS6Xd/0Y= +github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w= +github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg= +github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY= 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/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0= +github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk= +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.10.1 h1:T0ujvqyCSqRopADpgPgiTT63DUQVSfojyME59Ei63pQ= +github.com/gin-gonic/gin v1.10.1/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y= +github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= +github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= +github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= +github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= +github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= +github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= +github.com/go-playground/validator/v10 v10.20.0 h1:K9ISHbSaI0lyB2eWMPJo+kOS/FBExVwjEviJTixqxL8= +github.com/go-playground/validator/v10 v10.20.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= +github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= +github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/golang-jwt/jwt/v5 v5.3.0 h1:pv4AsKCKKZuqlgs5sUmn4x8UlGa0kEVt/puTpKx9vvo= +github.com/golang-jwt/jwt/v5 v5.3.0/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE= +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/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo= @@ -13,33 +42,75 @@ github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= +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/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= +github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM= +github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= +github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M= github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= 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.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= +github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= +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 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM= +github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs= 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/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= +github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= +github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= +github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE= +github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= 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.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ= go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= +golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= +golang.org/x/arch v0.8.0 h1:3wRIsP3pM4yUptoR96otTUOXI367OS0+c9eeRi9doIc= +golang.org/x/arch v0.8.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= +golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= +golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= +golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= +google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= 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/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= @@ -56,3 +127,5 @@ gorm.io/driver/sqlite v1.6.0 h1:WHRRrIiulaPiPFmDcod6prc4l2VGVWHz80KspNsxSfQ= gorm.io/driver/sqlite v1.6.0/go.mod h1:AO9V1qIQddBESngQUKWL9yoH93HIeA1X6V633rBwyT8= gorm.io/gorm v1.30.5 h1:dvEfYwxL+i+xgCNSGGBT1lDjCzfELK8fHZxL3Ee9X0s= gorm.io/gorm v1.30.5/go.mod h1:8Z33v652h4//uMA76KjeDH8mJXPm1QNCYrMeatR0DOE= +nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50= +rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= diff --git a/internal/app/controller/response.go b/internal/app/controller/response.go new file mode 100644 index 0000000..16aafa8 --- /dev/null +++ b/internal/app/controller/response.go @@ -0,0 +1,30 @@ +package controller + +import ( + "net/http" + + "github.com/gin-gonic/gin" +) + +// Response 定义统一的API响应结构体 +type Response struct { + Code int `json:"code"` // 业务状态码 + Message string `json:"message"` // 提示信息 + Data interface{} `json:"data"` // 业务数据 +} + +// SendResponse 发送统一格式的JSON响应 +// httpStatus 参数现在将几乎总是 http.StatusOK，业务状态码通过 Response.Code 传递 +func SendResponse(ctx *gin.Context, code int, message string, data interface{}) { + ctx.JSON(http.StatusOK, Response{ + Code: code, + Message: message, + Data: data, + }) +} + +// SendErrorResponse 发送统一格式的错误响应 +// 错误响应通常不包含业务数据，因此 data 参数固定为 nil +func SendErrorResponse(ctx *gin.Context, code int, message string) { + SendResponse(ctx, code, message, nil) +} diff --git a/internal/app/controller/user/user_controller.go b/internal/app/controller/user/user_controller.go new file mode 100644 index 0000000..342c50e --- /dev/null +++ b/internal/app/controller/user/user_controller.go @@ -0,0 +1,149 @@ +package user + +import ( + "net/http" + "time" + + "git.huangwc.com/pig/pig-farm-controller/internal/app/controller" + "git.huangwc.com/pig/pig-farm-controller/internal/infra/logs" + "git.huangwc.com/pig/pig-farm-controller/internal/infra/models" + "git.huangwc.com/pig/pig-farm-controller/internal/infra/repository" + "github.com/gin-gonic/gin" + "github.com/golang-jwt/jwt/v5" + "gorm.io/gorm" +) + +// jwtSecret 是用于签名 JWT 的密钥。在生产环境中，这应该从环境变量或安全配置中读取。 +var jwtSecret = []byte("your_super_secret_jwt_key") + +// Controller 用户控制器 +type Controller struct { + userRepo repository.UserRepository + logger *logs.Logger +} + +// NewController 创建用户控制器实例 +func NewController(userRepo repository.UserRepository, logger *logs.Logger) *Controller { + return &Controller{ + userRepo: userRepo, + logger: logger, + } +} + +// CreateUserRequest 定义创建用户请求的结构体 +type CreateUserRequest struct { + Username string `json:"username" binding:"required"` + Password string `json:"password" binding:"required,min=6"` +} + +// LoginRequest 定义登录请求的结构体 +type LoginRequest struct { + Username string `json:"username" binding:"required"` + Password string `json:"password" binding:"required"` +} + +// CreateUserResponse 定义创建用户成功响应的结构体 +type CreateUserResponse struct { + Username string `json:"username"` + ID uint `json:"id"` +} + +// LoginResponse 定义登录成功响应的结构体 +type LoginResponse struct { + Username string `json:"username"` + ID uint `json:"id"` + Token string `json:"token"` +} + +// generateToken 为给定用户生成 JWT +func generateToken(userID uint, username string) (string, error) { + expirationTime := time.Now().Add(24 * time.Hour) // Token 24 小时后过期 + claims := jwt.MapClaims{ + "user_id": userID, + "username": username, + "exp": expirationTime.Unix(), + } + + token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims) + tokenString, err := token.SignedString(jwtSecret) + if err != nil { + return "", err + } + + return tokenString, nil +} + +// CreateUser 处理创建用户的请求 +func (c *Controller) CreateUser(ctx *gin.Context) { + var req CreateUserRequest + if err := ctx.ShouldBindJSON(&req); err != nil { + c.logger.Errorf("CreateUser: 参数绑定失败: %v", err) + controller.SendErrorResponse(ctx, http.StatusBadRequest, err.Error()) + return + } + + user := &models.User{ + Username: req.Username, + Password: req.Password, // 密码会在 BeforeSave 钩子中哈希 + } + + if err := c.userRepo.Create(user); err != nil { + c.logger.Errorf("CreateUser: 创建用户失败: %v", err) + + // 尝试查询用户，以判断是否是用户名重复导致的错误 + _, findErr := c.userRepo.FindByUsername(req.Username) + if findErr == nil { // 如果能找到用户，说明是用户名重复 + controller.SendErrorResponse(ctx, http.StatusConflict, "用户名已存在") + return + } + + // 其他创建失败的情况 + controller.SendErrorResponse(ctx, http.StatusInternalServerError, "创建用户失败") + return + } + + controller.SendResponse(ctx, http.StatusOK, "用户创建成功", CreateUserResponse{ + Username: user.Username, + ID: user.ID, + }) +} + +// Login 处理用户登录请求 +func (c *Controller) Login(ctx *gin.Context) { + var req LoginRequest + if err := ctx.ShouldBindJSON(&req); err != nil { + c.logger.Errorf("Login: 参数绑定失败: %v", err) + controller.SendErrorResponse(ctx, http.StatusBadRequest, err.Error()) + return + } + + user, err := c.userRepo.FindByUsername(req.Username) + if err != nil { + if err == gorm.ErrRecordNotFound { + controller.SendErrorResponse(ctx, http.StatusUnauthorized, "用户名或密码不正确") + return + } + c.logger.Errorf("Login: 查询用户失败: %v", err) + controller.SendErrorResponse(ctx, http.StatusInternalServerError, "登录失败") + return + } + + if !user.CheckPassword(req.Password) { + controller.SendErrorResponse(ctx, http.StatusUnauthorized, "用户名或密码不正确") + return + } + + // 登录成功，生成 JWT token + tokenString, err := generateToken(user.ID, user.Username) + if err != nil { + c.logger.Errorf("Login: 生成 token 失败: %v", err) + controller.SendErrorResponse(ctx, http.StatusInternalServerError, "登录失败，无法生成认证信息") + return + } + + controller.SendResponse(ctx, http.StatusOK, "登录成功", LoginResponse{ + Username: user.Username, + ID: user.ID, + Token: tokenString, + }) +} diff --git a/internal/core/application.go b/internal/core/application.go index 80c67d6..aa6282e 100644 --- a/internal/core/application.go +++ b/internal/core/application.go @@ -7,17 +7,17 @@ import ( "os/signal" "syscall" - "git.huangwc.com/pig/pig-farm-controller/internal/config" - "git.huangwc.com/pig/pig-farm-controller/internal/logs" - "git.huangwc.com/pig/pig-farm-controller/internal/storage/db" - "git.huangwc.com/pig/pig-farm-controller/internal/task" + "git.huangwc.com/pig/pig-farm-controller/internal/infra/config" + "git.huangwc.com/pig/pig-farm-controller/internal/infra/database" + "git.huangwc.com/pig/pig-farm-controller/internal/infra/logs" + "git.huangwc.com/pig/pig-farm-controller/internal/infra/task" ) // Application 是整个应用的核心，封装了所有组件和生命周期。 type Application struct { Config *config.Config Logger *logs.Logger - Storage db.Storage + Storage database.Storage Executor *task.Executor } @@ -89,9 +89,9 @@ func (app *Application) Stop() error { } // initStorage 封装了数据库的初始化、连接和迁移逻辑。 -func initStorage(cfg config.DatabaseConfig, logger *logs.Logger) (db.Storage, error) { +func initStorage(cfg config.DatabaseConfig, logger *logs.Logger) (database.Storage, error) { // 创建存储实例 - storage := db.NewStorage(cfg, logger) + storage := database.NewStorage(cfg, logger) if err := storage.Connect(); err != nil { // 错误已在 Connect 内部被记录，这里只需包装并返回 return nil, fmt.Errorf("数据库连接失败: %w", err) diff --git a/internal/config/config.go b/internal/infra/config/config.go similarity index 100% rename from internal/config/config.go rename to internal/infra/config/config.go diff --git a/internal/database/postgres.go b/internal/infra/database/postgres.go similarity index 98% rename from internal/database/postgres.go rename to internal/infra/database/postgres.go index 4e0fbdf..1933d6b 100644 --- a/internal/database/postgres.go +++ b/internal/infra/database/postgres.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "git.huangwc.com/pig/pig-farm-controller/internal/logs" + "git.huangwc.com/pig/pig-farm-controller/internal/infra/logs" "gorm.io/driver/postgres" "gorm.io/gorm" ) diff --git a/internal/database/storage.go b/internal/infra/database/storage.go similarity index 90% rename from internal/database/storage.go rename to internal/infra/database/storage.go index b058c0b..72302d7 100644 --- a/internal/database/storage.go +++ b/internal/infra/database/storage.go @@ -6,8 +6,8 @@ package database import ( "fmt" - "git.huangwc.com/pig/pig-farm-controller/internal/config" - "git.huangwc.com/pig/pig-farm-controller/internal/logs" + "git.huangwc.com/pig/pig-farm-controller/internal/infra/config" + "git.huangwc.com/pig/pig-farm-controller/internal/infra/logs" "gorm.io/gorm" ) diff --git a/internal/logs/logs.go b/internal/infra/logs/logs.go similarity index 98% rename from internal/logs/logs.go rename to internal/infra/logs/logs.go index c1cf92c..bf16752 100644 --- a/internal/logs/logs.go +++ b/internal/infra/logs/logs.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "git.huangwc.com/pig/pig-farm-controller/internal/config" + "git.huangwc.com/pig/pig-farm-controller/internal/infra/config" "go.uber.org/zap" "go.uber.org/zap/zapcore" "gopkg.in/natefinch/lumberjack.v2" diff --git a/internal/logs/logs_test.go b/internal/infra/logs/logs_test.go similarity index 96% rename from internal/logs/logs_test.go rename to internal/infra/logs/logs_test.go index dc648a2..537efee 100644 --- a/internal/logs/logs_test.go +++ b/internal/infra/logs/logs_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "git.huangwc.com/pig/pig-farm-controller/internal/config" - "git.huangwc.com/pig/pig-farm-controller/internal/logs" + "git.huangwc.com/pig/pig-farm-controller/internal/infra/config" + "git.huangwc.com/pig/pig-farm-controller/internal/infra/logs" "github.com/stretchr/testify/assert" "go.uber.org/zap" "go.uber.org/zap/zapcore" diff --git a/internal/models/user.go b/internal/infra/models/user.go similarity index 100% rename from internal/models/user.go rename to internal/infra/models/user.go diff --git a/internal/models/user_test.go b/internal/infra/models/user_test.go similarity index 95% rename from internal/models/user_test.go rename to internal/infra/models/user_test.go index ff2bbf0..877abb2 100644 --- a/internal/models/user_test.go +++ b/internal/infra/models/user_test.go @@ -4,7 +4,7 @@ package models_test import ( "testing" - "git.huangwc.com/pig/pig-farm-controller/internal/models" + "git.huangwc.com/pig/pig-farm-controller/internal/infra/models" "github.com/stretchr/testify/assert" "golang.org/x/crypto/bcrypt" ) diff --git a/internal/repository/user_repository.go b/internal/infra/repository/user_repository.go similarity index 95% rename from internal/repository/user_repository.go rename to internal/infra/repository/user_repository.go index d1c2122..dcee8fa 100644 --- a/internal/repository/user_repository.go +++ b/internal/infra/repository/user_repository.go @@ -2,7 +2,7 @@ package repository import ( - "git.huangwc.com/pig/pig-farm-controller/internal/models" + "git.huangwc.com/pig/pig-farm-controller/internal/infra/models" "gorm.io/gorm" ) diff --git a/internal/repository/user_repository_test.go b/internal/infra/repository/user_repository_test.go similarity index 95% rename from internal/repository/user_repository_test.go rename to internal/infra/repository/user_repository_test.go index 241f08d..e9c2fcf 100644 --- a/internal/repository/user_repository_test.go +++ b/internal/infra/repository/user_repository_test.go @@ -4,8 +4,8 @@ package repository_test import ( "testing" - "git.huangwc.com/pig/pig-farm-controller/internal/models" - "git.huangwc.com/pig/pig-farm-controller/internal/repository" + "git.huangwc.com/pig/pig-farm-controller/internal/infra/models" + "git.huangwc.com/pig/pig-farm-controller/internal/infra/repository" "github.com/stretchr/testify/assert" "gorm.io/driver/sqlite" "gorm.io/gorm" diff --git a/internal/task/task.go b/internal/infra/task/task.go similarity index 98% rename from internal/task/task.go rename to internal/infra/task/task.go index 6e2795a..4b9205e 100644 --- a/internal/task/task.go +++ b/internal/infra/task/task.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "git.huangwc.com/pig/pig-farm-controller/internal/logs" + "git.huangwc.com/pig/pig-farm-controller/internal/infra/logs" ) // Task 代表一个任务接口 diff --git a/internal/task/task_test.go b/internal/infra/task/task_test.go similarity index 97% rename from internal/task/task_test.go rename to internal/infra/task/task_test.go index dda4fb8..436f16c 100644 --- a/internal/task/task_test.go +++ b/internal/infra/task/task_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" - "git.huangwc.com/pig/pig-farm-controller/internal/config" - "git.huangwc.com/pig/pig-farm-controller/internal/logs" - "git.huangwc.com/pig/pig-farm-controller/internal/task" + "git.huangwc.com/pig/pig-farm-controller/internal/infra/config" + "git.huangwc.com/pig/pig-farm-controller/internal/infra/logs" + "git.huangwc.com/pig/pig-farm-controller/internal/infra/task" "github.com/stretchr/testify/assert" )