f6312d7a by joe

no message

1 parent 62c2201e
......@@ -59,12 +59,12 @@ public class ScoreLogInfoController {
if (scoreLogInfo.getScore() > 30000) {
return null;
}
System.out.println("sign ---------------->"+sign);
System.out.println("score ---------------->"+scoreLogInfo.getScore());
System.out.println("signTime ---------------->"+signTime);
System.out.println("sign ---------------->" + sign);
System.out.println("score ---------------->" + scoreLogInfo.getScore());
System.out.println("signTime ---------------->" + signTime);
String forSign = MD5Utils.hash(keySecret + scoreLogInfo.getScore() + keySecret + signTime);
System.out.println("system sign ---------------->"+forSign);
System.out.println("system sign ---------------->" + forSign);
if (!forSign.equals(sign)) {
return null;
}
......@@ -124,6 +124,8 @@ public class ScoreLogInfoController {
ConfigInfo configInfo = configInfoMapper.get();
Long maxTime = configInfo.getMaxTime();
long lastTime = maxTime - l + s;
if (lastTime < 0)
lastTime = 0;
return builder.success(true).code("2000").content(lastTime).create();
}
......
......@@ -31,7 +31,7 @@
select(@i:= @i+ 1) r,
a.*
from(
select openid, min(score) score, count(*) num, min(nickname) nickname, min(headimgurl) nickname
select openid, min(score) score, count(*) num, min(nickname) nickname, min(headimgurl) headimgurl
from t_kmr_score_log_info
where status= 1
GROUP BY openid) a,
......@@ -46,7 +46,7 @@
from(
select(@i:= @i+ 1) r, a.*
from(
select openid, min(score) score, count(*) num, min(nickname) nickname, min(headimgurl) nickname
select openid, min(score) score, count(*) num, min(nickname) nickname, min(headimgurl) headimgurl
from t_kmr_score_log_info
where status= 1
GROUP BY openid) a,(
......