ck编辑器加载异常修复

publiccms-parent/pom.xml

@@ -5,7 +5,7 @@
     <groupId>com.publiccms</groupId>
     <artifactId>publiccms-parent</artifactId>
     <packaging>pom</packaging>
-    <version>V4.0.202011.a</version>
+    <version>V4.0.202011.b</version>
     <modules>
         <module>publiccms</module>
         <module>publiccms-core</module>

publiccms-parent/publiccms-analyzer/pom.xml

@@ -8,13 +8,13 @@
     <parent>
         <groupId>com.publiccms</groupId>
         <artifactId>publiccms-parent</artifactId>
-        <version>V4.0.202011.a</version>
+        <version>V4.0.202011.b</version>
     </parent>
     <dependencies>
         <dependency>
             <groupId>com.publiccms</groupId>
             <artifactId>publiccms-core</artifactId>
-            <version>V4.0.202011.a</version>
+            <version>V4.0.202011.b</version>
         </dependency>
         <dependency>
             <groupId>org.apache.lucene</groupId>

publiccms-parent/publiccms-common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.publiccms</groupId>
         <artifactId>publiccms-parent</artifactId>
-        <version>V4.0.202011.a</version>
+        <version>V4.0.202011.b</version>
     </parent>
     <artifactId>publiccms-common</artifactId>
     <name>publiccms-common</name>

publiccms-parent/publiccms-core/pom.xml

@@ -5,14 +5,14 @@
     <parent>
         <groupId>com.publiccms</groupId>
         <artifactId>publiccms-parent</artifactId>
-        <version>V4.0.202011.a</version>
+        <version>V4.0.202011.b</version>
     </parent>
     <artifactId>publiccms-core</artifactId>
     <dependencies>
         <dependency>
             <groupId>com.publiccms</groupId>
             <artifactId>publiccms-common</artifactId>
-            <version>V4.0.202011.a</version>
+            <version>V4.0.202011.b</version>
         </dependency>
         <dependency>
             <groupId>com.zaxxer</groupId>

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

