Explorar o código

Merge branch 'master' of ssh://anderx@git.jishutao.com:55555/jishutao/jitao-server.git

anderx %!s(int64=7) %!d(string=hai) anos
pai
achega
63a510580e

+ 1 - 1
src/main/java/com/goafanti/app/controller/AppUserController.java

@@ -371,7 +371,7 @@ public class AppUserController extends BaseApiController {
         if (!StringUtils.isBlank(keyword3)) {
         	keyword.add(keyword3);
 		}
-        String[] keywords=(String[])keyword.toArray(new String[keyword.size()]);
+        String[] keywords = keyword.toArray(new String[keyword.size()]);
         ia.setKeyword(StringUtils.join(keywords,","));
         if (bindingResult.hasErrors()) {
             res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),

+ 0 - 1
src/main/java/com/goafanti/common/constant/PageConstants.java

@@ -5,7 +5,6 @@ import java.util.List;
 import java.util.Map;
 
 import com.goafanti.common.utils.StringUtils;
-import com.goafanti.news.bo.newsInterestBo;
 
 public class PageConstants {
 	static final Map<String,String> WEB_DEMAND_PAGES = new HashMap<String, String>();

+ 2 - 5
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -1040,8 +1040,7 @@ public class WebpageController extends BaseController {
 				else {
 					List<PolicyEntity> newsList = achievementService.getIntellectualProperty(6);
 					PolicyEntity newsDetail = newsService.getPolicyDetail(id+"");
-					if (null != newsDetail) {
-			
+					if (null != newsDetail) {		
 						String summary = newsDetail.getSummary();
 						modelview.addObject("hasHighTech",
 								summary != null && (summary.indexOf("高新") > -1 || summary.indexOf("高企") > -1));
@@ -1051,9 +1050,7 @@ public class WebpageController extends BaseController {
 							summary != null && (summary.indexOf("软著") > -1 || summary.indexOf("知识产权") > -1));
 						modelview.addObject("hasTechProj",
 								summary != null && (summary.indexOf("科技") > -1 || summary.indexOf("项目") > -1));
-					}
-					@SuppressWarnings("unchecked")
-					List<PolicyEntity> la = (List<PolicyEntity>) newsList;
+					}			
 					if(newsDetail.getTitleImg()!=null) {
 						String[] imgs=newsDetail.getTitleImg().split(",");
 						if(imgs[0]==null || imgs[0].length()<1)modelview.addObject("imgs",null);

+ 2 - 2
src/main/java/com/goafanti/message/service/impl/MessageServiceImpl.java

@@ -88,7 +88,7 @@ public class MessageServiceImpl  extends BaseMybatisDao<MessageFromSystemMapper>
 					}
 					if(!flag) list.add(data[i]);
 				}
-				String[] tmp = (String[])list.toArray(new String[list.size()]);
+				String[] tmp = list.toArray(new String[list.size()]);
 				return Arrays.toString(tmp);
 			}
 		}else if(selectMap.containsKey(ConsumerType.INDUSTRY.getTypeCode())){ //行业
@@ -428,5 +428,5 @@ public class MessageServiceImpl  extends BaseMybatisDao<MessageFromSystemMapper>
 		jea.setEasemobPass(easemobPass);
 		return jpushEasemobAccountMapper.insert(jea);
 	}
-	
+
 }

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

@@ -5,18 +5,14 @@
 
 <head th:fragment="header(title, link)">
   <meta charset="UTF-8">
-<!--   <link rel="icon" th:href="${portalHost+'/img/ico_logo.ico'}" /> -->
-  <link rel="icon" type="image/png" th:href="${portalHost+'/img/ico_logo.png'}" sizes="16x16">
-
+  <link rel="shortcut icon " type="images/x-icon" th:href="${portalHost+ '/img/ico_logo.png'}">
   <meta name="Keywords" content="高新技术企业认定_双软评估_军工认证_知识产权贯标_知识产权转移_科德"/>
-	<meta name="Description" content="科德信息咨询有限公司17年来专注于国家高新技术企业认定,知识产权贯标,知识产权转移,双软评估,
-体系认证,专利申请,军工三证,工程技术研究中心,创新小巨人等湖南省市科技项目申报、
-成果转化的信息咨询旗舰企业,获得政府部门权威认证的咨询服务机构."/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta http-equiv="X-UA-Compatible" content="ie=edge">
-    <th:block th:replace="${link}" />
-    <title></title>
-    <script src="https://s13.cnzz.com/z_stat.php?id=1274328485&web_id=1274328485" language="JavaScript"></script>
+  <meta name="Description" content="科德信息咨询有限公司17年来专注于国家高新技术企业认定,知识产权贯标,知识产权转移,双软评估,
+	体系认证,专利申请,军工三证,工程技术研究中心,创新小巨人等湖南省市科技项目申报、成果转化的信息咨询旗舰企业,获得政府部门权威认证的咨询服务机构."/>
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <meta http-equiv="X-UA-Compatible" content="ie=edge">
+  <th:block th:replace="${link}" />
+  <title></title>
 </head>
 
 
@@ -338,7 +334,7 @@
 						<a href="http://www.cbtm.gov.cn/" target="_blank">技术合同登记官网</a>
 					</div>
 				</div>
-			</div>	
+			</div>
 		</div>
 		<div class="pub_fix">
 			<ul>
@@ -498,7 +494,17 @@
 	</th:block>
 
 	<th:block th:fragment="footer(scripts)">
-	<script language="javascript" src="https://put.zoosnet.net/JS/LsJS.aspx?siteid=PUT70876498&float=1&lng=cn"></script>
+	 	<script src="https://s22.cnzz.com/z_stat.php?id=1274334487&web_id=1274334487" language="JavaScript"></script>
+		<script>
+			var _hmt = _hmt || [];
+			(function() {
+				var hm = document.createElement("script");
+				hm.src = "https://hm.baidu.com/hm.js?f3add4ca3570adee0a450bd9a7fe9ffb";
+				var s = document.getElementsByTagName("script")[0];
+				s.parentNode.insertBefore(hm, s);
+			})();
+		</script>
+		<script language="javascript" src="https://put.zoosnet.net/JS/LsJS.aspx?siteid=PUT70876498&float=1&lng=cn"></script>
 		<script th:inline="javascript">
 			/*<![CDATA[*/
 			window.globalConfig = {};

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/continueHigh.html


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/index.html


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/militaryProject.html


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/practicalPatent.html


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/patent.html


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/technologyTrading/tradingIndex.html