Bladeren bron

Merge branch 'master' of https://git.coding.net/aft/AFT.git

Conflicts:
	src/main/resources/props/config_dev.properties
	src/main/resources/props/config_local.properties
	src/main/resources/props/config_prod.properties
	src/main/resources/props/config_test.properties

Change-Id: I1c2d6be2e00786356cf331758990751c070e07c5
albertshaw 9 jaren geleden
bovenliggende
commit
061b8cb1e9

+ 4 - 0
src/main/resources/props/config_dev.properties

@@ -50,7 +50,11 @@ session.timeout=12000000
 session.validate.timespan=18000000
 
 app.name=AFT
+<<<<<<< HEAD
 static.host=//afts.hnzhiming.com/1.0.5
+=======
+static.host=//afts.hnzhiming.com/1.0.4
+>>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
 
 upload.path=/data/wwwroot/aft/upload
 upload.private.path=/data/upload

+ 4 - 0
src/main/resources/props/config_local.properties

@@ -52,7 +52,11 @@ session.timeout=12000000
 session.validate.timespan=18000000
 
 app.name=AFT
+<<<<<<< HEAD
 static.host=//afts.hnzhiming.com/1.0.5
+=======
+static.host=//afts.hnzhiming.com/1.0.4
+>>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
 
 upload.path=/Users/xiaolong/Sites/upload
 upload.private.path=/Users/xiaolong/Sites/doc

+ 5 - 1
src/main/resources/props/config_prod.properties

@@ -50,4 +50,8 @@ session.timeout=12000000
 session.validate.timespan=18000000
 
 app.name=AFT
-static.host=//afts.hnzhiming.com/1.0.5
+<<<<<<< HEAD
+static.host=//afts.hnzhiming.com/1.0.5
+=======
+static.host=//afts.hnzhiming.com/1.0.4
+>>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git

+ 4 - 0
src/main/resources/props/config_test.properties

@@ -52,7 +52,11 @@ session.timeout=12000000
 session.validate.timespan=18000000
 
 app.name=AFT
+<<<<<<< HEAD
 static.host=//aftts.hnzhiming.com/1.0.5
+=======
+static.host=//aftts.hnzhiming.com/1.0.4
+>>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
 
 upload.path=/data/aft/public/upload
 upload.private.path=/data/aft/private/upload