diff --git a/src/main/java/net/mingsoft/MSApplication.java b/src/main/java/net/mingsoft/MSApplication.java index a42920d4..25188e73 100644 --- a/src/main/java/net/mingsoft/MSApplication.java +++ b/src/main/java/net/mingsoft/MSApplication.java @@ -39,5 +39,4 @@ public class MSApplication { public static void main(String[] args) { SpringApplication.run(MSApplication.class, args); } - } diff --git a/src/main/java/net/mingsoft/cms/action/GeneraterAction.java b/src/main/java/net/mingsoft/cms/action/GeneraterAction.java index 2d523101..5caae54c 100755 --- a/src/main/java/net/mingsoft/cms/action/GeneraterAction.java +++ b/src/main/java/net/mingsoft/cms/action/GeneraterAction.java @@ -100,7 +100,7 @@ public class GeneraterAction extends BaseAction { @Value("${ms.manager.path}") private String managerPath; - @Value("${ms.diy.html-dir:html}") + @Value("${ms.html-dir:html}") private String htmlDir; /** diff --git a/src/main/java/net/mingsoft/cms/action/web/MCmsAction.java b/src/main/java/net/mingsoft/cms/action/web/MCmsAction.java index 3cfd8b01..d8850a55 100755 --- a/src/main/java/net/mingsoft/cms/action/web/MCmsAction.java +++ b/src/main/java/net/mingsoft/cms/action/web/MCmsAction.java @@ -110,7 +110,7 @@ public class MCmsAction extends net.mingsoft.cms.action.BaseAction { private IModelBiz modelBiz; - @Value("${ms.diy.html-dir:html}") + @Value("${ms.html-dir:html}") private String htmlDir; diff --git a/src/main/java/net/mingsoft/cms/biz/impl/ContentBizImpl.java b/src/main/java/net/mingsoft/cms/biz/impl/ContentBizImpl.java index ff82eeed..6dc6c647 100755 --- a/src/main/java/net/mingsoft/cms/biz/impl/ContentBizImpl.java +++ b/src/main/java/net/mingsoft/cms/biz/impl/ContentBizImpl.java @@ -62,7 +62,7 @@ public class ContentBizImpl extends BaseBizImpl imp @Autowired private ICategoryDao categoryDao; - @Value("${ms.diy.html-dir:html}") + @Value("${ms.html-dir:html}") private String htmlDir; diff --git a/src/main/java/net/mingsoft/config/SwaggerConfig.java b/src/main/java/net/mingsoft/config/SwaggerConfig.java index e48bb3dd..917ee6fd 100644 --- a/src/main/java/net/mingsoft/config/SwaggerConfig.java +++ b/src/main/java/net/mingsoft/config/SwaggerConfig.java @@ -35,7 +35,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; @Configuration @EnableSwagger2 -@ConditionalOnProperty(prefix="ms",name = "swagger.enable", havingValue = "true") +@ConditionalOnProperty(prefix="ms",name = "swagger-enable", havingValue = "true") public class SwaggerConfig { @Bean diff --git a/src/main/java/net/mingsoft/config/WebConfig.java b/src/main/java/net/mingsoft/config/WebConfig.java index 36159cb7..d83a2aa3 100644 --- a/src/main/java/net/mingsoft/config/WebConfig.java +++ b/src/main/java/net/mingsoft/config/WebConfig.java @@ -68,7 +68,7 @@ public class WebConfig implements WebMvcConfigurer { /** * 上传路径映射 */ - @Value("${ms.diy.html-dir}") + @Value("${ms.html-dir:html}") private String htmlDir; @Bean public ActionInterceptor actionInterceptor() { @@ -79,7 +79,7 @@ public class WebConfig implements WebMvcConfigurer { public ConfigurationCustomizer configurationCustomizer() { return configuration -> configuration.setUseDeprecatedExecutor(false); } - /** + /**zF * 增加对rest api鉴权的spring mvc拦截器 */ @Override diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 912bfdc7..a24bcfe6 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -12,11 +12,9 @@ logging: name: mcms.log #会在项目的根目录下生成对应的mcms.log文件，也可以根据实际情况写绝对路径，例如：d:/mcms.log path: log #会在项目的根目录下生成log目录，里面会生成对应的日期目录，日期目录下面生成日志压缩包备份文件,默认按每10M分割一个日志文件，例如：log/2020-01/app-2020-01-03-18.1.log.gz（表示2020年1月3号下午六点的第一个备份），也可以根据实际情况写绝对路径，例如：d:/log ms: - diy: - html-dir: html + html-dir: html # scheme: https #解决使用代理服务器代理应用时标签解析域名依旧为http的问题 - swagger: - enable: false #启用swagger文档，生产的时候务必关掉 访问地址：http://ip|域名/项目发布名/swagger-ui.html + swagger-enable: false #启用swagger文档，生产的时候务必关掉 访问地址：http://ip|域名/项目发布名/swagger-ui.html manager: path: /ms #后台访问的路径，如:http://项目/ms/login.do，生产的时候建议修改 view-path: /WEB-INF/manager #后台视图层路径配置 diff --git a/src/main/webapp/WEB-INF/manager/cms/generate/index.ftl b/src/main/webapp/WEB-INF/manager/cms/generate/index.ftl index c134bfd7..d547bf5a 100644 --- a/src/main/webapp/WEB-INF/manager/cms/generate/index.ftl +++ b/src/main/webapp/WEB-INF/manager/cms/generate/index.ftl @@ -37,8 +37,9 @@
一般为index.html或default.html, - 如果是引导页面->首页，可以手动调整主页模版与主页设置，先生成引导页，再生成首页。一般default.html为引导页面index.html为主页。 - + 如果是引导页面->首页，可以手动调整主页模版与主页设置，先生成引导页，再生成首页。一般default.html为引导页面index.html为主页(需要服务器容器配置好对应默认页)。
+ 点击“预览主页”可跳转到网站首页进行预览网站首页
+ 不能选择有分页标签的页面生成，例如news-list.htm、search.htm
@@ -70,7 +71,7 @@ v-model="time" placeholder="请选择指定时间" start-placeholder="" - end-placeholder="" + en.class-3d-placeholder="" :readonly="false" :disabled="false" :editable="false" @@ -310,7 +311,7 @@ padding:20px; outline:none; outline-offset:-1px; - height:300px; + height:400px; max-width:100%; background-color:#FFFFFF; flex-direction:column;