Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw

back_recharge
lvxinran 2020-09-15 18:49:27 +08:00
commit 7b33db16df
4 changed files with 7 additions and 4 deletions

View File

@ -176,7 +176,7 @@ public class HandlerLogicThread extends Thread{
//内部codeErr统一处理
if(e instanceof ErrorCodeException){
int errCode = ErrorUtil.getExceptionErrorCodeValue(e);
LOGGER.error("\nAn unusual ErrorCodeException occurred for the user::use"+ session.getUid());
LOGGER.error("An unusual ErrorCodeException occurred for the user::use"+ session.getUid());
if (errCode <= 0) {
//打印堆栈定位错误
LOGGER.error(ErrorUtil.getExceptionStackTraceFileLineAndMethod(e));

View File

@ -53,8 +53,8 @@ public abstract class BaseHandler<T extends GeneratedMessage> {
} catch(NoSuchFieldException|SecurityException|IllegalAccessException|IllegalArgumentException|ExceptionInInitializerError|InvalidProtocolBufferException var5){
throw new LogicException("解析协议失败",var5);
}catch (Exception var4) {
if(null !=proto){
LOGGER.error("processWithProtoException\r\nprotoID:"+netData.getMsgId()+"\r\nuid"+netData.getUserId()+"\r\n"+proto.toString());
if (null != proto) {
LOGGER.error("processWithProto Exception protoID={},uid={},proto=>{}", netData.getMsgId(), netData.getUserId(), proto.toString());
}
throw var4;
}

View File

@ -117,7 +117,7 @@ public class LoginRequestHandler extends BaseHandler<PlayerInfoProto.LoginReques
// }
// }
LOGGER.info("the uid={},the pid={},the gid={},",userId,pid,gid);
LOGGER.info("LOGIN_REQUEST the uid={},the pid={},the gid={},",userId,pid,gid);
//登陆注册入内存
String openIdFront = loginRequest.getOpenId();
String[] split = openIdFront.split("\\.");

View File

@ -192,6 +192,9 @@ public class HeroLogic{
int uid = session.getUid();
User user = UserManager.getUser(uid);
SLotterySetting sLotterySetting = STableManager.getConfig(SLotterySetting.class).get(type);
if (sLotterySetting == null) {
throw new ErrorCodeException(ErrorCode.ACTIVITY_NOT_OPEN);
}
int perCount = sLotterySetting.getPerCount();
int maxTimes = sLotterySetting.getMaxTimes();
if(maxTimes!=0 && !PlayerLogic.getInstance().checkAndUpdate(user,maxTimes, perCount)){