merge both add routers/captcha_gen.go

controllers/partial/CaptchaController.go

@@ -5,6 +5,7 @@ import (
 	"git.qianqiusoft.com/qianqiusoft/light-apiengine/entitys"
 	"git.qianqiusoft.com/qianqiusoft/light-apiengine/utils"
 	"strconv"
+	"fmt"
 )
 
 // _Image
@@ -41,11 +42,15 @@ func Captcha_Image(c *entitys.CtrlContext) {
 // @Failure 403 :id is empty
 func Captcha_Sms(c *entitys.CtrlContext) {
 	mobile := c.Ctx.Query("mobile")
+	
+	fmt.Println("--------------> get mobile", mobile)
 
 	if mobile == "" {
 		c.Ctx.JSON(500, sysmodel.SysReturn{500, "mobile is cannot empty", nil})
 		return
 	}
+	
+	fmt.Println("--------------> utils.SendSmsCaptcha", mobile)
 
 	data, err := utils.SendSmsCaptcha(mobile)
 	if err == nil {

controllers/partial/SysAttachmentController.go

@@ -13,7 +13,10 @@ import (
 	"os"
 	"path"
 	"strconv"
+<<<<<<< HEAD
 	"strings"
+=======
+>>>>>>> 06105bace411eb44ed1c3037d5d722e4e881cc2a
 	"time"
 )
 
@@ -52,11 +55,25 @@ func SysAttachment_Download(c *entitys.CtrlContext) {
 
 	filePath := "files/" + attach.Id
 
-	c.Ctx.Header("Content-Disposition", "attachment;filename=\""+sysutils.FormatForBrowse(c.Ctx.Request.UserAgent(), attach.Name)+"\"")
-	c.Ctx.Header("Content-Type", strings.Replace(mime.TypeByExtension(attach.Ext), "charset=utf-8", "", -1))
-	c.Ctx.Header("Content-Length", strconv.FormatInt(int64(attach.Size), 10))
+
+
+	c.Ctx.Writer.Header().Add("Content-Disposition", "attachment;filename=\""+sysutils.FormatForBrowse(c.Ctx.Request.UserAgent(), attach.Name)+"\"")
+	c.Ctx.Writer.Header().Add("Content-Type", mime.TypeByExtension(attach.Ext))
+	c.Ctx.Writer.Header().Add("Content-Length", strconv.FormatInt(int64(attach.Size), 10))
+	c.Ctx.Writer.Header().Add("Accept-Ranges", "bytes")
+
+	if !sysutils.Exists(filePath){
+		c.Ctx.Writer.WriteHeader(400)
+		return
+	}
+	fmt.Println("---->", c.Ctx.Writer.Header().Get("Content-Disposition"))
+	fmt.Println("---->", c.Ctx.Writer.Header().Get("Content-Type"))
+	fmt.Println("---->", c.Ctx.Writer.Header().Get("Content-Length"))
+	fmt.Println("---->", c.Ctx.Writer.Header().Get("Accept-Ranges"))
+
 	c.Ctx.File(filePath)
-	c.Ctx.Writer.WriteHeader(200)
+	/*attrId := c.Ctx.Query("id")
+	//c.Ctx.Writer.WriteHeader(200)
 	/*attrId := c.Ctx.Query("id")
 
 	filePath := fmt.Sprintf("files/%s", attrId)

routers/captcha_gen.go

@@ -1,10 +1,17 @@
+<<<<<<< HEAD
 
+=======
+>>>>>>> 06105bace411eb44ed1c3037d5d722e4e881cc2a
 package routers
 
 import (
 	"git.qianqiusoft.com/qianqiusoft/light-apiengine/engine"
 	
 	"git.qianqiusoft.com/qianqiusoft/light-apiengine/controllers/gen"
+<<<<<<< HEAD
+=======
+	"fmt"
+>>>>>>> 06105bace411eb44ed1c3037d5d722e4e881cc2a
 )
 
 func init(){
@@ -20,11 +27,19 @@ func registerCaptchaRouter(e *engine.ApiEngine){
 	}
 	ctrler := gen.NewCaptchaController(e)
 
+<<<<<<< HEAD
 
+=======
+	
+>>>>>>> 06105bace411eb44ed1c3037d5d722e4e881cc2a
 
 	v1.GET("/image",ctrler.Image)
 	//v1.POST("/image",ctrler.Image)
 
+<<<<<<< HEAD
+=======
+	fmt.Println("bind sms router");
+>>>>>>> 06105bace411eb44ed1c3037d5d722e4e881cc2a
 	v1.GET("/sms",ctrler.Sms)
 	//v1.POST("/sms",ctrler.Sms)
 
@@ -32,4 +47,7 @@ func registerCaptchaRouter(e *engine.ApiEngine){
 	//v1.POST("/check",ctrler.Check)
 
 }
+<<<<<<< HEAD
 
+=======
+>>>>>>> 06105bace411eb44ed1c3037d5d722e4e881cc2a

utils/captcha_util.go

@@ -105,9 +105,9 @@ func SendSmsCaptcha(mobile string) ([]byte, error) {
 	if mobile == "" {
 		return nil, errors.New("mobile is cannot empty")
 	}
+	
 	sms_url := fmt.Sprintf(smsConfig.send_format, mobile)
-	logs.Debug("-----sms_send_url-------")
-	logs.Debug(sms_url)
+	fmt.Println("------>sms_url", sms_url)
 	data, err := NewHttpUtil().Get(sms_url, nil, nil)
 	logs.Debug(string(data))
 	if err != nil {