From b037147e07c3f7a7575ad653c259e8123f763622 Mon Sep 17 00:00:00 2001 From: duhui Date: Fri, 23 Jul 2021 13:55:12 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=B0=E5=BD=95=E7=89=88=E6=9C=AC=E5=8F=B7?= =?UTF-8?q?=E5=92=8C=E9=87=8D=E5=90=AF=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gamecommon/src/main/java/util/TimeUtils.java | 7 +++++ .../main/java/com/ljsd/GameApplication.java | 7 ++++- .../ljsd/jieling/logic/dao/ServerConfig.java | 30 +++++++++++++++++++ .../src/main/java/config/SGameSetting.java | 6 ++++ 4 files changed, 49 insertions(+), 1 deletion(-) diff --git a/gamecommon/src/main/java/util/TimeUtils.java b/gamecommon/src/main/java/util/TimeUtils.java index 630502e3e..7f0fd8c40 100644 --- a/gamecommon/src/main/java/util/TimeUtils.java +++ b/gamecommon/src/main/java/util/TimeUtils.java @@ -137,6 +137,7 @@ public class TimeUtils { public static final TimeZone TIME_ZONE; + private static final String ymdhms_Format_new = "yyyy-MM-dd HH:mm:ss"; public static final String Stand_CeHua_Data_format = "yyyyMMdd HHmmss"; @@ -294,6 +295,12 @@ public class TimeUtils { return new SimpleDateFormat(ymdFormat).format(new Date(time)); } + /** + * 获取时间戳字符串yyyy-MM-dd HH:mm:ss + */ + public static String getTimeStamp2(Long time) { + return new SimpleDateFormat(ymdhms_Format_new).format(new Date(time)); + } // /** // * 是否是同一天 diff --git a/serverlogic/src/main/java/com/ljsd/GameApplication.java b/serverlogic/src/main/java/com/ljsd/GameApplication.java index a859db0b5..c0f26b807 100644 --- a/serverlogic/src/main/java/com/ljsd/GameApplication.java +++ b/serverlogic/src/main/java/com/ljsd/GameApplication.java @@ -8,6 +8,8 @@ import com.ljsd.jieling.db.redis.RedisUtil; import com.ljsd.jieling.logic.dao.ServerConfig; import com.ljsd.jieling.network.NetManager; import com.ljsd.jieling.util.ConfigurableApplicationContextManager; +import config.SGameSetting; +import manager.STableManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -100,13 +102,16 @@ public class GameApplication { serverConfigTmp.setOpenTime(format); serverConfigTmp.setCacheOpenTime(serverOenTime); serverConfigTmp.setId(1); - MongoUtil.getInstence().getMyMongoTemplate().saveWithoutMongoRoot(serverConfigTmp); }else{ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String openTime = serverConfigTmp.getOpenTime(); Date date = simpleDateFormat.parse(openTime); serverConfigTmp.setCacheOpenTime(date.getTime()); } + int version = STableManager.getConfig(SGameSetting.class).get(1).getWookbookVersion(); + serverConfigTmp.setVersion(version); + serverConfigTmp.setRestartTime(TimeUtils.getTimeStamp2(TimeUtils.now())); + MongoUtil.getInstence().getMyMongoTemplate().saveWithoutMongoRoot(serverConfigTmp); serverConfig = serverConfigTmp; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ServerConfig.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ServerConfig.java index b928cc989..5eb444c02 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ServerConfig.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ServerConfig.java @@ -21,6 +21,12 @@ public class ServerConfig extends MongoBase { @Transient private long cacheOpenTime; + @Field(value = "version") + private int version; + + @Field(value = "restartTime") + private String restartTime; + public void setOpenTime(String openTime) { this.openTime = openTime; } @@ -44,4 +50,28 @@ public class ServerConfig extends MongoBase { public void setCacheOpenTime(long cacheOpenTime) { this.cacheOpenTime = cacheOpenTime; } + + public int getVersion() { + return version; + } + + public void setVersion(int version) { + this.version = version; + } + + public int getNew_worldLevel() { + return new_worldLevel; + } + + public void setNew_worldLevel(int new_worldLevel) { + this.new_worldLevel = new_worldLevel; + } + + public String getRestartTime() { + return restartTime; + } + + public void setRestartTime(String restartTime) { + this.restartTime = restartTime; + } } diff --git a/tablemanager/src/main/java/config/SGameSetting.java b/tablemanager/src/main/java/config/SGameSetting.java index 4e48742b8..5c6359998 100644 --- a/tablemanager/src/main/java/config/SGameSetting.java +++ b/tablemanager/src/main/java/config/SGameSetting.java @@ -115,6 +115,8 @@ public class SGameSetting implements BaseConfig { private int defaultSuit; + private int wookbookVersion; + @Override public void init() throws Exception { @@ -325,4 +327,8 @@ public class SGameSetting implements BaseConfig { } public int getDefaultSuit() {return defaultSuit; } + + public int getWookbookVersion() { + return wookbookVersion; + } } \ No newline at end of file