diff --git a/common/pom.xml b/common/pom.xml index c20b6bca..83754ed1 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -6,7 +6,7 @@ com.jeesite jeesite-parent - 4.5.1-SNAPSHOT + 4.6.0-SNAPSHOT ../parent/pom.xml diff --git a/modules/cms/pom.xml b/modules/cms/pom.xml index 1db74134..90d9ad4d 100644 --- a/modules/cms/pom.xml +++ b/modules/cms/pom.xml @@ -6,7 +6,7 @@ com.jeesite jeesite-parent - 4.5.1-SNAPSHOT + 4.6.0-SNAPSHOT ../../parent/pom.xml diff --git a/modules/cms/src/main/resources/db/upgrade/cms/versions b/modules/cms/src/main/resources/db/upgrade/cms/versions index 38942dc9..1e1b0216 100644 --- a/modules/cms/src/main/resources/db/upgrade/cms/versions +++ b/modules/cms/src/main/resources/db/upgrade/cms/versions @@ -13,4 +13,5 @@ 4.3.3 4.4.0 4.4.1 -4.5.0 \ No newline at end of file +4.5.0 +4.6.0 \ No newline at end of file diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 68312be5..d61ebb04 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -6,7 +6,7 @@ com.jeesite jeesite-parent - 4.5.1-SNAPSHOT + 4.6.0-SNAPSHOT ../../parent/pom.xml diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-web.sh.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-web.sh.xml index e519cbac..f03d8140 100644 --- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-web.sh.xml +++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-web.sh.xml @@ -31,7 +31,7 @@ cd app jar -xvf web.war rm web.war cd WEB-INF -exec ./startup.sh +sh ./startup.sh ]]> \ No newline at end of file diff --git a/modules/core/src/test/resources/application.yml b/modules/core/src/test/resources/application.yml index 9ef8f0bf..52be4eed 100644 --- a/modules/core/src/test/resources/application.yml +++ b/modules/core/src/test/resources/application.yml @@ -4,7 +4,7 @@ productName: JeeSite Demo companyName: ThinkGem # 产品版本、版权年份 -productVersion: V4.5 +productVersion: V4.6 copyrightYear: 2022 # 数据库连接 diff --git a/parent/pom.xml b/parent/pom.xml index 74628e7c..ab4ea813 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -12,7 +12,7 @@ com.jeesite jeesite-parent - 4.5.1-SNAPSHOT + 4.6.0-SNAPSHOT pom JeeSite Parent diff --git a/pom.xml b/pom.xml index c10a5c8a..e07086ca 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.jeesite jeesite - 4.5.1-SNAPSHOT + 4.6.0-SNAPSHOT pom JeeSite diff --git a/root/pom.xml b/root/pom.xml index 7e22ac05..63febf8c 100644 --- a/root/pom.xml +++ b/root/pom.xml @@ -5,7 +5,7 @@ com.jeesite jeesite-root - 4.5.1-SNAPSHOT + 4.6.0-SNAPSHOT pom JeeSite Root diff --git a/web/bin/docker/Dockerfile b/web/bin/docker/Dockerfile index 1d1f1646..0349b6a6 100644 --- a/web/bin/docker/Dockerfile +++ b/web/bin/docker/Dockerfile @@ -18,4 +18,4 @@ ENTRYPOINT jar -xvf app.war && rm app.war && cd WEB-INF && sh startup.sh EXPOSE 8980 -#docker run -p 8980:8980 thinkgem/jeesite-web:4.4 +#docker run -p 8980:8980 thinkgem/jeesite-web:4.6 diff --git a/web/bin/run-web.sh b/web/bin/run-web.sh index 6ff55294..6cb3043f 100644 --- a/web/bin/run-web.sh +++ b/web/bin/run-web.sh @@ -24,4 +24,4 @@ cd app jar -xvf web.war rm web.war cd WEB-INF -exec ./startup.sh +sh ./startup.sh diff --git a/web/pom.xml b/web/pom.xml index 26ffc84f..d62b4eba 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -6,7 +6,7 @@ com.jeesite jeesite-parent - 4.5.1-SNAPSHOT + 4.6.0-SNAPSHOT ../parent/pom.xml diff --git a/web/src/main/resources/config/application.yml b/web/src/main/resources/config/application.yml index fb4f0896..17fe5d55 100644 --- a/web/src/main/resources/config/application.yml +++ b/web/src/main/resources/config/application.yml @@ -8,7 +8,7 @@ productName: JeeSite Demo companyName: ThinkGem # 产品版本、版权年份 -productVersion: V4.5 +productVersion: V4.6 copyrightYear: 2022 # 是否演示模式