Sfoglia il codice sorgente

fix:待发布版本

Signed-off-by: mingsoft <killfen@126.com>
msgroup 2 anni fa
parent
commit
f9ff742d09
31 ha cambiato i file con 31 aggiunte e 29 eliminazioni
  1. 1 1
      src/main/java/net/mingsoft/MSApplication.java
  2. 1 1
      src/main/java/net/mingsoft/MSServletInitializer.java
  3. 1 1
      src/main/java/net/mingsoft/cms/action/BaseAction.java
  4. 1 1
      src/main/java/net/mingsoft/cms/action/CategoryAction.java
  5. 1 1
      src/main/java/net/mingsoft/cms/action/ContentAction.java
  6. 1 1
      src/main/java/net/mingsoft/cms/action/GeneraterAction.java
  7. 1 1
      src/main/java/net/mingsoft/cms/action/web/CategoryAction.java
  8. 1 1
      src/main/java/net/mingsoft/cms/action/web/ContentAction.java
  9. 1 1
      src/main/java/net/mingsoft/cms/action/web/MCmsAction.java
  10. 1 1
      src/main/java/net/mingsoft/cms/aop/CategoryAop.java
  11. 1 1
      src/main/java/net/mingsoft/cms/aop/ContentAop.java
  12. 1 1
      src/main/java/net/mingsoft/cms/bean/CategoryBean.java
  13. 1 1
      src/main/java/net/mingsoft/cms/bean/ContentBean.java
  14. 1 1
      src/main/java/net/mingsoft/cms/biz/ICategoryBiz.java
  15. 1 1
      src/main/java/net/mingsoft/cms/biz/IContentBiz.java
  16. 1 1
      src/main/java/net/mingsoft/cms/biz/IHistoryLogBiz.java
  17. 1 1
      src/main/java/net/mingsoft/cms/biz/impl/CategoryBizImpl.java
  18. 1 1
      src/main/java/net/mingsoft/cms/biz/impl/ContentBizImpl.java
  19. 1 1
      src/main/java/net/mingsoft/cms/biz/impl/HistoryLogBizImpl.java
  20. 1 1
      src/main/java/net/mingsoft/cms/constant/Const.java
  21. 1 1
      src/main/java/net/mingsoft/cms/constant/e/CategoryTypeEnum.java
  22. 1 1
      src/main/java/net/mingsoft/cms/dao/ICategoryDao.java
  23. 1 1
      src/main/java/net/mingsoft/cms/dao/ICmsHistoryLogDao.java
  24. 1 1
      src/main/java/net/mingsoft/cms/dao/IContentDao.java
  25. 1 1
      src/main/java/net/mingsoft/cms/entity/CategoryEntity.java
  26. 1 1
      src/main/java/net/mingsoft/cms/entity/ContentEntity.java
  27. 1 1
      src/main/java/net/mingsoft/cms/entity/HistoryLogEntity.java
  28. 1 0
      src/main/java/net/mingsoft/cms/resources/resources_en_US.properties
  29. 1 0
      src/main/java/net/mingsoft/cms/resources/resources_zh_CN.properties
  30. 1 1
      src/main/java/net/mingsoft/cms/util/CmsParserUtil.java
  31. 1 1
      src/main/java/net/mingsoft/config/WebConfig.java

+ 1 - 1
src/main/java/net/mingsoft/MSApplication.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License (MIT)
- * Copyright (c) 2012-2022 铭软科技(mingsoft.net)
+ * Copyright (c) 2012-present 铭软科技(mingsoft.net)
  * 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

+ 1 - 1
src/main/java/net/mingsoft/MSServletInitializer.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License (MIT)
- * Copyright (c) 2012-2022 铭软科技(mingsoft.net)
+ * Copyright (c) 2012-present 铭软科技(mingsoft.net)
  * 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

+ 1 - 1
src/main/java/net/mingsoft/cms/action/BaseAction.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License (MIT)
- * Copyright (c) 2012-2022 铭软科技(mingsoft.net)
+ * Copyright (c) 2012-present 铭软科技(mingsoft.net)
  * 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

