merge routers/captcha_gen.go

controllers/partial/SysAttachmentController.go

@@ -13,10 +13,6 @@ import (
 	"os"
 	"path"
 	"strconv"
-<<<<<<< HEAD
-	"strings"
-=======
->>>>>>> 06105bace411eb44ed1c3037d5d722e4e881cc2a
 	"time"
 )
 
@@ -55,14 +51,12 @@ func SysAttachment_Download(c *entitys.CtrlContext) {
 
 	filePath := "files/" + attach.Id
 
-
-
 	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){
+	if !sysutils.Exists(filePath) {
 		c.Ctx.Writer.WriteHeader(400)
 		return
 	}

routers/captcha_gen.go

@@ -1,17 +1,10 @@
-<<<<<<< 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(){
@@ -27,19 +20,11 @@ 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)
 
@@ -47,7 +32,4 @@ func registerCaptchaRouter(e *engine.ApiEngine){
 	//v1.POST("/check",ctrler.Check)
 
 }
-<<<<<<< HEAD
 
-=======
->>>>>>> 06105bace411eb44ed1c3037d5d722e4e881cc2a