generated from root/miduo_server
gm改版
parent
a2274ced60
commit
09e7fb9893
|
|
@ -20,6 +20,7 @@ import javax.servlet.http.HttpSession;
|
|||
import java.io.PrintWriter;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
|
|
@ -55,6 +56,8 @@ public class LoginController {
|
|||
powersVo.setUserName(admin.getUserName());
|
||||
updatePowers(powersVo,admin.getPowers());
|
||||
map.put("powersVo",powersVo);
|
||||
admin.getPowers().contains(53);
|
||||
|
||||
return "index";
|
||||
} else {
|
||||
return "redirect:/login";
|
||||
|
|
@ -63,7 +66,7 @@ public class LoginController {
|
|||
|
||||
|
||||
|
||||
private void updatePowers(PowersVo powersVo,List<Integer> powerList) {
|
||||
private void updatePowers(PowersVo powersVo, HashSet<Integer> powerList) {
|
||||
for (Integer str : powerList) {
|
||||
switch (str) {
|
||||
case 1:
|
||||
|
|
@ -213,6 +216,12 @@ public class LoginController {
|
|||
case 50:
|
||||
powersVo.setAdminList(0);
|
||||
break;
|
||||
case 52:
|
||||
powersVo.setBannedList(0);
|
||||
break;
|
||||
case 53:
|
||||
powersVo.setSupport(0);
|
||||
break;
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -259,7 +268,7 @@ public class LoginController {
|
|||
CAdminVo cAdminVo = new CAdminVo();
|
||||
cAdminVo.setUserName(cAdmin.getUserName());
|
||||
String power;
|
||||
List<Integer> powerList = cAdmin.getPowers();
|
||||
HashSet<Integer> powerList = cAdmin.getPowers();
|
||||
if (powerList.size() != 0) {
|
||||
power = getPower(powerList);
|
||||
} else {
|
||||
|
|
@ -274,7 +283,7 @@ public class LoginController {
|
|||
return "member-list";
|
||||
}
|
||||
|
||||
private String getPower(List<Integer> powerList) {
|
||||
private String getPower(HashSet<Integer> powerList) {
|
||||
StringBuilder power = new StringBuilder();
|
||||
for (Integer str : powerList) {
|
||||
String powers = "";
|
||||
|
|
@ -427,6 +436,12 @@ public class LoginController {
|
|||
case 50:
|
||||
powers = "用户管理";
|
||||
break;
|
||||
case 52:
|
||||
powers = "封禁管理";
|
||||
break;
|
||||
case 53:
|
||||
powers = "扶持审核";
|
||||
break;
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -93,6 +93,8 @@ public class ServerInfoController {
|
|||
serverInfo.setOpen_time(cServerOpenTime.getOpenTime());
|
||||
}
|
||||
}
|
||||
serverInfo.setRegister_state(serverInfo.getRegister_state());
|
||||
System.out.println(serverInfo);
|
||||
map.addAttribute("serverInfo", serverInfo);
|
||||
return "serverInfoEdit";
|
||||
}
|
||||
|
|
@ -103,9 +105,11 @@ public class ServerInfoController {
|
|||
int status = Integer.parseInt(request.getParameter("status"));
|
||||
String name = request.getParameter("name");
|
||||
String server_id = request.getParameter("server_id");
|
||||
int isnew = Integer.parseInt(request.getParameter("isnew"));
|
||||
int isnew = Integer.parseInt(request.getParameter("is_new"));
|
||||
String opentime = request.getParameter("startTime");
|
||||
serverInfoDao.updateServerInfo(server_id, status, 0, isnew, name);
|
||||
String register_state = request.getParameter("register_state");
|
||||
System.out.println(register_state);
|
||||
serverInfoDao.updateServerInfo(server_id, status, 0, isnew, name,register_state);
|
||||
if(status==-1){
|
||||
//自动开服修改开服时间
|
||||
RedisUtil.getInstence().putObject(String.valueOf(server_id) + RedisUserKey.Delimiter_colon + RedisUserKey.AUTOOPENTIME, "", opentime, -1);
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ public interface ServerInfoDao {
|
|||
|
||||
void openServerWhite(String server_id) throws Exception;
|
||||
|
||||
void updateServerInfo(String server_id, int status,int isWhite,int isnew,String name) throws Exception;
|
||||
void updateServerInfo(String server_id, int status,int isWhite,int isnew,String name,String register_state) throws Exception;
|
||||
|
||||
|
||||
void updateOpenServerTime(CServerOpenTime cServerOpenTime,String serverId) throws Exception;
|
||||
|
|
|
|||
|
|
@ -64,12 +64,13 @@ public class ServerInfoDaoImpl implements ServerInfoDao {
|
|||
}
|
||||
|
||||
@Override
|
||||
public void updateServerInfo(String server_id, int status,int isWhite,int is_new,String name) throws Exception {
|
||||
public void updateServerInfo(String server_id, int status,int isWhite,int is_new,String name,String register_state) throws Exception {
|
||||
Update update = new Update();
|
||||
update.set("name",name);
|
||||
update.set("status",String.valueOf(status));
|
||||
update.set("isWhite",String.valueOf(isWhite));
|
||||
update.set("is_new",String.valueOf(is_new));
|
||||
update.set("register_state",register_state);
|
||||
MongoTemplate mongoTemplate = connect.getMongoTemplete(dbName);
|
||||
Query query = new Query(Criteria.where("server_id").is(String.valueOf(server_id)));
|
||||
mongoTemplate.updateMulti(query, update, ServerInfo.class);
|
||||
|
|
|
|||
|
|
@ -25,7 +25,6 @@ public class GMHandler extends BaseHandler {
|
|||
private UserInfoDao gsUserDao;
|
||||
|
||||
public int execute(JSONObject jsonObject) throws Exception {
|
||||
|
||||
String uid;
|
||||
int dsid;
|
||||
int treat_type;
|
||||
|
|
|
|||
|
|
@ -5,7 +5,9 @@ import org.springframework.data.mongodb.core.mapping.Document;
|
|||
import org.springframework.data.mongodb.core.mapping.Field;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
@Document(collection = "c_admin")
|
||||
public class CAdmin {
|
||||
|
|
@ -22,7 +24,7 @@ public class CAdmin {
|
|||
private int identity;
|
||||
|
||||
@Field(value = "power")
|
||||
private List<Integer> powers = new ArrayList<>();
|
||||
private HashSet<Integer> powers = new HashSet<>();
|
||||
|
||||
public String getId() {
|
||||
return id;
|
||||
|
|
@ -44,11 +46,11 @@ public class CAdmin {
|
|||
this.password = password;
|
||||
}
|
||||
|
||||
public List<Integer> getPowers() {
|
||||
public HashSet<Integer> getPowers() {
|
||||
return powers;
|
||||
}
|
||||
|
||||
public void setPowers(List<Integer> powers) {
|
||||
public void setPowers(HashSet<Integer> powers) {
|
||||
this.powers = powers;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -52,6 +52,9 @@ public class ServerInfo {
|
|||
@Field(value = "open_type")
|
||||
private String open_type;
|
||||
|
||||
@Field(value = "register_state")
|
||||
private String register_state;
|
||||
|
||||
public ServerInfo(int _id, String name) {
|
||||
this._id = _id;
|
||||
this.server_id = String.valueOf(_id);
|
||||
|
|
@ -153,4 +156,27 @@ public class ServerInfo {
|
|||
public void setOpen_type(String open_type) {
|
||||
this.open_type = open_type;
|
||||
}
|
||||
|
||||
public String getRegister_state() { return register_state==null?"1":register_state; }
|
||||
|
||||
public void setRegister_state(String register_state) { this.register_state = register_state; }
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "ServerInfo{" +
|
||||
"_id=" + _id +
|
||||
", name='" + name + '\'' +
|
||||
", IP='" + IP + '\'' +
|
||||
", port='" + port + '\'' +
|
||||
", server_id='" + server_id + '\'' +
|
||||
", channel='" + channel + '\'' +
|
||||
", sub_channel='" + sub_channel + '\'' +
|
||||
", status='" + status + '\'' +
|
||||
", plat='" + plat + '\'' +
|
||||
", open_time='" + open_time + '\'' +
|
||||
", is_new='" + is_new + '\'' +
|
||||
", open_type='" + open_type + '\'' +
|
||||
", register_state='" + register_state + '\'' +
|
||||
'}';
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,6 +42,7 @@ public class PowersVo {
|
|||
public int dowOrderList=1;
|
||||
public int bannedManage=1;
|
||||
public int bannedPost=1;
|
||||
public int bannedList = 1;
|
||||
public int updateRoleName=1;
|
||||
public int grossWeight=1;
|
||||
public int InfoManage=1;
|
||||
|
|
@ -54,6 +55,8 @@ public class PowersVo {
|
|||
public int personMailAudit=1;
|
||||
public int chatInfoManage=1;
|
||||
public int chatInfoFind=1;
|
||||
public int support = 1;
|
||||
|
||||
|
||||
public int getChannelGame() {
|
||||
return channelGame;
|
||||
|
|
@ -454,4 +457,20 @@ public class PowersVo {
|
|||
public void setAdminList(int adminList) {
|
||||
this.adminList = adminList;
|
||||
}
|
||||
|
||||
public int getBannedList() {
|
||||
return bannedList;
|
||||
}
|
||||
|
||||
public void setBannedList(int bannedList) {
|
||||
this.bannedList = bannedList;
|
||||
}
|
||||
|
||||
public int getSupport() {
|
||||
return support;
|
||||
}
|
||||
|
||||
public void setSupport(int support) {
|
||||
this.support = support;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@
|
|||
<li th:case="0"><a data-href="findServerInfo" data-title="服务器列表" href="javascript:void(0)">服务器信息</a></li>
|
||||
</div>
|
||||
<div th:switch="${powersVo.serverRegister}">
|
||||
<li th:case="0"><a data-href="serverNumberInfo" data-title="服务器列表" href="javascript:void(0)">服务器注册</a></li>
|
||||
<li th:case="0"><a data-href="serverNumberInfo" data-title="服务器注册" href="javascript:void(0)">服务器注册</a></li>
|
||||
</div>
|
||||
<div th:switch="${powersVo.addServer}">
|
||||
<li th:case="0"><a data-href="/html/addServer.html" data-title="添加服务器" href="javascript:void(0)">添加服务器</a></li>
|
||||
|
|
@ -141,7 +141,6 @@
|
|||
<div th:switch="${powersVo.addWhiteListHero}">
|
||||
<li th:case="0"><a data-href="addHeroPage" data-title="添加白名单账号英雄" href="javascript:;">添加白名单账号英雄</a></li>
|
||||
</div>
|
||||
<!--<li><a data-href="/html/recoverItem.html" data-title="回收道具" href="javascript:;">回收道具</a></li>-->
|
||||
</ul>
|
||||
</dd>
|
||||
</dl>
|
||||
|
|
@ -173,6 +172,9 @@
|
|||
<dt><i class="Hui-iconfont"></i> 禁言/踢人/禁登录/改名<i class="Hui-iconfont menu_dropdown-arrow"></i></dt>
|
||||
<dd>
|
||||
<ul>
|
||||
<div th:switch="${powersVo.bannedList}">
|
||||
<li th:case="0"><a data-href="toGameTitle?type=1" data-title="封禁列表" href="javascript:;">封禁列表</a></li>
|
||||
</div>
|
||||
<div th:switch="${powersVo.bannedPost}">
|
||||
<li th:case="0"><a data-href="toGameTitle?type=1" data-title="禁言/踢下线/禁登录" href="javascript:;">禁言/踢下线/禁登录</a></li>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -297,6 +297,12 @@
|
|||
<label for="banned">封禁管理</label>
|
||||
<ul>
|
||||
<div>
|
||||
<div class="d">
|
||||
<li>
|
||||
<input type="checkbox" name="power" id="banned-4" value="52">
|
||||
<label for="banned-4">封禁列表</label>
|
||||
</li>
|
||||
</div>
|
||||
<div class="a" >
|
||||
<li>
|
||||
<input type="checkbox" name="power" id="banned-1" value="36">
|
||||
|
|
@ -315,8 +321,7 @@
|
|||
<label for="banned-3">根据openid封号</label>
|
||||
</li>
|
||||
</div>
|
||||
<div class="d">
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</ul>
|
||||
</li>
|
||||
|
|
@ -421,6 +426,12 @@
|
|||
</ul>
|
||||
</li>
|
||||
</div>
|
||||
<div>
|
||||
<li>
|
||||
<input type="checkbox" name="power" id="support" value="53">
|
||||
<label for="support">扶持审核</label>
|
||||
</li>
|
||||
</div>
|
||||
<div >
|
||||
<button style="background-color: #A60000;border: none;color: #ffffff;width: 100px;height: 30px" type="button" onclick="return registerUser()" >保存设置</button>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -89,10 +89,28 @@
|
|||
<span class="c-red">*</span>
|
||||
服务器推荐:</label>
|
||||
<div class="formControls col-xs-8 col-sm-9">
|
||||
<input type="hidden" id="isnew" th:value="*{is_new}"/>
|
||||
<select th:name="isnew" class="input-text" id="isnew1"><!--下拉列表-->
|
||||
<option th:value="0">普通</option>
|
||||
<option th:value="1">新服</option>
|
||||
<input type="hidden" id="is_new" th:value="*{is_new}"/>
|
||||
<select th:name="is_new" class="input-text" id="is_new1"><!--下拉列表-->
|
||||
<div th: th:switch="*{is_new}">
|
||||
<option th:value="0">普通</option>
|
||||
<option th:value="1">新服</option>
|
||||
</div>
|
||||
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row cl">
|
||||
<label class="form-label col-xs-4 col-sm-2">
|
||||
<span class="c-red">*</span>
|
||||
服务器注册:</label>
|
||||
<div class="formControls col-xs-8 col-sm-9">
|
||||
<input type="hidden" id="register_state" th:value="*{register_state}"/>
|
||||
|
||||
<select th:name="register_state" class="input-text" id="register_state1"><!--下拉列表-->
|
||||
<div th: th:switch="*{register_state}">
|
||||
<option th:value="1">开启</option>
|
||||
<option th:value="0">关闭</option>
|
||||
</div>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -143,6 +161,21 @@
|
|||
|
||||
$(document).ready(function () {
|
||||
var flag = $("#status").val();
|
||||
var register_state=$("#register_state").val();
|
||||
var is_new=$("#is_new").val();
|
||||
if (register_state === "1"){
|
||||
$("#register_state1 option[value='" + register_state + "']").attr("selected", "selected");
|
||||
} else if(register_state === "0"){
|
||||
$("#register_state1 option[value='" + register_state + "']").attr("selected", "selected");
|
||||
}
|
||||
|
||||
if (is_new === "1"){
|
||||
$("#is_new1 option[value='" + is_new + "']").attr("selected", "selected");
|
||||
} else if(register_state === "0"){
|
||||
$("#is_new1 option[value='" + is_new + "']").attr("selected", "selected");
|
||||
}
|
||||
|
||||
|
||||
//根据值让option选中
|
||||
if (flag === "4") {
|
||||
$("#status1 option[value='" + flag + "']").attr("selected", "selected");
|
||||
|
|
|
|||
Loading…
Reference in New Issue