diff --git a/LICENSE b/LICENSE index 976dbc387..7576baa7f 100644 --- a/LICENSE +++ b/LICENSE @@ -1,18 +1,26 @@ -Copyright (c) 2018 PublicMS +Copyright (c) 2024 PublicMS 一、授权许可 - 1.1 您可以免费修改、复制、分发本软件及本软件的源码 - 1.2 您可以免费获得的基于免费协议的授权文件，并获得非商业用途的使用权限，非商业用途限个人用户使用 - 1.3 所有免费授权用户，基于本软件开发的页面必须在显著位置添加Powered by PublicCMS标识，并保留产品中的授权及logo等标识 - 1.4 在将本软件用作商业用途时，需要取得软件版权方商业使用授权，授权单位应为最终使用产品的用户单位 - 1.5 已获得商业授权的用户可以使用、复制、修改、分发本软件(含源码)及包含本软件(含源码)的产品 - 1.6 该协议仅对当前版本有效，历史已发布版本请参照软件发布时附带得授权协议 + 1.1 该软件版本遵循MIT授权协议(http://www.opensource.org/licenses/mit-license.php) + 1.2 被授权人有权利使用、复制、修改、合并、出版发行、散布、再授权及贩售本软件及本软件的源码。 + 1.3 被授权人可根据程式的需要修改授权条款为适当的内容。 + 1.4 在软件和软件的所有副本中都必须包含版权声明和许可声明。 + 1.5 您的再发行版本，可以使用PublicCMS名义进行宣传。 + 1.6 本软件中包含其他授权协议的第三方产品请遵守其授权协议。 二、版权 2.1 该软件版权归PublicCMS官方所有 三、免责声明 3.1 本软件及所附带的文件是作为不提供任何明确的或隐含的赔偿或担保的形式提供的 3.2 用户出于自愿而使用本软件，您必须了解使用本软件的风险，在尚未购买产品技术服务之前，我们不承诺提供任何形式的技术支持、使用担保，也不承担任何因使用本软件而产生问题的相关责任 +### 协议正文 + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + # 其他授权许可 Other Licenses This software includes projects with the following licenses diff --git a/README.md b/README.md index 08fe3a2ac..32aef3177 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# PublicCMS V4.0 +# PublicCMS V2021 浜ゆ祦缇1缇 191381542 浜ゆ祦缇2缇 481589563 @@ -6,7 +6,7 @@ ## 绠浠 -PublicCMS鏄噰鐢2020骞存渶鏂颁富娴佹妧鏈紑鍙戠殑寮婧怞AVACMS绯荤粺銆傜敱澶╂触榛戞牳绉戞妧鏈夐檺鍏徃寮鍙戯紝鏋舵瀯绉戝锛岃交鏉炬敮鎸佷笂鍗冧竾鏁版嵁銆佸崈涓嘝V锛涙敮鎸佸叏绔欓潤鎬佸寲锛孲SI锛屽姩鎬侀〉闈㈠眬閮ㄩ潤鎬佸寲绛変负鎮ㄥ揩閫熷缓绔欙紝寤鸿澶ц妯＄珯鐐规彁渚涘己澶ч┍鍔紝涔熸槸浼佷笟绾ч」鐩骇鍝佸師鍨嬬殑鑹ソ閫夋嫨銆 +PublicCMS鏄噰鐢2021骞存渶鏂颁富娴佹妧鏈紑鍙戠殑寮婧怞AVACMS绯荤粺銆傜敱澶╂触榛戞牳绉戞妧鏈夐檺鍏徃寮鍙戯紝鏋舵瀯绉戝锛岃交鏉炬敮鎸佷笂鍗冧竾鏁版嵁銆佸崈涓嘝V锛涙敮鎸佸叏绔欓潤鎬佸寲锛孲SI锛屽姩鎬侀〉闈㈠眬閮ㄩ潤鎬佸寲绛変负鎮ㄥ揩閫熷缓绔欙紝寤鸿澶ц妯＄珯鐐规彁渚涘己澶ч┍鍔紝涔熸槸浼佷笟绾ч」鐩骇鍝佸師鍨嬬殑鑹ソ閫夋嫨銆 ## 鑾峰彇婧愮爜 @@ -15,12 +15,12 @@ https://github.com/sanluan/PublicCMS ## 鍙備笌寮鍙 -鍒囨崲鍒癲evelop鍒嗘敮,鍏嶈垂鐗堟湰鍒囨崲鍒2017鍒嗘敮 +鍒囨崲鍒癲evelop鍒嗘敮,鍏嶈垂鐗堟湰鍒囨崲鍒癡2021鍒嗘敮 ## 鎺堟潈鍗忚 -* 鐗堟湰:V4.0 鍟嗙敤浠樿垂鎺堟潈鍗忚:璇︽儏鍙傝LICENSE -* 鐗堟湰:V1.0,V2016,V2017 瀹屽叏鍏嶈垂鎺堟潈鍗忚:MIT +* 鐗堟湰:V4.0,V5 鍟嗙敤浠樿垂鎺堟潈鍗忚:璇︽儏鍙傝LICENSE +* 鐗堟湰:V1.0,V2016,V2017,V2019,V2021 瀹屽叏鍏嶈垂鎺堟潈鍗忚:MIT ## 鐜瑕佹眰 diff --git a/SECURITY.md b/SECURITY.md index d1526c9d9..a92103839 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -6,8 +6,12 @@ which versions are currently being supported with security updates. | Version | Supported | | ------- | ------------------ | +|V5-develop| :white_check_mark: | +| develop | :white_check_mark: | | 4.0 | :white_check_mark: | -| 2017 | :white_check_mark: | +| 2021 | :white_check_mark: | +| 2019 | :x: | +| 2017 | :x: | | 2016 | :x: | | 1.0 | :x: | diff --git a/Update History.md b/Update History.md index 9ccdb64b1..349b087f4 100644 --- a/Update History.md +++ b/Update History.md @@ -1,4 +1,4 @@ -### V4.0.202107.a +### V2021 绋嬪簭鍔熻兘淇敼 1. 澧炲姞璁块棶缁熻鍔熻兘 diff --git a/doc/PublicCMS V4.0 Deplyment Manual_english.doc b/doc/PublicCMS V2021 Deplyment Manual_english.doc similarity index 84% rename from doc/PublicCMS V4.0 Deplyment Manual_english.doc rename to doc/PublicCMS V2021 Deplyment Manual_english.doc index 4ce9d107f..cc8c086ce 100644 Binary files a/doc/PublicCMS V4.0 Deplyment Manual_english.doc and b/doc/PublicCMS V2021 Deplyment Manual_english.doc differ diff --git "a/doc/PublicCMS V4.0 ORACLE\346\225\260\346\215\256\345\272\223\351\200\202\351\205\215\346\211\213\345\206\214.doc" "b/doc/PublicCMS V2021 ORACLE\346\225\260\346\215\256\345\272\223\351\200\202\351\205\215\346\211\213\345\206\214.doc" similarity index 98% rename from "doc/PublicCMS V4.0 ORACLE\346\225\260\346\215\256\345\272\223\351\200\202\351\205\215\346\211\213\345\206\214.doc" rename to "doc/PublicCMS V2021 ORACLE\346\225\260\346\215\256\345\272\223\351\200\202\351\205\215\346\211\213\345\206\214.doc" index 2a3ab7ebd..f5d795235 100644 Binary files "a/doc/PublicCMS V4.0 ORACLE\346\225\260\346\215\256\345\272\223\351\200\202\351\205\215\346\211\213\345\206\214.doc" and "b/doc/PublicCMS V2021 ORACLE\346\225\260\346\215\256\345\272\223\351\200\202\351\205\215\346\211\213\345\206\214.doc" differ diff --git a/doc/PublicCMS V4.0 Secondary development manual_english.doc b/doc/PublicCMS V2021 Secondary development manual_english.doc similarity index 95% rename from doc/PublicCMS V4.0 Secondary development manual_english.doc rename to doc/PublicCMS V2021 Secondary development manual_english.doc index 3148a99a8..6f6885c90 100644 Binary files a/doc/PublicCMS V4.0 Secondary development manual_english.doc and b/doc/PublicCMS V2021 Secondary development manual_english.doc differ diff --git "a/doc/PublicCMS V4.0 \344\272\214\346\254\241\345\274\200\345\217\221\346\211\213\345\206\214_\344\270\255\346\226\207.doc" "b/doc/PublicCMS V2021 \344\272\214\346\254\241\345\274\200\345\217\221\346\211\213\345\206\214_\344\270\255\346\226\207.doc" similarity index 96% rename from "doc/PublicCMS V4.0 \344\272\214\346\254\241\345\274\200\345\217\221\346\211\213\345\206\214_\344\270\255\346\226\207.doc" rename to "doc/PublicCMS V2021 \344\272\214\346\254\241\345\274\200\345\217\221\346\211\213\345\206\214_\344\270\255\346\226\207.doc" index 43665e730..66d08ff57 100644 Binary files "a/doc/PublicCMS V4.0 \344\272\214\346\254\241\345\274\200\345\217\221\346\211\213\345\206\214_\344\270\255\346\226\207.doc" and "b/doc/PublicCMS V2021 \344\272\214\346\254\241\345\274\200\345\217\221\346\211\213\345\206\214_\344\270\255\346\226\207.doc" differ diff --git "a/doc/PublicCMS V4.0 \345\220\216\345\217\260\346\223\215\344\275\234\346\211\213\345\206\214_\344\270\255\346\226\207[\347\274\226\345\206\231\344\270\255].doc" "b/doc/PublicCMS V2021 \345\220\216\345\217\260\346\223\215\344\275\234\346\211\213\345\206\214_\344\270\255\346\226\207[\347\274\226\345\206\231\344\270\255].doc" similarity index 96% rename from "doc/PublicCMS V4.0 \345\220\216\345\217\260\346\223\215\344\275\234\346\211\213\345\206\214_\344\270\255\346\226\207[\347\274\226\345\206\231\344\270\255].doc" rename to "doc/PublicCMS V2021 \345\220\216\345\217\260\346\223\215\344\275\234\346\211\213\345\206\214_\344\270\255\346\226\207[\347\274\226\345\206\231\344\270\255].doc" index effad7620..002849669 100644 Binary files "a/doc/PublicCMS V4.0 \345\220\216\345\217\260\346\223\215\344\275\234\346\211\213\345\206\214_\344\270\255\346\226\207[\347\274\226\345\206\231\344\270\255].doc" and "b/doc/PublicCMS V2021 \345\220\216\345\217\260\346\223\215\344\275\234\346\211\213\345\206\214_\344\270\255\346\226\207[\347\274\226\345\206\231\344\270\255].doc" differ diff --git "a/doc/PublicCMS V4.0 \346\225\260\346\215\256\345\255\227\345\205\270_\344\270\255\346\226\207.doc" "b/doc/PublicCMS V2021 \346\225\260\346\215\256\345\255\227\345\205\270_\344\270\255\346\226\207.doc" similarity index 76% rename from "doc/PublicCMS V4.0 \346\225\260\346\215\256\345\255\227\345\205\270_\344\270\255\346\226\207.doc" rename to "doc/PublicCMS V2021 \346\225\260\346\215\256\345\255\227\345\205\270_\344\270\255\346\226\207.doc" index be962089d..73b7fa7eb 100644 Binary files "a/doc/PublicCMS V4.0 \346\225\260\346\215\256\345\255\227\345\205\270_\344\270\255\346\226\207.doc" and "b/doc/PublicCMS V2021 \346\225\260\346\215\256\345\255\227\345\205\270_\344\270\255\346\226\207.doc" differ diff --git "a/doc/PublicCMS V4.0 \346\250\241\346\235\277\345\210\266\344\275\234\346\211\213\345\206\214_\344\270\255\346\226\207.doc" "b/doc/PublicCMS V2021 \346\250\241\346\235\277\345\210\266\344\275\234\346\211\213\345\206\214_\344\270\255\346\226\207.doc" similarity index 82% rename from "doc/PublicCMS V4.0 \346\250\241\346\235\277\345\210\266\344\275\234\346\211\213\345\206\214_\344\270\255\346\226\207.doc" rename to "doc/PublicCMS V2021 \346\250\241\346\235\277\345\210\266\344\275\234\346\211\213\345\206\214_\344\270\255\346\226\207.doc" index 1b3eea746..10da19eb8 100644 Binary files "a/doc/PublicCMS V4.0 \346\250\241\346\235\277\345\210\266\344\275\234\346\211\213\345\206\214_\344\270\255\346\226\207.doc" and "b/doc/PublicCMS V2021 \346\250\241\346\235\277\345\210\266\344\275\234\346\211\213\345\206\214_\344\270\255\346\226\207.doc" differ diff --git "a/doc/PublicCMS V4.0 \351\203\250\347\275\262\346\211\213\345\206\214_\344\270\255\346\226\207.doc" "b/doc/PublicCMS V2021 \351\203\250\347\275\262\346\211\213\345\206\214_\344\270\255\346\226\207.doc" similarity index 92% rename from "doc/PublicCMS V4.0 \351\203\250\347\275\262\346\211\213\345\206\214_\344\270\255\346\226\207.doc" rename to "doc/PublicCMS V2021 \351\203\250\347\275\262\346\211\213\345\206\214_\344\270\255\346\226\207.doc" index c888b970a..fadd199b2 100644 Binary files "a/doc/PublicCMS V4.0 \351\203\250\347\275\262\346\211\213\345\206\214_\344\270\255\346\226\207.doc" and "b/doc/PublicCMS V2021 \351\203\250\347\275\262\346\211\213\345\206\214_\344\270\255\346\226\207.doc" differ diff --git a/publiccms-parent/build.gradle b/publiccms-parent/build.gradle index 25aee1c54..a60473809 100644 --- a/publiccms-parent/build.gradle +++ b/publiccms-parent/build.gradle @@ -23,28 +23,28 @@ subprojects { apply plugin: "eclipse-wtp" group = 'com.publiccms' - version = 'V4.0.202107.f' + version = 'V2021.a' test.enabled = false ext { // http://mvnrepository.com/artifact/org.springframework/spring-core // http://projects.spring.io/spring-framework/ - springVersion = "5.3.8" + springVersion = "5.3.27" // https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-web // https://projects.spring.io/spring-boot/ - springBootVersion = "2.5.2" + springBootVersion = "2.5.15" // http://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient // http://hc.apache.org/downloads.cgi httpclientVersion = "4.5.13" // http://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core - jacksonVersion = "2.12.4" + jacksonVersion = "2.15.4" // http://mvnrepository.com/artifact/org.hibernate/hibernate-core // http://hibernate.org/orm/downloads/ - hibernateVersion = "5.4.32.Final" + hibernateVersion = "5.4.33.Final" // http://mvnrepository.com/artifact/org.hibernate/hibernate-search // http://hibernate.org/search/downloads/ - hibernateSearchVersion = "6.0.5.Final" + hibernateSearchVersion = "6.0.11.Final" // https://mvnrepository.com/artifact/org.ehcache/ehcache ehcacheVersion = "3.9.4" // http://mvnrepository.com/artifact/org.freemarker/freemarker diff --git a/publiccms-parent/pom.xml b/publiccms-parent/pom.xml index 52b8ff226..6b9eb41e5 100644 --- a/publiccms-parent/pom.xml +++ b/publiccms-parent/pom.xml @@ -19,24 +19,24 @@ UTF-8 UTF-8 - V4.0.202107.f + V2021.a - 5.3.18 + 5.3.27 - 2.5.12 + 2.5.15 4.5.13 - 2.12.6.1 + 2.15.4 - 5.4.32.Final + 5.4.33.Final - 6.0.5.Final + 6.0.11.Final 3.9.4 diff --git a/publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/constants/CmsVersion.java b/publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/constants/CmsVersion.java index ad96cdca6..f8add57d5 100644 --- a/publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/constants/CmsVersion.java +++ b/publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/constants/CmsVersion.java @@ -2,10 +2,6 @@ import java.util.UUID; -import com.publiccms.common.copyright.CmsCopyright; -import com.publiccms.common.copyright.Copyright; -import com.publiccms.common.copyright.License; - /** * * CmsVersion @@ -15,41 +11,18 @@ public class CmsVersion { private static final String clusterId = UUID.randomUUID().toString(); private static boolean master = false; private static boolean initialized = false; - private static Copyright copyright = new CmsCopyright(); /** * @return version */ public static final String getVersion() { - return "V4.0.202107"; + return "V2021"; } /** * @return revision */ public static final String getRevision() { - return "f"; - } - - /** - * @return whether the authorization edition - */ - public static boolean isAuthorizationEdition() { - return copyright.verify(CommonConstants.CMS_FILEPATH + CommonConstants.LICENSE_FILENAME); - } - - /** - * @param domain - * @return whether the domain authorized - */ - public static boolean verifyDomain(String domain) { - return copyright.verify(CommonConstants.CMS_FILEPATH + CommonConstants.LICENSE_FILENAME, domain); - } - - /** - * @return license - */ - public static License getLicense() { - return copyright.getLicense(CommonConstants.CMS_FILEPATH + CommonConstants.LICENSE_FILENAME); + return "a"; } /** diff --git a/publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/constants/CommonConstants.java b/publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/constants/CommonConstants.java index c2c657330..6045a68a3 100644 --- a/publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/constants/CommonConstants.java +++ b/publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/constants/CommonConstants.java @@ -24,10 +24,6 @@ public class CommonConstants extends Constants{ * 瀹夎閿 */ public static final String INSTALL_LOCK_FILENAME = "/install.lock"; - /** - * 鎺堟潈鏂囦欢 - */ - public static final String LICENSE_FILENAME = "/license.dat"; /** * 閰嶇疆鏂囦欢 @@ -39,11 +35,6 @@ public class CommonConstants extends Constants{ */ public static final String ENCRYPT_KEY = "publiccms"; - /** - * 鍏挜 - */ - public static final String PUBLIC_KEY = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC/ZHiLKHR70/tuoE9TsWhcKuoAgHWIOWrt+kAl1cZotjqsZwR/55PkYkz0SLZMOhXRjY1ii5Y0SDceLG0GsdRQBSvrGb2pPCDPsWM+LuG7BM8Dr8gnHKK1CROVEHJ6wR2RYsD2UIZLRp/HIzTc5B922X9oFibIyZJphFqpZngYtwIDAQAB"; - /** * 棣栭〉妯℃澘 */ diff --git a/publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/copyright/CmsCopyright.java b/publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/copyright/CmsCopyright.java deleted file mode 100644 index a379a1d52..000000000 --- a/publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/copyright/CmsCopyright.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.publiccms.common.copyright; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.FileUtils; -import org.apache.commons.lang3.ArrayUtils; -import org.apache.commons.lang3.StringUtils; - -import com.publiccms.common.constants.CommonConstants; -import com.publiccms.common.tools.IpUtils; -import com.publiccms.common.tools.LicenseUtils; - -/** - * - * CmsCopyright - * - */ -public class CmsCopyright implements Copyright { - private long lastModify = 0L; - private License license; - - @Override - public boolean verify(String licenseFilePath) { - return LicenseUtils.verifyLicense(CommonConstants.PUBLIC_KEY, getLicense(licenseFilePath)); - } - - @Override - public boolean verify(String licenseFilePath, String domain) { - License l = getLicense(licenseFilePath); - return LicenseUtils.verifyLicense(CommonConstants.PUBLIC_KEY, l) && verifyDomain(domain, l.getDomain()); - } - - @Override - public License getLicense(String licenseFilePath) { - if (null != licenseFilePath) { - File licenseFile = new File(licenseFilePath); - if (null == license || lastModify != licenseFile.lastModified()) { - try { - String licenseText = FileUtils.readFileToString(licenseFile, CommonConstants.DEFAULT_CHARSET_NAME); - license = LicenseUtils.readLicense(licenseText); - lastModify = licenseFile.lastModified(); - } catch (IOException e) { - } - } - } - return license; - } - - private static boolean verifyDomain(String domain, String licenseDomain) { - if ("*".equals(licenseDomain) || IpUtils.isIp(domain) || domain.toLowerCase().startsWith("dev.") - || domain.toLowerCase().contains(".dev.") || "localhost".equals(domain)) { - return true; - } else { - String[] licenseDomains = StringUtils.split(licenseDomain, CommonConstants.COMMA_DELIMITED); - int index; - while (0 < (index = domain.indexOf(CommonConstants.DOT))) { - if (ArrayUtils.contains(licenseDomains, domain)) { - return true; - } else { - domain = domain.substring(index + 1); - } - } - } - return false; - } -} diff --git a/publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/copyright/Copyright.java b/publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/copyright/Copyright.java deleted file mode 100644 index 306f3c3e1..000000000 --- a/publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/copyright/Copyright.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.publiccms.common.copyright; - -/** - * - * Copyright - * - */ -public interface Copyright { - - /** - * @param licenseFilePath - * @return whether to pass verify - */ - boolean verify(String licenseFilePath); - - /** - * @param licenseFilePath - * @return license - */ - License getLicense(String licenseFilePath); - - /** - * @param licenseFilePath - * @param domain - * @return whether to pass verify - */ - boolean verify(String licenseFilePath, String domain); -} diff --git a/publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/copyright/License.java b/publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/copyright/License.java deleted file mode 100644 index 34f7354bd..000000000 --- a/publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/copyright/License.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.publiccms.common.copyright; - -import java.util.LinkedHashMap; - -public class License extends LinkedHashMap { - - /** - * - */ - private static final long serialVersionUID = 1L; - public final static String KEY_VERSION = "version"; - public final static String KEY_AUTHORIZATION = "authorization"; - public final static String KEY_ORGANIZATION = "organization"; - public final static String KEY_ISSUE = "issue"; - public final static String KEY_DOMAIN = "domain"; - public final static String KEY_START_DATE = "startDate"; - public final static String KEY_END_DATE = "endDate"; - public final static String KEY_SIGNATURER = "signaturer"; - - public String getVersion() { - return get(KEY_VERSION); - } - - public void setVersion(String version) { - this.put(KEY_VERSION, version); - } - - public String getAuthorization() { - return get(KEY_AUTHORIZATION); - } - - public void setAuthorization(String authorization) { - this.put(KEY_AUTHORIZATION, authorization); - } - - public String getOrganization() { - return get(KEY_ORGANIZATION); - } - - public void setOrganization(String organization) { - this.put(KEY_ORGANIZATION, organization); - } - - public String getIssue() { - return get(KEY_ISSUE); - } - - public void setIssue(String issue) { - this.put(KEY_ISSUE, issue); - } - - public String getDomain() { - return get(KEY_DOMAIN); - } - - public void setDomain(String domain) { - this.put(KEY_DOMAIN, domain); - } - - public String getStartDate() { - return get(KEY_START_DATE); - } - - public void setStartDate(String startDate) { - this.put(KEY_START_DATE, startDate); - } - - public String getEndDate() { - return get(KEY_END_DATE); - } - - public void setEndDate(String endDate) { - this.put(KEY_END_DATE, endDate); - } - - public String getSignaturer() { - return get(KEY_SIGNATURER); - } - - public void setSignaturer(String signaturer) { - this.put(KEY_SIGNATURER, signaturer); - } -} diff --git a/publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/database/CmsUpgrader.java b/publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/database/CmsUpgrader.java index 238d389d6..5aa148cfa 100644 --- a/publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/database/CmsUpgrader.java +++ b/publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/database/CmsUpgrader.java @@ -23,88 +23,76 @@ */ public class CmsUpgrader extends AbstractCmsUpgrader { - /** - * 涓婚敭绛栫暐 - */ - public static final String IDENTIFIER_GENERATOR = IDENTIFIER_GENERATOR_IDENTITY; - /** - * - */ - private final static String VERSION_20170708 = "V2017.0708", VERSION_20180210 = "V4.0.20180210", - VERSION_180707 = "V4.0.180707", VERSION_180825 = "V4.0.180825", VERSION_181024 = "V4.0.181024", - VERSION_190312 = "V4.0.190312", VERSION_202004 = "V4.0.202004", VERSION_202011 = "V4.0.202011"; - /** - * - */ - private final static List VERSION_LIST = Arrays.asList(VERSION_20170708, VERSION_20180210, VERSION_180707, - VERSION_180825, VERSION_181024, VERSION_190312, VERSION_202004, VERSION_202011); + /** + * 涓婚敭绛栫暐 + */ + public static final String IDENTIFIER_GENERATOR = IDENTIFIER_GENERATOR_IDENTITY; + /** + * + */ + private final static String VERSION_20170708 = "V2017.0708", VERSION_2019 = "V2019", VERSION_202011 = "V2021"; + /** + * + */ + private final static List VERSION_LIST = Arrays.asList(VERSION_20170708, VERSION_2019, VERSION_202011); - public CmsUpgrader(Properties config) { - super(config); - } + public CmsUpgrader(Properties config) { + super(config); + } - /** - * @throws SQLException - * @throws IOException - */ - @Override - public void update(StringWriter stringWriter, Connection connection, String fromVersion) throws SQLException, IOException { - switch (fromVersion) { - case VERSION_20170708: - runScript(stringWriter, connection, VERSION_20170708, VERSION_20180210); - case VERSION_20180210: - runScript(stringWriter, connection, VERSION_20180210, VERSION_180707); - case VERSION_180707: - updateMetadata(stringWriter, connection); - runScript(stringWriter, connection, VERSION_180707, VERSION_180825); - case VERSION_180825: - runScript(stringWriter, connection, VERSION_180825, VERSION_180825); - case VERSION_181024: - runScript(stringWriter, connection, VERSION_181024, VERSION_190312); - case VERSION_190312: - runScript(stringWriter, connection, VERSION_190312, VERSION_202004); - case VERSION_202004: - runScript(stringWriter, connection, VERSION_202004, VERSION_202011); - case VERSION_202011: - runScript(stringWriter, connection, VERSION_202011, CmsVersion.getVersion()); - } - } + /** + * @throws SQLException + * @throws IOException + */ + @Override + public void update(StringWriter stringWriter, Connection connection, String fromVersion) + throws SQLException, IOException { + switch (fromVersion) { + case VERSION_20170708: + runScript(stringWriter, connection, VERSION_20170708, VERSION_2019); + updateMetadata(stringWriter, connection); + case VERSION_2019: + runScript(stringWriter, connection, VERSION_2019, VERSION_202011); + case VERSION_202011: + runScript(stringWriter, connection, VERSION_202011, CmsVersion.getVersion()); + } + } - @Override - public void setDataBaseUrl(Properties dbconfig, String host, String port, String database, String timeZone) - throws IOException, URISyntaxException { - StringBuilder sb = new StringBuilder(); - sb.append("jdbc:mysql://"); - sb.append(host); - sb.append(":"); - if (CommonUtils.empty(port)) { - sb.append(getDefaultPort()); - } else { - sb.append(port); - } - sb.append("/"); - sb.append(database); - sb.append("?characterEncoding=UTF-8&useSSL=false&allowPublicKeyRetrieval=true&useAffectedRows=true"); - if (CommonUtils.notEmpty(timeZone)) { - try { - sb.append("&serverTimezone=GMT"); - if (!"Z".equalsIgnoreCase(timeZone)) { - sb.append(URLEncoder.encode(timeZone, Constants.DEFAULT_CHARSET_NAME)); - } - } catch (UnsupportedEncodingException e) { - } - } - dbconfig.setProperty("jdbc.url", sb.toString()); - dbconfig.setProperty("jdbc.driverClassName", "com.mysql.cj.jdbc.Driver"); - } + @Override + public void setDataBaseUrl(Properties dbconfig, String host, String port, String database, String timeZone) + throws IOException, URISyntaxException { + StringBuilder sb = new StringBuilder(); + sb.append("jdbc:mysql://"); + sb.append(host); + sb.append(":"); + if (CommonUtils.empty(port)) { + sb.append(getDefaultPort()); + } else { + sb.append(port); + } + sb.append("/"); + sb.append(database); + sb.append("?characterEncoding=UTF-8&useSSL=false&allowPublicKeyRetrieval=true&useAffectedRows=true"); + if (CommonUtils.notEmpty(timeZone)) { + try { + sb.append("&serverTimezone=GMT"); + if (!"Z".equalsIgnoreCase(timeZone)) { + sb.append(URLEncoder.encode(timeZone, Constants.DEFAULT_CHARSET_NAME)); + } + } catch (UnsupportedEncodingException e) { + } + } + dbconfig.setProperty("jdbc.url", sb.toString()); + dbconfig.setProperty("jdbc.driverClassName", "com.mysql.cj.jdbc.Driver"); + } - @Override - public List getVersionList() { - return VERSION_LIST; - } + @Override + public List getVersionList() { + return VERSION_LIST; + } - @Override - public int getDefaultPort() { - return 3306; - } + @Override + public int getDefaultPort() { + return 3306; + } } diff --git a/publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/tools/LicenseUtils.java b/publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/tools/LicenseUtils.java deleted file mode 100644 index ed267738b..000000000 --- a/publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/tools/LicenseUtils.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.publiccms.common.tools; - -import java.io.BufferedReader; -import java.io.BufferedWriter; -import java.io.IOException; -import java.io.StringReader; -import java.io.StringWriter; -import java.text.ParseException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Date; -import java.util.List; -import java.util.Map.Entry; - -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.time.DateUtils; - -import com.publiccms.common.constants.Constants; -import com.publiccms.common.copyright.License; - -public class LicenseUtils { - public static final String DATE_FORMAT_STRING = "yyyy-MM-dd"; - - public static String writeLicense(License license) { - try { - StringWriter sw = new StringWriter(); - BufferedWriter bw = new BufferedWriter(sw); - for (Entry entry : license.entrySet()) { - bw.append(entry.getKey()).append("=").append(entry.getValue()); - bw.newLine(); - } - bw.close(); - return sw.getBuffer().toString(); - } catch (IOException e) { - } - return null; - } - - public static License readLicense(String licenseText) { - License license = new License(); - if (null != licenseText) { - try { - BufferedReader br = new BufferedReader(new StringReader(licenseText)); - String temp = null; - while (null != (temp = br.readLine())) { - String[] values = StringUtils.split(temp, "=", 2); - if (values.length == 2) { - license.put(values[0], values[1]); - } - } - br.close(); - } catch (IOException e) { - } - } - return license; - } - - public static License readLicense(byte[] licenseData) { - License license = new License(); - if (null != licenseData) { - String licenseText = new String(licenseData, Constants.DEFAULT_CHARSET); - String[] licenseItem = StringUtils.split(licenseText, ";"); - for (String item : licenseItem) { - String[] values = StringUtils.split(item, "=", 2); - if (values.length == 2) { - license.put(values[0], values[1]); - } - } - } - return license; - } - - public static boolean verifyLicense(String publicKey, License license) { - if (null != license && VerificationUtils.publicKeyVerify(VerificationUtils.base64Decode(publicKey), - getLicenseDate(license), VerificationUtils.base64Decode(license.getSignaturer()))) { - return verifyLicenseDate(license); - } - return false; - } - - public static boolean verifyLicenseDate(License license) { - if (null != license && null != license.getStartDate() && null != license.getEndDate()) { - Date now = new Date(); - try { - if (now.after( - DateFormatUtils.getDateFormat(DateFormatUtils.SHORT_DATE_FORMAT_STRING).parse(license.getStartDate())) - && (DateFormatUtils.SHORT_DATE_LENGTH != license.getEndDate().length() || now - .before(DateUtils.addDays(DateFormatUtils.getDateFormat(DateFormatUtils.SHORT_DATE_FORMAT_STRING) - .parse(license.getEndDate()), 1)))) { - return true; - } - } catch (ParseException e) { - } - } - return false; - } - - public static String generateSignaturer(byte[] privateKey, License license) { - return VerificationUtils.base64Encode(VerificationUtils.privateKeySign(privateKey, getLicenseDate(license))); - } - - public static byte[] getLicenseDate(License license) { - StringBuilder sb = new StringBuilder(); - if (null != license) { - List list = new ArrayList<>(license.keySet()); - Collections.sort(list); - for (String key : list) { - if (!License.KEY_SIGNATURER.equals(key)) { - sb.append(key).append("=").append(license.get(key)).append(";"); - } - } - } - return sb.toString().getBytes(Constants.DEFAULT_CHARSET); - } -} \ No newline at end of file diff --git a/publiccms-parent/publiccms-core/src/main/java/com/publiccms/controller/admin/sys/SysDomainAdminController.java b/publiccms-parent/publiccms-core/src/main/java/com/publiccms/controller/admin/sys/SysDomainAdminController.java index 865ae8980..73715074a 100644 --- a/publiccms-parent/publiccms-core/src/main/java/com/publiccms/controller/admin/sys/SysDomainAdminController.java +++ b/publiccms-parent/publiccms-core/src/main/java/com/publiccms/controller/admin/sys/SysDomainAdminController.java @@ -1,6 +1,7 @@ package com.publiccms.controller.admin.sys; import javax.servlet.http.HttpServletRequest; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; @@ -10,7 +11,6 @@ import org.springframework.web.bind.annotation.SessionAttribute; import com.publiccms.common.annotation.Csrf; -import com.publiccms.common.constants.CmsVersion; import com.publiccms.common.constants.CommonConstants; import com.publiccms.common.tools.CommonUtils; import com.publiccms.common.tools.ControllerUtils; @@ -55,9 +55,7 @@ public class SysDomainAdminController { @Csrf public String save(@RequestAttribute SysSite site, @SessionAttribute SysUser admin, SysDomain entity, String oldName, HttpServletRequest request, ModelMap model) { - if (ControllerUtils.verifyCustom("noright", !siteComponent.isMaster(site.getId()), model) - || ControllerUtils.verifyCustom("needAuthorizationEdition", !CmsVersion.isAuthorizationEdition(), model) - || ControllerUtils.verifyCustom("unauthorizedDomain", !CmsVersion.verifyDomain(entity.getName()), model)) { + if (ControllerUtils.verifyCustom("noright", !siteComponent.isMaster(site.getId()), model)) { return CommonConstants.TEMPLATE_ERROR; } if (CommonUtils.notEmpty(oldName)) { diff --git a/publiccms-parent/publiccms-core/src/main/java/com/publiccms/controller/admin/sys/SysSiteAdminController.java b/publiccms-parent/publiccms-core/src/main/java/com/publiccms/controller/admin/sys/SysSiteAdminController.java index 2e55e2489..6f08c2091 100644 --- a/publiccms-parent/publiccms-core/src/main/java/com/publiccms/controller/admin/sys/SysSiteAdminController.java +++ b/publiccms-parent/publiccms-core/src/main/java/com/publiccms/controller/admin/sys/SysSiteAdminController.java @@ -2,7 +2,6 @@ import java.io.BufferedReader; import java.io.File; -import java.io.IOException; import java.io.InputStreamReader; import java.util.regex.Pattern; @@ -17,20 +16,15 @@ import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.RequestAttribute; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.SessionAttribute; -import org.springframework.web.multipart.MultipartFile; import com.publiccms.common.annotation.Csrf; -import com.publiccms.common.constants.CmsVersion; import com.publiccms.common.constants.CommonConstants; -import com.publiccms.common.tools.CmsFileUtils; import com.publiccms.common.tools.CommonUtils; import com.publiccms.common.tools.ControllerUtils; import com.publiccms.common.tools.JsonUtils; import com.publiccms.common.tools.RequestUtils; import com.publiccms.entities.log.LogOperate; -import com.publiccms.entities.log.LogUpload; import com.publiccms.entities.sys.SysSite; import com.publiccms.entities.sys.SysUser; import com.publiccms.logic.component.site.SiteComponent; @@ -108,9 +102,7 @@ public String save(@RequestAttribute SysSite site, @SessionAttribute SysUser adm "update.site", RequestUtils.getIpAddress(request), CommonUtils.getDate(), JsonUtils.getString(entity))); } } else { - if (ControllerUtils.verifyCustom("needAuthorizationEdition", !CmsVersion.isAuthorizationEdition(), model) - || ControllerUtils.verifyCustom("unauthorizedDomain", !CmsVersion.verifyDomain(domain), model) - || ControllerUtils.verifyNotEmpty("userName", userName, model) + if ( ControllerUtils.verifyNotEmpty("userName", userName, model) || ControllerUtils.verifyNotEmpty("password", password, model) || ControllerUtils.verifyHasExist("domain", domainService.getEntity(domain), model)) { return CommonConstants.TEMPLATE_ERROR; @@ -266,35 +258,6 @@ public String execScript(@RequestAttribute SysSite site, @SessionAttribute SysUs } - /** - * @param site - * @param admin - * @param file - * @param request - * @param model - * @return view name - */ - @RequestMapping(value = "doUploadLicense", method = RequestMethod.POST) - @Csrf - public String upload(@RequestAttribute SysSite site, @SessionAttribute SysUser admin, MultipartFile file, - HttpServletRequest request, ModelMap model) { - if (ControllerUtils.verifyCustom("noright", !siteComponent.isMaster(site.getId()), model)) { - return CommonConstants.TEMPLATE_ERROR; - } - if (null != file && !file.isEmpty()) { - try { - CmsFileUtils.upload(file, siteComponent.getRootPath() + CommonConstants.LICENSE_FILENAME); - logUploadService.save(new LogUpload(site.getId(), admin.getId(), LogLoginService.CHANNEL_WEB_MANAGER, - "license.dat", CmsFileUtils.FILE_TYPE_OTHER, file.getSize(), null, null, - RequestUtils.getIpAddress(request), CommonUtils.getDate(), CommonConstants.LICENSE_FILENAME)); - return CommonConstants.TEMPLATE_DONE; - } catch (IllegalStateException | IOException e) { - log.error(e.getMessage(), e); - } - } - return CommonConstants.TEMPLATE_ERROR; - } - /** * @param site * @param admin diff --git a/publiccms-parent/publiccms-core/src/main/java/com/publiccms/views/directive/sys/SysConfigDataDirective.java b/publiccms-parent/publiccms-core/src/main/java/com/publiccms/views/directive/sys/SysConfigDataDirective.java index 3dd0056fc..53fbb4edd 100644 --- a/publiccms-parent/publiccms-core/src/main/java/com/publiccms/views/directive/sys/SysConfigDataDirective.java +++ b/publiccms-parent/publiccms-core/src/main/java/com/publiccms/views/directive/sys/SysConfigDataDirective.java @@ -24,33 +24,38 @@ @Component public class SysConfigDataDirective extends AbstractTemplateDirective { - @Override - public void execute(RenderHandler handler) throws IOException, Exception { - String code = handler.getString("code"); - String[] codes = handler.getStringArray("codes"); - SysSite site = getSite(handler); - if (CommonUtils.notEmpty(code)) { - SysConfigData entity = service.getEntity(new SysConfigDataId(site.getId(), code)); - if (null != entity) { - handler.put("object", ExtendUtils.getExtendMap(entity.getData())).render(); - } - } else if (CommonUtils.notEmpty(codes)) { - SysConfigDataId[] ids = new SysConfigDataId[codes.length]; - int i = 0; - for (String s : codes) { - if (CommonUtils.notEmpty(s)) { - ids[i++] = new SysConfigDataId(site.getId(), s); - } - } - Map> map = new LinkedHashMap<>(); - for (SysConfigData entity : service.getEntitys(ids)) { - map.put(entity.getId().getCode(), ExtendUtils.getExtendMap(entity.getData())); - } - handler.put("map", map).render(); - } - } - - @Autowired - private SysConfigDataService service; + @Override + public void execute(RenderHandler handler) throws IOException, Exception { + String code = handler.getString("code"); + String[] codes = handler.getStringArray("codes"); + SysSite site = getSite(handler); + if (CommonUtils.notEmpty(code)) { + SysConfigData entity = service.getEntity(new SysConfigDataId(site.getId(), code)); + if (null != entity) { + handler.put("object", ExtendUtils.getExtendMap(entity.getData())).render(); + } + } else if (CommonUtils.notEmpty(codes)) { + SysConfigDataId[] ids = new SysConfigDataId[codes.length]; + int i = 0; + for (String s : codes) { + if (CommonUtils.notEmpty(s)) { + ids[i++] = new SysConfigDataId(site.getId(), s); + } + } + Map> map = new LinkedHashMap<>(); + for (SysConfigData entity : service.getEntitys(ids)) { + map.put(entity.getId().getCode(), ExtendUtils.getExtendMap(entity.getData())); + } + handler.put("map", map).render(); + } + } + + @Override + public boolean needAppToken() { + return true; + } + + @Autowired + private SysConfigDataService service; } diff --git a/publiccms-parent/publiccms-core/src/main/java/com/publiccms/views/directive/tools/LicenseVerifyDirective.java b/publiccms-parent/publiccms-core/src/main/java/com/publiccms/views/directive/tools/LicenseVerifyDirective.java deleted file mode 100644 index 385763c29..000000000 --- a/publiccms-parent/publiccms-core/src/main/java/com/publiccms/views/directive/tools/LicenseVerifyDirective.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.publiccms.views.directive.tools; - -import java.io.IOException; - -import org.springframework.stereotype.Component; - -import com.publiccms.common.base.AbstractTemplateDirective; -import com.publiccms.common.copyright.License; -import com.publiccms.common.handler.RenderHandler; -import com.publiccms.common.tools.CommonUtils; -import com.publiccms.common.tools.LicenseUtils; -import com.publiccms.common.tools.VerificationUtils; - -/** - * - * VersionDirective 鎶鏈鏋剁増鏈寚浠 - * - */ -@Component -public class LicenseVerifyDirective extends AbstractTemplateDirective { - - @Override - public void execute(RenderHandler handler) throws IOException, Exception { - String licenseData = handler.getString("licenseData"); - handler.put("result", false); - if (CommonUtils.notEmpty(licenseData)) { - License license = LicenseUtils.readLicense(VerificationUtils.base64Decode(licenseData)); - handler.put("result", LicenseUtils.verifyLicenseDate(license)); - } - handler.render(); - } - -} diff --git a/publiccms-parent/publiccms-core/src/main/java/com/publiccms/views/directive/tools/VersionDirective.java b/publiccms-parent/publiccms-core/src/main/java/com/publiccms/views/directive/tools/VersionDirective.java index 6e3d59640..36cb06b94 100644 --- a/publiccms-parent/publiccms-core/src/main/java/com/publiccms/views/directive/tools/VersionDirective.java +++ b/publiccms-parent/publiccms-core/src/main/java/com/publiccms/views/directive/tools/VersionDirective.java @@ -2,10 +2,10 @@ import java.io.IOException; -import com.publiccms.common.base.AbstractTemplateDirective; -import com.publiccms.common.constants.CmsVersion; import org.springframework.stereotype.Component; +import com.publiccms.common.base.AbstractTemplateDirective; +import com.publiccms.common.constants.CmsVersion; import com.publiccms.common.handler.RenderHandler; /** @@ -20,13 +20,6 @@ public class VersionDirective extends AbstractTemplateDirective { public void execute(RenderHandler handler) throws IOException, Exception { handler.put("cms", CmsVersion.getVersion()); handler.put("revision", CmsVersion.getRevision()); - boolean authorizationEdition = CmsVersion.isAuthorizationEdition(); - handler.put("authorizationEdition", authorizationEdition); - if (authorizationEdition) { - handler.put("authorizationStartDate", CmsVersion.getLicense().getStartDate()); - handler.put("authorizationEndDate", CmsVersion.getLicense().getEndDate()); - handler.put("authorizationOrganization", CmsVersion.getLicense().getOrganization()); - } handler.put("cluster", CmsVersion.getClusterId()); handler.put("master", CmsVersion.isMaster()); handler.render(); diff --git a/publiccms-parent/publiccms-core/src/main/java/com/publiccms/views/method/tools/GetLicenseDataMethod.java b/publiccms-parent/publiccms-core/src/main/java/com/publiccms/views/method/tools/GetLicenseDataMethod.java deleted file mode 100644 index ac3ed38de..000000000 --- a/publiccms-parent/publiccms-core/src/main/java/com/publiccms/views/method/tools/GetLicenseDataMethod.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.publiccms.views.method.tools; - -import java.util.List; - -import org.springframework.stereotype.Component; - -import com.publiccms.common.base.BaseMethod; -import com.publiccms.common.constants.CmsVersion; -import com.publiccms.common.tools.LicenseUtils; -import com.publiccms.common.tools.VerificationUtils; - -import freemarker.template.TemplateModelException; - -/** - * - * GetLicenseDateMethod - * - */ -@Component -public class GetLicenseDataMethod extends BaseMethod { - - @Override - public Object exec(@SuppressWarnings("rawtypes") List arguments) throws TemplateModelException { - return VerificationUtils.base64Encode(LicenseUtils.getLicenseDate(CmsVersion.getLicense())); - } - - @Override - public boolean needAppToken() { - return false; - } - - @Override - public int minParametersNumber() { - return 0; - } -} diff --git a/publiccms-parent/publiccms-core/src/main/java/com/publiccms/views/method/tools/GetLicenseMethod.java b/publiccms-parent/publiccms-core/src/main/java/com/publiccms/views/method/tools/GetLicenseMethod.java deleted file mode 100644 index 4a8fa59f1..000000000 --- a/publiccms-parent/publiccms-core/src/main/java/com/publiccms/views/method/tools/GetLicenseMethod.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.publiccms.views.method.tools; - -import java.util.List; - -import com.publiccms.common.constants.CmsVersion; -import org.springframework.stereotype.Component; - -import com.publiccms.common.base.BaseMethod; - -import freemarker.template.TemplateModelException; - -/** - * - * GetLicenseMethod - * - */ -@Component -public class GetLicenseMethod extends BaseMethod { - - @Override - public Object exec(@SuppressWarnings("rawtypes") List arguments) throws TemplateModelException { - return CmsVersion.getLicense(); - } - - @Override - public boolean needAppToken() { - return true; - } - - @Override - public int minParametersNumber() { - return 0; - } -} diff --git a/publiccms-parent/publiccms-core/src/main/java/com/publiccms/views/method/tools/GetXmlMethod.java b/publiccms-parent/publiccms-core/src/main/java/com/publiccms/views/method/tools/GetXmlMethod.java index d09800816..85bfc8af8 100644 --- a/publiccms-parent/publiccms-core/src/main/java/com/publiccms/views/method/tools/GetXmlMethod.java +++ b/publiccms-parent/publiccms-core/src/main/java/com/publiccms/views/method/tools/GetXmlMethod.java @@ -33,9 +33,9 @@ public Object exec(@SuppressWarnings("rawtypes") List arguments) throws Template if (CommonUtils.notEmpty(str)) { if (uninitialized) { try { - DocumentBuilderFactory dbf = NodeModel.getDocumentBuilderFactory(); + DocumentBuilderFactory dbf = NodeModel.getDocumentBuilderFactory(); dbf.setFeature("http://xml.org/sax/features/external-parameter-entities", false); - dbf.setFeature("http://apache.org/xml/features/disallow-doctype-decl", false); + dbf.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true); dbf.setFeature("http://xml.org/sax/features/external-general-entities", false); dbf.setXIncludeAware(false); dbf.setExpandEntityReferences(false); diff --git a/publiccms-parent/publiccms-core/src/main/resources/initialization/template/license.html b/publiccms-parent/publiccms-core/src/main/resources/initialization/template/license.html index 2ee5ea235..a5d78fe3b 100644 --- a/publiccms-parent/publiccms-core/src/main/resources/initialization/template/license.html +++ b/publiccms-parent/publiccms-core/src/main/resources/initialization/template/license.html @@ -1,10 +1,10 @@ 涓銆佹巿鏉冭鍙 - 1.1 鎮ㄥ彲浠ュ厤璐逛慨鏀广佸鍒躲佸垎鍙戞湰杞欢鍙婃湰杞欢鐨勬簮鐮 - 1.2 鎮ㄥ彲浠ュ厤璐硅幏寰楃殑鍩轰簬鍏嶈垂鍗忚鐨勬巿鏉冩枃浠讹紝骞惰幏寰楅潪鍟嗕笟鐢ㄩ旂殑浣跨敤鏉冮檺锛岄潪鍟嗕笟鐢ㄩ旈檺涓汉鐢ㄦ埛浣跨敤 - 1.3 鍟嗕笟鐢ㄩ旂敤鎴峰厑璁镐笉瓒呰繃3涓湀鐨勮瘯鐢紝璇曠敤鏈熼棿锛屽熀浜庢湰杞欢寮鍙戠殑椤甸潰蹇呴』鍦ㄦ樉钁椾綅缃坊鍔燩owered by PublicCMS鏍囪瘑锛屽苟淇濈暀浜у搧涓殑鎺堟潈鍙妉ogo绛夋爣璇 - 1.4 鍦ㄥ皢鏈蒋浠剁敤浣滃晢涓氱敤閫旀椂锛岄渶瑕佸彇寰楄蒋浠剁増鏉冩柟鍟嗕笟浣跨敤鎺堟潈锛屾巿鏉冨崟浣嶅簲涓烘渶缁堜娇鐢ㄤ骇鍝佺殑鐢ㄦ埛鍗曚綅 - 1.5 宸茶幏寰楀晢涓氭巿鏉冪殑鐢ㄦ埛鍙互浣跨敤銆佸鍒躲佷慨鏀广佸垎鍙戞湰杞欢(鍚簮鐮)鍙婂寘鍚湰杞欢(鍚簮鐮)鐨勪骇鍝 - 1.6 璇ュ崗璁粎瀵瑰綋鍓嶇増鏈湁鏁堬紝鍘嗗彶宸插彂甯冪増鏈鍙傜収杞欢鍙戝竷鏃堕檮甯︾殑鎺堟潈鍗忚 + 1.1 璇ヨ蒋浠剁増鏈伒寰狹IT鎺堟潈鍗忚(http://www.opensource.org/licenses/mit-license.php) + 1.2 琚巿鏉冧汉鏈夋潈鍒╀娇鐢ㄣ佸鍒躲佷慨鏀广佸悎骞躲佸嚭鐗堝彂琛屻佹暎甯冦佸啀鎺堟潈鍙婅穿鍞湰杞欢鍙婃湰杞欢鐨勬簮鐮併 + 1.3 琚巿鏉冧汉鍙牴鎹▼寮忕殑闇瑕佷慨鏀规巿鏉冩潯娆句负閫傚綋鐨勫唴瀹广 + 1.4 鍦ㄨ蒋浠跺拰杞欢鐨勬墍鏈夊壇鏈腑閮藉繀椤诲寘鍚増鏉冨０鏄庡拰璁稿彲澹版槑銆 + 1.5 鎮ㄧ殑鍐嶅彂琛岀増鏈紝鍙互浣跨敤PublicCMS鍚嶄箟杩涜瀹ｄ紶銆 + 1.6 鏈蒋浠朵腑鍖呭惈鍏朵粬鎺堟潈鍗忚鐨勭涓夋柟浜у搧璇烽伒瀹堝叾鎺堟潈鍗忚銆 浜屻佺増鏉 2.1 璇ヨ蒋浠剁増鏉冨綊PublicCMS瀹樻柟鎵鏈 涓夈佸厤璐ｅ０鏄 diff --git a/publiccms-parent/publiccms-core/src/main/resources/initialization/upgrade/V4.0.20180210-V4.0.180707.sql b/publiccms-parent/publiccms-core/src/main/resources/initialization/upgrade/V2017.0708-V2019.sql similarity index 57% rename from publiccms-parent/publiccms-core/src/main/resources/initialization/upgrade/V4.0.20180210-V4.0.180707.sql rename to publiccms-parent/publiccms-core/src/main/resources/initialization/upgrade/V2017.0708-V2019.sql index 33782c883..971fd4cd9 100644 --- a/publiccms-parent/publiccms-core/src/main/resources/initialization/upgrade/V4.0.20180210-V4.0.180707.sql +++ b/publiccms-parent/publiccms-core/src/main/resources/initialization/upgrade/V2017.0708-V2019.sql @@ -1,570 +1,1073 @@ -UPDATE `sys_module` SET `authorized_url` = 'sysUser/lookup,cmsContent/recycle,cmsContent/realDelete' WHERE `id` = 117; -ALTER TABLE `sys_user` MODIFY COLUMN `last_login_ip` varchar(64) NULL DEFAULT NULL COMMENT '鏈鍚庣櫥褰昳p' AFTER `last_login_date`; -ALTER TABLE `sys_user_token` MODIFY COLUMN `login_ip` varchar(64) NOT NULL COMMENT '鐧诲綍IP' AFTER `create_date`; --- 20180414 -- -DROP TABLE IF EXISTS `home_active`; -DROP TABLE IF EXISTS `home_article`; -DROP TABLE IF EXISTS `home_article_content`; -DROP TABLE IF EXISTS `home_attention`; -DROP TABLE IF EXISTS `home_broadcast`; -DROP TABLE IF EXISTS `home_comment`; -DROP TABLE IF EXISTS `home_comment_content`; -DROP TABLE IF EXISTS `home_directory`; -DROP TABLE IF EXISTS `home_file`; -DROP TABLE IF EXISTS `home_friend`; -DROP TABLE IF EXISTS `home_friend_apply`; -DROP TABLE IF EXISTS `home_group`; -DROP TABLE IF EXISTS `home_group_apply`; -DROP TABLE IF EXISTS `home_group_post`; -DROP TABLE IF EXISTS `home_group_post_content`; -DROP TABLE IF EXISTS `home_group_user`; -DROP TABLE IF EXISTS `home_score`; -DROP TABLE IF EXISTS `home_user`; -UPDATE `sys_module` SET `parent_id` = 149 WHERE `id` in (150,151,152,153,154); -UPDATE `sys_module` SET `parent_id` = 99 WHERE `id` in (145,146); --- 20180504 -- -UPDATE `sys_module` SET `authorized_url` = 'cmsContent/push_content,cmsContent/push_content_list,cmsContent/push_to_content,cmsContent/push_page,cmsContent/push_page_list,cmsPlace/add,cmsPlace/save,cmsContent/related,cmsContent/unrelated,cmsPlace/delete' WHERE `id` = 23; -INSERT INTO `sys_module` VALUES ('141', '淇敼鍐呭妯″瀷', 'cmsContent/changeModelParameters', 'cmsContent/changeModel', null, '12', '0', '0'); --- 20180605 -- -DELETE FROM `sys_module` WHERE id < 1000; -ALTER TABLE `sys_module` - MODIFY COLUMN `id` varchar(30) NOT NULL FIRST, - MODIFY COLUMN `parent_id` varchar(30) NULL DEFAULT NULL COMMENT '鐖舵ā鍧' AFTER `attached`; -ALTER TABLE `sys_role` MODIFY COLUMN `show_all_module` tinyint(1) NOT NULL COMMENT '鏄剧ず鍏ㄩ儴妯″潡' AFTER `owns_all_right`; -ALTER TABLE `sys_site` MODIFY COLUMN `id` smallint(6) NOT NULL AUTO_INCREMENT FIRST; -ALTER TABLE `cms_place` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `id`; -ALTER TABLE `sys_role_module` MODIFY COLUMN `module_id` varchar(30) NOT NULL COMMENT '妯″潡ID' AFTER `role_id`; - -CREATE TABLE `sys_module_lang` ( - `module_id` varchar(30) NOT NULL COMMENT '妯″潡ID', - `lang` varchar(20) NOT NULL COMMENT '璇█', - `value` varchar(100) DEFAULT NULL COMMENT '鍊', - PRIMARY KEY (`module_id`,`lang`) USING BTREE -) COMMENT='妯″潡璇█'; - -INSERT INTO `sys_module_lang` SELECT `id`,'',`name` FROM `sys_module` where id >= 1000; -INSERT INTO `sys_module_lang` SELECT `id`,'en',`name` FROM `sys_module` where id >= 1000; - -INSERT INTO `sys_module_lang` VALUES ('app_add', '', '澧炲姞/淇敼'); -INSERT INTO `sys_module_lang` VALUES ('app_add', 'en', 'Add/edit'); -INSERT INTO `sys_module_lang` VALUES ('app_client_disable', '', '绂佺敤'); -INSERT INTO `sys_module_lang` VALUES ('app_client_disable', 'en', 'Disable'); -INSERT INTO `sys_module_lang` VALUES ('app_client_enable', '', '鍚敤'); -INSERT INTO `sys_module_lang` VALUES ('app_client_enable', 'en', 'Enable'); -INSERT INTO `sys_module_lang` VALUES ('app_client_list', '', '瀹㈡埛绔鐞'); -INSERT INTO `sys_module_lang` VALUES ('app_client_list', 'en', 'Application client management'); -INSERT INTO `sys_module_lang` VALUES ('app_delete', '', '鍒犻櫎'); -INSERT INTO `sys_module_lang` VALUES ('app_delete', 'en', 'Delete'); -INSERT INTO `sys_module_lang` VALUES ('app_list', '', '搴旂敤鎺堟潈'); -INSERT INTO `sys_module_lang` VALUES ('app_list', 'en', 'Application Authorization'); -INSERT INTO `sys_module_lang` VALUES ('category', '', '鍒嗙被'); -INSERT INTO `sys_module_lang` VALUES ('category', 'en', 'Category'); -INSERT INTO `sys_module_lang` VALUES ('category_add', '', '澧炲姞/淇敼'); -INSERT INTO `sys_module_lang` VALUES ('category_add', 'en', 'Add/edit'); -INSERT INTO `sys_module_lang` VALUES ('category_delete', '', '鍒犻櫎'); -INSERT INTO `sys_module_lang` VALUES ('category_delete', 'en', 'Delete'); -INSERT INTO `sys_module_lang` VALUES ('category_extend', '', '鍒嗙被鎵╁睍'); -INSERT INTO `sys_module_lang` VALUES ('category_extend', 'en', 'Category extension'); -INSERT INTO `sys_module_lang` VALUES ('category_menu', '', '鍒嗙被绠＄悊'); -INSERT INTO `sys_module_lang` VALUES ('category_menu', 'en', 'Category management'); -INSERT INTO `sys_module_lang` VALUES ('category_move', '', '绉诲姩'); -INSERT INTO `sys_module_lang` VALUES ('category_move', 'en', 'Move'); -INSERT INTO `sys_module_lang` VALUES ('category_publish', '', '鐢熸垚'); -INSERT INTO `sys_module_lang` VALUES ('category_publish', 'en', 'Publish'); -INSERT INTO `sys_module_lang` VALUES ('category_push', '', '鎺ㄨ崘'); -INSERT INTO `sys_module_lang` VALUES ('category_push', 'en', 'Push'); -INSERT INTO `sys_module_lang` VALUES ('category_type_add', '', '澧炲姞/淇敼'); -INSERT INTO `sys_module_lang` VALUES ('category_type_add', 'en', 'test'); -INSERT INTO `sys_module_lang` VALUES ('category_type_change', '', '淇敼绫诲瀷'); -INSERT INTO `sys_module_lang` VALUES ('category_type_change', 'en', 'Change category type'); -INSERT INTO `sys_module_lang` VALUES ('category_type_delete', '', '鍒犻櫎'); -INSERT INTO `sys_module_lang` VALUES ('category_type_delete', 'en', 'test'); -INSERT INTO `sys_module_lang` VALUES ('category_type_list', '', '鍒嗙被绫诲瀷'); -INSERT INTO `sys_module_lang` VALUES ('category_type_list', 'en', 'Category type'); -INSERT INTO `sys_module_lang` VALUES ('clearcache', '', '鍒锋柊缂撳瓨'); -INSERT INTO `sys_module_lang` VALUES ('clearcache', 'en', 'Clear cache'); -INSERT INTO `sys_module_lang` VALUES ('config_add', '', '娣诲姞/淇敼'); -INSERT INTO `sys_module_lang` VALUES ('config_add', 'en', 'Add/edit'); -INSERT INTO `sys_module_lang` VALUES ('config_data_delete', '', '娓呯┖閰嶇疆'); -INSERT INTO `sys_module_lang` VALUES ('config_data_delete', 'en', 'Clear config data'); -INSERT INTO `sys_module_lang` VALUES ('config_data_edit', '', '淇敼'); -INSERT INTO `sys_module_lang` VALUES ('config_data_edit', 'en', 'Edit'); -INSERT INTO `sys_module_lang` VALUES ('config_data_list', '', '绔欑偣閰嶇疆'); -INSERT INTO `sys_module_lang` VALUES ('config_data_list', 'en', 'Site configuration'); -INSERT INTO `sys_module_lang` VALUES ('config_delete', '', '鍒犻櫎閰嶇疆'); -INSERT INTO `sys_module_lang` VALUES ('config_delete', 'en', 'Delete'); -INSERT INTO `sys_module_lang` VALUES ('config_list', '', '绔欑偣閰嶇疆绠＄悊'); -INSERT INTO `sys_module_lang` VALUES ('config_list', 'en', 'Site config management'); -INSERT INTO `sys_module_lang` VALUES ('config_list_data_dictionary', '', '閫夋嫨鏁版嵁瀛楀吀'); -INSERT INTO `sys_module_lang` VALUES ('config_list_data_dictionary', 'en', 'Select data dictionary'); -INSERT INTO `sys_module_lang` VALUES ('config_menu', '', '閰嶇疆绠＄悊'); -INSERT INTO `sys_module_lang` VALUES ('config_menu', 'en', 'Configuration management'); -INSERT INTO `sys_module_lang` VALUES ('content', '', '鍐呭'); -INSERT INTO `sys_module_lang` VALUES ('content', 'en', 'Content'); -INSERT INTO `sys_module_lang` VALUES ('content_add', '', '澧炲姞/淇敼'); -INSERT INTO `sys_module_lang` VALUES ('content_add', 'en', 'Add/edit'); -INSERT INTO `sys_module_lang` VALUES ('content_check', '', '瀹℃牳'); -INSERT INTO `sys_module_lang` VALUES ('content_check', 'en', 'Check'); -INSERT INTO `sys_module_lang` VALUES ('content_delete', '', '鍒犻櫎'); -INSERT INTO `sys_module_lang` VALUES ('content_delete', 'en', 'Delete'); -INSERT INTO `sys_module_lang` VALUES ('content_extend', '', '鍐呭鎵╁睍'); -INSERT INTO `sys_module_lang` VALUES ('content_extend', 'en', 'Content extension'); -INSERT INTO `sys_module_lang` VALUES ('content_menu', '', '鍐呭绠＄悊'); -INSERT INTO `sys_module_lang` VALUES ('content_menu', 'en', 'Content management'); -INSERT INTO `sys_module_lang` VALUES ('content_move', '', '绉诲姩'); -INSERT INTO `sys_module_lang` VALUES ('content_move', 'en', 'Move'); -INSERT INTO `sys_module_lang` VALUES ('content_publish', '', '鐢熸垚'); -INSERT INTO `sys_module_lang` VALUES ('content_publish', 'en', 'Publish'); -INSERT INTO `sys_module_lang` VALUES ('content_push', '', '鎺ㄨ崘'); -INSERT INTO `sys_module_lang` VALUES ('content_push', 'en', 'Push'); -INSERT INTO `sys_module_lang` VALUES ('content_recycle_delete', '', '鍒犻櫎'); -INSERT INTO `sys_module_lang` VALUES ('content_recycle_delete', 'en', 'test'); -INSERT INTO `sys_module_lang` VALUES ('content_recycle_list', '', '鍐呭鍥炴敹绔'); -INSERT INTO `sys_module_lang` VALUES ('content_recycle_list', 'en', 'Content recycle'); -INSERT INTO `sys_module_lang` VALUES ('content_recycle_recycle', '', '杩樺師'); -INSERT INTO `sys_module_lang` VALUES ('content_recycle_recycle', 'en', 'test'); -INSERT INTO `sys_module_lang` VALUES ('content_refresh', '', '鍒锋柊'); -INSERT INTO `sys_module_lang` VALUES ('content_refresh', 'en', 'Refresh'); -INSERT INTO `sys_module_lang` VALUES ('content_select_category', '', '閫夋嫨鍒嗙被'); -INSERT INTO `sys_module_lang` VALUES ('content_select_category', 'en', 'Select category'); -INSERT INTO `sys_module_lang` VALUES ('content_select_category_type', '', '閫夋嫨鍒嗙被绫诲瀷'); -INSERT INTO `sys_module_lang` VALUES ('content_select_category_type', 'en', 'Select category type'); -INSERT INTO `sys_module_lang` VALUES ('content_select_content', '', '閫夋嫨鍐呭'); -INSERT INTO `sys_module_lang` VALUES ('content_select_content', 'en', 'Select content'); -INSERT INTO `sys_module_lang` VALUES ('content_select_tag_type', '', '閫夋嫨鏍囩绫诲瀷'); -INSERT INTO `sys_module_lang` VALUES ('content_select_tag_type', 'en', 'Select tag type'); -INSERT INTO `sys_module_lang` VALUES ('content_select_template', '', '閫夋嫨妯℃澘'); -INSERT INTO `sys_module_lang` VALUES ('content_select_template', 'en', 'Select template'); -INSERT INTO `sys_module_lang` VALUES ('content_select_user', '', '閫夋嫨鐢ㄦ埛'); -INSERT INTO `sys_module_lang` VALUES ('content_select_user', 'en', 'Select user'); -INSERT INTO `sys_module_lang` VALUES ('content_sort', '', '缃《'); -INSERT INTO `sys_module_lang` VALUES ('content_sort', 'en', 'Sort'); -INSERT INTO `sys_module_lang` VALUES ('content_uncheck', '', '鎾ら攢瀹℃牳'); -INSERT INTO `sys_module_lang` VALUES ('content_uncheck', 'en', 'Uncheck'); -INSERT INTO `sys_module_lang` VALUES ('content_view', '', '鏌ョ湅'); -INSERT INTO `sys_module_lang` VALUES ('content_view', 'en', 'View'); -INSERT INTO `sys_module_lang` VALUES ('dept_add', '', '澧炲姞/淇敼'); -INSERT INTO `sys_module_lang` VALUES ('dept_add', 'en', 'Add/edit'); -INSERT INTO `sys_module_lang` VALUES ('dept_delete', '', '鍒犻櫎'); -INSERT INTO `sys_module_lang` VALUES ('dept_delete', 'en', 'Delete'); -INSERT INTO `sys_module_lang` VALUES ('dept_list', '', '閮ㄩ棬绠＄悊'); -INSERT INTO `sys_module_lang` VALUES ('dept_list', 'en', 'Department management'); -INSERT INTO `sys_module_lang` VALUES ('dept_user_list', '', '浜哄憳绠＄悊'); -INSERT INTO `sys_module_lang` VALUES ('dept_user_list', 'en', 'Department user management'); -INSERT INTO `sys_module_lang` VALUES ('develop', '', '寮鍙'); -INSERT INTO `sys_module_lang` VALUES ('develop', 'en', 'Development'); -INSERT INTO `sys_module_lang` VALUES ('dictionary_add', '', '娣诲姞/淇敼'); -INSERT INTO `sys_module_lang` VALUES ('dictionary_add', 'en', 'Add/edit'); -INSERT INTO `sys_module_lang` VALUES ('dictionary_delete', '', '鍒犻櫎'); -INSERT INTO `sys_module_lang` VALUES ('dictionary_delete', 'en', 'Delete'); -INSERT INTO `sys_module_lang` VALUES ('dictionary_list', '', '鏁版嵁瀛楀吀'); -INSERT INTO `sys_module_lang` VALUES ('dictionary_list', 'en', 'Dictionary management'); -INSERT INTO `sys_module_lang` VALUES ('domain_config', '', '淇敼'); -INSERT INTO `sys_module_lang` VALUES ('domain_config', 'en', 'Edit'); -INSERT INTO `sys_module_lang` VALUES ('domain_list', '', '缁戝畾鍩熷悕'); -INSERT INTO `sys_module_lang` VALUES ('domain_list', 'en', 'Domain management'); -INSERT INTO `sys_module_lang` VALUES ('file_menu', '', '鏂囦欢绠＄悊'); -INSERT INTO `sys_module_lang` VALUES ('file_menu', 'en', 'File maintenance'); -INSERT INTO `sys_module_lang` VALUES ('log_login', '', '鐧诲綍鏃ュ織'); -INSERT INTO `sys_module_lang` VALUES ('log_login', 'en', 'Login log'); -INSERT INTO `sys_module_lang` VALUES ('log_login_delete', '', '鍒犻櫎'); -INSERT INTO `sys_module_lang` VALUES ('log_login_delete', 'en', 'Delete'); -INSERT INTO `sys_module_lang` VALUES ('log_menu', '', '鏃ュ織绠＄悊'); -INSERT INTO `sys_module_lang` VALUES ('log_menu', 'en', 'Log management'); -INSERT INTO `sys_module_lang` VALUES ('log_operate', '', '鎿嶄綔鏃ュ織'); -INSERT INTO `sys_module_lang` VALUES ('log_operate', 'en', 'Operate log'); -INSERT INTO `sys_module_lang` VALUES ('log_operate_delete', '', '鍒犻櫎'); -INSERT INTO `sys_module_lang` VALUES ('log_operate_delete', 'en', 'Delete'); -INSERT INTO `sys_module_lang` VALUES ('log_operate_view', '', '鏌ョ湅'); -INSERT INTO `sys_module_lang` VALUES ('log_operate_view', 'en', 'View'); -INSERT INTO `sys_module_lang` VALUES ('log_task', '', '浠诲姟璁″垝鏃ュ織'); -INSERT INTO `sys_module_lang` VALUES ('log_task', 'en', 'Task log'); -INSERT INTO `sys_module_lang` VALUES ('log_task_delete', '', '鍒犻櫎'); -INSERT INTO `sys_module_lang` VALUES ('log_task_delete', 'en', 'Delete'); -INSERT INTO `sys_module_lang` VALUES ('log_task_view', '', '鏌ョ湅'); -INSERT INTO `sys_module_lang` VALUES ('log_task_view', 'en', 'View'); -INSERT INTO `sys_module_lang` VALUES ('log_upload', '', '鏂囦欢涓婁紶鏃ュ織'); -INSERT INTO `sys_module_lang` VALUES ('log_upload', 'en', 'Upload log'); -INSERT INTO `sys_module_lang` VALUES ('maintenance', '', '缁存姢'); -INSERT INTO `sys_module_lang` VALUES ('maintenance', 'en', 'Maintenance'); -INSERT INTO `sys_module_lang` VALUES ('model_add', '', '澧炲姞/淇敼'); -INSERT INTO `sys_module_lang` VALUES ('model_add', 'en', 'Add/edit'); -INSERT INTO `sys_module_lang` VALUES ('model_delete', '', '鍒犻櫎'); -INSERT INTO `sys_module_lang` VALUES ('model_delete', 'en', 'Delete'); -INSERT INTO `sys_module_lang` VALUES ('model_list', '', '鍐呭妯″瀷绠＄悊'); -INSERT INTO `sys_module_lang` VALUES ('model_list', 'en', 'Model management'); -INSERT INTO `sys_module_lang` VALUES ('myself', '', '涓汉'); -INSERT INTO `sys_module_lang` VALUES ('myself', 'en', 'Myself'); -INSERT INTO `sys_module_lang` VALUES ('myself_content', '', '鎴戠殑鍐呭'); -INSERT INTO `sys_module_lang` VALUES ('myself_content', 'en', 'My content'); -INSERT INTO `sys_module_lang` VALUES ('myself_content_add', '', '淇敼'); -INSERT INTO `sys_module_lang` VALUES ('myself_content_add', 'en', 'Add'); -INSERT INTO `sys_module_lang` VALUES ('myself_content_delete', '', '鍒犻櫎'); -INSERT INTO `sys_module_lang` VALUES ('myself_content_delete', 'en', 'Delete'); -INSERT INTO `sys_module_lang` VALUES ('myself_content_publish', '', '鐢熸垚'); -INSERT INTO `sys_module_lang` VALUES ('myself_content_publish', 'en', 'Publish'); -INSERT INTO `sys_module_lang` VALUES ('myself_content_push', '', '鎺ㄨ崘'); -INSERT INTO `sys_module_lang` VALUES ('myself_content_push', 'en', 'Push'); -INSERT INTO `sys_module_lang` VALUES ('myself_content_refresh', '', '鍒锋柊'); -INSERT INTO `sys_module_lang` VALUES ('myself_content_refresh', 'en', 'Refresh'); -INSERT INTO `sys_module_lang` VALUES ('myself_log_login', '', '鎴戠殑鐧诲綍鏃ュ織'); -INSERT INTO `sys_module_lang` VALUES ('myself_log_login', 'en', 'My login log'); -INSERT INTO `sys_module_lang` VALUES ('myself_log_operate', '', '鎴戠殑鎿嶄綔鏃ュ織'); -INSERT INTO `sys_module_lang` VALUES ('myself_log_operate', 'en', 'My operate log'); -INSERT INTO `sys_module_lang` VALUES ('myself_menu', '', '涓庢垜鐩稿叧'); -INSERT INTO `sys_module_lang` VALUES ('myself_menu', 'en', 'My account'); -INSERT INTO `sys_module_lang` VALUES ('myself_password', '', '淇敼瀵嗙爜'); -INSERT INTO `sys_module_lang` VALUES ('myself_password', 'en', 'Change password'); -INSERT INTO `sys_module_lang` VALUES ('myself_token', '', '鎴戠殑鐧诲綍鎺堟潈'); -INSERT INTO `sys_module_lang` VALUES ('myself_token', 'en', 'My login token'); -INSERT INTO `sys_module_lang` VALUES ('page', '', '椤甸潰'); -INSERT INTO `sys_module_lang` VALUES ('page', 'en', 'Page'); -INSERT INTO `sys_module_lang` VALUES ('page_list', '', '椤甸潰绠＄悊'); -INSERT INTO `sys_module_lang` VALUES ('page_list', 'en', 'Page management'); -INSERT INTO `sys_module_lang` VALUES ('page_menu', '', '椤甸潰缁存姢'); -INSERT INTO `sys_module_lang` VALUES ('page_menu', 'en', 'Page maintenance'); -INSERT INTO `sys_module_lang` VALUES ('page_metadata', '', '鍏冩暟鎹鐞'); -INSERT INTO `sys_module_lang` VALUES ('page_metadata', 'en', 'Metadata management'); -INSERT INTO `sys_module_lang` VALUES ('page_publish', '', '鐢熸垚椤甸潰'); -INSERT INTO `sys_module_lang` VALUES ('page_publish', 'en', 'Publish'); -INSERT INTO `sys_module_lang` VALUES ('page_save', '', '淇濆瓨椤甸潰閰嶇疆'); -INSERT INTO `sys_module_lang` VALUES ('page_save', 'en', 'Save configuration'); -INSERT INTO `sys_module_lang` VALUES ('page_select_category', '', '閫夋嫨鍒嗙被'); -INSERT INTO `sys_module_lang` VALUES ('page_select_category', 'en', 'Select category'); -INSERT INTO `sys_module_lang` VALUES ('page_select_category_type', '', '閫夋嫨鍒嗙被绫诲瀷'); -INSERT INTO `sys_module_lang` VALUES ('page_select_category_type', 'en', 'Select category type'); -INSERT INTO `sys_module_lang` VALUES ('page_select_content', '', '閫夋嫨鍐呭'); -INSERT INTO `sys_module_lang` VALUES ('page_select_content', 'en', 'Select content'); -INSERT INTO `sys_module_lang` VALUES ('page_select_tag_type', '', '閫夋嫨鏍囩绫诲瀷'); -INSERT INTO `sys_module_lang` VALUES ('page_select_tag_type', 'en', 'Select tag type'); -INSERT INTO `sys_module_lang` VALUES ('page_select_template', '', '閫夋嫨妯℃澘'); -INSERT INTO `sys_module_lang` VALUES ('page_select_template', 'en', 'Select template'); -INSERT INTO `sys_module_lang` VALUES ('page_select_user', '', '閫夋嫨鐢ㄦ埛'); -INSERT INTO `sys_module_lang` VALUES ('page_select_user', 'en', 'Select user'); -INSERT INTO `sys_module_lang` VALUES ('place_add', '', '澧炲姞/淇敼鎺ㄨ崘浣嶆暟鎹'); -INSERT INTO `sys_module_lang` VALUES ('place_add', 'en', 'Add/edit'); -INSERT INTO `sys_module_lang` VALUES ('place_check', '', '瀹℃牳鎺ㄨ崘浣嶆暟鎹'); -INSERT INTO `sys_module_lang` VALUES ('place_check', 'en', 'Check'); -INSERT INTO `sys_module_lang` VALUES ('place_clear', '', '娓呯┖鎺ㄨ崘浣嶆暟鎹'); -INSERT INTO `sys_module_lang` VALUES ('place_clear', 'en', 'Clear'); -INSERT INTO `sys_module_lang` VALUES ('place_data_list', '', '鎺ㄨ崘浣嶆暟鎹'); -INSERT INTO `sys_module_lang` VALUES ('place_data_list', 'en', 'Page fragment data'); -INSERT INTO `sys_module_lang` VALUES ('place_delete', '', '鍒犻櫎鎺ㄨ崘浣嶆暟鎹'); -INSERT INTO `sys_module_lang` VALUES ('place_delete', 'en', 'data'); -INSERT INTO `sys_module_lang` VALUES ('place_list', '', '椤甸潰鐗囨绠＄悊'); -INSERT INTO `sys_module_lang` VALUES ('place_list', 'en', 'Page fragment management'); -INSERT INTO `sys_module_lang` VALUES ('place_publish', '', '鍙戝竷'); -INSERT INTO `sys_module_lang` VALUES ('place_publish', 'en', 'Publish'); -INSERT INTO `sys_module_lang` VALUES ('place_refresh', '', '鍒锋柊鎺ㄨ崘浣嶆暟鎹'); -INSERT INTO `sys_module_lang` VALUES ('place_refresh', 'en', 'Refresh'); -INSERT INTO `sys_module_lang` VALUES ('place_template_content', '', '淇敼'); -INSERT INTO `sys_module_lang` VALUES ('place_template_content', 'en', 'Edit template'); -INSERT INTO `sys_module_lang` VALUES ('place_template_data_dictionary', '', '閫夋嫨鏁版嵁瀛楀吀'); -INSERT INTO `sys_module_lang` VALUES ('place_template_data_dictionary', 'en', 'Select data dictionary'); -INSERT INTO `sys_module_lang` VALUES ('place_template_fragment', '', '妯℃澘鐗囨'); -INSERT INTO `sys_module_lang` VALUES ('place_template_fragment', 'en', 'Template fragment'); -INSERT INTO `sys_module_lang` VALUES ('place_template_help', '', '妯℃澘甯姪'); -INSERT INTO `sys_module_lang` VALUES ('place_template_help', 'en', 'Template help'); -INSERT INTO `sys_module_lang` VALUES ('place_template_list', '', '椤甸潰鐗囨妯℃澘'); -INSERT INTO `sys_module_lang` VALUES ('place_template_list', 'en', 'Page fragment template'); -INSERT INTO `sys_module_lang` VALUES ('place_template_metadata', '', '淇敼鍏冩暟鎹'); -INSERT INTO `sys_module_lang` VALUES ('place_template_metadata', 'en', 'Edit metadata'); -INSERT INTO `sys_module_lang` VALUES ('place_template_place', '', '椤甸潰鐗囨'); -INSERT INTO `sys_module_lang` VALUES ('place_template_place', 'en', 'Page fragment'); -INSERT INTO `sys_module_lang` VALUES ('place_template_webfile', '', '缃戠珯鏂囦欢'); -INSERT INTO `sys_module_lang` VALUES ('place_template_webfile', 'en', 'Website file'); -INSERT INTO `sys_module_lang` VALUES ('place_view', '', '鏌ョ湅鎺ㄨ崘浣嶆暟鎹'); -INSERT INTO `sys_module_lang` VALUES ('place_view', 'en', 'View'); -INSERT INTO `sys_module_lang` VALUES ('report_user', '', '鐢ㄦ埛鏁版嵁鐩戞帶'); -INSERT INTO `sys_module_lang` VALUES ('report_user', 'en', 'User report'); -INSERT INTO `sys_module_lang` VALUES ('role_add', '', '澧炲姞/淇敼'); -INSERT INTO `sys_module_lang` VALUES ('role_add', 'en', 'Add/edit'); -INSERT INTO `sys_module_lang` VALUES ('role_delete', '', '鍒犻櫎'); -INSERT INTO `sys_module_lang` VALUES ('role_delete', 'en', 'Delete'); -INSERT INTO `sys_module_lang` VALUES ('role_list', '', '瑙掕壊绠＄悊'); -INSERT INTO `sys_module_lang` VALUES ('role_list', 'en', 'Role management'); -INSERT INTO `sys_module_lang` VALUES ('system_menu', '', '绯荤粺缁存姢'); -INSERT INTO `sys_module_lang` VALUES ('system_menu', 'en', 'System maintenance'); -INSERT INTO `sys_module_lang` VALUES ('tag_add', '', '澧炲姞/淇敼'); -INSERT INTO `sys_module_lang` VALUES ('tag_add', 'en', 'Add/edit'); -INSERT INTO `sys_module_lang` VALUES ('tag_delete', '', '鍒犻櫎'); -INSERT INTO `sys_module_lang` VALUES ('tag_delete', 'en', 'Delete'); -INSERT INTO `sys_module_lang` VALUES ('tag_list', '', '鏍囩绠＄悊'); -INSERT INTO `sys_module_lang` VALUES ('tag_list', 'en', 'Tag management'); -INSERT INTO `sys_module_lang` VALUES ('tag_type_delete', '', '鍒犻櫎'); -INSERT INTO `sys_module_lang` VALUES ('tag_type_delete', 'en', 'test'); -INSERT INTO `sys_module_lang` VALUES ('tag_type_list', '', '鏍囩鍒嗙被'); -INSERT INTO `sys_module_lang` VALUES ('tag_type_list', 'en', 'Tag type'); -INSERT INTO `sys_module_lang` VALUES ('tag_type_save', '', '澧炲姞/淇敼'); -INSERT INTO `sys_module_lang` VALUES ('tag_type_save', 'en', 'test'); -INSERT INTO `sys_module_lang` VALUES ('task_add', '', '澧炲姞/淇敼'); -INSERT INTO `sys_module_lang` VALUES ('task_add', 'en', 'Add/edit'); -INSERT INTO `sys_module_lang` VALUES ('task_delete', '', '鍒犻櫎'); -INSERT INTO `sys_module_lang` VALUES ('task_delete', 'en', 'Delete'); -INSERT INTO `sys_module_lang` VALUES ('task_list', '', '浠诲姟璁″垝'); -INSERT INTO `sys_module_lang` VALUES ('task_list', 'en', 'Task management'); -INSERT INTO `sys_module_lang` VALUES ('task_pause', '', '鏆傚仠'); -INSERT INTO `sys_module_lang` VALUES ('task_pause', 'en', 'Pause'); -INSERT INTO `sys_module_lang` VALUES ('task_recreate', '', '閲嶆柊鍒濆鍖'); -INSERT INTO `sys_module_lang` VALUES ('task_recreate', 'en', 'Recreate'); -INSERT INTO `sys_module_lang` VALUES ('task_resume', '', '鎭㈠'); -INSERT INTO `sys_module_lang` VALUES ('task_resume', 'en', 'Resume'); -INSERT INTO `sys_module_lang` VALUES ('task_runonce', '', '绔嬪埢鎵ц'); -INSERT INTO `sys_module_lang` VALUES ('task_runonce', 'en', 'Run once'); -INSERT INTO `sys_module_lang` VALUES ('task_template_content', '', '淇敼'); -INSERT INTO `sys_module_lang` VALUES ('task_template_content', 'en', 'Edit'); -INSERT INTO `sys_module_lang` VALUES ('task_template_delete', '', '鍒犻櫎'); -INSERT INTO `sys_module_lang` VALUES ('task_template_delete', 'en', 'Delete'); -INSERT INTO `sys_module_lang` VALUES ('task_template_fragment', '', '浠诲姟璁″垝鑴氭湰鐗囨'); -INSERT INTO `sys_module_lang` VALUES ('task_template_fragment', 'en', 'Task script fragment'); -INSERT INTO `sys_module_lang` VALUES ('task_template_help', '', '甯姪'); -INSERT INTO `sys_module_lang` VALUES ('task_template_help', 'en', 'help'); -INSERT INTO `sys_module_lang` VALUES ('task_template_list', '', '浠诲姟璁″垝鑴氭湰'); -INSERT INTO `sys_module_lang` VALUES ('task_template_list', 'en', 'Task template management'); -INSERT INTO `sys_module_lang` VALUES ('template_content', '', '淇敼'); -INSERT INTO `sys_module_lang` VALUES ('template_content', 'en', 'Edit'); -INSERT INTO `sys_module_lang` VALUES ('template_content-type', '', '閫夋嫨content-type'); -INSERT INTO `sys_module_lang` VALUES ('template_content-type', 'en', 'Select content-type'); -INSERT INTO `sys_module_lang` VALUES ('template_content_form', '', '鍐呭鎶曠ǹ琛ㄥ崟'); -INSERT INTO `sys_module_lang` VALUES ('template_content_form', 'en', 'Content contribute form'); -INSERT INTO `sys_module_lang` VALUES ('template_data_dictionary', '', '閫夋嫨鏁版嵁瀛楀吀'); -INSERT INTO `sys_module_lang` VALUES ('template_data_dictionary', 'en', 'Select data dictionary'); -INSERT INTO `sys_module_lang` VALUES ('template_delete', '', '鍒犻櫎'); -INSERT INTO `sys_module_lang` VALUES ('template_delete', 'en', 'Delete'); -INSERT INTO `sys_module_lang` VALUES ('template_demo', '', '妯℃澘绀轰緥'); -INSERT INTO `sys_module_lang` VALUES ('template_demo', 'en', 'Template example'); -INSERT INTO `sys_module_lang` VALUES ('template_fragment', '', '妯℃澘鐗囨'); -INSERT INTO `sys_module_lang` VALUES ('template_fragment', 'en', 'Template fragment'); -INSERT INTO `sys_module_lang` VALUES ('template_help', '', '妯℃澘甯姪'); -INSERT INTO `sys_module_lang` VALUES ('template_help', 'en', 'Template help'); -INSERT INTO `sys_module_lang` VALUES ('template_list', '', '妯℃澘鏂囦欢绠＄悊'); -INSERT INTO `sys_module_lang` VALUES ('template_list', 'en', 'Template management'); -INSERT INTO `sys_module_lang` VALUES ('template_metadata', '', '淇敼鍏冩暟鎹'); -INSERT INTO `sys_module_lang` VALUES ('template_metadata', 'en', 'Edit metadata'); -INSERT INTO `sys_module_lang` VALUES ('template_place', '', '椤甸潰鐗囨'); -INSERT INTO `sys_module_lang` VALUES ('template_place', 'en', 'Page fragment'); -INSERT INTO `sys_module_lang` VALUES ('template_place_form', '', '椤甸潰鐗囨鎶曠ǹ琛ㄥ崟'); -INSERT INTO `sys_module_lang` VALUES ('template_place_form', 'en', 'Page fragment data contribute form'); -INSERT INTO `sys_module_lang` VALUES ('template_upload', '', '涓婁紶妯℃澘'); -INSERT INTO `sys_module_lang` VALUES ('template_upload', 'en', 'Upload template'); -INSERT INTO `sys_module_lang` VALUES ('template_website_file', '', '缃戠珯鏂囦欢'); -INSERT INTO `sys_module_lang` VALUES ('template_website_file', 'en', 'Website file'); -INSERT INTO `sys_module_lang` VALUES ('user_add', '', '澧炲姞/淇敼'); -INSERT INTO `sys_module_lang` VALUES ('user_add', 'en', 'Add/edit'); -INSERT INTO `sys_module_lang` VALUES ('user_disable', '', '绂佺敤'); -INSERT INTO `sys_module_lang` VALUES ('user_disable', 'en', 'Disable'); -INSERT INTO `sys_module_lang` VALUES ('user_enable', '', '鍚敤'); -INSERT INTO `sys_module_lang` VALUES ('user_enable', 'en', 'Enable'); -INSERT INTO `sys_module_lang` VALUES ('user_list', '', '鐢ㄦ埛绠＄悊'); -INSERT INTO `sys_module_lang` VALUES ('user_list', 'en', 'User management'); -INSERT INTO `sys_module_lang` VALUES ('user_menu', '', '鐢ㄦ埛绠＄悊'); -INSERT INTO `sys_module_lang` VALUES ('user_menu', 'en', 'User maintenance'); -INSERT INTO `sys_module_lang` VALUES ('webfile_content', '', '淇敼鏂囦欢'); -INSERT INTO `sys_module_lang` VALUES ('webfile_content', 'en', 'Edit file'); -INSERT INTO `sys_module_lang` VALUES ('webfile_directory', '', '鏂板缓鐩綍'); -INSERT INTO `sys_module_lang` VALUES ('webfile_directory', 'en', 'Create Directory'); -INSERT INTO `sys_module_lang` VALUES ('webfile_list', '', '缃戠珯鏂囦欢绠＄悊'); -INSERT INTO `sys_module_lang` VALUES ('webfile_list', 'en', 'Website file management'); -INSERT INTO `sys_module_lang` VALUES ('webfile_unzip', '', '瑙ｅ帇缂'); -INSERT INTO `sys_module_lang` VALUES ('webfile_unzip', 'en', 'Decompress'); -INSERT INTO `sys_module_lang` VALUES ('webfile_upload', '', '涓婁紶'); -INSERT INTO `sys_module_lang` VALUES ('webfile_upload', 'en', 'Upload'); -INSERT INTO `sys_module_lang` VALUES ('webfile_zip', '', '鍘嬬缉'); -INSERT INTO `sys_module_lang` VALUES ('webfile_zip', 'en', 'Compress'); -INSERT INTO `sys_module_lang` VALUES ('word_list', '', '鎼滅储璇嶇鐞'); -INSERT INTO `sys_module_lang` VALUES ('word_list', 'en', 'Search word management'); - -ALTER TABLE `sys_module` DROP COLUMN `name`, - DROP INDEX `parent_id`, - DROP INDEX `url`, - ADD INDEX `parent_id`(`parent_id`, `menu`); - -INSERT INTO `sys_module` VALUES ('app_add', 'sysApp/add', 'sysApp/save', NULL, 'app_list', 0, 0); -INSERT INTO `sys_module` VALUES ('app_client_disable', NULL, 'sysAppClient/disable', NULL, 'app_client_list', 0, 0); -INSERT INTO `sys_module` VALUES ('app_client_enable', NULL, 'sysAppClient/enable', NULL, 'app_client_list', 0, 0); -INSERT INTO `sys_module` VALUES ('app_client_list', 'sysAppClient/list', NULL, '', 'user_menu', 1, 4); -INSERT INTO `sys_module` VALUES ('app_delete', NULL, 'sysApp/delete', NULL, 'app_list', 0, 0); -INSERT INTO `sys_module` VALUES ('app_list', 'sysApp/list', NULL, '', 'system_menu', 1, 5); -INSERT INTO `sys_module` VALUES ('category', NULL, NULL, '', NULL, 1, 5); -INSERT INTO `sys_module` VALUES ('category_add', 'cmsCategory/add', 'cmsCategory/addMore,cmsTemplate/lookup,cmsCategory/categoryPath,cmsCategory/contentPath,file/doUpload,cmsCategory/save', '', 'category_menu', 0, 0); -INSERT INTO `sys_module` VALUES ('category_delete', NULL, 'cmsCategory/delete', '', 'category_menu', 0, 0); -INSERT INTO `sys_module` VALUES ('category_extend', NULL, NULL, '', 'category', 1, 2); -INSERT INTO `sys_module` VALUES ('category_menu', 'cmsCategory/list', NULL, '', 'category', 1, 1); -INSERT INTO `sys_module` VALUES ('category_move', 'cmsCategory/moveParameters', 'cmsCategory/move,cmsCategory/lookup', '', 'category_menu', 0, 0); -INSERT INTO `sys_module` VALUES ('category_publish', 'cmsCategory/publishParameters', 'cmsCategory/publish', '', 'category_menu', 0, 0); -INSERT INTO `sys_module` VALUES ('category_push', 'cmsCategory/push_page', 'cmsPlace/push,cmsPlace/add,cmsPlace/save', '', 'category_menu', 0, 0); -INSERT INTO `sys_module` VALUES ('category_type_add', 'cmsCategoryType/add', 'cmsCategoryType/save', NULL, 'category_type_list', 0, 0); -INSERT INTO `sys_module` VALUES ('category_type_change', 'cmsCategory/changeTypeParameters', 'cmsCategory/changeType', '', 'category_menu', 0, 0); -INSERT INTO `sys_module` VALUES ('category_type_delete', NULL, 'cmsCategoryType/delete', NULL, 'category_type_list', 0, 0); -INSERT INTO `sys_module` VALUES ('category_type_list', 'cmsCategoryType/list', NULL, '', 'category_extend', 1, 1); -INSERT INTO `sys_module` VALUES ('clearcache', NULL, 'clearCache', '', NULL, 0, 10); -INSERT INTO `sys_module` VALUES ('config_add', 'sysConfig/add', 'sysConfig/save', NULL, 'config_list', 0, 0); -INSERT INTO `sys_module` VALUES ('config_data_delete', NULL, 'sysConfigData/delete', NULL, 'config_data_list', 0, 0); -INSERT INTO `sys_module` VALUES ('config_data_edit', 'sysConfigData/edit', 'sysConfigData/save', NULL, 'config_data_list', 0, 0); -INSERT INTO `sys_module` VALUES ('config_data_list', 'sysConfigData/list', NULL, '', 'system_menu', 1, 1); -INSERT INTO `sys_module` VALUES ('config_delete', NULL, 'sysConfig/delete', NULL, 'config_list', 0, 0); -INSERT INTO `sys_module` VALUES ('config_list', 'sysConfig/list', NULL, '', 'config_menu', 1, 2); -INSERT INTO `sys_module` VALUES ('config_list_data_dictionary', 'cmsDictionary/lookup', NULL, NULL, 'config_list', 0, 0); -INSERT INTO `sys_module` VALUES ('config_menu', NULL, NULL, '', 'develop', 1, 2); -INSERT INTO `sys_module` VALUES ('content', NULL, NULL, '', NULL, 1, 2); -INSERT INTO `sys_module` VALUES ('content_add', 'cmsContent/add', 'cmsContent/addMore,cmsContent/save,ueditor', '', 'content_menu', 1, 0); -INSERT INTO `sys_module` VALUES ('content_check', NULL, 'cmsContent/check', '', 'content_menu', 1, 0); -INSERT INTO `sys_module` VALUES ('content_delete', NULL, 'cmsContent/delete', '', 'content_menu', 1, 0); -INSERT INTO `sys_module` VALUES ('content_extend', NULL, NULL, '', 'content', 1, 1); -INSERT INTO `sys_module` VALUES ('content_menu', 'cmsContent/list', 'sysUser/lookup', '', 'content', 1, 0); -INSERT INTO `sys_module` VALUES ('content_move', 'cmsContent/moveParameters', 'cmsContent/move', '', 'content_menu', 1, 0); -INSERT INTO `sys_module` VALUES ('content_publish', NULL, 'cmsContent/publish', '', 'content_menu', 1, 0); -INSERT INTO `sys_module` VALUES ('content_push', 'cmsContent/push', 'cmsContent/push_content,cmsContent/push_content_list,cmsContent/push_to_content,cmsContent/push_page,cmsContent/push_page_list,cmsPlace/add,cmsPlace/save,cmsContent/related,cmsContent/unrelated,cmsPlace/delete', '', 'content_menu', 1, 0); -INSERT INTO `sys_module` VALUES ('content_recycle_delete', NULL, 'cmsContent/realDelete', NULL, 'content_recycle_list', 0, 0); -INSERT INTO `sys_module` VALUES ('content_recycle_list', 'cmsRecycleContent/list', 'sysUser/lookup', '', 'content_extend', 1, 3); -INSERT INTO `sys_module` VALUES ('content_recycle_recycle', NULL, 'cmsContent/recycle', NULL, 'content_recycle_list', 0, 0); -INSERT INTO `sys_module` VALUES ('content_refresh', NULL, 'cmsContent/refresh', '', 'content_menu', 1, 0); -INSERT INTO `sys_module` VALUES ('content_select_category', 'cmsCategory/lookup', NULL, NULL, 'content_add', 0, 0); -INSERT INTO `sys_module` VALUES ('content_select_category_type', 'cmsCategoryType/lookup', NULL, NULL, 'content_add', 0, 0); -INSERT INTO `sys_module` VALUES ('content_select_content', 'cmsContent/lookup', 'cmsContent/lookup_list', NULL, 'content_add', 0, 0); -INSERT INTO `sys_module` VALUES ('content_select_tag_type', 'cmsTagType/lookup', NULL, NULL, 'content_add', 0, 0); -INSERT INTO `sys_module` VALUES ('content_select_template', 'cmsTemplate/lookup', NULL, NULL, 'content_add', 0, 0); -INSERT INTO `sys_module` VALUES ('content_select_user', 'sysUser/lookup', NULL, NULL, 'content_add', 0, 0); -INSERT INTO `sys_module` VALUES ('content_sort', 'cmsContent/sortParameters', 'cmsContent/sort', '', 'content_menu', 0, 0); -INSERT INTO `sys_module` VALUES ('content_uncheck', NULL, 'cmsContent/uncheck', '', 'content_menu', 0, 0); -INSERT INTO `sys_module` VALUES ('content_view', 'cmsContent/view', NULL, '', 'content_menu', 0, 0); -INSERT INTO `sys_module` VALUES ('dept_add', 'sysDept/add', 'sysDept/lookup,sysUser/lookup,sysDept/save', NULL, 'dept_list', 0, 0); -INSERT INTO `sys_module` VALUES ('dept_delete', NULL, 'sysDept/delete', NULL, 'dept_list', 0, 0); -INSERT INTO `sys_module` VALUES ('dept_list', 'sysDept/list', 'sysDept/lookup,sysUser/lookup', '', 'user_menu', 1, 2); -INSERT INTO `sys_module` VALUES ('dept_user_list', 'sysDept/userList', 'sysDept/addUser,sysDept/saveUser,sysDept/enableUser,sysDept/disableUser', NULL, 'dept_list', 0, 0); -INSERT INTO `sys_module` VALUES ('develop', NULL, NULL, '', NULL, 1, 7); -INSERT INTO `sys_module` VALUES ('dictionary_add', 'cmsDictionary/add', 'cmsDictionary/save', NULL, 'dictionary_list', 0, 0); -INSERT INTO `sys_module` VALUES ('dictionary_delete', NULL, 'cmsDictionary/delete', NULL, 'dictionary_list', 0, 0); -INSERT INTO `sys_module` VALUES ('dictionary_list', 'cmsDictionary/list', NULL, '', 'system_menu', 1, 4); -INSERT INTO `sys_module` VALUES ('domain_config', 'sysDomain/config', 'sysDomain/saveConfig,cmsTemplate/directoryLookup,cmsTemplate/lookup', NULL, 'domain_list', 0, 0); -INSERT INTO `sys_module` VALUES ('domain_list', 'sysDomain/domainList', NULL, '', 'system_menu', 1, 3); -INSERT INTO `sys_module` VALUES ('file_menu', NULL, NULL, '', 'develop', 1, 1); -INSERT INTO `sys_module` VALUES ('log_login', 'log/login', 'sysUser/lookup', '', 'log_menu', 1, 3); -INSERT INTO `sys_module` VALUES ('log_login_delete', NULL, 'logLogin/delete', NULL, 'log_login', 0, 0); -INSERT INTO `sys_module` VALUES ('log_menu', NULL, NULL, '', 'maintenance', 1, 3); -INSERT INTO `sys_module` VALUES ('log_operate', 'log/operate', 'sysUser/lookup', '', 'log_menu', 1, 2); -INSERT INTO `sys_module` VALUES ('log_operate_delete', NULL, 'logOperate/delete', NULL, 'log_operate', 0, 0); -INSERT INTO `sys_module` VALUES ('log_operate_view', 'log/operateView', NULL, NULL, 'log_operate', 0, 0); -INSERT INTO `sys_module` VALUES ('log_task', 'log/task', 'sysUser/lookup', '', 'log_menu', 1, 4); -INSERT INTO `sys_module` VALUES ('log_task_delete', NULL, 'logTask/delete', NULL, 'log_task', 0, 0); -INSERT INTO `sys_module` VALUES ('log_task_view', 'log/taskView', NULL, NULL, 'log_task', 0, 0); -INSERT INTO `sys_module` VALUES ('log_upload', 'log/upload', 'sysUser/lookup', '', 'log_menu', 1, 1); -INSERT INTO `sys_module` VALUES ('maintenance', NULL, NULL, '', NULL, 1, 6); -INSERT INTO `sys_module` VALUES ('model_add', 'cmsModel/add', 'cmsModel/save,cmsTemplate/lookup', NULL, 'model_list', 0, 0); -INSERT INTO `sys_module` VALUES ('model_delete', NULL, 'cmsModel/delete', NULL, 'model_list', 0, 0); -INSERT INTO `sys_module` VALUES ('model_list', 'cmsModel/list', NULL, '', 'config_menu', 1, 1); -INSERT INTO `sys_module` VALUES ('myself', NULL, NULL, '', NULL, 1, 1); -INSERT INTO `sys_module` VALUES ('myself_content', 'myself/contentList', NULL, '', 'myself_menu', 1, 2); -INSERT INTO `sys_module` VALUES ('myself_content_add', 'cmsContent/add', 'cmsContent/addMore,file/doUpload,cmsContent/lookup,cmsContent/lookup_list,cmsContent/save,ueditor,ckeditor/upload', NULL, 'myself_content', 0, 0); -INSERT INTO `sys_module` VALUES ('myself_content_delete', NULL, 'cmsContent/delete', NULL, 'myself_content', 0, 0); -INSERT INTO `sys_module` VALUES ('myself_content_publish', NULL, 'cmsContent/publish', NULL, 'myself_content', 0, 0); -INSERT INTO `sys_module` VALUES ('myself_content_push', 'cmsContent/push', 'cmsContent/push_content,cmsContent/push_content_list,cmsContent/push_to_content,cmsContent/push_page,cmsContent/push_page_list,cmsContent/push_to_place,cmsContent/related', NULL, 'myself_content', 0, 0); -INSERT INTO `sys_module` VALUES ('myself_content_refresh', NULL, 'cmsContent/refresh', NULL, 'myself_content', 0, 0); -INSERT INTO `sys_module` VALUES ('myself_log_login', 'myself/logLogin', NULL, '', 'myself_menu', 1, 4); -INSERT INTO `sys_module` VALUES ('myself_log_operate', 'myself/logOperate', NULL, '', 'myself_menu', 1, 3); -INSERT INTO `sys_module` VALUES ('myself_menu', NULL, NULL, '', 'myself', 1, 0); -INSERT INTO `sys_module` VALUES ('myself_password', 'myself/password', 'changePassword', '', 'myself_menu', 1, 1); -INSERT INTO `sys_module` VALUES ('myself_token', 'myself/userTokenList', NULL, '', 'myself_menu', 1, 5); -INSERT INTO `sys_module` VALUES ('page', NULL, NULL, '', NULL, 1, 3); -INSERT INTO `sys_module` VALUES ('page_list', 'cmsPage/list', 'cmsPage/metadata,sysUser/lookup,cmsContent/lookup,cmsContent/lookup_list,cmsCategory/lookup', '', 'page_menu', 1, 1); -INSERT INTO `sys_module` VALUES ('page_menu', NULL, NULL, '', 'page', 1, 0); -INSERT INTO `sys_module` VALUES ('page_metadata', 'cmsPage/metadata', 'cmsPage/save', NULL, 'page_list', 0, 0); -INSERT INTO `sys_module` VALUES ('page_publish', NULL, 'cmsTemplate/publish', NULL, 'page_list', 0, 0); -INSERT INTO `sys_module` VALUES ('page_save', NULL, 'cmsPage/save,file/doUpload,cmsPage/clearCache', NULL, 'page_list', 0, 0); -INSERT INTO `sys_module` VALUES ('page_select_category', 'cmsCategory/lookup', NULL, NULL, 'page_list', 0, 0); -INSERT INTO `sys_module` VALUES ('page_select_category_type', 'cmsCategoryType/lookup', NULL, NULL, 'page_list', 0, 0); -INSERT INTO `sys_module` VALUES ('page_select_content', 'cmsContent/lookup', 'cmsContent/lookup_list', NULL, 'page_list', 0, 0); -INSERT INTO `sys_module` VALUES ('page_select_tag_type', 'cmsTagType/lookup', NULL, NULL, 'page_list', 0, 0); -INSERT INTO `sys_module` VALUES ('page_select_template', 'cmsTemplate/lookup', NULL, NULL, 'page_list', 0, 0); -INSERT INTO `sys_module` VALUES ('page_select_user', 'sysUser/lookup', NULL, NULL, 'page_list', 0, 0); -INSERT INTO `sys_module` VALUES ('place_add', 'cmsPlace/add', 'cmsContent/lookup,cmsPlace/lookup,cmsPlace/lookup_content_list,file/doUpload,cmsPlace/save', NULL, 'place_list', 0, 0); -INSERT INTO `sys_module` VALUES ('place_check', NULL, 'cmsPlace/check', NULL, 'place_list', 0, 0); -INSERT INTO `sys_module` VALUES ('place_clear', NULL, 'cmsPlace/clear', NULL, 'place_list', 0, 0); -INSERT INTO `sys_module` VALUES ('place_data_list', 'cmsPlace/dataList', NULL, NULL, 'place_list', 0, 1); -INSERT INTO `sys_module` VALUES ('place_delete', NULL, 'cmsPlace/delete', NULL, 'place_list', 0, 0); -INSERT INTO `sys_module` VALUES ('place_list', 'cmsPlace/list', 'sysUser/lookup,cmsPlace/data_list', '', 'page_menu', 1, 1); -INSERT INTO `sys_module` VALUES ('place_publish', 'cmsPlace/publish_place', 'cmsTemplate/publishPlace', NULL, 'place_list', 0, 0); -INSERT INTO `sys_module` VALUES ('place_refresh', NULL, 'cmsPlace/refresh', NULL, 'place_list', 0, 0); -INSERT INTO `sys_module` VALUES ('place_template_content', 'placeTemplate/content', 'cmsTemplate/help,cmsTemplate/chipLookup,cmsWebFile/lookup,cmsWebFile/contentForm,placeTemplate/form', NULL, 'place_template_list', 0, 0); -INSERT INTO `sys_module` VALUES ('place_template_data_dictionary', 'cmsDictionary/lookup', NULL, NULL, 'place_template_list', 0, 0); -INSERT INTO `sys_module` VALUES ('place_template_fragment', 'cmsTemplate/ftlLookup', NULL, NULL, 'place_template_list', 0, 0); -INSERT INTO `sys_module` VALUES ('place_template_help', 'cmsTemplate/help', NULL, NULL, 'place_template_list', 0, 0); -INSERT INTO `sys_module` VALUES ('place_template_list', 'placeTemplate/list', NULL, '', 'file_menu', 1, 2); -INSERT INTO `sys_module` VALUES ('place_template_metadata', 'placeTemplate/metadata', 'cmsTemplate/savePlaceMetaData', NULL, 'place_template_list', 0, 0); -INSERT INTO `sys_module` VALUES ('place_template_place', 'placeTemplate/lookup', NULL, NULL, 'place_template_list', 0, 0); -INSERT INTO `sys_module` VALUES ('place_template_webfile', 'cmsWebFile/lookup', NULL, NULL, 'place_template_list', 0, 0); -INSERT INTO `sys_module` VALUES ('place_view', 'cmsPlace/view', NULL, NULL, 'place_list', 0, 0); -INSERT INTO `sys_module` VALUES ('report_user', 'report/user', NULL, '', 'user_menu', 1, 5); -INSERT INTO `sys_module` VALUES ('role_add', 'sysRole/add', 'sysRole/save', NULL, 'role_list', 0, 0); -INSERT INTO `sys_module` VALUES ('role_delete', NULL, 'sysRole/delete', NULL, 'role_list', 0, 0); -INSERT INTO `sys_module` VALUES ('role_list', 'sysRole/list', NULL, '', 'user_menu', 1, 3); -INSERT INTO `sys_module` VALUES ('system_menu', NULL, NULL, '', 'maintenance', 1, 2); -INSERT INTO `sys_module` VALUES ('tag_add', 'cmsTag/add', 'cmsTagType/lookup,cmsTag/save', NULL, 'tag_list', 0, 0); -INSERT INTO `sys_module` VALUES ('tag_delete', NULL, 'cmsTag/delete', NULL, 'tag_list', 0, 0); -INSERT INTO `sys_module` VALUES ('tag_list', 'cmsTag/list', 'cmsTagType/lookup', '', 'content_extend', 1, 1); -INSERT INTO `sys_module` VALUES ('tag_type_delete', NULL, 'cmsTagType/delete', NULL, 'tag_type_list', 0, 0); -INSERT INTO `sys_module` VALUES ('tag_type_list', 'cmsTagType/list', NULL, '', 'category_extend', 1, 2); -INSERT INTO `sys_module` VALUES ('tag_type_save', 'cmsTagType/add', 'cmsTagType/save', NULL, 'tag_type_list', 0, 0); -INSERT INTO `sys_module` VALUES ('task_add', 'sysTask/add', 'sysTask/save,sysTask/example,taskTemplate/lookup', NULL, 'task_list', 0, 0); -INSERT INTO `sys_module` VALUES ('task_delete', NULL, 'sysTask/delete', NULL, 'task_list', 0, 0); -INSERT INTO `sys_module` VALUES ('task_list', 'sysTask/list', NULL, '', 'system_menu', 1, 2); -INSERT INTO `sys_module` VALUES ('task_pause', NULL, 'sysTask/pause', NULL, 'task_list', 0, 0); -INSERT INTO `sys_module` VALUES ('task_recreate', NULL, 'sysTask/recreate', NULL, 'task_list', 0, 0); -INSERT INTO `sys_module` VALUES ('task_resume', NULL, 'sysTask/resume', NULL, 'task_list', 0, 0); -INSERT INTO `sys_module` VALUES ('task_runonce', NULL, 'sysTask/runOnce', NULL, 'task_list', 0, 0); -INSERT INTO `sys_module` VALUES ('task_template_content', 'taskTemplate/content', 'taskTemplate/save,taskTemplate/chipLookup,cmsTemplate/help,placeTemplate/form,cmsWebFile/contentForm', NULL, 'task_template_list', 0, 0); -INSERT INTO `sys_module` VALUES ('task_template_delete', NULL, 'taskTemplate/delete', NULL, 'task_template_list', 0, 0); -INSERT INTO `sys_module` VALUES ('task_template_fragment', 'taskTemplate/chipLookup', NULL, NULL, 'task_template_list', 0, 0); -INSERT INTO `sys_module` VALUES ('task_template_help', 'cmsTemplate/help', NULL, NULL, 'task_template_list', 0, 0); -INSERT INTO `sys_module` VALUES ('task_template_list', 'taskTemplate/list', NULL, '', 'file_menu', 1, 3); -INSERT INTO `sys_module` VALUES ('template_content', 'cmsTemplate/content', 'cmsTemplate/save,cmsTemplate/chipLookup,cmsWebFile/lookup,placeTemplate/form,cmsWebFile/contentForm,cmsTemplate/demo,cmsTemplate/help,cmsTemplate/upload,cmsTemplate/doUpload', NULL, 'template_list', 0, 0); -INSERT INTO `sys_module` VALUES ('template_content-type', 'cmsTemplate/contentTypeLookup', NULL, NULL, 'template_list', 0, 0); -INSERT INTO `sys_module` VALUES ('template_content_form', 'cmsTemplate/contentForm', NULL, NULL, 'template_list', 0, 0); -INSERT INTO `sys_module` VALUES ('template_data_dictionary', 'cmsDictionary/lookup', NULL, NULL, 'template_list', 0, 0); -INSERT INTO `sys_module` VALUES ('template_delete', NULL, 'cmsTemplate/delete', NULL, 'template_list', 0, 0); -INSERT INTO `sys_module` VALUES ('template_demo', 'cmsTemplate/demo', NULL, NULL, 'template_list', 0, 0); -INSERT INTO `sys_module` VALUES ('template_fragment', 'cmsTemplate/ftlLookup', NULL, NULL, 'template_list', 0, 0); -INSERT INTO `sys_module` VALUES ('template_help', 'cmsTemplate/help', NULL, NULL, 'template_list', 0, 0); -INSERT INTO `sys_module` VALUES ('template_list', 'cmsTemplate/list', 'cmsTemplate/directory', '', 'file_menu', 1, 1); -INSERT INTO `sys_module` VALUES ('template_metadata', 'cmsTemplate/metadata', 'cmsTemplate/saveMetadata', NULL, 'template_list', 0, 0); -INSERT INTO `sys_module` VALUES ('template_place', 'placeTemplate/lookup', NULL, NULL, 'template_list', 0, 0); -INSERT INTO `sys_module` VALUES ('template_place_form', 'placeTemplate/form', NULL, NULL, 'template_list', 0, 0); -INSERT INTO `sys_module` VALUES ('template_upload', 'cmsTemplate/upload', 'cmsTemplate/doUpload', NULL, 'template_list', 0, 0); -INSERT INTO `sys_module` VALUES ('template_website_file', 'cmsWebFile/lookup', NULL, NULL, 'template_list', 0, 0); -INSERT INTO `sys_module` VALUES ('user_add', 'sysUser/add', 'sysDept/lookup,sysUser/save', NULL, 'user_list', 0, 0); -INSERT INTO `sys_module` VALUES ('user_disable', NULL, 'sysUser/disable', NULL, 'user_list', 0, 0); -INSERT INTO `sys_module` VALUES ('user_enable', NULL, 'sysUser/enable', NULL, 'user_list', 0, 0); -INSERT INTO `sys_module` VALUES ('user_list', 'sysUser/list', NULL, '', 'user_menu', 1, 1); -INSERT INTO `sys_module` VALUES ('user_menu', NULL, NULL, '', 'maintenance', 1, 1); -INSERT INTO `sys_module` VALUES ('webfile_content', 'cmsWebFile/content', 'cmsWebFile/save', NULL, 'webfile_list', 0, 0); -INSERT INTO `sys_module` VALUES ('webfile_directory', 'cmsWebFile/directory', 'cmsWebFile/createDirectory', NULL, 'webfile_list', 0, 0); -INSERT INTO `sys_module` VALUES ('webfile_list', 'cmsWebFile/list', NULL, '', 'file_menu', 1, 4); -INSERT INTO `sys_module` VALUES ('webfile_unzip', NULL, 'cmsWebFile/unzip,cmsWebFile/unzipHere', NULL, 'webfile_list', 0, 0); -INSERT INTO `sys_module` VALUES ('webfile_upload', 'cmsWebFile/upload', 'cmsWebFile/doUpload', NULL, 'webfile_list', 0, 0); -INSERT INTO `sys_module` VALUES ('webfile_zip', NULL, 'cmsWebFile/zip', NULL, 'webfile_list', 0, 0); -INSERT INTO `sys_module` VALUES ('word_list', 'cmsWord/list', NULL, '', 'content_extend', 1, 2); - --- 20180609 -- -ALTER TABLE `log_upload` - CHANGE COLUMN `image` `file_type` varchar(20) NOT NULL COMMENT '鏂囦欢绫诲瀷' AFTER `channel`, - ADD COLUMN `original_name` varchar(255) NULL COMMENT '鍘熸枃浠跺悕' AFTER `channel`, - DROP INDEX `image`, - ADD INDEX `file_type`(`file_type`); -UPDATE `log_upload` SET file_type = 'image' WHERE file_type = '1'; -UPDATE `log_upload` SET file_type = 'image' WHERE file_path like '%.png' or file_path like '%.jpg' or file_path like '%.gif' or file_path like '%.bmp'; -UPDATE `log_upload` SET file_type = 'video' WHERE file_path like '%.mp4' or file_path like '%.3gp'; -UPDATE `log_upload` SET file_type = 'other' WHERE file_type = '0'; --- 20180612 -- -DROP TABLE IF EXISTS `cms_lottery`; -DROP TABLE IF EXISTS `cms_lottery_user`; -DROP TABLE IF EXISTS `cms_vote`; -DROP TABLE IF EXISTS `cms_vote_item`; -DROP TABLE IF EXISTS `cms_vote_user`; --- 20180622 -- -ALTER TABLE `cms_dictionary` - ADD COLUMN `site_id` smallint(6) NOT NULL DEFAULT 1 COMMENT '绔欑偣ID' AFTER `id`, - DROP INDEX `multiple`, - ADD INDEX `siteId`(`site_id`, `multiple`); --- 20180706 -- -ALTER TABLE `sys_extend_field` MODIFY COLUMN `dictionary_id` bigint(20) NULL DEFAULT NULL COMMENT '鏁版嵁瀛楀吀ID' AFTER `default_value`; -ALTER TABLE `sys_extend_field` DROP COLUMN `dictionary_type`; \ No newline at end of file +-- 20170715 -- +INSERT INTO `sys_moudle` VALUES ('125', '鎾ら攢瀹℃牳', null, 'cmsContent/uncheck', null, '12', '0', '0'); +DROP TABLE IF EXISTS `home_dialog`; +DROP TABLE IF EXISTS `home_message`; +DROP TABLE IF EXISTS `home_group_active`; +-- 20170804 -- +UPDATE sys_moudle SET `parent_id` = 117 WHERE `sys_moudle`.`id` in(118,119); +-- 20170812 -- +INSERT INTO `sys_moudle` VALUES ('126', '鏂囦欢', null, null, '', null, '1', '1'); +UPDATE sys_moudle SET `parent_id` = 126 WHERE `sys_moudle`.`id` = 38; +UPDATE `sys_moudle` SET `name` = '绔欑偣閰嶇疆' WHERE `sys_moudle`.`id` = 140; +UPDATE `sys_moudle` SET `name` = '鏁版嵁瀛楀吀' WHERE `sys_moudle`.`id` = 122; +ALTER TABLE `cms_content` + ADD COLUMN `check_date` datetime default NULL COMMENT '瀹℃牳鏃ユ湡' AFTER `publish_date`, + ADD COLUMN `update_date` datetime default NULL COMMENT '鏇存柊鏃ユ湡' AFTER `check_date`, + DROP INDEX `publish_date`, + DROP INDEX `user_id`, + DROP INDEX `category_id`, + DROP INDEX `model_id`, + DROP INDEX `parent_id`, + DROP INDEX `status`, + DROP INDEX `childs`, + DROP INDEX `scores`, + DROP INDEX `comments`, + DROP INDEX `clicks`, + DROP INDEX `title`, + DROP INDEX `check_user_id`, + DROP INDEX `site_id`, + DROP INDEX `has_files`, + DROP INDEX `has_images`, + DROP INDEX `only_url`, + DROP INDEX `sort`, + ADD INDEX `check_date` (`check_date`,`update_date`), + ADD INDEX `scores` (`scores`,`comments`,`clicks`), + ADD INDEX `status` (`site_id`,`status`,`category_id`,`disabled`,`model_id`,`parent_id`,`sort`,`publish_date`), + ADD INDEX `only_url` (`only_url`,`has_images`,`has_files`,`user_id`); +UPDATE `cms_content` SET `check_date` = `publish_date`; +-- 20170905 -- +UPDATE `sys_moudle` SET `url` = 'cmsPlace/publish_place' WHERE `sys_moudle`.`id` = 53; +-- 20170922 -- +UPDATE `sys_moudle` SET `parent_id` = 5 WHERE `sys_moudle`.`id` = 63; +UPDATE `sys_moudle` SET `authorized_url` = 'cmsContent/addMore,file/doUpload,cmsContent/lookup,cmsContent/lookup_list,cmsContent/save,ueditor,ckeditor/upload' WHERE `sys_moudle`.`id` = 102; +-- 20170922 -- +INSERT INTO `sys_moudle` VALUES ('127', '鎺ㄨ崘浣嶆暟鎹', 'cmsPlace/dataList', null, null , '107', '1', '1'); +INSERT INTO `sys_moudle` VALUES ('128', '鐢ㄦ埛鏁版嵁鐩戞帶', 'report/user', NULL, '', '46', '1', '0'); +ALTER TABLE `sys_moudle` ORDER BY `id`; +DELETE FROM `sys_moudle` WHERE id = 130; +-- 20171103 -- +UPDATE `sys_user` SET roles = '2' where id = 2 and site_id = 2; +-- 20171216 -- +ALTER TABLE `cms_place` MODIFY COLUMN `item_id` bigint(20) default NULL COMMENT '鎺ㄨ崘椤圭洰ID' AFTER `item_type`; +ALTER TABLE `cms_category` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `id`; +ALTER TABLE `cms_category_type` CHANGE COLUMN `siteId` `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `id`, DROP INDEX `siteId`,ADD INDEX `site_id`(`site_id`) USING BTREE; +ALTER TABLE `cms_content` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `id`; +ALTER TABLE `cms_lottery` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `id`; +ALTER TABLE `cms_tag` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `id`; +ALTER TABLE `cms_tag_type` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `id`; +ALTER TABLE `cms_vote` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `id`; +ALTER TABLE `cms_word` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `id`; +ALTER TABLE `home_article` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `id`; +ALTER TABLE `home_broadcast` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `id`; +ALTER TABLE `home_comment` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `id`; +ALTER TABLE `home_directory` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `id`; +ALTER TABLE `home_file` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `id`; +ALTER TABLE `home_group` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `id`; +ALTER TABLE `home_group_post` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `id`; +ALTER TABLE `home_score` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `id`; +ALTER TABLE `home_user` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `user_id`; +ALTER TABLE `log_login` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `id`; +ALTER TABLE `log_operate` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `id`; +ALTER TABLE `log_task` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `id`; +ALTER TABLE `log_upload` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `id`; +ALTER TABLE `sys_app` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `id`; +ALTER TABLE `sys_app_client` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' FIRST; +ALTER TABLE `sys_config_data` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' FIRST; +ALTER TABLE `sys_dept` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `id`; +ALTER TABLE `sys_domain` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `name`; +ALTER TABLE `sys_role` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `id`; +ALTER TABLE `sys_task` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `id`; +ALTER TABLE `sys_user` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `id`; +ALTER TABLE `sys_user_token` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `auth_token`; +ALTER TABLE `cms_category_type` COMMENT = '鍒嗙被绫诲瀷'; +ALTER TABLE `cms_lottery` COMMENT = '鎶藉'; +ALTER TABLE `cms_lottery_user` COMMENT = '鎶藉鐢ㄦ埛'; +ALTER TABLE `cms_lottery_user_attribute` COMMENT = '鎶藉鐢ㄦ埛鎵╁睍鏁版嵁'; +ALTER TABLE `cms_vote` COMMENT = '鎶曠エ'; +ALTER TABLE `cms_vote_item` COMMENT = '鎶曠エ閫夐」'; +ALTER TABLE `cms_vote_user` COMMENT = '鎶曠エ鐢ㄦ埛'; +ALTER TABLE `cms_word` COMMENT = '鎼滅储璇'; +ALTER TABLE `sys_app` COMMENT = '搴旂敤'; +ALTER TABLE `sys_app_client` COMMENT = '搴旂敤瀹㈡埛绔'; +ALTER TABLE `sys_app_token` COMMENT = '搴旂敤鎺堟潈'; +ALTER TABLE `sys_extend` COMMENT = '鎵╁睍'; +ALTER TABLE `sys_extend_field` COMMENT = '鎵╁睍瀛楁'; +-- 2017-12-24 -- +ALTER TABLE `cms_lottery` DROP COLUMN `interval_hour`,DROP COLUMN `gift`,DROP COLUMN `extend_id`; +ALTER TABLE `cms_vote` DROP COLUMN `anonymous`,DROP COLUMN `interval_hour`,DROP COLUMN `item_extend_id` , DROP INDEX `disabled`, ADD INDEX `disabled` (`site_id`,`end_date`,`disabled`); +DROP TABLE IF EXISTS `cms_vote_item_attribute`; +DROP TABLE IF EXISTS `cms_lottery_user_attribute`; +-- 2018-01-18 -- +ALTER TABLE `cms_category` DROP COLUMN `contents`; +-- 2018-02-08 -- +ALTER TABLE `sys_moudle` RENAME `sys_module`; +ALTER TABLE `sys_role_moudle` RENAME `sys_role_module`; +ALTER TABLE `sys_role_module` CHANGE COLUMN `moudle_id` `module_id` int(11) NOT NULL COMMENT '妯″潡ID' AFTER `role_id`; +ALTER TABLE `sys_role` CHANGE COLUMN `show_all_moudle` `show_all_module` int(11) NOT NULL COMMENT '鏄剧ず鍏ㄩ儴妯″潡' AFTER `owns_all_right`; +UPDATE `sys_module` SET `authorized_url` = 'sysUser/lookup,cmsContent/recycle,cmsContent/realDelete' WHERE `id` = 117; +ALTER TABLE `sys_user` MODIFY COLUMN `last_login_ip` varchar(64) NULL DEFAULT NULL COMMENT '鏈鍚庣櫥褰昳p' AFTER `last_login_date`; +ALTER TABLE `sys_user_token` MODIFY COLUMN `login_ip` varchar(64) NOT NULL COMMENT '鐧诲綍IP' AFTER `create_date`; +-- 20180414 -- +DROP TABLE IF EXISTS `home_active`; +DROP TABLE IF EXISTS `home_article`; +DROP TABLE IF EXISTS `home_article_content`; +DROP TABLE IF EXISTS `home_attention`; +DROP TABLE IF EXISTS `home_broadcast`; +DROP TABLE IF EXISTS `home_comment`; +DROP TABLE IF EXISTS `home_comment_content`; +DROP TABLE IF EXISTS `home_directory`; +DROP TABLE IF EXISTS `home_file`; +DROP TABLE IF EXISTS `home_friend`; +DROP TABLE IF EXISTS `home_friend_apply`; +DROP TABLE IF EXISTS `home_group`; +DROP TABLE IF EXISTS `home_group_apply`; +DROP TABLE IF EXISTS `home_group_post`; +DROP TABLE IF EXISTS `home_group_post_content`; +DROP TABLE IF EXISTS `home_group_user`; +DROP TABLE IF EXISTS `home_score`; +DROP TABLE IF EXISTS `home_user`; +UPDATE `sys_module` SET `parent_id` = 149 WHERE `id` in (150,151,152,153,154); +UPDATE `sys_module` SET `parent_id` = 99 WHERE `id` in (145,146); +-- 20180504 -- +UPDATE `sys_module` SET `authorized_url` = 'cmsContent/push_content,cmsContent/push_content_list,cmsContent/push_to_content,cmsContent/push_page,cmsContent/push_page_list,cmsPlace/add,cmsPlace/save,cmsContent/related,cmsContent/unrelated,cmsPlace/delete' WHERE `id` = 23; +INSERT INTO `sys_module` VALUES ('141', '淇敼鍐呭妯″瀷', 'cmsContent/changeModelParameters', 'cmsContent/changeModel', null, '12', '0', '0'); +-- 20180605 -- +DELETE FROM `sys_module` WHERE id < 1000; +ALTER TABLE `sys_module` + MODIFY COLUMN `id` varchar(30) NOT NULL FIRST, + MODIFY COLUMN `parent_id` varchar(30) NULL DEFAULT NULL COMMENT '鐖舵ā鍧' AFTER `attached`; +ALTER TABLE `sys_role` MODIFY COLUMN `show_all_module` tinyint(1) NOT NULL COMMENT '鏄剧ず鍏ㄩ儴妯″潡' AFTER `owns_all_right`; +ALTER TABLE `sys_site` MODIFY COLUMN `id` smallint(6) NOT NULL AUTO_INCREMENT FIRST; +ALTER TABLE `cms_place` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `id`; +ALTER TABLE `sys_role_module` MODIFY COLUMN `module_id` varchar(30) NOT NULL COMMENT '妯″潡ID' AFTER `role_id`; + +CREATE TABLE `sys_module_lang` ( + `module_id` varchar(30) NOT NULL COMMENT '妯″潡ID', + `lang` varchar(20) NOT NULL COMMENT '璇█', + `value` varchar(100) DEFAULT NULL COMMENT '鍊', + PRIMARY KEY (`module_id`,`lang`) USING BTREE +) COMMENT='妯″潡璇█'; + +INSERT INTO `sys_module_lang` SELECT `id`,'',`name` FROM `sys_module` where id >= 1000; +INSERT INTO `sys_module_lang` SELECT `id`,'en',`name` FROM `sys_module` where id >= 1000; + +INSERT INTO `sys_module_lang` VALUES ('app_add', '', '澧炲姞/淇敼'); +INSERT INTO `sys_module_lang` VALUES ('app_add', 'en', 'Add/edit'); +INSERT INTO `sys_module_lang` VALUES ('app_client_disable', '', '绂佺敤'); +INSERT INTO `sys_module_lang` VALUES ('app_client_disable', 'en', 'Disable'); +INSERT INTO `sys_module_lang` VALUES ('app_client_enable', '', '鍚敤'); +INSERT INTO `sys_module_lang` VALUES ('app_client_enable', 'en', 'Enable'); +INSERT INTO `sys_module_lang` VALUES ('app_client_list', '', '瀹㈡埛绔鐞'); +INSERT INTO `sys_module_lang` VALUES ('app_client_list', 'en', 'Application client management'); +INSERT INTO `sys_module_lang` VALUES ('app_delete', '', '鍒犻櫎'); +INSERT INTO `sys_module_lang` VALUES ('app_delete', 'en', 'Delete'); +INSERT INTO `sys_module_lang` VALUES ('app_list', '', '搴旂敤鎺堟潈'); +INSERT INTO `sys_module_lang` VALUES ('app_list', 'en', 'Application Authorization'); +INSERT INTO `sys_module_lang` VALUES ('category', '', '鍒嗙被'); +INSERT INTO `sys_module_lang` VALUES ('category', 'en', 'Category'); +INSERT INTO `sys_module_lang` VALUES ('category_add', '', '澧炲姞/淇敼'); +INSERT INTO `sys_module_lang` VALUES ('category_add', 'en', 'Add/edit'); +INSERT INTO `sys_module_lang` VALUES ('category_delete', '', '鍒犻櫎'); +INSERT INTO `sys_module_lang` VALUES ('category_delete', 'en', 'Delete'); +INSERT INTO `sys_module_lang` VALUES ('category_extend', '', '鍒嗙被鎵╁睍'); +INSERT INTO `sys_module_lang` VALUES ('category_extend', 'en', 'Category extension'); +INSERT INTO `sys_module_lang` VALUES ('category_menu', '', '鍒嗙被绠＄悊'); +INSERT INTO `sys_module_lang` VALUES ('category_menu', 'en', 'Category management'); +INSERT INTO `sys_module_lang` VALUES ('category_move', '', '绉诲姩'); +INSERT INTO `sys_module_lang` VALUES ('category_move', 'en', 'Move'); +INSERT INTO `sys_module_lang` VALUES ('category_publish', '', '鐢熸垚'); +INSERT INTO `sys_module_lang` VALUES ('category_publish', 'en', 'Publish'); +INSERT INTO `sys_module_lang` VALUES ('category_push', '', '鎺ㄨ崘'); +INSERT INTO `sys_module_lang` VALUES ('category_push', 'en', 'Push'); +INSERT INTO `sys_module_lang` VALUES ('category_type_add', '', '澧炲姞/淇敼'); +INSERT INTO `sys_module_lang` VALUES ('category_type_add', 'en', 'test'); +INSERT INTO `sys_module_lang` VALUES ('category_type_change', '', '淇敼绫诲瀷'); +INSERT INTO `sys_module_lang` VALUES ('category_type_change', 'en', 'Change category type'); +INSERT INTO `sys_module_lang` VALUES ('category_type_delete', '', '鍒犻櫎'); +INSERT INTO `sys_module_lang` VALUES ('category_type_delete', 'en', 'test'); +INSERT INTO `sys_module_lang` VALUES ('category_type_list', '', '鍒嗙被绫诲瀷'); +INSERT INTO `sys_module_lang` VALUES ('category_type_list', 'en', 'Category type'); +INSERT INTO `sys_module_lang` VALUES ('clearcache', '', '鍒锋柊缂撳瓨'); +INSERT INTO `sys_module_lang` VALUES ('clearcache', 'en', 'Clear cache'); +INSERT INTO `sys_module_lang` VALUES ('config_add', '', '娣诲姞/淇敼'); +INSERT INTO `sys_module_lang` VALUES ('config_add', 'en', 'Add/edit'); +INSERT INTO `sys_module_lang` VALUES ('config_data_delete', '', '娓呯┖閰嶇疆'); +INSERT INTO `sys_module_lang` VALUES ('config_data_delete', 'en', 'Clear config data'); +INSERT INTO `sys_module_lang` VALUES ('config_data_edit', '', '淇敼'); +INSERT INTO `sys_module_lang` VALUES ('config_data_edit', 'en', 'Edit'); +INSERT INTO `sys_module_lang` VALUES ('config_data_list', '', '绔欑偣閰嶇疆'); +INSERT INTO `sys_module_lang` VALUES ('config_data_list', 'en', 'Site configuration'); +INSERT INTO `sys_module_lang` VALUES ('config_delete', '', '鍒犻櫎閰嶇疆'); +INSERT INTO `sys_module_lang` VALUES ('config_delete', 'en', 'Delete'); +INSERT INTO `sys_module_lang` VALUES ('config_list', '', '绔欑偣閰嶇疆绠＄悊'); +INSERT INTO `sys_module_lang` VALUES ('config_list', 'en', 'Site config management'); +INSERT INTO `sys_module_lang` VALUES ('config_list_data_dictionary', '', '閫夋嫨鏁版嵁瀛楀吀'); +INSERT INTO `sys_module_lang` VALUES ('config_list_data_dictionary', 'en', 'Select data dictionary'); +INSERT INTO `sys_module_lang` VALUES ('config_menu', '', '閰嶇疆绠＄悊'); +INSERT INTO `sys_module_lang` VALUES ('config_menu', 'en', 'Configuration management'); +INSERT INTO `sys_module_lang` VALUES ('content', '', '鍐呭'); +INSERT INTO `sys_module_lang` VALUES ('content', 'en', 'Content'); +INSERT INTO `sys_module_lang` VALUES ('content_add', '', '澧炲姞/淇敼'); +INSERT INTO `sys_module_lang` VALUES ('content_add', 'en', 'Add/edit'); +INSERT INTO `sys_module_lang` VALUES ('content_check', '', '瀹℃牳'); +INSERT INTO `sys_module_lang` VALUES ('content_check', 'en', 'Check'); +INSERT INTO `sys_module_lang` VALUES ('content_delete', '', '鍒犻櫎'); +INSERT INTO `sys_module_lang` VALUES ('content_delete', 'en', 'Delete'); +INSERT INTO `sys_module_lang` VALUES ('content_extend', '', '鍐呭鎵╁睍'); +INSERT INTO `sys_module_lang` VALUES ('content_extend', 'en', 'Content extension'); +INSERT INTO `sys_module_lang` VALUES ('content_menu', '', '鍐呭绠＄悊'); +INSERT INTO `sys_module_lang` VALUES ('content_menu', 'en', 'Content management'); +INSERT INTO `sys_module_lang` VALUES ('content_move', '', '绉诲姩'); +INSERT INTO `sys_module_lang` VALUES ('content_move', 'en', 'Move'); +INSERT INTO `sys_module_lang` VALUES ('content_publish', '', '鐢熸垚'); +INSERT INTO `sys_module_lang` VALUES ('content_publish', 'en', 'Publish'); +INSERT INTO `sys_module_lang` VALUES ('content_push', '', '鎺ㄨ崘'); +INSERT INTO `sys_module_lang` VALUES ('content_push', 'en', 'Push'); +INSERT INTO `sys_module_lang` VALUES ('content_recycle_delete', '', '鍒犻櫎'); +INSERT INTO `sys_module_lang` VALUES ('content_recycle_delete', 'en', 'test'); +INSERT INTO `sys_module_lang` VALUES ('content_recycle_list', '', '鍐呭鍥炴敹绔'); +INSERT INTO `sys_module_lang` VALUES ('content_recycle_list', 'en', 'Content recycle'); +INSERT INTO `sys_module_lang` VALUES ('content_recycle_recycle', '', '杩樺師'); +INSERT INTO `sys_module_lang` VALUES ('content_recycle_recycle', 'en', 'test'); +INSERT INTO `sys_module_lang` VALUES ('content_refresh', '', '鍒锋柊'); +INSERT INTO `sys_module_lang` VALUES ('content_refresh', 'en', 'Refresh'); +INSERT INTO `sys_module_lang` VALUES ('content_select_category', '', '閫夋嫨鍒嗙被'); +INSERT INTO `sys_module_lang` VALUES ('content_select_category', 'en', 'Select category'); +INSERT INTO `sys_module_lang` VALUES ('content_select_category_type', '', '閫夋嫨鍒嗙被绫诲瀷'); +INSERT INTO `sys_module_lang` VALUES ('content_select_category_type', 'en', 'Select category type'); +INSERT INTO `sys_module_lang` VALUES ('content_select_content', '', '閫夋嫨鍐呭'); +INSERT INTO `sys_module_lang` VALUES ('content_select_content', 'en', 'Select content'); +INSERT INTO `sys_module_lang` VALUES ('content_select_tag_type', '', '閫夋嫨鏍囩绫诲瀷'); +INSERT INTO `sys_module_lang` VALUES ('content_select_tag_type', 'en', 'Select tag type'); +INSERT INTO `sys_module_lang` VALUES ('content_select_template', '', '閫夋嫨妯℃澘'); +INSERT INTO `sys_module_lang` VALUES ('content_select_template', 'en', 'Select template'); +INSERT INTO `sys_module_lang` VALUES ('content_select_user', '', '閫夋嫨鐢ㄦ埛'); +INSERT INTO `sys_module_lang` VALUES ('content_select_user', 'en', 'Select user'); +INSERT INTO `sys_module_lang` VALUES ('content_sort', '', '缃《'); +INSERT INTO `sys_module_lang` VALUES ('content_sort', 'en', 'Sort'); +INSERT INTO `sys_module_lang` VALUES ('content_uncheck', '', '鎾ら攢瀹℃牳'); +INSERT INTO `sys_module_lang` VALUES ('content_uncheck', 'en', 'Uncheck'); +INSERT INTO `sys_module_lang` VALUES ('content_view', '', '鏌ョ湅'); +INSERT INTO `sys_module_lang` VALUES ('content_view', 'en', 'View'); +INSERT INTO `sys_module_lang` VALUES ('dept_add', '', '澧炲姞/淇敼'); +INSERT INTO `sys_module_lang` VALUES ('dept_add', 'en', 'Add/edit'); +INSERT INTO `sys_module_lang` VALUES ('dept_delete', '', '鍒犻櫎'); +INSERT INTO `sys_module_lang` VALUES ('dept_delete', 'en', 'Delete'); +INSERT INTO `sys_module_lang` VALUES ('dept_list', '', '閮ㄩ棬绠＄悊'); +INSERT INTO `sys_module_lang` VALUES ('dept_list', 'en', 'Department management'); +INSERT INTO `sys_module_lang` VALUES ('dept_user_list', '', '浜哄憳绠＄悊'); +INSERT INTO `sys_module_lang` VALUES ('dept_user_list', 'en', 'Department user management'); +INSERT INTO `sys_module_lang` VALUES ('develop', '', '寮鍙'); +INSERT INTO `sys_module_lang` VALUES ('develop', 'en', 'Development'); +INSERT INTO `sys_module_lang` VALUES ('dictionary_add', '', '娣诲姞/淇敼'); +INSERT INTO `sys_module_lang` VALUES ('dictionary_add', 'en', 'Add/edit'); +INSERT INTO `sys_module_lang` VALUES ('dictionary_delete', '', '鍒犻櫎'); +INSERT INTO `sys_module_lang` VALUES ('dictionary_delete', 'en', 'Delete'); +INSERT INTO `sys_module_lang` VALUES ('dictionary_list', '', '鏁版嵁瀛楀吀'); +INSERT INTO `sys_module_lang` VALUES ('dictionary_list', 'en', 'Dictionary management'); +INSERT INTO `sys_module_lang` VALUES ('domain_config', '', '淇敼'); +INSERT INTO `sys_module_lang` VALUES ('domain_config', 'en', 'Edit'); +INSERT INTO `sys_module_lang` VALUES ('domain_list', '', '缁戝畾鍩熷悕'); +INSERT INTO `sys_module_lang` VALUES ('domain_list', 'en', 'Domain management'); +INSERT INTO `sys_module_lang` VALUES ('file_menu', '', '鏂囦欢绠＄悊'); +INSERT INTO `sys_module_lang` VALUES ('file_menu', 'en', 'File maintenance'); +INSERT INTO `sys_module_lang` VALUES ('log_login', '', '鐧诲綍鏃ュ織'); +INSERT INTO `sys_module_lang` VALUES ('log_login', 'en', 'Login log'); +INSERT INTO `sys_module_lang` VALUES ('log_login_delete', '', '鍒犻櫎'); +INSERT INTO `sys_module_lang` VALUES ('log_login_delete', 'en', 'Delete'); +INSERT INTO `sys_module_lang` VALUES ('log_menu', '', '鏃ュ織绠＄悊'); +INSERT INTO `sys_module_lang` VALUES ('log_menu', 'en', 'Log management'); +INSERT INTO `sys_module_lang` VALUES ('log_operate', '', '鎿嶄綔鏃ュ織'); +INSERT INTO `sys_module_lang` VALUES ('log_operate', 'en', 'Operate log'); +INSERT INTO `sys_module_lang` VALUES ('log_operate_delete', '', '鍒犻櫎'); +INSERT INTO `sys_module_lang` VALUES ('log_operate_delete', 'en', 'Delete'); +INSERT INTO `sys_module_lang` VALUES ('log_operate_view', '', '鏌ョ湅'); +INSERT INTO `sys_module_lang` VALUES ('log_operate_view', 'en', 'View'); +INSERT INTO `sys_module_lang` VALUES ('log_task', '', '浠诲姟璁″垝鏃ュ織'); +INSERT INTO `sys_module_lang` VALUES ('log_task', 'en', 'Task log'); +INSERT INTO `sys_module_lang` VALUES ('log_task_delete', '', '鍒犻櫎'); +INSERT INTO `sys_module_lang` VALUES ('log_task_delete', 'en', 'Delete'); +INSERT INTO `sys_module_lang` VALUES ('log_task_view', '', '鏌ョ湅'); +INSERT INTO `sys_module_lang` VALUES ('log_task_view', 'en', 'View'); +INSERT INTO `sys_module_lang` VALUES ('log_upload', '', '鏂囦欢涓婁紶鏃ュ織'); +INSERT INTO `sys_module_lang` VALUES ('log_upload', 'en', 'Upload log'); +INSERT INTO `sys_module_lang` VALUES ('maintenance', '', '缁存姢'); +INSERT INTO `sys_module_lang` VALUES ('maintenance', 'en', 'Maintenance'); +INSERT INTO `sys_module_lang` VALUES ('model_add', '', '澧炲姞/淇敼'); +INSERT INTO `sys_module_lang` VALUES ('model_add', 'en', 'Add/edit'); +INSERT INTO `sys_module_lang` VALUES ('model_delete', '', '鍒犻櫎'); +INSERT INTO `sys_module_lang` VALUES ('model_delete', 'en', 'Delete'); +INSERT INTO `sys_module_lang` VALUES ('model_list', '', '鍐呭妯″瀷绠＄悊'); +INSERT INTO `sys_module_lang` VALUES ('model_list', 'en', 'Model management'); +INSERT INTO `sys_module_lang` VALUES ('myself', '', '涓汉'); +INSERT INTO `sys_module_lang` VALUES ('myself', 'en', 'Myself'); +INSERT INTO `sys_module_lang` VALUES ('myself_content', '', '鎴戠殑鍐呭'); +INSERT INTO `sys_module_lang` VALUES ('myself_content', 'en', 'My content'); +INSERT INTO `sys_module_lang` VALUES ('myself_content_add', '', '淇敼'); +INSERT INTO `sys_module_lang` VALUES ('myself_content_add', 'en', 'Add'); +INSERT INTO `sys_module_lang` VALUES ('myself_content_delete', '', '鍒犻櫎'); +INSERT INTO `sys_module_lang` VALUES ('myself_content_delete', 'en', 'Delete'); +INSERT INTO `sys_module_lang` VALUES ('myself_content_publish', '', '鐢熸垚'); +INSERT INTO `sys_module_lang` VALUES ('myself_content_publish', 'en', 'Publish'); +INSERT INTO `sys_module_lang` VALUES ('myself_content_push', '', '鎺ㄨ崘'); +INSERT INTO `sys_module_lang` VALUES ('myself_content_push', 'en', 'Push'); +INSERT INTO `sys_module_lang` VALUES ('myself_content_refresh', '', '鍒锋柊'); +INSERT INTO `sys_module_lang` VALUES ('myself_content_refresh', 'en', 'Refresh'); +INSERT INTO `sys_module_lang` VALUES ('myself_log_login', '', '鎴戠殑鐧诲綍鏃ュ織'); +INSERT INTO `sys_module_lang` VALUES ('myself_log_login', 'en', 'My login log'); +INSERT INTO `sys_module_lang` VALUES ('myself_log_operate', '', '鎴戠殑鎿嶄綔鏃ュ織'); +INSERT INTO `sys_module_lang` VALUES ('myself_log_operate', 'en', 'My operate log'); +INSERT INTO `sys_module_lang` VALUES ('myself_menu', '', '涓庢垜鐩稿叧'); +INSERT INTO `sys_module_lang` VALUES ('myself_menu', 'en', 'My account'); +INSERT INTO `sys_module_lang` VALUES ('myself_password', '', '淇敼瀵嗙爜'); +INSERT INTO `sys_module_lang` VALUES ('myself_password', 'en', 'Change password'); +INSERT INTO `sys_module_lang` VALUES ('myself_token', '', '鎴戠殑鐧诲綍鎺堟潈'); +INSERT INTO `sys_module_lang` VALUES ('myself_token', 'en', 'My login token'); +INSERT INTO `sys_module_lang` VALUES ('page', '', '椤甸潰'); +INSERT INTO `sys_module_lang` VALUES ('page', 'en', 'Page'); +INSERT INTO `sys_module_lang` VALUES ('page_list', '', '椤甸潰绠＄悊'); +INSERT INTO `sys_module_lang` VALUES ('page_list', 'en', 'Page management'); +INSERT INTO `sys_module_lang` VALUES ('page_menu', '', '椤甸潰缁存姢'); +INSERT INTO `sys_module_lang` VALUES ('page_menu', 'en', 'Page maintenance'); +INSERT INTO `sys_module_lang` VALUES ('page_metadata', '', '鍏冩暟鎹鐞'); +INSERT INTO `sys_module_lang` VALUES ('page_metadata', 'en', 'Metadata management'); +INSERT INTO `sys_module_lang` VALUES ('page_publish', '', '鐢熸垚椤甸潰'); +INSERT INTO `sys_module_lang` VALUES ('page_publish', 'en', 'Publish'); +INSERT INTO `sys_module_lang` VALUES ('page_save', '', '淇濆瓨椤甸潰閰嶇疆'); +INSERT INTO `sys_module_lang` VALUES ('page_save', 'en', 'Save configuration'); +INSERT INTO `sys_module_lang` VALUES ('page_select_category', '', '閫夋嫨鍒嗙被'); +INSERT INTO `sys_module_lang` VALUES ('page_select_category', 'en', 'Select category'); +INSERT INTO `sys_module_lang` VALUES ('page_select_category_type', '', '閫夋嫨鍒嗙被绫诲瀷'); +INSERT INTO `sys_module_lang` VALUES ('page_select_category_type', 'en', 'Select category type'); +INSERT INTO `sys_module_lang` VALUES ('page_select_content', '', '閫夋嫨鍐呭'); +INSERT INTO `sys_module_lang` VALUES ('page_select_content', 'en', 'Select content'); +INSERT INTO `sys_module_lang` VALUES ('page_select_tag_type', '', '閫夋嫨鏍囩绫诲瀷'); +INSERT INTO `sys_module_lang` VALUES ('page_select_tag_type', 'en', 'Select tag type'); +INSERT INTO `sys_module_lang` VALUES ('page_select_template', '', '閫夋嫨妯℃澘'); +INSERT INTO `sys_module_lang` VALUES ('page_select_template', 'en', 'Select template'); +INSERT INTO `sys_module_lang` VALUES ('page_select_user', '', '閫夋嫨鐢ㄦ埛'); +INSERT INTO `sys_module_lang` VALUES ('page_select_user', 'en', 'Select user'); +INSERT INTO `sys_module_lang` VALUES ('place_add', '', '澧炲姞/淇敼鎺ㄨ崘浣嶆暟鎹'); +INSERT INTO `sys_module_lang` VALUES ('place_add', 'en', 'Add/edit'); +INSERT INTO `sys_module_lang` VALUES ('place_check', '', '瀹℃牳鎺ㄨ崘浣嶆暟鎹'); +INSERT INTO `sys_module_lang` VALUES ('place_check', 'en', 'Check'); +INSERT INTO `sys_module_lang` VALUES ('place_clear', '', '娓呯┖鎺ㄨ崘浣嶆暟鎹'); +INSERT INTO `sys_module_lang` VALUES ('place_clear', 'en', 'Clear'); +INSERT INTO `sys_module_lang` VALUES ('place_data_list', '', '鎺ㄨ崘浣嶆暟鎹'); +INSERT INTO `sys_module_lang` VALUES ('place_data_list', 'en', 'Page fragment data'); +INSERT INTO `sys_module_lang` VALUES ('place_delete', '', '鍒犻櫎鎺ㄨ崘浣嶆暟鎹'); +INSERT INTO `sys_module_lang` VALUES ('place_delete', 'en', 'data'); +INSERT INTO `sys_module_lang` VALUES ('place_list', '', '椤甸潰鐗囨绠＄悊'); +INSERT INTO `sys_module_lang` VALUES ('place_list', 'en', 'Page fragment management'); +INSERT INTO `sys_module_lang` VALUES ('place_publish', '', '鍙戝竷'); +INSERT INTO `sys_module_lang` VALUES ('place_publish', 'en', 'Publish'); +INSERT INTO `sys_module_lang` VALUES ('place_refresh', '', '鍒锋柊鎺ㄨ崘浣嶆暟鎹'); +INSERT INTO `sys_module_lang` VALUES ('place_refresh', 'en', 'Refresh'); +INSERT INTO `sys_module_lang` VALUES ('place_template_content', '', '淇敼'); +INSERT INTO `sys_module_lang` VALUES ('place_template_content', 'en', 'Edit template'); +INSERT INTO `sys_module_lang` VALUES ('place_template_data_dictionary', '', '閫夋嫨鏁版嵁瀛楀吀'); +INSERT INTO `sys_module_lang` VALUES ('place_template_data_dictionary', 'en', 'Select data dictionary'); +INSERT INTO `sys_module_lang` VALUES ('place_template_fragment', '', '妯℃澘鐗囨'); +INSERT INTO `sys_module_lang` VALUES ('place_template_fragment', 'en', 'Template fragment'); +INSERT INTO `sys_module_lang` VALUES ('place_template_help', '', '妯℃澘甯姪'); +INSERT INTO `sys_module_lang` VALUES ('place_template_help', 'en', 'Template help'); +INSERT INTO `sys_module_lang` VALUES ('place_template_list', '', '椤甸潰鐗囨妯℃澘'); +INSERT INTO `sys_module_lang` VALUES ('place_template_list', 'en', 'Page fragment template'); +INSERT INTO `sys_module_lang` VALUES ('place_template_metadata', '', '淇敼鍏冩暟鎹'); +INSERT INTO `sys_module_lang` VALUES ('place_template_metadata', 'en', 'Edit metadata'); +INSERT INTO `sys_module_lang` VALUES ('place_template_place', '', '椤甸潰鐗囨'); +INSERT INTO `sys_module_lang` VALUES ('place_template_place', 'en', 'Page fragment'); +INSERT INTO `sys_module_lang` VALUES ('place_template_webfile', '', '缃戠珯鏂囦欢'); +INSERT INTO `sys_module_lang` VALUES ('place_template_webfile', 'en', 'Website file'); +INSERT INTO `sys_module_lang` VALUES ('place_view', '', '鏌ョ湅鎺ㄨ崘浣嶆暟鎹'); +INSERT INTO `sys_module_lang` VALUES ('place_view', 'en', 'View'); +INSERT INTO `sys_module_lang` VALUES ('report_user', '', '鐢ㄦ埛鏁版嵁鐩戞帶'); +INSERT INTO `sys_module_lang` VALUES ('report_user', 'en', 'User report'); +INSERT INTO `sys_module_lang` VALUES ('role_add', '', '澧炲姞/淇敼'); +INSERT INTO `sys_module_lang` VALUES ('role_add', 'en', 'Add/edit'); +INSERT INTO `sys_module_lang` VALUES ('role_delete', '', '鍒犻櫎'); +INSERT INTO `sys_module_lang` VALUES ('role_delete', 'en', 'Delete'); +INSERT INTO `sys_module_lang` VALUES ('role_list', '', '瑙掕壊绠＄悊'); +INSERT INTO `sys_module_lang` VALUES ('role_list', 'en', 'Role management'); +INSERT INTO `sys_module_lang` VALUES ('system_menu', '', '绯荤粺缁存姢'); +INSERT INTO `sys_module_lang` VALUES ('system_menu', 'en', 'System maintenance'); +INSERT INTO `sys_module_lang` VALUES ('tag_add', '', '澧炲姞/淇敼'); +INSERT INTO `sys_module_lang` VALUES ('tag_add', 'en', 'Add/edit'); +INSERT INTO `sys_module_lang` VALUES ('tag_delete', '', '鍒犻櫎'); +INSERT INTO `sys_module_lang` VALUES ('tag_delete', 'en', 'Delete'); +INSERT INTO `sys_module_lang` VALUES ('tag_list', '', '鏍囩绠＄悊'); +INSERT INTO `sys_module_lang` VALUES ('tag_list', 'en', 'Tag management'); +INSERT INTO `sys_module_lang` VALUES ('tag_type_delete', '', '鍒犻櫎'); +INSERT INTO `sys_module_lang` VALUES ('tag_type_delete', 'en', 'test'); +INSERT INTO `sys_module_lang` VALUES ('tag_type_list', '', '鏍囩鍒嗙被'); +INSERT INTO `sys_module_lang` VALUES ('tag_type_list', 'en', 'Tag type'); +INSERT INTO `sys_module_lang` VALUES ('tag_type_save', '', '澧炲姞/淇敼'); +INSERT INTO `sys_module_lang` VALUES ('tag_type_save', 'en', 'test'); +INSERT INTO `sys_module_lang` VALUES ('task_add', '', '澧炲姞/淇敼'); +INSERT INTO `sys_module_lang` VALUES ('task_add', 'en', 'Add/edit'); +INSERT INTO `sys_module_lang` VALUES ('task_delete', '', '鍒犻櫎'); +INSERT INTO `sys_module_lang` VALUES ('task_delete', 'en', 'Delete'); +INSERT INTO `sys_module_lang` VALUES ('task_list', '', '浠诲姟璁″垝'); +INSERT INTO `sys_module_lang` VALUES ('task_list', 'en', 'Task management'); +INSERT INTO `sys_module_lang` VALUES ('task_pause', '', '鏆傚仠'); +INSERT INTO `sys_module_lang` VALUES ('task_pause', 'en', 'Pause'); +INSERT INTO `sys_module_lang` VALUES ('task_recreate', '', '閲嶆柊鍒濆鍖'); +INSERT INTO `sys_module_lang` VALUES ('task_recreate', 'en', 'Recreate'); +INSERT INTO `sys_module_lang` VALUES ('task_resume', '', '鎭㈠'); +INSERT INTO `sys_module_lang` VALUES ('task_resume', 'en', 'Resume'); +INSERT INTO `sys_module_lang` VALUES ('task_runonce', '', '绔嬪埢鎵ц'); +INSERT INTO `sys_module_lang` VALUES ('task_runonce', 'en', 'Run once'); +INSERT INTO `sys_module_lang` VALUES ('task_template_content', '', '淇敼'); +INSERT INTO `sys_module_lang` VALUES ('task_template_content', 'en', 'Edit'); +INSERT INTO `sys_module_lang` VALUES ('task_template_delete', '', '鍒犻櫎'); +INSERT INTO `sys_module_lang` VALUES ('task_template_delete', 'en', 'Delete'); +INSERT INTO `sys_module_lang` VALUES ('task_template_fragment', '', '浠诲姟璁″垝鑴氭湰鐗囨'); +INSERT INTO `sys_module_lang` VALUES ('task_template_fragment', 'en', 'Task script fragment'); +INSERT INTO `sys_module_lang` VALUES ('task_template_help', '', '甯姪'); +INSERT INTO `sys_module_lang` VALUES ('task_template_help', 'en', 'help'); +INSERT INTO `sys_module_lang` VALUES ('task_template_list', '', '浠诲姟璁″垝鑴氭湰'); +INSERT INTO `sys_module_lang` VALUES ('task_template_list', 'en', 'Task template management'); +INSERT INTO `sys_module_lang` VALUES ('template_content', '', '淇敼'); +INSERT INTO `sys_module_lang` VALUES ('template_content', 'en', 'Edit'); +INSERT INTO `sys_module_lang` VALUES ('template_content-type', '', '閫夋嫨content-type'); +INSERT INTO `sys_module_lang` VALUES ('template_content-type', 'en', 'Select content-type'); +INSERT INTO `sys_module_lang` VALUES ('template_content_form', '', '鍐呭鎶曠ǹ琛ㄥ崟'); +INSERT INTO `sys_module_lang` VALUES ('template_content_form', 'en', 'Content contribute form'); +INSERT INTO `sys_module_lang` VALUES ('template_data_dictionary', '', '閫夋嫨鏁版嵁瀛楀吀'); +INSERT INTO `sys_module_lang` VALUES ('template_data_dictionary', 'en', 'Select data dictionary'); +INSERT INTO `sys_module_lang` VALUES ('template_delete', '', '鍒犻櫎'); +INSERT INTO `sys_module_lang` VALUES ('template_delete', 'en', 'Delete'); +INSERT INTO `sys_module_lang` VALUES ('template_demo', '', '妯℃澘绀轰緥'); +INSERT INTO `sys_module_lang` VALUES ('template_demo', 'en', 'Template example'); +INSERT INTO `sys_module_lang` VALUES ('template_fragment', '', '妯℃澘鐗囨'); +INSERT INTO `sys_module_lang` VALUES ('template_fragment', 'en', 'Template fragment'); +INSERT INTO `sys_module_lang` VALUES ('template_help', '', '妯℃澘甯姪'); +INSERT INTO `sys_module_lang` VALUES ('template_help', 'en', 'Template help'); +INSERT INTO `sys_module_lang` VALUES ('template_list', '', '妯℃澘鏂囦欢绠＄悊'); +INSERT INTO `sys_module_lang` VALUES ('template_list', 'en', 'Template management'); +INSERT INTO `sys_module_lang` VALUES ('template_metadata', '', '淇敼鍏冩暟鎹'); +INSERT INTO `sys_module_lang` VALUES ('template_metadata', 'en', 'Edit metadata'); +INSERT INTO `sys_module_lang` VALUES ('template_place', '', '椤甸潰鐗囨'); +INSERT INTO `sys_module_lang` VALUES ('template_place', 'en', 'Page fragment'); +INSERT INTO `sys_module_lang` VALUES ('template_place_form', '', '椤甸潰鐗囨鎶曠ǹ琛ㄥ崟'); +INSERT INTO `sys_module_lang` VALUES ('template_place_form', 'en', 'Page fragment data contribute form'); +INSERT INTO `sys_module_lang` VALUES ('template_upload', '', '涓婁紶妯℃澘'); +INSERT INTO `sys_module_lang` VALUES ('template_upload', 'en', 'Upload template'); +INSERT INTO `sys_module_lang` VALUES ('template_website_file', '', '缃戠珯鏂囦欢'); +INSERT INTO `sys_module_lang` VALUES ('template_website_file', 'en', 'Website file'); +INSERT INTO `sys_module_lang` VALUES ('user_add', '', '澧炲姞/淇敼'); +INSERT INTO `sys_module_lang` VALUES ('user_add', 'en', 'Add/edit'); +INSERT INTO `sys_module_lang` VALUES ('user_disable', '', '绂佺敤'); +INSERT INTO `sys_module_lang` VALUES ('user_disable', 'en', 'Disable'); +INSERT INTO `sys_module_lang` VALUES ('user_enable', '', '鍚敤'); +INSERT INTO `sys_module_lang` VALUES ('user_enable', 'en', 'Enable'); +INSERT INTO `sys_module_lang` VALUES ('user_list', '', '鐢ㄦ埛绠＄悊'); +INSERT INTO `sys_module_lang` VALUES ('user_list', 'en', 'User management'); +INSERT INTO `sys_module_lang` VALUES ('user_menu', '', '鐢ㄦ埛绠＄悊'); +INSERT INTO `sys_module_lang` VALUES ('user_menu', 'en', 'User maintenance'); +INSERT INTO `sys_module_lang` VALUES ('webfile_content', '', '淇敼鏂囦欢'); +INSERT INTO `sys_module_lang` VALUES ('webfile_content', 'en', 'Edit file'); +INSERT INTO `sys_module_lang` VALUES ('webfile_directory', '', '鏂板缓鐩綍'); +INSERT INTO `sys_module_lang` VALUES ('webfile_directory', 'en', 'Create Directory'); +INSERT INTO `sys_module_lang` VALUES ('webfile_list', '', '缃戠珯鏂囦欢绠＄悊'); +INSERT INTO `sys_module_lang` VALUES ('webfile_list', 'en', 'Website file management'); +INSERT INTO `sys_module_lang` VALUES ('webfile_unzip', '', '瑙ｅ帇缂'); +INSERT INTO `sys_module_lang` VALUES ('webfile_unzip', 'en', 'Decompress'); +INSERT INTO `sys_module_lang` VALUES ('webfile_upload', '', '涓婁紶'); +INSERT INTO `sys_module_lang` VALUES ('webfile_upload', 'en', 'Upload'); +INSERT INTO `sys_module_lang` VALUES ('webfile_zip', '', '鍘嬬缉'); +INSERT INTO `sys_module_lang` VALUES ('webfile_zip', 'en', 'Compress'); +INSERT INTO `sys_module_lang` VALUES ('word_list', '', '鎼滅储璇嶇鐞'); +INSERT INTO `sys_module_lang` VALUES ('word_list', 'en', 'Search word management'); + +ALTER TABLE `sys_module` DROP COLUMN `name`, + DROP INDEX `parent_id`, + DROP INDEX `url`, + ADD INDEX `parent_id`(`parent_id`, `menu`); + +INSERT INTO `sys_module` VALUES ('app_add', 'sysApp/add', 'sysApp/save', NULL, 'app_list', 0, 0); +INSERT INTO `sys_module` VALUES ('app_client_disable', NULL, 'sysAppClient/disable', NULL, 'app_client_list', 0, 0); +INSERT INTO `sys_module` VALUES ('app_client_enable', NULL, 'sysAppClient/enable', NULL, 'app_client_list', 0, 0); +INSERT INTO `sys_module` VALUES ('app_client_list', 'sysAppClient/list', NULL, '', 'user_menu', 1, 4); +INSERT INTO `sys_module` VALUES ('app_delete', NULL, 'sysApp/delete', NULL, 'app_list', 0, 0); +INSERT INTO `sys_module` VALUES ('app_list', 'sysApp/list', NULL, '', 'system_menu', 1, 5); +INSERT INTO `sys_module` VALUES ('category', NULL, NULL, '', NULL, 1, 5); +INSERT INTO `sys_module` VALUES ('category_add', 'cmsCategory/add', 'cmsCategory/addMore,cmsTemplate/lookup,cmsCategory/categoryPath,cmsCategory/contentPath,file/doUpload,cmsCategory/save', '', 'category_menu', 0, 0); +INSERT INTO `sys_module` VALUES ('category_delete', NULL, 'cmsCategory/delete', '', 'category_menu', 0, 0); +INSERT INTO `sys_module` VALUES ('category_extend', NULL, NULL, '', 'category', 1, 2); +INSERT INTO `sys_module` VALUES ('category_menu', 'cmsCategory/list', NULL, '', 'category', 1, 1); +INSERT INTO `sys_module` VALUES ('category_move', 'cmsCategory/moveParameters', 'cmsCategory/move,cmsCategory/lookup', '', 'category_menu', 0, 0); +INSERT INTO `sys_module` VALUES ('category_publish', 'cmsCategory/publishParameters', 'cmsCategory/publish', '', 'category_menu', 0, 0); +INSERT INTO `sys_module` VALUES ('category_push', 'cmsCategory/push_page', 'cmsPlace/push,cmsPlace/add,cmsPlace/save', '', 'category_menu', 0, 0); +INSERT INTO `sys_module` VALUES ('category_type_add', 'cmsCategoryType/add', 'cmsCategoryType/save', NULL, 'category_type_list', 0, 0); +INSERT INTO `sys_module` VALUES ('category_type_change', 'cmsCategory/changeTypeParameters', 'cmsCategory/changeType', '', 'category_menu', 0, 0); +INSERT INTO `sys_module` VALUES ('category_type_delete', NULL, 'cmsCategoryType/delete', NULL, 'category_type_list', 0, 0); +INSERT INTO `sys_module` VALUES ('category_type_list', 'cmsCategoryType/list', NULL, '', 'category_extend', 1, 1); +INSERT INTO `sys_module` VALUES ('clearcache', NULL, 'clearCache', '', NULL, 0, 10); +INSERT INTO `sys_module` VALUES ('config_add', 'sysConfig/add', 'sysConfig/save', NULL, 'config_list', 0, 0); +INSERT INTO `sys_module` VALUES ('config_data_delete', NULL, 'sysConfigData/delete', NULL, 'config_data_list', 0, 0); +INSERT INTO `sys_module` VALUES ('config_data_edit', 'sysConfigData/edit', 'sysConfigData/save', NULL, 'config_data_list', 0, 0); +INSERT INTO `sys_module` VALUES ('config_data_list', 'sysConfigData/list', NULL, '', 'system_menu', 1, 1); +INSERT INTO `sys_module` VALUES ('config_delete', NULL, 'sysConfig/delete', NULL, 'config_list', 0, 0); +INSERT INTO `sys_module` VALUES ('config_list', 'sysConfig/list', NULL, '', 'config_menu', 1, 2); +INSERT INTO `sys_module` VALUES ('config_list_data_dictionary', 'cmsDictionary/lookup', NULL, NULL, 'config_list', 0, 0); +INSERT INTO `sys_module` VALUES ('config_menu', NULL, NULL, '', 'develop', 1, 2); +INSERT INTO `sys_module` VALUES ('content', NULL, NULL, '', NULL, 1, 2); +INSERT INTO `sys_module` VALUES ('content_add', 'cmsContent/add', 'cmsContent/addMore,cmsContent/save,ueditor', '', 'content_menu', 1, 0); +INSERT INTO `sys_module` VALUES ('content_check', NULL, 'cmsContent/check', '', 'content_menu', 1, 0); +INSERT INTO `sys_module` VALUES ('content_delete', NULL, 'cmsContent/delete', '', 'content_menu', 1, 0); +INSERT INTO `sys_module` VALUES ('content_extend', NULL, NULL, '', 'content', 1, 1); +INSERT INTO `sys_module` VALUES ('content_menu', 'cmsContent/list', 'sysUser/lookup', '', 'content', 1, 0); +INSERT INTO `sys_module` VALUES ('content_move', 'cmsContent/moveParameters', 'cmsContent/move', '', 'content_menu', 1, 0); +INSERT INTO `sys_module` VALUES ('content_publish', NULL, 'cmsContent/publish', '', 'content_menu', 1, 0); +INSERT INTO `sys_module` VALUES ('content_push', 'cmsContent/push', 'cmsContent/push_content,cmsContent/push_content_list,cmsContent/push_to_content,cmsContent/push_page,cmsContent/push_page_list,cmsPlace/add,cmsPlace/save,cmsContent/related,cmsContent/unrelated,cmsPlace/delete', '', 'content_menu', 1, 0); +INSERT INTO `sys_module` VALUES ('content_recycle_delete', NULL, 'cmsContent/realDelete', NULL, 'content_recycle_list', 0, 0); +INSERT INTO `sys_module` VALUES ('content_recycle_list', 'cmsRecycleContent/list', 'sysUser/lookup', '', 'content_extend', 1, 3); +INSERT INTO `sys_module` VALUES ('content_recycle_recycle', NULL, 'cmsContent/recycle', NULL, 'content_recycle_list', 0, 0); +INSERT INTO `sys_module` VALUES ('content_refresh', NULL, 'cmsContent/refresh', '', 'content_menu', 1, 0); +INSERT INTO `sys_module` VALUES ('content_select_category', 'cmsCategory/lookup', NULL, NULL, 'content_add', 0, 0); +INSERT INTO `sys_module` VALUES ('content_select_category_type', 'cmsCategoryType/lookup', NULL, NULL, 'content_add', 0, 0); +INSERT INTO `sys_module` VALUES ('content_select_content', 'cmsContent/lookup', 'cmsContent/lookup_list', NULL, 'content_add', 0, 0); +INSERT INTO `sys_module` VALUES ('content_select_tag_type', 'cmsTagType/lookup', NULL, NULL, 'content_add', 0, 0); +INSERT INTO `sys_module` VALUES ('content_select_template', 'cmsTemplate/lookup', NULL, NULL, 'content_add', 0, 0); +INSERT INTO `sys_module` VALUES ('content_select_user', 'sysUser/lookup', NULL, NULL, 'content_add', 0, 0); +INSERT INTO `sys_module` VALUES ('content_sort', 'cmsContent/sortParameters', 'cmsContent/sort', '', 'content_menu', 0, 0); +INSERT INTO `sys_module` VALUES ('content_uncheck', NULL, 'cmsContent/uncheck', '', 'content_menu', 0, 0); +INSERT INTO `sys_module` VALUES ('content_view', 'cmsContent/view', NULL, '', 'content_menu', 0, 0); +INSERT INTO `sys_module` VALUES ('dept_add', 'sysDept/add', 'sysDept/lookup,sysUser/lookup,sysDept/save', NULL, 'dept_list', 0, 0); +INSERT INTO `sys_module` VALUES ('dept_delete', NULL, 'sysDept/delete', NULL, 'dept_list', 0, 0); +INSERT INTO `sys_module` VALUES ('dept_list', 'sysDept/list', 'sysDept/lookup,sysUser/lookup', '', 'user_menu', 1, 2); +INSERT INTO `sys_module` VALUES ('dept_user_list', 'sysDept/userList', 'sysDept/addUser,sysDept/saveUser,sysDept/enableUser,sysDept/disableUser', NULL, 'dept_list', 0, 0); +INSERT INTO `sys_module` VALUES ('develop', NULL, NULL, '', NULL, 1, 7); +INSERT INTO `sys_module` VALUES ('dictionary_add', 'cmsDictionary/add', 'cmsDictionary/save', NULL, 'dictionary_list', 0, 0); +INSERT INTO `sys_module` VALUES ('dictionary_delete', NULL, 'cmsDictionary/delete', NULL, 'dictionary_list', 0, 0); +INSERT INTO `sys_module` VALUES ('dictionary_list', 'cmsDictionary/list', NULL, '', 'system_menu', 1, 4); +INSERT INTO `sys_module` VALUES ('domain_config', 'sysDomain/config', 'sysDomain/saveConfig,cmsTemplate/directoryLookup,cmsTemplate/lookup', NULL, 'domain_list', 0, 0); +INSERT INTO `sys_module` VALUES ('domain_list', 'sysDomain/domainList', NULL, '', 'system_menu', 1, 3); +INSERT INTO `sys_module` VALUES ('file_menu', NULL, NULL, '', 'develop', 1, 1); +INSERT INTO `sys_module` VALUES ('log_login', 'log/login', 'sysUser/lookup', '', 'log_menu', 1, 3); +INSERT INTO `sys_module` VALUES ('log_login_delete', NULL, 'logLogin/delete', NULL, 'log_login', 0, 0); +INSERT INTO `sys_module` VALUES ('log_menu', NULL, NULL, '', 'maintenance', 1, 3); +INSERT INTO `sys_module` VALUES ('log_operate', 'log/operate', 'sysUser/lookup', '', 'log_menu', 1, 2); +INSERT INTO `sys_module` VALUES ('log_operate_delete', NULL, 'logOperate/delete', NULL, 'log_operate', 0, 0); +INSERT INTO `sys_module` VALUES ('log_operate_view', 'log/operateView', NULL, NULL, 'log_operate', 0, 0); +INSERT INTO `sys_module` VALUES ('log_task', 'log/task', 'sysUser/lookup', '', 'log_menu', 1, 4); +INSERT INTO `sys_module` VALUES ('log_task_delete', NULL, 'logTask/delete', NULL, 'log_task', 0, 0); +INSERT INTO `sys_module` VALUES ('log_task_view', 'log/taskView', NULL, NULL, 'log_task', 0, 0); +INSERT INTO `sys_module` VALUES ('log_upload', 'log/upload', 'sysUser/lookup', '', 'log_menu', 1, 1); +INSERT INTO `sys_module` VALUES ('maintenance', NULL, NULL, '', NULL, 1, 6); +INSERT INTO `sys_module` VALUES ('model_add', 'cmsModel/add', 'cmsModel/save,cmsTemplate/lookup', NULL, 'model_list', 0, 0); +INSERT INTO `sys_module` VALUES ('model_delete', NULL, 'cmsModel/delete', NULL, 'model_list', 0, 0); +INSERT INTO `sys_module` VALUES ('model_list', 'cmsModel/list', NULL, '', 'config_menu', 1, 1); +INSERT INTO `sys_module` VALUES ('myself', NULL, NULL, '', NULL, 1, 1); +INSERT INTO `sys_module` VALUES ('myself_content', 'myself/contentList', NULL, '', 'myself_menu', 1, 2); +INSERT INTO `sys_module` VALUES ('myself_content_add', 'cmsContent/add', 'cmsContent/addMore,file/doUpload,cmsContent/lookup,cmsContent/lookup_list,cmsContent/save,ueditor,ckeditor/upload', NULL, 'myself_content', 0, 0); +INSERT INTO `sys_module` VALUES ('myself_content_delete', NULL, 'cmsContent/delete', NULL, 'myself_content', 0, 0); +INSERT INTO `sys_module` VALUES ('myself_content_publish', NULL, 'cmsContent/publish', NULL, 'myself_content', 0, 0); +INSERT INTO `sys_module` VALUES ('myself_content_push', 'cmsContent/push', 'cmsContent/push_content,cmsContent/push_content_list,cmsContent/push_to_content,cmsContent/push_page,cmsContent/push_page_list,cmsContent/push_to_place,cmsContent/related', NULL, 'myself_content', 0, 0); +INSERT INTO `sys_module` VALUES ('myself_content_refresh', NULL, 'cmsContent/refresh', NULL, 'myself_content', 0, 0); +INSERT INTO `sys_module` VALUES ('myself_log_login', 'myself/logLogin', NULL, '', 'myself_menu', 1, 4); +INSERT INTO `sys_module` VALUES ('myself_log_operate', 'myself/logOperate', NULL, '', 'myself_menu', 1, 3); +INSERT INTO `sys_module` VALUES ('myself_menu', NULL, NULL, '', 'myself', 1, 0); +INSERT INTO `sys_module` VALUES ('myself_password', 'myself/password', 'changePassword', '', 'myself_menu', 1, 1); +INSERT INTO `sys_module` VALUES ('myself_token', 'myself/userTokenList', NULL, '', 'myself_menu', 1, 5); +INSERT INTO `sys_module` VALUES ('page', NULL, NULL, '', NULL, 1, 3); +INSERT INTO `sys_module` VALUES ('page_list', 'cmsPage/list', 'cmsPage/metadata,sysUser/lookup,cmsContent/lookup,cmsContent/lookup_list,cmsCategory/lookup', '', 'page_menu', 1, 1); +INSERT INTO `sys_module` VALUES ('page_menu', NULL, NULL, '', 'page', 1, 0); +INSERT INTO `sys_module` VALUES ('page_metadata', 'cmsPage/metadata', 'cmsPage/save', NULL, 'page_list', 0, 0); +INSERT INTO `sys_module` VALUES ('page_publish', NULL, 'cmsTemplate/publish', NULL, 'page_list', 0, 0); +INSERT INTO `sys_module` VALUES ('page_save', NULL, 'cmsPage/save,file/doUpload,cmsPage/clearCache', NULL, 'page_list', 0, 0); +INSERT INTO `sys_module` VALUES ('page_select_category', 'cmsCategory/lookup', NULL, NULL, 'page_list', 0, 0); +INSERT INTO `sys_module` VALUES ('page_select_category_type', 'cmsCategoryType/lookup', NULL, NULL, 'page_list', 0, 0); +INSERT INTO `sys_module` VALUES ('page_select_content', 'cmsContent/lookup', 'cmsContent/lookup_list', NULL, 'page_list', 0, 0); +INSERT INTO `sys_module` VALUES ('page_select_tag_type', 'cmsTagType/lookup', NULL, NULL, 'page_list', 0, 0); +INSERT INTO `sys_module` VALUES ('page_select_template', 'cmsTemplate/lookup', NULL, NULL, 'page_list', 0, 0); +INSERT INTO `sys_module` VALUES ('page_select_user', 'sysUser/lookup', NULL, NULL, 'page_list', 0, 0); +INSERT INTO `sys_module` VALUES ('place_add', 'cmsPlace/add', 'cmsContent/lookup,cmsPlace/lookup,cmsPlace/lookup_content_list,file/doUpload,cmsPlace/save', NULL, 'place_list', 0, 0); +INSERT INTO `sys_module` VALUES ('place_check', NULL, 'cmsPlace/check', NULL, 'place_list', 0, 0); +INSERT INTO `sys_module` VALUES ('place_clear', NULL, 'cmsPlace/clear', NULL, 'place_list', 0, 0); +INSERT INTO `sys_module` VALUES ('place_data_list', 'cmsPlace/dataList', NULL, NULL, 'place_list', 0, 1); +INSERT INTO `sys_module` VALUES ('place_delete', NULL, 'cmsPlace/delete', NULL, 'place_list', 0, 0); +INSERT INTO `sys_module` VALUES ('place_list', 'cmsPlace/list', 'sysUser/lookup,cmsPlace/data_list', '', 'page_menu', 1, 1); +INSERT INTO `sys_module` VALUES ('place_publish', 'cmsPlace/publish_place', 'cmsTemplate/publishPlace', NULL, 'place_list', 0, 0); +INSERT INTO `sys_module` VALUES ('place_refresh', NULL, 'cmsPlace/refresh', NULL, 'place_list', 0, 0); +INSERT INTO `sys_module` VALUES ('place_template_content', 'placeTemplate/content', 'cmsTemplate/help,cmsTemplate/chipLookup,cmsWebFile/lookup,cmsWebFile/contentForm,placeTemplate/form', NULL, 'place_template_list', 0, 0); +INSERT INTO `sys_module` VALUES ('place_template_data_dictionary', 'cmsDictionary/lookup', NULL, NULL, 'place_template_list', 0, 0); +INSERT INTO `sys_module` VALUES ('place_template_fragment', 'cmsTemplate/ftlLookup', NULL, NULL, 'place_template_list', 0, 0); +INSERT INTO `sys_module` VALUES ('place_template_help', 'cmsTemplate/help', NULL, NULL, 'place_template_list', 0, 0); +INSERT INTO `sys_module` VALUES ('place_template_list', 'placeTemplate/list', NULL, '', 'file_menu', 1, 2); +INSERT INTO `sys_module` VALUES ('place_template_metadata', 'placeTemplate/metadata', 'cmsTemplate/savePlaceMetaData', NULL, 'place_template_list', 0, 0); +INSERT INTO `sys_module` VALUES ('place_template_place', 'placeTemplate/lookup', NULL, NULL, 'place_template_list', 0, 0); +INSERT INTO `sys_module` VALUES ('place_template_webfile', 'cmsWebFile/lookup', NULL, NULL, 'place_template_list', 0, 0); +INSERT INTO `sys_module` VALUES ('place_view', 'cmsPlace/view', NULL, NULL, 'place_list', 0, 0); +INSERT INTO `sys_module` VALUES ('report_user', 'report/user', NULL, '', 'user_menu', 1, 5); +INSERT INTO `sys_module` VALUES ('role_add', 'sysRole/add', 'sysRole/save', NULL, 'role_list', 0, 0); +INSERT INTO `sys_module` VALUES ('role_delete', NULL, 'sysRole/delete', NULL, 'role_list', 0, 0); +INSERT INTO `sys_module` VALUES ('role_list', 'sysRole/list', NULL, '', 'user_menu', 1, 3); +INSERT INTO `sys_module` VALUES ('system_menu', NULL, NULL, '', 'maintenance', 1, 2); +INSERT INTO `sys_module` VALUES ('tag_add', 'cmsTag/add', 'cmsTagType/lookup,cmsTag/save', NULL, 'tag_list', 0, 0); +INSERT INTO `sys_module` VALUES ('tag_delete', NULL, 'cmsTag/delete', NULL, 'tag_list', 0, 0); +INSERT INTO `sys_module` VALUES ('tag_list', 'cmsTag/list', 'cmsTagType/lookup', '', 'content_extend', 1, 1); +INSERT INTO `sys_module` VALUES ('tag_type_delete', NULL, 'cmsTagType/delete', NULL, 'tag_type_list', 0, 0); +INSERT INTO `sys_module` VALUES ('tag_type_list', 'cmsTagType/list', NULL, '', 'category_extend', 1, 2); +INSERT INTO `sys_module` VALUES ('tag_type_save', 'cmsTagType/add', 'cmsTagType/save', NULL, 'tag_type_list', 0, 0); +INSERT INTO `sys_module` VALUES ('task_add', 'sysTask/add', 'sysTask/save,sysTask/example,taskTemplate/lookup', NULL, 'task_list', 0, 0); +INSERT INTO `sys_module` VALUES ('task_delete', NULL, 'sysTask/delete', NULL, 'task_list', 0, 0); +INSERT INTO `sys_module` VALUES ('task_list', 'sysTask/list', NULL, '', 'system_menu', 1, 2); +INSERT INTO `sys_module` VALUES ('task_pause', NULL, 'sysTask/pause', NULL, 'task_list', 0, 0); +INSERT INTO `sys_module` VALUES ('task_recreate', NULL, 'sysTask/recreate', NULL, 'task_list', 0, 0); +INSERT INTO `sys_module` VALUES ('task_resume', NULL, 'sysTask/resume', NULL, 'task_list', 0, 0); +INSERT INTO `sys_module` VALUES ('task_runonce', NULL, 'sysTask/runOnce', NULL, 'task_list', 0, 0); +INSERT INTO `sys_module` VALUES ('task_template_content', 'taskTemplate/content', 'taskTemplate/save,taskTemplate/chipLookup,cmsTemplate/help,placeTemplate/form,cmsWebFile/contentForm', NULL, 'task_template_list', 0, 0); +INSERT INTO `sys_module` VALUES ('task_template_delete', NULL, 'taskTemplate/delete', NULL, 'task_template_list', 0, 0); +INSERT INTO `sys_module` VALUES ('task_template_fragment', 'taskTemplate/chipLookup', NULL, NULL, 'task_template_list', 0, 0); +INSERT INTO `sys_module` VALUES ('task_template_help', 'cmsTemplate/help', NULL, NULL, 'task_template_list', 0, 0); +INSERT INTO `sys_module` VALUES ('task_template_list', 'taskTemplate/list', NULL, '', 'file_menu', 1, 3); +INSERT INTO `sys_module` VALUES ('template_content', 'cmsTemplate/content', 'cmsTemplate/save,cmsTemplate/chipLookup,cmsWebFile/lookup,placeTemplate/form,cmsWebFile/contentForm,cmsTemplate/demo,cmsTemplate/help,cmsTemplate/upload,cmsTemplate/doUpload', NULL, 'template_list', 0, 0); +INSERT INTO `sys_module` VALUES ('template_content-type', 'cmsTemplate/contentTypeLookup', NULL, NULL, 'template_list', 0, 0); +INSERT INTO `sys_module` VALUES ('template_content_form', 'cmsTemplate/contentForm', NULL, NULL, 'template_list', 0, 0); +INSERT INTO `sys_module` VALUES ('template_data_dictionary', 'cmsDictionary/lookup', NULL, NULL, 'template_list', 0, 0); +INSERT INTO `sys_module` VALUES ('template_delete', NULL, 'cmsTemplate/delete', NULL, 'template_list', 0, 0); +INSERT INTO `sys_module` VALUES ('template_demo', 'cmsTemplate/demo', NULL, NULL, 'template_list', 0, 0); +INSERT INTO `sys_module` VALUES ('template_fragment', 'cmsTemplate/ftlLookup', NULL, NULL, 'template_list', 0, 0); +INSERT INTO `sys_module` VALUES ('template_help', 'cmsTemplate/help', NULL, NULL, 'template_list', 0, 0); +INSERT INTO `sys_module` VALUES ('template_list', 'cmsTemplate/list', 'cmsTemplate/directory', '', 'file_menu', 1, 1); +INSERT INTO `sys_module` VALUES ('template_metadata', 'cmsTemplate/metadata', 'cmsTemplate/saveMetadata', NULL, 'template_list', 0, 0); +INSERT INTO `sys_module` VALUES ('template_place', 'placeTemplate/lookup', NULL, NULL, 'template_list', 0, 0); +INSERT INTO `sys_module` VALUES ('template_place_form', 'placeTemplate/form', NULL, NULL, 'template_list', 0, 0); +INSERT INTO `sys_module` VALUES ('template_upload', 'cmsTemplate/upload', 'cmsTemplate/doUpload', NULL, 'template_list', 0, 0); +INSERT INTO `sys_module` VALUES ('template_website_file', 'cmsWebFile/lookup', NULL, NULL, 'template_list', 0, 0); +INSERT INTO `sys_module` VALUES ('user_add', 'sysUser/add', 'sysDept/lookup,sysUser/save', NULL, 'user_list', 0, 0); +INSERT INTO `sys_module` VALUES ('user_disable', NULL, 'sysUser/disable', NULL, 'user_list', 0, 0); +INSERT INTO `sys_module` VALUES ('user_enable', NULL, 'sysUser/enable', NULL, 'user_list', 0, 0); +INSERT INTO `sys_module` VALUES ('user_list', 'sysUser/list', NULL, '', 'user_menu', 1, 1); +INSERT INTO `sys_module` VALUES ('user_menu', NULL, NULL, '', 'maintenance', 1, 1); +INSERT INTO `sys_module` VALUES ('webfile_content', 'cmsWebFile/content', 'cmsWebFile/save', NULL, 'webfile_list', 0, 0); +INSERT INTO `sys_module` VALUES ('webfile_directory', 'cmsWebFile/directory', 'cmsWebFile/createDirectory', NULL, 'webfile_list', 0, 0); +INSERT INTO `sys_module` VALUES ('webfile_list', 'cmsWebFile/list', NULL, '', 'file_menu', 1, 4); +INSERT INTO `sys_module` VALUES ('webfile_unzip', NULL, 'cmsWebFile/unzip,cmsWebFile/unzipHere', NULL, 'webfile_list', 0, 0); +INSERT INTO `sys_module` VALUES ('webfile_upload', 'cmsWebFile/upload', 'cmsWebFile/doUpload', NULL, 'webfile_list', 0, 0); +INSERT INTO `sys_module` VALUES ('webfile_zip', NULL, 'cmsWebFile/zip', NULL, 'webfile_list', 0, 0); +INSERT INTO `sys_module` VALUES ('word_list', 'cmsWord/list', NULL, '', 'content_extend', 1, 2); + +-- 20180609 -- +ALTER TABLE `log_upload` + CHANGE COLUMN `image` `file_type` varchar(20) NOT NULL COMMENT '鏂囦欢绫诲瀷' AFTER `channel`, + ADD COLUMN `original_name` varchar(255) NULL COMMENT '鍘熸枃浠跺悕' AFTER `channel`, + DROP INDEX `image`, + ADD INDEX `file_type`(`file_type`); +UPDATE `log_upload` SET file_type = 'image' WHERE file_type = '1'; +UPDATE `log_upload` SET file_type = 'image' WHERE file_path like '%.png' or file_path like '%.jpg' or file_path like '%.gif' or file_path like '%.bmp'; +UPDATE `log_upload` SET file_type = 'video' WHERE file_path like '%.mp4' or file_path like '%.3gp'; +UPDATE `log_upload` SET file_type = 'other' WHERE file_type = '0'; +-- 20180612 -- +DROP TABLE IF EXISTS `cms_lottery`; +DROP TABLE IF EXISTS `cms_lottery_user`; +DROP TABLE IF EXISTS `cms_vote`; +DROP TABLE IF EXISTS `cms_vote_item`; +DROP TABLE IF EXISTS `cms_vote_user`; +-- 20180622 -- +ALTER TABLE `cms_dictionary` + ADD COLUMN `site_id` smallint(6) NOT NULL DEFAULT 1 COMMENT '绔欑偣ID' AFTER `id`, + DROP INDEX `multiple`, + ADD INDEX `site_id`(`site_id`, `multiple`); +-- 20180706 -- +ALTER TABLE `sys_extend_field` MODIFY COLUMN `dictionary_id` bigint(20) NULL DEFAULT NULL COMMENT '鏁版嵁瀛楀吀ID' AFTER `default_value`; +ALTER TABLE `sys_extend_field` DROP COLUMN `dictionary_type`; +-- 20180711 -- +ALTER TABLE `sys_site` + ADD COLUMN `parent_id` smallint(6) DEFAULT NULL COMMENT '鐖剁珯鐐笽D' AFTER `id`, + MODIFY COLUMN `name` varchar(50) NOT NULL COMMENT '绔欑偣鍚' AFTER `parent_id`; +-- 20180714 -- +UPDATE `sys_module` SET `authorized_url` = 'cmsContent/addMore,file/doUpload,cmsContent/lookup,cmsContent/lookup_list,cmsContent/save,ueditor,ckeditor/upload,kindeditor/upload' WHERE `id` ='content_add'; +UPDATE `sys_module` SET `authorized_url` = 'cmsContent/addMore,file/doUpload,cmsContent/lookup,cmsContent/lookup_list,cmsContent/save,ueditor,ckeditor/upload,kindeditor/upload' WHERE `id` ='myself_content_add'; +UPDATE `sys_module` SET `authorized_url` = 'sysConfigData/save,sysConfigData/edit',url = NULL WHERE `id` ='config_data_edit'; +-- 20180811 -- +ALTER TABLE `sys_dept` ADD COLUMN `owns_all_config` tinyint(1) NOT NULL DEFAULT 1 COMMENT '鎷ユ湁鍏ㄩ儴閰嶇疆鏉冮檺' AFTER `owns_all_page`; +CREATE TABLE `sys_dept_config` ( + `dept_id` int(11) NOT NULL COMMENT '閮ㄩ棬ID', + `config` varchar(100) NOT NULL COMMENT '閰嶇疆', + PRIMARY KEY (`dept_id`,`config`) +) COMMENT='閮ㄩ棬閰嶇疆'; +ALTER TABLE `sys_user` ADD COLUMN `owns_all_content` tinyint(1) NOT NULL DEFAULT 1 COMMENT '鎷ユ湁鎵鏈夊唴瀹规潈闄' AFTER `dept_id`; +UPDATE `sys_user` SET `owns_all_content` = '0' WHERE `superuser_access` = '0'; +-- 20180813 -- +UPDATE `sys_module` SET `authorized_url` = 'cmsWebFile/unzip',url = 'cmsWebFile/unzipParameters' WHERE `id` ='webfile_unzip'; +-- 20180820 -- +UPDATE `sys_module` SET `authorized_url` = 'cmsPlace/check,cmsPlace/uncheck' WHERE `id` ='place_check'; +-- 20180821 -- +UPDATE `sys_module` SET `authorized_url` = 'cmsTemplate/help,cmsTemplate/savePlace,cmsTemplate/chipLookup,cmsWebFile/lookup,cmsWebFile/contentForm,placeTemplate/form' WHERE `id` ='place_template_content'; +DELETE FROM `sys_email_token`; +ALTER TABLE `sys_email_token` ADD COLUMN `expiry_date` datetime(0) NOT NULL COMMENT '杩囨湡鏃ユ湡' AFTER `create_date`; +ALTER TABLE `sys_user_token` ADD COLUMN `expiry_date` datetime(0) DEFAULT NULL COMMENT '杩囨湡鏃ユ湡' AFTER `create_date`; +ALTER TABLE `sys_app_token` ADD COLUMN `expiry_date` datetime(0) DEFAULT NULL COMMENT '杩囨湡鏃ユ湡' AFTER `create_date`; +ALTER TABLE `sys_app` ADD COLUMN `expiry_minutes` int(0) NULL COMMENT '杩囨湡鏃堕棿' AFTER `authorized_apis`; +UPDATE `sys_user_token` SET `expiry_date` = date_add(`create_date`, interval 30 day); +UPDATE `sys_app_token` SET `expiry_date` = date_add(`create_date`, interval 30 minute); +UPDATE `sys_app` SET `expiry_minutes` = '30'; +INSERT INTO `sys_module` VALUES ('app_issue', 'sysApp/issueParameters', 'sysAppToken/issue', NULL, 'app_list', 0, 0); +INSERT INTO `sys_module_lang` VALUES ('app_issue', '', '棰佸彂鎺堟潈'); +INSERT INTO `sys_module_lang` VALUES ('app_issue', 'en', 'Issue authorization'); +UPDATE `sys_module` SET `attached` = '' WHERE `id` ='myself'; +UPDATE `sys_module` SET `attached` = '' WHERE `id` ='content'; +UPDATE `sys_module` SET `attached` = '' WHERE `id` ='category'; +UPDATE `sys_module` SET `attached` = '' WHERE `id` ='develop'; +UPDATE `sys_module` SET `attached` = '' WHERE `id` ='page'; +UPDATE `sys_module_lang` SET `value` = 'Add' WHERE `lang` ='en' and module_id = 'myself_content_add'; +UPDATE `sys_module_lang` SET `value` = 'Delete' WHERE `lang` ='en' and module_id = 'myself_content_delete'; +UPDATE `sys_module_lang` SET `value` = 'Publish' WHERE `lang` ='en' and module_id = 'myself_content_publish'; +UPDATE `sys_module_lang` SET `value` = 'Push' WHERE `lang` ='en' and module_id = 'myself_content_push'; +UPDATE `sys_module_lang` SET `value` = 'Refresh' WHERE `lang` ='en' and module_id = 'myself_content_refresh'; +-- 20181022 -- +UPDATE `sys_module_lang` SET `lang` = 'zh' WHERE `lang` =''; +INSERT INTO `sys_module_lang` VALUES ('app_add', 'ja', '杩藉姞/澶夋洿'); +INSERT INTO `sys_module_lang` VALUES ('app_client_disable', 'ja', '绂佹'); +INSERT INTO `sys_module_lang` VALUES ('app_client_enable', 'ja', '銈兂'); +INSERT INTO `sys_module_lang` VALUES ('app_client_list', 'ja', '銈儵銈ゃ偄銉炽儓绠＄悊'); +INSERT INTO `sys_module_lang` VALUES ('app_issue', 'ja', '鐧鸿妯╅檺'); +INSERT INTO `sys_module_lang` VALUES ('app_delete', 'ja', '鍓婇櫎'); +INSERT INTO `sys_module_lang` VALUES ('app_list', 'ja', 'app妯╅檺'); +INSERT INTO `sys_module_lang` VALUES ('category', 'ja', '鍒嗛'); +INSERT INTO `sys_module_lang` VALUES ('category_add', 'ja', '杩藉姞/澶夋洿'); +INSERT INTO `sys_module_lang` VALUES ('category_delete', 'ja', '鍓婇櫎'); +INSERT INTO `sys_module_lang` VALUES ('category_extend', 'ja', '鍒嗛鎷″嫉'); +INSERT INTO `sys_module_lang` VALUES ('category_menu', 'ja', '鍒嗛绠＄悊'); +INSERT INTO `sys_module_lang` VALUES ('category_move', 'ja', '绉诲嫊'); +INSERT INTO `sys_module_lang` VALUES ('category_publish', 'ja', '鐢熸垚'); +INSERT INTO `sys_module_lang` VALUES ('category_push', 'ja', '銇娿仚銇欍倎'); +INSERT INTO `sys_module_lang` VALUES ('category_type_add', 'ja', '杩藉姞/澶夋洿'); +INSERT INTO `sys_module_lang` VALUES ('category_type_change', 'ja', '銈裤偆銉楀鏇'); +INSERT INTO `sys_module_lang` VALUES ('category_type_delete', 'ja', '鍓婇櫎'); +INSERT INTO `sys_module_lang` VALUES ('category_type_list', 'ja', '鍒嗛銈裤偆銉'); +INSERT INTO `sys_module_lang` VALUES ('clearcache', 'ja', '銈儯銉冦偡銉ャ倰銉儠銉儍銈枫儱銇欍倠'); +INSERT INTO `sys_module_lang` VALUES ('config_add', 'ja', '杩藉姞/澶夋洿'); +INSERT INTO `sys_module_lang` VALUES ('config_data_delete', 'ja', '銉囥兗銈裤倰銈儶銈'); +INSERT INTO `sys_module_lang` VALUES ('config_data_edit', 'ja', '澶夋洿'); +INSERT INTO `sys_module_lang` VALUES ('config_data_list', 'ja', '銈点偆銉堣ō瀹'); +INSERT INTO `sys_module_lang` VALUES ('config_delete', 'ja', '瑷畾銈掑墛闄'); +INSERT INTO `sys_module_lang` VALUES ('config_list', 'ja', '銈点偆銉堣ō瀹氱鐞'); +INSERT INTO `sys_module_lang` VALUES ('config_list_data_dictionary', 'ja', '銉囥兗銈胯緸鏇搞倰閬告姙'); +INSERT INTO `sys_module_lang` VALUES ('config_menu', 'ja', '瑷畾绠＄悊'); +INSERT INTO `sys_module_lang` VALUES ('content', 'ja', '銈炽兂銉嗐兂銉'); +INSERT INTO `sys_module_lang` VALUES ('content_add', 'ja', '杩藉姞/澶夋洿'); +INSERT INTO `sys_module_lang` VALUES ('content_check', 'ja', '瀵╂熁'); +INSERT INTO `sys_module_lang` VALUES ('content_delete', 'ja', '鍓婇櫎'); +INSERT INTO `sys_module_lang` VALUES ('content_extend', 'ja', '銈炽兂銉嗐兂銉勬嫛寮'); +INSERT INTO `sys_module_lang` VALUES ('content_menu', 'ja', '銈炽兂銉嗐兂銉勭鐞'); +INSERT INTO `sys_module_lang` VALUES ('content_move', 'ja', '绉诲嫊'); +INSERT INTO `sys_module_lang` VALUES ('content_publish', 'ja', '鐢熸垚'); +INSERT INTO `sys_module_lang` VALUES ('content_push', 'ja', '銇娿仚銇欍倎'); +INSERT INTO `sys_module_lang` VALUES ('content_recycle_delete', 'ja', '鍓婇櫎'); +INSERT INTO `sys_module_lang` VALUES ('content_recycle_list', 'ja', '銈炽兂銉嗐兂銉勩仈銇跨'); +INSERT INTO `sys_module_lang` VALUES ('content_recycle_recycle', 'ja', '鍙栥倞鎴汇仐'); +INSERT INTO `sys_module_lang` VALUES ('content_refresh', 'ja', '銉儠銉儍銈枫儱'); +INSERT INTO `sys_module_lang` VALUES ('content_select_category', 'ja', '鍒嗛銈掗伕鎶'); +INSERT INTO `sys_module_lang` VALUES ('content_select_category_type', 'ja', '鍒嗛銈裤偆銉椼倰閬告姙'); +INSERT INTO `sys_module_lang` VALUES ('content_select_content', 'ja', '銈炽兂銉嗐兂銉勩倰閬告姙'); +INSERT INTO `sys_module_lang` VALUES ('content_select_tag_type', 'ja', '銈裤偘銇ó椤炪倰閬告姙'); +INSERT INTO `sys_module_lang` VALUES ('content_select_template', 'ja', '銉嗐兂銉椼儸銉笺儓銈掗伕鎶'); +INSERT INTO `sys_module_lang` VALUES ('content_select_user', 'ja', '銉︺兗銈躲兗銈掗伕鎶'); +INSERT INTO `sys_module_lang` VALUES ('content_sort', 'ja', '銉堛儍銉斻兂銈'); +INSERT INTO `sys_module_lang` VALUES ('content_uncheck', 'ja', '瀵╂熁銈掑彇銈婃秷銇'); +INSERT INTO `sys_module_lang` VALUES ('content_view', 'ja', '瑕嬨倠'); +INSERT INTO `sys_module_lang` VALUES ('dept_add', 'ja', '杩藉姞/澶夋洿'); +INSERT INTO `sys_module_lang` VALUES ('dept_delete', 'ja', '鍓婇櫎'); +INSERT INTO `sys_module_lang` VALUES ('dept_list', 'ja', '閮ㄩ杸绠＄悊'); +INSERT INTO `sys_module_lang` VALUES ('dept_user_list', 'ja', '浜轰簨绠＄悊'); +INSERT INTO `sys_module_lang` VALUES ('develop', 'ja', '闁嬬櫤'); +INSERT INTO `sys_module_lang` VALUES ('dictionary_add', 'ja', '杩藉姞/澶夋洿'); +INSERT INTO `sys_module_lang` VALUES ('dictionary_delete', 'ja', '鍓婇櫎'); +INSERT INTO `sys_module_lang` VALUES ('dictionary_list', 'ja', '銉囥兗銈胯緸鏇'); +INSERT INTO `sys_module_lang` VALUES ('domain_config', 'ja', '澶夋洿'); +INSERT INTO `sys_module_lang` VALUES ('domain_list', 'ja', '銉夈儭銈ゃ兂鍚嶃倰銉愩偆銉炽儔'); +INSERT INTO `sys_module_lang` VALUES ('file_menu', 'ja', '銉曘偂銈ゃ儷绠＄悊'); +INSERT INTO `sys_module_lang` VALUES ('log_login', 'ja', '銉偘銈ゃ兂銉偘'); +INSERT INTO `sys_module_lang` VALUES ('log_login_delete', 'ja', '鍓婇櫎'); +INSERT INTO `sys_module_lang` VALUES ('log_menu', 'ja', '銉偘绠＄悊'); +INSERT INTO `sys_module_lang` VALUES ('log_operate', 'ja', '鎿嶄綔銉偘'); +INSERT INTO `sys_module_lang` VALUES ('log_operate_delete', 'ja', '鍓婇櫎'); +INSERT INTO `sys_module_lang` VALUES ('log_operate_view', 'ja', '瑕嬨倠'); +INSERT INTO `sys_module_lang` VALUES ('log_task', 'ja', '銈裤偣銈▓鐢汇儹銈'); +INSERT INTO `sys_module_lang` VALUES ('log_task_delete', 'ja', '鍓婇櫎'); +INSERT INTO `sys_module_lang` VALUES ('log_task_view', 'ja', '瑕嬨倠'); +INSERT INTO `sys_module_lang` VALUES ('log_upload', 'ja', '銉曘偂銈ゃ儷銈€儍銉椼儹銉笺儔銉偘'); +INSERT INTO `sys_module_lang` VALUES ('maintenance', 'ja', '缍寔'); +INSERT INTO `sys_module_lang` VALUES ('model_add', 'ja', '杩藉姞/澶夋洿'); +INSERT INTO `sys_module_lang` VALUES ('model_delete', 'ja', '鍓婇櫎'); +INSERT INTO `sys_module_lang` VALUES ('model_list', 'ja', '銈炽兂銉嗐兂銉勩儮銉囥儷绠＄悊'); +INSERT INTO `sys_module_lang` VALUES ('myself', 'ja', '鍊嬩汉'); +INSERT INTO `sys_module_lang` VALUES ('myself_content', 'ja', '銉炪偆銈炽兂銉嗐兂銉'); +INSERT INTO `sys_module_lang` VALUES ('myself_content_add', 'ja', '澶夋洿'); +INSERT INTO `sys_module_lang` VALUES ('myself_content_delete', 'ja', '鍓婇櫎'); +INSERT INTO `sys_module_lang` VALUES ('myself_content_publish', 'ja', '鐢熸垚'); +INSERT INTO `sys_module_lang` VALUES ('myself_content_push', 'ja', '銇娿仚銇欍倎'); +INSERT INTO `sys_module_lang` VALUES ('myself_content_refresh', 'ja', '銉儠銉儍銈枫儱'); +INSERT INTO `sys_module_lang` VALUES ('myself_log_login', 'ja', '銉炪偆銉偘銈ゃ兂銉偘'); +INSERT INTO `sys_module_lang` VALUES ('myself_log_operate', 'ja', '銉炪偆鎿嶄綔銉偘'); +INSERT INTO `sys_module_lang` VALUES ('myself_menu', 'ja', '绉併伀闁㈤ｃ仚銈嬫儏鍫'); +INSERT INTO `sys_module_lang` VALUES ('myself_password', 'ja', '銉戙偣銉兗銉夈倰澶夋洿'); +INSERT INTO `sys_module_lang` VALUES ('myself_token', 'ja', '绉併伄銉偘銈ゃ兂鎺堟ī'); +INSERT INTO `sys_module_lang` VALUES ('page', 'ja', '銉氥兗銈'); +INSERT INTO `sys_module_lang` VALUES ('page_list', 'ja', '銉氥兗銈哥鐞'); +INSERT INTO `sys_module_lang` VALUES ('page_menu', 'ja', '銉氥兗銈搞伄銉°兂銉嗐儕銉炽偣'); +INSERT INTO `sys_module_lang` VALUES ('page_metadata', 'ja', '銉°偪銉囥兗銈跨鐞'); +INSERT INTO `sys_module_lang` VALUES ('page_publish', 'ja', '銉氥兗銈搞倰鐢熸垚銇欍倠'); +INSERT INTO `sys_module_lang` VALUES ('page_save', 'ja', '銉氥兗銈歌ō瀹氥倰淇濆瓨'); +INSERT INTO `sys_module_lang` VALUES ('page_select_category', 'ja', '鍒嗛銈掗伕鎶'); +INSERT INTO `sys_module_lang` VALUES ('page_select_category_type', 'ja', '鍒嗛銈裤偆銉椼倰閬告姙'); +INSERT INTO `sys_module_lang` VALUES ('page_select_content', 'ja', '銈炽兂銉嗐兂銉勩倰閬告姙'); +INSERT INTO `sys_module_lang` VALUES ('page_select_tag_type', 'ja', '銈裤偘銇ó椤炪倰閬告姙'); +INSERT INTO `sys_module_lang` VALUES ('page_select_template', 'ja', '閫夋嫨妯℃澘銉嗐兂銉椼儸銉笺儓銈掗伕鎶'); +INSERT INTO `sys_module_lang` VALUES ('page_select_user', 'ja', '銉︺兗銈躲兗銈掗伕鎶'); +INSERT INTO `sys_module_lang` VALUES ('place_add', 'ja', '鎺ㄥエ銉撱儍銉堛儑銉笺偪銇拷鍔/澶夋洿'); +INSERT INTO `sys_module_lang` VALUES ('place_check', 'ja', '鎺ㄥエ銉撱儍銉堛儑銉笺偪銈掔⒑瑾嶃仚銈'); +INSERT INTO `sys_module_lang` VALUES ('place_clear', 'ja', '鎺ㄥエ銉撱儍銉堛儑銉笺偪銇偗銉偄'); +INSERT INTO `sys_module_lang` VALUES ('place_data_list', 'ja', '鎺ㄥエ銉撱儍銉堛儑銉笺偪'); +INSERT INTO `sys_module_lang` VALUES ('place_delete', 'ja', '鎺ㄥエ銉撱儍銉堛儑銉笺偪銈掑墛闄ゃ仚銈'); +INSERT INTO `sys_module_lang` VALUES ('place_list', 'ja', '銉氥兗銈搞儠銉┿偘銉°兂銉堢鐞'); +INSERT INTO `sys_module_lang` VALUES ('place_publish', 'ja', '銉儶銉笺偣'); +INSERT INTO `sys_module_lang` VALUES ('place_refresh', 'ja', '鍒锋柊鎺ㄨ崘浣嶆暟鎹帹濂ㄣ儞銉冦儓銉囥兗銈裤倰銉儠銉儍銈枫儱銇欍倠'); +INSERT INTO `sys_module_lang` VALUES ('place_template_content', 'ja', '澶夋洿'); +INSERT INTO `sys_module_lang` VALUES ('place_template_data_dictionary', 'ja', '銉囥兗銈胯緸鏇搞倰閬告姙'); +INSERT INTO `sys_module_lang` VALUES ('place_template_fragment', 'ja', '銉嗐兂銉椼儸銉笺儓銉曘儵銈般儭銉炽儓'); +INSERT INTO `sys_module_lang` VALUES ('place_template_help', 'ja', '銉嗐兂銉椼儸銉笺儓銇儤銉儣'); +INSERT INTO `sys_module_lang` VALUES ('place_template_list', 'ja', '銉氥兗銈搞儠銉┿偘銉°兂銉堛儐銉炽儣銉兗銉'); +INSERT INTO `sys_module_lang` VALUES ('place_template_metadata', 'ja', '銉°偪銉囥兗銈裤伄澶夋洿'); +INSERT INTO `sys_module_lang` VALUES ('place_template_place', 'ja', '銉氥兗銈搞儠銉┿偘銉°兂銉'); +INSERT INTO `sys_module_lang` VALUES ('place_template_webfile', 'ja', '銈︺偋銉栥偟銈ゃ儓銉曘偂銈ゃ儷'); +INSERT INTO `sys_module_lang` VALUES ('place_view', 'ja', '鎺ㄥエ銉撱儍銉堛儑銉笺偪銈掕銈'); +INSERT INTO `sys_module_lang` VALUES ('report_user', 'ja', '銉︺兗銈躲兗銉囥兗銈裤伄鐩ｈ'); +INSERT INTO `sys_module_lang` VALUES ('role_add', 'ja', '杩藉姞/澶夋洿'); +INSERT INTO `sys_module_lang` VALUES ('role_delete', 'ja', '鍓婇櫎'); +INSERT INTO `sys_module_lang` VALUES ('role_list', 'ja', '褰瑰壊绠＄悊'); +INSERT INTO `sys_module_lang` VALUES ('system_menu', 'ja', '銈枫偣銉嗐儬銉°兂銉嗐儕銉炽偣'); +INSERT INTO `sys_module_lang` VALUES ('tag_add', 'ja', '杩藉姞/澶夋洿'); +INSERT INTO `sys_module_lang` VALUES ('tag_delete', 'ja', '鍓婇櫎'); +INSERT INTO `sys_module_lang` VALUES ('tag_list', 'ja', '銉┿儥銉鐞'); +INSERT INTO `sys_module_lang` VALUES ('tag_type_delete', 'ja', '鍓婇櫎'); +INSERT INTO `sys_module_lang` VALUES ('tag_type_list', 'ja', '銈裤偘銇垎椤'); +INSERT INTO `sys_module_lang` VALUES ('tag_type_save', 'ja', '杩藉姞/澶夋洿'); +INSERT INTO `sys_module_lang` VALUES ('task_add', 'ja', '杩藉姞/澶夋洿'); +INSERT INTO `sys_module_lang` VALUES ('task_delete', 'ja', '鍓婇櫎'); +INSERT INTO `sys_module_lang` VALUES ('task_list', 'ja', '銈裤偣銈▓鐢'); +INSERT INTO `sys_module_lang` VALUES ('task_pause', 'ja', '鍋滄'); +INSERT INTO `sys_module_lang` VALUES ('task_recreate', 'ja', '銉偦銉冦儓'); +INSERT INTO `sys_module_lang` VALUES ('task_resume', 'ja', '鍥炲京'); +INSERT INTO `sys_module_lang` VALUES ('task_runonce', 'ja', '瀹熻'); +INSERT INTO `sys_module_lang` VALUES ('task_template_content', 'ja', '澶夋洿'); +INSERT INTO `sys_module_lang` VALUES ('task_template_delete', 'ja', '鍓婇櫎'); +INSERT INTO `sys_module_lang` VALUES ('task_template_fragment', 'ja', '銈裤偣銈▓鐢汇偣銈儶銉椼儓鏂墖'); +INSERT INTO `sys_module_lang` VALUES ('task_template_help', 'ja', '銉樸儷銉'); +INSERT INTO `sys_module_lang` VALUES ('task_template_list', 'ja', '銈裤偣銈▓鐢汇偣銈儶銉椼儓'); +INSERT INTO `sys_module_lang` VALUES ('template_content', 'ja', '澶夋洿'); +INSERT INTO `sys_module_lang` VALUES ('template_content-type', 'ja', 'content-type銈掗伕鎶'); +INSERT INTO `sys_module_lang` VALUES ('template_content_form', 'ja', '銈炽兂銉嗐兂銉勯佷俊銉曘偐銉笺儬'); +INSERT INTO `sys_module_lang` VALUES ('template_data_dictionary', 'ja', '銉囥兗銈胯緸鏇搞倰閬告姙'); +INSERT INTO `sys_module_lang` VALUES ('template_delete', 'ja', '鍓婇櫎'); +INSERT INTO `sys_module_lang` VALUES ('template_demo', 'ja', '銉嗐兂銉椼儸銉笺儓銇緥'); +INSERT INTO `sys_module_lang` VALUES ('template_fragment', 'ja', '銉嗐兂銉椼儸銉笺儓銉曘儵銈般儭銉炽儓'); +INSERT INTO `sys_module_lang` VALUES ('template_help', 'ja', '銉嗐兂銉椼儸銉笺儓銉樸儷銉'); +INSERT INTO `sys_module_lang` VALUES ('template_list', 'ja', '銉嗐兂銉椼儸銉笺儓銉曘偂銈ゃ儷绠＄悊'); +INSERT INTO `sys_module_lang` VALUES ('template_metadata', 'ja', '銉°偪銉囥兗銈裤伄澶夋洿'); +INSERT INTO `sys_module_lang` VALUES ('template_place', 'ja', '銉氥兗銈搞儠銉┿偘銉°兂銉'); +INSERT INTO `sys_module_lang` VALUES ('template_place_form', 'ja', '銉氥兗銈搞儠銉┿偘銉°兂銉堟彁鍑恒儠銈┿兗銉'); +INSERT INTO `sys_module_lang` VALUES ('template_upload', 'ja', '銉嗐兂銉椼儸銉笺儓銈掋偄銉冦儣銉兗銉夈仚銈'); +INSERT INTO `sys_module_lang` VALUES ('template_website_file', 'ja', '銈︺偋銉栥偟銈ゃ儓銉曘偂銈ゃ儷'); +INSERT INTO `sys_module_lang` VALUES ('user_add', 'ja', '杩藉姞/澶夋洿'); +INSERT INTO `sys_module_lang` VALUES ('user_disable', 'ja', '绂佹'); +INSERT INTO `sys_module_lang` VALUES ('user_enable', 'ja', '銈兂'); +INSERT INTO `sys_module_lang` VALUES ('user_list', 'ja', '銉︺兗銈躲兗绠＄悊'); +INSERT INTO `sys_module_lang` VALUES ('user_menu', 'ja', '銉︺兗銈躲兗绠＄悊'); +INSERT INTO `sys_module_lang` VALUES ('webfile_content', 'ja', '銉曘偂銈ゃ儷銇鏇'); +INSERT INTO `sys_module_lang` VALUES ('webfile_directory', 'ja', '鐩尣銈掍綔鎴'); +INSERT INTO `sys_module_lang` VALUES ('webfile_list', 'ja', '銈︺偋銉栥偟銈ゃ儓銇儠銈°偆銉鐞'); +INSERT INTO `sys_module_lang` VALUES ('webfile_unzip', 'ja', '瑙ｅ噸'); +INSERT INTO `sys_module_lang` VALUES ('webfile_upload', 'ja', '銈€儍銉椼儹銉笺儔'); +INSERT INTO `sys_module_lang` VALUES ('webfile_zip', 'ja', '鍦х府'); +INSERT INTO `sys_module_lang` VALUES ('word_list', 'ja', '妞滅储銉兗銉夌鐞'); +-- 2018-11-06 -- +ALTER TABLE `cms_category` + MODIFY COLUMN `path` varchar(1000) DEFAULT NULL COMMENT '棣栭〉璺緞' AFTER `template_path`, + MODIFY COLUMN `url` varchar(1000) DEFAULT NULL COMMENT '棣栭〉鍦板潃' AFTER `has_static`, + MODIFY COLUMN `content_path` varchar(1000) DEFAULT NULL COMMENT '鍐呭璺緞' AFTER `url`; +ALTER TABLE `cms_content` + MODIFY COLUMN `url` varchar(1000) DEFAULT NULL COMMENT '鍦板潃' AFTER `has_static`; +ALTER TABLE `cms_content_attribute` + MODIFY COLUMN `source_url` varchar(1000) DEFAULT NULL COMMENT '鏉ユ簮鍦板潃' AFTER `source`; +ALTER TABLE `cms_place` + MODIFY COLUMN `url` varchar(1000) default NULL COMMENT '瓒呴摼鎺' AFTER `title`; +ALTER TABLE `cms_content_related` + MODIFY COLUMN `url` varchar(1000) default NULL COMMENT '鎺ㄨ崘閾炬帴鍦板潃' AFTER `user_id`; +-- 2018-11-07 -- +CREATE TABLE `cms_comment` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID', + `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID', + `user_id` bigint(20) NOT NULL COMMENT '鐢ㄦ埛ID', + `content_id` bigint(20) NOT NULL COMMENT '鏂囩珷鍐呭', + `check_user_id` bigint(20) DEFAULT NULL COMMENT '瀹℃牳鐢ㄦ埛', + `check_date` datetime DEFAULT NULL COMMENT '瀹℃牳鏃ユ湡', + `update_date` datetime DEFAULT NULL COMMENT '鏇存柊鏃ユ湡', + `create_date` datetime NOT NULL COMMENT '鍒涘缓鏃ユ湡', + `status` int(11) NOT NULL COMMENT '鐘舵侊細1銆佸凡鍙戝竷 2銆佸緟瀹℃牳', + `disabled` tinyint(1) NOT NULL COMMENT '宸茬鐢', + `text` text COMMENT '鍐呭', + PRIMARY KEY (`id`), + KEY `site_id` (`site_id`,`content_id`,`status`,`disabled`, `create_date`) +) COMMENT='璇勮'; +INSERT INTO `sys_module` VALUES ('comment_list', 'cmsComment/list', 'sysUser/lookup', '', 'content_extend', 1, 4); +INSERT INTO `sys_module` VALUES ('comment_check', NULL, 'cmsComment/check', NULL, 'comment_list', 0, 0); +INSERT INTO `sys_module` VALUES ('comment_uncheck', NULL, 'cmsComment/uncheck', NULL, 'comment_list', 0, 0); +INSERT INTO `sys_module` VALUES ('comment_delete', NULL, 'cmsComment/delete', NULL, 'comment_list', 0, 0); + +INSERT INTO `sys_module_lang` VALUES ('comment_list', 'zh', '璇勮绠＄悊'); +INSERT INTO `sys_module_lang` VALUES ('comment_list', 'en', 'Comment management'); +INSERT INTO `sys_module_lang` VALUES ('comment_list', 'ja', '銈炽儭銉炽儓绠＄悊'); +INSERT INTO `sys_module_lang` VALUES ('comment_check', 'zh', '瀹℃牳'); +INSERT INTO `sys_module_lang` VALUES ('comment_check', 'en', 'Check'); +INSERT INTO `sys_module_lang` VALUES ('comment_check', 'ja', '瀵╂熁'); +INSERT INTO `sys_module_lang` VALUES ('comment_uncheck', 'zh', '鍙栨秷瀹℃牳'); +INSERT INTO `sys_module_lang` VALUES ('comment_uncheck', 'en', 'Uncheck'); +INSERT INTO `sys_module_lang` VALUES ('comment_uncheck', 'ja', '瀵╂熁銈掑彇銈婃秷銇'); +INSERT INTO `sys_module_lang` VALUES ('comment_delete', 'zh', '鍒犻櫎'); +INSERT INTO `sys_module_lang` VALUES ('comment_delete', 'en', 'Delete'); +INSERT INTO `sys_module_lang` VALUES ('comment_delete', 'ja', '鍓婇櫎'); +-- 2018-11-09 -- +UPDATE `sys_module` SET `attached` = replace(replace(`attached`,'',''); +ALTER TABLE `sys_module` + MODIFY COLUMN `attached` varchar(50) default NULL COMMENT '鏍囬闄勫姞' AFTER `authorized_url`; +ALTER TABLE `sys_user` + ADD COLUMN `salt` varchar(20) NULL COMMENT '娣锋穯鐮,涓虹┖鏃跺垯瀵嗙爜涓簃d5,涓10浣嶆椂sha512(sha512(password)+salt)' AFTER `password`, + ADD COLUMN `weak_password` tinyint(1) NOT NULL DEFAULT 0 COMMENT '寮卞瘑鐮' AFTER `salt`, + MODIFY COLUMN `password` varchar(128) NOT NULL COMMENT '瀵嗙爜' AFTER `name`; +-- 2018-12-07 -- +ALTER TABLE `cms_content_file` + CHANGE COLUMN `image` `file_type` varchar(20) NOT NULL COMMENT '鏂囦欢绫诲瀷' AFTER `file_path`, + CHANGE COLUMN `size` `file_size` bigint(20) NOT NULL COMMENT '鏂囦欢澶у皬' AFTER `file_type`, + DROP INDEX `image`, + DROP INDEX `size`, + ADD INDEX `file_type`(`file_type`), + ADD INDEX `file_size` (`file_size`); +UPDATE `cms_content_file` SET file_type = 'image' WHERE file_type = '1'; +UPDATE `cms_content_file` SET file_type = 'image' WHERE file_path like '%.png' or file_path like '%.jpg' or file_path like '%.gif' or file_path like '%.bmp'; +UPDATE `cms_content_file` SET file_type = 'video' WHERE file_path like '%.mp4' or file_path like '%.3gp'; +UPDATE `cms_content_file` SET file_type = 'other' WHERE file_type = '0'; +-- 2018-12-20 -- +INSERT INTO `sys_module` VALUES ('content_export', NULL, 'cmsContent/export', '', 'content_menu', 1, 0); +INSERT INTO `sys_module_lang` VALUES ('content_export', 'ja', '杓稿嚭'); +INSERT INTO `sys_module_lang` VALUES ('content_export', 'zh', '瀵煎嚭'); +INSERT INTO `sys_module_lang` VALUES ('content_export', 'en', 'Export'); +ALTER TABLE `cms_place` ADD COLUMN `check_user_id` bigint(20) NULL COMMENT '瀹℃牳鐢ㄦ埛' AFTER `user_id`; +ALTER TABLE `cms_place` + DROP INDEX `publish_date`, + DROP INDEX `site_id`, + DROP INDEX `item_type`, + DROP INDEX `user_id`, + DROP INDEX `path`, + DROP INDEX `disabled`, + DROP INDEX `create_date`, + DROP INDEX `status`, + DROP INDEX `item_id`, + ADD INDEX `publish_date`(`publish_date`, `create_date`) , + ADD INDEX `site_id`(`site_id`, `path`, `status`, `disabled`), + ADD INDEX `item_type`(`item_type`, `item_id`) , + ADD INDEX `user_id`(`user_id`, `check_user_id`) ; +UPDATE `sys_module` SET `authorized_url` = 'cmsPlace/dataList,cmsPlace/export' WHERE `id` ='place_data_list'; +UPDATE `sys_module` SET `authorized_url` = 'sysUser/lookup' WHERE `id` ='place_list'; +-- 2018-12-22 -- +ALTER TABLE `cms_comment` + ADD COLUMN `reply_id` bigint(20) NULL COMMENT '鍥炲ID' AFTER `user_id`, + DROP INDEX `site_id`, + ADD INDEX `site_id`(`site_id`, `content_id`, `status`, `disabled`), + ADD INDEX `update_date`(`update_date`, `create_date`), + ADD INDEX `reply_id`(`site_id`, `reply_id`); +ALTER TABLE `cms_comment` + ADD COLUMN `reply_user_id` bigint(20) NULL COMMENT '鍥炲鐢ㄦ埛ID' AFTER `reply_id`, + DROP INDEX `reply_id`, + ADD INDEX `reply_id`(`site_id`, `reply_user_id`, `reply_id`); +-- 2018-12-28 -- +ALTER TABLE `cms_content` DROP INDEX `status`, + ADD COLUMN `expiry_date` datetime NULL COMMENT '杩囨湡鏃ユ湡' AFTER `publish_date`, + ADD INDEX `status` (`site_id`,`status`,`category_id`,`disabled`,`model_id`,`parent_id`,`sort`,`publish_date`,`expiry_date`); +ALTER TABLE `cms_place` DROP INDEX `publish_date`, + ADD COLUMN `expiry_date` datetime NULL COMMENT '杩囨湡鏃ユ湡' AFTER `publish_date`, + ADD INDEX `publish_date` (`publish_date`,`create_date`,`expiry_date`); +-- 2019-01-01 -- +update cms_category set code=CONCAT(code,id) where (site_id,code) in ( + select * from ( + SELECT site_id,code FROM `cms_category` group by site_id,code having count(*) > 1 + ) a +) and id not in ( + select * from ( + select min(id) from cms_category where (site_id,code) in ( + SELECT site_id,code FROM `cms_category` group by site_id,code having count(*) > 1 + ) group by site_id,code + ) b +); +ALTER TABLE `cms_category` + MODIFY COLUMN `code` varchar(50) NOT NULL COMMENT '缂栫爜' AFTER `tag_type_ids`, + DROP INDEX `site_id`, + DROP INDEX `parent_id`, + DROP INDEX `disabled`, + DROP INDEX `type_id`, + DROP INDEX `allow_contribute`, + DROP INDEX `hidden`, + ADD INDEX `type_id`(`type_id`, `allow_contribute`), + ADD INDEX `site_id`(`site_id`, `parent_id`, `hidden`, `disabled`), + ADD UNIQUE INDEX `code`(`site_id`, `code`); +ALTER TABLE `cms_content` + ADD COLUMN `quote_content_id` bigint(20) NULL COMMENT '寮曠敤鍐呭ID' AFTER `parent_id`, + ADD INDEX `quote_content_id`(`site_id`, `quote_content_id`); +-- 2019-01-11 -- +UPDATE `sys_module` SET `authorized_url` = 'cmsWebFile/doUpload,cmsWebFile/check' WHERE `id` ='webfile_upload'; +-- 2019-01-22 -- +ALTER TABLE `cms_content` + ADD COLUMN `dictionar_values` text default NULL COMMENT '鏁版嵁瀛楀吀鍊' AFTER `tag_ids`; +-- 2019-01-24 -- +ALTER TABLE `cms_dictionary` + MODIFY COLUMN `id` varchar(20) NOT NULL FIRST, + DROP PRIMARY KEY, + ADD PRIMARY KEY (`id`, `site_id`); +ALTER TABLE `cms_dictionary_data` + MODIFY COLUMN `dictionary_id` varchar(20) NOT NULL COMMENT '瀛楀吀' FIRST, + ADD COLUMN `site_id` smallint(0) NOT NULL COMMENT '绔欑偣ID' AFTER `dictionary_id`, + DROP PRIMARY KEY, + ADD PRIMARY KEY (`dictionary_id`, `site_id`, `value`); +update cms_dictionary_data a set a.site_id = (select site_id from cms_dictionary b where a.dictionary_id = b.id); +ALTER TABLE `sys_extend_field` + MODIFY COLUMN `dictionary_id` varchar(20) NULL DEFAULT NULL COMMENT '鏁版嵁瀛楀吀ID' AFTER `default_value`; +-- 2019-01-24 -- +UPDATE `sys_module` SET `authorized_url` = 'cmsCategory/addMore,cmsCategory/virify,cmsTemplate/lookup,cmsCategory/categoryPath,cmsCategory/contentPath,file/doUpload,cmsCategory/save' WHERE `id` ='category_add'; +UPDATE `sys_module` SET `authorized_url` = 'cmsDictionary/save,cmsDictionary/virify' WHERE `id` ='dictionary_add'; +-- 2019-01-29 -- +INSERT INTO `sys_module` VALUES ('myself_device', 'myself/userDeviceList', 'sysAppClient/enable,sysAppClient/disable', 'icon-linux', 'myself_menu', 1, 5); +UPDATE `sys_module` SET `authorized_url` = 'sysUserToken/delete' WHERE `id` ='myself_token'; +INSERT INTO `sys_module_lang`(`module_id`, `lang`, `value`) VALUES ('myself_device', 'en', 'My device'); +INSERT INTO `sys_module_lang`(`module_id`, `lang`, `value`) VALUES ('myself_device', 'ja', '绉併伄绔湯'); +INSERT INTO `sys_module_lang`(`module_id`, `lang`, `value`) VALUES ('myself_device', 'zh', '鎴戠殑璁惧'); +ALTER TABLE `sys_app_client` + ADD COLUMN `id` bigint(20) NOT NULL AUTO_INCREMENT FIRST, + DROP PRIMARY KEY, + ADD PRIMARY KEY (`id`), + ADD UNIQUE INDEX(`site_id`, `channel`, `uuid`); +-- 2019-02-15 -- +ALTER TABLE `cms_place` + MODIFY COLUMN `path` varchar(100) NOT NULL COMMENT '妯℃澘璺緞' AFTER `site_id`; +DELETE FROM `cms_word` WHERE LENGTH(name) > 100; +ALTER TABLE `cms_word` + MODIFY COLUMN `name` varchar(100) NOT NULL COMMENT '鍚嶇О' AFTER `site_id`; +ALTER TABLE `sys_dept_page` + MODIFY COLUMN `page` varchar(100) NOT NULL COMMENT '椤甸潰' AFTER `dept_id`; +ALTER TABLE `sys_domain` + MODIFY COLUMN `name` varchar(100) NOT NULL COMMENT '鍩熷悕' FIRST, + MODIFY COLUMN `path` varchar(100) NULL DEFAULT NULL COMMENT '璺緞' AFTER `wild`; +ALTER TABLE `sys_role_authorized` + MODIFY COLUMN `url` varchar(100) NOT NULL COMMENT '鎺堟潈鍦板潃' AFTER `role_id`; +-- 2019-02-19 -- +ALTER TABLE `cms_content_attribute` + ADD COLUMN `search_text` longtext NULL COMMENT '鍏ㄦ枃绱㈠紩鏂囨湰' AFTER `data`; +ALTER TABLE `sys_extend_field` + ADD COLUMN `searchable` tinyint(1) NOT NULL COMMENT '鏄惁鍙悳绱' AFTER `required`, + MODIFY COLUMN `maxlength` int(11) NULL DEFAULT NULL COMMENT '鏈澶ч暱搴' AFTER `searchable`; +-- 2019-02-22 -- +UPDATE `sys_module` SET `parent_id` = 'config_menu' where id = 'domain_list'; +UPDATE `sys_module` SET `authorized_url` = 'cmsPlace/export',`url` = 'cmsPlace/dataList' WHERE `id` ='place_data_list'; \ No newline at end of file diff --git a/publiccms-parent/publiccms-core/src/main/resources/initialization/upgrade/V2017.0708-V4.0.20180210.sql b/publiccms-parent/publiccms-core/src/main/resources/initialization/upgrade/V2017.0708-V4.0.20180210.sql deleted file mode 100644 index dd0c20a22..000000000 --- a/publiccms-parent/publiccms-core/src/main/resources/initialization/upgrade/V2017.0708-V4.0.20180210.sql +++ /dev/null @@ -1,106 +0,0 @@ --- 20170715 -- -INSERT INTO `sys_moudle` VALUES ('125', '鎾ら攢瀹℃牳', null, 'cmsContent/uncheck', null, '12', '0', '0'); -DROP TABLE IF EXISTS `home_dialog`; -DROP TABLE IF EXISTS `home_message`; -DROP TABLE IF EXISTS `home_group_active`; --- 20170804 -- -UPDATE sys_moudle SET `parent_id` = 117 WHERE `sys_moudle`.`id` in(118,119); --- 20170812 -- -INSERT INTO `sys_moudle` VALUES ('126', '鏂囦欢', null, null, '', null, '1', '1'); -UPDATE sys_moudle SET `parent_id` = 126 WHERE `sys_moudle`.`id` = 38; -UPDATE `sys_moudle` SET `name` = '绔欑偣閰嶇疆' WHERE `sys_moudle`.`id` = 140; -UPDATE `sys_moudle` SET `name` = '鏁版嵁瀛楀吀' WHERE `sys_moudle`.`id` = 122; -ALTER TABLE `cms_content` - ADD COLUMN `check_date` datetime default NULL COMMENT '瀹℃牳鏃ユ湡' AFTER `publish_date`, - ADD COLUMN `update_date` datetime default NULL COMMENT '鏇存柊鏃ユ湡' AFTER `check_date`, - DROP INDEX `publish_date`, - DROP INDEX `user_id`, - DROP INDEX `category_id`, - DROP INDEX `model_id`, - DROP INDEX `parent_id`, - DROP INDEX `status`, - DROP INDEX `childs`, - DROP INDEX `scores`, - DROP INDEX `comments`, - DROP INDEX `clicks`, - DROP INDEX `title`, - DROP INDEX `check_user_id`, - DROP INDEX `site_id`, - DROP INDEX `has_files`, - DROP INDEX `has_images`, - DROP INDEX `only_url`, - DROP INDEX `sort`, - ADD INDEX `check_date` (`check_date`,`update_date`), - ADD INDEX `scores` (`scores`,`comments`,`clicks`), - ADD INDEX `status` (`site_id`,`status`,`category_id`,`disabled`,`model_id`,`parent_id`,`sort`,`publish_date`), - ADD INDEX `only_url` (`only_url`,`has_images`,`has_files`,`user_id`); -UPDATE `cms_content` SET `check_date` = `publish_date`; --- 20170905 -- -UPDATE `sys_moudle` SET `url` = 'cmsPlace/publish_place' WHERE `sys_moudle`.`id` = 53; --- 20170922 -- -UPDATE `sys_moudle` SET `parent_id` = 5 WHERE `sys_moudle`.`id` = 63; -UPDATE `sys_moudle` SET `authorized_url` = 'cmsContent/addMore,file/doUpload,cmsContent/lookup,cmsContent/lookup_list,cmsContent/save,ueditor,ckeditor/upload' WHERE `sys_moudle`.`id` = 102; --- 20170922 -- -INSERT INTO `sys_moudle` VALUES ('127', '鎺ㄨ崘浣嶆暟鎹', 'cmsPlace/dataList', null, null , '107', '1', '1'); -INSERT INTO `sys_moudle` VALUES ('128', '鐢ㄦ埛鏁版嵁鐩戞帶', 'report/user', NULL, '', '46', '1', '0'); -ALTER TABLE `sys_moudle` ORDER BY `id`; -DELETE FROM `sys_moudle` WHERE id = 130; --- 20171103 -- -UPDATE `sys_user` SET roles = '2' where id = 2 and site_id = 2; --- 20171216 -- -ALTER TABLE `cms_place` MODIFY COLUMN `item_id` bigint(20) default NULL COMMENT '鎺ㄨ崘椤圭洰ID' AFTER `item_type`; -ALTER TABLE `cms_category` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `id`; -ALTER TABLE `cms_category_type` CHANGE COLUMN `siteId` `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `id`, DROP INDEX `siteId`,ADD INDEX `site_id`(`site_id`) USING BTREE; -ALTER TABLE `cms_content` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `id`; -ALTER TABLE `cms_lottery` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `id`; -ALTER TABLE `cms_tag` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `id`; -ALTER TABLE `cms_tag_type` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `id`; -ALTER TABLE `cms_vote` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `id`; -ALTER TABLE `cms_word` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `id`; -ALTER TABLE `home_article` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `id`; -ALTER TABLE `home_broadcast` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `id`; -ALTER TABLE `home_comment` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `id`; -ALTER TABLE `home_directory` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `id`; -ALTER TABLE `home_file` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `id`; -ALTER TABLE `home_group` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `id`; -ALTER TABLE `home_group_post` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `id`; -ALTER TABLE `home_score` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `id`; -ALTER TABLE `home_user` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `user_id`; -ALTER TABLE `log_login` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `id`; -ALTER TABLE `log_operate` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `id`; -ALTER TABLE `log_task` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `id`; -ALTER TABLE `log_upload` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `id`; -ALTER TABLE `sys_app` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `id`; -ALTER TABLE `sys_app_client` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' FIRST; -ALTER TABLE `sys_config_data` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' FIRST; -ALTER TABLE `sys_dept` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `id`; -ALTER TABLE `sys_domain` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `name`; -ALTER TABLE `sys_role` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `id`; -ALTER TABLE `sys_task` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `id`; -ALTER TABLE `sys_user` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `id`; -ALTER TABLE `sys_user_token` MODIFY COLUMN `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID' AFTER `auth_token`; -ALTER TABLE `cms_category_type` COMMENT = '鍒嗙被绫诲瀷'; -ALTER TABLE `cms_lottery` COMMENT = '鎶藉'; -ALTER TABLE `cms_lottery_user` COMMENT = '鎶藉鐢ㄦ埛'; -ALTER TABLE `cms_lottery_user_attribute` COMMENT = '鎶藉鐢ㄦ埛鎵╁睍鏁版嵁'; -ALTER TABLE `cms_vote` COMMENT = '鎶曠エ'; -ALTER TABLE `cms_vote_item` COMMENT = '鎶曠エ閫夐」'; -ALTER TABLE `cms_vote_user` COMMENT = '鎶曠エ鐢ㄦ埛'; -ALTER TABLE `cms_word` COMMENT = '鎼滅储璇'; -ALTER TABLE `sys_app` COMMENT = '搴旂敤'; -ALTER TABLE `sys_app_client` COMMENT = '搴旂敤瀹㈡埛绔'; -ALTER TABLE `sys_app_token` COMMENT = '搴旂敤鎺堟潈'; -ALTER TABLE `sys_extend` COMMENT = '鎵╁睍'; -ALTER TABLE `sys_extend_field` COMMENT = '鎵╁睍瀛楁'; --- 2017-12-24 -- -ALTER TABLE `cms_lottery` DROP COLUMN `interval_hour`,DROP COLUMN `gift`,DROP COLUMN `extend_id`; -ALTER TABLE `cms_vote` DROP COLUMN `anonymous`,DROP COLUMN `interval_hour`,DROP COLUMN `item_extend_id` , DROP INDEX `disabled`, ADD INDEX `disabled` (`site_id`,`end_date`,`disabled`); -DROP TABLE IF EXISTS `cms_vote_item_attribute`; -DROP TABLE IF EXISTS `cms_lottery_user_attribute`; --- 2018-01-18 -- -ALTER TABLE `cms_category` DROP COLUMN `contents`; --- 2018-02-08 -- -ALTER TABLE `sys_moudle` RENAME `sys_module`; -ALTER TABLE `sys_role_moudle` RENAME `sys_role_module`; -ALTER TABLE `sys_role_module` CHANGE COLUMN `moudle_id` `module_id` int(11) NOT NULL COMMENT '妯″潡ID' AFTER `role_id`; -ALTER TABLE `sys_role` CHANGE COLUMN `show_all_moudle` `show_all_module` int(11) NOT NULL COMMENT '鏄剧ず鍏ㄩ儴妯″潡' AFTER `owns_all_right`; diff --git a/publiccms-parent/publiccms-core/src/main/resources/initialization/upgrade/V4.0.190312-V4.0.202004.sql b/publiccms-parent/publiccms-core/src/main/resources/initialization/upgrade/V2019-V2021.sql similarity index 59% rename from publiccms-parent/publiccms-core/src/main/resources/initialization/upgrade/V4.0.190312-V4.0.202004.sql rename to publiccms-parent/publiccms-core/src/main/resources/initialization/upgrade/V2019-V2021.sql index 5fcf7f2d5..c872bbb54 100644 --- a/publiccms-parent/publiccms-core/src/main/resources/initialization/upgrade/V4.0.190312-V4.0.202004.sql +++ b/publiccms-parent/publiccms-core/src/main/resources/initialization/upgrade/V2019-V2021.sql @@ -525,3 +525,274 @@ ALTER TABLE `sys_user` MODIFY COLUMN `last_login_ip` varchar(130) DEFAULT NULL COMMENT '鏈鍚庣櫥褰昳p' AFTER `last_login_date`; ALTER TABLE `sys_app_client` MODIFY COLUMN `last_login_ip` varchar(130) DEFAULT NULL COMMENT '涓婃鐧诲綍IP' AFTER `last_login_date`; + +-- 2020-06-23 -- +ALTER TABLE `cms_tag` + DROP INDEX `cms_tag_site_id`, + ADD INDEX `cms_tag_site_id`(`site_id`, `name`), + ADD INDEX `cms_tag_type_id` (`type_id`); +ALTER TABLE `cms_tag_type` + DROP INDEX `cms_tag_type_site_id`, + ADD INDEX `cms_tag_type_site_id` (`site_id`,`name`); +-- 2020-07-27 -- +DELETE FROM `sys_module` WHERE id = 'category'; +DELETE FROM `sys_module_lang` WHERE module_id = 'category'; +UPDATE `sys_module` SET `parent_id` = 'content' WHERE `id` ='category_extend'; +UPDATE `sys_module` SET `id` = 'category_list', `parent_id` = 'content_menu',`sort` = '1' WHERE `id` ='category_menu'; +UPDATE `sys_module_lang` SET `module_id` = 'category_list' WHERE `module_id` ='category_menu'; +UPDATE `sys_module` SET `parent_id` = 'category_list' WHERE `parent_id` ='category_menu'; +UPDATE `sys_module` SET `parent_id` = 'content_list' WHERE `parent_id` ='content_menu'; +UPDATE `sys_module` SET `parent_id` = 'content_menu' WHERE `parent_id` ='content_extend'; +DELETE FROM `sys_module_lang` WHERE `module_id` = 'content_extend'; +DELETE FROM `sys_module` WHERE `id` = 'content_extend'; +UPDATE `sys_module` SET `parent_id` = 'content_menu', `sort` = '2' WHERE `id` ='category_list'; +UPDATE `sys_module` SET `authorized_url` = NULL, `url` = NULL WHERE `id` ='content_menu'; +INSERT INTO `sys_module` VALUES ('content_list', 'cmsContent/list', 'sysUser/lookup', 'icon-book', 'content_menu', 1, 0); +UPDATE `sys_module` SET `sort` = '1' where `id` = 'comment_list'; +UPDATE `sys_module` SET `sort` = '3' where `id` = 'tag_list'; +UPDATE `sys_module` SET `sort` = '4' where `id` = 'word_list'; +UPDATE `sys_module` SET `sort` = '5' where `id` = 'content_vote'; +UPDATE `sys_module` SET `sort` = '6' where `id` = 'content_recycle_list'; +UPDATE `sys_module` SET `attached` = NULL where `id` = 'content_add'; +UPDATE `sys_module` SET `menu` = '0' where `parent_id` = 'content_list'; +UPDATE `sys_module` SET `sort` = '1' where `id` = 'category_extend'; +INSERT INTO `sys_module_lang` VALUES ('content_list', 'en', 'Content management'); +INSERT INTO `sys_module_lang` VALUES ('content_list', 'ja', '銈炽兂銉嗐兂銉勭鐞'); +INSERT INTO `sys_module_lang` VALUES ('content_list', 'zh', '鍐呭绠＄悊'); +ALTER TABLE `cms_content` DROP INDEX `cms_content_quote_content_id`; +UPDATE `sys_module_lang` SET `value` = '绉併伄' where `module_id` = 'myself' and `lang` = 'ja'; +UPDATE `sys_module_lang` SET `value` = '鎴戠殑' where `module_id` = 'myself' and `lang` = 'zh'; +-- 2021-01-14 -- +ALTER TABLE `cms_content` + ADD INDEX `cms_content_quote_content_id`(`site_id`, `quote_content_id`); +CREATE TABLE `log_visit` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `site_id` smallint(6) NOT NULL COMMENT '绔欑偣', + `session_id` varchar(50) NOT NULL COMMENT '浼氳瘽', + `visit_date` date NOT NULL COMMENT '璁块棶鏃ユ湡', + `visit_hour` tinyint(4) NOT NULL COMMENT '璁块棶灏忔椂', + `ip` varchar(130) NOT NULL COMMENT 'IP', + `user_agent` varchar(500) DEFAULT NULL COMMENT 'User Agent', + `url` varchar(2048) NOT NULL COMMENT '璁块棶璺緞', + `title` varchar(255) DEFAULT NULL COMMENT '鏍囬', + `screen_width` int(11) DEFAULT NULL COMMENT '灞忓箷瀹藉害', + `screen_height` int(11) DEFAULT NULL COMMENT '灞忓箷楂樺害', + `referer_url` varchar(2048) DEFAULT NULL COMMENT '鏉ユ簮URL', + `item_type` varchar(50) DEFAULT NULL COMMENT '椤圭洰绫诲瀷', + `item_id` varchar(50) DEFAULT NULL COMMENT '椤圭洰', + `create_date` datetime NOT NULL COMMENT '鍒涘缓鏃ユ湡', + PRIMARY KEY (`id`), + KEY `log_visit_visit_date` (`site_id`,`visit_date`,`visit_hour`), + KEY `log_visit_session_id` (`site_id`,`session_id`,`visit_date`,`create_date`,`ip`) +) COMMENT='璁块棶鏃ュ織'; + +CREATE TABLE `log_visit_day` ( + `site_id` smallint(6) NOT NULL COMMENT '绔欑偣', + `visit_date` date NOT NULL COMMENT '鏃ユ湡', + `visit_hour` tinyint(4) NOT NULL COMMENT '灏忔椂', + `pv` bigint(20) NOT NULL COMMENT 'Page Views', + `uv` bigint(20) DEFAULT NULL COMMENT 'User Views', + `ipviews` bigint(20) DEFAULT NULL COMMENT 'IP鏁', + PRIMARY KEY (`site_id`,`visit_date`,`visit_hour`), + KEY `log_visit_session_id` (`site_id`,`visit_date`) +) COMMENT = '璁块棶姹囨'; + +CREATE TABLE `log_visit_session` ( + `site_id` smallint(6) NOT NULL COMMENT '绔欑偣', + `session_id` varchar(50) NOT NULL COMMENT '浼氳瘽', + `visit_date` date NOT NULL COMMENT '鏃ユ湡', + `last_visit_date` datetime DEFAULT NULL COMMENT '涓婃璁块棶鏃ユ湡', + `first_visit_date` datetime DEFAULT NULL COMMENT '棣栨璁块棶鏃ユ湡', + `ip` varchar(130) NOT NULL COMMENT 'IP', + `pv` bigint(20) NOT NULL COMMENT 'PV', + PRIMARY KEY (`site_id`,`session_id`,`visit_date`), + KEY `log_visit_visit_date` (`site_id`,`visit_date`,`ip`) +) COMMENT = '璁块棶浼氳瘽'; + +-- 2021-03-25 -- +UPDATE `sys_module` SET `authorized_url` = 'cmsContent/push_content,cmsContent/push_content_list,cmsContent/push_to_content,cmsContent/push_page,cmsContent/push_page_list,cmsPlace/add,cmsPlace/save,cmsContent/related,cmsContent/unrelated,cmsPlace/delete,cmsPlace/push' WHERE `id` ='content_push'; +-- 20210329 -- +ALTER TABLE `log_login` MODIFY COLUMN `error_password` varchar(255) default NULL COMMENT '閿欒瀵嗙爜' AFTER `create_date`; +-- 2021-05-26 -- +INSERT INTO `sys_module` VALUES ('log_visit', 'log/visit', 'log/visitView', 'icon-bolt', 'log_menu', 1, 5); +INSERT INTO `sys_module` VALUES ('log_visit_day', 'log/visitDay', NULL, 'icon-calendar', 'log_menu', 1, 7); +INSERT INTO `sys_module` VALUES ('log_visit_session', 'log/visitSession', NULL, 'icon-comment-alt', 'log_menu', 1, 6); +INSERT INTO `sys_module_lang` VALUES ('log_visit', 'en', 'Visit log'); +INSERT INTO `sys_module_lang` VALUES ('log_visit', 'ja', '銈€偗銈汇偣銉偘'); +INSERT INTO `sys_module_lang` VALUES ('log_visit', 'zh', '璁块棶鏃ュ織'); +INSERT INTO `sys_module_lang` VALUES ('log_visit_day', 'en', 'Daily visit log'); +INSERT INTO `sys_module_lang` VALUES ('log_visit_day', 'ja', '姣庢棩銇í鍟忋儹銈'); +INSERT INTO `sys_module_lang` VALUES ('log_visit_day', 'zh', '鏃ヨ闂棩蹇'); +INSERT INTO `sys_module_lang` VALUES ('log_visit_session', 'en', 'Visit session'); +INSERT INTO `sys_module_lang` VALUES ('log_visit_session', 'ja', '銈€偗銈汇偣銈汇儍銈枫儳銉'); +INSERT INTO `sys_module_lang` VALUES ('log_visit_session', 'zh', '璁块棶鏃ュ織浼氳瘽'); +-- 2021-06-25 -- +UPDATE `sys_module` SET `authorized_url` = 'tradeOrder/refund' WHERE `id` ='refund_refund'; +UPDATE `sys_module` SET `authorized_url` = 'cmsTemplate/save,cmsTemplate/chipLookup,cmsWebFile/lookup,placeTemplate/form,cmsTemplate/contentForm,cmsCategory/contributeForm,cmsTemplate/demo,cmsTemplate/help,cmsTemplate/upload,cmsTemplate/doUpload,cmsTemplate/export' WHERE `id` ='template_content'; +UPDATE `sys_module` SET `authorized_url` = 'taskTemplate/save,taskTemplate/upload,taskTemplate/doUpload,taskTemplate/export,taskTemplate/chipLookup,cmsTemplate/help' WHERE `id` ='task_template_content'; +-- 2021-06026 -- +CREATE TABLE `cms_content_product` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `site_id` smallint(6) NOT NULL COMMENT '绔欑偣', + `content_id` bigint(20) NOT NULL COMMENT '鍐呭', + `user_id` bigint(20) NOT NULL COMMENT '鐢ㄦ埛', + `cover` varchar(255) DEFAULT NULL COMMENT '灏侀潰鍥', + `title` varchar(100) NOT NULL COMMENT '鏍囬', + `price` decimal(10,2) NOT NULL COMMENT '浠锋牸', + `min_quantity` int(11) DEFAULT NULL COMMENT '鏈灏忚喘涔版暟閲', + `max_quantity` int(11) DEFAULT NULL COMMENT '鏈澶ц喘涔版暟閲', + `inventory` int(11) NOT NULL COMMENT '搴撳瓨', + `sales` int(11) NOT NULL COMMENT '閿閲', + PRIMARY KEY (`id`), + KEY `cms_content_product_content_id` (`site_id`, `content_id`), + KEY `cms_content_product_user_id` (`site_id`, `user_id`), + KEY `cms_content_product_sales` (`site_id`, `sales`), + KEY `cms_content_product_inventory` (`site_id`, `inventory`), + KEY `cms_content_product_price` (`site_id`, `price`) +) COMMENT='鍐呭鍟嗗搧'; +INSERT INTO `sys_module` VALUES ('product_list', 'cmsContentProduct/list', NULL, 'icon-truck', 'content_menu', 1, 4); +INSERT INTO `sys_module` VALUES ('product_add', 'cmsContentProduct/add', 'cmsContentProduct/save', NULL, 'product_list', 1, 0); +INSERT INTO `sys_module_lang` VALUES ('product_list', 'en', 'Product management'); +INSERT INTO `sys_module_lang` VALUES ('product_list', 'ja', '瑁藉搧绠＄悊'); +INSERT INTO `sys_module_lang` VALUES ('product_list', 'zh', '浜у搧绠＄悊'); +INSERT INTO `sys_module_lang` VALUES ('product_add', 'en', 'Edit'); +INSERT INTO `sys_module_lang` VALUES ('product_add', 'ja', '澶夋洿'); +INSERT INTO `sys_module_lang` VALUES ('product_add', 'zh', '淇敼'); +UPDATE `sys_module` SET `sort` = '6' WHERE `id` = 'word_list'; +UPDATE `sys_module` SET `sort` = '7' WHERE `id` = 'content_recycle_list'; +RENAME TABLE `trade_order` TO `trade_payment`; +RENAME TABLE `trade_order_history` TO `trade_payment_history`; +ALTER TABLE `trade_refund` + CHANGE COLUMN `order_id` `payment_id` bigint(20) NOT NULL COMMENT '璁㈠崟' AFTER `id`; +ALTER TABLE `trade_payment_history` CHANGE COLUMN `order_id` `payment_id` bigint(20) NOT NULL COMMENT '璁㈠崟' AFTER `site_id`; +ALTER TABLE `trade_payment` + DROP INDEX `trade_order_account_type`, + DROP INDEX `trade_order_site_id`, + DROP INDEX `trade_order_trade_type`, + DROP INDEX `trade_order_create_date`, + ADD INDEX `trade_payment_account_type`(`account_type`, `account_serial_number`) , + ADD INDEX `trade_payment_site_id`(`site_id`, `user_id`, `status`) , + ADD INDEX `trade_payment_trade_type`(`trade_type`, `serial_number`) , + ADD INDEX `trade_payment_create_date`(`create_date`); +ALTER TABLE `trade_payment_history` + DROP INDEX `trade_order_history_site_id`, + DROP INDEX `trade_order_history_create_date`, + ADD INDEX `trade_payment_history_site_id`(`site_id`, `payment_id`, `operate`), + ADD INDEX `trade_payment_history_create_date`(`create_date`); +CREATE TABLE `trade_order` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `site_id` smallint(6) NOT NULL COMMENT '绔欑偣', + `user_id` bigint(20) NOT NULL COMMENT '鐢ㄦ埛', + `amount` decimal(10,2) NOT NULL COMMENT '鎬婚噾棰', + `payment_id` bigint(20) DEFAULT NULL COMMENT '鏀粯璁㈠崟', + `address` varchar(255) DEFAULT NULL COMMENT '鍦板潃', + `addressee` varchar(100) DEFAULT NULL COMMENT '鏀朵欢浜', + `telephone` varchar(100) DEFAULT NULL COMMENT '鐢佃瘽', + `ip` varchar(130) NOT NULL COMMENT 'IP鍦板潃', + `remark` varchar(255) DEFAULT NULL COMMENT '澶囨敞', + `status` int(11) NOT NULL COMMENT '鐘舵:0寰呯‘璁,1鏃犳晥璁㈠崟,2宸蹭粯娆,3宸查娆,4宸插叧闂', + `confirmed` tinyint(1) NOT NULL COMMENT '宸茬‘璁', + `processed` tinyint(1) NOT NULL COMMENT '宸插鐞', + `process_info` varchar(255) DEFAULT NULL COMMENT '澶勭悊淇℃伅', + `update_date` datetime DEFAULT NULL COMMENT '鏇存柊鏃ユ湡', + `create_date` datetime NOT NULL COMMENT '鍒涘缓鏃ユ湡', + `process_date` datetime DEFAULT NULL COMMENT '澶勭悊鏃ユ湡', + `payment_date` datetime DEFAULT NULL COMMENT '鏀粯鏃ユ湡', + PRIMARY KEY (`id`), + KEY `trade_order_site_id` (`site_id`,`user_id`,`status`), + KEY `trade_order_create_date` (`create_date`), + KEY `trade_order_payment_id` (`site_id`,`payment_id`) +) COMMENT='浜у搧璁㈠崟'; +CREATE TABLE `trade_order_history` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `site_id` smallint(6) NOT NULL COMMENT '绔欑偣', + `order_id` bigint(20) NOT NULL COMMENT '璁㈠崟', + `create_date` datetime NOT NULL COMMENT '鍒涘缓鏃ユ湡', + `operate` varchar(100) NOT NULL COMMENT '鎿嶄綔', + `content` text COMMENT '鍐呭', + PRIMARY KEY (`id`), + KEY `trade_order_history_site_id` (`site_id`,`order_id`,`operate`), + KEY `trade_order_history_create_date` (`create_date`) +) COMMENT='璁㈠崟娴佹按'; +CREATE TABLE `trade_order_product` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `site_id` smallint(6) NOT NULL COMMENT '绔欑偣', + `order_id` bigint(20) NOT NULL COMMENT '鐢ㄦ埛', + `content_id` bigint(20) NOT NULL COMMENT '鍐呭', + `product_id` bigint(20) NOT NULL COMMENT '浜у搧', + `price` decimal(10,2) NOT NULL COMMENT '浠锋牸', + `quantity` int(11) NOT NULL COMMENT '鏁伴噺', + `amount` decimal(10,2) NOT NULL COMMENT '鎬婚噾棰', + `remark` varchar(255) DEFAULT NULL COMMENT '澶囨敞', + PRIMARY KEY (`id`), + KEY `trade_order_product_site_id` (`site_id`,`order_id`) +) COMMENT='浜у搧璁㈠崟'; +ALTER TABLE `cms_content` + ADD COLUMN `has_products` tinyint(1) NOT NULL COMMENT '鎷ユ湁浜у搧鍒楄〃' AFTER `has_files`, + DROP INDEX `cms_content_only_url`, + ADD INDEX `cms_content_only_url`(`only_url`, `has_images`, `has_files`, `has_products`, `user_id`) ; +ALTER TABLE `trade_payment` + ADD COLUMN `process_user_id` bigint(20) NULL COMMENT '澶勭悊鐢ㄦ埛' AFTER `processed`; +ALTER TABLE `trade_order` + ADD COLUMN `process_user_id` bigint(20) NULL COMMENT '澶勭悊鐢ㄦ埛' AFTER `processed`; +-- 2021-06-28 -- +ALTER TABLE `trade_refund` + ADD COLUMN `site_id` smallint(0) NOT NULL COMMENT '绔欑偣' AFTER `id`, + ADD COLUMN `user_id` bigint(20) NOT NULL COMMENT '鐢ㄦ埛' AFTER `payment_id`, + DROP INDEX `trade_refund_order_id`; +ALTER TABLE `cms_content_related` + DROP INDEX `cms_content_related_user_id`, + ADD INDEX `cms_content_related_content_id`(`content_id`, `sort`); +ALTER TABLE `trade_refund` + ADD INDEX `trade_refund_user_id`(`user_id`, `payment_id`, `status`); +-- 2021-06-30 -- +UPDATE `sys_module` SET `sort` = '7' WHERE `id` = 'account_history_list'; +UPDATE `sys_module` SET `sort` = '6' WHERE `id` = 'account_list'; +UPDATE `sys_module` SET `sort` = '5' WHERE `id` = 'refund_list'; +INSERT INTO `sys_module` VALUES ('payment_history_list', 'tradePaymentHistory/list', NULL, 'icon-exchange', 'trade_menu', 1, 4); +INSERT INTO `sys_module_lang` VALUES ('payment_history_list', 'en', 'Payment history'); +INSERT INTO `sys_module_lang` VALUES ('payment_history_list', 'ja', '鏀墪姝'); +INSERT INTO `sys_module_lang` VALUES ('payment_history_list', 'zh', '鏀粯鍘嗗彶'); +ALTER TABLE `trade_payment` + CHANGE COLUMN `status` `status` int(11) NOT NULL COMMENT '鐘舵:0寰呮敮浠,1宸叉敮浠,2寰呴娆,3宸查娆,4宸插叧闂' after `ip`; +-- 2021-07-01 -- +ALTER TABLE `trade_order` + ADD COLUMN `title` varchar(255) NOT NULL COMMENT '鏍囬' AFTER `user_id`; +-- 2021-07-03 -- +UPDATE `sys_module` SET `authorized_url` = 'tradeAccount/save,sysUser/lookup' WHERE `id` ='account_add'; +INSERT INTO `sys_module` VALUES ('order_confirm', 'tradeOrder/confirmParameters', 'tradeOrder/confirm', NULL, 'order_list', 0, 0); +INSERT INTO `sys_module` VALUES ('order_process', 'tradeOrder/processParameters', 'tradeOrder/process', NULL, 'order_list', 0, 0); +INSERT INTO `sys_module` VALUES ('order_view', 'tradeOrder/view', NULL, NULL, 'order_list', 0, 0); +INSERT INTO `sys_module_lang` VALUES ('order_confirm', 'en', 'Confirm order'); +INSERT INTO `sys_module_lang` VALUES ('order_confirm', 'ja', '娉ㄦ枃銇⒑瑾'); +INSERT INTO `sys_module_lang` VALUES ('order_confirm', 'zh', '纭璁㈠崟'); +INSERT INTO `sys_module_lang` VALUES ('order_process', 'en', 'Process order'); +INSERT INTO `sys_module_lang` VALUES ('order_process', 'ja', '銉椼儹銈汇偣銈兗銉銉'); +INSERT INTO `sys_module_lang` VALUES ('order_process', 'zh', '澶勭悊璁㈠崟'); +INSERT INTO `sys_module_lang` VALUES ('order_view', 'en', 'View'); +INSERT INTO `sys_module_lang` VALUES ('order_view', 'ja', '瑕嬨倠'); +INSERT INTO `sys_module_lang` VALUES ('order_view', 'zh', '鏌ョ湅'); +INSERT INTO `sys_module` VALUES ('payment_list', 'tradePayment/list', 'sysUser/lookup', 'icon-money', 'trade_menu', 1, 3); +INSERT INTO `sys_module_lang` VALUES ('payment_list', 'en', 'Payment management'); +INSERT INTO `sys_module_lang` VALUES ('payment_list', 'ja', '鏀墪銇勭鐞'); +INSERT INTO `sys_module_lang` VALUES ('payment_list', 'zh', '鏀粯绠＄悊'); +UPDATE `sys_module` SET `authorized_url` = 'tradePaymentHistory/view' WHERE `id` ='payment_history_list'; +INSERT INTO `sys_module` VALUES ('refund_refuse', 'tradeRefund/refuseParameters', 'tradeOrder/refuse', '', 'refund_list', 0, 0); +INSERT INTO `sys_module_lang` VALUES ('refund_refuse', 'en', 'Refuse'); +INSERT INTO `sys_module_lang` VALUES ('refund_refuse', 'ja', '銇斻伩'); +INSERT INTO `sys_module_lang` VALUES ('refund_refuse', 'zh', '鎷掔粷'); +-- 2021-07-04 -- +UPDATE `sys_module` SET `menu` = '1' WHERE `id` ='trade_menu'; +-- 2021-06-08 -- +DELETE FROM `sys_module` WHERE `id` ='repo_sync'; +DELETE FROM `sys_module_lang` WHERE `module_id` ='repo_sync'; +-- 2021-07-09 -- +ALTER TABLE `sys_extend_field` + ADD INDEX `sys_extend_field_input_type` (`extend_id`, `input_type`,`searchable`); +-- 2021-07-11 -- +INSERT INTO `sys_module` VALUES ('report_visit', 'report/visit', NULL, 'icon-bolt', 'user_menu', 1, 6); +INSERT INTO `sys_module_lang` VALUES ('report_visit', 'en', 'Visit report'); +INSERT INTO `sys_module_lang` VALUES ('report_visit', 'ja', '銈€偗銈汇偣鐩ｈ'); +INSERT INTO `sys_module_lang` VALUES ('report_visit', 'zh', '缃戠珯璁块棶鐩戞帶'); +-- 221-07-20 -- +ALTER TABLE `trade_payment_history` COMMENT = '鏀粯璁㈠崟娴佹按'; \ No newline at end of file diff --git a/publiccms-parent/publiccms-core/src/main/resources/initialization/upgrade/V4.0.180707-V4.0.180825.sql b/publiccms-parent/publiccms-core/src/main/resources/initialization/upgrade/V4.0.180707-V4.0.180825.sql deleted file mode 100644 index 061802d1e..000000000 --- a/publiccms-parent/publiccms-core/src/main/resources/initialization/upgrade/V4.0.180707-V4.0.180825.sql +++ /dev/null @@ -1,39 +0,0 @@ --- 20180711 -- -ALTER TABLE `sys_site` - ADD COLUMN `parent_id` smallint(6) DEFAULT NULL COMMENT '鐖剁珯鐐笽D' AFTER `id`, - MODIFY COLUMN `name` varchar(50) NOT NULL COMMENT '绔欑偣鍚' AFTER `parent_id`; --- 20180714 -- -UPDATE `sys_module` SET `authorized_url` = 'cmsContent/addMore,file/doUpload,cmsContent/lookup,cmsContent/lookup_list,cmsContent/save,ueditor,ckeditor/upload,kindeditor/upload' WHERE `id` ='content_add'; -UPDATE `sys_module` SET `authorized_url` = 'cmsContent/addMore,file/doUpload,cmsContent/lookup,cmsContent/lookup_list,cmsContent/save,ueditor,ckeditor/upload,kindeditor/upload' WHERE `id` ='myself_content_add'; -UPDATE `sys_module` SET `authorized_url` = 'sysConfigData/save,sysConfigData/edit',url = NULL WHERE `id` ='config_data_edit'; --- 20180811 -- -ALTER TABLE `sys_dept` ADD COLUMN `owns_all_config` tinyint(1) NOT NULL DEFAULT 1 COMMENT '鎷ユ湁鍏ㄩ儴閰嶇疆鏉冮檺' AFTER `owns_all_page`; -CREATE TABLE `sys_dept_config` ( - `dept_id` int(11) NOT NULL COMMENT '閮ㄩ棬ID', - `config` varchar(100) NOT NULL COMMENT '閰嶇疆', - PRIMARY KEY (`dept_id`,`config`) -) COMMENT='閮ㄩ棬閰嶇疆'; -ALTER TABLE `sys_user` ADD COLUMN `owns_all_content` tinyint(1) NOT NULL DEFAULT 1 COMMENT '鎷ユ湁鎵鏈夊唴瀹规潈闄' AFTER `dept_id`; -UPDATE `sys_user` SET `owns_all_content` = '0' WHERE `superuser_access` = '0'; --- 20180813 -- -UPDATE `sys_module` SET `authorized_url` = 'cmsWebFile/unzip',url = 'cmsWebFile/unzipParameters' WHERE `id` ='webfile_unzip'; --- 20180820 -- -UPDATE `sys_module` SET `authorized_url` = 'cmsPlace/check,cmsPlace/uncheck' WHERE `id` ='place_check'; --- 20180821 -- -UPDATE `sys_module` SET `authorized_url` = 'cmsTemplate/help,cmsTemplate/savePlace,cmsTemplate/chipLookup,cmsWebFile/lookup,cmsWebFile/contentForm,placeTemplate/form' WHERE `id` ='place_template_content'; -DELETE FROM `sys_email_token`; -ALTER TABLE `sys_email_token` ADD COLUMN `expiry_date` datetime(0) NOT NULL COMMENT '杩囨湡鏃ユ湡' AFTER `create_date`; -ALTER TABLE `sys_user_token` ADD COLUMN `expiry_date` datetime(0) DEFAULT NULL COMMENT '杩囨湡鏃ユ湡' AFTER `create_date`; -ALTER TABLE `sys_app_token` ADD COLUMN `expiry_date` datetime(0) DEFAULT NULL COMMENT '杩囨湡鏃ユ湡' AFTER `create_date`; -ALTER TABLE `sys_app` ADD COLUMN `expiry_minutes` int(0) NULL COMMENT '杩囨湡鏃堕棿' AFTER `authorized_apis`; -UPDATE `sys_user_token` SET `expiry_date` = date_add(`create_date`, interval 30 day); -UPDATE `sys_app_token` SET `expiry_date` = date_add(`create_date`, interval 30 minute); -UPDATE `sys_app` SET `expiry_minutes` = '30'; -INSERT INTO `sys_module` VALUES ('app_issue', 'sysApp/issueParameters', 'sysAppToken/issue', NULL, 'app_list', 0, 0); -INSERT INTO `sys_module_lang` VALUES ('app_issue', '', '棰佸彂鎺堟潈'); -INSERT INTO `sys_module_lang` VALUES ('app_issue', 'en', 'Issue authorization'); -UPDATE `sys_module` SET `attached` = '' WHERE `id` ='myself'; -UPDATE `sys_module` SET `attached` = '' WHERE `id` ='content'; -UPDATE `sys_module` SET `attached` = '' WHERE `id` ='category'; -UPDATE `sys_module` SET `attached` = '' WHERE `id` ='develop'; -UPDATE `sys_module` SET `attached` = '' WHERE `id` ='page'; \ No newline at end of file diff --git a/publiccms-parent/publiccms-core/src/main/resources/initialization/upgrade/V4.0.180825-V4.0.181024.sql b/publiccms-parent/publiccms-core/src/main/resources/initialization/upgrade/V4.0.180825-V4.0.181024.sql deleted file mode 100644 index 56bfc74ce..000000000 --- a/publiccms-parent/publiccms-core/src/main/resources/initialization/upgrade/V4.0.180825-V4.0.181024.sql +++ /dev/null @@ -1,172 +0,0 @@ -UPDATE `sys_module_lang` SET `value` = 'Add' WHERE `lang` ='en' and module_id = 'myself_content_add'; -UPDATE `sys_module_lang` SET `value` = 'Delete' WHERE `lang` ='en' and module_id = 'myself_content_delete'; -UPDATE `sys_module_lang` SET `value` = 'Publish' WHERE `lang` ='en' and module_id = 'myself_content_publish'; -UPDATE `sys_module_lang` SET `value` = 'Push' WHERE `lang` ='en' and module_id = 'myself_content_push'; -UPDATE `sys_module_lang` SET `value` = 'Refresh' WHERE `lang` ='en' and module_id = 'myself_content_refresh'; --- 20181022 -- -UPDATE `sys_module_lang` SET `lang` = 'zh' WHERE `lang` =''; -INSERT INTO `sys_module_lang` VALUES ('app_add', 'ja', '杩藉姞/澶夋洿'); -INSERT INTO `sys_module_lang` VALUES ('app_client_disable', 'ja', '绂佹'); -INSERT INTO `sys_module_lang` VALUES ('app_client_enable', 'ja', '銈兂'); -INSERT INTO `sys_module_lang` VALUES ('app_client_list', 'ja', '銈儵銈ゃ偄銉炽儓绠＄悊'); -INSERT INTO `sys_module_lang` VALUES ('app_issue', 'ja', '鐧鸿妯╅檺'); -INSERT INTO `sys_module_lang` VALUES ('app_delete', 'ja', '鍓婇櫎'); -INSERT INTO `sys_module_lang` VALUES ('app_list', 'ja', 'app妯╅檺'); -INSERT INTO `sys_module_lang` VALUES ('category', 'ja', '鍒嗛'); -INSERT INTO `sys_module_lang` VALUES ('category_add', 'ja', '杩藉姞/澶夋洿'); -INSERT INTO `sys_module_lang` VALUES ('category_delete', 'ja', '鍓婇櫎'); -INSERT INTO `sys_module_lang` VALUES ('category_extend', 'ja', '鍒嗛鎷″嫉'); -INSERT INTO `sys_module_lang` VALUES ('category_menu', 'ja', '鍒嗛绠＄悊'); -INSERT INTO `sys_module_lang` VALUES ('category_move', 'ja', '绉诲嫊'); -INSERT INTO `sys_module_lang` VALUES ('category_publish', 'ja', '鐢熸垚'); -INSERT INTO `sys_module_lang` VALUES ('category_push', 'ja', '銇娿仚銇欍倎'); -INSERT INTO `sys_module_lang` VALUES ('category_type_add', 'ja', '杩藉姞/澶夋洿'); -INSERT INTO `sys_module_lang` VALUES ('category_type_change', 'ja', '銈裤偆銉楀鏇'); -INSERT INTO `sys_module_lang` VALUES ('category_type_delete', 'ja', '鍓婇櫎'); -INSERT INTO `sys_module_lang` VALUES ('category_type_list', 'ja', '鍒嗛銈裤偆銉'); -INSERT INTO `sys_module_lang` VALUES ('clearcache', 'ja', '銈儯銉冦偡銉ャ倰銉儠銉儍銈枫儱銇欍倠'); -INSERT INTO `sys_module_lang` VALUES ('config_add', 'ja', '杩藉姞/澶夋洿'); -INSERT INTO `sys_module_lang` VALUES ('config_data_delete', 'ja', '銉囥兗銈裤倰銈儶銈'); -INSERT INTO `sys_module_lang` VALUES ('config_data_edit', 'ja', '澶夋洿'); -INSERT INTO `sys_module_lang` VALUES ('config_data_list', 'ja', '銈点偆銉堣ō瀹'); -INSERT INTO `sys_module_lang` VALUES ('config_delete', 'ja', '瑷畾銈掑墛闄'); -INSERT INTO `sys_module_lang` VALUES ('config_list', 'ja', '銈点偆銉堣ō瀹氱鐞'); -INSERT INTO `sys_module_lang` VALUES ('config_list_data_dictionary', 'ja', '銉囥兗銈胯緸鏇搞倰閬告姙'); -INSERT INTO `sys_module_lang` VALUES ('config_menu', 'ja', '瑷畾绠＄悊'); -INSERT INTO `sys_module_lang` VALUES ('content', 'ja', '銈炽兂銉嗐兂銉'); -INSERT INTO `sys_module_lang` VALUES ('content_add', 'ja', '杩藉姞/澶夋洿'); -INSERT INTO `sys_module_lang` VALUES ('content_check', 'ja', '瀵╂熁'); -INSERT INTO `sys_module_lang` VALUES ('content_delete', 'ja', '鍓婇櫎'); -INSERT INTO `sys_module_lang` VALUES ('content_extend', 'ja', '銈炽兂銉嗐兂銉勬嫛寮'); -INSERT INTO `sys_module_lang` VALUES ('content_menu', 'ja', '銈炽兂銉嗐兂銉勭鐞'); -INSERT INTO `sys_module_lang` VALUES ('content_move', 'ja', '绉诲嫊'); -INSERT INTO `sys_module_lang` VALUES ('content_publish', 'ja', '鐢熸垚'); -INSERT INTO `sys_module_lang` VALUES ('content_push', 'ja', '銇娿仚銇欍倎'); -INSERT INTO `sys_module_lang` VALUES ('content_recycle_delete', 'ja', '鍓婇櫎'); -INSERT INTO `sys_module_lang` VALUES ('content_recycle_list', 'ja', '銈炽兂銉嗐兂銉勩仈銇跨'); -INSERT INTO `sys_module_lang` VALUES ('content_recycle_recycle', 'ja', '鍙栥倞鎴汇仐'); -INSERT INTO `sys_module_lang` VALUES ('content_refresh', 'ja', '銉儠銉儍銈枫儱'); -INSERT INTO `sys_module_lang` VALUES ('content_select_category', 'ja', '鍒嗛銈掗伕鎶'); -INSERT INTO `sys_module_lang` VALUES ('content_select_category_type', 'ja', '鍒嗛銈裤偆銉椼倰閬告姙'); -INSERT INTO `sys_module_lang` VALUES ('content_select_content', 'ja', '銈炽兂銉嗐兂銉勩倰閬告姙'); -INSERT INTO `sys_module_lang` VALUES ('content_select_tag_type', 'ja', '銈裤偘銇ó椤炪倰閬告姙'); -INSERT INTO `sys_module_lang` VALUES ('content_select_template', 'ja', '銉嗐兂銉椼儸銉笺儓銈掗伕鎶'); -INSERT INTO `sys_module_lang` VALUES ('content_select_user', 'ja', '銉︺兗銈躲兗銈掗伕鎶'); -INSERT INTO `sys_module_lang` VALUES ('content_sort', 'ja', '銉堛儍銉斻兂銈'); -INSERT INTO `sys_module_lang` VALUES ('content_uncheck', 'ja', '瀵╂熁銈掑彇銈婃秷銇'); -INSERT INTO `sys_module_lang` VALUES ('content_view', 'ja', '瑕嬨倠'); -INSERT INTO `sys_module_lang` VALUES ('dept_add', 'ja', '杩藉姞/澶夋洿'); -INSERT INTO `sys_module_lang` VALUES ('dept_delete', 'ja', '鍓婇櫎'); -INSERT INTO `sys_module_lang` VALUES ('dept_list', 'ja', '閮ㄩ杸绠＄悊'); -INSERT INTO `sys_module_lang` VALUES ('dept_user_list', 'ja', '浜轰簨绠＄悊'); -INSERT INTO `sys_module_lang` VALUES ('develop', 'ja', '闁嬬櫤'); -INSERT INTO `sys_module_lang` VALUES ('dictionary_add', 'ja', '杩藉姞/澶夋洿'); -INSERT INTO `sys_module_lang` VALUES ('dictionary_delete', 'ja', '鍓婇櫎'); -INSERT INTO `sys_module_lang` VALUES ('dictionary_list', 'ja', '銉囥兗銈胯緸鏇'); -INSERT INTO `sys_module_lang` VALUES ('domain_config', 'ja', '澶夋洿'); -INSERT INTO `sys_module_lang` VALUES ('domain_list', 'ja', '銉夈儭銈ゃ兂鍚嶃倰銉愩偆銉炽儔'); -INSERT INTO `sys_module_lang` VALUES ('file_menu', 'ja', '銉曘偂銈ゃ儷绠＄悊'); -INSERT INTO `sys_module_lang` VALUES ('log_login', 'ja', '銉偘銈ゃ兂銉偘'); -INSERT INTO `sys_module_lang` VALUES ('log_login_delete', 'ja', '鍓婇櫎'); -INSERT INTO `sys_module_lang` VALUES ('log_menu', 'ja', '銉偘绠＄悊'); -INSERT INTO `sys_module_lang` VALUES ('log_operate', 'ja', '鎿嶄綔銉偘'); -INSERT INTO `sys_module_lang` VALUES ('log_operate_delete', 'ja', '鍓婇櫎'); -INSERT INTO `sys_module_lang` VALUES ('log_operate_view', 'ja', '瑕嬨倠'); -INSERT INTO `sys_module_lang` VALUES ('log_task', 'ja', '銈裤偣銈▓鐢汇儹銈'); -INSERT INTO `sys_module_lang` VALUES ('log_task_delete', 'ja', '鍓婇櫎'); -INSERT INTO `sys_module_lang` VALUES ('log_task_view', 'ja', '瑕嬨倠'); -INSERT INTO `sys_module_lang` VALUES ('log_upload', 'ja', '銉曘偂銈ゃ儷銈€儍銉椼儹銉笺儔銉偘'); -INSERT INTO `sys_module_lang` VALUES ('maintenance', 'ja', '缍寔'); -INSERT INTO `sys_module_lang` VALUES ('model_add', 'ja', '杩藉姞/澶夋洿'); -INSERT INTO `sys_module_lang` VALUES ('model_delete', 'ja', '鍓婇櫎'); -INSERT INTO `sys_module_lang` VALUES ('model_list', 'ja', '銈炽兂銉嗐兂銉勩儮銉囥儷绠＄悊'); -INSERT INTO `sys_module_lang` VALUES ('myself', 'ja', '鍊嬩汉'); -INSERT INTO `sys_module_lang` VALUES ('myself_content', 'ja', '銉炪偆銈炽兂銉嗐兂銉'); -INSERT INTO `sys_module_lang` VALUES ('myself_content_add', 'ja', '澶夋洿'); -INSERT INTO `sys_module_lang` VALUES ('myself_content_delete', 'ja', '鍓婇櫎'); -INSERT INTO `sys_module_lang` VALUES ('myself_content_publish', 'ja', '鐢熸垚'); -INSERT INTO `sys_module_lang` VALUES ('myself_content_push', 'ja', '銇娿仚銇欍倎'); -INSERT INTO `sys_module_lang` VALUES ('myself_content_refresh', 'ja', '銉儠銉儍銈枫儱'); -INSERT INTO `sys_module_lang` VALUES ('myself_log_login', 'ja', '銉炪偆銉偘銈ゃ兂銉偘'); -INSERT INTO `sys_module_lang` VALUES ('myself_log_operate', 'ja', '銉炪偆鎿嶄綔銉偘'); -INSERT INTO `sys_module_lang` VALUES ('myself_menu', 'ja', '绉併伀闁㈤ｃ仚銈嬫儏鍫'); -INSERT INTO `sys_module_lang` VALUES ('myself_password', 'ja', '銉戙偣銉兗銉夈倰澶夋洿'); -INSERT INTO `sys_module_lang` VALUES ('myself_token', 'ja', '绉併伄銉偘銈ゃ兂鎺堟ī'); -INSERT INTO `sys_module_lang` VALUES ('page', 'ja', '銉氥兗銈'); -INSERT INTO `sys_module_lang` VALUES ('page_list', 'ja', '銉氥兗銈哥鐞'); -INSERT INTO `sys_module_lang` VALUES ('page_menu', 'ja', '銉氥兗銈搞伄銉°兂銉嗐儕銉炽偣'); -INSERT INTO `sys_module_lang` VALUES ('page_metadata', 'ja', '銉°偪銉囥兗銈跨鐞'); -INSERT INTO `sys_module_lang` VALUES ('page_publish', 'ja', '銉氥兗銈搞倰鐢熸垚銇欍倠'); -INSERT INTO `sys_module_lang` VALUES ('page_save', 'ja', '銉氥兗銈歌ō瀹氥倰淇濆瓨'); -INSERT INTO `sys_module_lang` VALUES ('page_select_category', 'ja', '鍒嗛銈掗伕鎶'); -INSERT INTO `sys_module_lang` VALUES ('page_select_category_type', 'ja', '鍒嗛銈裤偆銉椼倰閬告姙'); -INSERT INTO `sys_module_lang` VALUES ('page_select_content', 'ja', '銈炽兂銉嗐兂銉勩倰閬告姙'); -INSERT INTO `sys_module_lang` VALUES ('page_select_tag_type', 'ja', '銈裤偘銇ó椤炪倰閬告姙'); -INSERT INTO `sys_module_lang` VALUES ('page_select_template', 'ja', '閫夋嫨妯℃澘銉嗐兂銉椼儸銉笺儓銈掗伕鎶'); -INSERT INTO `sys_module_lang` VALUES ('page_select_user', 'ja', '銉︺兗銈躲兗銈掗伕鎶'); -INSERT INTO `sys_module_lang` VALUES ('place_add', 'ja', '鎺ㄥエ銉撱儍銉堛儑銉笺偪銇拷鍔/澶夋洿'); -INSERT INTO `sys_module_lang` VALUES ('place_check', 'ja', '鎺ㄥエ銉撱儍銉堛儑銉笺偪銈掔⒑瑾嶃仚銈'); -INSERT INTO `sys_module_lang` VALUES ('place_clear', 'ja', '鎺ㄥエ銉撱儍銉堛儑銉笺偪銇偗銉偄'); -INSERT INTO `sys_module_lang` VALUES ('place_data_list', 'ja', '鎺ㄥエ銉撱儍銉堛儑銉笺偪'); -INSERT INTO `sys_module_lang` VALUES ('place_delete', 'ja', '鎺ㄥエ銉撱儍銉堛儑銉笺偪銈掑墛闄ゃ仚銈'); -INSERT INTO `sys_module_lang` VALUES ('place_list', 'ja', '銉氥兗銈搞儠銉┿偘銉°兂銉堢鐞'); -INSERT INTO `sys_module_lang` VALUES ('place_publish', 'ja', '銉儶銉笺偣'); -INSERT INTO `sys_module_lang` VALUES ('place_refresh', 'ja', '鍒锋柊鎺ㄨ崘浣嶆暟鎹帹濂ㄣ儞銉冦儓銉囥兗銈裤倰銉儠銉儍銈枫儱銇欍倠'); -INSERT INTO `sys_module_lang` VALUES ('place_template_content', 'ja', '澶夋洿'); -INSERT INTO `sys_module_lang` VALUES ('place_template_data_dictionary', 'ja', '銉囥兗銈胯緸鏇搞倰閬告姙'); -INSERT INTO `sys_module_lang` VALUES ('place_template_fragment', 'ja', '銉嗐兂銉椼儸銉笺儓銉曘儵銈般儭銉炽儓'); -INSERT INTO `sys_module_lang` VALUES ('place_template_help', 'ja', '銉嗐兂銉椼儸銉笺儓銇儤銉儣'); -INSERT INTO `sys_module_lang` VALUES ('place_template_list', 'ja', '銉氥兗銈搞儠銉┿偘銉°兂銉堛儐銉炽儣銉兗銉'); -INSERT INTO `sys_module_lang` VALUES ('place_template_metadata', 'ja', '銉°偪銉囥兗銈裤伄澶夋洿'); -INSERT INTO `sys_module_lang` VALUES ('place_template_place', 'ja', '銉氥兗銈搞儠銉┿偘銉°兂銉'); -INSERT INTO `sys_module_lang` VALUES ('place_template_webfile', 'ja', '銈︺偋銉栥偟銈ゃ儓銉曘偂銈ゃ儷'); -INSERT INTO `sys_module_lang` VALUES ('place_view', 'ja', '鎺ㄥエ銉撱儍銉堛儑銉笺偪銈掕銈'); -INSERT INTO `sys_module_lang` VALUES ('report_user', 'ja', '銉︺兗銈躲兗銉囥兗銈裤伄鐩ｈ'); -INSERT INTO `sys_module_lang` VALUES ('role_add', 'ja', '杩藉姞/澶夋洿'); -INSERT INTO `sys_module_lang` VALUES ('role_delete', 'ja', '鍓婇櫎'); -INSERT INTO `sys_module_lang` VALUES ('role_list', 'ja', '褰瑰壊绠＄悊'); -INSERT INTO `sys_module_lang` VALUES ('system_menu', 'ja', '銈枫偣銉嗐儬銉°兂銉嗐儕銉炽偣'); -INSERT INTO `sys_module_lang` VALUES ('tag_add', 'ja', '杩藉姞/澶夋洿'); -INSERT INTO `sys_module_lang` VALUES ('tag_delete', 'ja', '鍓婇櫎'); -INSERT INTO `sys_module_lang` VALUES ('tag_list', 'ja', '銉┿儥銉鐞'); -INSERT INTO `sys_module_lang` VALUES ('tag_type_delete', 'ja', '鍓婇櫎'); -INSERT INTO `sys_module_lang` VALUES ('tag_type_list', 'ja', '銈裤偘銇垎椤'); -INSERT INTO `sys_module_lang` VALUES ('tag_type_save', 'ja', '杩藉姞/澶夋洿'); -INSERT INTO `sys_module_lang` VALUES ('task_add', 'ja', '杩藉姞/澶夋洿'); -INSERT INTO `sys_module_lang` VALUES ('task_delete', 'ja', '鍓婇櫎'); -INSERT INTO `sys_module_lang` VALUES ('task_list', 'ja', '銈裤偣銈▓鐢'); -INSERT INTO `sys_module_lang` VALUES ('task_pause', 'ja', '鍋滄'); -INSERT INTO `sys_module_lang` VALUES ('task_recreate', 'ja', '銉偦銉冦儓'); -INSERT INTO `sys_module_lang` VALUES ('task_resume', 'ja', '鍥炲京'); -INSERT INTO `sys_module_lang` VALUES ('task_runonce', 'ja', '瀹熻'); -INSERT INTO `sys_module_lang` VALUES ('task_template_content', 'ja', '澶夋洿'); -INSERT INTO `sys_module_lang` VALUES ('task_template_delete', 'ja', '鍓婇櫎'); -INSERT INTO `sys_module_lang` VALUES ('task_template_fragment', 'ja', '銈裤偣銈▓鐢汇偣銈儶銉椼儓鏂墖'); -INSERT INTO `sys_module_lang` VALUES ('task_template_help', 'ja', '銉樸儷銉'); -INSERT INTO `sys_module_lang` VALUES ('task_template_list', 'ja', '銈裤偣銈▓鐢汇偣銈儶銉椼儓'); -INSERT INTO `sys_module_lang` VALUES ('template_content', 'ja', '澶夋洿'); -INSERT INTO `sys_module_lang` VALUES ('template_content-type', 'ja', 'content-type銈掗伕鎶'); -INSERT INTO `sys_module_lang` VALUES ('template_content_form', 'ja', '銈炽兂銉嗐兂銉勯佷俊銉曘偐銉笺儬'); -INSERT INTO `sys_module_lang` VALUES ('template_data_dictionary', 'ja', '銉囥兗銈胯緸鏇搞倰閬告姙'); -INSERT INTO `sys_module_lang` VALUES ('template_delete', 'ja', '鍓婇櫎'); -INSERT INTO `sys_module_lang` VALUES ('template_demo', 'ja', '銉嗐兂銉椼儸銉笺儓銇緥'); -INSERT INTO `sys_module_lang` VALUES ('template_fragment', 'ja', '銉嗐兂銉椼儸銉笺儓銉曘儵銈般儭銉炽儓'); -INSERT INTO `sys_module_lang` VALUES ('template_help', 'ja', '銉嗐兂銉椼儸銉笺儓銉樸儷銉'); -INSERT INTO `sys_module_lang` VALUES ('template_list', 'ja', '銉嗐兂銉椼儸銉笺儓銉曘偂銈ゃ儷绠＄悊'); -INSERT INTO `sys_module_lang` VALUES ('template_metadata', 'ja', '銉°偪銉囥兗銈裤伄澶夋洿'); -INSERT INTO `sys_module_lang` VALUES ('template_place', 'ja', '銉氥兗銈搞儠銉┿偘銉°兂銉'); -INSERT INTO `sys_module_lang` VALUES ('template_place_form', 'ja', '銉氥兗銈搞儠銉┿偘銉°兂銉堟彁鍑恒儠銈┿兗銉'); -INSERT INTO `sys_module_lang` VALUES ('template_upload', 'ja', '銉嗐兂銉椼儸銉笺儓銈掋偄銉冦儣銉兗銉夈仚銈'); -INSERT INTO `sys_module_lang` VALUES ('template_website_file', 'ja', '銈︺偋銉栥偟銈ゃ儓銉曘偂銈ゃ儷'); -INSERT INTO `sys_module_lang` VALUES ('user_add', 'ja', '杩藉姞/澶夋洿'); -INSERT INTO `sys_module_lang` VALUES ('user_disable', 'ja', '绂佹'); -INSERT INTO `sys_module_lang` VALUES ('user_enable', 'ja', '銈兂'); -INSERT INTO `sys_module_lang` VALUES ('user_list', 'ja', '銉︺兗銈躲兗绠＄悊'); -INSERT INTO `sys_module_lang` VALUES ('user_menu', 'ja', '銉︺兗銈躲兗绠＄悊'); -INSERT INTO `sys_module_lang` VALUES ('webfile_content', 'ja', '銉曘偂銈ゃ儷銇鏇'); -INSERT INTO `sys_module_lang` VALUES ('webfile_directory', 'ja', '鐩尣銈掍綔鎴'); -INSERT INTO `sys_module_lang` VALUES ('webfile_list', 'ja', '銈︺偋銉栥偟銈ゃ儓銇儠銈°偆銉鐞'); -INSERT INTO `sys_module_lang` VALUES ('webfile_unzip', 'ja', '瑙ｅ噸'); -INSERT INTO `sys_module_lang` VALUES ('webfile_upload', 'ja', '銈€儍銉椼儹銉笺儔'); -INSERT INTO `sys_module_lang` VALUES ('webfile_zip', 'ja', '鍦х府'); -INSERT INTO `sys_module_lang` VALUES ('word_list', 'ja', '妞滅储銉兗銉夌鐞'); \ No newline at end of file diff --git a/publiccms-parent/publiccms-core/src/main/resources/initialization/upgrade/V4.0.181024-V4.0.190312.sql b/publiccms-parent/publiccms-core/src/main/resources/initialization/upgrade/V4.0.181024-V4.0.190312.sql deleted file mode 100644 index 985ed7f95..000000000 --- a/publiccms-parent/publiccms-core/src/main/resources/initialization/upgrade/V4.0.181024-V4.0.190312.sql +++ /dev/null @@ -1,186 +0,0 @@ --- 2018-11-06 -- -ALTER TABLE `cms_category` - MODIFY COLUMN `path` varchar(1000) DEFAULT NULL COMMENT '棣栭〉璺緞' AFTER `template_path`, - MODIFY COLUMN `url` varchar(1000) DEFAULT NULL COMMENT '棣栭〉鍦板潃' AFTER `has_static`, - MODIFY COLUMN `content_path` varchar(1000) DEFAULT NULL COMMENT '鍐呭璺緞' AFTER `url`; -ALTER TABLE `cms_content` - MODIFY COLUMN `url` varchar(1000) DEFAULT NULL COMMENT '鍦板潃' AFTER `has_static`; -ALTER TABLE `cms_content_attribute` - MODIFY COLUMN `source_url` varchar(1000) DEFAULT NULL COMMENT '鏉ユ簮鍦板潃' AFTER `source`; -ALTER TABLE `cms_place` - MODIFY COLUMN `url` varchar(1000) default NULL COMMENT '瓒呴摼鎺' AFTER `title`; -ALTER TABLE `cms_content_related` - MODIFY COLUMN `url` varchar(1000) default NULL COMMENT '鎺ㄨ崘閾炬帴鍦板潃' AFTER `user_id`; --- 2018-11-07 -- -CREATE TABLE `cms_comment` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID', - `site_id` smallint(6) NOT NULL COMMENT '绔欑偣ID', - `user_id` bigint(20) NOT NULL COMMENT '鐢ㄦ埛ID', - `content_id` bigint(20) NOT NULL COMMENT '鏂囩珷鍐呭', - `check_user_id` bigint(20) DEFAULT NULL COMMENT '瀹℃牳鐢ㄦ埛', - `check_date` datetime DEFAULT NULL COMMENT '瀹℃牳鏃ユ湡', - `update_date` datetime DEFAULT NULL COMMENT '鏇存柊鏃ユ湡', - `create_date` datetime NOT NULL COMMENT '鍒涘缓鏃ユ湡', - `status` int(11) NOT NULL COMMENT '鐘舵侊細1銆佸凡鍙戝竷 2銆佸緟瀹℃牳', - `disabled` tinyint(1) NOT NULL COMMENT '宸茬鐢', - `text` text COMMENT '鍐呭', - PRIMARY KEY (`id`), - KEY `site_id` (`site_id`,`content_id`,`status`,`disabled`, `create_date`) -) COMMENT='璇勮'; -INSERT INTO `sys_module` VALUES ('comment_list', 'cmsComment/list', 'sysUser/lookup', '', 'content_extend', 1, 4); -INSERT INTO `sys_module` VALUES ('comment_check', NULL, 'cmsComment/check', NULL, 'comment_list', 0, 0); -INSERT INTO `sys_module` VALUES ('comment_uncheck', NULL, 'cmsComment/uncheck', NULL, 'comment_list', 0, 0); -INSERT INTO `sys_module` VALUES ('comment_delete', NULL, 'cmsComment/delete', NULL, 'comment_list', 0, 0); - -INSERT INTO `sys_module_lang` VALUES ('comment_list', 'zh', '璇勮绠＄悊'); -INSERT INTO `sys_module_lang` VALUES ('comment_list', 'en', 'Comment management'); -INSERT INTO `sys_module_lang` VALUES ('comment_list', 'ja', '銈炽儭銉炽儓绠＄悊'); -INSERT INTO `sys_module_lang` VALUES ('comment_check', 'zh', '瀹℃牳'); -INSERT INTO `sys_module_lang` VALUES ('comment_check', 'en', 'Check'); -INSERT INTO `sys_module_lang` VALUES ('comment_check', 'ja', '瀵╂熁'); -INSERT INTO `sys_module_lang` VALUES ('comment_uncheck', 'zh', '鍙栨秷瀹℃牳'); -INSERT INTO `sys_module_lang` VALUES ('comment_uncheck', 'en', 'Uncheck'); -INSERT INTO `sys_module_lang` VALUES ('comment_uncheck', 'ja', '瀵╂熁銈掑彇銈婃秷銇'); -INSERT INTO `sys_module_lang` VALUES ('comment_delete', 'zh', '鍒犻櫎'); -INSERT INTO `sys_module_lang` VALUES ('comment_delete', 'en', 'Delete'); -INSERT INTO `sys_module_lang` VALUES ('comment_delete', 'ja', '鍓婇櫎'); --- 2018-11-09 -- -UPDATE `sys_module` SET `attached` = replace(replace(`attached`,'',''); -ALTER TABLE `sys_module` - MODIFY COLUMN `attached` varchar(50) default NULL COMMENT '鏍囬闄勫姞' AFTER `authorized_url`; -ALTER TABLE `sys_user` - ADD COLUMN `salt` varchar(20) NULL COMMENT '娣锋穯鐮,涓虹┖鏃跺垯瀵嗙爜涓簃d5,涓10浣嶆椂sha512(sha512(password)+salt)' AFTER `password`, - ADD COLUMN `weak_password` tinyint(1) NOT NULL DEFAULT 0 COMMENT '寮卞瘑鐮' AFTER `salt`, - MODIFY COLUMN `password` varchar(128) NOT NULL COMMENT '瀵嗙爜' AFTER `name`; --- 2018-12-07 -- -ALTER TABLE `cms_content_file` - CHANGE COLUMN `image` `file_type` varchar(20) NOT NULL COMMENT '鏂囦欢绫诲瀷' AFTER `file_path`, - CHANGE COLUMN `size` `file_size` bigint(20) NOT NULL COMMENT '鏂囦欢澶у皬' AFTER `file_type`, - DROP INDEX `image`, - DROP INDEX `size`, - ADD INDEX `file_type`(`file_type`), - ADD INDEX `file_size` (`file_size`); -UPDATE `cms_content_file` SET file_type = 'image' WHERE file_type = '1'; -UPDATE `cms_content_file` SET file_type = 'image' WHERE file_path like '%.png' or file_path like '%.jpg' or file_path like '%.gif' or file_path like '%.bmp'; -UPDATE `cms_content_file` SET file_type = 'video' WHERE file_path like '%.mp4' or file_path like '%.3gp'; -UPDATE `cms_content_file` SET file_type = 'other' WHERE file_type = '0'; --- 2018-12-20 -- -INSERT INTO `sys_module` VALUES ('content_export', NULL, 'cmsContent/export', '', 'content_menu', 1, 0); -INSERT INTO `sys_module_lang` VALUES ('content_export', 'ja', '杓稿嚭'); -INSERT INTO `sys_module_lang` VALUES ('content_export', 'zh', '瀵煎嚭'); -INSERT INTO `sys_module_lang` VALUES ('content_export', 'en', 'Export'); -ALTER TABLE `cms_place` ADD COLUMN `check_user_id` bigint(20) NULL COMMENT '瀹℃牳鐢ㄦ埛' AFTER `user_id`; -ALTER TABLE `cms_place` - DROP INDEX `publish_date`, - DROP INDEX `site_id`, - DROP INDEX `item_type`, - DROP INDEX `user_id`, - DROP INDEX `path`, - DROP INDEX `disabled`, - DROP INDEX `create_date`, - DROP INDEX `status`, - DROP INDEX `item_id`, - ADD INDEX `publish_date`(`publish_date`, `create_date`) , - ADD INDEX `site_id`(`site_id`, `path`, `status`, `disabled`), - ADD INDEX `item_type`(`item_type`, `item_id`) , - ADD INDEX `user_id`(`user_id`, `check_user_id`) ; -UPDATE `sys_module` SET `authorized_url` = 'cmsPlace/dataList,cmsPlace/export' WHERE `id` ='place_data_list'; -UPDATE `sys_module` SET `authorized_url` = 'sysUser/lookup' WHERE `id` ='place_list'; --- 2018-12-22 -- -ALTER TABLE `cms_comment` - ADD COLUMN `reply_id` bigint(20) NULL COMMENT '鍥炲ID' AFTER `user_id`, - DROP INDEX `site_id`, - ADD INDEX `site_id`(`site_id`, `content_id`, `status`, `disabled`), - ADD INDEX `update_date`(`update_date`, `create_date`), - ADD INDEX `reply_id`(`site_id`, `reply_id`); -ALTER TABLE `cms_comment` - ADD COLUMN `reply_user_id` bigint(20) NULL COMMENT '鍥炲鐢ㄦ埛ID' AFTER `reply_id`, - DROP INDEX `reply_id`, - ADD INDEX `reply_id`(`site_id`, `reply_user_id`, `reply_id`); --- 2018-12-28 -- -ALTER TABLE `cms_content` DROP INDEX `status`, - ADD COLUMN `expiry_date` datetime NULL COMMENT '杩囨湡鏃ユ湡' AFTER `publish_date`, - ADD INDEX `status` (`site_id`,`status`,`category_id`,`disabled`,`model_id`,`parent_id`,`sort`,`publish_date`,`expiry_date`); -ALTER TABLE `cms_place` DROP INDEX `publish_date`, - ADD COLUMN `expiry_date` datetime NULL COMMENT '杩囨湡鏃ユ湡' AFTER `publish_date`, - ADD INDEX `publish_date` (`publish_date`,`create_date`,`expiry_date`); --- 2019-01-01 -- -update cms_category set code=CONCAT(code,id) where (site_id,code) in ( - select * from ( - SELECT site_id,code FROM `cms_category` group by site_id,code having count(*) > 1 - ) a -) and id not in ( - select * from ( - select min(id) from cms_category where (site_id,code) in ( - SELECT site_id,code FROM `cms_category` group by site_id,code having count(*) > 1 - ) group by site_id,code - ) b -); -ALTER TABLE `cms_category` - MODIFY COLUMN `code` varchar(50) NOT NULL COMMENT '缂栫爜' AFTER `tag_type_ids`, - DROP INDEX `site_id`, - DROP INDEX `parent_id`, - DROP INDEX `disabled`, - DROP INDEX `type_id`, - DROP INDEX `allow_contribute`, - DROP INDEX `hidden`, - ADD INDEX `type_id`(`type_id`, `allow_contribute`), - ADD INDEX `site_id`(`site_id`, `parent_id`, `hidden`, `disabled`), - ADD UNIQUE INDEX `code`(`site_id`, `code`); -ALTER TABLE `cms_content` - ADD COLUMN `quote_content_id` bigint(20) NULL COMMENT '寮曠敤鍐呭ID' AFTER `parent_id`, - ADD INDEX `quote_content_id`(`site_id`, `quote_content_id`); --- 2019-01-11 -- -UPDATE `sys_module` SET `authorized_url` = 'cmsWebFile/doUpload,cmsWebFile/check' WHERE `id` ='webfile_upload'; --- 2019-01-22 -- -ALTER TABLE `cms_content` - ADD COLUMN `dictionar_values` text default NULL COMMENT '鏁版嵁瀛楀吀鍊' AFTER `tag_ids`; --- 2019-01-24 -- -ALTER TABLE `cms_dictionary` - MODIFY COLUMN `id` varchar(20) NOT NULL FIRST, - DROP PRIMARY KEY, - ADD PRIMARY KEY (`id`, `site_id`); -ALTER TABLE `cms_dictionary_data` - MODIFY COLUMN `dictionary_id` varchar(20) NOT NULL COMMENT '瀛楀吀' FIRST, - ADD COLUMN `site_id` smallint(0) NOT NULL COMMENT '绔欑偣ID' AFTER `dictionary_id`, - DROP PRIMARY KEY, - ADD PRIMARY KEY (`dictionary_id`, `site_id`, `value`); -update cms_dictionary_data a set a.site_id = (select site_id from cms_dictionary b where a.dictionary_id = b.id); -ALTER TABLE `sys_extend_field` - MODIFY COLUMN `dictionary_id` varchar(20) NULL DEFAULT NULL COMMENT '鏁版嵁瀛楀吀ID' AFTER `default_value`; --- 2019-01-24 -- -UPDATE `sys_module` SET `authorized_url` = 'cmsCategory/addMore,cmsCategory/virify,cmsTemplate/lookup,cmsCategory/categoryPath,cmsCategory/contentPath,file/doUpload,cmsCategory/save' WHERE `id` ='category_add'; -UPDATE `sys_module` SET `authorized_url` = 'cmsDictionary/save,cmsDictionary/virify' WHERE `id` ='dictionary_add'; --- 2019-01-29 -- -INSERT INTO `sys_module` VALUES ('myself_device', 'myself/userDeviceList', 'sysAppClient/enable,sysAppClient/disable', 'icon-linux', 'myself_menu', 1, 5); -UPDATE `sys_module` SET `authorized_url` = 'sysUserToken/delete' WHERE `id` ='myself_token'; -INSERT INTO `sys_module_lang`(`module_id`, `lang`, `value`) VALUES ('myself_device', 'en', 'My device'); -INSERT INTO `sys_module_lang`(`module_id`, `lang`, `value`) VALUES ('myself_device', 'ja', '绉併伄绔湯'); -INSERT INTO `sys_module_lang`(`module_id`, `lang`, `value`) VALUES ('myself_device', 'zh', '鎴戠殑璁惧'); -ALTER TABLE `sys_app_client` - ADD COLUMN `id` bigint(20) NOT NULL AUTO_INCREMENT FIRST, - DROP PRIMARY KEY, - ADD PRIMARY KEY (`id`), - ADD UNIQUE INDEX(`site_id`, `channel`, `uuid`); --- 2019-02-15 -- -ALTER TABLE `cms_place` - MODIFY COLUMN `path` varchar(100) NOT NULL COMMENT '妯℃澘璺緞' AFTER `site_id`; -DELETE FROM `cms_word` WHERE LENGTH(name) > 100; -ALTER TABLE `cms_word` - MODIFY COLUMN `name` varchar(100) NOT NULL COMMENT '鍚嶇О' AFTER `site_id`; -ALTER TABLE `sys_dept_page` - MODIFY COLUMN `page` varchar(100) NOT NULL COMMENT '椤甸潰' AFTER `dept_id`; -ALTER TABLE `sys_domain` - MODIFY COLUMN `name` varchar(100) NOT NULL COMMENT '鍩熷悕' FIRST, - MODIFY COLUMN `path` varchar(100) NULL DEFAULT NULL COMMENT '璺緞' AFTER `wild`; -ALTER TABLE `sys_role_authorized` - MODIFY COLUMN `url` varchar(100) NOT NULL COMMENT '鎺堟潈鍦板潃' AFTER `role_id`; --- 2019-02-19 -- -ALTER TABLE `cms_content_attribute` - ADD COLUMN `search_text` longtext NULL COMMENT '鍏ㄦ枃绱㈠紩鏂囨湰' AFTER `data`; -ALTER TABLE `sys_extend_field` - ADD COLUMN `searchable` tinyint(1) NOT NULL COMMENT '鏄惁鍙悳绱' AFTER `required`, - MODIFY COLUMN `maxlength` int(11) NULL DEFAULT NULL COMMENT '鏈澶ч暱搴' AFTER `searchable`; --- 2019-02-22 -- -UPDATE `sys_module` SET `parent_id` = 'config_menu' where id = 'domain_list'; -UPDATE `sys_module` SET `authorized_url` = 'cmsPlace/export',`url` = 'cmsPlace/dataList' WHERE `id` ='place_data_list'; \ No newline at end of file diff --git a/publiccms-parent/publiccms-core/src/main/resources/initialization/upgrade/V4.0.202004-V4.0.202011.sql b/publiccms-parent/publiccms-core/src/main/resources/initialization/upgrade/V4.0.202004-V4.0.202011.sql deleted file mode 100644 index 551ad3827..000000000 --- a/publiccms-parent/publiccms-core/src/main/resources/initialization/upgrade/V4.0.202004-V4.0.202011.sql +++ /dev/null @@ -1,36 +0,0 @@ --- 2020-06-23 -- -ALTER TABLE `cms_tag` - DROP INDEX `cms_tag_site_id`, - ADD INDEX `cms_tag_site_id`(`site_id`, `name`), - ADD INDEX `cms_tag_type_id` (`type_id`); -ALTER TABLE `cms_tag_type` - DROP INDEX `cms_tag_type_site_id`, - ADD INDEX `cms_tag_type_site_id` (`site_id`,`name`); --- 2020-07-27 -- -DELETE FROM `sys_module` WHERE id = 'category'; -DELETE FROM `sys_module_lang` WHERE module_id = 'category'; -UPDATE `sys_module` SET `parent_id` = 'content' WHERE `id` ='category_extend'; -UPDATE `sys_module` SET `id` = 'category_list', `parent_id` = 'content_menu',`sort` = '1' WHERE `id` ='category_menu'; -UPDATE `sys_module_lang` SET `module_id` = 'category_list' WHERE `module_id` ='category_menu'; -UPDATE `sys_module` SET `parent_id` = 'category_list' WHERE `parent_id` ='category_menu'; -UPDATE `sys_module` SET `parent_id` = 'content_list' WHERE `parent_id` ='content_menu'; -UPDATE `sys_module` SET `parent_id` = 'content_menu' WHERE `parent_id` ='content_extend'; -DELETE FROM `sys_module_lang` WHERE `module_id` = 'content_extend'; -DELETE FROM `sys_module` WHERE `id` = 'content_extend'; -UPDATE `sys_module` SET `parent_id` = 'content_menu', `sort` = '2' WHERE `id` ='category_list'; -UPDATE `sys_module` SET `authorized_url` = NULL, `url` = NULL WHERE `id` ='content_menu'; -INSERT INTO `sys_module` VALUES ('content_list', 'cmsContent/list', 'sysUser/lookup', 'icon-book', 'content_menu', 1, 0); -UPDATE `sys_module` SET `sort` = '1' where `id` = 'comment_list'; -UPDATE `sys_module` SET `sort` = '3' where `id` = 'tag_list'; -UPDATE `sys_module` SET `sort` = '4' where `id` = 'word_list'; -UPDATE `sys_module` SET `sort` = '5' where `id` = 'content_vote'; -UPDATE `sys_module` SET `sort` = '6' where `id` = 'content_recycle_list'; -UPDATE `sys_module` SET `attached` = NULL where `id` = 'content_add'; -UPDATE `sys_module` SET `menu` = '0' where `parent_id` = 'content_list'; -UPDATE `sys_module` SET `sort` = '1' where `id` = 'category_extend'; -INSERT INTO `sys_module_lang` VALUES ('content_list', 'en', 'Content management'); -INSERT INTO `sys_module_lang` VALUES ('content_list', 'ja', '銈炽兂銉嗐兂銉勭鐞'); -INSERT INTO `sys_module_lang` VALUES ('content_list', 'zh', '鍐呭绠＄悊'); -ALTER TABLE `cms_content` DROP INDEX `cms_content_quote_content_id`; -UPDATE `sys_module_lang` SET `value` = '绉併伄' where `module_id` = 'myself' and `lang` = 'ja'; -UPDATE `sys_module_lang` SET `value` = '鎴戠殑' where `module_id` = 'myself' and `lang` = 'zh'; \ No newline at end of file diff --git a/publiccms-parent/publiccms-core/src/main/resources/initialization/upgrade/V4.0.202011-V4.0.202107.sql b/publiccms-parent/publiccms-core/src/main/resources/initialization/upgrade/V4.0.202011-V4.0.202107.sql deleted file mode 100644 index 3660b6c2c..000000000 --- a/publiccms-parent/publiccms-core/src/main/resources/initialization/upgrade/V4.0.202011-V4.0.202107.sql +++ /dev/null @@ -1,234 +0,0 @@ --- 2021-01-14 -- -ALTER TABLE `cms_content` - ADD INDEX `cms_content_quote_content_id`(`site_id`, `quote_content_id`); -CREATE TABLE `log_visit` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT, - `site_id` smallint(6) NOT NULL COMMENT '绔欑偣', - `session_id` varchar(50) NOT NULL COMMENT '浼氳瘽', - `visit_date` date NOT NULL COMMENT '璁块棶鏃ユ湡', - `visit_hour` tinyint(4) NOT NULL COMMENT '璁块棶灏忔椂', - `ip` varchar(130) NOT NULL COMMENT 'IP', - `user_agent` varchar(500) DEFAULT NULL COMMENT 'User Agent', - `url` varchar(2048) NOT NULL COMMENT '璁块棶璺緞', - `title` varchar(255) DEFAULT NULL COMMENT '鏍囬', - `screen_width` int(11) DEFAULT NULL COMMENT '灞忓箷瀹藉害', - `screen_height` int(11) DEFAULT NULL COMMENT '灞忓箷楂樺害', - `referer_url` varchar(2048) DEFAULT NULL COMMENT '鏉ユ簮URL', - `item_type` varchar(50) DEFAULT NULL COMMENT '椤圭洰绫诲瀷', - `item_id` varchar(50) DEFAULT NULL COMMENT '椤圭洰', - `create_date` datetime NOT NULL COMMENT '鍒涘缓鏃ユ湡', - PRIMARY KEY (`id`), - KEY `log_visit_visit_date` (`site_id`,`visit_date`,`visit_hour`), - KEY `log_visit_session_id` (`site_id`,`session_id`,`visit_date`,`create_date`,`ip`) -) COMMENT='璁块棶鏃ュ織'; - -CREATE TABLE `log_visit_day` ( - `site_id` smallint(6) NOT NULL COMMENT '绔欑偣', - `visit_date` date NOT NULL COMMENT '鏃ユ湡', - `visit_hour` tinyint(4) NOT NULL COMMENT '灏忔椂', - `pv` bigint(20) NOT NULL COMMENT 'Page Views', - `uv` bigint(20) DEFAULT NULL COMMENT 'User Views', - `ipviews` bigint(20) DEFAULT NULL COMMENT 'IP鏁', - PRIMARY KEY (`site_id`,`visit_date`,`visit_hour`), - KEY `log_visit_session_id` (`site_id`,`visit_date`) -) COMMENT = '璁块棶姹囨'; - -CREATE TABLE `log_visit_session` ( - `site_id` smallint(6) NOT NULL COMMENT '绔欑偣', - `session_id` varchar(50) NOT NULL COMMENT '浼氳瘽', - `visit_date` date NOT NULL COMMENT '鏃ユ湡', - `last_visit_date` datetime DEFAULT NULL COMMENT '涓婃璁块棶鏃ユ湡', - `first_visit_date` datetime DEFAULT NULL COMMENT '棣栨璁块棶鏃ユ湡', - `ip` varchar(130) NOT NULL COMMENT 'IP', - `pv` bigint(20) NOT NULL COMMENT 'PV', - PRIMARY KEY (`site_id`,`session_id`,`visit_date`), - KEY `log_visit_visit_date` (`site_id`,`visit_date`,`ip`) -) COMMENT = '璁块棶浼氳瘽'; - --- 2021-03-25 -- -UPDATE `sys_module` SET `authorized_url` = 'cmsContent/push_content,cmsContent/push_content_list,cmsContent/push_to_content,cmsContent/push_page,cmsContent/push_page_list,cmsPlace/add,cmsPlace/save,cmsContent/related,cmsContent/unrelated,cmsPlace/delete,cmsPlace/push' WHERE `id` ='content_push'; --- 20210329 -- -ALTER TABLE `log_login` MODIFY COLUMN `error_password` varchar(255) default NULL COMMENT '閿欒瀵嗙爜' AFTER `create_date`; --- 2021-05-26 -- -INSERT INTO `sys_module` VALUES ('log_visit', 'log/visit', 'log/visitView', 'icon-bolt', 'log_menu', 1, 5); -INSERT INTO `sys_module` VALUES ('log_visit_day', 'log/visitDay', NULL, 'icon-calendar', 'log_menu', 1, 7); -INSERT INTO `sys_module` VALUES ('log_visit_session', 'log/visitSession', NULL, 'icon-comment-alt', 'log_menu', 1, 6); -INSERT INTO `sys_module_lang` VALUES ('log_visit', 'en', 'Visit log'); -INSERT INTO `sys_module_lang` VALUES ('log_visit', 'ja', '銈€偗銈汇偣銉偘'); -INSERT INTO `sys_module_lang` VALUES ('log_visit', 'zh', '璁块棶鏃ュ織'); -INSERT INTO `sys_module_lang` VALUES ('log_visit_day', 'en', 'Daily visit log'); -INSERT INTO `sys_module_lang` VALUES ('log_visit_day', 'ja', '姣庢棩銇í鍟忋儹銈'); -INSERT INTO `sys_module_lang` VALUES ('log_visit_day', 'zh', '鏃ヨ闂棩蹇'); -INSERT INTO `sys_module_lang` VALUES ('log_visit_session', 'en', 'Visit session'); -INSERT INTO `sys_module_lang` VALUES ('log_visit_session', 'ja', '銈€偗銈汇偣銈汇儍銈枫儳銉'); -INSERT INTO `sys_module_lang` VALUES ('log_visit_session', 'zh', '璁块棶鏃ュ織浼氳瘽'); --- 2021-06-25 -- -UPDATE `sys_module` SET `authorized_url` = 'tradeOrder/refund' WHERE `id` ='refund_refund'; -UPDATE `sys_module` SET `authorized_url` = 'cmsTemplate/save,cmsTemplate/chipLookup,cmsWebFile/lookup,placeTemplate/form,cmsTemplate/contentForm,cmsCategory/contributeForm,cmsTemplate/demo,cmsTemplate/help,cmsTemplate/upload,cmsTemplate/doUpload,cmsTemplate/export' WHERE `id` ='template_content'; -UPDATE `sys_module` SET `authorized_url` = 'taskTemplate/save,taskTemplate/upload,taskTemplate/doUpload,taskTemplate/export,taskTemplate/chipLookup,cmsTemplate/help' WHERE `id` ='task_template_content'; --- 2021-06026 -- -CREATE TABLE `cms_content_product` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT, - `site_id` smallint(6) NOT NULL COMMENT '绔欑偣', - `content_id` bigint(20) NOT NULL COMMENT '鍐呭', - `user_id` bigint(20) NOT NULL COMMENT '鐢ㄦ埛', - `cover` varchar(255) DEFAULT NULL COMMENT '灏侀潰鍥', - `title` varchar(100) NOT NULL COMMENT '鏍囬', - `price` decimal(10,2) NOT NULL COMMENT '浠锋牸', - `min_quantity` int(11) DEFAULT NULL COMMENT '鏈灏忚喘涔版暟閲', - `max_quantity` int(11) DEFAULT NULL COMMENT '鏈澶ц喘涔版暟閲', - `inventory` int(11) NOT NULL COMMENT '搴撳瓨', - `sales` int(11) NOT NULL COMMENT '閿閲', - PRIMARY KEY (`id`), - KEY `cms_content_product_content_id` (`site_id`, `content_id`), - KEY `cms_content_product_user_id` (`site_id`, `user_id`), - KEY `cms_content_product_sales` (`site_id`, `sales`), - KEY `cms_content_product_inventory` (`site_id`, `inventory`), - KEY `cms_content_product_price` (`site_id`, `price`) -) COMMENT='鍐呭鍟嗗搧'; -INSERT INTO `sys_module` VALUES ('product_list', 'cmsContentProduct/list', NULL, 'icon-truck', 'content_menu', 1, 4); -INSERT INTO `sys_module` VALUES ('product_add', 'cmsContentProduct/add', 'cmsContentProduct/save', NULL, 'product_list', 1, 0); -INSERT INTO `sys_module_lang` VALUES ('product_list', 'en', 'Product management'); -INSERT INTO `sys_module_lang` VALUES ('product_list', 'ja', '瑁藉搧绠＄悊'); -INSERT INTO `sys_module_lang` VALUES ('product_list', 'zh', '浜у搧绠＄悊'); -INSERT INTO `sys_module_lang` VALUES ('product_add', 'en', 'Edit'); -INSERT INTO `sys_module_lang` VALUES ('product_add', 'ja', '澶夋洿'); -INSERT INTO `sys_module_lang` VALUES ('product_add', 'zh', '淇敼'); -UPDATE `sys_module` SET `sort` = '6' WHERE `id` = 'word_list'; -UPDATE `sys_module` SET `sort` = '7' WHERE `id` = 'content_recycle_list'; -RENAME TABLE `trade_order` TO `trade_payment`; -RENAME TABLE `trade_order_history` TO `trade_payment_history`; -ALTER TABLE `trade_refund` - CHANGE COLUMN `order_id` `payment_id` bigint(20) NOT NULL COMMENT '璁㈠崟' AFTER `id`; -ALTER TABLE `trade_payment_history` CHANGE COLUMN `order_id` `payment_id` bigint(20) NOT NULL COMMENT '璁㈠崟' AFTER `site_id`; -ALTER TABLE `trade_payment` - DROP INDEX `trade_order_account_type`, - DROP INDEX `trade_order_site_id`, - DROP INDEX `trade_order_trade_type`, - DROP INDEX `trade_order_create_date`, - ADD INDEX `trade_payment_account_type`(`account_type`, `account_serial_number`) , - ADD INDEX `trade_payment_site_id`(`site_id`, `user_id`, `status`) , - ADD INDEX `trade_payment_trade_type`(`trade_type`, `serial_number`) , - ADD INDEX `trade_payment_create_date`(`create_date`); -ALTER TABLE `trade_payment_history` - DROP INDEX `trade_order_history_site_id`, - DROP INDEX `trade_order_history_create_date`, - ADD INDEX `trade_payment_history_site_id`(`site_id`, `payment_id`, `operate`), - ADD INDEX `trade_payment_history_create_date`(`create_date`); -CREATE TABLE `trade_order` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT, - `site_id` smallint(6) NOT NULL COMMENT '绔欑偣', - `user_id` bigint(20) NOT NULL COMMENT '鐢ㄦ埛', - `amount` decimal(10,2) NOT NULL COMMENT '鎬婚噾棰', - `payment_id` bigint(20) DEFAULT NULL COMMENT '鏀粯璁㈠崟', - `address` varchar(255) DEFAULT NULL COMMENT '鍦板潃', - `addressee` varchar(100) DEFAULT NULL COMMENT '鏀朵欢浜', - `telephone` varchar(100) DEFAULT NULL COMMENT '鐢佃瘽', - `ip` varchar(130) NOT NULL COMMENT 'IP鍦板潃', - `remark` varchar(255) DEFAULT NULL COMMENT '澶囨敞', - `status` int(11) NOT NULL COMMENT '鐘舵:0寰呯‘璁,1鏃犳晥璁㈠崟,2宸蹭粯娆,3宸查娆,4宸插叧闂', - `confirmed` tinyint(1) NOT NULL COMMENT '宸茬‘璁', - `processed` tinyint(1) NOT NULL COMMENT '宸插鐞', - `process_info` varchar(255) DEFAULT NULL COMMENT '澶勭悊淇℃伅', - `update_date` datetime DEFAULT NULL COMMENT '鏇存柊鏃ユ湡', - `create_date` datetime NOT NULL COMMENT '鍒涘缓鏃ユ湡', - `process_date` datetime DEFAULT NULL COMMENT '澶勭悊鏃ユ湡', - `payment_date` datetime DEFAULT NULL COMMENT '鏀粯鏃ユ湡', - PRIMARY KEY (`id`), - KEY `trade_order_site_id` (`site_id`,`user_id`,`status`), - KEY `trade_order_create_date` (`create_date`), - KEY `trade_order_payment_id` (`site_id`,`payment_id`) -) COMMENT='浜у搧璁㈠崟'; -CREATE TABLE `trade_order_history` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT, - `site_id` smallint(6) NOT NULL COMMENT '绔欑偣', - `order_id` bigint(20) NOT NULL COMMENT '璁㈠崟', - `create_date` datetime NOT NULL COMMENT '鍒涘缓鏃ユ湡', - `operate` varchar(100) NOT NULL COMMENT '鎿嶄綔', - `content` text COMMENT '鍐呭', - PRIMARY KEY (`id`), - KEY `trade_order_history_site_id` (`site_id`,`order_id`,`operate`), - KEY `trade_order_history_create_date` (`create_date`) -) COMMENT='璁㈠崟娴佹按'; -CREATE TABLE `trade_order_product` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT, - `site_id` smallint(6) NOT NULL COMMENT '绔欑偣', - `order_id` bigint(20) NOT NULL COMMENT '鐢ㄦ埛', - `content_id` bigint(20) NOT NULL COMMENT '鍐呭', - `product_id` bigint(20) NOT NULL COMMENT '浜у搧', - `price` decimal(10,2) NOT NULL COMMENT '浠锋牸', - `quantity` int(11) NOT NULL COMMENT '鏁伴噺', - `amount` decimal(10,2) NOT NULL COMMENT '鎬婚噾棰', - `remark` varchar(255) DEFAULT NULL COMMENT '澶囨敞', - PRIMARY KEY (`id`), - KEY `trade_order_product_site_id` (`site_id`,`order_id`) -) COMMENT='浜у搧璁㈠崟'; -ALTER TABLE `cms_content` - ADD COLUMN `has_products` tinyint(1) NOT NULL COMMENT '鎷ユ湁浜у搧鍒楄〃' AFTER `has_files`, - DROP INDEX `cms_content_only_url`, - ADD INDEX `cms_content_only_url`(`only_url`, `has_images`, `has_files`, `has_products`, `user_id`) ; -ALTER TABLE `trade_payment` - ADD COLUMN `process_user_id` bigint(20) NULL COMMENT '澶勭悊鐢ㄦ埛' AFTER `processed`; -ALTER TABLE `trade_order` - ADD COLUMN `process_user_id` bigint(20) NULL COMMENT '澶勭悊鐢ㄦ埛' AFTER `processed`; --- 2021-06-28 -- -ALTER TABLE `trade_refund` - ADD COLUMN `site_id` smallint(0) NOT NULL COMMENT '绔欑偣' AFTER `id`, - ADD COLUMN `user_id` bigint(20) NOT NULL COMMENT '鐢ㄦ埛' AFTER `payment_id`, - DROP INDEX `trade_refund_order_id`; -ALTER TABLE `cms_content_related` - DROP INDEX `cms_content_related_user_id`, - ADD INDEX `cms_content_related_content_id`(`content_id`, `sort`); -ALTER TABLE `trade_refund` - ADD INDEX `trade_refund_user_id`(`user_id`, `payment_id`, `status`); --- 2021-06-30 -- -UPDATE `sys_module` SET `sort` = '7' WHERE `id` = 'account_history_list'; -UPDATE `sys_module` SET `sort` = '6' WHERE `id` = 'account_list'; -UPDATE `sys_module` SET `sort` = '5' WHERE `id` = 'refund_list'; -INSERT INTO `sys_module` VALUES ('payment_history_list', 'tradePaymentHistory/list', NULL, 'icon-exchange', 'trade_menu', 1, 4); -INSERT INTO `sys_module_lang` VALUES ('payment_history_list', 'en', 'Payment history'); -INSERT INTO `sys_module_lang` VALUES ('payment_history_list', 'ja', '鏀墪姝'); -INSERT INTO `sys_module_lang` VALUES ('payment_history_list', 'zh', '鏀粯鍘嗗彶'); -ALTER TABLE `trade_payment` - CHANGE COLUMN `status` `status` int(11) NOT NULL COMMENT '鐘舵:0寰呮敮浠,1宸叉敮浠,2寰呴娆,3宸查娆,4宸插叧闂' after `ip`; --- 2021-07-01 -- -ALTER TABLE `trade_order` - ADD COLUMN `title` varchar(255) NOT NULL COMMENT '鏍囬' AFTER `user_id`; --- 2021-07-03 -- -UPDATE `sys_module` SET `authorized_url` = 'tradeAccount/save,sysUser/lookup' WHERE `id` ='account_add'; -INSERT INTO `sys_module` VALUES ('order_confirm', 'tradeOrder/confirmParameters', 'tradeOrder/confirm', NULL, 'order_list', 0, 0); -INSERT INTO `sys_module` VALUES ('order_process', 'tradeOrder/processParameters', 'tradeOrder/process', NULL, 'order_list', 0, 0); -INSERT INTO `sys_module` VALUES ('order_view', 'tradeOrder/view', NULL, NULL, 'order_list', 0, 0); -INSERT INTO `sys_module_lang` VALUES ('order_confirm', 'en', 'Confirm order'); -INSERT INTO `sys_module_lang` VALUES ('order_confirm', 'ja', '娉ㄦ枃銇⒑瑾'); -INSERT INTO `sys_module_lang` VALUES ('order_confirm', 'zh', '纭璁㈠崟'); -INSERT INTO `sys_module_lang` VALUES ('order_process', 'en', 'Process order'); -INSERT INTO `sys_module_lang` VALUES ('order_process', 'ja', '銉椼儹銈汇偣銈兗銉銉'); -INSERT INTO `sys_module_lang` VALUES ('order_process', 'zh', '澶勭悊璁㈠崟'); -INSERT INTO `sys_module_lang` VALUES ('order_view', 'en', 'View'); -INSERT INTO `sys_module_lang` VALUES ('order_view', 'ja', '瑕嬨倠'); -INSERT INTO `sys_module_lang` VALUES ('order_view', 'zh', '鏌ョ湅'); -INSERT INTO `sys_module` VALUES ('payment_list', 'tradePayment/list', 'sysUser/lookup', 'icon-money', 'trade_menu', 1, 3); -INSERT INTO `sys_module_lang` VALUES ('payment_list', 'en', 'Payment management'); -INSERT INTO `sys_module_lang` VALUES ('payment_list', 'ja', '鏀墪銇勭鐞'); -INSERT INTO `sys_module_lang` VALUES ('payment_list', 'zh', '鏀粯绠＄悊'); -UPDATE `sys_module` SET `authorized_url` = 'tradePaymentHistory/view' WHERE `id` ='payment_history_list'; -INSERT INTO `sys_module` VALUES ('refund_refuse', 'tradeRefund/refuseParameters', 'tradeOrder/refuse', '', 'refund_list', 0, 0); -INSERT INTO `sys_module_lang` VALUES ('refund_refuse', 'en', 'Refuse'); -INSERT INTO `sys_module_lang` VALUES ('refund_refuse', 'ja', '銇斻伩'); -INSERT INTO `sys_module_lang` VALUES ('refund_refuse', 'zh', '鎷掔粷'); --- 2021-07-04 -- -UPDATE `sys_module` SET `menu` = '1' WHERE `id` ='trade_menu'; --- 2021-06-08 -- -DELETE FROM `sys_module` WHERE `id` ='repo_sync'; -DELETE FROM `sys_module_lang` WHERE `module_id` ='repo_sync'; --- 2021-07-09 -- -ALTER TABLE `sys_extend_field` - ADD INDEX `sys_extend_field_input_type` (`extend_id`, `input_type`,`searchable`); --- 2021-07-11 -- -INSERT INTO `sys_module` VALUES ('report_visit', 'report/visit', NULL, 'icon-bolt', 'user_menu', 1, 6); -INSERT INTO `sys_module_lang` VALUES ('report_visit', 'en', 'Visit report'); -INSERT INTO `sys_module_lang` VALUES ('report_visit', 'ja', '銈€偗銈汇偣鐩ｈ'); -INSERT INTO `sys_module_lang` VALUES ('report_visit', 'zh', '缃戠珯璁块棶鐩戞帶'); --- 221-07-20 -- -ALTER TABLE `trade_payment_history` COMMENT = '鏀粯璁㈠崟娴佹按'; \ No newline at end of file diff --git a/publiccms-parent/publiccms/pom.xml b/publiccms-parent/publiccms/pom.xml index 663b26651..c63ff8a0c 100644 --- a/publiccms-parent/publiccms/pom.xml +++ b/publiccms-parent/publiccms/pom.xml @@ -5,6 +5,7 @@ 4.0.0 publiccms war + com.publiccms publiccms-parent diff --git a/publiccms-parent/publiccms/src/main/java/boot/SpringBootApplication.java b/publiccms-parent/publiccms/src/main/java/boot/SpringBootApplication.java index 430482ae2..16b87f99a 100644 --- a/publiccms-parent/publiccms/src/main/java/boot/SpringBootApplication.java +++ b/publiccms-parent/publiccms/src/main/java/boot/SpringBootApplication.java @@ -33,7 +33,12 @@ @Import(CmsConfig.class) public class SpringBootApplication { - /** + /** + * 鍦╥dea涓氳繃main鏂规硶鍚姩闇瑕佸皢宸ヤ綔鐩綍鏀逛负 publiccms 妯″潡鎵鍦ㄧ殑璺緞锛屽惁鍒欓潤鎬佽祫婧愪笉鑳藉姞杞 + * idea銇甿ain銉°偨銉冦儔銇嬨倝濮嬨倎銈嬨伀銇佷綔妤儑銈ｃ儸銈儓銉倰publiccms銉€偢銉ャ兗銉亴閰嶇疆銇曘倢銇︺亜銈嬨儜銈广伀澶夋洿銇欍倠蹇呰銇屻亗銈娿併仢銇嗐仐銇亜銇ㄩ潤鐨勩儶銈姐兗銈广倰銉兗銉夈仹銇嶃伨銇涖倱 + * To start through the main method in idea, you need to change the working directory to the path where the publiccms module is located, otherwise the static resources cannot be loaded + * https://www.publiccms.com/question/2018/02-13/376.html + * * @param args */ public static void main(String[] args) { diff --git a/publiccms-parent/publiccms/src/main/resources/language/menu_en.properties b/publiccms-parent/publiccms/src/main/resources/language/menu_en.properties index 9f7da1547..e5cbef629 100644 --- a/publiccms-parent/publiccms/src/main/resources/language/menu_en.properties +++ b/publiccms-parent/publiccms/src/main/resources/language/menu_en.properties @@ -9,6 +9,5 @@ menu.dict=Custom dictionary menu.site_script=Execute script menu.monitor=System monitor menu.cluster=Cluster management -menu.license=Product license menu.official=PublicCMS menu.official_website=PublicCMS website \ No newline at end of file diff --git a/publiccms-parent/publiccms/src/main/resources/language/menu_ja.properties b/publiccms-parent/publiccms/src/main/resources/language/menu_ja.properties index 89f175c1a..2b7b78320 100644 --- a/publiccms-parent/publiccms/src/main/resources/language/menu_ja.properties +++ b/publiccms-parent/publiccms/src/main/resources/language/menu_ja.properties @@ -9,6 +9,5 @@ menu.dict=\u30AB\u30B9\u30BF\u30E0\u8F9E\u66F8 menu.site_script=\u30B9\u30AF\u30EA\u30D7\u30C8\u3092\u5B9F\u884C\u3059\u308B menu.monitor=\u30B7\u30B9\u30C6\u30E0\u76E3\u8996 menu.cluster=\u30CE\u30FC\u30C9\u7BA1\u7406 -menu.license=\u5546\u54C1\u30E9\u30A4\u30BB\u30F3\u30B9 menu.official=PublicCMS menu.official_website=PublicCMS\u516C\u5F0F\u30B5\u30A4\u30C8 \ No newline at end of file diff --git a/publiccms-parent/publiccms/src/main/resources/language/menu_zh.properties b/publiccms-parent/publiccms/src/main/resources/language/menu_zh.properties index b86d75db4..44a09958b 100644 --- a/publiccms-parent/publiccms/src/main/resources/language/menu_zh.properties +++ b/publiccms-parent/publiccms/src/main/resources/language/menu_zh.properties @@ -9,6 +9,5 @@ menu.dict=\u81EA\u5B9A\u4E49\u8BCD\u5178 menu.site_script=\u6267\u884C\u811A\u672C menu.monitor=\u7CFB\u7EDF\u76D1\u63A7 menu.cluster=\u8282\u70B9\u7BA1\u7406 -menu.license=\u4EA7\u54C1\u6388\u6743\u8BB8\u53EF menu.official=PublicCMS menu.official_website=PublicCMS\u5B98\u7F51 \ No newline at end of file diff --git a/publiccms-parent/publiccms/src/main/resources/language/message_en.properties b/publiccms-parent/publiccms/src/main/resources/language/message_en.properties index cd4e94a30..ae1de55da 100644 --- a/publiccms-parent/publiccms/src/main/resources/language/message_en.properties +++ b/publiccms-parent/publiccms/src/main/resources/language/message_en.properties @@ -39,8 +39,6 @@ verify.user.notAdmin=Not an administrator verify.user.notEnablie=User has been disabled verify.custom.static=Generate static page failed verify.custom.noright=No permissions -verify.custom.needAuthorizationEdition=Requires authorization file -verify.custom.unauthorizedDomain=The domain name is not authorized verify.custom.notExist.template=Template does not exist verify.custom.contribute=Do not allow front side submission verify.custom.anonymousContribute=Do not allow anonymous submission diff --git a/publiccms-parent/publiccms/src/main/resources/language/message_ja.properties b/publiccms-parent/publiccms/src/main/resources/language/message_ja.properties index e861fbff2..252612a1a 100644 --- a/publiccms-parent/publiccms/src/main/resources/language/message_ja.properties +++ b/publiccms-parent/publiccms/src/main/resources/language/message_ja.properties @@ -39,8 +39,6 @@ verify.user.notAdmin=\u7BA1\u7406\u8005\u3067\u306F\u3042\u308A\u307E\u305B\u309 verify.user.notEnablie=\u30E6\u30FC\u30B6\u30FC\u306F\u30A2\u30FC\u30AB\u30A4\u30D6\u3055\u308C\u307E\u3057\u305F\u3002 verify.custom.static=\u30B9\u30BF\u30C6\u30A3\u30C3\u30AF\u30DA\u30FC\u30B8\u306E\u751F\u6210\u306B\u5931\u6557\u3057\u307E\u3057\u305F verify.custom.noright=\u8A31\u53EF\u306A\u3057 -verify.custom.needAuthorizationEdition=\u5546\u54C1\u306E\u6388\u6A29\u30A2\u30AF\u30BB\u30B9\u304C\u5FC5\u8981 -verify.custom.unauthorizedDomain=\u30C9\u30E1\u30A4\u30F3\u540D\u306F\u6388\u6A29\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002 verify.custom.notExist.template=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u306F\u5B58\u5728\u3057\u307E\u305B\u3093 verify.custom.contribute=\u30D5\u30A9\u30A2\u30B0\u30E9\u30A6\u30F3\u30C9\u63D0\u51FA\u306F\u8A31\u53EF\u3057\u307E\u305B\u3093\u3002 verify.custom.anonymousContribute=\u533F\u540D\u63D0\u51FA\u306F\u8A31\u53EF\u3057\u307E\u305B\u3093 diff --git a/publiccms-parent/publiccms/src/main/resources/language/message_zh.properties b/publiccms-parent/publiccms/src/main/resources/language/message_zh.properties index 9bdc50d7b..6670e2ef3 100644 --- a/publiccms-parent/publiccms/src/main/resources/language/message_zh.properties +++ b/publiccms-parent/publiccms/src/main/resources/language/message_zh.properties @@ -39,8 +39,6 @@ verify.user.notAdmin=\u4e0d\u662f\u7ba1\u7406\u5458 verify.user.notEnablie=\u7528\u6237\u5df2\u88ab\u7981\u7528 verify.custom.static=\u751F\u6210\u9759\u6001\u9875\u9762\u5931\u8D25 verify.custom.noright=\u6CA1\u6709\u6743\u9650 -verify.custom.needAuthorizationEdition=\u9700\u8981\u4EA7\u54C1\u6388\u6743\u8BB8\u53EF -verify.custom.unauthorizedDomain=\u57DF\u540D\u672A\u901A\u8FC7\u6388\u6743 verify.custom.notExist.template=\u6A21\u677F\u4E0D\u5B58\u5728 verify.custom.contribute=\u4E0D\u5141\u8BB8\u524D\u53F0\u63D0\u4EA4 verify.custom.anonymousContribute=\u4E0D\u5141\u8BB8\u533F\u540D\u63D0\u4EA4 diff --git a/publiccms-parent/publiccms/src/main/resources/templates/admin/common/license.html b/publiccms-parent/publiccms/src/main/resources/templates/admin/common/license.html deleted file mode 100644 index a749bb017..000000000 --- a/publiccms-parent/publiccms/src/main/resources/templates/admin/common/license.html +++ /dev/null @@ -1,51 +0,0 @@ -
-<#assign license = getLicense()/> -<#if license?has_content> -
-
<@t.page 'version'/>:
-
${license.version!}
-
-
-
<@t.page 'license.authorization'/>:
-
${license.authorization!}
-
-
-
<@t.page 'license.organization'/>:
-
${license.organization!}
-
-
-
<@t.page 'license.domain'/>:
-
${license.domain!}
-
-
-
<@t.page 'license.start_date'/>:
-
${license.startDate!}
-
-
-
<@t.page 'license.end_date'/>:
-
${license.endDate!}
-
-
-
<@t.page 'license.issue'/>:
-
${license.issue!}
-
-
-
<@t.page 'license.verify_on_line'/>:
-
-
- - -
-
-
    -
    • -
-
\ No newline at end of file diff --git a/publiccms-parent/publiccms/src/main/resources/templates/admin/index.html b/publiccms-parent/publiccms/src/main/resources/templates/admin/index.html index ba75e330d..38ab954dc 100644 --- a/publiccms-parent/publiccms/src/main/resources/templates/admin/index.html +++ b/publiccms-parent/publiccms/src/main/resources/templates/admin/index.html @@ -108,18 +108,6 @@ -<@_version> - <#if authorizationEdition> - <@t.page 'license'/>: ${getLicense().authorization!} - <#else> - <@t.page 'license.no'/> - <@_masterSite> - <@_sysAuthorized roleIds=admin.roles url='sysSite/uploadLicense'> - <@t.page 'license.upgrade'/> - - - - Copyright © ${.now?string('yyyy')}
    • diff --git a/publiccms-parent/publiccms/src/main/resources/templates/admin/sysSite/menu.html b/publiccms-parent/publiccms/src/main/resources/templates/admin/sysSite/menu.html index f3706e4b1..e97ccbc3f 100644 --- a/publiccms-parent/publiccms/src/main/resources/templates/admin/sysSite/menu.html +++ b/publiccms-parent/publiccms/src/main/resources/templates/admin/sysSite/menu.html @@ -33,9 +33,6 @@

    <@t.menu 'site_menu'/> <@t.menu 'cluster'/> -
  • - <@t.menu 'license'/> -

diff --git a/publiccms-parent/publiccms/src/main/resources/templates/admin/sysSite/uploadLicense.html b/publiccms-parent/publiccms/src/main/resources/templates/admin/sysSite/uploadLicense.html deleted file mode 100644 index 4c76633d7..000000000 --- a/publiccms-parent/publiccms/src/main/resources/templates/admin/sysSite/uploadLicense.html +++ /dev/null @@ -1,35 +0,0 @@ -
- -
-
    -
    • -
    • -
-
-
-
-
<@t.page 'license.award'/>:
-
- <@t.menu 'official_website'/> -
-
-
-
<@t.page 'license.status'/>:
-
- <@_version> - <#if authorizationEdition> - <@t.page 'license'/>: ${getLicense().authorization!} - <#else> - <@t.page 'license.no'/> - - -
-
-
-
<@t.page 'license.file'/>:
-
- -
-
-
-
\ No newline at end of file diff --git a/publiccms-parent/publiccms/src/main/webapp/error/500.jsp b/publiccms-parent/publiccms/src/main/webapp/error/500.jsp index 35d77c8ca..3f05cf359 100644 --- a/publiccms-parent/publiccms/src/main/webapp/error/500.jsp +++ b/publiccms-parent/publiccms/src/main/webapp/error/500.jsp @@ -30,7 +30,7 @@ try{ -