From 433811f731e6be8f8fea8cdd03982cd3f83e5857 Mon Sep 17 00:00:00 2001 From: huangfeng Date: Wed, 18 Sep 2024 17:27:18 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8E=BB=E6=8E=89Dongle=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../busi/controller/AppLoginController.java | 6 +- .../controller/BusiHomePageController.java | 6 +- .../busi/service/BusiHomePageService.java | 2 +- .../service/impl/BusiHomePageServiceImpl.java | 66 ++++++++--------- .../base/service/impl/LoginServiceImpl.java | 70 +++++++++---------- 5 files changed, 75 insertions(+), 75 deletions(-) diff --git a/busi-back/busi-app-control/src/main/java/com/huatek/busi/controller/AppLoginController.java b/busi-back/busi-app-control/src/main/java/com/huatek/busi/controller/AppLoginController.java index 1a81aac..10c9ea6 100644 --- a/busi-back/busi-app-control/src/main/java/com/huatek/busi/controller/AppLoginController.java +++ b/busi-back/busi-app-control/src/main/java/com/huatek/busi/controller/AppLoginController.java @@ -41,9 +41,9 @@ public class AppLoginController { @PostMapping(value = "/login", produces = { "application/json;charset=utf-8" }) public Map login(@RequestBody UserDTO user) throws UnknownHostException { log.info("*************"); - if(!busiHomePageService.verifyDongle()){ - return ResultUtil.put(Md5Util.DANGLE_CODE_FAIL, "", null); - } +// if(!busiHomePageService.verifyDongle()){ +// return ResultUtil.put(Md5Util.DANGLE_CODE_FAIL, "", null); +// } return loginService.login(user,time); } } diff --git a/busi-back/busi-back-control/src/main/java/com/huatek/busi/controller/BusiHomePageController.java b/busi-back/busi-back-control/src/main/java/com/huatek/busi/controller/BusiHomePageController.java index 1f352ad..c4ab28c 100644 --- a/busi-back/busi-back-control/src/main/java/com/huatek/busi/controller/BusiHomePageController.java +++ b/busi-back/busi-back-control/src/main/java/com/huatek/busi/controller/BusiHomePageController.java @@ -182,9 +182,9 @@ public class BusiHomePageController { @RequestParam(value = "limit", required = false) Integer limit, @RequestParam(value = "warningTime", required = false) String warningTime, @RequestParam(value = "warningTimeEnd", required = false) String warningTimeEnd) throws UnknownHostException { - if(!busiHomePageService.verifyDongle()){ - return ResultUtil.put(Md5Util.DANGLE_CODE_FAIL, "", null); - } +// if(!busiHomePageService.verifyDongle()){ +// return ResultUtil.put(Md5Util.DANGLE_CODE_FAIL, "", null); +// } BusiEqmWarningDto busiEqmWarningDto = new BusiEqmWarningDto(); busiEqmWarningDto.setEqType(eqType); busiEqmWarningDto.setGzType(gzType); diff --git a/busi-back/busi-back-service/src/main/java/com/huatek/busi/service/BusiHomePageService.java b/busi-back/busi-back-service/src/main/java/com/huatek/busi/service/BusiHomePageService.java index 65f2ca2..aac4c8b 100644 --- a/busi-back/busi-back-service/src/main/java/com/huatek/busi/service/BusiHomePageService.java +++ b/busi-back/busi-back-service/src/main/java/com/huatek/busi/service/BusiHomePageService.java @@ -61,7 +61,7 @@ public interface BusiHomePageService { PageInfo findCurrentWarningBySensorCodeList(BusiEqmWarningDto busiEqmWarningDto); - public boolean verifyDongle() throws UnknownHostException; +// public boolean verifyDongle() throws UnknownHostException; /** * 首页默认获取避雷器气象信息 diff --git a/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/service/impl/BusiHomePageServiceImpl.java b/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/service/impl/BusiHomePageServiceImpl.java index 6369018..5a1716f 100644 --- a/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/service/impl/BusiHomePageServiceImpl.java +++ b/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/service/impl/BusiHomePageServiceImpl.java @@ -110,8 +110,8 @@ public class BusiHomePageServiceImpl implements BusiHomePageService { @Autowired private BusiArresterSensorMapper busiArresterSensorMapper; - @Value("${dangle.dat.path}") - private String danglePath; +// @Value("${dangle.dat.path}") +// private String danglePath; @Value("${dangle.dat.ip}") private String ip; @@ -239,37 +239,37 @@ public class BusiHomePageServiceImpl implements BusiHomePageService { return busiEqmWarningService.findCurrentWarningBySensorCodeList(busiEqmWarningDto); } - @Override - public boolean verifyDongle() throws UnknownHostException { - String path=danglePath; - File file = new File(path); - List list = new ArrayList(); - String sourse=""; - if (file.exists()) { - try { - //将文件的每行为一个元素添加到list中 - list = Files.readAllLines(file.toPath(), Charset.defaultCharset()); - } catch (IOException ex) { - ex.printStackTrace(); - } - if (list.isEmpty()){ - return false; - } - - }else{ - return false; - } - for (Object line : list) { - sourse+=line; - } - String sourseNew = Md5Util.md5(Md5Util.DANGLE_CONTENT+ip+mac).toUpperCase(); - if(sourse.equals(sourseNew)){ - return true; - }else{ - return false; - } - - } +// @Override +// public boolean verifyDongle() throws UnknownHostException { +// String path=danglePath; +// File file = new File(path); +// List list = new ArrayList(); +// String sourse=""; +// if (file.exists()) { +// try { +// //将文件的每行为一个元素添加到list中 +// list = Files.readAllLines(file.toPath(), Charset.defaultCharset()); +// } catch (IOException ex) { +// ex.printStackTrace(); +// } +// if (list.isEmpty()){ +// return false; +// } +// +// }else{ +// return false; +// } +// for (Object line : list) { +// sourse+=line; +// } +// String sourseNew = Md5Util.md5(Md5Util.DANGLE_CONTENT+ip+mac).toUpperCase(); +// if(sourse.equals(sourseNew)){ +// return true; +// }else{ +// return false; +// } +// +// } @Override public MeteorologicalVo queryMeteorologicalInfo() { diff --git a/frame-base/frame-base-serviceImpl/src/main/java/com/huatek/frame/base/service/impl/LoginServiceImpl.java b/frame-base/frame-base-serviceImpl/src/main/java/com/huatek/frame/base/service/impl/LoginServiceImpl.java index eea7fed..0a070ff 100644 --- a/frame-base/frame-base-serviceImpl/src/main/java/com/huatek/frame/base/service/impl/LoginServiceImpl.java +++ b/frame-base/frame-base-serviceImpl/src/main/java/com/huatek/frame/base/service/impl/LoginServiceImpl.java @@ -52,8 +52,8 @@ import com.huatek.torch.util.uuid.Uuid; @Transactional(rollbackFor = Exception.class) public class LoginServiceImpl implements LoginService { - @Value("${dangle.dat.path}") - private String danglePath; +// @Value("${dangle.dat.path}") +// private String danglePath; @Value("${dangle.dat.ip}") private String ip; @@ -76,9 +76,9 @@ public class LoginServiceImpl implements LoginService { @Override public Map login(UserDTO user, long time, String tag, String code, boolean verify) throws Exception{ - if(!verifyDongle()){ - return ResultUtil.put(Md5Util.DANGLE_CODE_FAIL, "", null); - } +// if(!verifyDongle()){ +// return ResultUtil.put(Md5Util.DANGLE_CODE_FAIL, "", null); +// } ValueOperations operations = redisTemplate.opsForValue(); if (verify) { if (StringUtils.isEmpty(code)) { @@ -137,36 +137,36 @@ public class LoginServiceImpl implements LoginService { return ResultUtil.put(ConstantUtil.REQUEST_SUCCESS, "", ""); } - public boolean verifyDongle() throws UnknownHostException { - String path=danglePath; - File file = new File(path); - List list = new ArrayList(); - String sourse=""; - if (file.exists()) { - try { - //将文件的每行为一个元素添加到list中 - list = Files.readAllLines(file.toPath(), Charset.defaultCharset()); - } catch (IOException ex) { - ex.printStackTrace(); - } - if (list.isEmpty()){ - return false; - } - - }else{ - return false; - } - for (Object line : list) { - sourse+=line; - } - String sourseNew =Md5Util.md5(Md5Util.DANGLE_CONTENT+ip+mac).toUpperCase(); - if(sourse.equals(sourseNew)){ - return true; - }else{ - return false; - } - - } +// public boolean verifyDongle() throws UnknownHostException { +// String path=danglePath; +// File file = new File(path); +// List list = new ArrayList(); +// String sourse=""; +// if (file.exists()) { +// try { +// //将文件的每行为一个元素添加到list中 +// list = Files.readAllLines(file.toPath(), Charset.defaultCharset()); +// } catch (IOException ex) { +// ex.printStackTrace(); +// } +// if (list.isEmpty()){ +// return false; +// } +// +// }else{ +// return false; +// } +// for (Object line : list) { +// sourse+=line; +// } +// String sourseNew =Md5Util.md5(Md5Util.DANGLE_CONTENT+ip+mac).toUpperCase(); +// if(sourse.equals(sourseNew)){ +// return true; +// }else{ +// return false; +// } +// +// } @Override public Map changePwd(String token, Map map) { String oldPwd = map.get("oldPwd");