diff --git a/go.mod b/go.mod index 83a96db1..73f0c843 100644 --- a/go.mod +++ b/go.mod @@ -9,6 +9,7 @@ require ( github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f // indirect github.com/casbin/casbin/v2 v2.23.4 github.com/casbin/xorm-adapter/v2 v2.2.0 + github.com/dchest/captcha v0.0.0-20200903113550-03f5f0333e1f github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/go-sql-driver/mysql v1.5.0 github.com/google/uuid v1.2.0 diff --git a/go.sum b/go.sum index 78dddf96..782834a4 100644 --- a/go.sum +++ b/go.sum @@ -47,6 +47,8 @@ github.com/cupcake/rdb v0.0.0-20161107195141-43ba34106c76/go.mod h1:vYwsqCOLxGii 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/dchest/captcha v0.0.0-20200903113550-03f5f0333e1f h1:q/DpyjJjZs94bziQ7YkBmIlpqbVP7yw179rnzoNVX1M= +github.com/dchest/captcha v0.0.0-20200903113550-03f5f0333e1f/go.mod h1:QGrK8vMWWHQYQ3QU9bw9Y9OPNfxccGzfb41qjvVeXtY= github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= diff --git a/object/captcha.go b/object/captcha.go new file mode 100644 index 00000000..dbc03e3b --- /dev/null +++ b/object/captcha.go @@ -0,0 +1,26 @@ +package object + +import ( + "bytes" + + "github.com/dchest/captcha" +) + +func GetCaptcha() (string, []byte) { + id := captcha.NewLen(5) + + var buffer bytes.Buffer + + err := captcha.WriteImage(&buffer, id, 200, 80) + if err != nil { + panic(err) + } + + return id, buffer.Bytes() +} + +func VerifyCaptcha(id string, digits string) bool { + res := captcha.VerifyString(id, digits) + + return res +} diff --git a/object/check.go b/object/check.go index bccbf392..293a0999 100644 --- a/object/check.go +++ b/object/check.go @@ -92,7 +92,3 @@ func CheckUserLogin(organization string, username string, password string) (*Use return user, "" } - -func (user *User) GetId() string { - return fmt.Sprintf("%s/%s", user.Owner, user.Name) -} diff --git a/web/src/CropperDiv.js b/web/src/CropperDiv.js index 468a66b4..3073237d 100644 --- a/web/src/CropperDiv.js +++ b/web/src/CropperDiv.js @@ -93,32 +93,28 @@ export const CropperDiv = (props) => { [] } > -