Procházet zdrojové kódy

前端相关联修改

anderx před 4 roky
rodič
revize
72df646ef0

+ 12 - 13
src/main/java/com/kede/activity/controller/AdminActivityApiController.java

@@ -7,9 +7,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
-import com.fasterxml.jackson.core.format.InputAccessor;
 import com.kede.activity.bo.InputActivity;
 import com.kede.activity.bo.InputActivity;
-import com.kede.activity.service.Impl.ActivityService;
+import com.kede.activity.service.ActivityService;
 import com.kede.common.bo.Result;
 import com.kede.common.bo.Result;
 import com.kede.common.constant.ErrorConstants;
 import com.kede.common.constant.ErrorConstants;
 import com.kede.common.controller.BaseApiController;
 import com.kede.common.controller.BaseApiController;
@@ -26,8 +25,8 @@ public class AdminActivityApiController extends BaseApiController {
  	private ActivityService	activityService;
  	private ActivityService	activityService;
 	
 	
 
 
-	@RequestMapping(value = "/addNews", method = RequestMethod.POST)
-	public Result addNews(InputActivity in) {
+	@RequestMapping(value = "/add", method = RequestMethod.POST)
+	public Result add(InputActivity in) {
 		Result res =new Result();
 		Result res =new Result();
 		inputcheke(in, res);
 		inputcheke(in, res);
 		if(!res.getError().isEmpty())return res;
 		if(!res.getError().isEmpty())return res;
@@ -57,15 +56,15 @@ public class AdminActivityApiController extends BaseApiController {
 		
 		
 		
 		
 	
 	
-	@RequestMapping(value = "/updateNews", method = RequestMethod.POST)
-	public Result updateNews(InputActivity in) {
+	@RequestMapping(value = "/update", method = RequestMethod.POST)
+	public Result update(InputActivity in) {
 		Result res =new Result();
 		Result res =new Result();
 		res.data(activityService.update(in));
 		res.data(activityService.update(in));
 		return res;
 		return res;
 	}
 	}
 	
 	
-	@RequestMapping(value = "/deleteNews", method = RequestMethod.POST)
-	public Result deleteNews(InputActivity in) {
+	@RequestMapping(value = "/delete", method = RequestMethod.POST)
+	public Result delete(InputActivity in) {
 		Result res =new Result();
 		Result res =new Result();
 		if(in.getId()==null) {
 		if(in.getId()==null) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"ID","ID"));
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"ID","ID"));
@@ -76,27 +75,27 @@ public class AdminActivityApiController extends BaseApiController {
 	}
 	}
 	
 	
 	@RequestMapping(value = "/list", method = RequestMethod.GET)
 	@RequestMapping(value = "/list", method = RequestMethod.GET)
-	public Result listNews(InputActivity in,Integer pageSize,Integer pageNo) {
+	public Result list(InputActivity in,Integer pageSize,Integer pageNo) {
 		Result res =new Result();
 		Result res =new Result();
 		
 		
 		res.data(activityService.listDetails(in,pageSize,pageNo));
 		res.data(activityService.listDetails(in,pageSize,pageNo));
 		return res;
 		return res;
 	}
 	}
 	
 	
-	@RequestMapping(value = "/selectNews", method = RequestMethod.GET)
-	public Result selectNews(InputNews in) {
+	@RequestMapping(value = "/select", method = RequestMethod.GET)
+	public Result select(InputNews in) {
 		Result res =new Result();
 		Result res =new Result();
 		if(in.getId()==null) {
 		if(in.getId()==null) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"ID","ID"));
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"ID","ID"));
 			return res;
 			return res;
 		}
 		}
 		if (!res.getError().isEmpty()) return res;
 		if (!res.getError().isEmpty()) return res;
-//		res.data(activityService.selectNews(in));
+		res.data(activityService.select(in));
 		return res;
 		return res;
 	}
 	}
 	
 	
 	/** 上传图片 **/
 	/** 上传图片 **/
