From f512777c4f59394decfa92f900099f233da79582 Mon Sep 17 00:00:00 2001 From: hujl Date: Fri, 18 Nov 2022 09:21:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=86=E7=A0=81=E9=94=99=E8=AF=AF=E6=8F=90?= =?UTF-8?q?=E9=86=92=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/manage/controller/FontController.java | 53 +++++-------------- .../manage/controller/LoginController.java | 7 +++ .../webapp/WEB-INF/views/loginDir/login.jsp | 1 - .../bootstrap-table/bootstrap-table.js | 8 +-- .../src/main/webapp/static/js/login.js | 41 +++++++------- .../src/main/java/com/manage/util/Msg.java | 8 +++ 6 files changed, 53 insertions(+), 65 deletions(-) diff --git a/power-admin/src/main/java/com/manage/controller/FontController.java b/power-admin/src/main/java/com/manage/controller/FontController.java index ad5a4cd..494d9a9 100644 --- a/power-admin/src/main/java/com/manage/controller/FontController.java +++ b/power-admin/src/main/java/com/manage/controller/FontController.java @@ -598,28 +598,19 @@ public class FontController { @RequestMapping(value="getQRcode") @ResponseBody public QrBean getQRcode(QRcode qRcode, HttpServletRequest request){ - // 获得Http客户端 CloseableHttpClient httpClient = HttpClientBuilder.create().build(); // 创建Post请求 HttpPost httpPost = new HttpPost("http://192.168.1.212:8080/cloudkeyserver/api/login/qrcode/nostatus/2CKV1"); -// qRcode.setLoginTypeBitValue(16); -// qRcode.setType(3); -// qRcode.setProjectUid("cloudkey-fstth"); -// qRcode.setApplicationId("fstth-wzh"); - System.out.println("qRcode:::::"+qRcode.getApplicationId()); //json格式转换 String jsonString = JSON.toJSONString(qRcode); - System.out.println("jsonString1::::"+jsonString); StringEntity entity = new StringEntity(jsonString, "UTF-8"); - System.out.println("jsonString::::"+jsonString); // post请求是将参数放在请求体里面传过去的;这里将entity放入post请求体中 httpPost.setEntity(entity); httpPost.setHeader("Content-Type", "application/json;charset=utf8"); // 响应模型 CloseableHttpResponse response = null; HttpEntity responseEntity=null; - String s =""; QrBean qrBean=new QrBean(); try { // 由客户端执行(发送)Post请求 @@ -635,11 +626,8 @@ public class FontController { String qrCodeIdentity = contentsObject.getString("qrCodeIdentity"); JSONArray qrCodes = contentsObject.getJSONArray("qrCodes"); String qrCodeBase64 = qrCodes.getJSONObject(0).get("qrCodeBase64").toString(); - - qrBean.setQrCodeBase64(qrCodeBase64); qrBean.setQrCodeIdentity(qrCodeIdentity); - System.out.println("qrBean::::"+qrBean.getQrCodeIdentity()); } } catch (ClientProtocolException e) { e.printStackTrace(); @@ -671,7 +659,6 @@ public class FontController { @RequestMapping(value="getScanCode") @ResponseBody public ScanCodeRes getQRcode(ScanCode scanCode, HttpServletRequest request){ - System.out.println("scanCode123::::"+scanCode.getQrCodeIdentity()); // 获得Http客户端 CloseableHttpClient httpClient = HttpClientBuilder.create().build(); // 创建Post请求 @@ -739,18 +726,18 @@ public class FontController { //json格式转换 String jsonString = JSON.toJSONString(userCode); StringEntity entity = new StringEntity(jsonString, "UTF-8"); - // post请求是将参数放在请求体里面传过去的;这里将entity放入post请求体中 - httpPost.setEntity(entity); - httpPost.setHeader("Content-Type", "application/json;charset=utf8"); - // 响应模型 - CloseableHttpResponse response = null; - HttpEntity responseEntity=null; - UserCodeRes userCodeRes =new UserCodeRes(); - try { - // 由客户端执行(发送)Post请求 - response = httpClient.execute(httpPost); - // 从响应模型中获取响应实体 - responseEntity = response.getEntity(); + // post请求是将参数放在请求体里面传过去的;这里将entity放入post请求体中 + httpPost.setEntity(entity); + httpPost.setHeader("Content-Type", "application/json;charset=utf8"); + // 响应模型 + CloseableHttpResponse response = null; + HttpEntity responseEntity=null; + UserCodeRes userCodeRes =new UserCodeRes(); + try { + // 由客户端执行(发送)Post请求 + response = httpClient.execute(httpPost); + // 从响应模型中获取响应实体 + responseEntity = response.getEntity(); System.out.println("responseEntity::::"+responseEntity); System.out.println("响应状态为:" + response.getStatusLine()); if (responseEntity != null) { @@ -797,23 +784,11 @@ public class FontController { public Msg qRCodeLogin(Power_User powerUser, HttpServletResponse response, HttpServletRequest request, Model model){ try { Power_UserVo user = power_userService.findUserName(powerUser); - System.out.println("user:::::"+user); //添加进操作日志 Power_Log log = new Power_Log(); if(user != null){ -// //存session密码置空 -//// //是否记住密码功能 -//// MyCookieUtil.remember(request, response); - //设置token缓存 String token = UUID.randomUUID().toString(); //查询归属医院 - /*long start5 = System.currentTimeMillis(); - Power_User_Dict powerUserDict = powerUserDictMapper.selectDictIdByUserId(user.getUserId()); - long end5 = System.currentTimeMillis(); - System.out.println("查询医院时间="+(end5-start5)/1000.0+"s"); - user.setDictId(powerUserDict.getDictId());*/ - //设置用户登录次数缓存 - //CacheManager.addloginUserCount(fmt.format(new Date()),user.getUserName()); CacheManager.addExcCount("noExc"); List list = null; List menuList = new ArrayList<>(); @@ -867,10 +842,6 @@ public class FontController { url = "http://"+ip+":"+POWER_PORT+"/power/gatewayPage"; } - //request.getRequestDispatcher(url).forward(request, response); - - //response.sendRedirect(url); - //return "redirect:gatewayPage"; return Msg.success().add("url",url); }else{ //登录失败 diff --git a/power-admin/src/main/java/com/manage/controller/LoginController.java b/power-admin/src/main/java/com/manage/controller/LoginController.java index e20074b..1846d59 100644 --- a/power-admin/src/main/java/com/manage/controller/LoginController.java +++ b/power-admin/src/main/java/com/manage/controller/LoginController.java @@ -69,7 +69,13 @@ public class LoginController { @ResponseBody public Msg login(Power_User powerUser,HttpServletResponse response, HttpServletRequest request,Model model){ try { + String userName = powerUser.getUserName(); + if (!userName.equals("admin")){ + String s ="00" + userName; + powerUser.setUserName(s); + } Power_UserVo user = powerUserService.findPowerUserByUserNameAndUserPwd(powerUser); + //添加进操作日志 Power_Log log = new Power_Log(); if(user != null){ @@ -162,6 +168,7 @@ public class LoginController { log.setRemark("已错误【"+wrongNum+"】次"); logService.insert(log); request.setAttribute("msg", "用户名或密码不正确"); + return Msg.failUser(); } }catch (Exception e){ e.printStackTrace(); diff --git a/power-admin/src/main/webapp/WEB-INF/views/loginDir/login.jsp b/power-admin/src/main/webapp/WEB-INF/views/loginDir/login.jsp index 547abac..dca2d9f 100644 --- a/power-admin/src/main/webapp/WEB-INF/views/loginDir/login.jsp +++ b/power-admin/src/main/webapp/WEB-INF/views/loginDir/login.jsp @@ -83,7 +83,6 @@
-

${msg}

diff --git a/power-admin/src/main/webapp/static/bootstrap-3.3.7/bower_components/bootstrap-table/bootstrap-table.js b/power-admin/src/main/webapp/static/bootstrap-3.3.7/bower_components/bootstrap-table/bootstrap-table.js index ac65a6c..80ff7cf 100644 --- a/power-admin/src/main/webapp/static/bootstrap-3.3.7/bower_components/bootstrap-table/bootstrap-table.js +++ b/power-admin/src/main/webapp/static/bootstrap-3.3.7/bower_components/bootstrap-table/bootstrap-table.js @@ -218,7 +218,7 @@ return item[field]; } var props = field.split('.'); - // IE8 for...in ὫҲöٳ ʹ for loop + // ��IE8 �� for...in �Ὣ����Ҳö�ٳ��� ʹ�� for loop // for (var p in props) { // value = value[props[p]]; // } @@ -1247,8 +1247,8 @@ html.push(''); html.push( - '
', - '
תҳ
', + '
', + '
��ת����ҳ
', '', '