Merge remote-tracking branch 'origin/dev_v3.2.2' into dev_v3.2.2

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

@@ -158,16 +158,21 @@ public class AuthInfoServiceImpl implements AuthInfoService {
     public AppInfoResult selectAuthInfo() throws Exception {
         Long expireTime = null;
         AppInfo appInfo = solarService.getAppInfo();
+        AuthEnum authEnum = AuthEnum.NON_ACTIVATED;
+        String accessKey = null, accessSecret = null;
         if (Objects.isNull(appInfo)) {//说明未激活，从数据库取最后激活记录
             TSAuth tsAuth = licenseForDb(AuthEnum.OFF_LINE);
-            return new AppInfoResult(tsAuth.getExpireTime(), tsAuth.getAccessKey(), tsAuth.getAccessSecret(), tsAuth.getType());
+            if (Objects.nonNull(tsAuth)) {
+                return new AppInfoResult(tsAuth.getExpireTime(), tsAuth.getAccessKey(), tsAuth.getAccessSecret(), tsAuth.getType());
+            } else {
+                return new AppInfoResult(expireTime, accessKey, accessSecret, authEnum);
+            }
         } else {
-            String accessKey = solarProperties.getAccessKey();
-            String accessSecret = solarProperties.getAccessSecret();
+            accessKey = solarProperties.getAccessKey();
+            accessSecret = solarProperties.getAccessSecret();
             if (Objects.nonNull(appInfo) && Objects.nonNull(appInfo.getControl())) {
                 expireTime = Objects.nonNull(appInfo.getControl().getExpireTime()) ? appInfo.getControl().getExpireTime() : -1;
             }
-            AuthEnum authEnum = AuthEnum.NON_ACTIVATED;
             if (Objects.nonNull(accessKey) && Objects.nonNull(accessSecret)) {
                 authEnum = AuthEnum.ON_LINE;
             } else if (Objects.nonNull(expireTime)) {