wangliang пре 2 година
родитељ
комит
1594794712

+ 4 - 12
themis-admin/src/main/java/com/qmth/themis/admin/api/TBOrgController.java

@@ -91,12 +91,8 @@ public class TBOrgController {
                 tbOrg.setUpdateId(tbUser.getId());
             }
             tbOrgService.saveOrUpdate(tbOrg);
-            if (Objects.isNull(cacheService.updateOrgCache(tbOrg.getId()))) {
-                cacheService.removeOrgCache(tbOrg.getId());
-            }
-            if (Objects.isNull(cacheService.updateOrgCodeCache(tbOrg.getCode()))) {
-                cacheService.removeOrgCodeCache(tbOrg.getCode());
-            }
+            cacheService.removeOrgCache(tbOrg.getId());
+            cacheService.removeOrgCodeCache(tbOrg.getCode());
         } catch (Exception e) {
             log.error(SystemConstant.LOG_ERROR, e);
             if (e instanceof DuplicateKeyException) {
@@ -135,12 +131,8 @@ public class TBOrgController {
         //保存机构
         tbOrg.setEnable(enable);
         tbOrgService.updateById(tbOrg);
-        if (Objects.isNull(cacheService.updateOrgCache(orgId))) {
-            cacheService.removeOrgCache(orgId);
-        }
-        if (Objects.isNull(cacheService.updateOrgCodeCache(tbOrg.getCode()))) {
-            cacheService.removeOrgCodeCache(tbOrg.getCode());
-        }
+        cacheService.removeOrgCache(orgId);
+        cacheService.removeOrgCodeCache(tbOrg.getCode());
         return ResultUtil.ok(true);
     }
 }

+ 2 - 6
themis-admin/src/main/java/com/qmth/themis/admin/api/TBUserController.java

@@ -676,9 +676,7 @@ public class TBUserController {
                 cacheService.removeAccountCache(tbUser.getId());
                 cacheService.removeAccountAuthCache(tbUser.getId());
             } else {
-                if (Objects.isNull(cacheService.updateAccountCache(tbUser.getId()))) {
-                    cacheService.removeAccountCache(tbUser.getId());
-                }
+                cacheService.removeAccountCache(tbUser.getId());
             }
         } catch (Exception e) {
             log.error(SystemConstant.LOG_ERROR, e);
@@ -760,9 +758,7 @@ public class TBUserController {
             cacheService.removeAccountCache(tbUser.getId());
             cacheService.removeAccountAuthCache(tbUser.getId());
         } else {
-            if (Objects.isNull(cacheService.updateAccountCache(tbUser.getId()))) {
-                cacheService.removeAccountCache(tbUser.getId());
-            }
+            cacheService.removeAccountCache(tbUser.getId());
         }
         return ResultUtil.ok(true);
     }

+ 1 - 3
themis-business/src/main/java/com/qmth/themis/business/service/impl/AuthInfoServiceImpl.java

@@ -187,9 +187,7 @@ public class AuthInfoServiceImpl implements AuthInfoService {
             } else {
                 tsAuthList.add(new TSAuth(o.getId(), solarProperties.getAccessKey(), solarProperties.getAccessSecret(), authEnum, appInfo.getControl().getExpireTime()));
             }
-            if (Objects.isNull(cacheService.updateAuthInfoCache(o.getCode()))) {
-                cacheService.removeAuthInfoCache(o.getCode());
-            }
+            cacheService.removeAuthInfoCache(o.getCode());
 
             QueryWrapper<TBOrg> tbOrgQueryWrapper = new QueryWrapper<>();
             tbOrgQueryWrapper.lambda().eq(TBOrg::getCode, o.getCode());