From bc2920691ed8f9d8fa5d059ad153f4116fb0689e Mon Sep 17 00:00:00 2001 From: mengchengzhen <13682025901@163.com> Date: Mon, 21 Jun 2021 17:43:37 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/jmfy/controller/GameTitleController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/jmfy/controller/GameTitleController.java b/src/main/java/com/jmfy/controller/GameTitleController.java index 86117de..a75c810 100644 --- a/src/main/java/com/jmfy/controller/GameTitleController.java +++ b/src/main/java/com/jmfy/controller/GameTitleController.java @@ -229,6 +229,7 @@ public class GameTitleController { } catch (NoSuchAlgorithmException | UnsupportedEncodingException e) { + e.printStackTrace(); return false; } } From 1314f178602f994855c6b803e1bb00b121d5e7ae Mon Sep 17 00:00:00 2001 From: mengchengzhen <13682025901@163.com> Date: Mon, 21 Jun 2021 17:59:55 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E5=A4=A9=E7=9C=BC=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/jmfy/controller/GameTitleController.java | 3 ++- src/main/java/com/jmfy/handler/GMHandler.java | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/jmfy/controller/GameTitleController.java b/src/main/java/com/jmfy/controller/GameTitleController.java index a75c810..b329ea7 100644 --- a/src/main/java/com/jmfy/controller/GameTitleController.java +++ b/src/main/java/com/jmfy/controller/GameTitleController.java @@ -191,6 +191,7 @@ public class GameTitleController { try { HashMap parameterMap = JsonUtil.getInstence().getParameterMap(request); String jsonString = JSON.toJSONString(parameterMap); + LOGGER.info("天眼封禁json=>{}",jsonString); JSONObject jsonObject = JSON.parseObject(jsonString); BaseHandler handler = ManagerManager.getInstance().getBaseHandler("gm"); if(handler.skyEyeExecute(jsonObject,session,map)){ @@ -224,7 +225,7 @@ public class GameTitleController { BigInteger bigInt = new BigInteger(1, md5sum); String newsign = String.format("%032X", bigInt).toLowerCase(); map.put("message","sign:"+sign+" newSign:"+newsign); - LOGGER.info("message,sign=>{},new sign=>{}",sign,newsign); + LOGGER.info("天眼message,sign=>{},new sign=>{}",sign,newsign); return newsign.equalsIgnoreCase(sign); // MD5前面会补零 } catch (NoSuchAlgorithmException | UnsupportedEncodingException e) diff --git a/src/main/java/com/jmfy/handler/GMHandler.java b/src/main/java/com/jmfy/handler/GMHandler.java index bb53ddc..fc47d13 100644 --- a/src/main/java/com/jmfy/handler/GMHandler.java +++ b/src/main/java/com/jmfy/handler/GMHandler.java @@ -162,22 +162,23 @@ public class GMHandler extends BaseHandler { String rpcString = RedisUtil.getInstence().getObject(RedisUserKey.LOGIC_SERVER_INFO, String.valueOf(coreServerList.getServer_id()), String.class, -1); if (null == rpcString) { map.put("message","Exception send err rpcString dsid="+coreUserInfo.getServerid()+",uid="+userId); - LOGGER.error("Exception send err rpcString dsid=>{},uid=>{},cmd=>{}", coreUserInfo.getServerid(), userId, cmd); + LOGGER.error("天眼Exception send err rpcString dsid=>{},uid=>{},cmd=>{}", coreUserInfo.getServerid(), userId, cmd); return false; } String thriftIp = rpcString.split(":")[0]; String thriftPort = rpcString.split(":")[1]; if (thriftIp == null || thriftIp.isEmpty() || null == thriftPort || thriftPort.isEmpty()) { map.put("message","thriftIp == null || thriftIp.isEmpty() || null == thriftPort || thriftPort.isEmpty()"); + LOGGER.error("天眼thriftIp == null || thriftIp.isEmpty() || null == thriftPort || thriftPort.isEmpty()"); return false; } Result result = RPCClient.gmSend(cmd, thriftIp, thriftPort); // 异常或者错误 if (result.getResultCode() != 0) { - LOGGER.error("Exception send err dsid=>{},uid=>{},cmd=>{}", coreUserInfo.getServerid(), userId, cmd); + LOGGER.error("天眼Exception send err dsid=>{},uid=>{},cmd=>{}", coreUserInfo.getServerid(), userId, cmd); }else { // 封禁入库 - LOGGER.info("封禁入库,serverid=>{},uid=>{}", zoneId, userId); + LOGGER.info("天眼封禁入库,serverid=>{},uid=>{}", zoneId, userId); updateUserBanner(coreUserInfo,session,jsonBan); } } From bd5d95198fcf36514b9e6470a4510096a86ccd5e Mon Sep 17 00:00:00 2001 From: mengchengzhen <13682025901@163.com> Date: Mon, 21 Jun 2021 18:13:14 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E5=A4=A9=E7=9C=BC=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/jmfy/handler/GMHandler.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/jmfy/handler/GMHandler.java b/src/main/java/com/jmfy/handler/GMHandler.java index fc47d13..683c34d 100644 --- a/src/main/java/com/jmfy/handler/GMHandler.java +++ b/src/main/java/com/jmfy/handler/GMHandler.java @@ -149,10 +149,12 @@ public class GMHandler extends BaseHandler { if (null == coreServerList) { map.put("message","服务器不存在"); + LOGGER.error("天眼服务器不存在"); return false; } if (!coreServerList.getServer_id().equals(String.valueOf(zoneId))) { map.put("message","服务器不存在"+zoneId); + LOGGER.error("天眼服务器不存在{}",zoneId); return false; } From 10300891db1f25fd13030c0e11f8d09955c58ea5 Mon Sep 17 00:00:00 2001 From: mengchengzhen <13682025901@163.com> Date: Mon, 21 Jun 2021 19:00:46 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E5=A4=A9=E7=9C=BC=E5=B0=81=E7=A6=81?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/jmfy/handler/GMHandler.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/com/jmfy/handler/GMHandler.java b/src/main/java/com/jmfy/handler/GMHandler.java index 683c34d..fa92930 100644 --- a/src/main/java/com/jmfy/handler/GMHandler.java +++ b/src/main/java/com/jmfy/handler/GMHandler.java @@ -247,6 +247,10 @@ public class GMHandler extends BaseHandler { int type = jsonObject.getIntValue("treat_type"); switch (type) { case GMHandler.SKYEYE_BAN: + UserBanned skyeyebanned = userBannedDao.getUserBannedByBannedType(cUser.getUserId(),type); + if(skyeyebanned != null){ + return; + } case GMHandler.BANNED_TO_POST: case GMHandler.BANNED_LOGIN: // 封禁用户 From e568f2abc112c6742fd659a1236d7834b7cb235d Mon Sep 17 00:00:00 2001 From: mengchengzhen <13682025901@163.com> Date: Mon, 21 Jun 2021 19:11:16 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E5=A4=A9=E7=9C=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/jmfy/handler/GMHandler.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/jmfy/handler/GMHandler.java b/src/main/java/com/jmfy/handler/GMHandler.java index fa92930..fe1d949 100644 --- a/src/main/java/com/jmfy/handler/GMHandler.java +++ b/src/main/java/com/jmfy/handler/GMHandler.java @@ -251,6 +251,7 @@ public class GMHandler extends BaseHandler { if(skyeyebanned != null){ return; } + break; case GMHandler.BANNED_TO_POST: case GMHandler.BANNED_LOGIN: // 封禁用户 From 49a85e2eb2814fb687e03b26f716726114bdb8f9 Mon Sep 17 00:00:00 2001 From: duhui Date: Tue, 22 Jun 2021 10:21:57 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E5=81=9C=E6=9C=8D=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jmfy/controller/ServerInfoController.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/jmfy/controller/ServerInfoController.java b/src/main/java/com/jmfy/controller/ServerInfoController.java index c72c702..595fc82 100644 --- a/src/main/java/com/jmfy/controller/ServerInfoController.java +++ b/src/main/java/com/jmfy/controller/ServerInfoController.java @@ -20,6 +20,8 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; import java.io.IOException; +import java.io.OutputStream; +import java.io.PrintStream; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; @@ -263,9 +265,12 @@ public class ServerInfoController { } String command = "sh " + path + " 210 " + serverInfo.getIP() + " " + serverInfo.getServer_id() + " " + serverInfo.getCoreName(); try { - wait = Runtime.getRuntime().exec(command).waitFor(); - System.out.printf("删除操作完成:命令:{%s},结果{%d}\n",command,wait); - } catch (InterruptedException | IOException e) { + OutputStream stream = Runtime.getRuntime().exec(command).getOutputStream(); + PrintStream printStream = new PrintStream(stream); + System.out.printf("删除操作完成:命令:{%s}\n",command); + printStream.println(); + wait = 0; + } catch (IOException e) { System.err.printf("删除操作失败:命令:{%s},报错:{%s}\n",command,e.getMessage()); e.printStackTrace(); } From 98fe750cb358f1757f11fb7da1c1209510b47abc Mon Sep 17 00:00:00 2001 From: duhui Date: Tue, 22 Jun 2021 10:47:37 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E5=81=9C=E6=9C=8D=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=BE=93=E5=87=BA=E6=9B=B4=E6=96=B02?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jmfy/controller/ServerInfoController.java | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/jmfy/controller/ServerInfoController.java b/src/main/java/com/jmfy/controller/ServerInfoController.java index 595fc82..00e001d 100644 --- a/src/main/java/com/jmfy/controller/ServerInfoController.java +++ b/src/main/java/com/jmfy/controller/ServerInfoController.java @@ -19,9 +19,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; -import java.io.IOException; -import java.io.OutputStream; -import java.io.PrintStream; +import java.io.*; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; @@ -264,16 +262,26 @@ public class ServerInfoController { return wait; } String command = "sh " + path + " 210 " + serverInfo.getIP() + " " + serverInfo.getServer_id() + " " + serverInfo.getCoreName(); + List processList = new ArrayList<>(); try { - OutputStream stream = Runtime.getRuntime().exec(command).getOutputStream(); - PrintStream printStream = new PrintStream(stream); + Process exec = Runtime.getRuntime().exec(command); + BufferedReader input = new BufferedReader(new InputStreamReader(exec.getInputStream())); + String line = ""; + while ((line = input.readLine()) != null) { + processList.add(line); + } System.out.printf("删除操作完成:命令:{%s}\n",command); - printStream.println(); wait = 0; + input.close(); } catch (IOException e) { System.err.printf("删除操作失败:命令:{%s},报错:{%s}\n",command,e.getMessage()); e.printStackTrace(); } + + System.out.println("========================== 停服脚本执行结果开始 ==========================="); + processList.forEach(System.out::println); + System.out.println("=========================== 停服脚本执行结果结束 =========================="); + return wait; } } From 62e397e8d3b4fd16e5a0b3f7e8cff11e7c145531 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Tue, 22 Jun 2021 16:33:05 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E6=8F=90=E5=AE=A1=E6=9C=8Dgm=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jmfy/controller/GmController.java | 42 +++-- .../com/jmfy/controller/TishenController.java | 128 ++++++++++++++ src/main/java/com/jmfy/dao/HandInDao.java | 26 +++ .../java/com/jmfy/dao/impl/HandInDaoImpl.java | 64 +++++++ .../java/com/jmfy/model/TishenServerInfo.java | 57 +++++++ .../java/com/jmfy/model/vo/PowersEnum.java | 1 + src/main/resources/templates/index.html | 4 +- .../templates/insertTiShenInfoPage.html | 157 ++++++++++++++++++ .../templates/tishenInfoManager.html | 124 ++++++++++++++ .../resources/templates/updateTishenPage.html | 115 +++++++++++++ 10 files changed, 707 insertions(+), 11 deletions(-) create mode 100644 src/main/java/com/jmfy/controller/TishenController.java create mode 100644 src/main/java/com/jmfy/dao/HandInDao.java create mode 100644 src/main/java/com/jmfy/dao/impl/HandInDaoImpl.java create mode 100644 src/main/java/com/jmfy/model/TishenServerInfo.java create mode 100644 src/main/resources/templates/insertTiShenInfoPage.html create mode 100644 src/main/resources/templates/tishenInfoManager.html create mode 100644 src/main/resources/templates/updateTishenPage.html diff --git a/src/main/java/com/jmfy/controller/GmController.java b/src/main/java/com/jmfy/controller/GmController.java index 15ade66..9578c91 100644 --- a/src/main/java/com/jmfy/controller/GmController.java +++ b/src/main/java/com/jmfy/controller/GmController.java @@ -46,7 +46,7 @@ public class GmController { String cmd = request.getParameter("content"); if(cmd.equals("recharge")){ - recharge(); +// recharge(); return 0; } String serverId = request.getParameter("serverId"); @@ -226,7 +226,29 @@ public class GmController { } - public void recharge() throws IOException { +// public void recharge() throws IOException { +// String osName = System.getProperty("os.name"); +// String filePath = ""; +// Gson gson = new Gson(); +// if (osName.matches("^(?i)Windows.*$")) {// Window 系统 +// filePath = "conf/"; +// } else {// Linux 系统 +// filePath = "../config/"; +// } +// BufferedReader in = new BufferedReader(new FileReader(filePath+"rechargeImport.txt")); +// BufferedWriter out = new BufferedWriter(new FileWriter(filePath+"recharge.json")); +// String str; +// while ((str = in.readLine()) != null) { +// String[] s = str.split("\t"); +// RechargeInfo rechargeInfo = new RechargeInfo(s[0], Double.valueOf(s[1]), 0); +// String json = gson.toJson(rechargeInfo); +// System.out.println(s[0]+"||"+s[1]); +// out.write(json+"\n"); +// } +// in.close(); +// out.close(); +// } + public static void main(String[] args) throws IOException { String osName = System.getProperty("os.name"); String filePath = ""; Gson gson = new Gson(); @@ -235,18 +257,18 @@ public class GmController { } else {// Linux 系统 filePath = "../config/"; } - BufferedReader in = new BufferedReader(new FileReader(filePath+"rechargeImport.txt")); - BufferedWriter out = new BufferedWriter(new FileWriter(filePath+"recharge.json")); + BufferedReader in = new BufferedReader(new FileReader(filePath+"rank.txt")); String str; + int i = 568; while ((str = in.readLine()) != null) { - String[] s = str.split("\t"); - RechargeInfo rechargeInfo = new RechargeInfo(s[0], Double.valueOf(s[1]), 0); - String json = gson.toJson(rechargeInfo); - System.out.println(s[0]+"||"+s[1]); - out.write(json+"\n"); + int value = Integer.valueOf(str); + int i1 = value % 50; + if(i1==16||i1==2||i1==38){ + System.out.println(value+" "+i); + } + i--; } in.close(); - out.close(); } static class CPayOrder { diff --git a/src/main/java/com/jmfy/controller/TishenController.java b/src/main/java/com/jmfy/controller/TishenController.java new file mode 100644 index 0000000..6c6288e --- /dev/null +++ b/src/main/java/com/jmfy/controller/TishenController.java @@ -0,0 +1,128 @@ +package com.jmfy.controller; + +import com.jmfy.dao.impl.HandInDaoImpl; +import com.jmfy.model.TishenServerInfo; +import com.jmfy.utils.JsonUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.HashMap; +import java.util.List; + +/** + * @author lvxinran + * @date 2021/6/21 + * @discribe + */ +@Controller +public class TishenController { + private static final Logger LOGGER = LoggerFactory.getLogger(TishenController.class); + + @Resource + HandInDaoImpl handInDao; + + /** + * 跳转到提审服信息页面 + * @param map + * @return + */ + @RequestMapping(value = "/tishenInfoList", method = RequestMethod.GET) + public String toTishenInfoManagerPage(ModelMap map){ + try { + + List handInInfos = handInDao.getAllHandInInfo(); + map.addAttribute("handInInfos", handInInfos); + + } catch (Exception e) { + e.printStackTrace(); + } + return "tishenInfoManager"; + } + + /** + * 添加提审信息页面 + * @param map + * @return + */ + @RequestMapping(value = "/toInsertTiShenInfo", method = RequestMethod.GET) + public String toInsertTishenInfoManagerPage(ModelMap map){ + return "insertTiShenInfoPage"; + } + + + /** + * 添加提审服 + * @param info + * @return + */ + @RequestMapping(value = "/addTishenServer", method = RequestMethod.POST) + @ResponseBody + public int addTishenServer(@RequestBody TishenServerInfo info){ + + try { + handInDao.addHandIn(info); + } catch (Exception e) { + e.printStackTrace(); + return 0; + } + return 1; + } + + @RequestMapping(value = "/deleteTiShenServer", method = RequestMethod.POST) + @ResponseBody + public int deleteTiShenServer(HttpServletRequest request){ + + try { + HashMap map = JsonUtil.getInstence().getParameterMap(request); + + TishenServerInfo tishenServerInfo = new TishenServerInfo(); + tishenServerInfo.set_id(map.get("tiShenId")); + handInDao.removeHandInInfo(tishenServerInfo); + } catch (Exception e) { + e.printStackTrace(); + return 0; + } + return 1; + } + + @RequestMapping(value = "/toUpdateTishenServer", method = RequestMethod.GET) + public String toUpdateTishenServer(ModelMap map,HttpServletRequest request){ + + try { + String id = request.getParameter("id"); + TishenServerInfo handInInfoById = handInDao.getHandInInfoById(id); + map.addAttribute("tishenInfo",handInInfoById); + } catch (Exception e) { + e.printStackTrace(); + return ""; + } + return "updateTishenPage"; + } + @RequestMapping(value = "/doUpdateTishenServerInfo", method = RequestMethod.POST) + public String doUpdateTishenServerInfo(ModelMap map,HttpServletRequest request){ + + try { + String id = request.getParameter("id"); + String serverInfo = request.getParameter("serverInfo"); + + String remark = request.getParameter("remark"); + TishenServerInfo info = new TishenServerInfo(id,remark,Integer.valueOf(serverInfo)); + handInDao.updateHandInfo(info); + List allHandInInfo = handInDao.getAllHandInInfo(); + map.addAttribute("handInInfos", allHandInInfo); + + } catch (Exception e) { + e.printStackTrace(); + return ""; + } + return "tishenInfoManager"; + } + + + +} diff --git a/src/main/java/com/jmfy/dao/HandInDao.java b/src/main/java/com/jmfy/dao/HandInDao.java new file mode 100644 index 0000000..f0a6e0d --- /dev/null +++ b/src/main/java/com/jmfy/dao/HandInDao.java @@ -0,0 +1,26 @@ +package com.jmfy.dao; + +import com.jmfy.model.TishenServerInfo; + +import java.util.List; + +/** + * @author lvxinran + * @date 2021/6/21 + * @discribe + */ +public interface HandInDao { + + //添加 + void addHandIn(TishenServerInfo info) throws Exception; + + //获取所有 + List getAllHandInInfo() throws Exception; + //删除 + int removeHandInInfo (TishenServerInfo info) throws Exception; + //修改 + void updateHandInfo(TishenServerInfo info) throws Exception; + + TishenServerInfo getHandInInfoById(String id) throws Exception; + +} diff --git a/src/main/java/com/jmfy/dao/impl/HandInDaoImpl.java b/src/main/java/com/jmfy/dao/impl/HandInDaoImpl.java new file mode 100644 index 0000000..c9f7163 --- /dev/null +++ b/src/main/java/com/jmfy/dao/impl/HandInDaoImpl.java @@ -0,0 +1,64 @@ +package com.jmfy.dao.impl; + +import com.jmfy.dao.HandInDao; +import com.jmfy.model.Constant; +import com.jmfy.model.TishenServerInfo; +import com.jmfy.utils.Connect; +import com.mongodb.WriteResult; +import org.springframework.data.mongodb.core.MongoTemplate; +import org.springframework.data.mongodb.core.query.Criteria; +import org.springframework.data.mongodb.core.query.Query; +import org.springframework.data.mongodb.core.query.Update; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @author lvxinran + * @date 2021/6/21 + * @discribe + */ +@Component +public class HandInDaoImpl implements HandInDao { + @Resource + private Connect connect; + public static final String colon = ":"; + @Override + public void addHandIn(TishenServerInfo info) throws Exception { + MongoTemplate mongoTemplate = connect.getMongoTemplete(Constant.dbName); + + mongoTemplate.insert(info, "hand_in"); + } + + @Override + public List getAllHandInInfo() throws Exception { + MongoTemplate mongoTemplate = connect.getMongoTemplete(Constant.dbName); + Query query = new Query(); + return mongoTemplate.find(query, TishenServerInfo.class); + } + + @Override + public int removeHandInInfo(TishenServerInfo info) throws Exception { + MongoTemplate mongoTemplate = connect.getMongoTemplete(Constant.dbName); + mongoTemplate.remove(info); + return 1; + } + + @Override + public void updateHandInfo(TishenServerInfo info) throws Exception { + Update update = new Update(); + update.set("remark",info.getRemark()); + update.set("serverInfo",info.getServerInfo()); + MongoTemplate mongoTemplate = connect.getMongoTemplete(Constant.dbName); + Query query = new Query(Criteria.where("_id").is(info.get_id())); + mongoTemplate.updateMulti(query, update, TishenServerInfo.class); + } + + @Override + public TishenServerInfo getHandInInfoById(String id) throws Exception { + MongoTemplate mongoTemplate = connect.getMongoTemplete(Constant.dbName); + TishenServerInfo info = mongoTemplate.findById(id, TishenServerInfo.class); + return info; + } +} diff --git a/src/main/java/com/jmfy/model/TishenServerInfo.java b/src/main/java/com/jmfy/model/TishenServerInfo.java new file mode 100644 index 0000000..2d8a33d --- /dev/null +++ b/src/main/java/com/jmfy/model/TishenServerInfo.java @@ -0,0 +1,57 @@ +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; + +/** + * @author lvxinran + * @date 2021/6/21 + * @discribe + */ +@Document(collection = "hand_in") +public class TishenServerInfo { + + @Id + private String _id; + + @Field("remark") + private String remark; + + @Field("serverInfo") + private int serverInfo; + + + public TishenServerInfo(String _id, String remark, int serverInfo) { + this._id = _id; + this.remark = remark; + this.serverInfo = serverInfo; + } + + public TishenServerInfo() { + } + + public String get_id() { + return _id; + } + + public void set_id(String _id) { + this._id = _id; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public int getServerInfo() { + return serverInfo; + } + + public void setServerInfo(int serverInfo) { + this.serverInfo = serverInfo; + } +} diff --git a/src/main/java/com/jmfy/model/vo/PowersEnum.java b/src/main/java/com/jmfy/model/vo/PowersEnum.java index edbe884..fc824f9 100644 --- a/src/main/java/com/jmfy/model/vo/PowersEnum.java +++ b/src/main/java/com/jmfy/model/vo/PowersEnum.java @@ -44,6 +44,7 @@ public enum PowersEnum { CHANNEL_NAME_MANAGER(415,"渠道管理",400), ADD_CHANNEL_PERMISSIONS(416,"权限: 添加渠道",400), DELETE_CHANNEL_PERMISSIONS(417,"权限: 删除渠道",400), + HAND_IN_MANAGER(418,"提审服管理",400), // 流水日志管理500-599 BILL_LOG(500,"流水日志管理",500), diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 8345432..f6fad9c 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -28,7 +28,7 @@