Przeglądaj źródła

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

gitadmin 4 lat temu
rodzic
commit
b748f18395

+ 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
 template.cacheable=false
 
 
 static.host=//ss.jishutao.com/client/1.2.10
 static.host=//ss.jishutao.com/client/1.2.10
-portal.host=//ss.jishutao.com/portal/1.2.15
+portal.host=//ss.jishutao.com/portal/1.2.17
 skjt.host=//ss.jishutao.com/skjt/1.3
 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
 template.cacheable=false
 
 
 static.host=//statics.jishutao.com/client/1.2.7
 static.host=//statics.jishutao.com/client/1.2.7
-portal.host=//statics.jishutao.com/portal/1.2.15
+portal.host=//statics.jishutao.com/portal/1.2.17
 skjt.host=//statics.jishutao.com/skjt/1.3
 skjt.host=//statics.jishutao.com/skjt/1.3
 skjt.userName=admin
 skjt.userName=admin
 skjt.password=asd123..
 skjt.password=asd123..

+ 1 - 1
src/main/webapp/WEB-INF/views/common.html

@@ -228,7 +228,7 @@
                     </li>
                     </li>
                     <li th:class="${subM}=='trading'?active:''" >
                     <li th:class="${subM}=='trading'?active:''" >
                    		 <div>
                    		 <div>
-	                        <a th:href="@{/portal/technologyTrading/tradingIndex}">绿色金融</a>
+	                        <a th:href="@{/portal/technologyTrading/tradingIndex}">科技金融</a>
 	 						<!-- <ol class="subnavigation">
 	 						<!-- <ol class="subnavigation">
 	                            <li>
 	                            <li>
 	                                 <a th:href="@{/portal/technologyTrading/achievement}">技术成果</a>
 	                                 <a th:href="@{/portal/technologyTrading/achievement}">技术成果</a>