diff --git a/APIJSON-Java-Server/APIJSONBoot-MultiDataSource/libs/apijson-column-1.1.5.jar b/APIJSON-Java-Server/APIJSONBoot-MultiDataSource/libs/apijson-column-1.1.7.jar similarity index 95% rename from APIJSON-Java-Server/APIJSONBoot-MultiDataSource/libs/apijson-column-1.1.5.jar rename to APIJSON-Java-Server/APIJSONBoot-MultiDataSource/libs/apijson-column-1.1.7.jar index 6808ce00..0f2af490 100644 Binary files a/APIJSON-Java-Server/APIJSONBoot-MultiDataSource/libs/apijson-column-1.1.5.jar and b/APIJSON-Java-Server/APIJSONBoot-MultiDataSource/libs/apijson-column-1.1.7.jar differ diff --git a/APIJSON-Java-Server/APIJSONBoot/libs/apijson-framework-4.8.3.jar b/APIJSON-Java-Server/APIJSONBoot-MultiDataSource/libs/apijson-framework-4.9.1.jar similarity index 96% rename from APIJSON-Java-Server/APIJSONBoot/libs/apijson-framework-4.8.3.jar rename to APIJSON-Java-Server/APIJSONBoot-MultiDataSource/libs/apijson-framework-4.9.1.jar index 94d5c16f..73723dcc 100644 Binary files a/APIJSON-Java-Server/APIJSONBoot/libs/apijson-framework-4.8.3.jar and b/APIJSON-Java-Server/APIJSONBoot-MultiDataSource/libs/apijson-framework-4.9.1.jar differ diff --git a/APIJSON-Java-Server/APIJSONBoot-MultiDataSource/libs/apijson-orm-4.8.3.jar b/APIJSON-Java-Server/APIJSONBoot-MultiDataSource/libs/apijson-orm-4.8.3.jar deleted file mode 100644 index ad75edf6..00000000 Binary files a/APIJSON-Java-Server/APIJSONBoot-MultiDataSource/libs/apijson-orm-4.8.3.jar and /dev/null differ diff --git a/APIJSON-Java-Server/APIJSONBoot-MultiDataSource/libs/apijson-orm-4.9.1.jar b/APIJSON-Java-Server/APIJSONBoot-MultiDataSource/libs/apijson-orm-4.9.1.jar new file mode 100644 index 00000000..63a1f7ad Binary files /dev/null and b/APIJSON-Java-Server/APIJSONBoot-MultiDataSource/libs/apijson-orm-4.9.1.jar differ diff --git a/APIJSON-Java-Server/APIJSONBoot-MultiDataSource/pom.xml b/APIJSON-Java-Server/APIJSONBoot-MultiDataSource/pom.xml index 349da725..b4a1a5d3 100755 --- a/APIJSON-Java-Server/APIJSONBoot-MultiDataSource/pom.xml +++ b/APIJSON-Java-Server/APIJSONBoot-MultiDataSource/pom.xml @@ -5,7 +5,7 @@ apijson.boot apijson-boot - 4.8.3 + 4.9.1 APIJSONBoot-MultiDataSource @@ -56,17 +56,17 @@ com.github.Tencent APIJSON - 4.8.3 + 4.9.1 com.github.APIJSON apijson-framework - 4.8.3 + 4.9.1 com.github.APIJSON apijson-column - 1.1.5 + 1.1.7 diff --git a/APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/java/apijson/boot/DemoApplication.java b/APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/java/apijson/boot/DemoApplication.java index 344d371d..518b5027 100755 --- a/APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/java/apijson/boot/DemoApplication.java +++ b/APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/java/apijson/boot/DemoApplication.java @@ -14,12 +14,9 @@ package apijson.boot; -import java.lang.reflect.Modifier; -import java.util.List; -import java.util.Map; -import java.util.regex.Pattern; - -import javax.naming.Context; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.serializer.PropertyFilter; import org.springframework.beans.BeansException; import org.springframework.boot.SpringApplication; @@ -33,9 +30,12 @@ import org.springframework.web.servlet.config.annotation.CorsRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.serializer.PropertyFilter; +import java.lang.reflect.Modifier; +import java.util.List; +import java.util.Map; +import java.util.regex.Pattern; + +import javax.naming.Context; import apijson.Log; import apijson.NotNull; diff --git a/APIJSON-Java-Server/APIJSONFinal/libs/apijson-column-1.1.5.jar b/APIJSON-Java-Server/APIJSONBoot/libs/apijson-column-1.1.7.jar similarity index 95% rename from APIJSON-Java-Server/APIJSONFinal/libs/apijson-column-1.1.5.jar rename to APIJSON-Java-Server/APIJSONBoot/libs/apijson-column-1.1.7.jar index 6808ce00..0f2af490 100644 Binary files a/APIJSON-Java-Server/APIJSONFinal/libs/apijson-column-1.1.5.jar and b/APIJSON-Java-Server/APIJSONBoot/libs/apijson-column-1.1.7.jar differ diff --git a/APIJSON-Java-Server/APIJSONBoot-MultiDataSource/libs/apijson-framework-4.8.3.jar b/APIJSON-Java-Server/APIJSONBoot/libs/apijson-framework-4.9.1.jar similarity index 96% rename from APIJSON-Java-Server/APIJSONBoot-MultiDataSource/libs/apijson-framework-4.8.3.jar rename to APIJSON-Java-Server/APIJSONBoot/libs/apijson-framework-4.9.1.jar index 94d5c16f..73723dcc 100644 Binary files a/APIJSON-Java-Server/APIJSONBoot-MultiDataSource/libs/apijson-framework-4.8.3.jar and b/APIJSON-Java-Server/APIJSONBoot/libs/apijson-framework-4.9.1.jar differ diff --git a/APIJSON-Java-Server/APIJSONBoot/libs/apijson-orm-4.8.3.jar b/APIJSON-Java-Server/APIJSONBoot/libs/apijson-orm-4.8.3.jar deleted file mode 100644 index ad75edf6..00000000 Binary files a/APIJSON-Java-Server/APIJSONBoot/libs/apijson-orm-4.8.3.jar and /dev/null differ diff --git a/APIJSON-Java-Server/APIJSONBoot/libs/apijson-orm-4.9.1.jar b/APIJSON-Java-Server/APIJSONBoot/libs/apijson-orm-4.9.1.jar new file mode 100644 index 00000000..63a1f7ad Binary files /dev/null and b/APIJSON-Java-Server/APIJSONBoot/libs/apijson-orm-4.9.1.jar differ diff --git a/APIJSON-Java-Server/APIJSONBoot/pom.xml b/APIJSON-Java-Server/APIJSONBoot/pom.xml index fad053ba..d6f93d9c 100755 --- a/APIJSON-Java-Server/APIJSONBoot/pom.xml +++ b/APIJSON-Java-Server/APIJSONBoot/pom.xml @@ -5,7 +5,7 @@ apijson.boot apijson-boot - 4.8.3 + 4.9.1 APIJSONBoot @@ -56,17 +56,17 @@ com.github.Tencent APIJSON - 4.8.3 + 4.9.1 com.github.APIJSON apijson-framework - 4.8.3 + 4.9.1 com.github.APIJSON apijson-column - 1.1.5 + 1.1.7 diff --git a/APIJSON-Java-Server/APIJSONDemo-Druid/pom.xml b/APIJSON-Java-Server/APIJSONDemo-Druid/pom.xml index f5ce100e..ea96918b 100755 --- a/APIJSON-Java-Server/APIJSONDemo-Druid/pom.xml +++ b/APIJSON-Java-Server/APIJSONDemo-Druid/pom.xml @@ -5,7 +5,7 @@ apijson.demo apijson-demo-druid - 4.8.3 + 4.9.1 jar APIJSONDemo-Druid diff --git a/APIJSON-Java-Server/APIJSONDemo-HikariCP/pom.xml b/APIJSON-Java-Server/APIJSONDemo-HikariCP/pom.xml index bfef8b05..6e00065a 100755 --- a/APIJSON-Java-Server/APIJSONDemo-HikariCP/pom.xml +++ b/APIJSON-Java-Server/APIJSONDemo-HikariCP/pom.xml @@ -5,7 +5,7 @@ apijson.demo apijson-demo-hikaricp - 4.8.3 + 4.9.1 jar APIJSONDemo diff --git a/APIJSON-Java-Server/APIJSONDemo/pom.xml b/APIJSON-Java-Server/APIJSONDemo/pom.xml index 149ce135..8e5d4412 100755 --- a/APIJSON-Java-Server/APIJSONDemo/pom.xml +++ b/APIJSON-Java-Server/APIJSONDemo/pom.xml @@ -5,7 +5,7 @@ apijson.demo apijson-demo - 4.8.3 + 4.9.1 jar APIJSONDemo diff --git a/APIJSON-Java-Server/APIJSONBoot/libs/apijson-column-1.1.5.jar b/APIJSON-Java-Server/APIJSONFinal/libs/apijson-column-1.1.7.jar similarity index 95% rename from APIJSON-Java-Server/APIJSONBoot/libs/apijson-column-1.1.5.jar rename to APIJSON-Java-Server/APIJSONFinal/libs/apijson-column-1.1.7.jar index 6808ce00..0f2af490 100644 Binary files a/APIJSON-Java-Server/APIJSONBoot/libs/apijson-column-1.1.5.jar and b/APIJSON-Java-Server/APIJSONFinal/libs/apijson-column-1.1.7.jar differ diff --git a/APIJSON-Java-Server/APIJSONFinal/libs/apijson-framework-4.8.3.jar b/APIJSON-Java-Server/APIJSONFinal/libs/apijson-framework-4.9.1.jar similarity index 96% rename from APIJSON-Java-Server/APIJSONFinal/libs/apijson-framework-4.8.3.jar rename to APIJSON-Java-Server/APIJSONFinal/libs/apijson-framework-4.9.1.jar index 94d5c16f..73723dcc 100644 Binary files a/APIJSON-Java-Server/APIJSONFinal/libs/apijson-framework-4.8.3.jar and b/APIJSON-Java-Server/APIJSONFinal/libs/apijson-framework-4.9.1.jar differ diff --git a/APIJSON-Java-Server/APIJSONFinal/libs/apijson-orm-4.8.3.jar b/APIJSON-Java-Server/APIJSONFinal/libs/apijson-orm-4.8.3.jar deleted file mode 100644 index ad75edf6..00000000 Binary files a/APIJSON-Java-Server/APIJSONFinal/libs/apijson-orm-4.8.3.jar and /dev/null differ diff --git a/APIJSON-Java-Server/APIJSONFinal/libs/apijson-orm-4.9.1.jar b/APIJSON-Java-Server/APIJSONFinal/libs/apijson-orm-4.9.1.jar new file mode 100644 index 00000000..63a1f7ad Binary files /dev/null and b/APIJSON-Java-Server/APIJSONFinal/libs/apijson-orm-4.9.1.jar differ diff --git a/APIJSON-Java-Server/APIJSONFinal/pom.xml b/APIJSON-Java-Server/APIJSONFinal/pom.xml index 5410c8e7..f7e5c9c6 100755 --- a/APIJSON-Java-Server/APIJSONFinal/pom.xml +++ b/APIJSON-Java-Server/APIJSONFinal/pom.xml @@ -4,7 +4,7 @@ apijson.jfinal apijson-final jar - 4.8.3 + 4.9.1 Demo project for APIJSON Server based on JFinal http://maven.apache.org @@ -26,12 +26,12 @@ com.github.Tencent APIJSON - 4.8.3 + 4.9.1 com.github.APIJSON apijson-framework - 4.8.3 + 4.9.1