-	@RequestMapping(value = "/uploadFile", method = RequestMethod.POST)
+	@RequestMapping(value = "/upload", method = RequestMethod.POST)
 	public Result uploadOrderInvoiceFile(HttpServletRequest req){
 	public Result uploadOrderInvoiceFile(HttpServletRequest req){
 		Result res = new Result();
 		Result res = new Result();
 		res.setData(handleFile(res, "/activity/", false, req, "activity"));
 		res.setData(handleFile(res, "/activity/", false, req, "activity"));

+ 4 - 1
src/main/java/com/kede/activity/service/Impl/ActivityService.java

@@ -1,8 +1,9 @@
-package com.kede.activity.service.Impl;
+package com.kede.activity.service;
 
 
 import com.kede.activity.bo.InputActivity;
 import com.kede.activity.bo.InputActivity;
 import com.kede.activity.bo.OutActivity;
 import com.kede.activity.bo.OutActivity;
 import com.kede.core.mybatis.page.Pagination;
 import com.kede.core.mybatis.page.Pagination;
+import com.kede.news.bo.InputNews;
 
 
 public interface ActivityService {
 public interface ActivityService {
 
 
@@ -14,4 +15,6 @@ public interface ActivityService {
 
 
 	Pagination<OutActivity> listDetails(InputActivity in, Integer pageSize, Integer pageNo);
 	Pagination<OutActivity> listDetails(InputActivity in, Integer pageSize, Integer pageNo);
 
 
+	OutActivity select(InputNews in);
+
 }
 }

+ 29 - 3
src/main/java/com/kede/activity/service/Impl/ActivityServiceImpl.java

@@ -9,16 +9,22 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Map;
 
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 
 import com.kede.activity.bo.InputActivity;
 import com.kede.activity.bo.InputActivity;
 import com.kede.activity.bo.OutActivity;
 import com.kede.activity.bo.OutActivity;
+import com.kede.activity.service.ActivityService;
 import com.kede.common.constant.AFTConstants;
 import com.kede.common.constant.AFTConstants;
 import com.kede.common.dao.ActivityMapper;
 import com.kede.common.dao.ActivityMapper;
 import com.kede.common.error.BusinessException;
 import com.kede.common.error.BusinessException;
+import com.kede.common.model.Activity;
+import com.kede.common.utils.BeanUtilsExt;
 import com.kede.common.utils.DateUtils;
 import com.kede.common.utils.DateUtils;
 import com.kede.core.mybatis.BaseMybatisDao;
 import com.kede.core.mybatis.BaseMybatisDao;
 import com.kede.core.mybatis.page.Pagination;
 import com.kede.core.mybatis.page.Pagination;
+import com.kede.news.bo.InputNews;
 
 
+@Service
 public class ActivityServiceImpl extends BaseMybatisDao<ActivityMapper> implements ActivityService {
 public class ActivityServiceImpl extends BaseMybatisDao<ActivityMapper> implements ActivityService {
 
 
 	@Autowired
 	@Autowired
@@ -28,11 +34,12 @@ public class ActivityServiceImpl extends BaseMybatisDao<ActivityMapper> implemen
 	public int add(InputActivity in) {
 	public int add(InputActivity in) {
 		if (in.getReleaseTimes() != null) {
 		if (in.getReleaseTimes() != null) {
 			try {
 			try {
-				in.setReleaseTime(DateUtils.StringToDate(in.getReleaseTimes(), AFTConstants.YYYYMMDDHHMMSS));
+				in.setReleaseTime(DateUtils.StringToDate(in.getReleaseTimes(), AFTConstants.YYYYMMDD));
 			} catch (ParseException e) {
 			} catch (ParseException e) {
 				throw new BusinessException("转换异常");
 				throw new BusinessException("转换异常");
 			}
 			}
 		}
 		}
+		in.setCreateTime(new Date());
 		if (in.getReleaseStatus() == 1 && in.getReleaseTime() == null) {
 		if (in.getReleaseStatus() == 1 && in.getReleaseTime() == null) {
 			in.setReleaseTime(new Date());
 			in.setReleaseTime(new Date());
 		}
 		}
@@ -44,7 +51,7 @@ public class ActivityServiceImpl extends BaseMybatisDao<ActivityMapper> implemen
 	public int update(InputActivity in) {
 	public int update(InputActivity in) {
 		if (in.getReleaseTimes() != null) {
 		if (in.getReleaseTimes() != null) {
 			try {
 			try {
-				in.setReleaseTime(DateUtils.StringToDate(in.getReleaseTimes(), AFTConstants.YYYYMMDDHHMMSS));
+				in.setReleaseTime(DateUtils.StringToDate(in.getReleaseTimes(), AFTConstants.YYYYMMDD));
 			} catch (ParseException e) {
 			} catch (ParseException e) {
 				throw new BusinessException("转换异常");
 				throw new BusinessException("转换异常");
 			}
 			}
@@ -66,8 +73,27 @@ public class ActivityServiceImpl extends BaseMybatisDao<ActivityMapper> implemen
 	public Pagination<OutActivity> listDetails(InputActivity in, Integer pageSize, Integer pageNo) {Map<String, Object> params = new HashMap<>();
 	public Pagination<OutActivity> listDetails(InputActivity in, Integer pageSize, Integer pageNo) {Map<String, Object> params = new HashMap<>();
 	if(pageSize==null||pageSize<0)pageSize=10;
 	if(pageSize==null||pageSize<0)pageSize=10;
 	if(pageNo==null||pageNo<0)pageNo=1;
 	if(pageNo==null||pageNo<0)pageNo=1;
-	params.put("n", in);
+	if(in.getTitle()!=null)params.put("title", in.getTitle());
+	if(in.getReleaseStatus()!=null)params.put("releaseStatus", in.getReleaseStatus());
 	return (Pagination<OutActivity>) findPage("findActivityList", "findActivityCount", params, pageNo, pageSize);
 	return (Pagination<OutActivity>) findPage("findActivityList", "findActivityCount", params, pageNo, pageSize);
 	}
 	}
 
 
+	@Override
+	public OutActivity select(InputNews in) {
+		Activity a=activityMapper.selectByPrimaryKey(in.getId());
+		OutActivity oa=null;
+		if(a!=null) {
+			oa=new OutActivity();
+			try {
+				BeanUtilsExt.copyProperties(oa,a);
+				oa.setCreateTimeConvert(DateUtils.formatDate(a.getCreateTime(), AFTConstants.YYYYMMDDHHMMSS));
+				oa.setReleaseTimeConvert(DateUtils.formatDate(a.getReleaseTime(), AFTConstants.YYYYMMDD));
+			} catch (Exception e) {
+				new BusinessException("实体转换异常",e);
+			}
+		}
+		
+		return oa;
+	}
+
 }
 }

+ 11 - 0
src/main/java/com/kede/common/controller/PublicApiController.java

@@ -8,6 +8,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
+import com.kede.activity.bo.InputActivity;
+import com.kede.activity.service.ActivityService;
 import com.kede.banners.service.BannersService;
 import com.kede.banners.service.BannersService;
 import com.kede.common.bo.Result;
 import com.kede.common.bo.Result;
 import com.kede.common.constant.ErrorConstants;
 import com.kede.common.constant.ErrorConstants;
@@ -40,6 +42,8 @@ public class PublicApiController extends BaseController {
 	private RecruitmentService	recruitmentService;
 	private RecruitmentService	recruitmentService;
 	@Resource
 	@Resource
 	private VisitingCustomersService	visitingCustomersService;
 	private VisitingCustomersService	visitingCustomersService;
+	@Resource
+	private ActivityService	activityService;
 
 
 	
 	
 	@RequestMapping(value = "/listNews", method = RequestMethod.GET)
 	@RequestMapping(value = "/listNews", method = RequestMethod.GET)
@@ -87,4 +91,11 @@ public class PublicApiController extends BaseController {
 		res.data(visitingCustomersService.addVisitingCustomers(vc));
 		res.data(visitingCustomersService.addVisitingCustomers(vc));
 		return res;
 		return res;
 	}
 	}
+	@RequestMapping(value = "/activity/list", method = RequestMethod.GET)
+	public Result list(InputActivity in,Integer pageSize,Integer pageNo) {
+		Result res =new Result();
+		in.setReleaseStatus(1);
+		res.data(activityService.listDetails(in,pageSize,pageNo));
+		return res;
+	}
 }
 }

+ 26 - 0
src/main/java/com/kede/common/mapper/ActivityMapper.xml

@@ -211,4 +211,30 @@
       release_time = #{releaseTime,jdbcType=TIMESTAMP}
       release_time = #{releaseTime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
   </update>
+  <select id="findActivityList" resultType="com.kede.activity.bo.OutActivity">
+	select id,title ,publisher ,picture_url pictureUrl,sort ,content,
+	release_status releaseStatus,
+	date_format( create_time,'%Y-%m-%d %H:%i:%s') createTimeConvert,
+	date_format( release_time ,'%Y-%m-%d') releaseTimeConvert
+	from activity where 1=1
+	<if test="title != null">
+	and title like concat('%',#{title},'%')
+	</if>
+	<if test="releaseStatus != null">
+	and release_status = #{releaseStatus}
+	</if>
+	 <if test="page_sql!=null">
+			${page_sql}
+	</if>
+  </select>
+    <select id="findActivityCount" resultType="java.lang.Integer">
+	select count(*)
+	from activity where 1=1
+	<if test="title != null">
+	and title like concat('%',#{title},'%')
+	</if>
+	<if test="releaseStatus != null">
+	and release_status = #{releaseStatus}
+	</if>
+  </select>
 </mapper>
 </mapper>

+ 2 - 7
src/main/java/com/kede/common/utils/DateUtils.java

@@ -428,8 +428,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
 	 * @throws ParseException 
 	 * @throws ParseException 
 	 */
 	 */
 	public static Date parseDate(String source, String pattern) throws ParseException {
 	public static Date parseDate(String source, String pattern) throws ParseException {
-		SimpleDateFormat format = new SimpleDateFormat(pattern);
-		return format.parse(source);
+		return new SimpleDateFormat(pattern).parse(source);
 	}
 	}
 
 
 	/**
 	/**
@@ -465,11 +464,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
 	 */
 	 */
 	public static Date StringToDate(String date,String ymd) throws ParseException
 	public static Date StringToDate(String date,String ymd) throws ParseException
 	{
 	{
-	SimpleDateFormat dateFormat=new SimpleDateFormat(ymd);
-	
-	Date parse = dateFormat.parse(date);
-	return parse;
-
+	return new SimpleDateFormat(ymd).parse(date);
 	}
 	}
 	
 	
 
 

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

@@ -7,7 +7,7 @@
 <meta charset="UTF-8">
 <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width,initial-scale=1.0, user-scalable=no">
     <meta name="viewport" content="width=device-width,initial-scale=1.0, user-scalable=no">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
-    <title>湖南科德信息咨询有限公司</title>
+    <title>湖南科德信息咨询集团有限公司</title>
     <link rel="icon" th:href="${portalHost+'/images/icon/kedexinxi.ico'}"  type="image/x-icon">
     <link rel="icon" th:href="${portalHost+'/images/icon/kedexinxi.ico'}"  type="image/x-icon">
     <!--Bootstrap CSS 文件 -->
     <!--Bootstrap CSS 文件 -->
     <link rel="stylesheet" th:href="${portalHost+'/css/bootstrap.min.css'}">
     <link rel="stylesheet" th:href="${portalHost+'/css/bootstrap.min.css'}">
@@ -53,7 +53,7 @@
                     <li><a th:href="${basePath+'/portal/index'}">首页</a></li>
                     <li><a th:href="${basePath+'/portal/index'}">首页</a></li>
                     <li class="product_nav">
                     <li class="product_nav">
                         <a th:href="${basePath+'/portal/productService'}">产品中心</a>
                         <a th:href="${basePath+'/portal/productService'}">产品中心</a>
-                        
+
                     </li>
                     </li>
                     <li><a th:href="${basePath+'/portal/strategic'}">战略合作</a></li>
                     <li><a th:href="${basePath+'/portal/strategic'}">战略合作</a></li>
                     <li><a th:href="${basePath+'/portal/client'}">服务客户</a></li>
                     <li><a th:href="${basePath+'/portal/client'}">服务客户</a></li>
@@ -93,7 +93,7 @@
                                 <li><a th:href="${basePath+'/portal/productServiceGaoxin?6'}">政策融资</a></li>
                                 <li><a th:href="${basePath+'/portal/productServiceGaoxin?6'}">政策融资</a></li>
                             </ul>
                             </ul>
                         </div>
                         </div>
-                    </div>                            
+                    </div>
                     <div class="list">
                     <div class="list">
                         <div class=" ">
                         <div class=" ">
                             <p>知识产权</p>
                             <p>知识产权</p>
@@ -137,7 +137,7 @@
                                     <li><a th:href="${basePath+'/portal/productServiceKejixiangmu?9'}">制造强省(市)专项(含技改、新材料)</a></li>
                                     <li><a th:href="${basePath+'/portal/productServiceKejixiangmu?9'}">制造强省(市)专项(含技改、新材料)</a></li>
                                     <li><a th:href="${basePath+'/portal/productServiceKejixiangmu?10'}">省/市移动互联网产业发展专项</a></li>
                                     <li><a th:href="${basePath+'/portal/productServiceKejixiangmu?10'}">省/市移动互联网产业发展专项</a></li>
                                     <li><a th:href="${basePath+'/portal/productServiceKejixiangmu?11'}">省/市人工智能产业专项</a></li>
                                     <li><a th:href="${basePath+'/portal/productServiceKejixiangmu?11'}">省/市人工智能产业专项</a></li>
-                                    <li><a th:href="${basePath+'/portal/productServiceKejixiangmu?12'}">中小企业发展专项(含专精特新)</a></li> 
+                                    <li><a th:href="${basePath+'/portal/productServiceKejixiangmu?12'}">中小企业发展专项(含专精特新)</a></li>
                                 </div>
                                 </div>
                             </ul>
                             </ul>
                         </div>
                         </div>
@@ -157,7 +157,7 @@
                                 <li><a th:href="${basePath+'/portal/productServiceCaisui?8'}">企业管理咨询</a></li>
                                 <li><a th:href="${basePath+'/portal/productServiceCaisui?8'}">企业管理咨询</a></li>
                             </ul>
                             </ul>
                         </div>
                         </div>
-                    </div>                            
+                    </div>
                     <div class="list">
                     <div class="list">
                         <div class=" ">
                         <div class=" ">
                             <p>军民科技转化</p>
                             <p>军民科技转化</p>
@@ -170,10 +170,10 @@
                                 <li><a th:href="${basePath+'/portal/productServiceJunming?5'}">军民两用技术转移转化服务</a></li>
                                 <li><a th:href="${basePath+'/portal/productServiceJunming?5'}">军民两用技术转移转化服务</a></li>
                             </ul>
                             </ul>
                         </div>
                         </div>
-                    </div>                            
+                    </div>
                     <div class="list">
                     <div class="list">
                         <div class=" ">
                         <div class=" ">
-                            <p style="text-align: center;">资质认证</p>
+                            <p style="text-align: center;">体系认证</p>
                             <ul>
                             <ul>
                                 <li><a th:href="${basePath+'/portal/productServiceTxrz?0'}">ISO9001质量管理体系认证</a></li>
                                 <li><a th:href="${basePath+'/portal/productServiceTxrz?0'}">ISO9001质量管理体系认证</a></li>
                                 <li><a th:href="${basePath+'/portal/productServiceTxrz?1'}">OHSAS18001职业健康安全体系认证</a></li>
                                 <li><a th:href="${basePath+'/portal/productServiceTxrz?1'}">OHSAS18001职业健康安全体系认证</a></li>
@@ -213,17 +213,17 @@
                                 <li><a th:href="${basePath+'/portal/productServiceTxrz?30'}">中国诚信经理人</a></li>
                                 <li><a th:href="${basePath+'/portal/productServiceTxrz?30'}">中国诚信经理人</a></li>
                             </ul>
                             </ul>
                         </div>
                         </div>
-                    </div>  
+                    </div>
                     <div class="list">
                     <div class="list">
                         <div class=" ">
                         <div class=" ">
                             <p>平台开发建设</p>
                             <p>平台开发建设</p>
                             <ul>
                             <ul>
                                 <li><a th:href="${basePath+'/portal/productServicePingtai?0'}">网站PC端开发或共建</a></li>
                                 <li><a th:href="${basePath+'/portal/productServicePingtai?0'}">网站PC端开发或共建</a></li>
-                                <li><a th:href="${basePath+'/portal/productServicePingtai?1'}">管理系统研发</a></li> 
+                                <li><a th:href="${basePath+'/portal/productServicePingtai?1'}">管理系统研发</a></li>
                                 <li><a th:href="${basePath+'/portal/productServicePingtai?2'}">Android及IOS移动端开发</a></li>
                                 <li><a th:href="${basePath+'/portal/productServicePingtai?2'}">Android及IOS移动端开发</a></li>
                             </ul>
                             </ul>
                         </div>
                         </div>
-                    </div>                                                        
+                    </div>
                 </div>
                 </div>
             </nav>
             </nav>
             <!-- 电脑端导航栏  end -->
             <!-- 电脑端导航栏  end -->
@@ -236,7 +236,7 @@
                     <div class="swiper-container" id="swiper4">
                     <div class="swiper-container" id="swiper4">
                         <div class="swiper-wrapper">
                         <div class="swiper-wrapper">
                             <div class="swiper-slide">
                             <div class="swiper-slide">
-                                <a th:href="${basePath + '/portal/productService?0'}">                        
+                                <a th:href="${basePath + '/portal/productService?0'}">
                                     <div th:class="${Cstatus}=='jszy'?'active pd-li':'pd-li'">
                                     <div th:class="${Cstatus}=='jszy'?'active pd-li':'pd-li'">
                                         <img th:src="${portalHost+'/images/Product-center/jishuzhuanyi/p-1-1.png'}" />
                                         <img th:src="${portalHost+'/images/Product-center/jishuzhuanyi/p-1-1.png'}" />
                                         <div class="pd-mask">
                                         <div class="pd-mask">
@@ -349,7 +349,7 @@
                                         </div>
                                         </div>
                                     </div>
                                     </div>
                                 </a>
                                 </a>
-                                <a th:href="${basePath+'/portal/productServicePingtai?0'}"> 
+                                <a th:href="${basePath+'/portal/productServicePingtai?0'}">
                                     <div th:class="${Cstatus}=='ptkf'?'active pd-li':'pd-li'">
                                     <div th:class="${Cstatus}=='ptkf'?'active pd-li':'pd-li'">
                                         <img th:src="${portalHost+'/images/Product-center/pingtaikaifajianshe/p-1-1.png'}" />
                                         <img th:src="${portalHost+'/images/Product-center/pingtaikaifajianshe/p-1-1.png'}" />
                                         <div class="pd-mask">
                                         <div class="pd-mask">
@@ -365,7 +365,7 @@
                                         </div>
                                         </div>
                                     </div>
                                     </div>
                                 </a>
                                 </a>
-                            </div>                    
+                            </div>
                         </div>
                         </div>
                         <!-- 分页器 -->
                         <!-- 分页器 -->
                         <div class="swiper-pagination"></div>
                         <div class="swiper-pagination"></div>
@@ -440,8 +440,8 @@
             </div>
             </div>
             <div class="infoDown">
             <div class="infoDown">
                 <div class="container">
                 <div class="container">
-                    <span class="info_one">Copyright 2014-2025 湖南科德信息咨询有限公司</span>
-                    <a href="http://www.beian.miit.gov.cn" target="_blank"><span> ©湘ICP备15019731号-5</span></a>
+                    <span class="info_one">Copyright 2014-2025 湖南科德信息咨询集团有限公司</span>
+                    <a href="https://beian.miit.gov.cn/" target="_blank"><span> ©湘ICP备15019731号-5</span></a>
                 </div>
                 </div>
             </div>
             </div>
             <div class="infoDown" style="height: 80px;">
             <div class="infoDown" style="height: 80px;">
@@ -480,7 +480,7 @@
                         <li><a th:href="${basePath+'/portal/productServiceKejixiangmu?0'}">科技项目</a></li>
                         <li><a th:href="${basePath+'/portal/productServiceKejixiangmu?0'}">科技项目</a></li>
                         <li><a th:href="${basePath+'/portal/productServiceCaisui?0'}" >财税咨询</a></li>
                         <li><a th:href="${basePath+'/portal/productServiceCaisui?0'}" >财税咨询</a></li>
                         <li><a th:href="${basePath+'/portal/productServiceJunming?0'}" >军民科技</a></li>
                         <li><a th:href="${basePath+'/portal/productServiceJunming?0'}" >军民科技</a></li>
-                        <li><a th:href="${basePath+'/portal/productServiceTxrz?0'}">认证体系</a></li>
+                        <li><a th:href="${basePath+'/portal/productServiceTxrz?0'}">体系认证</a></li>
                         <li><a th:href="${basePath+'/portal/productServicePingtai?0'}">平台建设</a></li>
                         <li><a th:href="${basePath+'/portal/productServicePingtai?0'}">平台建设</a></li>
                     </ul>
                     </ul>
                 </a>
                 </a>
@@ -537,13 +537,13 @@
 					(function() {
 					(function() {
 					  var hm = document.createElement("script");
 					  var hm = document.createElement("script");
 					  hm.src = "https://hm.baidu.com/hm.js?e20e700f2bb1656e3253cb466c60f15b";
 					  hm.src = "https://hm.baidu.com/hm.js?e20e700f2bb1656e3253cb466c60f15b";
-					  var s = document.getElementsByTagName("script")[0]; 
+					  var s = document.getElementsByTagName("script")[0];
 					  s.parentNode.insertBefore(hm, s);
 					  s.parentNode.insertBefore(hm, s);
 					})();
 					})();
 				</script>
 				</script>
 		<th:block th:replace="${scripts}" />
 		<th:block th:replace="${scripts}" />
 	</th:block>
 	</th:block>
-		
+
 
 
 </body>
 </body>
 </html>
 </html>

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 35 - 8
src/main/webapp/WEB-INF/views/portal/aboutKede.html


+ 2 - 2
src/main/webapp/WEB-INF/views/portal/contactUs.html

@@ -36,7 +36,7 @@
                         </div>
                         </div>
                         <div class="contact_img">
                         <div class="contact_img">
                             <img th:src="${portalHost+'/images/logo.jpg'}" />
                             <img th:src="${portalHost+'/images/logo.jpg'}" />
-                            <h5>湖南科德信息咨询有限公司</h5>
+                            <h5>湖南科德信息咨询集团有限公司</h5>
                         </div>
                         </div>
                         <div class="contact_text">
                         <div class="contact_text">
                             <ul>
                             <ul>
@@ -60,4 +60,4 @@
     <div th:replace="common::footer(~{},'')">
     <div th:replace="common::footer(~{},'')">
     </div>
     </div>
 </body>
 </body>
-</html>
+</html>

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 20 - 19
src/main/webapp/WEB-INF/views/portal/index.html


+ 3 - 2
src/main/webapp/WEB-INF/web.xml

@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" version="3.1">
+<?xml version="1.0" encoding="utf-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://xmlns.jcp.org/xml/ns/javaee" 
+		xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee  http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" version="3.1">
   <display-name>kede-ow</display-name>
   <display-name>kede-ow</display-name>
   <context-param>
   <context-param>
     <param-name>spring.profiles.active</param-name>
     <param-name>spring.profiles.active</param-name>