diff --git a/tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/aspect/PreAuthorizeAspect.java b/tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/aspect/PreAuthorizeAspect.java index aa665c7..aacb253 100644 --- a/tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/aspect/PreAuthorizeAspect.java +++ b/tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/aspect/PreAuthorizeAspect.java @@ -36,12 +36,13 @@ public class PreAuthorizeAspect * 2. 类上的注解 * 3. 父类或接口上的注解 */ - public static final String POINTCUT_SIGN = " @annotation(com.tongran.common.security.annotation.RequiresLogin) || " + public static final String POINTCUT_SIGN = " (@annotation(com.tongran.common.security.annotation.RequiresLogin) || " + "@annotation(com.tongran.common.security.annotation.RequiresPermissions) || " + "@annotation(com.tongran.common.security.annotation.RequiresRoles) || " + "@within(com.tongran.common.security.annotation.RequiresLogin) || " + "@within(com.tongran.common.security.annotation.RequiresPermissions) || " - + "@within(com.tongran.common.security.annotation.RequiresRoles)"; + + "@within(com.tongran.common.security.annotation.RequiresRoles))" + + "&& !@annotation(com.tongran.common.security.annotation.InnerAuth)"; /** * 声明AOP签名 diff --git a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmRegistrationMachineController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmRegistrationMachineController.java index 834ae23..758b2be 100644 --- a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmRegistrationMachineController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmRegistrationMachineController.java @@ -23,7 +23,7 @@ import java.util.List; */ @RestController @RequestMapping("/machine") -@RequiresPermissions("system:machine") +@RequiresPermissions("system:registration") public class RmRegistrationMachineController extends BaseController { @Autowired diff --git a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmSwitchInterfaceInfoController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmSwitchInterfaceInfoController.java index 0372d11..dbed389 100644 --- a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmSwitchInterfaceInfoController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmSwitchInterfaceInfoController.java @@ -23,7 +23,7 @@ import java.util.List; */ @RestController @RequestMapping("/switchInterfaceInfo") -@RequiresPermissions("system:switchInterfaceInfo") +@RequiresPermissions("rocketmq:switchInfo") public class RmSwitchInterfaceInfoController extends BaseController { @Autowired diff --git a/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/RmResourceRegistrationServiceImpl.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/RmResourceRegistrationServiceImpl.java index ddd63e3..0804914 100644 --- a/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/RmResourceRegistrationServiceImpl.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/RmResourceRegistrationServiceImpl.java @@ -1080,13 +1080,13 @@ public class RmResourceRegistrationServiceImpl implements IRmResourceRegistratio public int addRemark(RmResourceRegistration rmResourceRegistration) { rmResourceRegistration.setDeployDevice(rmResourceRegistration.getDeployDevice().replace("\n",",")); int rows = rmResourceRegistrationMapper.addRemark(rmResourceRegistration); - return rows; + return 1; } @Override public int updateRemark(RmResourceRegistration rmResourceRegistration) { rmResourceRegistration.setDeployDevice(rmResourceRegistration.getDeployDevice().replace("\n",",")); int rows = rmResourceRegistrationMapper.updateRemark(rmResourceRegistration); - return rows; + return 1; } @Override public int addReportedBandwidth(RmResourceRegistration rmResourceRegistration) { diff --git a/tongran-modules/tongran-system/src/main/resources/logback.xml b/tongran-modules/tongran-system/src/main/resources/logback.xml index c5c96ec..5e8d5d7 100644 --- a/tongran-modules/tongran-system/src/main/resources/logback.xml +++ b/tongran-modules/tongran-system/src/main/resources/logback.xml @@ -56,6 +56,26 @@ DENY + + + ${log.path}/debug.log + + ${log.path}/debug.%d{yyyy-MM-dd}.log + 30 + + + ${log.pattern} + + + + ERROR + DENY + NEUTRAL + + + DEBUG + + diff --git a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmResourceRemoteServiceImpl.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmResourceRemoteServiceImpl.java index aabca4c..240d51c 100644 --- a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmResourceRemoteServiceImpl.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmResourceRemoteServiceImpl.java @@ -121,12 +121,14 @@ public class RmResourceRemoteServiceImpl implements IRmResourceRemoteService for (RmResourceRemote resourceRemote : reslutList) { // 脚本执行返回结果 JSONObject jsonObject = JSONObject.parseObject(resourceRemote.getDescription()); - String command = jsonObject.getString("command"); - String resOut = jsonObject.getString("resOut"); - String sucOrFail = (!"".equals(resOut) && !"脚本执行失败".equals(resOut)) ? "\n执行成功，\n":"\n执行失败，\n"; StringBuilder resultSb = new StringBuilder(); - resultSb.append("【").append(resourceRemote.getClientId()).append("】脚本执行命令：\n") - .append(command).append(sucOrFail).append("执行结果如下：\n").append(resOut); + if(jsonObject != null){ + String command = jsonObject.getString("command"); + String resOut = jsonObject.getString("resOut"); + String sucOrFail = (!"".equals(resOut) && !"脚本执行失败".equals(resOut)) ? "\n执行成功，\n":"\n执行失败，\n"; + resultSb.append("【").append(resourceRemote.getClientId()).append("】脚本执行命令：\n") + .append(command).append(sucOrFail).append("执行结果如下：\n").append(resOut); + } Map map = new HashMap<>(); Date createTime = resourceRemote.getCreateTime(); String createTimeStr = DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", createTime); diff --git a/tongran-rocketmq/src/main/resources/logback.xml b/tongran-rocketmq/src/main/resources/logback.xml index a76ae2a..fa2eb24 100644 --- a/tongran-rocketmq/src/main/resources/logback.xml +++ b/tongran-rocketmq/src/main/resources/logback.xml @@ -57,6 +57,26 @@ DENY + + + ${log.path}/debug.log + + ${log.path}/debug.%d{yyyy-MM-dd}.log + 30 + + + ${log.pattern} + + + + ERROR + DENY + NEUTRAL + + + DEBUG + + diff --git a/tongran-rocketmq/src/main/resources/mapper/rocketmq/RmResourceRemoteMapper.xml b/tongran-rocketmq/src/main/resources/mapper/rocketmq/RmResourceRemoteMapper.xml index 3b4d622..567c48b 100644 --- a/tongran-rocketmq/src/main/resources/mapper/rocketmq/RmResourceRemoteMapper.xml +++ b/tongran-rocketmq/src/main/resources/mapper/rocketmq/RmResourceRemoteMapper.xml @@ -43,6 +43,7 @@ and client_id = #{clientId} and result_flag = #{resultFlag} and script_id = #{scriptId} + and script_id != ''