pipIrr-platform/pipIrr-global/pom.xml
@@ -69,7 +69,6 @@ <dependency> <groupId>org.projectlombok</groupId> <artifactId>lombok</artifactId> <version>1.18.28</version> </dependency> <dependency> <groupId>org.aspectj</groupId> pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/captcha/CaptchaCtrl.java
@@ -74,7 +74,7 @@ baCaptcha.setCode(captchaDomain.getCode()); baCaptcha.setExpiration(calendar.getTimeInMillis()); Long rec = captchaSV.addCaptcha(baCaptcha); System.out.println("token: " + captchaDomain.getToken() + "; code: " + captchaDomain.getCode()); //System.out.println("token: " + captchaDomain.getToken() + "; code: " + captchaDomain.getCode()); // 无用信息设空 captchaDomain.setText(null); @@ -118,7 +118,7 @@ baCaptcha.setCode(captchaDomain.getCode()); baCaptcha.setExpiration(calendar.getTimeInMillis()); Long rec = captchaSV.addCaptcha(baCaptcha); System.out.println("token: " + captchaDomain.getToken() + "; code: " + captchaDomain.getCode()); //System.out.println("token: " + captchaDomain.getToken() + "; code: " + captchaDomain.getCode()); // 以文件流的形式,输出验证码图片 ServletOutputStream out = null; pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeStateReceiverCtrl.java
@@ -317,6 +317,13 @@ if(!hasRunning){ cache.ugOverallState.allOver = true ; } if(cache.ugOverallState.allOver){ if(cache.ugRtuStateList != null && cache.ugRtuStateList.size() > 0){ for(UpgradeRtu rtu : cache.ugRtuStateList){ rtu.isOver = true ; } } } return hasRunning ; } }