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

Merge pull request !222 from 灰色DT/master

pom.xml

@@ -52,12 +52,12 @@
         <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>-->
+        <!-- 如果使用的是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>
@@ -103,7 +103,6 @@
                         <!--注意这玩意从编译结果目录开始算目录结构 -->
                         <exclude>**/static/plugins/</exclude>
                         <exclude>**/static/skin/</exclude>
-						<exclude>**/application*.yml</exclude>
                         <exclude>**/Dockerfile</exclude>
                         <exclude>**/ehcache.xml</exclude>
                         <exclude>**/upgrade/</exclude>
@@ -137,6 +136,10 @@
                     </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>
@@ -145,21 +148,7 @@
                     <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>
@@ -246,9 +235,11 @@
                         </resource>
                     </webResources>
                     <attachClasses>true</attachClasses>
-					<warSourceExcludes> */web.xml,static</warSourceExcludes>
+                    <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>
+                    <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>
@@ -258,31 +249,7 @@
                     <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>
 

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;

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>

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);
 				});