Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms

xiaoyong931011

2022-07-07 795084c308a27601e3a50280f9c0919adf87e32a

Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms

 src/main/java/com/xcong/farmer/cms/core/node/Template.java

@@ -63,7 +63,7 @@
        if ("article".equals(templateType)) {
            Object templateName = system.get("templateName");
            if (templateName != null) {
                this.name = (String) templateName;
                this.name = String.valueOf(templateName);
            }
        } else if ("column".equals(templateType)) {
            Object page = system.get("page");

 src/main/resources/application-test.yml

@@ -94,7 +94,7 @@

cms:
  base-url: http://120.27.238.55:8000/cms/output
  static-url: http://120.27.238.55:8000/cms/static
  static-url: http://120.27.238.55:8000/cms/static/
  template-path: /home/javaweb/webresource/cms/template
  static-path: /home/javaweb/webresource/cms/static
  output-path: /home/javaweb/webresource/cms/output