Merge remote-tracking branch 'origin/master' into V5

README.md

@@ -4,10 +4,10 @@
   English | <a href="./README.zh-CN.md">简体中文</a>
 </p>
 
-<a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=xoxCUvv7bDCFQ8AAqaoWB1JsLz0L90qn">QQ Group 1</a> 191381542
-<a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=x15JZdCp8vWlxV1mMoMTyrHzMqw3dmI1">QQ Group 2</a> 481589563
-<a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=VogNtcpFOLxvjtvzUcAElZOK-KC4To_u">QQ Group 3</a> 638756883
-<a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=lsFbfVpj3yqWuY92GYkOG1esbyPNS7O3">QQ Group 4</a> 930992232
+<a target="_blank" href="https://qm.qq.com/q/uk0kyc8Sru">QQ Group 1</a> 191381542
+<a target="_blank" href="https://qm.qq.com/q/em30nS0dsA">QQ Group 2</a> 481589563
+<a target="_blank" href="https://qm.qq.com/q/estzM3VONM">QQ Group 3</a> 638756883
+<a target="_blank" href="https://qm.qq.com/q/l26b2Z2R3i">QQ Group 4</a> 930992232
 
 ## Introduction
 

README.zh-CN.md

@@ -4,10 +4,10 @@
   <a href="./README.md">English</a> | 简体中文
 </p>
 
-<a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=xoxCUvv7bDCFQ8AAqaoWB1JsLz0L90qn">交流1群</a> 191381542
-<a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=x15JZdCp8vWlxV1mMoMTyrHzMqw3dmI1">交流2群</a> 481589563
-<a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=VogNtcpFOLxvjtvzUcAElZOK-KC4To_u">交流3群</a> 638756883
-<a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=lsFbfVpj3yqWuY92GYkOG1esbyPNS7O3">交流4群</a> 930992232
+<a target="_blank" href="https://qm.qq.com/q/uk0kyc8Sru">交流1群</a> 191381542
+<a target="_blank" href="https://qm.qq.com/q/em30nS0dsA">交流2群</a> 481589563
+<a target="_blank" href="https://qm.qq.com/q/estzM3VONM">交流3群</a> 638756883
+<a target="_blank" href="https://qm.qq.com/q/l26b2Z2R3i">交流4群</a> 930992232
 
 ## 简介
 

data/publiccms/template/site_1/index.html

@@ -35,7 +35,7 @@ <h3><a href="${a.dynamicPath!}" target="_blank">${a.name}</a><#if a.useStatic>[S
         <div class="clear"></div>
         <p>The default user name / password for all sites: admin / admin</p>
         <p>The domain name list indicates that you use these domain names to access the program, the corresponding site will be displayed! Wildcard domain name means that all subdomains of this domain name can also access this site。The template root directory means access using this domain name, the template files in this directory are accessed</p>
-        <p>The first visit to the static site requires you to log in to the background and perform "重新生成全站" in Maintenance-> System Maintenance-> Task Schedule to browse normally</p>
+        <p>The first visit to the static site requires you to log in to the background and perform "重新生成全站" in System -&gt; Task Schedule to browse normally</p>
         <p>For testing purposes, we have pointed dev.publiccms.com and all its subdomains to 127.0.0.1, which can be used to test local services in the same way as localhost and loopback when you are connected to the Internet.</p>
     </main>
     <footer>

data/publiccms/template/site_1/index_zh_CN.html

@@ -36,7 +36,7 @@ <h3><a href="${a.dynamicPath!}" target="_blank">${a.name}</a><#if a.useStatic>[
         <div class="clear"></div>
         <p>所有站点后台默认用户名/密码：admin/admin</p>
         <p>域名列表表示您使用这些域名访问本程序，将展示对应站点！通配域名表示所有该域名的子域名也可以访问到这个站点。模板根目录表示使用该域名访问，访问的是该目录下的模板文件</p>
-        <p>静态化站点首次访问需要您登录后台，在维护->系统维护->任务计划 中执行“重新生成全站”，才能正常浏览</p>
+        <p>静态化站点首次访问需要您登录后台，在 系统-&gt;任务计划 中执行“重新生成全站”，才能正常浏览</p>
         <p>为方便测试，我们已经将dev.publiccms.com及其所有子域名解析指向了127.0.0.1,它在您联网的情况下可以与localhost,loopback一样用来测试本地服务</p>
     </main>
     <footer>

publiccms-parent/build.gradle

@@ -23,7 +23,7 @@ subprojects {
     apply plugin: "eclipse-wtp"
 
     group = "com.publiccms"
-    version = "V5.202406.a"
+    version = "V5.202406.c"
 
     test.enabled = false
 

publiccms-parent/pom.xml

@@ -21,7 +21,7 @@
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
-        <version.publiccms>V5.202406.a</version.publiccms>
+        <version.publiccms>V5.202406.c</version.publiccms>
         <!-- https://mvnrepository.com/artifact/jakarta.servlet/jakarta.servlet-api -->
         <version.servlet>6.1.0</version.servlet>
         <!-- http://mvnrepository.com/artifact/org.springframework/spring-core -->

publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/constants/CmsVersion.java

@@ -38,7 +38,7 @@ public static final String getVersion() {
      * @return revision
      */
     public static final String getRevision() {
-        return "b";
+        return "c";
     }
 
     /**

publiccms-parent/publiccms/src/main/resources/templates/web/site_1/index.html

@@ -7,14 +7,12 @@
 <body>
     <h1 data-diy="page">欢迎使用PublicCMS!</h1>
     <p>使用您安装过程填写的用户名密码 <a href="./admin/" target="_blank">登录后台</a></p>
-    <p>您看到此页面是因为您的cms数据目录还没有index.html模板文件</p>
-    <p>在开发->文件管理->模板管理 中创建index.html模板</p>
+    <p>您看到此页面是因为您的cms数据目录还没有index.html模板文件,在 文件-&gt;模板文件管理 中创建index.html模板</p>
     <p>根据cms工程配置,您的cms数据目录放在 <@tools.disk>${rootPath}</@tools.disk>,如果这不是您预期的路径,请修改配置文件cms.properties</p>
     <hr/>
     <h1 data-diy="page">Welcome to PublicCMS!</h1>
     <p><a href="./admin/" target="_blank">Login Management System</a> Use the username and password you entered during installation</p>
-    <p>You see this page because your cms data directory does not yet have an index.html template file</p>
-    <p>Create the index.html template in Development -> File management -> Template management</p>
+    <p>You see this page because your cms data directory does not yet have an index.html template file,Create the index.html template in File -&gt; Template management</p>
     <p>Depending on the cms project configuration, your cms data directory is placed on <@tools.disk>${rootPath}</@tools.disk>,If this is not the path you expected, modify the configuration file cms.properties</p>
     <script>
     var templatePath='${.current_template_name?keep_after('/')?keep_after('/')}';