diff --git a/conf/script/hefu_mongo.sh b/conf/script/hefu_mongo.sh new file mode 100644 index 0000000..c583322 --- /dev/null +++ b/conf/script/hefu_mongo.sh @@ -0,0 +1,24 @@ +#!/bin/bash + +# MongoDB的账号、密码、端口等信息 +MONGO_HOST=$1 +MONGO_PORT=$2 +MONGO_USER=$3 +MONGO_PASSWORD=$4 +MONGO_AUTH_DB=$5 + +# 导出数据的数据库和集合 +DATABASE_NAME=$6 +COLLECTION_NAME=$7 + +# 导出数据保存的目录 +EXPORT_DIRECTORY="/data/jieling/hefu" + +# 导入数据的目录 +IMPORT_DIRECTORY="/data/jieling/hefu" + +# 导出数据 +mongodump --host $MONGO_HOST --port $MONGO_PORT --username $MONGO_USER --password $MONGO_PASSWORD --authenticationDatabase $MONGO_AUTH_DB --db $DATABASE_NAME --collection $COLLECTION_NAME --out $EXPORT_DIRECTORY + +# 导入数据 +mongorestore --host $MONGO_HOST --port $MONGO_PORT --username $MONGO_USER --password $MONGO_PASSWORD --authenticationDatabase $MONGO_AUTH_DB --db $DATABASE_NAME $IMPORT_DIRECTORY \ No newline at end of file diff --git a/src/main/java/com/jmfy/controller/GmController.java b/src/main/java/com/jmfy/controller/GmController.java index d2dcb81..3407b7b 100644 --- a/src/main/java/com/jmfy/controller/GmController.java +++ b/src/main/java/com/jmfy/controller/GmController.java @@ -49,8 +49,6 @@ public class GmController { private BanFuctionDao banFuctionDao; @Resource private ItemDao itemDao; - @Resource - private HeFuManager heFuManager; private int htmlLikeId = 0; @@ -114,7 +112,7 @@ public class GmController { } if (cmd.contains("hefu")) { - TaskKit.scheduleWithFixedOne(()->heFuManager.hefu(cmd),0); + TaskKit.scheduleWithFixedOne(()->HeFuManager.hefu(cmd),0); return 0; } diff --git a/src/main/java/com/jmfy/dao/impl/MailDaoImpl.java b/src/main/java/com/jmfy/dao/impl/MailDaoImpl.java index b61398a..41e1df7 100644 --- a/src/main/java/com/jmfy/dao/impl/MailDaoImpl.java +++ b/src/main/java/com/jmfy/dao/impl/MailDaoImpl.java @@ -1,6 +1,5 @@ package com.jmfy.dao.impl; -import com.jmfy.controller.UserInfoController; import com.jmfy.dao.MailDao; import com.jmfy.handler.HeFuManager; import com.jmfy.model.*; diff --git a/src/main/java/com/jmfy/handler/HeFuManager.java b/src/main/java/com/jmfy/handler/HeFuManager.java index 8ea2595..8bbeac3 100644 --- a/src/main/java/com/jmfy/handler/HeFuManager.java +++ b/src/main/java/com/jmfy/handler/HeFuManager.java @@ -8,12 +8,10 @@ import com.jmfy.utils.RedisUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.data.redis.core.ZSetOperations; import org.springframework.stereotype.Component; import javax.annotation.PostConstruct; -import javax.annotation.Resource; import java.io.BufferedReader; import java.io.InputStreamReader; import java.text.SimpleDateFormat; @@ -30,12 +28,12 @@ public class HeFuManager { private static final Logger LOGGER = LoggerFactory.getLogger(HeFuManager.class); private static CHefuDao hefuDao; - @Resource - private ServerInfoDao serverInfoDao; + private static ServerInfoDao serverInfoDao; @Autowired - public HeFuManager(CHefuDao hefuDao) { + public HeFuManager(CHefuDao hefuDao, ServerInfoDao serverInfoDao) { HeFuManager.hefuDao = hefuDao; + HeFuManager.serverInfoDao = serverInfoDao; } private static final Map hefuMap = new HashMap<>(); @@ -64,7 +62,7 @@ public class HeFuManager { /** * mongo数据库信息 */ - @Value("${spring.data.gameMongodb.uri}") +// @Value("${spring.data.gameMongodb.uri}") private static String mongoClient; private static String path = "/data/jieling/hefu/"; @@ -79,7 +77,8 @@ public class HeFuManager { private static String MONGO_RESTORE_COMMAND = "mongorestore --host 10.0.0.176 --port 27017 -u rwuser -p Ysj666_777 --authenticationDatabase admin -d ysj_40001 ./"; - public void hefu(String cmd) { + // hefu|10001|10002#10003#10004 + public static void hefu(String cmd) { try { String[] split = cmd.split("\\|"); int masterId = Integer.parseInt(split[1]); @@ -217,7 +216,7 @@ public class HeFuManager { return datas; } - public void upsertServerIpAndPort(int masterSID, int slowSID) throws Exception { + public static void upsertServerIpAndPort(int masterSID, int slowSID) throws Exception { LOGGER.info("开始处理IP和端口===========,a:{},b:{}",masterSID,slowSID); ServerInfo masterServer = serverInfoDao.getServerInfo(String.valueOf(masterSID)); ServerInfo slaveServer = serverInfoDao.getServerInfo(String.valueOf(slowSID)); @@ -240,7 +239,7 @@ public class HeFuManager { public static final String GUILD_CHALLENGE_RANK = "GUILD_CHALLENGE_RANK";//公会副本排行榜 public static final String ARENA_RANK = "ARENA_RANK";//竞技场排行榜 - public void dealRedis(int masterSID, int slowSID){ + public static void dealRedis(int masterSID, int slowSID){ LOGGER.info("开始处理redis排行榜===========,a:{},b:{}",masterSID,slowSID); // 战力排行榜处理 defaultRankOfRedis(FORCE_CURR_RANK,masterSID,slowSID); @@ -263,7 +262,7 @@ public class HeFuManager { LOGGER.info("处理redis排行榜完成"); } - public void defaultRankOfRedis(String key, int masterSID, int slowSID){ + public static void defaultRankOfRedis(String key, int masterSID, int slowSID){ try { RedisUtil instence = RedisUtil.getInstence(); String masterChapterKey = masterSID + colon + key + colon; @@ -276,7 +275,7 @@ public class HeFuManager { } } - public void fourRankOfRedis(String key, int masterSID, int slowSID){ + public static void fourRankOfRedis(String key, int masterSID, int slowSID){ RedisUtil instence = RedisUtil.getInstence(); for (int i = 1; i < 5; i++) { try { @@ -291,7 +290,7 @@ public class HeFuManager { } } - public void deleteRankOfRedis(String key, int masterSID){ + public static void deleteRankOfRedis(String key, int masterSID){ try { RedisUtil instence = RedisUtil.getInstence(); String masterChapterKey = masterSID + colon + key + colon;