diff --git a/ureport2-console/pom.xml b/ureport2-console/pom.xml index 8e396e1..ebf3545 100644 --- a/ureport2-console/pom.xml +++ b/ureport2-console/pom.xml @@ -4,7 +4,7 @@ ureport2-console 2.2.9 - com.spcp.ureport + com.bstek.ureport ureport2-parent 2.0.6 @@ -20,7 +20,7 @@ 1.7 - com.spcp.ureport + com.bstek.ureport ureport2-core 2.2.9 diff --git a/ureport2-console/upload.bat b/ureport2-console/upload.bat index e608a55..ac561f2 100644 --- a/ureport2-console/upload.bat +++ b/ureport2-console/upload.bat @@ -5,7 +5,7 @@ set repoUrl=http://192.168.31.188:8081/repository/maven-releases/ call mvn clean install -xcopy %mvn_repo_home%com\spcp\ureport\ureport2-console\2.2.9\ureport2-console-2.2.9* %deploy_tmp_folder% /y -call mvn deploy:deploy-file -DgroupId=com.spcp.ureport -DartifactId=ureport2-console -Dversion=2.2.9 -Dpackaging=jar -Dfile=%deploy_tmp_folder%ureport2-console-2.2.9.jar -Durl=%repoUrl% -DrepositoryId=%repositoryId% -call mvn deploy:deploy-file -DgroupId=com.spcp.ureport -DartifactId=ureport2-console-sources -Dversion=2.2.9 -Dpackaging=jar -Dclassifier=sources -Dfile=%deploy_tmp_folder%ureport2-console-2.2.9-sources.jar -Durl=%repoUrl% -DrepositoryId=%repositoryId% -call mvn deploy:deploy-file -DgroupId=com.spcp.ureport -DartifactId=ureport2-console -Dversion=2.2.9 -Dpackaging=pom -Dfile=%deploy_tmp_folder%ureport2-console-2.2.9.pom -Durl=%repoUrl% -DrepositoryId=%repositoryId% +xcopy %mvn_repo_home%com\bstek\ureport\ureport2-console\2.2.9\ureport2-console-2.2.9* %deploy_tmp_folder% /y +call mvn deploy:deploy-file -DgroupId=com.bstek.ureport -DartifactId=ureport2-console -Dversion=2.2.9 -Dpackaging=jar -Dfile=%deploy_tmp_folder%ureport2-console-2.2.9.jar -Durl=%repoUrl% -DrepositoryId=%repositoryId% +call mvn deploy:deploy-file -DgroupId=com.bstek.ureport -DartifactId=ureport2-console-sources -Dversion=2.2.9 -Dpackaging=jar -Dclassifier=sources -Dfile=%deploy_tmp_folder%ureport2-console-2.2.9-sources.jar -Durl=%repoUrl% -DrepositoryId=%repositoryId% +call mvn deploy:deploy-file -DgroupId=com.bstek.ureport -DartifactId=ureport2-console -Dversion=2.2.9 -Dpackaging=pom -Dfile=%deploy_tmp_folder%ureport2-console-2.2.9.pom -Durl=%repoUrl% -DrepositoryId=%repositoryId% diff --git a/ureport2-core/pom.xml b/ureport2-core/pom.xml index aeabaae..d8f5902 100644 --- a/ureport2-core/pom.xml +++ b/ureport2-core/pom.xml @@ -3,7 +3,7 @@ ureport2-core 2.2.9 - com.spcp.ureport + com.bstek.ureport ureport2-parent 2.0.6 diff --git a/ureport2-core/src/main/java/com/bstek/ureport/definition/searchform/RangeDateUtils.java b/ureport2-core/src/main/java/com/bstek/ureport/definition/searchform/RangeDateUtils.java index e29830d..24c31f3 100644 --- a/ureport2-core/src/main/java/com/bstek/ureport/definition/searchform/RangeDateUtils.java +++ b/ureport2-core/src/main/java/com/bstek/ureport/definition/searchform/RangeDateUtils.java @@ -36,7 +36,7 @@ public abstract class RangeDateUtils { /** * 多选结尾标志 */ - public static final String MULTIPLE_SELECT = "Multiple"; + public static final String MULTIPLE_SELECT = "CheckBox"; /** * 判断是否需要分组 */ diff --git a/ureport2-core/target/maven-archiver/pom.properties b/ureport2-core/target/maven-archiver/pom.properties index 537895a..cca3b5f 100644 --- a/ureport2-core/target/maven-archiver/pom.properties +++ b/ureport2-core/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Fri Jul 10 13:55:07 CST 2020 +#Fri Jul 10 15:27:50 CST 2020 version=2.2.9 -groupId=com.spcp.ureport +groupId=com.bstek.ureport artifactId=ureport2-core diff --git a/ureport2-core/target/ureport2-core-2.2.9-sources.jar b/ureport2-core/target/ureport2-core-2.2.9-sources.jar index 30b02c4..7203c5e 100644 Binary files a/ureport2-core/target/ureport2-core-2.2.9-sources.jar and b/ureport2-core/target/ureport2-core-2.2.9-sources.jar differ diff --git a/ureport2-core/target/ureport2-core-2.2.9.jar b/ureport2-core/target/ureport2-core-2.2.9.jar index 20a9734..f318274 100644 Binary files a/ureport2-core/target/ureport2-core-2.2.9.jar and b/ureport2-core/target/ureport2-core-2.2.9.jar differ diff --git a/ureport2-core/upload.bat b/ureport2-core/upload.bat index 4b8c97e..0057e8e 100644 --- a/ureport2-core/upload.bat +++ b/ureport2-core/upload.bat @@ -5,7 +5,7 @@ set repoUrl=http://192.168.31.188:8081/repository/maven-releases/ call mvn clean install -xcopy %mvn_repo_home%com\spcp\ureport\ureport2-core\2.2.9\ureport2-core-2.2.9* %deploy_tmp_folder% /y -call mvn deploy:deploy-file -DgroupId=com.spcp.ureport -DartifactId=ureport2-core -Dversion=2.2.9 -Dpackaging=jar -Dfile=%deploy_tmp_folder%ureport2-core-2.2.9.jar -Durl=%repoUrl% -DrepositoryId=%repositoryId% -call mvn deploy:deploy-file -DgroupId=com.spcp.ureport -DartifactId=ureport2-core-sources -Dversion=2.2.9 -Dpackaging=jar -Dclassifier=sources -Dfile=%deploy_tmp_folder%ureport2-core-2.2.9-sources.jar -Durl=%repoUrl% -DrepositoryId=%repositoryId% -call mvn deploy:deploy-file -DgroupId=com.spcp.ureport -DartifactId=ureport2-core -Dversion=2.2.9 -Dpackaging=pom -Dfile=%deploy_tmp_folder%ureport2-core-2.2.9.pom -Durl=%repoUrl% -DrepositoryId=%repositoryId% +xcopy %mvn_repo_home%com\bstek\ureport\ureport2-core\2.2.9\ureport2-core-2.2.9* %deploy_tmp_folder% /y +call mvn deploy:deploy-file -DgroupId=com.bstek.ureport -DartifactId=ureport2-core -Dversion=2.2.9 -Dpackaging=jar -Dfile=%deploy_tmp_folder%ureport2-core-2.2.9.jar -Durl=%repoUrl% -DrepositoryId=%repositoryId% +call mvn deploy:deploy-file -DgroupId=com.bstek.ureport -DartifactId=ureport2-core-sources -Dversion=2.2.9 -Dpackaging=jar -Dclassifier=sources -Dfile=%deploy_tmp_folder%ureport2-core-2.2.9-sources.jar -Durl=%repoUrl% -DrepositoryId=%repositoryId% +call mvn deploy:deploy-file -DgroupId=com.bstek.ureport -DartifactId=ureport2-core -Dversion=2.2.9 -Dpackaging=pom -Dfile=%deploy_tmp_folder%ureport2-core-2.2.9.pom -Durl=%repoUrl% -DrepositoryId=%repositoryId% diff --git a/ureport2-parent/pom.xml b/ureport2-parent/pom.xml index 1f4f41d..a4d79d5 100644 --- a/ureport2-parent/pom.xml +++ b/ureport2-parent/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - com.spcp.ureport + com.bstek.ureport ureport2-parent 2.0.6 pom diff --git a/ureport2-parent/upload.bat b/ureport2-parent/upload.bat index 15f66c1..14196e8 100644 --- a/ureport2-parent/upload.bat +++ b/ureport2-parent/upload.bat @@ -4,5 +4,5 @@ set repositoryId=maven-releases set repoUrl=http://192.168.31.188:8081/repository/maven-releases/ call mvn clean install -xcopy %mvn_repo_home%com\spcp\ureport\ureport2-parent\2.0.6\ureport2-parent-2.0.6* %deploy_tmp_folder% /y -call mvn deploy:deploy-file -DgroupId=com.spcp.ureport -DartifactId=ureport2-parent -Dversion=2.0.6 -Dpackaging=pom -Dfile=%deploy_tmp_folder%ureport2-parent-2.0.6.pom -Durl=%repoUrl% -DrepositoryId=%repositoryId% +xcopy %mvn_repo_home%com\bstek\ureport\ureport2-parent\2.0.6\ureport2-parent-2.0.6* %deploy_tmp_folder% /y +call mvn deploy:deploy-file -DgroupId=com.bstek.ureport -DartifactId=ureport2-parent -Dversion=2.0.6 -Dpackaging=pom -Dfile=%deploy_tmp_folder%ureport2-parent-2.0.6.pom -Durl=%repoUrl% -DrepositoryId=%repositoryId%