Prechádzať zdrojové kódy

优化版本判断逻辑

zhouhao 7 rokov pred
rodič
commit
ebeda17963

+ 2 - 0
hsweb-starter/hsweb-spring-boot-starter/src/main/java/org/hswebframework/web/starter/HswebAutoConfiguration.java

@@ -112,6 +112,8 @@ public class HswebAutoConfiguration {
                 return super.getDeserializer(type);
             }
         };
+
+        //fastjson.parser.autoTypeAccept
         ParserConfig.getGlobalInstance().addAccept("org.hswebframework.web.entity.");
         ParserConfig.getGlobalInstance().addAccept("org.hsweb.");
         ParserConfig.getGlobalInstance().addDeny("org.hsweb.ezorm.core.param.SqlTerm");

+ 3 - 0
hsweb-starter/hsweb-spring-boot-starter/src/main/java/org/hswebframework/web/starter/SystemVersion.java

@@ -196,6 +196,9 @@ class Version implements Comparable<Version> {
     }
 
     public void setVersion(String version) {
+        if (null == version) {
+            return;
+        }
         boolean snapshot = version.toLowerCase().contains("snapshot");
         version = version.toLowerCase().replace(".snapshot", "").replace("-snapshot", "");
         String[] ver = version.split("[.]");

+ 5 - 5
hsweb-starter/hsweb-spring-boot-starter/src/main/java/org/hswebframework/web/starter/init/SystemInitialize.java

@@ -135,11 +135,11 @@ public class SystemInitialize {
     protected void initInstallInfo() throws SQLException {
         boolean tableInstall = sqlExecutor.tableExists("s_system");
         database.createOrAlter("s_system")
-                .addColumn().name("name").varchar(128).notNull().comment("系统名称").commit()
-                .addColumn().name("major_version").alias(majorVersion).number(32).javaType(Integer.class).notNull().comment("主版本号").commit()
-                .addColumn().name("minor_version").alias(minorVersion).number(32).javaType(Integer.class).notNull().comment("次版本号").commit()
-                .addColumn().name("revision_version").alias(revisionVersion).number(32).javaType(Integer.class).notNull().comment("修订版").commit()
-                .addColumn().name("snapshot").number(1).javaType(Boolean.class).notNull().comment("是否快照版").commit()
+                .addColumn().name("name").varchar(128).comment("系统名称").commit()
+                .addColumn().name("major_version").alias(majorVersion).number(32).javaType(Integer.class).comment("主版本号").commit()
+                .addColumn().name("minor_version").alias(minorVersion).number(32).javaType(Integer.class).comment("次版本号").commit()
+                .addColumn().name("revision_version").alias(revisionVersion).number(32).javaType(Integer.class).comment("修订版").commit()
+                .addColumn().name("snapshot").number(1).javaType(Boolean.class).comment("是否快照版").commit()
                 .addColumn().name("comment").varchar(2000).comment("系统说明").commit()
                 .addColumn().name("website").varchar(2000).comment("系统网址").commit()
                 .addColumn().name("framework_version").notNull().alias(frameworkVersion).clob()