Explorar el Código

Merge branch 'test' of jishutao/jitao-server into prod

anderx hace 4 años
padre
commit
1ca705e615

+ 1 - 1
src/main/resources/props/config_local.properties

@@ -39,7 +39,7 @@ app.mobile.website=http://m.jishutao.com/1.0/template/index.html
 template.cacheable=false
 
 static.host=//ss.jishutao.com/client/1.2.10
-portal.host=//ss.jishutao.com/portal/1.2.13
+portal.host=//ss.jishutao.com/portal/1.2.15
 skjt.host=//ss.jishutao.com/skjt/1.3
 
 

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -57,7 +57,7 @@ app.mobile.website=http://muat.jishutao.com
 template.cacheable=false
 
 static.host=//statics.jishutao.com/client/1.2.7
-portal.host=//statics.jishutao.com/portal/1.2.8
+portal.host=//statics.jishutao.com/portal/1.2.15
 skjt.host=//statics.jishutao.com/skjt/1.3
 skjt.userName=admin
 skjt.password=asd123..

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 22 - 1
src/main/webapp/WEB-INF/views/portal/aboutUs.html