Kaynağa Gözat

Merge remote-tracking branch 'origin/On-Premises/v1.0.0' into On-Premises/v1.0.0

# Conflicts:
#	pdf-tech-core/src/main/java/cn/kdan/pdf/tech/core/utils/KeyFileParseUtils.java
tangxiangan 1 yıl önce
ebeveyn
işleme
b1615e88da

+ 4 - 4
pdf-tech-core/src/main/java/cn/kdan/pdf/tech/core/utils/KeyFileParseUtils.java

@@ -44,14 +44,14 @@ public class KeyFileParseUtils {
         String expireDate = properties.getProperty("ExpireDate");
         String users = properties.getProperty("Users");
         Sign sign = JsonUtils.jsonStringToBean(signJsonStr, Sign.class);
-//        if (!Objects.deepEquals(ServerUtils.getDeviceId(),serverID)) {
-//            throw new BackendRuntimeException("The key file signature is invalid.");
-//        }
+        if (!Objects.deepEquals(ServerUtils.getDeviceId(),serverID)) {
+            throw new BackendRuntimeException("Server ID Error. Please check your Key File.");
+        }
         if (!(Objects.deepEquals(sign.getServerID(),serverID)
                 && Objects.deepEquals(sign.getLicenseDate(),licenseDate)
                 && Objects.deepEquals(sign.getExpireDate(),expireDate)
                 && Objects.deepEquals(sign.getUsers(),users))) {
-            throw new BackendRuntimeException("The key file signature is invalid.");
+            throw new BackendRuntimeException("Signature invalid. Please check your Key File.");
         }
         FileContent fileContent = new FileContent();
         // 是否是更新?