!222 添加注释,主页选中问题

Merge pull request !222 from 灰色DT/master

pom.xml

@@ -1,291 +1,258 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<parent>
-		<groupId>net.mingsoft</groupId>
-		<artifactId>ms-pom</artifactId>
-		<version>1.0.0</version>
-		<relativePath/>
-	</parent>
-		<modelVersion>4.0.0</modelVersion>
-	<groupId>net.mingsoft</groupId>
-	<artifactId>ms-mcms</artifactId>
-	<version>5.0.0</version>
-	<name>${project.groupId}:${project.artifactId}</name>
-	<description>ms-mcms tools Library</description>
-	<url>https://github.com/ming-soft/ms-mcms</url>
-	<licenses>
-		<license>
-			<name>The MIT License (MIT)</name>
-			<url>http://mit-license.org</url>
-		</license>
-	</licenses>
-	<developers>
-		<developer>
-			<name>mingsoft develop group</name>
-			<email>service@mingsoft.net</email>
-			<organization>mingsoft</organization>
-			<organizationUrl>http://www.mingsoft.net</organizationUrl>
-		</developer>
-	</developers>
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>net.mingsoft</groupId>
+        <artifactId>ms-pom</artifactId>
+        <version>1.0.0</version>
+        <relativePath/>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>net.mingsoft</groupId>
+    <artifactId>ms-mcms</artifactId>
+    <version>5.0.0</version>
+    <name>${project.groupId}:${project.artifactId}</name>
+    <description>ms-mcms tools Library</description>
+    <url>https://github.com/ming-soft/ms-mcms</url>
+    <licenses>
+        <license>
+            <name>The MIT License (MIT)</name>
+            <url>http://mit-license.org</url>
+        </license>
+    </licenses>
+    <developers>
+        <developer>
+            <name>mingsoft develop group</name>
+            <email>service@mingsoft.net</email>
+            <organization>mingsoft</organization>
+            <organizationUrl>http://www.mingsoft.net</organizationUrl>
+        </developer>
+    </developers>
 
