修复授权bug

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/config/service/impl/SystemCache.java

@@ -56,7 +56,8 @@ public class SystemCache {
             JSONObject json = AppLicenseUtil.parseLicense(ByteArray.fromBase64(s.getDescription()).value());
             if (json != null) {
                 Auth = true;
-                if (json.has("control") && json.getJSONObject("control").has("expireTime")) {
+                if (json.has("control") && json.getJSONObject("control").has("expireTime")
+                        && !json.getJSONObject("control").getJSONObject("expireTime").isNullObject()) {
                     expireTime = json.getJSONObject("control").getLong("expireTime");
                 }
             }

stmms-common/src/main/java/cn/com/qmth/stmms/common/utils/VersionInfo.java

@@ -5,7 +5,7 @@ package cn.com.qmth.stmms.common.utils;
  */
 public class VersionInfo {
 
-    public static final String NAME = "1.3.10";
+    public static final String NAME = "1.3.12";
 
-    public static final String DATE = "20221223";
+    public static final String DATE = "20230601";
 }

stmms-web/src/main/java/cn/com/qmth/stmms/admin/config/SystemAuthController.java

@@ -18,7 +18,6 @@ import cn.com.qmth.stmms.common.utils.Encodes;
 import com.qmth.boot.tools.models.ByteArray;
 import net.sf.json.JSONObject;
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -107,12 +106,12 @@ public class SystemAuthController extends BaseController {
                 JSONObject json = AppLicenseUtil.parseLicense(ByteArray.fromInputStream(file.getInputStream()).value());
                 if (json != null) {
                     authCache.setAuth(true);
-                    if (json.has("control") && json.getJSONObject("control").has("expireTime") && StringUtils
-                            .isNotBlank(json.getJSONObject("control").getString("expireTime"))) {
+                    List<School> list = schoolService.parseJson(json.getString("orgs"));
+                    schoolService.updateOrg(list);
+                    if (json.has("control") && json.getJSONObject("control").has("expireTime")
+                            && !json.getJSONObject("control").getJSONObject("expireTime").isNullObject()) {
                         Long expireTime = json.getJSONObject("control").getLong("expireTime");
                         authCache.setExpireTime(expireTime);
-                        List<School> list = schoolService.parseJson(json.getString("orgs"));
-                        schoolService.updateOrg(list);
                     }
                 } else {
                     authCache.setAuth(false);