@@ -27,7 +27,7 @@ public class CmsVersion {
      * @return revision
      */
     public static final String getRevision() {
-        return "a";
+        return "b";
     }
 
     /**

publiccms-parent/publiccms-dmdialect/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.publiccms</groupId>
         <artifactId>publiccms-parent</artifactId>
-        <version>V4.0.202011.a</version>
+        <version>V4.0.202011.b</version>
     </parent>
     <artifactId>publiccms-dmdialect</artifactId>
     <dependencies>

publiccms-parent/publiccms-j2cache/pom.xml

@@ -5,14 +5,14 @@
     <parent>
         <groupId>com.publiccms</groupId>
         <artifactId>publiccms-parent</artifactId>
-        <version>V4.0.202011.a</version>
+        <version>V4.0.202011.b</version>
     </parent>
     <artifactId>publiccms-j2cache</artifactId>
     <dependencies>
         <dependency>
             <groupId>com.publiccms</groupId>
             <artifactId>publiccms-common</artifactId>
-            <version>V4.0.202011.a</version>
+            <version>V4.0.202011.b</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/net.oschina.j2cache/j2cache-core -->
         <dependency>

publiccms-parent/publiccms-oauth/pom.xml

@@ -7,13 +7,13 @@
 	<parent>
 		<groupId>com.publiccms</groupId>
 		<artifactId>publiccms-parent</artifactId>
-		<version>V4.0.202011.a</version>
+		<version>V4.0.202011.b</version>
 	</parent>
 	<dependencies>
 		<dependency>
 			<groupId>com.publiccms</groupId>
 			<artifactId>publiccms-core</artifactId>
-			<version>V4.0.202011.a</version>
+			<version>V4.0.202011.b</version>
 		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>

publiccms-parent/publiccms-redis/pom.xml

@@ -8,13 +8,13 @@
     <parent>
         <groupId>com.publiccms</groupId>
         <artifactId>publiccms-parent</artifactId>
-        <version>V4.0.202011.a</version>
+        <version>V4.0.202011.b</version>
     </parent>
     <dependencies>
         <dependency>
             <groupId>com.publiccms</groupId>
             <artifactId>publiccms-common</artifactId>
-            <version>V4.0.202011.a</version>
+            <version>V4.0.202011.b</version>
         </dependency>
         <dependency>
             <groupId>org.mybatis</groupId>

publiccms-parent/publiccms-trade/pom.xml

@@ -8,13 +8,13 @@
     <parent>
         <groupId>com.publiccms</groupId>
         <artifactId>publiccms-parent</artifactId>
-        <version>V4.0.202011.a</version>
+        <version>V4.0.202011.b</version>
     </parent>
     <dependencies>
         <dependency>
             <groupId>com.publiccms</groupId>
             <artifactId>publiccms-core</artifactId>
-            <version>V4.0.202011.a</version>
+            <version>V4.0.202011.b</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/com.alipay.sdk/alipay-sdk-java -->
         <dependency>

publiccms-parent/publiccms/pom.xml

@@ -8,38 +8,38 @@
     <parent>
         <groupId>com.publiccms</groupId>
         <artifactId>publiccms-parent</artifactId>
-        <version>V4.0.202011.a</version>
+        <version>V4.0.202011.b</version>
     </parent>
     <dependencies>
         <dependency>
             <groupId>com.publiccms</groupId>
             <artifactId>publiccms-core</artifactId>
-            <version>V4.0.202011.a</version>
+            <version>V4.0.202011.b</version>
         </dependency>
         <dependency>
             <groupId>com.publiccms</groupId>
             <artifactId>publiccms-oauth</artifactId>
-            <version>V4.0.202011.a</version>
+            <version>V4.0.202011.b</version>
         </dependency>
         <dependency>
             <groupId>com.publiccms</groupId>
             <artifactId>publiccms-redis</artifactId>
-            <version>V4.0.202011.a</version>
+            <version>V4.0.202011.b</version>
         </dependency>
         <dependency>
             <groupId>com.publiccms</groupId>
             <artifactId>publiccms-j2cache</artifactId>
-            <version>V4.0.202011.a</version>
+            <version>V4.0.202011.b</version>
         </dependency>
         <dependency>
             <groupId>com.publiccms</groupId>
             <artifactId>publiccms-analyzer</artifactId>
-            <version>V4.0.202011.a</version>
+            <version>V4.0.202011.b</version>
         </dependency>
         <dependency>
             <groupId>com.publiccms</groupId>
             <artifactId>publiccms-trade</artifactId>
-            <version>V4.0.202011.a</version>
+            <version>V4.0.202011.b</version>
         </dependency>
         <dependency>
             <groupId>mysql</groupId>

publiccms-parent/publiccms/src/main/resources/templates/admin/index.html

@@ -133,13 +133,13 @@
 <script src="${base}/resource/js/cms.js"></script>
     <script>
     var base="${base+adminContextPath}";
-    window.UEDITOR_HOME_URL="${site.dynamicPath}resource/ueditor/";
-    window.CKEDITOR_BASEPATH="${base}resource/ckeditor/";
+    window.UEDITOR_HOME_URL="${base}/resource/ueditor/";
+    window.CKEDITOR_BASEPATH="${base}/resource/ckeditor/";
     window.CKEDITOR_LANGUAGE="<@t.page 'ckeditor.lang'/>";
     window.KINDEDITOR_OPTIONS= {
             width:'60%',
             height:'400px',
-            basePath:'${site.dynamicPath}resource/kindeditor/',
+            basePath:'${base}/resource/kindeditor/',
             uploadJson : '${base+adminContextPath}/kindeditor/upload.do',
             fileManagerJson : '${base+adminContextPath}/cmsWebFile/fileList.html',
             allowFileManager : true