Browse Source

bugfix,打包路径修改

chao 3 years ago
parent
commit
db839963e8

+ 2 - 2
pom.xml

@@ -80,9 +80,9 @@
 		</profile>
 		<!-- 生产正式环境 -->
 		<profile>
-			<id>product</id>
+			<id>prod</id>
 			<properties>
-				<env.type>product</env.type>
+				<env.type>prod</env.type>
 			</properties>
 		</profile>
 	</profiles>

+ 11 - 10
src/main/java/org/apache/ibatis/thread/Runnable.java

@@ -159,19 +159,20 @@ public class Runnable implements java.lang.Runnable {
 		List<File> refreshs = new ArrayList<File>();
 
 		File[] files = dir.listFiles();
-		for (int i = 0; i < files.length; i++) {
-			File file = files[i];
-			if (file.isDirectory()) {
-				refreshs.addAll(this.getRefreshFile(file, beforeTime));
-			} else if (file.isFile()) {
-				if (this.check(file, beforeTime)) {
-					refreshs.add(file);
+		if (null != files && files.length>0){
+			for (int i = 0; i < files.length; i++) {
+				File file = files[i];
+				if (file.isDirectory()) {
+					refreshs.addAll(this.getRefreshFile(file, beforeTime));
+				} else if (file.isFile()) {
+					if (this.check(file, beforeTime)) {
+						refreshs.add(file);
+					}
+				} else {
+					System.out.println("error file." + file.getName());
 				}
-			} else {
-				System.out.println("error file." + file.getName());
 			}
 		}
-
 		return refreshs;
 	}
 

+ 0 - 0
src/main/resources/config/product/caimei.properties → src/main/resources/config/prod/caimei.properties


+ 0 - 0
src/main/resources/config/product/dfs_client.conf → src/main/resources/config/prod/dfs_client.conf


+ 0 - 0
src/main/resources/config/product/dfs_pool.properties → src/main/resources/config/prod/dfs_pool.properties


+ 0 - 0
src/main/resources/config/product/log4j.properties → src/main/resources/config/prod/log4j.properties


+ 1 - 1
src/main/webapp/WEB-INF/views/modules/newhome/newPageFloorContentForm.jsp

@@ -198,7 +198,7 @@
             </span>
             <span style="display: inline-block;text-align: center;margin-right:12px;margin-bottom: 12px;">
                 <img src="/static/template/product/H.png" style="width: 350px"><br>
-                <form:radiobutton path="templateType" value="8" label="模板H(图片可轮播)" onclick="imageShow()"/>
+                <form:radiobutton path="templateType" value="8" label="模板H(轮播-此模板每个页面只能有一个)" onclick="imageShow()"/>
             </span>
         </div>
         <br>