激活BUG修复

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

@@ -89,8 +89,8 @@ public class TSAuthController {
     @RequestMapping(value = "/online/activation", method = RequestMethod.POST)
     public Result onlineActivation(@ApiParam(value = "accessKey", required = true) @RequestParam(required = true) String accessKey,
                                    @ApiParam(value = "accessSecret", required = true) @RequestParam(required = true) String accessSecret) throws Exception {
-        AppInfo appInfo = solarService.update(accessSecret, accessKey);
-        authInfoService.appInfoInit(appInfo, accessSecret, accessKey);
+        AppInfo appInfo = solarService.update(accessKey, accessSecret);
+        authInfoService.appInfoInit(appInfo, accessKey, accessSecret);
         return ResultUtil.ok(true);
     }
 

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/result/AppInfoResult.java

@@ -17,7 +17,6 @@ import java.io.Serializable;
 public class AppInfoResult implements Serializable {
 
     @ApiModelProperty(value = "过期时间")
-    @JsonSerialize(using = ToStringSerializer.class)
     Long expireTime;
 
     @ApiModelProperty(value = "accessKey")

teachcloud-common/src/main/java/com/qmth/teachcloud/common/enums/AuthEnum.java

@@ -13,7 +13,9 @@ public enum AuthEnum {
 
     ON_LINE("在线激活"),
 
-    OFF_LINE("离线激活");
+    OFF_LINE("离线激活"),
+
+    NON_ACTIVATED("未激活");
 
     AuthEnum(String title) {
         this.title = title;

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

@@ -162,9 +162,11 @@ public class AuthInfoServiceImpl implements AuthInfoService {
         }
         String accessKey = solarProperties.getAccessKey();
         String accessSecret = solarProperties.getAccessSecret();
-        AuthEnum authEnum = AuthEnum.OFF_LINE;
+        AuthEnum authEnum = AuthEnum.NON_ACTIVATED;
         if (Objects.nonNull(accessKey) && Objects.nonNull(accessSecret)) {
             authEnum = AuthEnum.ON_LINE;
+        } else if (Objects.nonNull(expireTime)) {
+            authEnum = AuthEnum.OFF_LINE;
         }
         return new AppInfoResult(expireTime, accessKey, accessSecret, authEnum);
     }