generated from root/miduo_server
Merge branch 'master' of http://60.1.1.230/backend/jieling_loginserver
commit
31d4182c47
|
@ -65,7 +65,6 @@ public class GetUserController extends HttpServlet {
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
String banInfo = BaseGlobal.getInstance().redisApp.get(RedisKey.Ban_Open_Id, openId, String.class, -1);
|
String banInfo = BaseGlobal.getInstance().redisApp.get(RedisKey.Ban_Open_Id, openId, String.class, -1);
|
||||||
LOGGER.info("doGet Ban_Open_Id=>{} openId=>{} banInfo==null ? {}", RedisKey.Ban_Open_Id, openId, banInfo==null ? null : banInfo);
|
|
||||||
if (banInfo != null) {
|
if (banInfo != null) {
|
||||||
String[] split = banInfo.split("\\|");
|
String[] split = banInfo.split("\\|");
|
||||||
long currentTimeMillis = System.currentTimeMillis();
|
long currentTimeMillis = System.currentTimeMillis();
|
||||||
|
@ -81,7 +80,6 @@ public class GetUserController extends HttpServlet {
|
||||||
return;
|
return;
|
||||||
} else {
|
} else {
|
||||||
BaseGlobal.getInstance().redisApp.del(RedisKey.Ban_Open_Id, openId);
|
BaseGlobal.getInstance().redisApp.del(RedisKey.Ban_Open_Id, openId);
|
||||||
LOGGER.info("doGet del Ban_Open_Id=>{} openId=>{} banInfo==null ? {}", RedisKey.Ban_Open_Id, openId, banInfo==null ? null : banInfo);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
@ -91,7 +89,6 @@ public class GetUserController extends HttpServlet {
|
||||||
if (version == null) {
|
if (version == null) {
|
||||||
version="未知版本号";
|
version="未知版本号";
|
||||||
}
|
}
|
||||||
LOGGER.info("the opendId = {},isTestLan={},version{}",openId,isTestLan,version);
|
|
||||||
String serverId = request.getParameter("serverId");
|
String serverId = request.getParameter("serverId");
|
||||||
if (serverId == null || serverId.isEmpty()) {
|
if (serverId == null || serverId.isEmpty()) {
|
||||||
response.sendError(400, "serverId is empety");
|
response.sendError(400, "serverId is empety");
|
||||||
|
@ -153,7 +150,6 @@ public class GetUserController extends HttpServlet {
|
||||||
res.put("uid", uid);
|
res.put("uid", uid);
|
||||||
res.put("token", utoken);
|
res.put("token", utoken);
|
||||||
res.put("errorCode", 0);
|
res.put("errorCode", 0);
|
||||||
LOGGER.info("=======================>openId=>{} uid=>{} token=>{}", openId, uid, token);
|
|
||||||
BaseGlobal.getInstance().redisApp.set(RedisKey.TOKEN, String.valueOf(uid), utoken, -1, false);
|
BaseGlobal.getInstance().redisApp.set(RedisKey.TOKEN, String.valueOf(uid), utoken, -1, false);
|
||||||
BaseGlobal.getInstance().redisApp.set(RedisKey.PIDGIDTEMP, String.valueOf(uid), pid+"#"+gid, -1, false);
|
BaseGlobal.getInstance().redisApp.set(RedisKey.PIDGIDTEMP, String.valueOf(uid), pid+"#"+gid, -1, false);
|
||||||
|
|
||||||
|
|
|
@ -67,7 +67,6 @@ public class UserLoginController extends HttpServlet {
|
||||||
parms.put("openId",one.get("openId").toString());
|
parms.put("openId",one.get("openId").toString());
|
||||||
int token = new Random().nextInt(1024) +10000;
|
int token = new Random().nextInt(1024) +10000;
|
||||||
parms.put("token",Integer.toString(token));
|
parms.put("token",Integer.toString(token));
|
||||||
LOGGER.info("UserLoginController openId=>{},token=>{}", openId, token);
|
|
||||||
BaseGlobal.getInstance().redisApp.set(RedisKey.LOGIN_TOKEN,openId,token,-1, false);
|
BaseGlobal.getInstance().redisApp.set(RedisKey.LOGIN_TOKEN,openId,token,-1, false);
|
||||||
resMsg.setCode(0);
|
resMsg.setCode(0);
|
||||||
resMsg.setMsg(returnMsg);
|
resMsg.setMsg(returnMsg);
|
||||||
|
|
Loading…
Reference in New Issue