活跃用户铜币奖励

zhima1234 · zhima1234 · commit a80ddbb06c09 · 2017-06-16T11:16:28.000+08:00
diff --git a/data/programming.txt b/data/programming.txt
@@ -51,6 +51,7 @@ vscode 3 n
 eclipse 3 n
 docker 3 n
 dockerfile 3 n
+kubernetes 3 n
 goroot 3 n
 etcd 3 n
 consul 3 n
diff --git a/src/logic/rank.go b/src/logic/rank.go
@@ -119,11 +119,17 @@ func (self RankLogic) FindMonthRank(ctx context.Context, objtype, num int, needE
 	return self.findModelsByRank(resultSlice, objtype, num, needExt...)
 }
 
-func (self RankLogic) FindDAURank(ctx context.Context, num int) []*model.User {
+// FindDAURank DAU 排名，默认获取当天的
+func (self RankLogic) FindDAURank(ctx context.Context, num int, ymds ...string) []*model.User {
 	objLog := GetLogger(ctx)
 
+	ymd := times.Format("ymd")
+	if len(ymds) > 0 {
+		ymd = ymds[0]
+	}
+
 	redisClient := nosql.NewRedisClient()
-	key := self.getDAURankKey(times.Format("ymd"))
+	key := self.getDAURankKey(ymd)
 	resultSlice, err := redisClient.ZREVRANGE(key, 0, num-1, true)
 	redisClient.Close()
 	if err != nil {
diff --git a/src/logic/user_rich.go b/src/logic/user_rich.go
@@ -10,20 +10,80 @@ import (
 	"errors"
 	"fmt"
 	"model"
+	"time"
+	"util"
 
 	. "db"
 
+	"github.com/garyburd/redigo/redis"
 	"github.com/go-xorm/xorm"
 	"github.com/polaris1119/logger"
+	"github.com/polaris1119/nosql"
+	"github.com/polaris1119/times"
 	"golang.org/x/net/context"
 )
 
+var (
+	beginAwardWeight = 50
+)
+
 type UserRichLogic struct{}
 
 var DefaultUserRich = UserRichLogic{}
 
-func (self UserRichLogic) Add(ctx context.Context) error {
-	return nil
+func (self UserRichLogic) AwardCooper() {
+	redisClient := nosql.NewRedisClient()
+	defer redisClient.Close()
+	ymd := times.Format("ymd", time.Now().Add(-86400*time.Second))
+	key := DefaultRank.getDAURankKey(ymd)
+
+	var (
+		cursor      uint64
+		err         error
+		resultSlice []interface{}
+		count       = 20
+	)
+
+	for {
+		cursor, resultSlice, err = redisClient.ZSCAN(key, cursor, "COUNT", count)
+		if err != nil {
+			logger.Errorln("AwardCooper ZSCAN error:", err)
+			break
+		}
+
+		for len(resultSlice) > 0 {
+			var (
+				uid, weight int
+				err         error
+			)
+			resultSlice, err = redis.Scan(resultSlice, &uid, &weight)
+			if err != nil {
+				logger.Errorln("AwardCooper redis Scan error:", err)
+				continue
+			}
+
+			if weight < beginAwardWeight {
+				continue
+			}
+
+			award := util.Max((weight-500)*5, 0) +
+				util.UMin((weight-400), 100)*4 +
+				util.UMin((weight-300), 100)*3 +
+				util.UMin((weight-200), 100)*2 +
+				util.UMin((weight-100), 100) +
+				int(float64(util.UMin((weight-beginAwardWeight), beginAwardWeight))*0.5)
+
+			userRank := redisClient.ZREVRANK(key, uid)
+			desc := fmt.Sprintf("%s 的活跃度为 %d，排名第 %d，奖励 %d 铜币", ymd, weight, userRank, award)
+			fmt.Println(uid, desc)
+			user := DefaultUser.FindOne(nil, "uid", uid)
+			self.IncrUserRich(user, model.MissionTypeActive, award, desc)
+		}
+
+		if cursor == 0 {
+			break
+		}
+	}
 }
 
 // IncrUserRich 增加或减少用户财富
@@ -33,8 +93,9 @@ func (self UserRichLogic) IncrUserRich(user *model.User, typ, award int, desc st
 		err   error
 	)
 
-	if award > 0 && typ == model.MissionTypeReplied {
+	if award > 0 && (typ == model.MissionTypeReplied || typ == model.MissionTypeActive) {
 		// 老用户，因为之前的主题被人回复而增加财富，自动帮其领取初始资本
+		// 因为活跃奖励铜币，自动帮其领取初始资本
 		total, err = MasterDB.Where("uid=?", user.Uid).Count(new(model.UserBalanceDetail))
 		if err != nil {
 			logger.Errorln("IncrUserRich count error:", err)
diff --git a/src/logic/user_rich_test.go b/src/logic/user_rich_test.go
@@ -0,0 +1,7 @@
+package logic_test
+
+import "testing"
+
+func TestAwardCooper(t *testing.T) {
+	// logic.DefaultUserRich.AwardCooper()
+}
diff --git a/src/model/mission.go b/src/model/mission.go
@@ -27,6 +27,8 @@ const (
 	MissionTypeReplied = 70
 	// 额外奖励
 	MissionTypeAward = 80
+	// 活跃奖励
+	MissionTypeActive = 81
 )
 
 const (
diff --git a/src/model/user_rich.go b/src/model/user_rich.go
@@ -24,6 +24,7 @@ var BalanceTypeMap = map[int]string{
 	MissionTypeProject:  "发布项目",
 	MissionTypeBook:     "分享图书",
 	MissionTypeReplied:  "回复收益",
+	MissionTypeActive:   "活跃奖励",
 }
 
 type UserBalanceDetail struct {
diff --git a/src/server/studygolang/background.go b/src/server/studygolang/background.go
@@ -59,6 +59,9 @@ func ServeBackGround() {
 			// 给用户发邮件，如通知网站最近的动态，每周的晨读汇总等
 			c.AddFunc("0 0 4 * * 1", logic.DefaultEmail.EmailNotice)
 		}
+
+		// 每天对活跃用户奖励铜币
+		c.AddFunc("@daily", logic.DefaultUserRich.AwardCooper)
 	}
 
 	// 两分钟刷一次浏览数（TODO：重启丢失问题？信号控制重启？）
diff --git a/src/util/tool.go b/src/util/tool.go
@@ -9,6 +9,7 @@ package util
 import (
 	"fmt"
 	"global"
+	"math"
 	"regexp"
 	"strings"
 
@@ -34,6 +35,18 @@ func Gravatar(avatar string, emailI interface{}, size uint16, isHttps bool) stri
 	return fmt.Sprintf("%s/avatar/%s?s=%d", gravatarDomain, goutils.Md5(email), size)
 }
 
+func Max(x, y int) int {
+	return int(math.Max(float64(x), float64(y)))
+}
+
+// 最小值，但不会小于0
+func UMin(x, y int) int {
+	if x < 0 || y < 0 {
+		return 0
+	}
+	return int(math.Min(float64(x), float64(y)))
+}
+
 // 内嵌 Wide iframe 版
 func EmbedWide(content string) string {
 	if !strings.Contains(content, "&lt;iframe") {
diff --git a/template/common/layout.html b/template/common/layout.html
@@ -98,6 +98,7 @@
 							<li class="first"><a href="/user/{{.me.Username}}">我的主页</a></li>
 							<li><a href="/account/edit">个人资料设置</a></li>
 							<li><a href="/favorites/{{.me.Username}}">我的收藏</a></li>
+							<li><a href="/balance">我的财富</a></li>
 							<li role="presentation" class="divider"></li>
 							{{if .me.IsAdmin}}
 							<li><a href="/admin" target="_blank">管理后台</a></li>
diff --git a/template/common/my_info.html b/template/common/my_info.html
@@ -5,8 +5,9 @@
 			<span class="avatar"><a href="/account/edit#change-avatar"><img alt="个人首页" width="80" height="80" src="{{gravatar .me.Avatar .me.Email 80 .is_https}}" class="img-circle tool-tip" data-toggle="tooltip" data-placement="left" title="更换头像"></a></span>
 		</div>
 		<div class="profile-show pull-left">
-			<p></p>
-			<p class="user-name"><a href="/user/{{.me.Username}}">{{.me.Username}}</a></p>
+			<div class="user-name"><a href="/user/{{.me.Username}}">{{.me.Username}}</a></div>
+			<small class="f12 cc">{{.me.Monlog}}</small>
+			<div class="sep5"></div>
 			<p><a href="/account/edit">个人资料设置</a></p>
 		</div>
 	</div>
@@ -19,7 +20,13 @@
 		<a class="btn btn-default btn-sm" href="/resources/new">分享资源</a>&nbsp;
 	</div>
 	<div class="inner_content">
-		<a class="pull-left" href="/message/system" style="margin-left: 10px">{{.me.MsgNum}} 条未读消息</a>
+		<a class="pull-left" href="/message/system" style="margin-left: 10px">
+			{{if .me.MsgNum}}
+			<strong>{{.me.MsgNum}} 条未读消息</strong>
+			{{else}}
+			{{.me.MsgNum}} 条未读消息
+			{{end}}
+		</a>
 		<div style="text-align: right; margin-right: 20px;">
 			<a href="/balance" class="balance_area">
 				{{if .me.Gold}}
diff --git a/template/resources/detail.html b/template/resources/detail.html
@@ -32,7 +32,7 @@ <h1>
 				<div class="outdated">这是一个分享于 <span title="{{.resource.ctime}}" class="timeago"></span> 的资源，其中的信息可能已经有所发展或是发生改变。</div>
 				{{end}}
 				<div class="cell">
-					<div class="content">{{if eq .resource.form "只是链接"}}传送门： {{.resource.url}}{{else}}{{.resource.content}}{{end}}</div>
+					<div class="content">{{if eq .resource.form "只是链接"}}传送门： {{if hasPrefix .resource.url "/r/golang/"}}https://reddit.com{{end}}{{.resource.url}}{{else}}{{.resource.content}}{{end}}</div>
 				</div>
 				
 				<div class="content-buttons">

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,8 @@ const (`
`27`	`27`	`MissionTypeReplied = 70`
`28`	`28`	`// 额外奖励`
`29`	`29`	`MissionTypeAward = 80`
	`30`	`+ // 活跃奖励`
	`31`	`+ MissionTypeActive = 81`
`30`	`32`	`)`
`31`	`33`
`32`	`34`	`const (`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ var BalanceTypeMap = map[int]string{`
`24`	`24`	`MissionTypeProject: "发布项目",`
`25`	`25`	`MissionTypeBook: "分享图书",`
`26`	`26`	`MissionTypeReplied: "回复收益",`
	`27`	`+ MissionTypeActive: "活跃奖励",`
`27`	`28`	`}`
`28`	`29`
`29`	`30`	`type UserBalanceDetail struct {`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,9 @@ func ServeBackGround() {`
`59`	`59`	`// 给用户发邮件，如通知网站最近的动态，每周的晨读汇总等`
`60`	`60`	`c.AddFunc("0 0 4 * * 1", logic.DefaultEmail.EmailNotice)`
`61`	`61`	`}`
	`62`	`+`
	`63`	`+ // 每天对活跃用户奖励铜币`
	`64`	`+ c.AddFunc("@daily", logic.DefaultUserRich.AwardCooper)`
`62`	`65`	`}`
`63`	`66`
`64`	`67`	`// 两分钟刷一次浏览数（TODO：重启丢失问题？信号控制重启？）`