+ 1 - 1
src/main/java/net/mingsoft/cms/action/CategoryAction.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License (MIT)
- * Copyright (c) 2012-2022 铭软科技(mingsoft.net)
+ * Copyright (c) 2012-present 铭软科技(mingsoft.net)
  * 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

+ 1 - 1
src/main/java/net/mingsoft/cms/action/ContentAction.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License (MIT)
- * Copyright (c) 2012-2022 铭软科技(mingsoft.net)
+ * Copyright (c) 2012-present 铭软科技(mingsoft.net)
  * 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

+ 1 - 1
src/main/java/net/mingsoft/cms/action/GeneraterAction.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License (MIT)
- * Copyright (c) 2012-2022 铭软科技(mingsoft.net)
+ * Copyright (c) 2012-present 铭软科技(mingsoft.net)
  * 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

+ 1 - 1
src/main/java/net/mingsoft/cms/action/web/CategoryAction.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License (MIT)
- * Copyright (c) 2012-2022 铭软科技(mingsoft.net)
+ * Copyright (c) 2012-present 铭软科技(mingsoft.net)
  * 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

+ 1 - 1
src/main/java/net/mingsoft/cms/action/web/ContentAction.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License (MIT)
- * Copyright (c) 2012-2022 铭软科技(mingsoft.net)
+ * Copyright (c) 2012-present 铭软科技(mingsoft.net)
  * 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

+ 1 - 1
src/main/java/net/mingsoft/cms/action/web/MCmsAction.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License (MIT)
- * Copyright (c) 2012-2022 铭软科技(mingsoft.net)
+ * Copyright (c) 2012-present 铭软科技(mingsoft.net)
  * 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

+ 1 - 1
src/main/java/net/mingsoft/cms/aop/CategoryAop.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012-2022 铭软科技(mingsoft.net)
+ * Copyright (c) 2012-present 铭软科技(mingsoft.net)
  * 本软件及相关文档文件(以下简称“软件”)的版权归 铭软科技 所有
  * 遵循铭软科技《保密协议》
  */

+ 1 - 1
src/main/java/net/mingsoft/cms/aop/ContentAop.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License (MIT)
- * Copyright (c) 2012-2022 铭软科技(mingsoft.net)
+ * Copyright (c) 2012-present 铭软科技(mingsoft.net)
  * 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

+ 1 - 1
src/main/java/net/mingsoft/cms/bean/CategoryBean.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License (MIT)
- * Copyright (c) 2012-2022 铭软科技(mingsoft.net)
+ * Copyright (c) 2012-present 铭软科技(mingsoft.net)
  * 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

+ 1 - 1
src/main/java/net/mingsoft/cms/bean/ContentBean.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License (MIT)
- * Copyright (c) 2012-2022 铭软科技(mingsoft.net)
+ * Copyright (c) 2012-present 铭软科技(mingsoft.net)
  * 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

+ 1 - 1
src/main/java/net/mingsoft/cms/biz/ICategoryBiz.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License (MIT)
- * Copyright (c) 2012-2022 铭软科技(mingsoft.net)
+ * Copyright (c) 2012-present 铭软科技(mingsoft.net)
  * 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

+ 1 - 1
src/main/java/net/mingsoft/cms/biz/IContentBiz.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License (MIT)
- * Copyright (c) 2012-2022 铭软科技(mingsoft.net)
+ * Copyright (c) 2012-present 铭软科技(mingsoft.net)
  * 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

+ 1 - 1
src/main/java/net/mingsoft/cms/biz/IHistoryLogBiz.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License (MIT)
- * Copyright (c) 2012-2022 铭软科技(mingsoft.net)
+ * Copyright (c) 2012-present 铭软科技(mingsoft.net)
  * 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

+ 1 - 1
src/main/java/net/mingsoft/cms/biz/impl/CategoryBizImpl.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License (MIT)
- * Copyright (c) 2012-2022 铭软科技(mingsoft.net)
+ * Copyright (c) 2012-present 铭软科技(mingsoft.net)
  * 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

+ 1 - 1
src/main/java/net/mingsoft/cms/biz/impl/ContentBizImpl.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License (MIT)
- * Copyright (c) 2012-2022 铭软科技(mingsoft.net)
+ * Copyright (c) 2012-present 铭软科技(mingsoft.net)
  * 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

