From 7f7ae3572aae61f6d31e0f7381dd4d6921280235 Mon Sep 17 00:00:00 2001
From: devezhao <zhaofang123@gmail.com>
Date: Sat, 7 Sep 2019 14:11:01 +0800
Subject: [PATCH] state ex

---
 src/main/java/com/rebuild/server/helper/Lisence.java  |  2 +-
 .../com/rebuild/server/helper/state/StateHelper.java  |  7 ++++++-
 .../rebuild/server/metadata/DefaultValueHelper.java   | 11 ++++++-----
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/rebuild/server/helper/Lisence.java b/src/main/java/com/rebuild/server/helper/Lisence.java
index ebf5675a9..093d441c9 100644
--- a/src/main/java/com/rebuild/server/helper/Lisence.java
+++ b/src/main/java/com/rebuild/server/helper/Lisence.java
@@ -40,7 +40,7 @@ public final class Lisence {
         String SN = SysConfiguration.get(ConfigurableItem.SN, true);
         if (SN == null) {
             SN = String.format("ZR%s%s-%s",
-                    "150",
+                    "105", // v1.5
                     StringUtils.leftPad(Locale.getDefault().getCountry(), 3, "0"),
                     UUID.randomUUID().toString().replace("-", "").substring(0, 15).toUpperCase());
             SysConfiguration.set(ConfigurableItem.SN, SN);
diff --git a/src/main/java/com/rebuild/server/helper/state/StateHelper.java b/src/main/java/com/rebuild/server/helper/state/StateHelper.java
index 41e1b507c..b6dfd0ec8 100644
--- a/src/main/java/com/rebuild/server/helper/state/StateHelper.java
+++ b/src/main/java/com/rebuild/server/helper/state/StateHelper.java
@@ -39,7 +39,11 @@ public class StateHelper {
      * @return
      */
     public static boolean isStateClass(String clazzName) {
-        return getSatetClass(clazzName) != null;
+        try {
+            return getSatetClass(clazzName) != null;
+        } catch (IllegalArgumentException ignored) {
+            return false;
+        }
     }
 
     /**
@@ -63,6 +67,7 @@ public class StateHelper {
      * @throws IllegalArgumentException
      */
     public static Class<?> getSatetClass(String stateClass) throws IllegalArgumentException {
+        assert stateClass != null;
         Class<?> stateEnum = null;
         try {
             stateEnum = ClassUtils.getClass(stateClass);
diff --git a/src/main/java/com/rebuild/server/metadata/DefaultValueHelper.java b/src/main/java/com/rebuild/server/metadata/DefaultValueHelper.java
index 7c03d3f7c..4199f92a7 100644
--- a/src/main/java/com/rebuild/server/metadata/DefaultValueHelper.java
+++ b/src/main/java/com/rebuild/server/metadata/DefaultValueHelper.java
@@ -80,15 +80,16 @@ public class DefaultValueHelper {
                 && field.getReferenceEntity().getEntityCode() == EntityHelper.PickList) {
             return PickListManager.instance.getDefaultItem(field);
         } else if (EasyMeta.getDisplayType(field) == DisplayType.STATE) {
-            Class<?> stateClass = StateHelper.getSatetClass(field);
-            if (stateClass == null) {
+            Class<?> stateClass;
+            try {
+                stateClass = StateHelper.getSatetClass(field);
+            } catch (IllegalArgumentException ex) {
+                LOG.error("Bad field: " + field, ex);
                 return null;
             }
 
             for (Object c : stateClass.getEnumConstants()) {
-                if (((StateSpec) c).isDefault()) {
-                    return ((StateSpec) c).getState();
-                }
+                if (((StateSpec) c).isDefault()) return ((StateSpec) c).getState();
             }
         }