Merge pull request '修复积分bug' (#2889) from point-v2 into V20220926

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2889
Reviewed-by: zouap <zouap@pcl.ac.cn>

services/reward/serial.go

@@ -11,7 +11,7 @@ import (
 
 func GetSerialNoByRedis() (string, error) {
 	now := time.Now()
-	r := int64(rand.Intn(4)) + 1
+	r := int64(rand.Intn(3)) + 1
 	n, err := redis_client.IncrBy(redis_key.RewardSerialCounter(now), r)
 	if err != nil {
 		log.Error("GetSerialNoByRedis RewardSerialCounter error. %v", err)
@@ -20,5 +20,9 @@ func GetSerialNoByRedis() (string, error) {
 	if n == r {
 		redis_client.Expire(redis_key.RewardSerialCounter(now), 2*time.Minute)
 	}
+	//when the counter n exceeds 1000, the length of the serial number will become longer
+	if n >= 1000 {
+		return now.Format("200601021504") + fmt.Sprintf("%d", n) + fmt.Sprint(rand.Intn(10)), nil
+	}
 	return now.Format("200601021504") + fmt.Sprintf("%03d", n) + fmt.Sprint(rand.Intn(10)), nil
 }

templates/base/footer_content.tmpl

@@ -20,7 +20,7 @@
 					<div class="column ui vertical text menu">
 						<div class="header item">{{.i18n.Tr "custom.foot.help"}}</div>
 						<div class="ui language bottom floating slide up dropdown link item">
-							<i class="world icon"></i>
+							<i class="globe icon"></i>
 							<div class="text">{{.LangName}}</div>
 							<div class="menu">
 								{{range .AllLangs}}
@@ -29,12 +29,12 @@
 							</div>
 						</div>
 
-						<a href="https://git.openi.org.cn/zeizei/OpenI_Learning" class=" item a_margin" target="_blank"><i class="ri-creative-commons-by-line footer_icon" ></i><p class="footer_icon">{{.i18n.Tr "custom.Platform_Tutorial"}}</p> </a>
-						{{if .EnableSwagger}}<a href="/api/swagger" class=" item a_margin"><i class="ri-exchange-line footer_icon" > </i><p class="footer_icon">API</p> </a>{{end}}
+						<a href="https://git.openi.org.cn/zeizei/OpenI_Learning" class="item" target="_blank"><i class="compass icon" ></i> {{.i18n.Tr "custom.Platform_Tutorial"}}</a>
+						{{if .EnableSwagger}}<a href="/api/swagger" class="item"><i class="plug icon"></i> API</a>{{end}}
 						{{if .IsSigned}}
-							<a href="https://git.openi.org.cn/zeizei/OpenI_Learning/issues/new" class=" item a_margin" target="_blank"><i class="ri-mail-send-line footer_icon"></i><p class="footer_icon">{{.i18n.Tr "custom.foot.advice_feedback"}}</p></a>
+							<a href="https://git.openi.org.cn/zeizei/OpenI_Learning/issues/new" class="item" target="_blank"><i class="envelope icon"></i> {{.i18n.Tr "custom.foot.advice_feedback"}}</a>
 						{{else}}
-							<a href="{{AppSubUrl}}/user/login" class=" item a_margin" ><i class="ri-mail-send-line footer_icon"  ></i><p class="footer_icon">{{.i18n.Tr "custom.foot.advice_feedback"}}</p></a>
+							<a href="{{AppSubUrl}}/user/login" class="item"><i class="envelope icon"></i> {{.i18n.Tr "custom.foot.advice_feedback"}}</a>
 						{{end}}
 
 						{{template "custom/extra_links_footer" .}}

templates/base/footer_content_fluid.tmpl

@@ -18,7 +18,7 @@
 					<div class="column ui vertical text menu">
 						<div class="header item">{{.i18n.Tr "custom.foot.help"}}</div>
 						<div class="ui language bottom floating slide up dropdown link item">
-							<i class="world icon"></i>
+							<i class="globe icon"></i>
 							<div class="text">{{.LangName}}</div>
 							<div class="menu">
 								{{range .AllLangs}}
@@ -26,12 +26,12 @@
 								{{end}}
 							</div>
 						</div>
-						<a href="https://git.openi.org.cn/zeizei/OpenI_Learning" class=" item a_margin" target="_blank"><i class="ri-creative-commons-by-line footer_icon" ></i><p class="footer_icon">{{.i18n.Tr "custom.Platform_Tutorial"}}</p> </a>
-						{{if .EnableSwagger}}<a href="/api/swagger" class=" item a_margin"><i class="ri-exchange-line footer_icon" > </i><p class="footer_icon">API</p> </a>{{end}}
+						<a href="https://git.openi.org.cn/zeizei/OpenI_Learning" class="item" target="_blank"><i class="compass icon"></i> {{.i18n.Tr "custom.Platform_Tutorial"}} </a>
+						{{if .EnableSwagger}}<a href="/api/swagger" class="item"><i class="plug icon" ></i> API</a>{{end}}
 						{{if .IsSigned}}
-							<a href="https://git.openi.org.cn/zeizei/OpenI_Learning/issues/new" class=" item a_margin" target="_blank"><i class="ri-mail-send-line footer_icon"></i><p class="footer_icon">{{.i18n.Tr "custom.foot.advice_feedback"}}</p></a>
+							<a href="https://git.openi.org.cn/zeizei/OpenI_Learning/issues/new" class="item" target="_blank"><i class="envelope icon"></i> {{.i18n.Tr "custom.foot.advice_feedback"}}</a>
 						{{else}}
-							<a href="{{AppSubUrl}}/user/login" class=" item a_margin" ><i class="ri-mail-send-line footer_icon"  ></i><p class="footer_icon footer_icon">{{.i18n.Tr "custom.foot.advice_feedback"}}</p></a>
+							<a href="{{AppSubUrl}}/user/login" class="item"><i class="envelope icon"></i> {{.i18n.Tr "custom.foot.advice_feedback"}}</a>
 						{{end}}
 						{{template "custom/extra_links_footer" .}}
 					</div>