Merge remote-tracking branch 'origin/master'

ruoyi-auth/src/main/java/org/dromara/auth/service/SysLoginService.java

@@ -299,7 +299,7 @@ public class SysLoginService {
             throw new ServiceException("参数有误!");
         }
 
-        boolean isTest = true; // todo 是否模拟单点登陆为正常结果,仅测试时为true
+        boolean isTest = false; // todo 是否模拟单点登陆为正常结果,仅测试时为true
         Map<String, String> loginInfo = new HashMap<>(2);
         if(!isTest){
             // code 换取 token

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/service/impl/XfTermServiceImpl.java

@@ -188,7 +188,7 @@ public class XfTermServiceImpl implements IXfTermService {
      * @param bo 消费设备
      * @return 是否修改成功
      */
-    @CacheEvict(cacheNames = CacheNames.PT_PARAMETER, allEntries = true)
+    @CacheEvict(cacheNames = CacheNames.PT_TERM, allEntries = true)
     @Override
     public Boolean updateByBo(XfTermBo bo) {
         XfTerm update = MapstructUtils.convert(bo, XfTerm.class);
@@ -196,7 +196,7 @@ public class XfTermServiceImpl implements IXfTermService {
         return baseMapper.updateById(update) > 0;
     }
 
-    @CacheEvict(cacheNames = CacheNames.PT_PARAMETER, allEntries = true)
+    @CacheEvict(cacheNames = CacheNames.PT_TERM, allEntries = true)
     public Boolean updateParamByBo(XfTermParamBo bo){
         XfTerm update = MapstructUtils.convert(bo, XfTerm.class);
         return baseMapper.updateById(update) > 0;
@@ -231,7 +231,7 @@ public class XfTermServiceImpl implements IXfTermService {
      * @return 是否删除成功
      */
     @Override
-    @CacheEvict(cacheNames = CacheNames.PT_PARAMETER, allEntries = true)
+    @CacheEvict(cacheNames = CacheNames.PT_TERM, allEntries = true)
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         if(isValid){
             //可以删除