shs 1 vuosi sitten
vanhempi
commit
c534133798

+ 1 - 1
aidex-admin/src/main/resources/application-druid.yml

@@ -15,7 +15,7 @@ spring:
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
-                enabled: false
+                enabled: false pull
                 url:
                 username:
                 password:

+ 6 - 4
aidex-system/src/main/java/com/aidex/common/app/server/impl/AppService.java

@@ -201,12 +201,14 @@ public class AppService implements IAppService {
             else
                 distSiteNum = myNum - shipNum;
         }
-        Object num = redisCache.get(CacheConstants.SYS_SURPLUS_KEY+sysShipResVO.getShipId());
+        String numKey = redisCache.get(CacheConstants.SYS_SURPLUS_KEY+sysShipResVO.getShipId()).toString();
         Long resetNum = 0L;
-        if(num == null)
+        if(numKey == null)
             resetNum = -1L;
-        else
-            resetNum = Long.valueOf(num.toString());
+        else {
+            Object num = redisCache.get(numKey);
+            resetNum = num == null ? -1L: Long.valueOf(num.toString());
+        }
 
         sysShipResVO.setReseat(resetNum);
         sysShipResVO.setAwaitTime(awaitTime);