Browse Source

激活BUG修复

wangliang 2 years ago
parent
commit
abb1bed999

+ 2 - 1
teachcloud-common-api/src/main/java/com/qmth/teachcloud/common/api/api/TSAuthController.java

@@ -89,8 +89,9 @@ public class TSAuthController {
         AppInfo appInfo = solarService.update(accessKey, accessSecret);
         if (Objects.isNull(appInfo)) {
             throw ExceptionResultEnum.ERROR.exception("激活失败,请检查key和secret输入是否正确");
+        } else {
+            authInfoService.appInfoInit(appInfo, accessKey, accessSecret);
         }
-        authInfoService.appInfoInit(appInfo, accessKey, accessSecret);
         return ResultUtil.ok(true);
     }
 

+ 2 - 4
teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/AuthInfoServiceImpl.java

@@ -144,8 +144,9 @@ public class AuthInfoServiceImpl implements AuthInfoService {
         AppInfo appInfo = solarService.update(licenseData);
         if (Objects.isNull(appInfo)) {
             throw ExceptionResultEnum.ERROR.exception("激活失败");
+        } else {
+            authInfoService.saveAuthInfo(appInfo, AuthEnum.OFF_LINE, licenseData);
         }
-        authInfoService.saveAuthInfo(appInfo, AuthEnum.OFF_LINE, licenseData);
     }
 
     /**
@@ -161,9 +162,6 @@ public class AuthInfoServiceImpl implements AuthInfoService {
         String accessSecret = solarProperties.getAccessSecret();
         if (Objects.nonNull(appInfo) && Objects.nonNull(appInfo.getControl())) {
             expireTime = Objects.nonNull(appInfo.getControl().getExpireTime()) ? appInfo.getControl().getExpireTime() : -1;
-        } else {
-            accessKey = null;
-            accessSecret = null;
         }
         AuthEnum authEnum = AuthEnum.NON_ACTIVATED;
         if (Objects.nonNull(accessKey) && Objects.nonNull(accessSecret)) {