更新发货机

master
mashiyu 2018-06-27 20:51:54 +08:00
parent 067aea691f
commit a76b9aa248
5 changed files with 11 additions and 693 deletions

View File

@ -2,7 +2,6 @@ package com.jmfy.controller;
import com.jmfy.dto.CUserDao;
import com.jmfy.dto.JsonResult;
import com.jmfy.model.CUser;
import com.jmfy.thrift.idl.RPCRequestIFace;
import com.jmfy.thrift.idl.Result;
import com.jmfy.thrift.pool.ClientAdapterPo;
@ -72,14 +71,14 @@ public class IAPManagerController {
}
LOGGER.info("checkSign Success !!! ");
CUser cUser = cuserDao.findUserInfo(gameServer,userId);
LOGGER.info("cUser : "+ cUser.toString());
String userAddress = cuserDao.findUserInfo(gameServer,userId);
LOGGER.info("userAddress : "+ userAddress);
String ip;
String port;
//TODO RPC 发货
Result result = null;
if (cUser != null){
String[] split = cUser.getCoreAddress().split(":");
if (userAddress != null){
String[] split = userAddress.split(":");
ip = split[0];
port = split[1];

View File

@ -2,7 +2,6 @@ package com.jmfy.controller;
import com.jmfy.dto.CUserDao;
import com.jmfy.dto.JsonResult;
import com.jmfy.model.CUser;
import com.jmfy.thrift.idl.RPCRequestIFace;
import com.jmfy.thrift.idl.Result;
import com.jmfy.thrift.pool.ClientAdapterPo;
@ -89,14 +88,14 @@ public class ManagerController {
}
LOGGER.info("checkSign Success !!! ");
CUser cUser = cuserDao.findUserInfo(gameServer,userId);
LOGGER.info("cUser : "+ cUser.toString());
String userAddress = cuserDao.findUserInfo(gameServer,userId);
LOGGER.info("userAddress : "+ userAddress);
String ip;
String port;
//TODO RPC 发货
Result result = null;
if (cUser != null){
String[] split = cUser.getCoreAddress().split(":");
if (userAddress != null){
String[] split = userAddress.split(":");
ip = split[0];
port = split[1];

View File

@ -1,8 +1,6 @@
package com.jmfy.dto;
import com.jmfy.model.CUser;
public interface CUserDao {
CUser findUserInfo(int serverId, int userId);
String findUserInfo(int serverId, int userId);
}

View File

@ -1,15 +1,13 @@
package com.jmfy.dto.impl;
import com.jmfy.dto.CUserDao;
import com.jmfy.model.CUser;
import com.jmfy.util.RedisUtil;
import org.springframework.stereotype.Component;
@Component
public class CUserDaoImpl implements CUserDao {
@Override
public CUser findUserInfo(int serverId, int userId) {
CUser cUser= RedisUtil.getInstence().getObject(serverId + ":CUser_Key", Integer.toString(userId), CUser.class, 3600 * 24 * 7);
return cUser;
public String findUserInfo(int serverId, int userId) {
return RedisUtil.getInstence().getObject(serverId+":CUser_ServerInfo", Integer.toString(userId),String.class, -1);
}
}

View File

@ -1,676 +0,0 @@
package com.jmfy.model;
import org.springframework.data.annotation.Id;
import org.springframework.data.mongodb.core.mapping.Document;
import org.springframework.data.mongodb.core.mapping.Field;
import java.util.Map;
import java.util.Set;
/**
* Created by justin on 14-7-28.
*
* mongodbDocument
*/
@Document(collection = "c_user")
public class CUser {
@Id
private int id;
@Field(value = "userName")
private String userName;
@Field(value = "sUserId")
private int sUserId;//模板id
@Field(value = "permission")
private int permission;
/**
*
*/
@Field(value = "level")
private int level;//用户等级
@Field(value = "exp")
private int exp;//当前经验
@Field(value = "vipLevel")
private int vipLevel; //用户vip等级
@Field(value = "img")
private String img;//头像
@Field(value = "createTime")
private long createTime; //创建时间
@Field(value = "lastLoginTime")
private long lastLoginTime; //最近一次登录
@Field(value = "cumulative_online_time")
private long cumulativeOnlineTime; //总累计时间
@Field(value = "day_online_time")
private long dayOnlineTime; //当日累计时间
@Field(value = "QQ_batch_time")
private long QQBatchTime;//用于QQ关怀统计时间每5分钟更新一次
@Field(value = "curStamina")
private int curStamina;//体力
@Field(value = "maxStamina")
private int maxStamina;//体力
@Field(value = "gold")
private int gold;//金币
@Field(value = "gem")
private int gem;//宝石
@Field(value = "sys_gem")
private int sysGem;//宝石
@Field(value = "honorPoint")
private int honorPoint; // 荣誉点
@Field(value = "friendHeart")
private int friendHeart;//友情点
@Field(value = "banTime")
private long banTime;//禁言时间
@Field(value = "banReason")
private String banReason;//禁言原因
@Field(value = "vip_flush_time")
private long vipFlushTime;
@Field(value = "systemSetting") // 保存系统设置
private String systemSetting;
@Field(value = "totalForces")
private int totalForces; // 总战斗力
@Field(value = "award_level_set")
private Set<Integer> awardLevelSet;
@Field(value = "medal")
private int medal;
@Field(value = "area_id")
private int areaId;
@Field(value = "shield")
private int shield; //0:未封号 1:永久封号 2:至封号时间期间封号
@Field(value = "shield_time")
private long shieldTime;
@Field(value = "shield_cause")
private String shieldCause;
@Field(value = "award_stamina_time")
private long awardStaminaTime;//获取体力值得最后时间
@Field(value = "vip_award_set")
private Set<Integer> vipAwardSet;//vip已领取等级集合
@Field(value = "population_upper_limit")
private int populationUpperLimit;//关卡人口上限
@Field(value = "is_first_fail")
private int isFirstFail; //0:未触发 1:已触发
@Field(value = "novice_guide_id")
private String noviceGuideId; //新手引导BI记录Id
@Field(value = "danmu")
private String danmu; // 是否显示弹幕 "1" 显示, "0"不显示
@Field(value = "take_stamina_map")
private Map<Integer, Integer> takeStaminaMap;
@Field(value = "captain_id")
private String captainId; // 设为队长的英雄id
@Field(value = "skip_newer")
private int skipNewer; // 跳过剧情==1
@Field(value = "cum_login_time")
private int CumLoginTime;
@Field(value = "online")//1在线 0不在线
private int online;
@Field(value = "draw_daily_time")
private int drawDailyTime;//每日抽签累计领取次数
@Field(value = "draw_daily_state")
private int drawDailyState;//每日抽签1可领取 0不可领取
@Field(value = "is_privilege")
private int isPrivilege;
@Field(value = "privilegedLoginTime")
private long privilegedLoginTime;
@Field(value = "recall")
private int recall;
@Field(value = "cumulative_recharge")
private int cumulativeRecharge;
@Field(value = "skinGold")
private int skinGold;
@Field(value = "head")
private int head;
@Field(value = "headFrame")
private int headFrame;
@Field(value = "clientVersion")
private String clientVersion;
@Field(value = "recNoticeTime")
private long recNoticeTime;
@Field(value = "core_address")
private String coreAddress;
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public String getUserName() {
return userName;
}
public void setUserName(String userName) {
this.userName = userName;
}
public int getsUserId() {
return sUserId;
}
public void setsUserId(int sUserId) {
this.sUserId = sUserId;
}
public int getPermission() {
return permission;
}
public void setPermission(int permission) {
this.permission = permission;
}
public int getLevel() {
return level;
}
public void setLevel(int level) {
this.level = level;
}
public int getExp() {
return exp;
}
public void setExp(int exp) {
this.exp = exp;
}
public int getVipLevel() {
return vipLevel;
}
public void setVipLevel(int vipLevel) {
this.vipLevel = vipLevel;
}
public String getImg() {
return img;
}
public void setImg(String img) {
this.img = img;
}
public long getCreateTime() {
return createTime;
}
public void setCreateTime(long createTime) {
this.createTime = createTime;
}
public long getLastLoginTime() {
return lastLoginTime;
}
public void setLastLoginTime(long lastLoginTime) {
this.lastLoginTime = lastLoginTime;
}
public long getCumulativeOnlineTime() {
return cumulativeOnlineTime;
}
public void setCumulativeOnlineTime(long cumulativeOnlineTime) {
this.cumulativeOnlineTime = cumulativeOnlineTime;
}
public long getDayOnlineTime() {
return dayOnlineTime;
}
public void setDayOnlineTime(long dayOnlineTime) {
this.dayOnlineTime = dayOnlineTime;
}
public long getQQBatchTime() {
return QQBatchTime;
}
public void setQQBatchTime(long QQBatchTime) {
this.QQBatchTime = QQBatchTime;
}
public int getCurStamina() {
return curStamina;
}
public void setCurStamina(int curStamina) {
this.curStamina = curStamina;
}
public int getMaxStamina() {
return maxStamina;
}
public void setMaxStamina(int maxStamina) {
this.maxStamina = maxStamina;
}
public int getGold() {
return gold;
}
public void setGold(int gold) {
this.gold = gold;
}
public int getGem() {
return gem;
}
public void setGem(int gem) {
this.gem = gem;
}
public int getSysGem() {
return sysGem;
}
public void setSysGem(int sysGem) {
this.sysGem = sysGem;
}
public int getHonorPoint() {
return honorPoint;
}
public void setHonorPoint(int honorPoint) {
this.honorPoint = honorPoint;
}
public int getFriendHeart() {
return friendHeart;
}
public void setFriendHeart(int friendHeart) {
this.friendHeart = friendHeart;
}
public long getBanTime() {
return banTime;
}
public void setBanTime(long banTime) {
this.banTime = banTime;
}
public String getBanReason() {
return banReason;
}
public void setBanReason(String banReason) {
this.banReason = banReason;
}
public long getVipFlushTime() {
return vipFlushTime;
}
public void setVipFlushTime(long vipFlushTime) {
this.vipFlushTime = vipFlushTime;
}
public String getSystemSetting() {
return systemSetting;
}
public void setSystemSetting(String systemSetting) {
this.systemSetting = systemSetting;
}
public int getTotalForces() {
return totalForces;
}
public void setTotalForces(int totalForces) {
this.totalForces = totalForces;
}
public Set<Integer> getAwardLevelSet() {
return awardLevelSet;
}
public void setAwardLevelSet(Set<Integer> awardLevelSet) {
this.awardLevelSet = awardLevelSet;
}
public int getMedal() {
return medal;
}
public void setMedal(int medal) {
this.medal = medal;
}
public int getAreaId() {
return areaId;
}
public void setAreaId(int areaId) {
this.areaId = areaId;
}
public int getShield() {
return shield;
}
public void setShield(int shield) {
this.shield = shield;
}
public long getShieldTime() {
return shieldTime;
}
public void setShieldTime(long shieldTime) {
this.shieldTime = shieldTime;
}
public String getShieldCause() {
return shieldCause;
}
public void setShieldCause(String shieldCause) {
this.shieldCause = shieldCause;
}
public long getAwardStaminaTime() {
return awardStaminaTime;
}
public void setAwardStaminaTime(long awardStaminaTime) {
this.awardStaminaTime = awardStaminaTime;
}
public Set<Integer> getVipAwardSet() {
return vipAwardSet;
}
public void setVipAwardSet(Set<Integer> vipAwardSet) {
this.vipAwardSet = vipAwardSet;
}
public int getPopulationUpperLimit() {
return populationUpperLimit;
}
public void setPopulationUpperLimit(int populationUpperLimit) {
this.populationUpperLimit = populationUpperLimit;
}
public int getIsFirstFail() {
return isFirstFail;
}
public void setIsFirstFail(int isFirstFail) {
this.isFirstFail = isFirstFail;
}
public String getNoviceGuideId() {
return noviceGuideId;
}
public void setNoviceGuideId(String noviceGuideId) {
this.noviceGuideId = noviceGuideId;
}
public String getDanmu() {
return danmu;
}
public void setDanmu(String danmu) {
this.danmu = danmu;
}
public Map<Integer, Integer> getTakeStaminaMap() {
return takeStaminaMap;
}
public void setTakeStaminaMap(Map<Integer, Integer> takeStaminaMap) {
this.takeStaminaMap = takeStaminaMap;
}
public String getCaptainId() {
return captainId;
}
public void setCaptainId(String captainId) {
this.captainId = captainId;
}
public int getSkipNewer() {
return skipNewer;
}
public void setSkipNewer(int skipNewer) {
this.skipNewer = skipNewer;
}
public int getCumLoginTime() {
return CumLoginTime;
}
public void setCumLoginTime(int cumLoginTime) {
CumLoginTime = cumLoginTime;
}
public int getOnline() {
return online;
}
public void setOnline(int online) {
this.online = online;
}
public int getDrawDailyTime() {
return drawDailyTime;
}
public void setDrawDailyTime(int drawDailyTime) {
this.drawDailyTime = drawDailyTime;
}
public int getDrawDailyState() {
return drawDailyState;
}
public void setDrawDailyState(int drawDailyState) {
this.drawDailyState = drawDailyState;
}
public int getIsPrivilege() {
return isPrivilege;
}
public void setIsPrivilege(int isPrivilege) {
this.isPrivilege = isPrivilege;
}
public long getPrivilegedLoginTime() {
return privilegedLoginTime;
}
public void setPrivilegedLoginTime(long privilegedLoginTime) {
this.privilegedLoginTime = privilegedLoginTime;
}
public int getRecall() {
return recall;
}
public void setRecall(int recall) {
this.recall = recall;
}
public int getCumulativeRecharge() {
return cumulativeRecharge;
}
public void setCumulativeRecharge(int cumulativeRecharge) {
this.cumulativeRecharge = cumulativeRecharge;
}
public int getSkinGold() {
return skinGold;
}
public void setSkinGold(int skinGold) {
this.skinGold = skinGold;
}
public int getHead() {
return head;
}
public void setHead(int head) {
this.head = head;
}
public int getHeadFrame() {
return headFrame;
}
public void setHeadFrame(int headFrame) {
this.headFrame = headFrame;
}
public String getClientVersion() {
return clientVersion;
}
public void setClientVersion(String clientVersion) {
this.clientVersion = clientVersion;
}
public long getRecNoticeTime() {
return recNoticeTime;
}
public void setRecNoticeTime(long recNoticeTime) {
this.recNoticeTime = recNoticeTime;
}
public String getCoreAddress() {
return coreAddress;
}
public void setCoreAddress(String coreAddress) {
this.coreAddress = coreAddress;
}
@Override
public String toString() {
return "CUser{" +
"id=" + id +
", userName='" + userName + '\'' +
", sUserId=" + sUserId +
", permission=" + permission +
", level=" + level +
", exp=" + exp +
", vipLevel=" + vipLevel +
", img='" + img + '\'' +
", createTime=" + createTime +
", lastLoginTime=" + lastLoginTime +
", cumulativeOnlineTime=" + cumulativeOnlineTime +
", dayOnlineTime=" + dayOnlineTime +
", QQBatchTime=" + QQBatchTime +
", curStamina=" + curStamina +
", maxStamina=" + maxStamina +
", gold=" + gold +
", gem=" + gem +
", sysGem=" + sysGem +
", honorPoint=" + honorPoint +
", friendHeart=" + friendHeart +
", banTime=" + banTime +
", banReason='" + banReason + '\'' +
", vipFlushTime=" + vipFlushTime +
", systemSetting='" + systemSetting + '\'' +
", totalForces=" + totalForces +
", awardLevelSet=" + awardLevelSet +
", medal=" + medal +
", areaId=" + areaId +
", shield=" + shield +
", shieldTime=" + shieldTime +
", shieldCause='" + shieldCause + '\'' +
", awardStaminaTime=" + awardStaminaTime +
", vipAwardSet=" + vipAwardSet +
", populationUpperLimit=" + populationUpperLimit +
", isFirstFail=" + isFirstFail +
", noviceGuideId='" + noviceGuideId + '\'' +
", danmu='" + danmu + '\'' +
", takeStaminaMap=" + takeStaminaMap +
", captainId='" + captainId + '\'' +
", skipNewer=" + skipNewer +
", CumLoginTime=" + CumLoginTime +
", online=" + online +
", drawDailyTime=" + drawDailyTime +
", drawDailyState=" + drawDailyState +
", isPrivilege=" + isPrivilege +
", privilegedLoginTime=" + privilegedLoginTime +
", recall=" + recall +
", cumulativeRecharge=" + cumulativeRecharge +
", skinGold=" + skinGold +
", head=" + head +
", headFrame=" + headFrame +
", clientVersion='" + clientVersion + '\'' +
", recNoticeTime=" + recNoticeTime +
", coreAddress='" + coreAddress + '\'' +
'}';
}
}