Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
550ce57411
|
@ -103,4 +103,8 @@ public class LjsdMongoTemplate {
|
||||||
public Object convertToMongoType(Object obj){
|
public Object convertToMongoType(Object obj){
|
||||||
return this.mongoTemplate.getConverter().convertToMongoType(obj);
|
return this.mongoTemplate.getConverter().convertToMongoType(obj);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public MongoTemplate getMongoTemplate() {
|
||||||
|
return mongoTemplate;
|
||||||
|
}
|
||||||
}
|
}
|
|
@ -13,6 +13,7 @@ import com.ljsd.jieling.logic.GlobalDataManaager;
|
||||||
import com.ljsd.jieling.logic.activity.ActivityLogic;
|
import com.ljsd.jieling.logic.activity.ActivityLogic;
|
||||||
import com.ljsd.jieling.logic.dao.GuilidManager;
|
import com.ljsd.jieling.logic.dao.GuilidManager;
|
||||||
import com.ljsd.jieling.logic.dao.MailingSystemManager;
|
import com.ljsd.jieling.logic.dao.MailingSystemManager;
|
||||||
|
import com.ljsd.jieling.logic.dao.root.User;
|
||||||
import com.ljsd.jieling.logic.hero.HeroLogic;
|
import com.ljsd.jieling.logic.hero.HeroLogic;
|
||||||
import com.ljsd.jieling.network.server.ProtocolsManager;
|
import com.ljsd.jieling.network.server.ProtocolsManager;
|
||||||
import com.ljsd.jieling.thread.ThreadManager;
|
import com.ljsd.jieling.thread.ThreadManager;
|
||||||
|
@ -48,6 +49,7 @@ public class GameLogicService implements IService {
|
||||||
public void init() throws Exception {
|
public void init() throws Exception {
|
||||||
RedisUtil.getInstence().init();
|
RedisUtil.getInstence().init();
|
||||||
MongoUtil.getInstence().init();
|
MongoUtil.getInstence().init();
|
||||||
|
MongoUtil.getLjsdMongoTemplate().getMongoTemplate().getCollection(User.getCollectionName()).createIndex("playerManager.level");
|
||||||
registerServerInfoToRedis();
|
registerServerInfoToRedis();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -347,6 +347,7 @@ public class GlobalDataManaager implements IManager {
|
||||||
if (TimeUtils.isOverTime(0,user.getPlayerInfoManager().getLoginTime())) {
|
if (TimeUtils.isOverTime(0,user.getPlayerInfoManager().getLoginTime())) {
|
||||||
flushGoodsTimes(user);
|
flushGoodsTimes(user);
|
||||||
}
|
}
|
||||||
|
user.getPlayerInfoManager().setLoginTime(TimeUtils.now());
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -44,8 +44,13 @@ public class MainLevelRank extends AbstractRank {
|
||||||
}
|
}
|
||||||
return o1.getRankInfo().getRank()-o2.getRankInfo().getRank();
|
return o1.getRankInfo().getRank()-o2.getRankInfo().getRank();
|
||||||
});
|
});
|
||||||
|
List<CommonProto.UserRank> buildersCopy = new ArrayList<>(ranksBuilderList.size());
|
||||||
|
for(CommonProto.UserRank userRank : builders){
|
||||||
|
buildersCopy.add(userRank.toBuilder().setRankInfo(userRank.toBuilder().getRankInfo().toBuilder().setRank(start).build()).build());
|
||||||
|
start++;
|
||||||
|
}
|
||||||
PlayerInfoProto.RankResponse.Builder response = PlayerInfoProto.RankResponse.newBuilder();
|
PlayerInfoProto.RankResponse.Builder response = PlayerInfoProto.RankResponse.newBuilder();
|
||||||
response.setMyRankInfo(allUserResponse.getMyRankInfo()).addAllRanks(builders);
|
response.setMyRankInfo(allUserResponse.getMyRankInfo()).addAllRanks(buildersCopy);
|
||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -37,7 +37,7 @@ public class MessageUtil {
|
||||||
backMessage = new byte[0];
|
backMessage = new byte[0];
|
||||||
} else {
|
} else {
|
||||||
backMessage = generatedMessage.toByteArray();
|
backMessage = generatedMessage.toByteArray();
|
||||||
LOGGER.info(JsonFormat.printToString(generatedMessage));
|
// LOGGER.info(JsonFormat.printToString(generatedMessage));
|
||||||
}
|
}
|
||||||
|
|
||||||
int length = PackageConstant.UID_FIELD_LEN + PackageConstant.TOKEN_LEN
|
int length = PackageConstant.UID_FIELD_LEN + PackageConstant.TOKEN_LEN
|
||||||
|
|
Loading…
Reference in New Issue