Browse Source

Accept Merge Request #224 发布新版 : (master -> prod)

Merge Request: 发布新版
Created By: @albertshaw
Accepted By: @albertshaw
URL: https://coding.net/t/aft/p/AFT/git/merge/224
albertshaw 8 years ago
parent
commit
e1a671b6db

+ 2 - 2
src/main/resources/props/config_dev.properties

@@ -51,7 +51,7 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//afts.hnzhiming.com/1.0.40
+static.host=//afts.hnzhiming.com/1.0.41
 
 upload.path=/data/wwwroot/aft/upload
 upload.private.path=/data/upload
@@ -67,7 +67,7 @@ template.cacheable=false
 
 mobileCodeTemplate=SMS_37845022
 
-portal.host=//afts.hnzhiming.com/portal/1.0.10
+portal.host=//afts.hnzhiming.com/portal/1.0.11
 
 patentTemplate=SMS_72005286
 

+ 3 - 3
src/main/webapp/WEB-INF/views/portal/ipr/patentOperation.html

@@ -87,15 +87,15 @@
 					</a> <img
 						src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAALBAMAAACEzBAKAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAPUExURXy4/0dwTObx/6zS//D3/3zk8F4AAAACdFJOU38A3jSoAQAAAD5JREFUCNc9yIEJACAMA8GIC7Qz6ADiCJL9ZzJRsZDyHDIzih60Om7EbOVE7Ws4YpIiCEgRDCYYTDggAt/92AlDDjfH3KJAAAAAAElFTkSuQmCC" />
 					</li>
-					<li><a href="#tab2" data-toggle="tab"> <span>竞争对手专利分析</span>
+					<li><a href="#tab2" data-toggle="tab"> <span>专利挖掘</span>
 					</a> <img
 						src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAALBAMAAACEzBAKAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAPUExURXy4/0dwTObx/6zS//D3/3zk8F4AAAACdFJOU38A3jSoAQAAAD5JREFUCNc9yIEJACAMA8GIC7Qz6ADiCJL9ZzJRsZDyHDIzih60Om7EbOVE7Ws4YpIiCEgRDCYYTDggAt/92AlDDjfH3KJAAAAAAElFTkSuQmCC" />
 					</li>
-					<li><a href="#tab3" data-toggle="tab"> <span>行业专利信息分析专利挖掘与布局</span>
+					<li><a href="#tab3" data-toggle="tab"> <span>专利布局</span>
 					</a> <img
 						src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAALBAMAAACEzBAKAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAPUExURXy4/0dwTObx/6zS//D3/3zk8F4AAAACdFJOU38A3jSoAQAAAD5JREFUCNc9yIEJACAMA8GIC7Qz6ADiCJL9ZzJRsZDyHDIzih60Om7EbOVE7Ws4YpIiCEgRDCYYTDggAt/92AlDDjfH3KJAAAAAAElFTkSuQmCC" />
 					</li>
-					<li><a href="#tab4" data-toggle="tab"> <span>专利预警服务</span>
+					<li><a href="#tab4" data-toggle="tab"> <span>专利预警分析</span>
 					</a> <img
 						src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAALBAMAAACEzBAKAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAPUExURXy4/0dwTObx/6zS//D3/3zk8F4AAAACdFJOU38A3jSoAQAAAD5JREFUCNc9yIEJACAMA8GIC7Qz6ADiCJL9ZzJRsZDyHDIzih60Om7EbOVE7Ws4YpIiCEgRDCYYTDggAt/92AlDDjfH3KJAAAAAAElFTkSuQmCC" />
 					</li>