@@ -56,7 +56,7 @@ var bodyTpl = `
`
-func SendEmail(to, subject, title, body string) bool {
+func SendEmailOld(to, subject, body string) bool {
hp := strings.Split(host, ":")
auth := smtp.PlainAuth("", username, password, hp[0])
@@ -69,9 +69,8 @@ func SendEmail(to, subject, title, body string) bool {
content_type = "Content-Type: text/plain" + "; charset=UTF-8"
}
- // 登录之
- body = strings.Replace(bodyTpl, "$body", body, 1)
- body = strings.Replace(body, "$title", title, 1)
+ //body = strings.Replace(bodyTpl, "$body", body, 1)
+ //body = strings.Replace(body, "$title", title, 1)
msg := []byte("To: " + to + "\r\nFrom: " + username + "<"+ username +">\r\nSubject: " + subject + "\r\n" + content_type + "\r\n\r\n" + body)
send_to := strings.Split(to, ";")
@@ -84,7 +83,7 @@ func SendEmail(to, subject, title, body string) bool {
return true
}
-func SendToLeanote(subject, title, body string) {
+func SendToLeanoteOld(subject, title, body string) {
to := "leanote@leanote.com"
- SendEmail(to, subject, title, body);
+ SendEmailOld(to, subject, body);
}
\ No newline at end of file
diff --git a/app/lea/File.go b/app/lea/File.go
index 503f165..d3d54f9 100644
--- a/app/lea/File.go
+++ b/app/lea/File.go
@@ -77,4 +77,14 @@ func CopyFile(srcName, dstName string) (written int64, err error) {
}
defer dst.Close()
return io.Copy(dst, src)
+}
+
+func IsDirExists(path string) bool {
+ fi, err := os.Stat(path)
+ if err != nil {
+ return os.IsExist(err)
+ }else{
+ return fi.IsDir()
+ }
+ return false
}
\ No newline at end of file
diff --git a/app/lea/Vd.go b/app/lea/Vd.go
new file mode 100644
index 0000000..4adcf12
--- /dev/null
+++ b/app/lea/Vd.go
@@ -0,0 +1,145 @@
+package lea
+
+import (
+ "encoding/json"
+ "strconv"
+ "regexp"
+)
+
+// 验证
+
+var rulesStr = `{
+ "username": [
+ {"rule": "required", "msg": "inputUsername"},
+ {"rule": "noSpecialChars", "msg": "noSpecialChars"},
+ {"rule": "minLength", "data": "4", "msg": "minLength", "msgData": "4"}
+ ],
+ "email": [
+ {"rule": "required", "msg": "inputEmail"},
+ {"rule": "email", "msg": "errorEmail"}
+ ],
+ "password": [
+ {"rule": "required", "msg": "inputPassword"},
+ {"rule": "password", "msg": "errorPassword"}
+ ],
+ "subDomain": [
+ {"rule": "subDomain", "msg": "errorSubDomain"}
+ ],
+ "domain": [
+ {"rule": "domain", "msg": "errorDomain"}
+ ]
+}
+`
+var rulesMap map[string][]map[string]string
+
+var rules = map[string]func(string, map[string]string)(bool, string) {
+ "required": func(value string, rule map[string]string)(ok bool, msg string) {
+ if value == "" {
+ return
+ }
+ ok = true
+ return
+ },
+ "minLength": func(value string, rule map[string]string)(ok bool, msg string) {
+ if value == "" {
+ return
+ }
+ data := rule["data"]
+ dataI, _ := strconv.Atoi(data)
+ ok = len(value) >= dataI
+ return
+ },
+
+ "password": func(value string, rule map[string]string)(ok bool, msg string) {
+ if value == "" {
+ return
+ }
+ ok = len(value) >= 6
+ return
+ },
+ "email": func(value string, rule map[string]string)(ok bool, msg string) {
+ if value == "" {
+ return
+ }
+ ok = IsEmail(value)
+ return
+ },
+ "noSpecialChars": func(value string, rule map[string]string)(ok bool, msg string) {
+ if value == "" {
+ return
+ }
+ ok = IsUsername(value)
+ return
+ },
+ // www.baidu.com
+ //
+ "domain": func(value string, rule map[string]string)(ok bool, msg string) {
+ if value == "" {
+ ok = true
+ return // 可为空
+ }
+ ok2, _ := regexp.MatchString(`[^0-9a-zA-Z_\.\-]`, value)
+ ok = !ok2
+ if !ok {
+ return
+ }
+ ok = true
+ return
+ },
+ // abcd
+ "subDomain": func(value string, rule map[string]string)(ok bool, msg string) {
+ if value == "" {
+ ok = true
+ return // 可为空
+ }
+ if len(value) < 4 {
+ ok = false
+ return
+ }
+ ok2, _ := regexp.MatchString(`[^0-9a-zA-Z_\-]`, value)
+ ok = !ok2
+ return
+ },
+}
+
+func InitVd() {
+ json.Unmarshal([]byte(rulesStr), &rulesMap)
+ LogJ(rulesMap)
+}
+
+// 验证
+// Vd("username", "life")
+
+func Vd(name, value string) (ok bool, msg string) {
+ rs, _ := rulesMap[name]
+
+ for _, rule := range rs {
+ ruleFunc, _ := rules[rule["rule"]]
+ if ok2, msg2 := ruleFunc(value, rule); !ok2 {
+ ok = false
+ if msg2 != "" {
+ msg = msg2
+ } else {
+ msg = rule["msg"]
+ }
+ msgData := rule["msgData"]
+ if msgData != "" {
+ msg += "-" + msgData
+ }
+ return
+ }
+ }
+ ok = true
+ return
+}
+
+func Vds(m map[string]string) (ok bool, msg string) {
+ for name, value := range m {
+ ok, msg = Vd(name, value)
+ if !ok {
+ return
+ }
+ }
+ ok = true
+ return
+}
diff --git a/app/lea/captcha/Captcha.go b/app/lea/captcha/Captcha.go
new file mode 100644
index 0000000..6348d2a
--- /dev/null
+++ b/app/lea/captcha/Captcha.go
@@ -0,0 +1,399 @@
+package captcha
+
+import (
+ "image"
+ "image/color"
+ "image/png"
+ "io"
+ "math/rand"
+ crand "crypto/rand"
+ "time"
+ "strconv"
+)
+const (
+ stdWidth = 100
+ stdHeight = 40
+ maxSkew = 2
+)
+
+const (
+ fontWidth = 5
+ fontHeight = 8
+ blackChar = 1
+)
+
+var font = [][]byte{
+ { // 0
+ 0, 1, 1, 1, 0,
+ 1, 0, 0, 0, 1,
+ 1, 0, 0, 0, 1,
+ 1, 0, 0, 0, 1,
+ 1, 0, 0, 0, 1,
+ 1, 0, 0, 0, 1,
+ 1, 0, 0, 0, 1,
+ 0, 1, 1, 1, 0,
+ },
+ { // 1
+ 0, 0, 1, 0, 0,
+ 0, 1, 1, 0, 0,
+ 1, 0, 1, 0, 0,
+ 0, 0, 1, 0, 0,
+ 0, 0, 1, 0, 0,
+ 0, 0, 1, 0, 0,
+ 0, 0, 1, 0, 0,
+ 1, 1, 1, 1, 1,
+ },
+ { // 2
+ 0, 1, 1, 1, 0,
+ 1, 0, 0, 0, 1,
+ 0, 0, 0, 0, 1,
+ 0, 0, 0, 1, 1,
+ 0, 1, 1, 0, 0,
+ 1, 0, 0, 0, 0,
+ 1, 0, 0, 0, 0,
+ 1, 1, 1, 1, 1,
+ },
+ { // 3
+ 1, 1, 1, 1, 0,
+ 0, 0, 0, 0, 1,
+ 0, 0, 0, 1, 0,
+ 0, 1, 1, 1, 0,
+ 0, 0, 0, 1, 0,
+ 0, 0, 0, 0, 1,
+ 0, 0, 0, 0, 1,
+ 1, 1, 1, 1, 0,
+ },
+ { // 4
+ 1, 0, 0, 1, 0,
+ 1, 0, 0, 1, 0,
+ 1, 0, 0, 1, 0,
+ 1, 0, 0, 1, 0,
+ 1, 1, 1, 1, 1,
+ 0, 0, 0, 1, 0,
+ 0, 0, 0, 1, 0,
+ 0, 0, 0, 1, 0,
+ },
+ { // 5
+ 1, 1, 1, 1, 1,
+ 1, 0, 0, 0, 0,
+ 1, 0, 0, 0, 0,
+ 1, 1, 1, 1, 0,
+ 0, 0, 0, 0, 1,
+ 0, 0, 0, 0, 1,
+ 0, 0, 0, 0, 1,
+ 1, 1, 1, 1, 0,
+ },
+ { // 6
+ 0, 0, 1, 1, 1,
+ 0, 1, 0, 0, 0,
+ 1, 0, 0, 0, 0,
+ 1, 1, 1, 1, 0,
+ 1, 0, 0, 0, 1,
+ 1, 0, 0, 0, 1,
+ 1, 0, 0, 0, 1,
+ 0, 1, 1, 1, 0,
+ },
+ { // 7
+ 1, 1, 1, 1, 1,
+ 0, 0, 0, 0, 1,
+ 0, 0, 0, 0, 1,
+ 0, 0, 0, 1, 0,
+ 0, 0, 1, 0, 0,
+ 0, 1, 0, 0, 0,
+ 0, 1, 0, 0, 0,
+ 0, 1, 0, 0, 0,
+ },
+ { // 8
+ 0, 1, 1, 1, 0,
+ 1, 0, 0, 0, 1,
+ 1, 0, 0, 0, 1,
+ 0, 1, 1, 1, 0,
+ 1, 0, 0, 0, 1,
+ 1, 0, 0, 0, 1,
+ 1, 0, 0, 0, 1,
+ 0, 1, 1, 1, 0,
+ },
+ { // 9
+ 0, 1, 1, 1, 0,
+ 1, 0, 0, 0, 1,
+ 1, 0, 0, 0, 1,
+ 1, 1, 0, 0, 1,
+ 0, 1, 1, 1, 1,
+ 0, 0, 0, 0, 1,
+ 0, 0, 0, 0, 1,
+ 1, 1, 1, 1, 0,
+ },
+}
+
+type Image struct {
+ *image.NRGBA
+ color *color.NRGBA
+ width int //a digit width
+ height int //a digit height
+ dotsize int
+}
+func init(){
+ rand.Seed(int64(time.Second))
+}
+
+func NewImage(digits []byte, width, height int) *Image {
+ img := new(Image)
+ r := image.Rect(img.width, img.height, stdWidth, stdHeight)
+ img.NRGBA = image.NewNRGBA(r)
+
+ img.color = &color.NRGBA{
+ uint8(rand.Intn(129)),
+ uint8(rand.Intn(129)),
+ uint8(rand.Intn(129)),
+ 0xFF,
+ }
+ // Draw background (10 random circles of random brightness)
+ img.calculateSizes(width, height, len(digits))
+ img.fillWithCircles(10, img.dotsize)
+
+ maxx := width - (img.width+img.dotsize)*len(digits) - img.dotsize
+ maxy := height - img.height - img.dotsize*2
+
+ x := rnd(img.dotsize*2, maxx)
+ y := rnd(img.dotsize*2, maxy)
+
+ // Draw digits.
+ for _, n := range digits {
+ img.drawDigit(font[n], x, y)
+ x += img.width + img.dotsize
+ }
+
+ // Draw strike-through line.
+ // 中间线不要
+ //img.strikeThrough()
+
+ return img
+}
+
+func (img *Image) WriteTo(w io.Writer) (int64, error) {
+ return 0, png.Encode(w, img)
+}
+
+func (img *Image) calculateSizes(width, height, ncount int) {
+
+ // Goal: fit all digits inside the image.
+ var border int
+ if width > height {
+ border = height / 5
+ } else {
+ border = width / 5
+ }
+ // Convert everything to floats for calculations.
+ w := float64(width - border*2) //268
+ h := float64(height - border*2) //48
+ // fw takes into account 1-dot spacing between digits.
+
+ fw := float64(fontWidth) + 1 //6
+
+ fh := float64(fontHeight) //8
+ nc := float64(ncount) //7
+
+ // Calculate the width of a single digit taking into account only the
+ // width of the image.
+ nw := w / nc //38
+ // Calculate the height of a digit from this width.
+ nh := nw * fh / fw //51
+
+ // Digit too high?
+
+ if nh > h {
+ // Fit digits based on height.
+ nh = h //nh = 44
+ nw = fw / fh * nh
+ }
+ // Calculate dot size.
+ img.dotsize = int(nh / fh)
+ // Save everything, making the actual width smaller by 1 dot to account
+ // for spacing between digits.
+ img.width = int(nw)
+ img.height = int(nh) - img.dotsize
+}
+
+func (img *Image) fillWithCircles(n, maxradius int) {
+ color := img.color
+ maxx := img.Bounds().Max.X
+ maxy := img.Bounds().Max.Y
+ for i := 0; i < n; i++ {
+ setRandomBrightness(color, 255)
+ r := rnd(1, maxradius)
+ img.drawCircle(color, rnd(r, maxx-r), rnd(r, maxy-r), r)
+ }
+}
+
+func (img *Image) drawHorizLine(color color.Color, fromX, toX, y int) {
+ for x := fromX; x <= toX; x++ {
+ img.Set(x, y, color)
+ }
+}
+
+func (img *Image) drawCircle(color color.Color, x, y, radius int) {
+ f := 1 - radius
+ dfx := 1
+ dfy := -2 * radius
+ xx := 0
+ yy := radius
+
+ img.Set(x, y+radius, color)
+ img.Set(x, y-radius, color)
+ img.drawHorizLine(color, x-radius, x+radius, y)
+
+ for xx < yy {
+ if f >= 0 {
+ yy--
+ dfy += 2
+ f += dfy
+ }
+ xx++
+ dfx += 2
+ f += dfx
+ img.drawHorizLine(color, x-xx, x+xx, y+yy)
+ img.drawHorizLine(color, x-xx, x+xx, y-yy)
+ img.drawHorizLine(color, x-yy, x+yy, y+xx)
+ img.drawHorizLine(color, x-yy, x+yy, y-xx)
+ }
+}
+
+func (img *Image) strikeThrough() {
+ r := 0
+ maxx := img.Bounds().Max.X
+ maxy := img.Bounds().Max.Y
+ y := rnd(maxy/3, maxy-maxy/3)
+ for x := 0; x < maxx; x += r {
+ r = rnd(1, img.dotsize/3)
+ y += rnd(-img.dotsize/2, img.dotsize/2)
+ if y <= 0 || y >= maxy {
+ y = rnd(maxy/3, maxy-maxy/3)
+ }
+ img.drawCircle(img.color, x, y, r)
+ }
+}
+
+func (img *Image) drawDigit(digit []byte, x, y int) {
+ skf := rand.Float64() * float64(rnd(-maxSkew, maxSkew))
+ xs := float64(x)
+ minr := img.dotsize / 2 // minumum radius
+ maxr := img.dotsize/2 + img.dotsize/4 // maximum radius
+ y += rnd(-minr, minr)
+ for yy := 0; yy < fontHeight; yy++ {
+ for xx := 0; xx < fontWidth; xx++ {
+ if digit[yy*fontWidth+xx] != blackChar {
+ continue
+ }
+ // Introduce random variations.
+ or := rnd(minr, maxr)
+ ox := x + (xx * img.dotsize) + rnd(0, or/2)
+ oy := y + (yy * img.dotsize) + rnd(0, or/2)
+
+ img.drawCircle(img.color, ox, oy, or)
+ }
+ xs += skf
+ x = int(xs)
+ }
+}
+
+func setRandomBrightness(c *color.NRGBA, max uint8) {
+ minc := min3(c.R, c.G, c.B)
+ maxc := max3(c.R, c.G, c.B)
+ if maxc > max {
+ return
+ }
+ n := rand.Intn(int(max-maxc)) - int(minc)
+ c.R = uint8(int(c.R) + n)
+ c.G = uint8(int(c.G) + n)
+ c.B = uint8(int(c.B) + n)
+}
+
+func min3(x, y, z uint8) (o uint8) {
+ o = x
+ if y < o {
+ o = y
+ }
+ if z < o {
+ o = z
+ }
+ return
+}
+
+func max3(x, y, z uint8) (o uint8) {
+ o = x
+ if y > o {
+ o = y
+ }
+ if z > o {
+ o = z
+ }
+ return
+}
+
+// rnd returns a random number in range [from, to].
+func rnd(from, to int) int {
+ //println(to+1-from)
+ return rand.Intn(to+1-from) + from
+}
+
+const (
+ // Standard length of uniuri string to achive ~95 bits of entropy.
+ StdLen = 16
+ // Length of uniurl string to achive ~119 bits of entropy, closest
+ // to what can be losslessly converted to UUIDv4 (122 bits).
+ UUIDLen = 20
+)
+
+// Standard characters allowed in uniuri string.
+var StdChars = []byte("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789")
+
+// New returns a new random string of the standard length, consisting of
+// standard characters.
+func New() string {
+ return NewLenChars(StdLen, StdChars)
+}
+
+// NewLen returns a new random string of the provided length, consisting of
+// standard characters.
+func NewLen(length int) string {
+ return NewLenChars(length, StdChars)
+}
+
+// NewLenChars returns a new random string of the provided length, consisting
+// of the provided byte slice of allowed characters (maximum 256).
+func NewLenChars(length int, chars []byte) string {
+ b := make([]byte, length)
+ r := make([]byte, length+(length/4)) // storage for random bytes.
+ clen := byte(len(chars))
+ maxrb := byte(256 - (256 % len(chars)))
+ i := 0
+ for {
+ if _, err := io.ReadFull(crand.Reader, r); err != nil {
+ panic("error reading from random source: " + err.Error())
+ }
+ for _, c := range r {
+ if c >= maxrb {
+ // Skip this number to avoid modulo bias.
+ continue
+ }
+ b[i] = chars[c%clen]
+ i++
+ if i == length {
+ return string(b)
+ }
+ }
+ }
+ panic("unreachable")
+}
+
+func Fetch() (*Image, string) {
+ d := make([]byte, 4)
+ s := NewLen(4)
+ ss := ""
+ d = []byte(s)
+ for v := range d {
+ d[v] %= 10
+ ss += strconv.FormatInt(int64(d[v]), 32)
+ }
+ return NewImage(d, 100, 40), ss
+}
\ No newline at end of file
diff --git a/app/lea/html2image/ToImage.go b/app/lea/html2image/ToImage.go
new file mode 100644
index 0000000..e6730f7
--- /dev/null
+++ b/app/lea/html2image/ToImage.go
@@ -0,0 +1,10 @@
+package html2image
+
+import (
+ "github.com/leanote/leanote/app/info"
+)
+
+func Html2Image(userInfo info.User, note info.Note, content, toPath string) bool {
+ return true
+}
+
diff --git a/app/lea/memcache/Memcache.go b/app/lea/memcache/Memcache.go
index b83844c..23ab0d5 100644
--- a/app/lea/memcache/Memcache.go
+++ b/app/lea/memcache/Memcache.go
@@ -3,9 +3,20 @@ package memcache
import (
"github.com/robfig/gomemcache/memcache"
"encoding/json"
+ "strconv"
)
-func Set(key string, value map[string]string, expiration int32) {
+var client *memcache.Client
+
+// onAppStart后调用
+func InitMemcache() {
+ client = memcache.New("localhost:11211")
+}
+
+//------------
+// map
+
+func SetMap(key string, value map[string]string, expiration int32) {
// 把value转成byte
bytes, _ := json.Marshal(value)
if expiration == -1 {
@@ -14,7 +25,7 @@ func Set(key string, value map[string]string, expiration int32) {
client.Set(&memcache.Item{Key: key, Value: bytes, Expiration: expiration})
}
-func Get(key string) map[string]string {
+func GetMap(key string) map[string]string {
item, err := client.Get(key)
if err != nil {
return nil
@@ -23,4 +34,33 @@ func Get(key string) map[string]string {
m := map[string]string{}
json.Unmarshal(item.Value, &m)
return m
-}
\ No newline at end of file
+}
+
+//------------
+// string
+func GetString(key string) string {
+ item, err := client.Get(key)
+ if err != nil {
+ return ""
+ }
+ return string(item.Value)
+}
+func SetString(key string, value string, expiration int32) {
+ if expiration == -1 {
+ expiration = 30 * 24 * 60 * 60 // 30天
+ }
+ client.Set(&memcache.Item{Key: key, Value: []byte(value), Expiration: expiration})
+}
+
+//-------------------------
+// int, 是通过转成string来存的
+
+func GetInt(key string) int {
+ str := GetString(key)
+ i, _ := strconv.Atoi(str)
+ return i
+}
+func SetInt(key string, value int, expiration int32) {
+ str := strconv.Itoa(value)
+ SetString(key, str, expiration)
+}
diff --git a/app/lea/memcache/init.go b/app/lea/memcache/init.go
deleted file mode 100644
index cca3cf7..0000000
--- a/app/lea/memcache/init.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package memcache
-
-import (
- "github.com/robfig/gomemcache/memcache"
-)
-
-var client *memcache.Client
-
-func init() {
- // client = memcache.New("localhost:11211")
-}
\ No newline at end of file
diff --git a/app/lea/netutil/NetUtil.go b/app/lea/netutil/NetUtil.go
index 21b156c..9cf4ff3 100644
--- a/app/lea/netutil/NetUtil.go
+++ b/app/lea/netutil/NetUtil.go
@@ -13,7 +13,7 @@ import (
// toPath 文件保存的目录
// 默认是/tmp
// 返回文件的完整目录
-func WriteUrl(url string, toPath string) (path string, ok bool) {
+func WriteUrl(url string, toPath string) (length int64, newFilename, path string, ok bool) {
if url == "" {
return;
}
@@ -22,6 +22,8 @@ func WriteUrl(url string, toPath string) (path string, ok bool) {
return;
}
+ length = int64(len(content))
+
// a.html?a=a11&xxx
url = trimQueryParams(url)
_, ext := SplitFilename(url)
@@ -29,13 +31,8 @@ func WriteUrl(url string, toPath string) (path string, ok bool) {
toPath = "/tmp"
}
// dir := filepath.Dir(toPath)
- newFilename := NewGuid() + ext
+ newFilename = NewGuid() + ext
fullPath := toPath + "/" + newFilename
- /*
- if err := os.MkdirAll(dir, 0777); err != nil {
- return
- }
- */
// 写到文件中
file, err := os.Create(fullPath)
@@ -54,6 +51,7 @@ func WriteUrl(url string, toPath string) (path string, ok bool) {
func GetContent(url string) (content []byte, err error) {
var resp *http.Response
resp, err = http.Get(url)
+ Log(err)
if(resp != nil && resp.Body != nil) {
defer resp.Body.Close()
} else {
@@ -65,6 +63,7 @@ func GetContent(url string) (content []byte, err error) {
var buf []byte
buf, err = ioutil.ReadAll(resp.Body)
if(err != nil) {
+ Log(err)
return
}
diff --git a/app/lea/Route.go b/app/lea/route/Route.go
similarity index 60%
rename from app/lea/Route.go
rename to app/lea/route/Route.go
index 4681cbb..386d74b 100644
--- a/app/lea/Route.go
+++ b/app/lea/route/Route.go
@@ -1,14 +1,20 @@
-package lea
+package route
import (
"github.com/revel/revel"
+// "github.com/leanote/leanote/app/service"
+// . "github.com/leanote/leanote/app/lea"
"net/url"
"strings"
)
// overwite revel RouterFilter
// /api/user/Info => ApiUser.Info()
+var staticPrefix = []string{"/public", "/favicon.ico", "/css", "/js", "/images", "/tinymce", "/upload", "/fonts"}
func RouterFilter(c *revel.Controller, fc []revel.Filter) {
+ // 补全controller部分
+ path := c.Request.Request.URL.Path
+
// Figure out the Controller/Action
var route *revel.RouteMatch = revel.MainRouter.Route(c.Request.Request)
if route == nil {
@@ -24,12 +30,25 @@ func RouterFilter(c *revel.Controller, fc []revel.Filter) {
//----------
// life start
- path := c.Request.Request.URL.Path
- // Log(c.Request.Request.URL.Host)
- if strings.HasPrefix(path, "/api") || strings.HasPrefix(path, "api") {
- route.ControllerName = "Api" + route.ControllerName
+ /*
+ type URL struct {
+ Scheme string
+ Opaque string // encoded opaque data
+ User *Userinfo // username and password information
+ Host string // host or host:port
+ Path string
+ RawQuery string // encoded query values, without '?'
+ Fragment string // fragment for references, without '#'
+ }
+ */
+ if route.ControllerName != "Static" {
+ // api设置
+ // leanote.com/api/user/get => ApiUser::Get
+ if strings.HasPrefix(path, "/api/") || strings.HasPrefix(path, "api/") {
+ route.ControllerName = "Api" + route.ControllerName
+ }
+ // end
}
- // end
// Set the action.
if err := c.SetAction(route.ControllerName, route.MethodName); err != nil {
diff --git a/app/lea/session/MSession.go b/app/lea/session/MSession.go
new file mode 100644
index 0000000..808ed58
--- /dev/null
+++ b/app/lea/session/MSession.go
@@ -0,0 +1,38 @@
+package session
+
+import (
+ "github.com/revel/revel"
+ "github.com/leanote/leanote/app/lea/memcache"
+ . "github.com/leanote/leanote/app/lea"
+)
+
+// 使用filter
+// 很巧妙就使用了memcache来处理session
+// revel的session(cookie)只存sessionId, 其它信息存在memcache中
+
+func MSessionFilter(c *revel.Controller, fc []revel.Filter) {
+ sessionId := c.Session.Id()
+
+ // 从memcache中得到cache, 赋给session
+ cache := revel.Session(memcache.GetMap(sessionId))
+
+ Log("memcache")
+ LogJ(cache)
+ if cache == nil {
+ cache = revel.Session{}
+ cache.Id()
+ }
+ c.Session = cache
+
+ // Make session vars available in templates as {{.session.xyz}}
+ c.RenderArgs["session"] = c.Session
+
+ fc[0](c, fc[1:])
+
+ // 再把session保存之
+ LogJ(c.Session)
+ memcache.SetMap(sessionId, c.Session, -1)
+
+ // 只留下sessionId
+ c.Session = revel.Session{revel.SESSION_ID_KEY: sessionId}
+}
\ No newline at end of file
diff --git a/app/lea/session/session.go b/app/lea/session/session.go
index a5990a1..6cc0cea 100644
--- a/app/lea/session/session.go
+++ b/app/lea/session/session.go
@@ -1,31 +1,208 @@
package session
import (
- "github.com/robfig/revel"
- "github.com/leanote/leanote/app/lea/memcache"
-// . "leanote/app/lea"
+ "github.com/revel/revel"
+// . "github.com/leanote/leanote/app/lea"
+ "crypto/rand"
+ "encoding/hex"
+ "fmt"
+ "net/http"
+ "net/url"
+ "strconv"
+ "strings"
+ "time"
)
-// 使用filter
-// 很巧妙就使用了memcache来处理session
-// revel的session(cookie)只存sessionId, 其它信息存在memcache中
+// 主要修改revel的cookie, 设置Domain
+// 为了使sub domain共享cookie
+// cookie.domain = leanote.com
-func SessionFilter(c *revel.Controller, fc []revel.Filter) {
- sessionId := c.Session.Id()
-
- // 从memcache中得到cache, 赋给session
- cache := revel.Session(memcache.Get(sessionId))
- if cache == nil {
- cache = revel.Session{}
- cache.Id()
+// A signed cookie (and thus limited to 4kb in size).
+// Restriction: Keys may not have a colon in them.
+type Session map[string]string
+
+const (
+ SESSION_ID_KEY = "_ID"
+ TIMESTAMP_KEY = "_TS"
+)
+
+// expireAfterDuration is the time to live, in seconds, of a session cookie.
+// It may be specified in config as "session.expires". Values greater than 0
+// set a persistent cookie with a time to live as specified, and the value 0
+// sets a session cookie.
+var expireAfterDuration time.Duration
+var cookieDomain = "" // life
+func init() {
+ // Set expireAfterDuration, default to 30 days if no value in config
+ revel.OnAppStart(func() {
+ var err error
+ if expiresString, ok := revel.Config.String("session.expires"); !ok {
+ expireAfterDuration = 30 * 24 * time.Hour
+ } else if expiresString == "session" {
+ expireAfterDuration = 0
+ } else if expireAfterDuration, err = time.ParseDuration(expiresString); err != nil {
+ panic(fmt.Errorf("session.expires invalid: %s", err))
+ }
+
+ cookieDomain, _ = revel.Config.String("cookie.domain")
+ })
+}
+
+// Id retrieves from the cookie or creates a time-based UUID identifying this
+// session.
+func (s Session) Id() string {
+ if sessionIdStr, ok := s[SESSION_ID_KEY]; ok {
+ return sessionIdStr
}
- c.Session = cache
+
+ buffer := make([]byte, 32)
+ if _, err := rand.Read(buffer); err != nil {
+ panic(err)
+ }
+
+ s[SESSION_ID_KEY] = hex.EncodeToString(buffer)
+ return s[SESSION_ID_KEY]
+}
+
+// getExpiration return a time.Time with the session's expiration date.
+// If previous session has set to "session", remain it
+func (s Session) getExpiration() time.Time {
+ if expireAfterDuration == 0 || s[TIMESTAMP_KEY] == "session" {
+ // Expire after closing browser
+ return time.Time{}
+ }
+ return time.Now().Add(expireAfterDuration)
+}
+
+// cookie returns an http.Cookie containing the signed session.
+func (s Session) cookie() *http.Cookie {
+ var sessionValue string
+ ts := s.getExpiration()
+ s[TIMESTAMP_KEY] = getSessionExpirationCookie(ts)
+ for key, value := range s {
+ if strings.ContainsAny(key, ":\x00") {
+ panic("Session keys may not have colons or null bytes")
+ }
+ if strings.Contains(value, "\x00") {
+ panic("Session values may not have null bytes")
+ }
+ sessionValue += "\x00" + key + ":" + value + "\x00"
+ }
+
+ sessionData := url.QueryEscape(sessionValue)
+ cookie := http.Cookie{
+ Name: revel.CookiePrefix + "_SESSION",
+ Value: revel.Sign(sessionData) + "-" + sessionData,
+ Path: "/",
+ HttpOnly: revel.CookieHttpOnly,
+ Secure: revel.CookieSecure,
+ Expires: ts.UTC(),
+ }
+
+ if cookieDomain != "" {
+ cookie.Domain = cookieDomain
+ }
+
+ return &cookie
+}
+
+// sessionTimeoutExpiredOrMissing returns a boolean of whether the session
+// cookie is either not present or present but beyond its time to live; i.e.,
+// whether there is not a valid session.
+func sessionTimeoutExpiredOrMissing(session Session) bool {
+ if exp, present := session[TIMESTAMP_KEY]; !present {
+ return true
+ } else if exp == "session" {
+ return false
+ } else if expInt, _ := strconv.Atoi(exp); int64(expInt) < time.Now().Unix() {
+ return true
+ }
+ return false
+}
+
+// getSessionFromCookie returns a Session struct pulled from the signed
+// session cookie.
+func getSessionFromCookie(cookie *http.Cookie) Session {
+ session := make(Session)
+
+ // Separate the data from the signature.
+ hyphen := strings.Index(cookie.Value, "-")
+ if hyphen == -1 || hyphen >= len(cookie.Value)-1 {
+ return session
+ }
+ sig, data := cookie.Value[:hyphen], cookie.Value[hyphen+1:]
+
+ // Verify the signature.
+ if !revel.Verify(data, sig) {
+ revel.INFO.Println("Session cookie signature failed")
+ return session
+ }
+
+ revel.ParseKeyValueCookie(data, func(key, val string) {
+ session[key] = val
+ })
+
+ if sessionTimeoutExpiredOrMissing(session) {
+ session = make(Session)
+ }
+
+ return session
+}
+
+// SessionFilter is a Revel Filter that retrieves and sets the session cookie.
+// Within Revel, it is available as a Session attribute on Controller instances.
+// The name of the Session cookie is set as CookiePrefix + "_SESSION".
+func SessionFilter(c *revel.Controller, fc []revel.Filter) {
+ session := restoreSession(c.Request.Request)
+ // c.Session, 重新生成一个revel.Session给controller!!!
+// Log("sessoin--------")
+// LogJ(session)
+ revelSession := revel.Session(session) // 强制转换 还是同一个对象, 但有个问题, 这样Session.Id()方法是用revel的了
+ c.Session = revelSession
+ // 生成sessionId
+ c.Session.Id()
+ sessionWasEmpty := len(c.Session) == 0
+
+ // Make session vars available in templates as {{.session.xyz}}
+ c.RenderArgs["session"] = c.Session
fc[0](c, fc[1:])
-
- // 再把session保存之
- memcache.Set(sessionId, c.Session, -1)
-
- // 只留下sessionId
- c.Session = revel.Session{revel.SESSION_ID_KEY: sessionId}
+
+ // Store the signed session if it could have changed.
+ if len(c.Session) > 0 || !sessionWasEmpty {
+ // 转换成lea.Session
+ session = Session(c.Session)
+ c.SetCookie(session.cookie())
+ }
+}
+
+// restoreSession returns either the current session, retrieved from the
+// session cookie, or a new session.
+func restoreSession(req *http.Request) Session {
+ cookie, err := req.Cookie(revel.CookiePrefix + "_SESSION")
+ if err != nil {
+ return make(Session)
+ } else {
+ return getSessionFromCookie(cookie)
+ }
+}
+
+// getSessionExpirationCookie retrieves the cookie's time to live as a
+// string of either the number of seconds, for a persistent cookie, or
+// "session".
+func getSessionExpirationCookie(t time.Time) string {
+ if t.IsZero() {
+ return "session"
+ }
+ return strconv.FormatInt(t.Unix(), 10)
+}
+
+// SetNoExpiration sets session to expire when browser session ends
+func (s Session) SetNoExpiration() {
+ s[TIMESTAMP_KEY] = "session"
+}
+
+// SetDefaultExpiration sets session to expire after default duration
+func (s Session) SetDefaultExpiration() {
+ delete(s, TIMESTAMP_KEY)
}
\ No newline at end of file
diff --git a/app/release/release.go b/app/release/release.go
index 17c027a..05c0d2b 100644
--- a/app/release/release.go
+++ b/app/release/release.go
@@ -39,6 +39,7 @@ var cmdPath = "/usr/local/bin/uglifyjs"
func cmdError(err error) {
if err != nil {
+ fmt.Println(err)
fmt.Fprintf(os.Stderr, "The command failed to perform: %s (Command: %s, Arguments: %s)", err, "", "")
} else {
fmt.Println("OK")
@@ -63,6 +64,7 @@ func combineJs() {
for _, js := range jss {
to := base + js + "-min.js"
+ fmt.Println(to)
compressJs(js)
// 每个压缩后的文件放入之
@@ -85,6 +87,7 @@ func dev() {
"notebook.js": "notebook-min.js",
"share.js": "share-min.js",
"tag.js": "tag-min.js",
+ "main.js": "main-min.js",
"jquery.contextmenu.js": "jquery.contextmenu-min.js",
"editor/editor.js": "editor/editor-min.js",
"/public/mdeditor/editor/scrollLink.js": "/public/mdeditor/editor/scrollLink-min.js",
@@ -108,7 +111,8 @@ func tinymce() {
// cmd := exec.Command("/Users/life/Documents/eclipse-workspace/go/leanote_release/tinymce-master/node_modules/jake/bin/cli.js", "minify", "bundle[themes:modern,plugins:table,paste,advlist,autolink,link,image,lists,charmap,hr,searchreplace,visualblocks,visualchars,code,nav,tabfocus,contextmenu,directionality,codemirror,codesyntax,textcolor,fullpage]")
cmd := exec.Command("/Users/life/Documents/eclipse-workspace/go/leanote_release/tinymce-master/node_modules/jake/bin/cli.js", "minify")
cmd.Dir = "/Users/life/Documents/eclipse-workspace/go/leanote_release/tinymce-master"
- _, err := cmd.CombinedOutput()
+ c, err := cmd.CombinedOutput()
+ fmt.Println(string(c))
cmdError(err)
}
@@ -116,11 +120,12 @@ func main() {
dev();
// 其它零散的需要压缩的js
- otherJss := []string{"tinymce/tinymce", "js/app/page", "js/contextmenu/jquery.contextmenu",
+ otherJss := []string{"tinymce/tinymce", "js/main", "js/app/page", "js/contextmenu/jquery.contextmenu",
"mdeditor/editor/scrollLink",
"mdeditor/editor/editor",
"mdeditor/editor/jquery.waitforimages",
"mdeditor/editor/pagedown/local/Markdown.local.zh",
+ "mdeditor/editor/pagedown/local/Markdown.local.en",
"mdeditor/editor/pagedown/Markdown.Editor",
"mdeditor/editor/pagedown/Markdown.Sanitizer",
"mdeditor/editor/pagedown/Markdown.Converter",
diff --git a/app/service/AuthService.go b/app/service/AuthService.go
index f4c3928..1d4e66a 100644
--- a/app/service/AuthService.go
+++ b/app/service/AuthService.go
@@ -4,9 +4,10 @@ import (
"gopkg.in/mgo.v2/bson"
// "github.com/leanote/leanote/app/db"
"github.com/leanote/leanote/app/info"
- "github.com/revel/revel"
+// "github.com/revel/revel"
. "github.com/leanote/leanote/app/lea"
"fmt"
+ "strconv"
)
// 登录与权限
@@ -16,7 +17,8 @@ type AuthService struct {
// pwd已md5了
func (this *AuthService) Login(emailOrUsername, pwd string) info.User {
- return userService.LoginGetUserInfo(emailOrUsername, Md5(pwd))
+ userInfo := userService.LoginGetUserInfo(emailOrUsername, Md5(pwd))
+ return userInfo
}
// 注册
@@ -56,20 +58,30 @@ func (this *AuthService) register(user info.User) (bool, string) {
email := user.Email
// 添加leanote -> 该用户的共享
- leanoteUserId, _ := revel.Config.String("register.sharedUserId"); // "5368c1aa99c37b029d000001";
- nk1, _ := revel.Config.String("register.sharedUserShareNotebookId"); // 5368c1aa99c37b029d000002" // leanote
- welcomeNoteId, _ := revel.Config.String("register.welcomeNoteId") // "5368c1b919807a6f95000000" // 欢迎来到leanote
-
- if leanoteUserId != "" && nk1 != "" && welcomeNoteId != "" {
- shareService.AddShareNotebook(nk1, 0, leanoteUserId, email);
- shareService.AddShareNote(welcomeNoteId, 0, leanoteUserId, email);
+ registerSharedUserId := configService.GetGlobalStringConfig("registerSharedUserId")
+ if(registerSharedUserId != "") {
+ registerSharedNotebooks := configService.GetGlobalArrMapConfig("registerSharedNotebooks")
+ registerSharedNotes := configService.GetGlobalArrMapConfig("registerSharedNotes")
+ registerCopyNoteIds := configService.GetGlobalArrayConfig("registerCopyNoteIds")
- // 将welcome copy给我
- note := noteService.CopySharedNote(welcomeNoteId, title2Id["life"].Hex(), leanoteUserId, user.UserId.Hex());
+ // 添加共享笔记本
+ for _, notebook := range registerSharedNotebooks {
+ perm, _ := strconv.Atoi(notebook["perm"])
+ shareService.AddShareNotebook(notebook["notebookId"], perm, registerSharedUserId, email);
+ }
- // 公开为博客
- noteUpdate := bson.M{"IsBlog": true}
- noteService.UpdateNote(user.UserId.Hex(), user.UserId.Hex(), note.NoteId.Hex(), noteUpdate)
+ // 添加共享笔记
+ for _, note := range registerSharedNotes {
+ perm, _ := strconv.Atoi(note["perm"])
+ shareService.AddShareNote(note["noteId"], perm, registerSharedUserId, email);
+ }
+
+ // 复制笔记
+ for _, noteId := range registerCopyNoteIds {
+ note := noteService.CopySharedNote(noteId, title2Id["life"].Hex(), registerSharedUserId, user.UserId.Hex());
+ noteUpdate := bson.M{"IsBlog": true}
+ noteService.UpdateNote(user.UserId.Hex(), user.UserId.Hex(), note.NoteId.Hex(), noteUpdate)
+ }
}
//---------------
diff --git a/app/service/BlogService.go b/app/service/BlogService.go
index 39a7a78..4ca78fd 100644
--- a/app/service/BlogService.go
+++ b/app/service/BlogService.go
@@ -3,10 +3,12 @@ package service
import (
"github.com/leanote/leanote/app/info"
"github.com/leanote/leanote/app/db"
-// . "github.com/leanote/leanote/app/lea"
+ . "github.com/leanote/leanote/app/lea"
"gopkg.in/mgo.v2/bson"
// "time"
// "sort"
+ "strings"
+ "time"
)
// blog
@@ -207,15 +209,25 @@ func (this *BlogService) ListAllBlogs(tag string, keywords string, isRecommend b
//------------------------
// 博客设置
+func (this *BlogService) fixUserBlog(userBlog *info.UserBlog) {
+ /*
+ if userBlog.Title == "" {
+ userInfo := userService.GetUserInfo(userBlog)
+ userBlog.Title = userInfo.Username + " 's Blog"
+ }
+ */
+
+ // Logo路径问题, 有些有http: 有些没有
+ Log(userBlog.Logo)
+ if userBlog.Logo != "" && !strings.HasPrefix(userBlog.Logo, "http") {
+ userBlog.Logo = strings.Trim(userBlog.Logo, "/")
+ userBlog.Logo = siteUrl + "/" + userBlog.Logo
+ }
+}
func (this *BlogService) GetUserBlog(userId string) info.UserBlog {
userBlog := info.UserBlog{}
db.Get(db.UserBlogs, userId, &userBlog)
-
- if userBlog.Title == "" {
- userInfo := userService.GetUserInfo(userId)
- userBlog.Title = userInfo.Username + " 的博客"
- }
-
+ this.fixUserBlog(&userBlog)
return userBlog
}
@@ -225,7 +237,8 @@ func (this *BlogService) UpdateUserBlog(userBlog info.UserBlog) bool {
}
// 修改之UserBlogBase
func (this *BlogService) UpdateUserBlogBase(userId string, userBlog info.UserBlogBase) bool {
- return db.UpdateByQMap(db.UserBlogs, bson.M{"_id": bson.ObjectIdHex(userId)}, userBlog)
+ ok := db.UpdateByQMap(db.UserBlogs, bson.M{"_id": bson.ObjectIdHex(userId)}, userBlog)
+ return ok
}
func (this *BlogService) UpdateUserBlogComment(userId string, userBlog info.UserBlogComment) bool {
return db.UpdateByQMap(db.UserBlogs, bson.M{"_id": bson.ObjectIdHex(userId)}, userBlog)
@@ -234,10 +247,325 @@ func (this *BlogService) UpdateUserBlogStyle(userId string, userBlog info.UserBl
return db.UpdateByQMap(db.UserBlogs, bson.M{"_id": bson.ObjectIdHex(userId)}, userBlog)
}
-//------------
+
+//---------------------
// 后台管理
// 推荐博客
func (this *BlogService) SetRecommend(noteId string, isRecommend bool) bool {
- return db.UpdateByQField(db.Notes, bson.M{"_id": bson.ObjectIdHex(noteId), "IsBlog": true}, "IsRecommend", isRecommend)
+ data := bson.M{"IsRecommend": isRecommend}
+ if isRecommend {
+ data["RecommendTime"] = time.Now()
+ }
+ return db.UpdateByQMap(db.Notes, bson.M{"_id": bson.ObjectIdHex(noteId), "IsBlog": true}, data)
+}
+
+//----------------------
+// 博客社交, 评论
+
+// 返回所有liked用户, bool是否还有
+func (this *BlogService) ListLikedUsers(noteId string, isAll bool) ([]info.User, bool) {
+ // 默认前5
+ pageSize := 5
+ skipNum, sortFieldR := parsePageAndSort(1, pageSize, "CreatedTime", false)
+
+ likes := []info.BlogLike{}
+ query := bson.M{"NoteId": bson.ObjectIdHex(noteId)}
+ q := db.BlogLikes.Find(query);
+
+ // 总记录数
+ count, _ := q.Count()
+ if count == 0 {
+ return nil, false
+ }
+
+ if isAll {
+ q.Sort(sortFieldR).Skip(skipNum).Limit(pageSize).All(&likes)
+ } else {
+ q.Sort(sortFieldR).All(&likes)
+ }
+
+ // 得到所有userIds
+ userIds := make([]bson.ObjectId, len(likes))
+ for i, like := range likes {
+ userIds[i] = like.UserId
+ }
+ // 得到用户信息
+ userMap := userService.MapUserInfoAndBlogInfosByUserIds(userIds)
+
+ users := make([]info.User, len(likes));
+ for i, like := range likes {
+ users[i] = userMap[like.UserId]
+ }
+
+ return users, count > pageSize
+}
+
+func (this *BlogService) IsILikeIt(noteId, userId string) bool {
+ if userId == "" {
+ return false
+ }
+ if db.Has(db.BlogLikes, bson.M{"NoteId": bson.ObjectIdHex(noteId), "UserId": bson.ObjectIdHex(userId)}) {
+ return true
+ }
+ return false
+}
+
+// 阅读次数统计+1
+func (this *BlogService) IncReadNum(noteId string) bool {
+ note := noteService.GetNoteById(noteId)
+ if note.IsBlog {
+ return db.Update(db.Notes, bson.M{"_id": bson.ObjectIdHex(noteId)}, bson.M{"$inc": bson.M{"ReadNum": 1}})
+ }
+ return false
+}
+
+// 点赞
+// retun ok , isLike
+func (this *BlogService) LikeBlog(noteId, userId string) (ok bool, isLike bool) {
+ ok = false
+ isLike = false
+ if noteId == "" || userId == "" {
+ return
+ }
+ // 判断是否点过赞, 如果点过那么取消点赞
+ note := noteService.GetNoteById(noteId)
+ if !note.IsBlog /*|| note.UserId.Hex() == userId */{
+ return
+ }
+
+ noteIdO := bson.ObjectIdHex(noteId)
+ userIdO := bson.ObjectIdHex(userId)
+ var n int
+ if !db.Has(db.BlogLikes, bson.M{"NoteId": noteIdO, "UserId": userIdO}) {
+ n = 1
+ // 添加之
+ db.Insert(db.BlogLikes, info.BlogLike{LikeId: bson.NewObjectId(), NoteId: noteIdO, UserId: userIdO, CreatedTime: time.Now()})
+ isLike = true
+ } else {
+ // 已点过, 那么删除之
+ n = -1
+ db.Delete(db.BlogLikes, bson.M{"NoteId": noteIdO, "UserId": userIdO})
+ isLike = false
+ }
+ ok = db.Update(db.Notes, bson.M{"_id": noteIdO}, bson.M{"$inc": bson.M{"LikeNum": n}})
+
+ return
+}
+
+// 评论
+// 在noteId博客下userId 给toUserId评论content
+// commentId可为空(针对某条评论评论)
+func (this *BlogService) Comment(noteId, toCommentId, userId, content string) (bool, info.BlogComment) {
+ var comment info.BlogComment
+ if content == "" {
+ return false, comment
+ }
+
+ note := noteService.GetNoteById(noteId)
+ if !note.IsBlog {
+ return false, comment
+ }
+
+ comment = info.BlogComment{CommentId: bson.NewObjectId(),
+ NoteId: bson.ObjectIdHex(noteId),
+ UserId: bson.ObjectIdHex(userId),
+ Content: content,
+ CreatedTime: time.Now(),
+ }
+ var comment2 = info.BlogComment{}
+ if toCommentId != "" {
+ comment2 = info.BlogComment{}
+ db.Get(db.BlogComments, toCommentId, &comment2)
+ if comment2.CommentId != "" {
+ comment.ToCommentId = comment2.CommentId
+ comment.ToUserId = comment2.UserId
+ }
+ } else {
+ // comment.ToUserId = note.UserId
+ }
+ ok := db.Insert(db.BlogComments, comment)
+ if ok {
+ // 评论+1
+ db.Update(db.Notes, bson.M{"_id": bson.ObjectIdHex(noteId)}, bson.M{"$inc": bson.M{"CommentNum": 1}})
+ }
+
+ if userId != note.UserId.Hex() || toCommentId != "" {
+ go func() {
+ this.sendEmail(note, comment2, userId, content);
+ }()
+ }
+
+ return ok, comment
+}
+
+// 发送email
+func (this *BlogService) sendEmail(note info.Note, comment info.BlogComment, userId, content string) {
+ emailService.SendCommentEmail(note, comment, userId, content);
+ /*
+ toUserId := note.UserId.Hex()
+ // title := "评论提醒"
+
+ // 表示回复回复的内容, 那么发送给之前回复的
+ if comment.CommentId != "" {
+ toUserId = comment.UserId.Hex()
+ }
+ toUserInfo := userService.GetUserInfo(toUserId)
+ sendUserInfo := userService.GetUserInfo(userId)
+
+ subject := note.Title + " 收到 " + sendUserInfo.Username + " 的评论";
+ if comment.CommentId != "" {
+ subject = "您在 " + note.Title + " 发表的评论收到 " + sendUserInfo.Username;
+ if userId == note.UserId.Hex() {
+ subject += "(作者)";
+ }
+ subject += " 的评论";
+ }
+
+ body := "{header}
评论内容:
" + content + "
";
+ href := "http://"+ configService.GetBlogDomain() + "/view/" + note.NoteId.Hex()
+ body += "
博客链接:
" + href + "{footer}";
+
+ emailService.SendEmail(toUserInfo.Email, subject, body)
+ */
+}
+
+// 作者(或管理员)可以删除所有评论
+// 自己可以删除评论
+func (this *BlogService) DeleteComment(noteId, commentId, userId string) bool {
+ note := noteService.GetNoteById(noteId)
+ if !note.IsBlog {
+ return false
+ }
+
+ comment := info.BlogComment{}
+ db.Get(db.BlogComments, commentId, &comment)
+
+ if comment.CommentId == "" {
+ return false
+ }
+
+ if userId == adminUserId || note.UserId.Hex() == userId || comment.UserId.Hex() == userId {
+ if db.Delete(db.BlogComments, bson.M{"_id": bson.ObjectIdHex(commentId)}) {
+ // 评论-1
+ db.Update(db.Notes, bson.M{"_id": bson.ObjectIdHex(noteId)}, bson.M{"$inc": bson.M{"CommentNum": -1}})
+ return true
+ }
+ }
+
+ return false
+}
+
+// 点赞/取消赞
+func (this *BlogService) LikeComment(commentId, userId string) (ok bool, isILike bool, num int) {
+ ok = false
+ isILike = false
+ num = 0
+ comment := info.BlogComment{}
+
+ db.Get(db.BlogComments, commentId, &comment)
+
+ var n int
+ if comment.LikeUserIds != nil && len(comment.LikeUserIds) > 0 && InArray(comment.LikeUserIds, userId) {
+ n = -1
+ // 从点赞名单删除
+ db.Update(db.BlogComments, bson.M{"_id": bson.ObjectIdHex(commentId)},
+ bson.M{"$pull": bson.M{"LikeUserIds": userId}})
+ isILike = false
+ } else {
+ n = 1
+ // 添加之
+ db.Update(db.BlogComments, bson.M{"_id": bson.ObjectIdHex(commentId)},
+ bson.M{"$push": bson.M{"LikeUserIds": userId}})
+ isILike = true
+ }
+
+ if comment.LikeUserIds == nil {
+ num = 0
+ } else {
+ num = len(comment.LikeUserIds) + n
+ }
+
+ ok = db.Update(db.BlogComments, bson.M{"_id": bson.ObjectIdHex(commentId)},
+ bson.M{"$set": bson.M{"LikeNum": num}})
+
+ return
+}
+
+// 评论列表
+// userId主要是显示userId是否点过某评论的赞
+// 还要获取用户信息
+func (this *BlogService) ListComments(userId, noteId string, page, pageSize int) (info.Page, []info.BlogCommentPublic, map[string]info.User) {
+ pageInfo := info.Page{CurPage: page}
+
+ comments2 := []info.BlogComment{}
+
+ skipNum, sortFieldR := parsePageAndSort(page, pageSize, "CreatedTime", false)
+
+ query := bson.M{"NoteId": bson.ObjectIdHex(noteId)}
+ q := db.BlogComments.Find(query);
+
+ // 总记录数
+ count, _ := q.Count()
+ q.Sort(sortFieldR).Skip(skipNum).Limit(pageSize).All(&comments2)
+
+ if(len(comments2) == 0) {
+ return pageInfo, nil, nil
+ }
+
+ comments := make([]info.BlogCommentPublic, len(comments2))
+ // 我是否点过赞呢?
+ for i, comment := range comments2 {
+ comments[i].BlogComment = comment
+ if comment.LikeNum > 0 && comment.LikeUserIds != nil && len(comment.LikeUserIds) > 0 && InArray(comment.LikeUserIds, userId) {
+ comments[i].IsILikeIt = true
+ }
+ }
+
+ note := noteService.GetNoteById(noteId);
+
+ // 得到用户信息
+ userIdsMap := map[bson.ObjectId]bool{note.UserId: true}
+ for _, comment := range comments {
+ userIdsMap[comment.UserId] = true
+ if comment.ToUserId != "" { // 可能为空
+ userIdsMap[comment.ToUserId] = true
+ }
+ }
+ userIds := make([]bson.ObjectId, len(userIdsMap))
+ i := 0
+ for userId, _ := range userIdsMap {
+ userIds[i] = userId
+ i++
+ }
+
+ // 得到用户信息
+ userMap := userService.MapUserInfoByUserIds(userIds)
+ userMap2 := make(map[string]info.User, len(userMap))
+ for userId, v := range userMap {
+ userMap2[userId.Hex()] = v
+ }
+
+ pageInfo = info.NewPage(page, pageSize, count, nil)
+
+ return pageInfo, comments, userMap2
+}
+
+// 举报
+func (this *BlogService) Report(noteId, commentId, reason, userId string) (bool) {
+ note := noteService.GetNoteById(noteId)
+ if !note.IsBlog {
+ return false
+ }
+
+ report := info.Report{ReportId: bson.NewObjectId(),
+ NoteId: bson.ObjectIdHex(noteId),
+ UserId: bson.ObjectIdHex(userId),
+ Reason: reason,
+ CreatedTime: time.Now(),
+ }
+ if commentId != "" {
+ report.CommentId = bson.ObjectIdHex(commentId)
+ }
+ return db.Insert(db.Reports, report)
}
\ No newline at end of file
diff --git a/app/service/ConfigService.go b/app/service/ConfigService.go
index 54a90d5..45cd594 100644
--- a/app/service/ConfigService.go
+++ b/app/service/ConfigService.go
@@ -2,40 +2,38 @@ package service
import (
"github.com/leanote/leanote/app/info"
-// . "github.com/leanote/leanote/app/lea"
+ . "github.com/leanote/leanote/app/lea"
"github.com/leanote/leanote/app/db"
"gopkg.in/mgo.v2/bson"
"github.com/revel/revel"
"time"
+ "os"
+ "os/exec"
+ "fmt"
+ "strings"
+ "strconv"
)
// 配置服务
+// 只是全局的, 用户的配置没有
type ConfigService struct {
// 全局的
+ GlobalAllConfigs map[string]interface{}
GlobalStringConfigs map[string]string
GlobalArrayConfigs map[string][]string
-
- // 两种配置, 用户自己的
- UserStringConfigs map[string]string
- UserArrayConfigs map[string][]string
-
- // 合并之后的
- AllStringConfigs map[string]string
- AllArrayConfigs map[string][]string
+ GlobalMapConfigs map[string]map[string]string
+ GlobalArrMapConfigs map[string][]map[string]string
}
var adminUserId = ""
// appStart时 将全局的配置从数据库中得到作为全局
func (this *ConfigService) InitGlobalConfigs() bool {
+ this.GlobalAllConfigs = map[string]interface{}{}
this.GlobalStringConfigs = map[string]string{}
this.GlobalArrayConfigs = map[string][]string{}
-
- this.UserStringConfigs = map[string]string{}
- this.UserArrayConfigs = map[string][]string{}
-
- this.AllStringConfigs = map[string]string{}
- this.AllArrayConfigs = map[string][]string{}
+ this.GlobalMapConfigs = map[string]map[string]string{}
+ this.GlobalArrMapConfigs = map[string][]map[string]string{}
adminUsername, _ := revel.Config.String("adminUsername")
if adminUsername == "" {
@@ -48,84 +46,95 @@ func (this *ConfigService) InitGlobalConfigs() bool {
}
adminUserId = userInfo.UserId.Hex()
- configs := info.Config{}
- db.Get2(db.Configs, userInfo.UserId, &configs)
+ configs := []info.Config{}
+ db.ListByQ(db.Configs, bson.M{"UserId": userInfo.UserId}, &configs)
- if configs.UserId == "" {
- db.Insert(db.Configs, info.Config{UserId: userInfo.UserId, StringConfigs: map[string]string{}, ArrayConfigs: map[string][]string{}})
- }
-
- this.GlobalStringConfigs = configs.StringConfigs;
- this.GlobalArrayConfigs = configs.ArrayConfigs;
-
- // 复制到所有配置上
- for key, value := range this.GlobalStringConfigs {
- this.AllStringConfigs[key] = value
- }
- for key, value := range this.GlobalArrayConfigs {
- this.AllArrayConfigs[key] = value
+ for _, config := range configs {
+ if config.IsArr {
+ this.GlobalArrayConfigs[config.Key] = config.ValueArr
+ this.GlobalAllConfigs[config.Key] = config.ValueArr
+ } else if config.IsMap {
+ this.GlobalMapConfigs[config.Key] = config.ValueMap
+ this.GlobalAllConfigs[config.Key] = config.ValueMap
+ } else if config.IsArrMap {
+ this.GlobalArrMapConfigs[config.Key] = config.ValueArrMap
+ this.GlobalAllConfigs[config.Key] = config.ValueArrMap
+ } else {
+ this.GlobalStringConfigs[config.Key] = config.ValueStr
+ this.GlobalAllConfigs[config.Key] = config.ValueStr
+ }
}
return true
}
-// 用户登录后获取用户自定义的配置, 并将所有的配置都用上
-func (this *ConfigService) InitUserConfigs(userId string) bool {
- configs := info.Config{}
- db.Get(db.Configs, userId, &configs)
-
- if configs.UserId == "" {
- db.Insert(db.Configs, info.Config{UserId: bson.ObjectIdHex(userId), StringConfigs: map[string]string{}, ArrayConfigs: map[string][]string{}})
+// 通用方法
+func (this *ConfigService) updateGlobalConfig(userId, key string, value interface{}, isArr, isMap, isArrMap bool) bool {
+ // 判断是否存在
+ if _, ok := this.GlobalAllConfigs[key]; !ok {
+ // 需要添加
+ config := info.Config{ConfigId: bson.NewObjectId(),
+ UserId: bson.ObjectIdHex(userId),
+ Key: key,
+ IsArr: isArr,
+ IsMap: isMap,
+ IsArrMap: isArrMap,
+ UpdatedTime: time.Now(),
+ }
+ if(isArr) {
+ v, _ := value.([]string)
+ config.ValueArr = v
+ this.GlobalArrayConfigs[key] = v
+ } else if isMap {
+ v, _ := value.(map[string]string)
+ config.ValueMap = v
+ this.GlobalMapConfigs[key] = v
+ } else if isArrMap {
+ v, _ := value.([]map[string]string)
+ config.ValueArrMap = v
+ this.GlobalArrMapConfigs[key] = v
+ } else {
+ v, _ := value.(string)
+ config.ValueStr = v
+ this.GlobalStringConfigs[key] = v
+ }
+ return db.Insert(db.Configs, config)
+ } else {
+ i := bson.M{"UpdatedTime": time.Now()}
+ this.GlobalAllConfigs[key] = value
+ if(isArr) {
+ v, _ := value.([]string)
+ i["ValueArr"] = v
+ this.GlobalArrayConfigs[key] = v
+ } else if isMap {
+ v, _ := value.(map[string]string)
+ i["ValueMap"] = v
+ this.GlobalMapConfigs[key] = v
+ } else if isArrMap {
+ v, _ := value.([]map[string]string)
+ i["ValueArrMap"] = v
+ this.GlobalArrMapConfigs[key] = v
+ } else {
+ v, _ := value.(string)
+ i["ValueStr"] = v
+ this.GlobalStringConfigs[key] = v
+ }
+ return db.UpdateByQMap(db.Configs, bson.M{"UserId": bson.ObjectIdHex(userId), "Key": key}, i)
}
-
- this.UserStringConfigs = configs.StringConfigs;
- this.UserArrayConfigs = configs.ArrayConfigs;
-
- // 合并配置
- for key, value := range this.UserStringConfigs {
- this.AllStringConfigs[key] = value
- }
- for key, value := range this.UserArrayConfigs {
- this.AllArrayConfigs[key] = value
- }
-
- return true
-}
-
-// 获取配置
-func (this *ConfigService) GetStringConfig(key string) string {
- return this.AllStringConfigs[key]
-}
-func (this *ConfigService) GetArrayConfig(key string) []string {
- arr := this.AllArrayConfigs[key]
- if arr == nil {
- return []string{}
- }
- return arr
}
// 更新用户配置
-func (this *ConfigService) UpdateUserStringConfig(userId, key string, value string) bool {
- this.UserStringConfigs[key] = value
- this.AllStringConfigs[key] = value
- if userId == adminUserId {
- this.GlobalStringConfigs[key] = value
- }
-
- // 保存到数据库中
- return db.UpdateByQMap(db.Configs, bson.M{"_id": bson.ObjectIdHex(userId)},
- bson.M{"StringConfigs": this.UserStringConfigs, "UpdatedTime": time.Now()})
+func (this *ConfigService) UpdateGlobalStringConfig(userId, key string, value string) bool {
+ return this.updateGlobalConfig(userId, key, value, false, false, false)
}
-func (this *ConfigService) UpdateUserArrayConfig(userId, key string, value []string) bool {
- this.UserArrayConfigs[key] = value
- this.AllArrayConfigs[key] = value
- if userId == adminUserId {
- this.GlobalArrayConfigs[key] = value
- }
-
- // 保存到数据库中
- return db.UpdateByQMap(db.Configs, bson.M{"_id": bson.ObjectIdHex(userId)},
- bson.M{"ArrayConfigs": this.UserArrayConfigs, "UpdatedTime": time.Now()})
+func (this *ConfigService) UpdateGlobalArrayConfig(userId, key string, value []string) bool {
+ return this.updateGlobalConfig(userId, key, value, true, false, false)
+}
+func (this *ConfigService) UpdateGlobalMapConfig(userId, key string, value map[string]string) bool {
+ return this.updateGlobalConfig(userId, key, value, false, true, false)
+}
+func (this *ConfigService) UpdateGlobalArrMapConfig(userId, key string, value []map[string]string) bool {
+ return this.updateGlobalConfig(userId, key, value, false, false, true)
}
// 获取全局配置, 博客平台使用
@@ -138,4 +147,391 @@ func (this *ConfigService) GetGlobalArrayConfig(key string) []string {
return []string{}
}
return arr
-}
\ No newline at end of file
+}
+func (this *ConfigService) GetGlobalMapConfig(key string) map[string]string {
+ m := this.GlobalMapConfigs[key]
+ if m == nil {
+ return map[string]string{}
+ }
+ return m
+}
+func (this *ConfigService) GetGlobalArrMapConfig(key string) []map[string]string {
+ m := this.GlobalArrMapConfigs[key]
+ if m == nil {
+ return []map[string]string{}
+ }
+ return m
+}
+//-------
+// 修改共享笔记的配置
+func (this *ConfigService) UpdateShareNoteConfig(registerSharedUserId string,
+ registerSharedNotebookPerms, registerSharedNotePerms []int,
+ registerSharedNotebookIds, registerSharedNoteIds, registerCopyNoteIds []string) (ok bool, msg string) {
+
+ defer func() {
+ if err := recover(); err != nil {
+ ok = false
+ msg = fmt.Sprint(err)
+ }
+ }();
+
+ // 用户是否存在?
+ if registerSharedUserId == "" {
+ ok = true
+ msg = "share userId is blank, So it share nothing to register"
+ this.UpdateGlobalStringConfig(adminUserId, "registerSharedUserId", "")
+ return
+ } else {
+ user := userService.GetUserInfo(registerSharedUserId)
+ if user.UserId == "" {
+ ok = false
+ msg = "no such user: " + registerSharedUserId
+ return
+ } else {
+ this.UpdateGlobalStringConfig(adminUserId, "registerSharedUserId", registerSharedUserId)
+ }
+ }
+
+ notebooks := []map[string]string{}
+ // 共享笔记本
+ if len(registerSharedNotebookIds) > 0 {
+ for i := 0; i < len(registerSharedNotebookIds); i++ {
+ // 判断笔记本是否存在
+ notebookId := registerSharedNotebookIds[i]
+ if notebookId == "" {
+ continue
+ }
+ notebook := notebookService.GetNotebook(notebookId, registerSharedUserId)
+ if notebook.NotebookId == "" {
+ ok = false
+ msg = "The user has no such notebook: " + notebookId
+ return
+ } else {
+ perm := "0";
+ if registerSharedNotebookPerms[i] == 1 {
+ perm = "1"
+ }
+ notebooks = append(notebooks, map[string]string{"notebookId": notebookId, "perm": perm})
+ }
+ }
+ }
+ this.UpdateGlobalArrMapConfig(adminUserId, "registerSharedNotebooks", notebooks)
+
+ notes := []map[string]string{}
+ // 共享笔记
+ if len(registerSharedNoteIds) > 0 {
+ for i := 0; i < len(registerSharedNoteIds); i++ {
+ // 判断笔记本是否存在
+ noteId := registerSharedNoteIds[i]
+ if noteId == "" {
+ continue
+ }
+ note := noteService.GetNote(noteId, registerSharedUserId)
+ if note.NoteId == "" {
+ ok = false
+ msg = "The user has no such note: " + noteId
+ return
+ } else {
+ perm := "0";
+ if registerSharedNotePerms[i] == 1 {
+ perm = "1"
+ }
+ notes = append(notes, map[string]string{"noteId": noteId, "perm": perm})
+ }
+ }
+ }
+ this.UpdateGlobalArrMapConfig(adminUserId, "registerSharedNotes", notes)
+
+ // 复制
+ noteIds := []string{}
+ if len(registerCopyNoteIds) > 0 {
+ for i := 0; i < len(registerCopyNoteIds); i++ {
+ // 判断笔记本是否存在
+ noteId := registerCopyNoteIds[i]
+ if noteId == "" {
+ continue
+ }
+ note := noteService.GetNote(noteId, registerSharedUserId)
+ if note.NoteId == "" {
+ ok = false
+ msg = "The user has no such note: " + noteId
+ return
+ } else {
+ noteIds = append(noteIds, noteId)
+ }
+ }
+ }
+ this.UpdateGlobalArrayConfig(adminUserId, "registerCopyNoteIds", noteIds)
+
+ ok = true
+ return
+}
+
+// 添加备份
+func (this *ConfigService) AddBackup(path, remark string) bool {
+ backups := this.GetGlobalArrMapConfig("backups") // [{}, {}]
+ n := time.Now().Unix()
+ nstr := fmt.Sprintf("%v", n)
+ backups = append(backups, map[string]string{"createdTime": nstr, "path": path, "remark": remark})
+ return this.UpdateGlobalArrMapConfig(adminUserId, "backups", backups)
+}
+
+func (this *ConfigService) getBackupDirname() string {
+ n := time.Now()
+ y, m, d := n.Date()
+ return strconv.Itoa(y) + "_" + m.String() + "_" + strconv.Itoa(d) + "_" + fmt.Sprintf("%v", n.Unix())
+}
+func (this *ConfigService) Backup(remark string) (ok bool, msg string) {
+ binPath := configService.GetGlobalStringConfig("mongodumpPath")
+ config := revel.Config;
+ dbname, _ := config.String("db.dbname")
+ host, _ := revel.Config.String("db.host")
+ port, _ := revel.Config.String("db.port")
+ username, _ := revel.Config.String("db.username")
+ password, _ := revel.Config.String("db.password")
+ // mongodump -h localhost -d leanote -o /root/mongodb_backup/leanote-9-22/ -u leanote -p nKFAkxKnWkEQy8Vv2LlM
+ binPath = binPath + " -h " + host + " -d " + dbname + " -port " + port
+ if username != "" {
+ binPath += " -u " + username + " -p " + password
+ }
+ // 保存的路径
+ dir := revel.BasePath + "/backup/" + this.getBackupDirname()
+ binPath += " -o " + dir
+ err := os.MkdirAll(dir, 0755)
+ if err != nil {
+ ok = false
+ msg = fmt.Sprintf("%v", err)
+ return
+ }
+
+ cmd := exec.Command("/bin/sh", "-c", binPath)
+ Log(binPath);
+ b, err := cmd.Output()
+ if err != nil {
+ msg = fmt.Sprintf("%v", err)
+ ok = false
+ Log("error:......")
+ Log(string(b))
+ return
+ }
+ ok = configService.AddBackup(dir, remark)
+ return ok, msg
+}
+// 还原
+func (this *ConfigService) Restore(createdTime string) (ok bool, msg string) {
+ backups := this.GetGlobalArrMapConfig("backups") // [{}, {}]
+ var i int
+ var backup map[string]string
+ for i, backup = range backups {
+ if backup["createdTime"] == createdTime {
+ break;
+ }
+ }
+ if i == len(backups) {
+ return false, "Backup Not Found"
+ }
+
+ // 先备份当前
+ ok, msg = this.Backup("Auto backup when restore from " + backup["createdTime"] )
+ if !ok {
+ return
+ }
+
+ // mongorestore -h localhost -d leanote --directoryperdb /home/user1/gopackage/src/github.com/leanote/leanote/mongodb_backup/leanote_install_data/
+ binPath := configService.GetGlobalStringConfig("mongorestorePath")
+ config := revel.Config;
+ dbname, _ := config.String("db.dbname")
+ host, _ := revel.Config.String("db.host")
+ port, _ := revel.Config.String("db.port")
+ username, _ := revel.Config.String("db.username")
+ password, _ := revel.Config.String("db.password")
+ // mongorestore -h localhost -d leanote -o /root/mongodb_backup/leanote-9-22/ -u leanote -p nKFAkxKnWkEQy8Vv2LlM
+ binPath = binPath + " --drop -h " + host + " -d " + dbname + " -port " + port
+ if username != "" {
+ binPath += " -u " + username + " -p " + password
+ }
+
+ path := backup["path"] + "/" + dbname
+ // 判断路径是否存在
+ if !IsDirExists(path) {
+ return false, path + " Is Not Exists"
+ }
+
+ binPath += " --directoryperdb " + path
+
+ cmd := exec.Command("/bin/sh", "-c", binPath)
+ Log(binPath);
+ b, err := cmd.Output()
+ if err != nil {
+ msg = fmt.Sprintf("%v", err)
+ ok = false
+ Log("error:......")
+ Log(string(b))
+ return
+ }
+
+ return true, ""
+}
+func (this *ConfigService) DeleteBackup(createdTime string) (bool, string) {
+ backups := this.GetGlobalArrMapConfig("backups") // [{}, {}]
+ var i int
+ var backup map[string]string
+ for i, backup = range backups {
+ if backup["createdTime"] == createdTime {
+ break;
+ }
+ }
+ if i == len(backups) {
+ return false, "Backup Not Found"
+ }
+
+ // 删除文件夹之
+ err := os.RemoveAll(backups[i]["path"])
+ if err != nil {
+ return false, fmt.Sprintf("%v", err)
+ }
+
+ // 删除之
+ backups = append(backups[0:i], backups[i+1:]...)
+
+ ok := this.UpdateGlobalArrMapConfig(adminUserId, "backups", backups)
+ return ok, ""
+}
+
+func (this *ConfigService) UpdateBackupRemark(createdTime, remark string) (bool, string) {
+ backups := this.GetGlobalArrMapConfig("backups") // [{}, {}]
+ var i int
+ var backup map[string]string
+ for i, backup = range backups {
+ if backup["createdTime"] == createdTime {
+ break;
+ }
+ }
+ if i == len(backups) {
+ return false, "Backup Not Found"
+ }
+ backup["remark"] = remark;
+
+ ok := this.UpdateGlobalArrMapConfig(adminUserId, "backups", backups)
+ return ok, ""
+}
+
+// 得到备份
+func (this *ConfigService) GetBackup(createdTime string) (map[string]string, bool) {
+ backups := this.GetGlobalArrMapConfig("backups") // [{}, {}]
+ var i int
+ var backup map[string]string
+ for i, backup = range backups {
+ if backup["createdTime"] == createdTime {
+ break;
+ }
+ }
+ if i == len(backups) {
+ return map[string]string{}, false
+ }
+ return backup, true
+}
+
+//--------------
+// sub domain
+var defaultDomain string
+var schema = "http://"
+var port string
+
+func init() {
+ revel.OnAppStart(func() {
+ port = strconv.Itoa(revel.HttpPort)
+ if port != "80" {
+ port = ":" + port
+ } else {
+ port = "";
+ }
+
+ siteUrl, _ = revel.Config.String("site.url") // 已包含:9000, http, 去掉成 leanote.com
+ if strings.HasPrefix(siteUrl, "http://") {
+ defaultDomain = siteUrl[len("http://"):]
+ } else if strings.HasPrefix(siteUrl, "https://") {
+ defaultDomain = siteUrl[len("https://"):]
+ schema = "https://"
+ }
+ })
+}
+
+
+func (this *ConfigService) GetSchema() string {
+ return schema;
+}
+// 默认
+func (this *ConfigService) GetDefaultDomain() string {
+ return defaultDomain
+}
+// 包含http://
+func (this *ConfigService) GetDefaultUrl() string {
+ return schema + defaultDomain
+}
+// note
+func (this *ConfigService) GetNoteDomain() string {
+ subDomain := this.GetGlobalStringConfig("noteSubDomain");
+ if subDomain != "" {
+ return subDomain + port
+ }
+ return this.GetDefaultDomain() + "/note"
+}
+func (this *ConfigService) GetNoteUrl() string {
+ return schema + this.GetNoteDomain();
+}
+
+// blog
+func (this *ConfigService) GetBlogDomain() string {
+ subDomain := this.GetGlobalStringConfig("blogSubDomain");
+ if subDomain != "" {
+ return subDomain + port
+ }
+ return this.GetDefaultDomain() + "/blog"
+}
+func (this *ConfigService) GetBlogUrl() string {
+ return schema + this.GetBlogDomain();
+}
+// lea
+func (this *ConfigService) GetLeaDomain() string {
+ subDomain := this.GetGlobalStringConfig("leaSubDomain");
+ if subDomain != "" {
+ return subDomain + port
+ }
+ return this.GetDefaultDomain() + "/lea"
+}
+func (this *ConfigService) GetLeaUrl() string {
+ return schema + this.GetLeaDomain();
+}
+
+func (this *ConfigService) GetUserUrl(domain string) string {
+ return schema + domain + port
+}
+func (this *ConfigService) GetUserSubUrl(subDomain string) string {
+ return schema + subDomain + "." + this.GetDefaultDomain()
+}
+
+// 是否允许自定义域名
+func (this *ConfigService) AllowCustomDomain() bool {
+ return configService.GetGlobalStringConfig("allowCustomDomain") != ""
+}
+// 是否是好的自定义域名
+func (this *ConfigService) IsGoodCustomDomain(domain string) bool {
+ blacks := this.GetGlobalArrayConfig("blackCustomDomains")
+ for _, black := range blacks {
+ if strings.Contains(domain, black) {
+ return false
+ }
+ }
+ return true
+}
+func (this *ConfigService) IsGoodSubDomain(domain string) bool {
+ blacks := this.GetGlobalArrayConfig("blackSubDomains")
+ LogJ(blacks)
+ for _, black := range blacks {
+ if domain == black {
+ return false
+ }
+ }
+ return true
+}
diff --git a/app/service/EmailService.go b/app/service/EmailService.go
new file mode 100644
index 0000000..09c7045
--- /dev/null
+++ b/app/service/EmailService.go
@@ -0,0 +1,474 @@
+package service
+
+import (
+ "github.com/leanote/leanote/app/info"
+ "github.com/leanote/leanote/app/db"
+ . "github.com/leanote/leanote/app/lea"
+ "gopkg.in/mgo.v2/bson"
+ "time"
+ "strings"
+ "net/smtp"
+ "strconv"
+ "fmt"
+ "html/template"
+ "bytes"
+)
+
+// 发送邮件
+
+type EmailService struct {
+ tpls map[string]*template.Template
+}
+
+func NewEmailService() (*EmailService) {
+ return &EmailService{tpls: map[string]*template.Template{}}
+}
+
+// 发送邮件
+var host = ""
+var emailPort = ""
+var username = ""
+var password = ""
+
+func InitEmailFromDb() {
+ host = configService.GetGlobalStringConfig("emailHost")
+ emailPort = configService.GetGlobalStringConfig("emailPort")
+ username = configService.GetGlobalStringConfig("emailUsername")
+ password = configService.GetGlobalStringConfig("emailPassword")
+}
+
+func (this *EmailService) SendEmail(to, subject, body string) (ok bool, e string) {
+ InitEmailFromDb()
+
+ if host == "" || emailPort == "" || username == "" || password == "" {
+ return
+ }
+ hp := strings.Split(host, ":")
+ auth := smtp.PlainAuth("", username, password, hp[0])
+
+ var content_type string
+
+ mailtype := "html"
+ if mailtype == "html" {
+ content_type = "Content-Type: text/"+ mailtype + "; charset=UTF-8"
+ } else{
+ content_type = "Content-Type: text/plain" + "; charset=UTF-8"
+ }
+
+ msg := []byte("To: " + to + "\r\nFrom: " + username + "<"+ username +">\r\nSubject: " + subject + "\r\n" + content_type + "\r\n\r\n" + body)
+ send_to := strings.Split(to, ";")
+ err := smtp.SendMail(host+":"+emailPort, auth, username, send_to, msg)
+
+ if err != nil {
+ e = fmt.Sprint(err)
+ return
+ }
+ ok = true
+ return
+}
+
+// AddUser调用
+// 可以使用一个goroutine
+func (this *EmailService) RegisterSendActiveEmail(userInfo info.User, email string) bool {
+ token := tokenService.NewToken(userInfo.UserId.Hex(), email, info.TokenActiveEmail)
+ if token == "" {
+ return false
+ }
+
+ subject := configService.GetGlobalStringConfig("emailTemplateRegisterSubject");
+ tpl := configService.GetGlobalStringConfig("emailTemplateRegister");
+
+ if(tpl == "") {
+ return false
+ }
+
+ tokenUrl := siteUrl + "/user/activeEmail?token=" + token
+ // {siteUrl} {tokenUrl} {token} {tokenTimeout} {user.id} {user.email} {user.username}
+ token2Value := map[string]interface{}{"siteUrl": siteUrl, "tokenUrl": tokenUrl, "token": token, "tokenTimeout": strconv.Itoa(int(tokenService.GetOverHours(info.TokenActiveEmail))),
+ "user": map[string]interface{}{
+ "userId": userInfo.UserId.Hex(),
+ "email": userInfo.Email,
+ "username": userInfo.Username,
+ },
+ }
+
+ var ok bool
+ ok, _, subject, tpl = this.renderEmail(subject, tpl, token2Value)
+ if !ok {
+ return false
+ }
+
+ // 发送邮件
+ ok, _ = this.SendEmail(email, subject, tpl)
+ return ok
+}
+
+// 修改邮箱
+func (this *EmailService) UpdateEmailSendActiveEmail(userInfo info.User, email string) (ok bool, msg string) {
+ // 先验证该email是否被注册了
+ if userService.IsExistsUser(email) {
+ ok = false
+ msg = "该邮箱已注册"
+ return
+ }
+
+ token := tokenService.NewToken(userInfo.UserId.Hex(), email, info.TokenUpdateEmail)
+
+ if token == "" {
+ return
+ }
+
+ subject := configService.GetGlobalStringConfig("emailTemplateUpdateEmailSubject");
+ tpl := configService.GetGlobalStringConfig("emailTemplateUpdateEmail");
+
+ // 发送邮件
+ tokenUrl := siteUrl + "/user/updateEmail?token=" + token
+ // {siteUrl} {tokenUrl} {token} {tokenTimeout} {user.userId} {user.email} {user.username}
+ token2Value := map[string]interface{}{"siteUrl": siteUrl, "tokenUrl": tokenUrl, "token": token, "tokenTimeout": strconv.Itoa(int(tokenService.GetOverHours(info.TokenActiveEmail))),
+ "newEmail": email,
+ "user": map[string]interface{}{
+ "userId": userInfo.UserId.Hex(),
+ "email": userInfo.Email,
+ "username": userInfo.Username,
+ },
+ }
+
+ ok, msg, subject, tpl = this.renderEmail(subject, tpl, token2Value)
+ if !ok {
+ return
+ }
+
+ // 发送邮件
+ ok, msg = this.SendEmail(email, subject, tpl)
+ return
+}
+
+func (this *EmailService) FindPwdSendEmail(token, email string) (ok bool, msg string) {
+ subject := configService.GetGlobalStringConfig("emailTemplateFindPasswordSubject");
+ tpl := configService.GetGlobalStringConfig("emailTemplateFindPassword");
+
+ // 发送邮件
+ tokenUrl := siteUrl + "/findPassword/" + token
+ // {siteUrl} {tokenUrl} {token} {tokenTimeout} {user.id} {user.email} {user.username}
+ token2Value := map[string]interface{}{"siteUrl": siteUrl, "tokenUrl": tokenUrl,
+ "token": token, "tokenTimeout": strconv.Itoa(int(tokenService.GetOverHours(info.TokenActiveEmail)))}
+
+ ok, msg, subject, tpl = this.renderEmail(subject, tpl, token2Value)
+ if !ok {
+ return
+ }
+ // 发送邮件
+ ok, msg = this.SendEmail(email, subject, tpl)
+ return
+}
+
+// 发送邀请链接
+func (this *EmailService) SendInviteEmail(userInfo info.User, email, content string) bool {
+ subject := configService.GetGlobalStringConfig("emailTemplateInviteSubject");
+ tpl := configService.GetGlobalStringConfig("emailTemplateInvite");
+
+ token2Value := map[string]interface{}{"siteUrl": siteUrl,
+ "registerUrl": siteUrl + "/register?from=" + userInfo.Username,
+ "content": content,
+ "user": map[string]interface{}{
+ "username": userInfo.Username,
+ "email": userInfo.Email,
+ },
+ }
+ var ok bool
+ ok, _, subject, tpl = this.renderEmail(subject, tpl, token2Value)
+ if !ok {
+ return false
+ }
+ // 发送邮件
+ ok, _ = this.SendEmail(email, subject, tpl)
+ return ok
+}
+
+// 发送评论
+func (this *EmailService) SendCommentEmail(note info.Note, comment info.BlogComment, userId, content string) bool {
+ subject := configService.GetGlobalStringConfig("emailTemplateCommentSubject");
+ tpl := configService.GetGlobalStringConfig("emailTemplateComment");
+
+ // title := "评论提醒"
+
+ /*
+ toUserId := note.UserId.Hex()
+ // title := "评论提醒"
+
+ // 表示回复回复的内容, 那么发送给之前回复的
+ if comment.CommentId != "" {
+ toUserId = comment.UserId.Hex()
+ }
+ toUserInfo := userService.GetUserInfo(toUserId)
+ sendUserInfo := userService.GetUserInfo(userId)
+
+ subject := note.Title + " 收到 " + sendUserInfo.Username + " 的评论";
+ if comment.CommentId != "" {
+ subject = "您在 " + note.Title + " 发表的评论收到 " + sendUserInfo.Username;
+ if userId == note.UserId.Hex() {
+ subject += "(作者)";
+ }
+ subject += " 的评论";
+ }
+ */
+
+ toUserId := note.UserId.Hex()
+ // 表示回复回复的内容, 那么发送给之前回复的
+ if comment.CommentId != "" {
+ toUserId = comment.UserId.Hex()
+ }
+ toUserInfo := userService.GetUserInfo(toUserId) // 被评论者
+ sendUserInfo := userService.GetUserInfo(userId) // 评论者
+
+ // {siteUrl} {blogUrl}
+ // {blog.id} {blog.title} {blog.url}
+ // {commentUser.userId} {commentUser.username} {commentUser.email}
+ // {commentedUser.userId} {commentedUser.username} {commentedUser.email}
+ token2Value := map[string]interface{}{"siteUrl": siteUrl, "blogUrl": configService.GetBlogUrl(),
+ "blog": map[string]string{
+ "id": note.NoteId.Hex(),
+ "title": note.Title,
+ "url": configService.GetBlogUrl() + "/view/" + note.NoteId.Hex(),
+ },
+ "commentContent": content,
+ // 评论者信息
+ "commentUser": map[string]interface{}{"userId": sendUserInfo.UserId.Hex(),
+ "username": sendUserInfo.Username,
+ "email": sendUserInfo.Email,
+ "isBlogAuthor": userId == note.UserId.Hex(),
+ },
+ // 被评论者信息
+ "commentedUser": map[string]interface{}{"userId": toUserId,
+ "username": toUserInfo.Username,
+ "email": toUserInfo.Email,
+ "isBlogAuthor": toUserId == note.UserId.Hex(),
+ },
+ }
+
+ ok := false
+ ok, _, subject, tpl = this.renderEmail(subject, tpl, token2Value)
+ if !ok {
+ return false
+ }
+
+ // 发送邮件
+ ok, _ = this.SendEmail(toUserInfo.Email, subject, tpl)
+ return ok
+}
+
+
+// 验证模板是否正确
+func (this *EmailService) ValidTpl(str string) (ok bool, msg string){
+ defer func() {
+ if err := recover(); err != nil {
+ ok = false
+ msg = fmt.Sprint(err)
+ }
+ }();
+ header := configService.GetGlobalStringConfig("emailTemplateHeader");
+ footer := configService.GetGlobalStringConfig("emailTemplateFooter");
+ str = strings.Replace(str, "{{header}}", header, -1)
+ str = strings.Replace(str, "{{footer}}", footer, -1)
+ _, err := template.New("tpl name").Parse(str)
+ if err != nil {
+ msg = fmt.Sprint(err)
+ return
+ }
+ ok = true
+ return
+}
+
+// ok, msg, subject, tpl
+func (this *EmailService) getTpl(str string) (ok bool, msg string, tpl *template.Template){
+ defer func() {
+ if err := recover(); err != nil {
+ ok = false
+ msg = fmt.Sprint(err)
+ }
+ }();
+
+ var err error
+ var has bool
+
+ if tpl, has = this.tpls[str]; !has {
+ tpl, err = template.New("tpl name").Parse(str)
+ if err != nil {
+ msg = fmt.Sprint(err)
+ return
+ }
+ this.tpls[str] = tpl
+ }
+ ok = true
+ return
+}
+
+// 通过subject, body和值得到内容
+func (this *EmailService) renderEmail(subject, body string, values map[string]interface{}) (ok bool, msg string, o string, b string) {
+ ok = false
+ msg = ""
+ defer func() { // 必须要先声明defer，否则不能捕获到panic异常
+ if err := recover(); err != nil {
+ ok = false
+ msg = fmt.Sprint(err) // 这里的err其实就是panic传入的内容，
+ }
+ }();
+
+ var tpl *template.Template
+
+ values["siteUrl"] = siteUrl;
+
+ // subject
+ if subject != "" {
+ ok, msg, tpl = this.getTpl(subject)
+ if(!ok) {
+ return
+ }
+ var buffer bytes.Buffer
+ err := tpl.Execute(&buffer, values)
+ if err != nil {
+ msg = fmt.Sprint(err)
+ return
+ }
+ o = buffer.String()
+ } else {
+ o = ""
+ }
+
+ // content
+ header := configService.GetGlobalStringConfig("emailTemplateHeader");
+ footer := configService.GetGlobalStringConfig("emailTemplateFooter");
+ body = strings.Replace(body, "{{header}}", header, -1)
+ body = strings.Replace(body, "{{footer}}", footer, -1)
+ values["subject"] = o
+ ok, msg, tpl = this.getTpl(body)
+ if(!ok) {
+ return
+ }
+ var buffer2 bytes.Buffer
+ err := tpl.Execute(&buffer2, values)
+ if err != nil {
+ msg = fmt.Sprint(err)
+ return
+ }
+ b = buffer2.String()
+
+ return
+}
+
+// 发送email给用户
+// 需要记录
+func (this *EmailService) SendEmailToUsers(users []info.User, subject, body string) (ok bool, msg string) {
+ if(users == nil || len(users) == 0) {
+ msg = "no users"
+ return
+ }
+
+ // 尝试renderHtml
+ ok, msg, _, _ = this.renderEmail(subject, body, map[string]interface{}{})
+ if(!ok) {
+ Log(msg)
+ return
+ }
+
+ go func() {
+ for _, user := range users {
+ LogJ(user)
+ m := map[string]interface{}{}
+ m["userId"] = user.UserId.Hex()
+ m["username"] = user.Username
+ m["email"] = user.Email
+ ok2, msg2, subject2, body2 := this.renderEmail(subject, body, m)
+ ok = ok2
+ msg = msg2
+ if(ok2) {
+ sendOk, msg := this.SendEmail(user.Email, subject2, body2);
+ this.AddEmailLog(user.Email, subject, body, sendOk, msg) // 把模板记录下
+ // 记录到Email Log
+ if sendOk {
+ // Log("ok " + user.Email)
+ } else {
+ // Log("no " + user.Email)
+ }
+ } else {
+ // Log(msg);
+ }
+ }
+ }()
+
+ return
+}
+
+func (this *EmailService) SendEmailToEmails(emails []string, subject, body string) (ok bool, msg string) {
+ if(emails == nil || len(emails) == 0) {
+ msg = "no emails"
+ return
+ }
+
+ // 尝试renderHtml
+ ok, msg, _, _ = this.renderEmail(subject, body, map[string]interface{}{})
+ if(!ok) {
+ Log(msg)
+ return
+ }
+
+// go func() {
+ for _, email := range emails {
+ if email == "" {
+ continue
+ }
+ m := map[string]interface{}{}
+ m["email"] = email
+ ok, msg, subject, body = this.renderEmail(subject, body, m)
+ if(ok) {
+ sendOk, msg := this.SendEmail(email, subject, body);
+ this.AddEmailLog(email, subject, body, sendOk, msg)
+ // 记录到Email Log
+ if sendOk {
+ Log("ok " + email)
+ } else {
+ Log("no " + email)
+ }
+ } else {
+ Log(msg);
+ }
+ }
+// }()
+
+ return
+}
+
+// 添加邮件日志
+func (this *EmailService) AddEmailLog(email, subject, body string, ok bool, msg string) {
+ log := info.EmailLog{LogId: bson.NewObjectId(), Email: email, Subject: subject, Body: body, Ok: ok, Msg: msg, CreatedTime: time.Now()}
+ db.Insert(db.EmailLogs, log)
+}
+// 展示邮件日志
+
+func (this *EmailService) DeleteEmails(ids []string) bool {
+ idsO := make([]bson.ObjectId, len(ids))
+ for i, id := range ids {
+ idsO[i] = bson.ObjectIdHex(id)
+ }
+ db.DeleteAll(db.EmailLogs, bson.M{"_id": bson.M{"$in": idsO}})
+
+ return true
+}
+func (this *EmailService) ListEmailLogs(pageNumber, pageSize int, sortField string, isAsc bool, email string) (page info.Page, emailLogs []info.EmailLog) {
+ emailLogs = []info.EmailLog{}
+ skipNum, sortFieldR := parsePageAndSort(pageNumber, pageSize, sortField, isAsc)
+ query := bson.M{}
+ if email != "" {
+ query["Email"] = bson.M{"$regex": bson.RegEx{".*?" + email + ".*", "i"}}
+ }
+ q := db.EmailLogs.Find(query);
+ // 总记录数
+ count, _ := q.Count()
+ // 列表
+ q.Sort(sortFieldR).
+ Skip(skipNum).
+ Limit(pageSize).
+ All(&emailLogs)
+ page = info.NewPage(pageNumber, pageSize, count, nil)
+ return
+}
\ No newline at end of file
diff --git a/app/service/NoteService.go b/app/service/NoteService.go
index 7fc2504..dd8386b 100644
--- a/app/service/NoteService.go
+++ b/app/service/NoteService.go
@@ -126,13 +126,21 @@ func (this *NoteService) AddNote(note info.Note) info.Note {
note.UpdatedUserId = note.UserId
// 设为blog
- note.IsBlog = notebookService.IsBlog(note.NotebookId.Hex())
+ notebookId := note.NotebookId.Hex()
+ note.IsBlog = notebookService.IsBlog(notebookId)
+
+ if note.IsBlog {
+ note.PublicTime = note.UpdatedTime
+ }
db.Insert(db.Notes, note)
// tag1
tagService.AddTags(note.UserId.Hex(), note.Tags)
+ // recount notebooks' notes number
+ notebookService.ReCountNotebookNumberNotes(notebookId)
+
return note
}
@@ -276,6 +284,9 @@ func (this *NoteService) UpdateTags(noteId string, userId string, tags []string)
// 2. 要判断之前是否是blog, 如果不是, 那么notebook是否是blog?
func (this *NoteService) MoveNote(noteId, notebookId, userId string) info.Note {
if notebookService.IsMyNotebook(notebookId, userId) {
+ note := this.GetNote(noteId, userId)
+ preNotebookId := note.NotebookId.Hex()
+
re := db.UpdateByIdAndUserId(db.Notes, noteId, userId,
bson.M{"$set": bson.M{"IsTrash": false,
"NotebookId": bson.ObjectIdHex(notebookId)}})
@@ -283,6 +294,13 @@ func (this *NoteService) MoveNote(noteId, notebookId, userId string) info.Note {
if re {
// 更新blog状态
this.updateToNotebookBlog(noteId, notebookId, userId)
+
+ // recount notebooks' notes number
+ notebookService.ReCountNotebookNumberNotes(notebookId)
+ // 之前不是trash才统计, trash本不在统计中的
+ if !note.IsTrash && preNotebookId != notebookId {
+ notebookService.ReCountNotebookNumberNotes(preNotebookId)
+ }
}
return this.GetNote(noteId, userId);
@@ -330,7 +348,11 @@ func (this *NoteService) CopyNote(noteId, notebookId, userId string) info.Note {
// 更新blog状态
isBlog := this.updateToNotebookBlog(note.NoteId.Hex(), notebookId, userId)
+ // recount
+ notebookService.ReCountNotebookNumberNotes(notebookId)
+
note.IsBlog = isBlog
+
return note
}
@@ -340,7 +362,7 @@ func (this *NoteService) CopyNote(noteId, notebookId, userId string) info.Note {
// 复制别人的共享笔记给我
// 将别人可用的图片转为我的图片, 复制图片
func (this *NoteService) CopySharedNote(noteId, notebookId, fromUserId, myUserId string) info.Note {
- Log(shareService.HasSharedNote(noteId, myUserId) || shareService.HasSharedNotebook(noteId, myUserId, fromUserId))
+ // Log(shareService.HasSharedNote(noteId, myUserId) || shareService.HasSharedNotebook(noteId, myUserId, fromUserId))
// 判断是否共享了给我
if notebookService.IsMyNotebook(notebookId, myUserId) &&
(shareService.HasSharedNote(noteId, myUserId) || shareService.HasSharedNotebook(noteId, myUserId, fromUserId)) {
@@ -375,6 +397,9 @@ func (this *NoteService) CopySharedNote(noteId, notebookId, fromUserId, myUserId
// 更新blog状态
isBlog := this.updateToNotebookBlog(note.NoteId.Hex(), notebookId, myUserId)
+ // recount
+ notebookService.ReCountNotebookNumberNotes(notebookId)
+
note.IsBlog = isBlog
return note
}
@@ -482,4 +507,13 @@ func (this *NoteService) SearchNoteByTags(tags []string, userId string, pageNumb
Limit(pageSize).
All(¬es)
return
+}
+
+//------------
+// 统计
+func (this *NoteService) CountNote() int {
+ return db.Count(db.Notes, bson.M{"IsTrash": false})
+}
+func (this *NoteService) CountBlog() int {
+ return db.Count(db.Notes, bson.M{"IsBlog": true, "IsTrash": false})
}
\ No newline at end of file
diff --git a/app/service/NotebookService.go b/app/service/NotebookService.go
index a00931c..a1a3774 100644
--- a/app/service/NotebookService.go
+++ b/app/service/NotebookService.go
@@ -5,7 +5,7 @@ import (
"gopkg.in/mgo.v2/bson"
"github.com/leanote/leanote/app/db"
"github.com/leanote/leanote/app/info"
-// . "github.com/leanote/leanote/app/lea"
+ . "github.com/leanote/leanote/app/lea"
"sort"
"time"
)
@@ -96,6 +96,11 @@ func (this *NotebookService) GetNotebook(notebookId, userId string) info.Noteboo
db.GetByIdAndUserId(db.Notebooks, notebookId, userId, ¬ebook)
return notebook
}
+func (this *NotebookService) GetNotebookById(notebookId string) info.Notebook {
+ notebook := info.Notebook{}
+ db.Get(db.Notebooks, notebookId, ¬ebook)
+ return notebook
+}
// 得到用户下所有的notebook
// 排序好之后返回
@@ -168,11 +173,15 @@ func (this *NotebookService) UpdateNotebook(userId, notebookId string, needUpdat
// 如果有IsBlog之类的, 需要特殊处理
if isBlog, ok := needUpdate["IsBlog"]; ok {
- // 设为blog/取消
+ // 设为blog/取消, 把它下面所有的note都设为isBlog
if is, ok2 := isBlog.(bool); ok2 {
q := bson.M{"UserId": bson.ObjectIdHex(userId),
"NotebookId": bson.ObjectIdHex(notebookId)}
- db.UpdateByQMap(db.Notes, q, bson.M{"IsBlog": is})
+ data := bson.M{"IsBlog": is}
+ if is {
+ data["PublicTime"] = time.Now()
+ }
+ db.UpdateByQMap(db.Notes, q, data)
// noteContents也更新, 这个就麻烦了, noteContents表没有NotebookId
// 先查该notebook下所有notes, 得到id
@@ -248,4 +257,27 @@ func (this *NotebookService) DragNotebooks(userId string, curNotebookId string,
}
return true
-}
\ No newline at end of file
+}
+
+// 重新统计笔记本下的笔记数目
+// noteSevice: AddNote, CopyNote, CopySharedNote, MoveNote
+// trashService: DeleteNote (recove不用, 都统一在MoveNote里了)
+func (this *NotebookService) ReCountNotebookNumberNotes(notebookId string) bool {
+ notebookIdO := bson.ObjectIdHex(notebookId)
+ count := db.Count(db.Notes, bson.M{"NotebookId": notebookIdO, "IsTrash": false})
+ Log(count)
+ Log(notebookId)
+ return db.UpdateByQField(db.Notebooks, bson.M{"_id": notebookIdO}, "NumberNotes", count)
+}
+
+func (this *NotebookService) ReCountAll() {
+ /*
+ // 得到所有笔记本
+ notebooks := []info.Notebook{}
+ db.ListByQWithFields(db.Notebooks, bson.M{}, []string{"NotebookId"}, ¬ebooks)
+
+ for _, each := range notebooks {
+ this.ReCountNotebookNumberNotes(each.NotebookId.Hex())
+ }
+ */
+}
diff --git a/app/service/PwdService.go b/app/service/PwdService.go
index 3e3f052..715b1a7 100644
--- a/app/service/PwdService.go
+++ b/app/service/PwdService.go
@@ -2,11 +2,9 @@ package service
import (
"gopkg.in/mgo.v2/bson"
- "github.com/revel/revel"
"github.com/leanote/leanote/app/db"
"github.com/leanote/leanote/app/info"
. "github.com/leanote/leanote/app/lea"
- "fmt"
)
// 找回密码
@@ -32,14 +30,7 @@ func (this *PwdService) FindPwd(email string) (ok bool, msg string) {
}
// 发送邮件
- siteUrl, _ := revel.Config.String("site.url")
- url := siteUrl + "/findPassword/" + token
- body := fmt.Sprintf("请点击链接修改密码:
%v. %v小时后过期.", url, url, int(overHours));
- if !SendEmail(email, "leanote-找回密码", "找回密码", body) {
- return false, "邮箱发送失败"
- }
-
- ok = true
+ ok, msg = emailService.FindPwdSendEmail(token, email)
return
}
diff --git a/app/service/SessionService.go b/app/service/SessionService.go
new file mode 100644
index 0000000..6156790
--- /dev/null
+++ b/app/service/SessionService.go
@@ -0,0 +1,71 @@
+package service
+
+import (
+ "github.com/leanote/leanote/app/info"
+ "github.com/leanote/leanote/app/db"
+ . "github.com/leanote/leanote/app/lea"
+ "gopkg.in/mgo.v2/bson"
+ "time"
+// "strings"
+)
+
+// Session存储到mongodb中
+type SessionService struct {
+}
+
+func (this *SessionService) Update(sessionId, key string, value interface{}) bool {
+ return db.UpdateByQMap(db.Sessions, bson.M{"SessionId": sessionId},
+ bson.M{key: value, "UpdatedTime": time.Now()})
+}
+// 注销时清空session
+func (this *SessionService) Clear(sessionId string) bool {
+ return db.Delete(db.Sessions, bson.M{"SessionId": sessionId})
+}
+func (this *SessionService) Get(sessionId string) info.Session {
+ session := info.Session{}
+ db.GetByQ(db.Sessions, bson.M{"SessionId": sessionId}, &session)
+
+ // 如果没有session, 那么插入一条之
+ if session.Id == "" {
+ session.Id = bson.NewObjectId()
+ session.SessionId = sessionId
+ session.CreatedTime = time.Now()
+ session.UpdatedTime = session.CreatedTime
+ db.Insert(db.Sessions, session)
+ }
+
+ return session
+}
+
+//------------------
+// 错误次数处理
+
+// 登录错误时间是否已超过了
+func (this *SessionService) LoginTimesIsOver(sessionId string) bool {
+ session := this.Get(sessionId)
+ return session.LoginTimes > 5
+}
+// 登录成功后清空错误次数
+func (this *SessionService) ClearLoginTimes(sessionId string) bool {
+ return this.Update(sessionId, "LoginTimes", 0)
+}
+// 增加错误次数
+func (this *SessionService) IncrLoginTimes(sessionId string) bool {
+ session := this.Get(sessionId)
+ return this.Update(sessionId, "LoginTimes", session.LoginTimes + 1)
+}
+
+//----------
+// 验证码
+func (this *SessionService) GetCaptcha(sessionId string) string {
+ session := this.Get(sessionId)
+ return session.Captcha
+}
+func (this *SessionService) SetCaptcha(sessionId, captcha string) bool {
+ this.Get(sessionId)
+ Log(sessionId)
+ Log(captcha)
+ ok := this.Update(sessionId, "Captcha", captcha)
+ Log(ok)
+ return ok
+}
diff --git a/app/service/TrashService.go b/app/service/TrashService.go
index 014e6ac..f92d756 100644
--- a/app/service/TrashService.go
+++ b/app/service/TrashService.go
@@ -28,7 +28,13 @@ func (this *TrashService) DeleteNote(noteId, userId string) bool {
// 首先删除其共享
if shareService.DeleteShareNoteAll(noteId, userId) {
// 更新note isTrash = true
- return db.UpdateByIdAndUserId(db.Notes, noteId, userId, bson.M{"$set": bson.M{"IsTrash": true}})
+ if db.UpdateByIdAndUserId(db.Notes, noteId, userId, bson.M{"$set": bson.M{"IsTrash": true}}) {
+ // recount notebooks' notes number
+ notebookIdO := noteService.GetNotebookId(noteId)
+ notebookId := notebookIdO.Hex()
+ notebookService.ReCountNotebookNumberNotes(notebookId)
+ return true
+ }
}
return false
}
diff --git a/app/service/UpgradeService.go b/app/service/UpgradeService.go
new file mode 100644
index 0000000..0f67b69
--- /dev/null
+++ b/app/service/UpgradeService.go
@@ -0,0 +1,27 @@
+package service
+
+import (
+ "github.com/leanote/leanote/app/info"
+ . "github.com/leanote/leanote/app/lea"
+ "github.com/leanote/leanote/app/db"
+ "gopkg.in/mgo.v2/bson"
+// "time"
+)
+
+
+type UpgradeService struct {
+}
+
+// 添加了PublicTime, RecommendTime
+func (this *UpgradeService) UpgradeBlog() bool {
+ notes := []info.Note{}
+ db.ListByQ(db.Notes, bson.M{"IsBlog": true}, ¬es)
+
+ // PublicTime, RecommendTime = UpdatedTime
+ for _, note := range notes {
+ db.UpdateByIdAndUserIdMap2(db.Notes, note.NoteId, note.UserId, bson.M{"PublicTime": note.UpdatedTime, "RecommendTime": note.UpdatedTime})
+ Log(note.NoteId.Hex())
+ }
+
+ return true
+}
\ No newline at end of file
diff --git a/app/service/UserService.go b/app/service/UserService.go
index 6bd59c3..760ef65 100644
--- a/app/service/UserService.go
+++ b/app/service/UserService.go
@@ -1,20 +1,17 @@
package service
import (
- "github.com/revel/revel"
"github.com/leanote/leanote/app/info"
"github.com/leanote/leanote/app/db"
. "github.com/leanote/leanote/app/lea"
"gopkg.in/mgo.v2/bson"
"time"
"strings"
- "fmt"
)
type UserService struct {
}
-
// 添加用户
func (this *UserService) AddUser(user info.User) bool {
if user.UserId == "" {
@@ -27,7 +24,9 @@ func (this *UserService) AddUser(user info.User) bool {
// 发送验证邮箱
go func() {
- this.RegisterSendActiveEmail(user.UserId.Hex(), user.Email)
+ emailService.RegisterSendActiveEmail(user, user.Email)
+ // 发送给我 life@leanote.com
+ emailService.SendEmail("life@leanote.com", "新增用户", "{header}用户名" + user.Email + "{footer}");
}();
}
@@ -69,10 +68,23 @@ func (this *UserService) GetUserInfoByAny(idEmailUsername string) info.User {
return this.GetUserInfoByUsername(idEmailUsername)
}
+func (this *UserService) setUserLogo(user *info.User) {
+ // Logo路径问题, 有些有http: 有些没有
+ if user.Logo == "" {
+ user.Logo = "images/blog/default_avatar.png"
+ }
+ if user.Logo != "" && !strings.HasPrefix(user.Logo, "http") {
+ user.Logo = strings.Trim(user.Logo, "/")
+ user.Logo = siteUrl + "/" + user.Logo
+ }
+}
+
// 得到用户信息 userId
func (this *UserService) GetUserInfo(userId string) info.User {
user := info.User{}
db.Get(db.Users, userId, &user)
+ // Logo路径问题, 有些有http: 有些没有
+ this.setUserLogo(&user)
return user
}
// 得到用户信息 email
@@ -99,29 +111,27 @@ func (this *UserService) ListUserInfosByUserIds(userIds []bson.ObjectId) []info.
db.ListByQ(db.Users, bson.M{"_id": bson.M{"$in": userIds}}, &users)
return users
}
-// 用户信息和博客设置信息
-func (this *UserService) MapUserInfoAndBlogInfosByUserIds(userIds []bson.ObjectId) map[bson.ObjectId]info.User {
+func (this *UserService) ListUserInfosByEmails(emails []string) []info.User {
+ users := []info.User{}
+ db.ListByQ(db.Users, bson.M{"Email": bson.M{"$in": emails}}, &users)
+ return users
+}
+// 用户信息即可
+func (this *UserService) MapUserInfoByUserIds(userIds []bson.ObjectId) map[bson.ObjectId]info.User {
users := []info.User{}
db.ListByQ(db.Users, bson.M{"_id": bson.M{"$in": userIds}}, &users)
- userBlogs := []info.UserBlog{}
- db.ListByQWithFields(db.UserBlogs, bson.M{"_id": bson.M{"$in": userIds}}, []string{"Logo"}, &userBlogs)
-
- userBlogMap := make(map[bson.ObjectId]info.UserBlog, len(userBlogs))
- for _, user := range userBlogs {
- userBlogMap[user.UserId] = user
- }
-
userMap := make(map[bson.ObjectId]info.User, len(users))
for _, user := range users {
- if userBlog, ok := userBlogMap[user.UserId]; ok {
- user.Logo = userBlog.Logo
- }
+ this.setUserLogo(&user)
userMap[user.UserId] = user
}
-
return userMap
}
+// 用户信息和博客设置信息
+func (this *UserService) MapUserInfoAndBlogInfosByUserIds(userIds []bson.ObjectId) map[bson.ObjectId]info.User {
+ return this.MapUserInfoByUserIds(userIds)
+}
// 通过ids得到users, 按id的顺序组织users
func (this *UserService) GetUserInfosOrderBySeq(userIds []bson.ObjectId) []info.User {
@@ -174,6 +184,12 @@ func (this *UserService) UpdateUsername(userId, username string) (bool, string)
return ok, ""
}
+// 修改头像
+func (this *UserService) UpdateAvatar(userId, avatarPath string) (bool) {
+ userIdO := bson.ObjectIdHex(userId)
+ return db.UpdateByQField(db.Users, bson.M{"_id": userIdO}, "Logo", avatarPath)
+}
+
//----------------------
// 已经登录了的用户修改密码
func (this *UserService) UpdatePwd(userId, oldPwd, pwd string) (bool, string) {
@@ -194,59 +210,6 @@ func (this *UserService) UpdateTheme(userId, theme string) (bool) {
//---------------
// 修改email
-// 发送激活邮件
-
-// AddUser调用
-// 可以使用一个goroutine
-func (this *UserService) RegisterSendActiveEmail(userId string, email string) bool {
- token := tokenService.NewToken(userId, email, info.TokenActiveEmail)
-
- if token == "" {
- return false
- }
-
- // 发送邮件
- siteUrl, _ := revel.Config.String("site.url")
- url := siteUrl + "/user/activeEmail?token=" + token
- body := fmt.Sprintf("请点击链接验证邮箱:
%v. %v小时后过期.", url, url, tokenService.GetOverHours(info.TokenActiveEmail));
- if !SendEmail(email, "leanote-验证邮箱", "验证邮箱", body) {
- return false
- }
-
- // 发送给我 life@leanote.com
- SendEmail("life@leanote.com", "新增用户", "新增用户", "用户名" + email);
-
- return true
-}
-
-// 修改邮箱
-func (this *UserService) UpdateEmailSendActiveEmail(userId, email string) (ok bool, msg string) {
- // 先验证该email是否被注册了
- if userService.IsExistsUser(email) {
- ok = false
- msg = "该邮箱已注册"
- return
- }
-
- token := tokenService.NewToken(userId, email, info.TokenUpdateEmail)
-
- if token == "" {
- return
- }
-
- // 发送邮件
- siteUrl, _ := revel.Config.String("site.url")
- url := siteUrl + "/user/updateEmail?token=" + token
- body := "邮箱验证后您的登录邮箱为:
" + email + "";
- body += fmt.Sprintf("请点击链接验证邮箱:
%v. %v小时后过期.", url, url, tokenService.GetOverHours(info.TokenUpdateEmail));
- if !SendEmail(email, "leanote-验证邮箱", "验证邮箱", body) {
- msg = "发送失败, 该邮箱存在?"
- return
- }
- ok = true
- return
-}
-
// 注册后验证邮箱
func (this *UserService) ActiveEmail(token string) (ok bool, msg, email string) {
tokenInfo := info.Token{}
@@ -308,13 +271,13 @@ func (this *UserService) ThirdAddUser(userId, email, pwd string) (ok bool, msg s
return
}
-
//------------
// 偏好设置
// 宽度
-func (this *UserService)UpdateColumnWidth(userId string, notebookWidth, noteListWidth int) bool {
- return db.UpdateByQMap(db.Users, bson.M{"_id": bson.ObjectIdHex(userId)}, bson.M{"NotebookWidth": notebookWidth, "NoteListWidth": noteListWidth})
+func (this *UserService)UpdateColumnWidth(userId string, notebookWidth, noteListWidth, mdEditorWidth int) bool {
+ return db.UpdateByQMap(db.Users, bson.M{"_id": bson.ObjectIdHex(userId)},
+ bson.M{"NotebookWidth": notebookWidth, "NoteListWidth": noteListWidth, "mdEditorWidth": mdEditorWidth})
}
// 左侧是否隐藏
func (this *UserService)UpdateLeftIsMin(userId string, leftIsMin bool) bool {
@@ -340,4 +303,48 @@ func (this *UserService) ListUsers(pageNumber, pageSize int, sortField string, i
All(&users)
page = info.NewPage(pageNumber, pageSize, count, nil)
return
-}
\ No newline at end of file
+}
+
+func (this *UserService) GetAllUserByFilter(userFilterEmail, userFilterWhiteList, userFilterBlackList string, verified bool) []info.User {
+ query := bson.M{}
+
+ if verified {
+ query["Verified"] = true
+ }
+
+ orQ := []bson.M{}
+ if userFilterEmail != "" {
+ orQ = append(orQ, bson.M{"Email": bson.M{"$regex": bson.RegEx{".*?" + userFilterEmail + ".*", "i"}}},
+ bson.M{"Username": bson.M{"$regex": bson.RegEx{".*?" + userFilterEmail + ".*", "i"}}},
+ )
+ }
+ if(userFilterWhiteList != "") {
+ userFilterWhiteList = strings.Replace(userFilterWhiteList, "\r", "", -1)
+ emails := strings.Split(userFilterWhiteList, "\n");
+ orQ = append(orQ, bson.M{"Email": bson.M{"$in": emails}})
+ }
+ if len(orQ) > 0 {
+ query["$or"] = orQ
+ }
+
+ emailQ := bson.M{}
+ if(userFilterBlackList != "") {
+ userFilterWhiteList = strings.Replace(userFilterBlackList, "\r", "", -1)
+ bEmails := strings.Split(userFilterBlackList, "\n");
+ emailQ["$nin"] = bEmails
+ query["Email"] = emailQ
+ }
+
+ LogJ(query)
+ users := []info.User{}
+ q := db.Users.Find(query);
+ q.All(&users)
+ Log(len(users))
+
+ return users
+}
+
+// 统计
+func (this *UserService) CountUser() int {
+ return db.Count(db.Users, bson.M{})
+}
diff --git a/app/service/init.go b/app/service/init.go
index c9ea2c3..01fdbe9 100644
--- a/app/service/init.go
+++ b/app/service/init.go
@@ -1,7 +1,7 @@
package service
import (
-
+ "github.com/revel/revel"
)
// init service, for share service bettween services
@@ -24,7 +24,12 @@ var attachService, AttachS *AttachService
var configService, ConfigS *ConfigService
var PwdS *PwdService
var SuggestionS *SuggestionService
+var emailService, EmailS *EmailService
var AuthS *AuthService
+var UpgradeS *UpgradeService
+var SessionS, sessionService *SessionService
+
+var siteUrl string
// onAppStart调用
func InitService() {
@@ -45,6 +50,9 @@ func InitService() {
PwdS = &PwdService{}
SuggestionS = &SuggestionService{}
AuthS = &AuthService{}
+ EmailS = NewEmailService()
+ UpgradeS = &UpgradeService{}
+ SessionS = &SessionService{}
notebookService = NotebookS
noteService = NoteS
@@ -60,4 +68,9 @@ func InitService() {
albumService = AlbumS
attachService = AttachS
configService = ConfigS
+ emailService = EmailS
+ sessionService = SessionS
+
+ //
+ siteUrl, _ = revel.Config.String("site.url")
}
\ No newline at end of file
diff --git a/app/test/TestNoteService.go b/app/test/TestNoteService.go
index 3d3e15f..2412fa6 100644
--- a/app/test/TestNoteService.go
+++ b/app/test/TestNoteService.go
@@ -189,7 +189,8 @@ func testLea() {
func main() {
revel.BasePath = "/Users/life/Documents/Go/package/src/leanote"
- testLea();
+ // testLea();
+
// a, b := SplitFilename("http://ab/c/a.gif#??")
// println(a)
// println(b)
diff --git a/app/views/Admin/Blog/list.html b/app/views/Admin/Blog/list.html
index ba7e19c..6f8969b 100644
--- a/app/views/Admin/Blog/list.html
+++ b/app/views/Admin/Blog/list.html
@@ -4,22 +4,11 @@
-
+
@@ -62,16 +51,7 @@
-
- isRecommend
-
-
-
-
-
- |
+
@@ -82,8 +62,6 @@
|
-
- |
@@ -100,21 +78,9 @@
{{.User.Username}}
-
-
- |
{{.CreatedTime|datetime}}
|
-
- Send Email
- |
{{end}}
@@ -123,22 +89,11 @@