-	<scm>
-		<connection>scm:git://github.com/ming-soft/ms-mcms.git</connection>
-		<developerConnection>scm:git@github.com:ming-soft/ms-mcms.git</developerConnection>
-		<url>https://github.com/ming-soft/ms-mcms</url>
-	</scm>
-	<distributionManagement>
-		<snapshotRepository>
-			<id>sonatype-nexus-snapshots</id>
-			<name>Sonatype Nexus snapshot repository</name>
-			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
-		</snapshotRepository>
-		<repository>
-			<id>sonatype-nexus-staging</id>
-			<name>Sonatype Nexus release repository</name>
-			<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-		</repository>
-	</distributionManagement>
-	<properties>
-		<java.version>1.8</java.version>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	</properties>
-	<dependencies>
-<!-- 如果使用的是mysql8.0需要使用8.0的驱动 -->	
-<!--		<dependency>-->
-<!--			<groupId>mysql</groupId>-->
-<!--			<artifactId>mysql-connector-java</artifactId>-->
-<!--			<version>8.0.11</version>-->
-<!--		</dependency>-->
-		<dependency>
-			<groupId>net.mingsoft</groupId>
-			<artifactId>ms-mpeople</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>net.mingsoft</groupId>
-			<artifactId>ms-upgrader</artifactId>
-		</dependency>
-	</dependencies>
-	<build>
-		<resources>
-			<resource>
-				<directory>src/main/java</directory>
-			</resource>
-			<resource>
-				<directory>src/main/webapp</directory>
-				<excludes>
-					<exclude>html/</exclude>
-					<exclude>static/</exclude>
-					<exclude>upload/</exclude>
-					<exclude>templets/</exclude>
-				</excludes>
-			</resource>
-			<resource>
-				<directory>src/main/resources</directory>
-			</resource>
-		</resources>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.6</version>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<excludes>
-						<!--注意这玩意从编译结果目录开始算目录结构 -->
-						<exclude>**/static/plugins/</exclude>
-						<exclude>**/static/skin/</exclude>
-						<exclude>**/application*.yml</exclude>
-						<exclude>**/Dockerfile</exclude>
-						<exclude>**/ehcache.xml</exclude>
-						<exclude>**/upgrade/</exclude>
-						<exclude>**/*.java</exclude>
-					</excludes>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-				<version>2.2.1</version>
-				<configuration>
-					<excludes>
-						<exclude>**/static/plugins/</exclude>
-						<exclude>**/static/skin/</exclude>
-						<exclude>**/application*.yml</exclude>
-						<exclude>**/Dockerfile</exclude>
-						<exclude>**/ehcache.xml</exclude>
-						<exclude>**/upgrade/</exclude>
-						<exclude>**/config/</exclude>
-						<exclude>**/MSApplication.java</exclude>
-						<exclude>**/MSServletInitializer.java</exclude>
-					</excludes>
-				</configuration>
-				<executions>
-					<execution>
-						<id>attach-sources</id>
-						<goals>
-							<goal>jar-no-fork</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.1</version>
-				<configuration>
-					<source>${java.version}</source>
-					<target>${java.version}</target>
-					<encoding>${project.build.sourceEncoding}</encoding>
-					<showDeprecation>true</showDeprecation>
-					<showWarnings>true</showWarnings>
-					<compilerArguments>
-						<verbose />
-						<bootclasspath>${java.home}/lib/rt.jar:${java.home}/lib/jce.jar</bootclasspath>
-					</compilerArguments>
-					<compilerArgument>-Xlint:unchecked</compilerArgument>
-				</configuration>
-				<dependencies>
-					<dependency>
-						<groupId>org.codehaus.plexus</groupId>
-						<artifactId>plexus-compiler-eclipse</artifactId>
-						<version>2.1</version>
-					</dependency>
-				</dependencies>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-eclipse-plugin</artifactId>
-				<version>2.8</version>
-				<configuration>
-					<additionalConfig>
-						<file>
-							<name>.settings/org.eclipse.core.resources.prefs</name>
-							<content>
-                            <![CDATA[
+    <scm>
+        <connection>scm:git://github.com/ming-soft/ms-mcms.git</connection>
+        <developerConnection>scm:git@github.com:ming-soft/ms-mcms.git</developerConnection>
+        <url>https://github.com/ming-soft/ms-mcms</url>
+    </scm>
+    <distributionManagement>
+        <snapshotRepository>
+            <id>sonatype-nexus-snapshots</id>
+            <name>Sonatype Nexus snapshot repository</name>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+        </snapshotRepository>
+        <repository>
+            <id>sonatype-nexus-staging</id>
+            <name>Sonatype Nexus release repository</name>
+            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+        </repository>
+    </distributionManagement>
+    <properties>
+        <java.version>1.8</java.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+    <dependencies>
+        <!-- 如果使用的是mysql8.0需要使用8.0的驱动 -->
+        <!--		<dependency>-->
+        <!--			<groupId>mysql</groupId>-->
+        <!--			<artifactId>mysql-connector-java</artifactId>-->
+        <!--			<version>8.0.11</version>-->
+        <!--		</dependency>-->
+        <dependency>
+            <groupId>net.mingsoft</groupId>
+            <artifactId>ms-mpeople</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>net.mingsoft</groupId>
+            <artifactId>ms-upgrader</artifactId>
+        </dependency>
+    </dependencies>
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+            </resource>
+            <resource>
+                <directory>src/main/webapp</directory>
+                <excludes>
+                    <exclude>html/</exclude>
+                    <exclude>static/</exclude>
+                    <exclude>upload/</exclude>
+                    <exclude>templets/</exclude>
+                </excludes>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.6</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <excludes>
+                        <!--注意这玩意从编译结果目录开始算目录结构 -->
+                        <exclude>**/static/plugins/</exclude>
+                        <exclude>**/static/skin/</exclude>
+                        <exclude>**/Dockerfile</exclude>
+                        <exclude>**/ehcache.xml</exclude>
+                        <exclude>**/upgrade/</exclude>
+                        <exclude>**/*.java</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>2.2.1</version>
+                <configuration>
+                    <excludes>
+                        <exclude>**/static/plugins/</exclude>
+                        <exclude>**/static/skin/</exclude>
+                        <exclude>**/application*.yml</exclude>
+                        <exclude>**/Dockerfile</exclude>
+                        <exclude>**/ehcache.xml</exclude>
+                        <exclude>**/upgrade/</exclude>
+                        <exclude>**/config/</exclude>
+                        <exclude>**/MSApplication.java</exclude>
+                        <exclude>**/MSServletInitializer.java</exclude>
+                    </excludes>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                    <encoding>${project.build.sourceEncoding}</encoding>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-eclipse-plugin</artifactId>
+                <version>2.8</version>
+                <configuration>
+                    <additionalConfig>
+                        <file>
+                            <name>.settings/org.eclipse.core.resources.prefs</name>
+                            <content>
+                                <![CDATA[
                             eclipse.preferences.version=1
                             encoding/<project>=${project.build.sourceEncoding}
                             ]]>
-							</content>
-						</file>
-					</additionalConfig>
-				</configuration>
-			</plugin>
+                            </content>
+                        </file>
+                    </additionalConfig>
+                </configuration>
+            </plugin>
 
-			<plugin>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-					<argLine>-Xmx256m</argLine>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>com.atlassian.maven.plugins</groupId>
-				<artifactId>maven-clover2-plugin</artifactId>
-				<version>2.6.3</version>
-				<configuration>
-					<licenseLocation>${clover.license.file}</licenseLocation>
-					<encoding>${project.build.sourceEncoding}</encoding>
-					<generateXml>true</generateXml>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>findbugs-maven-plugin</artifactId>
-				<version>1.2</version>
-				<configuration>
-					<findbugsXmlOutput>true</findbugsXmlOutput>
-					<findbugsXmlWithMessages>true</findbugsXmlWithMessages>
-					<xmlOutput>true</xmlOutput>
-				</configuration>
-			</plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <argLine>-Xmx256m</argLine>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>com.atlassian.maven.plugins</groupId>
+                <artifactId>maven-clover2-plugin</artifactId>
+                <version>2.6.3</version>
+                <configuration>
+                    <licenseLocation>${clover.license.file}</licenseLocation>
+                    <encoding>${project.build.sourceEncoding}</encoding>
+                    <generateXml>true</generateXml>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>findbugs-maven-plugin</artifactId>
+                <version>1.2</version>
+                <configuration>
+                    <findbugsXmlOutput>true</findbugsXmlOutput>
+                    <findbugsXmlWithMessages>true</findbugsXmlWithMessages>
+                    <xmlOutput>true</xmlOutput>
+                </configuration>
+            </plugin>
 
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.9.1</version>
-				<configuration>
-					<charset>UTF-8</charset>
-					<encoding>UTF-8</encoding>
-					<docencoding>UTF-8</docencoding>
-					<javadocExecutable>${java.home}/../bin/javadoc</javadocExecutable>
-					<additionalparam>-Xdoclint:none</additionalparam>
-				</configuration>
-				<executions>
-					<execution>
-						<id>attach-javadocs</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-war-plugin</artifactId>
-				<version>2.6</version>
-				<configuration>
-					<webResources>
-						<resource>
-							<directory>src/main/webapp/WEB-INF</directory>
-							<targetPath>WEB-INF</targetPath>
-							<filtering>true</filtering>
-							<includes>
-								<include>**/*.xml</include>
-							</includes>
-							<excludes>
-								<exclude>web.xml</exclude>
-							</excludes>
-						</resource>
-					</webResources>
-					<attachClasses>true</attachClasses>
-					<warSourceExcludes> */web.xml,static</warSourceExcludes>
-					<failOnMissingWebXml>false</failOnMissingWebXml>
-					<packagingExcludes>ms.install,html/,static/,temp,upgrader,WEB-INF/web.xml,WEB-INF/lib/,templets/,upload/,WEB-INF/classes/*.xml,WEB-INF/classes/*.properties,*.sh,WEB-INF/classes/net/mingsoft/config/,WEB-INF/classes/net/mingsoft/*.class</packagingExcludes>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-release-plugin</artifactId>
-				<configuration>
-					<arguments>-Dgpg.passphrase=${gpg.passphrase}</arguments>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.sonatype.plugins</groupId>
-				<artifactId>nexus-staging-maven-plugin</artifactId>
-				<version>1.6.7</version>
-				<extensions>true</extensions>
-				<configuration>
-					<serverId>sonatype-nexus-staging</serverId>
-					<nexusUrl>https://oss.sonatype.org/</nexusUrl>
-					<autoReleaseAfterClose>true</autoReleaseAfterClose>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-gpg-plugin</artifactId>
-				<version>1.5</version>
-				<executions>
-					<execution>
-						<id>sign-artifacts</id>
-						<phase>verify</phase>
-						<goals>
-							<goal>sign</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-		<defaultGoal>compile</defaultGoal>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.9.1</version>
+                <configuration>
+                    <charset>UTF-8</charset>
+                    <encoding>UTF-8</encoding>
+                    <docencoding>UTF-8</docencoding>
+                    <javadocExecutable>${java.home}/../bin/javadoc</javadocExecutable>
+                    <additionalparam>-Xdoclint:none</additionalparam>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>2.6</version>
+                <configuration>
+                    <webResources>
+                        <resource>
+                            <directory>src/main/webapp/WEB-INF</directory>
+                            <targetPath>WEB-INF</targetPath>
+                            <filtering>true</filtering>
+                            <includes>
+                                <include>**/*.xml</include>
+                            </includes>
+                            <excludes>
+                                <exclude>web.xml</exclude>
+                            </excludes>
+                        </resource>
+                    </webResources>
+                    <attachClasses>true</attachClasses>
+                    <warSourceExcludes>*/web.xml,static</warSourceExcludes>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                    <packagingExcludes>
+                        ms.install,html/,static/,temp,upgrader,WEB-INF/web.xml,WEB-INF/lib/,templets/,upload/,WEB-INF/classes/*.xml,WEB-INF/classes/*.properties,*.sh,WEB-INF/classes/net/mingsoft/config/,WEB-INF/classes/net/mingsoft/*.class
+                    </packagingExcludes>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-release-plugin</artifactId>
+                <configuration>
+                    <arguments>-Dgpg.passphrase=${gpg.passphrase}</arguments>
+                </configuration>
+            </plugin>
 
-		<finalName>ms-mcms</finalName>
-	</build>
-</project>
+        </plugins>
+        <defaultGoal>compile</defaultGoal>
+
+        <finalName>ms-mcms</finalName>
+    </build>
+</project>

src/main/java/net/mingsoft/cms/action/GeneraterAction.java

@@ -24,7 +24,6 @@ package net.mingsoft.cms.action;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.io.FileUtil;
-import net.mingsoft.basic.action.BaseAction;
 import net.mingsoft.basic.biz.IModelBiz;
 import net.mingsoft.basic.entity.AppEntity;
 import net.mingsoft.basic.util.BasicUtil;
@@ -52,12 +51,12 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * 
+ *
  * @ClassName: GeneraterAction
  * @Description:TODO 生成器
  * @author: 铭飞开发团队
  * @date: 2018年1月31日 下午2:52:07
- * 
+ *
  * @Copyright: 2018 www.mingsoft.net Inc. All rights reserved.
  */
 @Controller("cmsGenerater")
@@ -92,7 +91,7 @@ public class GeneraterAction extends BaseAction {
 
 	/**
 	 * 更新主页
-	 * 
+	 *
 	 * @return
 	 */
 	@RequestMapping("/index")
@@ -102,7 +101,7 @@ public class GeneraterAction extends BaseAction {
 
 	/**
 	 * 生成主页
-	 * 
+	 *
 	 * @param request
 	 * @param response
 	 */
@@ -114,7 +113,7 @@ public class GeneraterAction extends BaseAction {
 		String tmpFileName = request.getParameter("url");
 		// 生成后的文件名称
 		String generateFileName = request.getParameter("position");
-		
+
 		// 获取文件所在路径 首先判断用户输入的模版文件是否存在
 		if (!FileUtil.exist(ParserUtil.buildTempletPath())) {
 			this.outJson(response, false, getResString("templet.file"));
@@ -128,12 +127,12 @@ public class GeneraterAction extends BaseAction {
 			}
 		}
 	}
-	
+
 
 
 	/**
 	 * 生成列表的静态页面
-	 * 
+	 *
 	 * @param request
 	 * @param response
 	 * @param CategoryId
@@ -194,7 +193,7 @@ public class GeneraterAction extends BaseAction {
 
 	/**
 	 * 根据栏目id更新所有的文章
-	 * 
+	 *
 	 * @param request
 	 * @param response
 	 * @param columnId
@@ -219,12 +218,12 @@ public class GeneraterAction extends BaseAction {
 			this.outJson(response, false);
 		}
 	}
-	
+
 
 
 	/**
 	 * 用户预览主页
-	 * 
+	 *
 	 * @param request
 	 * @return
 	 */
@@ -236,4 +235,4 @@ public class GeneraterAction extends BaseAction {
 				+ File.separator + position + ParserUtil.HTML_SUFFIX;
 		return "redirect:" + indexPosition;
 	}
-}
+}

src/main/java/net/mingsoft/cms/dao/ICategoryDao.xml

@@ -174,7 +174,7 @@
 			and
 			(
 			<if test="categoryParentId != null and categoryParentId!=''">
-				CATEGORY_PARENT_ID like '%${categoryParentId}%'
+				find_in_set(#{categoryParentId},CATEGORY_PARENT_ID)
 			</if>
 			<if test="categoryParentId == null or  categoryParentId ==''">
 				<include refid="queryWhereCategoryId"></include>
@@ -237,4 +237,4 @@
 		order by id desc
 	</select>
 
-</mapper>
+</mapper>

src/main/java/net/mingsoft/cms/resources/resources.properties

@@ -33,3 +33,4 @@ category.id=\u6240\u5C5E\u680F\u76EE
 content.sort=\u81EA\u5B9A\u4E49\u987A\u5E8F
 category.diy.url=\u81EA\u5B9A\u4E49\u94FE\u63A5
 content.keyword=\u5173\u952E\u5B57
+templet.file=\u672A\u627E\u5230\u6A21\u677F\u6587\u4EF6

src/main/java/net/mingsoft/cms/resources/resources_zh_CN.properties

@@ -33,3 +33,4 @@ category.id=\u6240\u5C5E\u680F\u76EE
 content.sort=\u81EA\u5B9A\u4E49\u987A\u5E8F
 category.diy.url=\u81EA\u5B9A\u4E49\u94FE\u63A5
 content.keyword=\u5173\u952E\u5B57
+templet.file=\u672A\u627E\u5230\u6A21\u677F\u6587\u4EF6

src/main/webapp/WEB-INF/manager/cms/generate/index.ftl

@@ -128,7 +128,7 @@
 			homeLoading:false,
 			articleLoading:false,
 			columnLoading:false,
-			template:'index.htm',//主题模板
+			template:'',//主题模板
 			templateOptions:[],
 			position:'index', //位置
 			contentSection:'0', //文章栏目
@@ -205,6 +205,12 @@
 				var that = this;
 				ms.http.get(ms.manager+'/template/queryTemplateFileForColumn.do', {pageSize:99999}).then(function (data) {
 					that.templateOptions = data.data;
+					//寻找主页
+					var template = that.templateOptions.find(function (x) {
+						return x.indexOf("index")!=-1||x.indexOf("default")!=-1;
+					})
+					//没有就找其他的
+					that.template = template||(that.templateOptions.length>0?that.templateOptions[0]:"");
 				}).catch(function (err) {
 					console.log(err);
 				});
@@ -702,4 +708,4 @@
 	.el-date-editor{
 		width: 100%;
 	}
-</style>
+</style>