master
gaojie 2019-04-12 14:24:24 +08:00
parent dc1b551e37
commit 41144889f2
7 changed files with 58 additions and 19 deletions

View File

@ -92,9 +92,8 @@ public class CdkInfoController {
UseCDKInfoVo useCDKInfoVo = new UseCDKInfoVo();
useCDKInfoVo.setIsData(1);
useCDKInfoVo.setUserId(cdkUseInfo.getUid());
// CUser cUser = userInfoDao.findCuserInfo(cdkUseInfo.getServerId(), cdkUseInfo.getUid());
// useCDKInfoVo.setUserName(cUser.getUserName());
useCDKInfoVo.setUserName("哈哈哈");
CUser cUser = userInfoDao.findCuserInfo(cdkUseInfo.getServerId(), cdkUseInfo.getUid());
useCDKInfoVo.setUserName(cUser.getUserName());
CUserInfo cUserInfo = userInfoDao.findUserInfoByUserId(cdkUseInfo.getUid());
useCDKInfoVo.setOpenId(cUserInfo.getOpenId());
useCDKInfoVo.setGoodsName(scdkInfo.getGoodsName());

View File

@ -31,8 +31,10 @@ public class LoginController {
public String loginVerify(String userName,String password,HttpSession session) throws Exception {
CAdmin admin = cUserDao.findAdmin(userName);
boolean verify = false;
if (password.equals(admin.getPassword())){
verify = true;
if (admin != null){
if (password.equals(admin.getPassword())) {
verify = true;
}
}
if (verify) {
session.setAttribute(WebSecurityConfig.SESSION_KEY, userName);

View File

@ -1,8 +1,10 @@
server.port=8888
##数据库配置
spring.datasource.driver-class-name=com.mysql.jdbc.Driver
spring.datasource.url=jdbc:mysql://60.1.1.11:3306/Tlog?useUnicode=true&characterEncoding=utf-8
spring.datasource.username=root
spring.datasource.password=123456
#spring.datasource.driver-class-name=com.mysql.jdbc.Driver
#spring.datasource.url=jdbc:mysql://60.1.1.11:3306/Tlog?useUnicode=true&characterEncoding=utf-8
#spring.datasource.username=root
#spring.datasource.password=123456
#开发,时关闭缓存不然没法看到实时页面
spring.thymeleaf.cache=false

View File

@ -35,7 +35,7 @@
<a class="btn btn-success radius r" style="line-height:1.6em;margin-top:3px" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
</nav>
<div class="page-container">
<form class="form form-horizontal" id="form-article-add" action="/findFlow" method="get" onsubmit="return findFlow">
<form class="form form-horizontal" id="form-article-add" action="/findFlow" method="get" onsubmit="return findFlow()">
<div id="tab-system" class="HuiTab">
<div class="tabBar cl">
<span>流水日誌查询</span>
@ -47,6 +47,7 @@
开始时间:</label>
<div class="formControls col-xs-8 col-sm-9">
<input type="text" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss',minDate:'#F{$dp.$D(\'datemin\')}' })" id="datemin" class="input-text Wdate" style="width:180px;" name="startTime">
<span class="STARTTIME"></span>
</div>
</div>
<div class="row cl">
@ -55,6 +56,7 @@
结束时间:</label>
<div class="formControls col-xs-8 col-sm-9">
<input type="text" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss',minDate:'#F{$dp.$D(\'datemin\')}' })" id="datemax" class="input-text Wdate" style="width:180px;" name="endTime">
<span class="ENDTIME"></span>
</div>
</div>
<div class="row cl">
@ -122,10 +124,28 @@
function findFlow() {
var erroCode = $('.SERVERID');
var serverId = $("input[name='serverId']").val();
var userId = $("input[name='userId']").val();
var startTime = $("input[name='startTime']").val();
var endTime = $("input[name='endTime']").val();
if (serverId === '' || serverId == null) {
erroCode.html('<span style="color: red; ">服务器id不能为空!</span>');
return false;
}
if (userId === '' || userId == null) {
erroCode = $('.USERID');
erroCode.html('<span style="color: red; ">用户id不能为空!</span>');
return false;
}
if (startTime === '' || startTime == null) {
erroCode = $('.STARTTIME');
erroCode.html('<span style="color: red; ">开始时间不能为空!</span>');
return false;
}
if (endTime === '' || endTime == null) {
erroCode = $('.ENDTIME');
erroCode.html('<span style="color: red; ">结束时间不能为空!</span>');
return false;
}
return true;
}
</script>

View File

@ -224,7 +224,6 @@ $(function(){
});
});
$('#sendNotice').load(function () {
alert(1111);
// 根据后台返回值处理结果
var j=$.parseJSON(text);
if(j.status!=0) {
@ -238,7 +237,6 @@ function sendNoticeCheck() {
var erroCode = $('.SERVERID');
var serverId = $("input[name='serverId']").val();
var contentType = document.getElementById("contentType").value;
var isSkip = document.getElementById("isSkip").value;
var gameLabel = document.getElementById("gameLabel").value;
var popType = document.getElementById("popType").value;
var popCycle = document.getElementById("popCycle").value;
@ -308,8 +306,7 @@ function sendNoticeCheck() {
"priorityLevel": priorityLevel,
"startTime": startTime,
"endTime": endTime,
"version": version,
"isSkip": isSkip
"version": version
},
url: "/sendNotice",
success: function (data) {

View File

@ -47,6 +47,7 @@
服务器id</label>
<div class="formControls col-xs-8 col-sm-9">
<input type="text" name="serverId" placeholder="单服邮件填写服务器id,全服邮件服务器id为0" value="" class="input-text"/>
<span class="SERVERID"></span>
</div>
</div>
<div class="row cl">
@ -155,7 +156,6 @@ function sendSysMail() {
var serverId = $("input[name='serverId']").val();
var mailTitle = $("input[name='mailTitle']").val();
var mailContent = $("textarea[name='mailContent']").val();
alert(mailContent);
var attach = $("input[name='attach']").val();
var isAttach = document.getElementById("isAttach").value;
var sendTime = $("input[name='sendTime']").val();

View File

@ -20,17 +20,19 @@
<body>
<div class="loginWraper">
<div id="loginform" class="loginBox">
<form class="form form-horizontal" action="/loginVerify" method="post">
<form class="form form-horizontal" action="/loginVerify" method="post" onsubmit="return loginUser()">
<div class="row cl">
<label class="form-label col-xs-3"><i class="Hui-iconfont">&#xe60d;</i></label>
<div class="formControls col-xs-8">
<input id="userName" name="userName" type="text" placeholder="账户" class="input-text size-L">
<input id="userName" name="userName" type="text" placeholder="账户" class="input-text size-L"><br>
<span class="USERNAME"></span>
</div>
</div>
<div class="row cl">
<label class="form-label col-xs-3"><i class="Hui-iconfont">&#xe60e;</i></label>
<div class="formControls col-xs-8">
<input id="password" name="password" type="password" placeholder="密码" class="input-text size-L">
<input id="password" name="password" type="password" placeholder="密码" class="input-text size-L"><br>
<span class="PASSWORD"></span>
</div>
</div>
<div class="row cl">
@ -42,8 +44,25 @@
</form>
</div>
</div>
<div class="footer">Copyright 蓝鲸时代 by H-ui.admin v3.1</div>
<div class="footer">蓝鲸时代</div>
<script type="text/javascript" src="lib/jquery/1.9.1/jquery.min.js"></script>
<script type="text/javascript" src="static/h-ui/js/H-ui.min.js"></script>
<script type="text/javascript">
function loginUser() {
var erroCode = $('.USERNAME');
var userName = $("input[name='userName']").val();
var password = $("input[name='password']").val();
if (userName === '' || userName == null) {
erroCode.html('<span style="color: red; ">用户名不能为空!</span>');
return false;
}
if (password === '' || password == null) {
erroCode = $('.PASSWORD');
erroCode.html('<span style="color: red; ">密码不能为空!</span>');
return false;
}
return true;
}
</script>
</body>
</html>