diff --git a/src/main/java/com/jmfy/controller/GmController.java b/src/main/java/com/jmfy/controller/GmController.java
index f422276..dac07c0 100644
--- a/src/main/java/com/jmfy/controller/GmController.java
+++ b/src/main/java/com/jmfy/controller/GmController.java
@@ -149,10 +149,16 @@ public class GmController {
 
         HSSFWorkbook wb = new HSSFWorkbook();
 
-        HashSet<Integer> set = new HashSet<>(HeFuManager.getHefuMap().values());
-        LOGGER.info("查询道具，主服数量：{}，主服列表：{}",set.size(), set);
+        List<ServerInfo> serverInfo = serverInfoDao.getAllServerInfo();
+        HashSet<Integer> set = new HashSet<>();
 
-        for (Integer serverId : set) {
+        for (ServerInfo server : serverInfo) {
+            int serverId = server.getServerId();
+            if (set.contains(serverId)){
+                continue;
+            }else {
+                set.add(serverId);
+            }
             CItemParam param = new CItemParam();
             param.setServerId(serverId);
             param.setType(Integer.parseInt(strings[1]));
@@ -168,13 +174,15 @@ public class GmController {
             createExcelToSheet(wb, logVoList, String.valueOf(serverId));
         }
 
+        LOGGER.info("查询道具，主服数量：{}，主服列表：{}",set.size(), set);
+
         //第六步将生成excel文件保存到指定路径下
         String osName = System.getProperty("os.name");
         String path;
         if (Pattern.matches("Linux.*", osName)) {
-            path = "/data/jieling/玩家道具信息"+DateUtil.nowInt()+".xls";
+            path = "/data/jieling/useriteminfo"+DateUtil.nowInt()+".xls";
         } else {
-            path = "D:/Program Files (x86)/Quick/Downloads/玩家道具信息"+DateUtil.nowInt()+".xls";
+            path = "D:/Program Files (x86)/Quick/Downloads/useriteminfo"+DateUtil.nowInt()+".xls";
         }
 
         LOGGER.info("\"查询道具，文件地址：{}============",path);