From 41144889f2a48be0c596883832db3ff75d171c41 Mon Sep 17 00:00:00 2001 From: gaojie Date: Fri, 12 Apr 2019 14:24:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jmfy/controller/CdkInfoController.java | 5 ++-- .../com/jmfy/controller/LoginController.java | 6 +++-- src/main/resources/application.properties | 10 ++++--- src/main/resources/static/html/findFlow.html | 22 ++++++++++++++- .../resources/static/html/sendNotice.html | 5 +--- .../resources/static/html/sendSysMail.html | 2 +- src/main/resources/templates/login.html | 27 ++++++++++++++++--- 7 files changed, 58 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/jmfy/controller/CdkInfoController.java b/src/main/java/com/jmfy/controller/CdkInfoController.java index ad7ec12..82ec99c 100644 --- a/src/main/java/com/jmfy/controller/CdkInfoController.java +++ b/src/main/java/com/jmfy/controller/CdkInfoController.java @@ -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()); diff --git a/src/main/java/com/jmfy/controller/LoginController.java b/src/main/java/com/jmfy/controller/LoginController.java index 1c8f41c..d9aed9b 100644 --- a/src/main/java/com/jmfy/controller/LoginController.java +++ b/src/main/java/com/jmfy/controller/LoginController.java @@ -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); diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 3dc77ee..d6e7323 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -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 diff --git a/src/main/resources/static/html/findFlow.html b/src/main/resources/static/html/findFlow.html index 88d4e72..4cfd67a 100644 --- a/src/main/resources/static/html/findFlow.html +++ b/src/main/resources/static/html/findFlow.html @@ -35,7 +35,7 @@
-
+
流水日誌查询 @@ -47,6 +47,7 @@ 开始时间:
+
@@ -55,6 +56,7 @@ 结束时间:
+
@@ -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('服务器id不能为空!'); return false; } + if (userId === '' || userId == null) { + erroCode = $('.USERID'); + erroCode.html('用户id不能为空!'); + return false; + } + if (startTime === '' || startTime == null) { + erroCode = $('.STARTTIME'); + erroCode.html('开始时间不能为空!'); + return false; + } + if (endTime === '' || endTime == null) { + erroCode = $('.ENDTIME'); + erroCode.html('结束时间不能为空!'); + return false; + } return true; } diff --git a/src/main/resources/static/html/sendNotice.html b/src/main/resources/static/html/sendNotice.html index 1e08d44..ccffcc0 100644 --- a/src/main/resources/static/html/sendNotice.html +++ b/src/main/resources/static/html/sendNotice.html @@ -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) { diff --git a/src/main/resources/static/html/sendSysMail.html b/src/main/resources/static/html/sendSysMail.html index 381e526..4adc527 100644 --- a/src/main/resources/static/html/sendSysMail.html +++ b/src/main/resources/static/html/sendSysMail.html @@ -47,6 +47,7 @@ 服务器id:
+
@@ -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(); diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html index 09fa90e..192e345 100644 --- a/src/main/resources/templates/login.html +++ b/src/main/resources/templates/login.html @@ -20,17 +20,19 @@
- +
- +
+
- +
+
@@ -42,8 +44,25 @@
- + + \ No newline at end of file