+ 1 - 1
src/main/java/net/mingsoft/cms/biz/impl/HistoryLogBizImpl.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License (MIT)
- * Copyright (c) 2012-2022 铭软科技(mingsoft.net)
+ * Copyright (c) 2012-present 铭软科技(mingsoft.net)
  * 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

+ 1 - 1
src/main/java/net/mingsoft/cms/constant/Const.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License (MIT)
- * Copyright (c) 2012-2022 铭软科技(mingsoft.net)
+ * Copyright (c) 2012-present 铭软科技(mingsoft.net)
  * 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

+ 1 - 1
src/main/java/net/mingsoft/cms/constant/e/CategoryTypeEnum.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License (MIT)
- * Copyright (c) 2012-2022 铭软科技(mingsoft.net)
+ * Copyright (c) 2012-present 铭软科技(mingsoft.net)
  * 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

+ 1 - 1
src/main/java/net/mingsoft/cms/dao/ICategoryDao.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License (MIT)
- * Copyright (c) 2012-2022 铭软科技(mingsoft.net)
+ * Copyright (c) 2012-present 铭软科技(mingsoft.net)
  * 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

+ 1 - 1
src/main/java/net/mingsoft/cms/dao/ICmsHistoryLogDao.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License (MIT)
- * Copyright (c) 2012-2022 铭软科技(mingsoft.net)
+ * Copyright (c) 2012-present 铭软科技(mingsoft.net)
  * 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

+ 1 - 1
src/main/java/net/mingsoft/cms/dao/IContentDao.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License (MIT)
- * Copyright (c) 2012-2022 铭软科技(mingsoft.net)
+ * Copyright (c) 2012-present 铭软科技(mingsoft.net)
  * 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

+ 1 - 1
src/main/java/net/mingsoft/cms/entity/CategoryEntity.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License (MIT)
- * Copyright (c) 2012-2022 铭软科技(mingsoft.net)
+ * Copyright (c) 2012-present 铭软科技(mingsoft.net)
  * 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

+ 1 - 1
src/main/java/net/mingsoft/cms/entity/ContentEntity.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License (MIT)
- * Copyright (c) 2012-2022 铭软科技(mingsoft.net)
+ * Copyright (c) 2012-present 铭软科技(mingsoft.net)
  * 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

+ 1 - 1
src/main/java/net/mingsoft/cms/entity/HistoryLogEntity.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License (MIT)
- * Copyright (c) 2012-2022 铭软科技(mingsoft.net)
+ * Copyright (c) 2012-present 铭软科技(mingsoft.net)
  * 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

+ 1 - 0
src/main/java/net/mingsoft/cms/resources/resources_en_US.properties

@@ -35,3 +35,4 @@ category.diy.url=custom link
 content.keyword=keyword
 templet.file=template file not found
 category.pinyin=pinyin
+err.format=category pinyin format error

+ 1 - 0
src/main/java/net/mingsoft/cms/resources/resources_zh_CN.properties

@@ -35,3 +35,4 @@ category.diy.url=\u81EA\u5B9A\u4E49\u94FE\u63A5
 content.keyword=\u5173\u952E\u5B57
 templet.file=\u672A\u627E\u5230\u6A21\u677F\u6587\u4EF6
 category.pinyin=\u62FC\u97F3
+err.format=\u680f\u76ee\u62fc\u97f3\u683c\u5f0f\u9519\u8bef

+ 1 - 1
src/main/java/net/mingsoft/cms/util/CmsParserUtil.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License (MIT)
- * Copyright (c) 2012-2022 铭软科技(mingsoft.net)
+ * Copyright (c) 2012-present 铭软科技(mingsoft.net)
  * 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

+ 1 - 1
src/main/java/net/mingsoft/config/WebConfig.java

@@ -1,6 +1,6 @@
 /**
  * The MIT License (MIT)
- * Copyright (c) 2012-2022 铭软科技(mingsoft.net)
+ * Copyright (c) 2012-present 铭软科技(mingsoft.net)
  * 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