diff --git a/intellagric-agriecom-web/pom.xml b/intellagric-agriecom-web/pom.xml
index 8fc9957a0bea1f42969421a67f060550d4516f1c..e8042c9316ec02db2920b93267daf3efec9ee1f8 100644
--- a/intellagric-agriecom-web/pom.xml
+++ b/intellagric-agriecom-web/pom.xml
@@ -22,7 +22,11 @@
intellagric-manager-interface
1.0-SNAPSHOT
-
+
+ com.intellagric
+ intellagric-common
+ 1.0-SNAPSHOT
+
org.springframework
@@ -117,6 +121,13 @@
1.0-SNAPSHOT
compile
+
+ org.jsoup
+ jsoup
+ 1.11.3
+
+
+
diff --git a/intellagric-agriecom-web/src/main/java/com/intellagric/agriecom/controller/agriecom_index/GrabDataController.java b/intellagric-agriecom-web/src/main/java/com/intellagric/agriecom/controller/agriecom_index/GrabDataController.java
new file mode 100644
index 0000000000000000000000000000000000000000..1f2e3cf9ebae58c3501b0539358a0d2646688642
--- /dev/null
+++ b/intellagric-agriecom-web/src/main/java/com/intellagric/agriecom/controller/agriecom_index/GrabDataController.java
@@ -0,0 +1,181 @@
+package com.intellagric.agriecom.controller.agriecom_index;
+
+
+import com.intellagric.agriecom.module.agriecom_produce.ProduceService;
+import com.intellagric.common.pojo.LayuiDataGridResult;
+import com.intellagric.common.utils.UUIDUtils;
+import com.intellagric.pojo.AgriecomProduce;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
+import org.jsoup.select.Elements;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.io.IOException;
+import java.util.Date;
+
+@Controller
+public class GrabDataController {
+
+ @Autowired
+ private ProduceService produceService;
+
+ @RequestMapping("/index/grabData")
+ @ResponseBody
+ public String grabData(String fruitName,String categoryId){
+ System.out.println(fruitName);
+ System.out.println(categoryId);
+
+ for(int i =1;i<2;i++) {
+ //获取url
+ String url = "http://www.cnhnb.com/p/"+fruitName+"-0-0-0-0-"+i+"/";
+ //爬取网页信息
+ String html = pickData(url);
+ //获取html中的内容
+ Document document = Jsoup.parse(html);
+ //获取html class 为product-content-ul 的节点
+ Elements divs = document.getElementsByClass("product-bg");
+
+
+ for(Element e :divs){
+ AgriecomProduce p=new AgriecomProduce();
+
+ p.setProduceId(UUIDUtils.getID());
+ //categoryId分类
+ p.setCategoryId(categoryId);
+
+ //显示一张图片
+ Elements imgEle= e.select("img.s-image");
+ String img=imgEle.get(0).attr("src")+",";
+ p.setProduceImg(img);
+
+ e=e.selectFirst("#fruit-text");
+ //产品名称
+ Element nameEle= e.selectFirst("span.fruit-explain");
+ String name=nameEle.text();
+ p.setProduceName(name);
+
+ //单位
+ Elements unitEle= e.select("li span.Jin");
+ String unit=unitEle.get(0).text();
+ p.setUnit(unit);
+ //价格
+ Elements priceEle= e.select("li span.fruit-price");
+ String price=priceEle.get(0).text();
+ p.setPrice(Float.parseFloat(price));
+ //producingArea产地
+ Elements placeEle= e.select("li span.place");
+ String producingArea=placeEle.get(1).text();
+ p.setProducingArea(producingArea);
+ //商家名称
+
+
+ //进去产品详情页面，再抓取数据
+
+ //商品编号
+ Elements proIdEle= e.select("a.seller");
+ String proId=proIdEle.get(0).attr("href");
+ String urlPro = "http://www.cnhnb.com"+proId;
+ //爬取网页信息
+ String htmlPro = pickData(urlPro);
+ //获取html中的内容
+ Document documentPro = Jsoup.parse(htmlPro);
+
+
+ //图片区
+ Elements imgUl = documentPro.getElementsByClass("ul.clearfix");
+ //图片完善
+ Elements imgEles= imgUl.select("img.s-image");
+ for(int j=1;j1)
+ params=params.substring(0,params.length()-2);//切掉最后的；
+ p.setProduceParameter(params);
+// System.out.println(produceService);
+ produceService.insertProduce(p);
+
+ }
+
+ }
+
+ return "1111";
+ }
+ /*
+ * 爬取网页信息
+ */
+ private static String pickData(String url) {
+ CloseableHttpClient httpclient = HttpClients.createDefault();
+ try {
+ HttpGet httpget = new HttpGet(url);
+ CloseableHttpResponse response = httpclient.execute(httpget);
+ try {
+ // 获取响应实体
+ HttpEntity entity = response.getEntity();
+ // 打印响应状态
+ if (entity != null) {
+ return EntityUtils.toString(entity);
+ }
+ } finally {
+ response.close();
+ }
+ } catch (ClientProtocolException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ } finally {
+ // 关闭连接,释放资源
+ try {
+ httpclient.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ return null;
+ }
+
+}
diff --git a/intellagric-agriecom-web/src/main/java/com/intellagric/agriecom/controller/agriecom_index/IndexController.java b/intellagric-agriecom-web/src/main/java/com/intellagric/agriecom/controller/agriecom_index/IndexController.java
index 92e7389159513de15c1138dceb09de83308e0067..e53ef1a249673335a0216f615e03d2a90bf03c1e 100644
--- a/intellagric-agriecom-web/src/main/java/com/intellagric/agriecom/controller/agriecom_index/IndexController.java
+++ b/intellagric-agriecom-web/src/main/java/com/intellagric/agriecom/controller/agriecom_index/IndexController.java
@@ -3,17 +3,23 @@ package com.intellagric.agriecom.controller.agriecom_index;
import com.intellagric.agriecom.module.agriecom_produce.ProduceService;
import com.intellagric.agriecom.module.agriecom_produce_category.AgriecomProduceCategoryService;
+import com.intellagric.common.jedis.JedisClient;
import com.intellagric.common.pojo.LayuiDataGridResult;
+import com.intellagric.common.utils.CookieUtils;
+import com.intellagric.common.utils.JsonUtils;
import com.intellagric.pojo.AgriecomProduce;
import com.intellagric.pojo.AgriecomProduceCategory;
import com.intellagric.pojo.CmsCategoryContent;
+import com.intellagric.pojo.SysUser;
import com.intellagric.service.module.cms_content.ContentCategoryService;
import com.intellagric.service.module.cms_content.ContentService;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.converter.json.MappingJacksonValue;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
+import javax.servlet.http.HttpServletRequest;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.util.List;
@@ -28,6 +34,9 @@ public class IndexController {
private ProduceService produceService;
@Autowired
private ContentCategoryService contentCategoryService;
+ @Autowired
+ private JedisClient jedisClient;
+
@RequestMapping("/index/getMenu")
@@ -67,5 +76,14 @@ public class IndexController {
public AgriecomProduceCategory getAncestorNode(String categoryId,int level ){
return CategoryService.getAncestorNode(categoryId,level);
}
+ @RequestMapping("/index/getUser")
+ @ResponseBody
+ public SysUser getUser(HttpServletRequest request){
+ String token= CookieUtils.getCookieValue( request,"token");
+ if(jedisClient.get("SESSION:"+token)==null){
+ return null;
+ }
+ return JsonUtils.jsonToPojo(jedisClient.get("SESSION:"+token), SysUser.class);
+ }
}
diff --git a/intellagric-agriecom-web/src/main/java/com/intellagric/agriecom/controller/agriecom_index/SearchController.java b/intellagric-agriecom-web/src/main/java/com/intellagric/agriecom/controller/agriecom_index/SearchController.java
index 10ed12ffeb4adbeb2565d5d6e40f932a30a65400..e1f4eb6705d4682bea466e740b9a19ef06be0786 100644
--- a/intellagric-agriecom-web/src/main/java/com/intellagric/agriecom/controller/agriecom_index/SearchController.java
+++ b/intellagric-agriecom-web/src/main/java/com/intellagric/agriecom/controller/agriecom_index/SearchController.java
@@ -7,8 +7,10 @@ import com.intellagric.module.cms.ContentVo;
import com.intellagric.pojo.AgriecomProduce;
import com.intellagric.pojo.AgriecomProduceCategory;
import com.intellagric.pojo.CmsCategoryContent;
+import com.intellagric.pojo.SysOffice;
import com.intellagric.service.module.cms_content.ContentService;
import com.intellagric.service.search.agriecom.AgriecomProductSearch;
+import com.intellagric.service.search.agriecom.pojo.AgriecomProductResult;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
@@ -59,15 +61,14 @@ public class SearchController {
@RequestMapping("/agriecomIndex/search/categoryAndKeyword")
@ResponseBody
public LayuiDataGridResult categoryAndKeyword(@RequestParam(defaultValue = "1")int page, @RequestParam(defaultValue = "3")int limit, @RequestParam(defaultValue = "") String categoryId, @RequestParam(defaultValue = "") String keyword){
-
try {
keyword=new String(keyword.getBytes("ISO-8859-1"),"UTF-8");
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
+ LayuiDataGridResult result= productSearch.keywordSearch(page,limit,categoryId,keyword);
- return productSearch.keywordSearch(page,limit,categoryId,keyword);
-
+ return result;
}
@RequestMapping("/agriecomIndex/search/forward")
public String searchForward(@RequestParam(defaultValue = "1")int page, @RequestParam(defaultValue = "20")int limit, String categoryId, String keyword,RedirectAttributes attributes){
@@ -135,28 +136,30 @@ public class SearchController {
return "redirect:/collection.html?categoryId="+categoryId;
}
+
/**
- * 第二页面跳转
+ * 根据分类id重定向到参数页面
* @param page
* @param limit
* @param categoryId
* @return
*/
- @RequestMapping("/agriecomIndex/search/secondForward")
- public String secondForward(@RequestParam(defaultValue = "1")int page, @RequestParam(defaultValue = "20")int limit,String categoryId){
- return "redirect:/collectionSecond.html?categoryId="+categoryId;
+ @RequestMapping("/agriecomIndex/search/paramForward")
+ public String paramForward(@RequestParam(defaultValue = "1")int page, @RequestParam(defaultValue = "20")int limit,String categoryId){
+ return "redirect:/collectionThird.html?categoryId="+categoryId;
}
/**
- * 根据分类id重定向到参数页面
+ * 第二页面
* @param page
* @param limit
* @param categoryId
* @return
*/
- @RequestMapping("/agriecomIndex/search/paramForward")
- public String paramForward(@RequestParam(defaultValue = "1")int page, @RequestParam(defaultValue = "20")int limit,String categoryId){
- return "redirect:/collectionThird.html?categoryId="+categoryId;
+ @RequestMapping("/agriecomIndex/search/secondForward")
+ public String secondForward(@RequestParam(defaultValue = "1")int page, @RequestParam(defaultValue = "20")int limit,String categoryId){
+ return "redirect:/collectionSecond.html?categoryId="+categoryId;
}
+
//@RequestBody() String param ?categoryId=1&map=[select1:%20"凯特芒",%20select2:%20null,%20select3:%20null] , ,@RequestBody Map map
@RequestMapping("/agriecomIndex/search/paramPageSearch")
@ResponseBody
diff --git a/intellagric-agriecom-web/src/main/java/com/intellagric/agriecom/controller/agriecom_product/ProductController.java b/intellagric-agriecom-web/src/main/java/com/intellagric/agriecom/controller/agriecom_product/ProductController.java
index 058e458e024bdc917933638f245138fb161f2775..531f7615728d8539547ee191e951ab43adc28b00 100644
--- a/intellagric-agriecom-web/src/main/java/com/intellagric/agriecom/controller/agriecom_product/ProductController.java
+++ b/intellagric-agriecom-web/src/main/java/com/intellagric/agriecom/controller/agriecom_product/ProductController.java
@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
import java.util.LinkedHashMap;
import java.util.List;
-import java.util.Map;
+
@Controller
public class ProductController {
diff --git a/intellagric-agriecom-web/src/main/java/com/intellagric/agriecom/controller/recommend/controller/RecommendColumnController.java b/intellagric-agriecom-web/src/main/java/com/intellagric/agriecom/controller/recommend/controller/RecommendColumnController.java
new file mode 100644
index 0000000000000000000000000000000000000000..9378997900244eb879cff251aaeb3944e0ea8ef1
--- /dev/null
+++ b/intellagric-agriecom-web/src/main/java/com/intellagric/agriecom/controller/recommend/controller/RecommendColumnController.java
@@ -0,0 +1,110 @@
+package com.intellagric.agriecom.controller.recommend.controller;
+
+import com.intellagric.agriecom.module.recommend.RecommendColumnServiceIN;
+import com.intellagric.common.pojo.LayuiDataGridResult;
+import com.intellagric.common.pojo.ResponseMessage;
+import com.intellagric.pojo.RecommendColumn;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Auther: zhy
+ * @Date: 2019/5/10
+ * @Description: 推荐栏位管理
+ */
+@Controller
+public class RecommendColumnController {
+
+ @Autowired
+ private RecommendColumnServiceIN recommendColumnService;
+
+ /**
+ * 添加荐栏位信息
+ * @Param recommendColumn
+ * @return ResponseMessage
+ */
+ @RequestMapping("/recommend/column/add")
+ @ResponseBody
+ public ResponseMessage add(RecommendColumn recommendColumn) {
+ recommendColumn.setCreatedDate(new Date());
+ if (recommendColumnService.addRecommendColumn(recommendColumn) == 1) {
+ return ResponseMessage.success();
+ } else {
+ return ResponseMessage.fail();
+ }
+ }
+
+
+ /**
+ * 删除荐栏位信息
+ * @Param id
+ * @return ResponseMessage
+ */
+ @RequestMapping("/recommend/column/delete")
+ @ResponseBody
+ public ResponseMessage delete(int id) {
+ if (recommendColumnService.deleteRecommendColumn(id) == 1) {
+ return ResponseMessage.success();
+ } else {
+ return ResponseMessage.fail();
+ }
+ }
+
+ /**
+ * 修改荐栏位信息
+ * @Param recommendColumn
+ * @return ResponseMessage
+ */
+ @RequestMapping("/recommend/column/edit")
+ @ResponseBody
+ public ResponseMessage edit(RecommendColumn recommendColumn) {
+ if (recommendColumnService.editRecommendColumn(recommendColumn) == 1) {
+ return ResponseMessage.success();
+ } else {
+ return ResponseMessage.fail();
+ }
+ }
+
+ /**
+ * 查询荐栏位信息
+ * @return RecommendColumn
+ */
+ @RequestMapping("/recommend/column/{id}")
+ @ResponseBody
+ public RecommendColumn get(@PathVariable int id) {
+ return recommendColumnService.queryRecommendColumnById(id);
+ }
+
+
+ /**
+ * 查询荐栏位信息列表
+ * @return LayuiDataGridResult
+ */
+ @RequestMapping("/recommend/column/list")
+ @ResponseBody
+ public LayuiDataGridResult getList() {
+ List recommendColumnList = recommendColumnService.queryRecommendColumnList();
+ return LayuiDataGridResult.success().add(recommendColumnList,recommendColumnList.size());
+ }
+
+ /**
+ * 分页查询荐栏位信息列表
+ * @return LayuiDataGridResult
+ */
+ @RequestMapping("/recommend/column/page")
+ @ResponseBody
+ public LayuiDataGridResult getPage() {
+ List recommendColumnList = recommendColumnService.queryRecommendColumnList();
+ return LayuiDataGridResult.success().add(recommendColumnList,recommendColumnList.size());
+ }
+
+
+
+
+}
diff --git a/intellagric-agriecom-web/src/main/java/com/intellagric/agriecom/controller/recommend/controller/RecommendController.java b/intellagric-agriecom-web/src/main/java/com/intellagric/agriecom/controller/recommend/controller/RecommendController.java
new file mode 100644
index 0000000000000000000000000000000000000000..204506e9d0297da9b5069deb9c45a5fdaebf461b
--- /dev/null
+++ b/intellagric-agriecom-web/src/main/java/com/intellagric/agriecom/controller/recommend/controller/RecommendController.java
@@ -0,0 +1,44 @@
+package com.intellagric.agriecom.controller.recommend.controller;
+
+
+import com.intellagric.agriecom.module.recommend.RecommendServiceIN;
+import com.intellagric.common.pojo.ResponseMessage;
+import com.intellagric.pojo.AgriecomProduce;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
+
+/**
+ * @Auther: zhy
+ * @Date: 2019/5/8
+ * @Description: 商品推荐
+ */
+@Controller
+public class RecommendController {
+
+ @Autowired
+ private RecommendServiceIN recommendService;
+
+ /**
+ * 根据推荐栏位来进行商品的推荐
+ *
+ * @param columnId 栏位id
+ * @param userId 用户id
+ * @return ResponseMessage
+ */
+ @RequestMapping("/recommend")
+ @ResponseBody
+ public List recommendByCulumnId(int columnId, String userId) {
+ List recomendProductList = recommendService.recomend(columnId, userId);
+ return recomendProductList;
+// return ResponseMessage.success().add("recomendProductList",recomendProductList);
+ }
+
+
+
+
+
+}
diff --git a/intellagric-agriecom-web/src/main/java/com/intellagric/agriecom/controller/recommend/controller/RecommendTemplateController.java b/intellagric-agriecom-web/src/main/java/com/intellagric/agriecom/controller/recommend/controller/RecommendTemplateController.java
new file mode 100644
index 0000000000000000000000000000000000000000..d2dd073815458933097ae74d5f790b5212a07c41
--- /dev/null
+++ b/intellagric-agriecom-web/src/main/java/com/intellagric/agriecom/controller/recommend/controller/RecommendTemplateController.java
@@ -0,0 +1,121 @@
+package com.intellagric.agriecom.controller.recommend.controller;
+
+import com.intellagric.agriecom.module.recommend.RuleServiceIN;
+import com.intellagric.common.pojo.LayuiDataGridResult;
+import com.intellagric.common.pojo.ResponseMessage;
+import com.intellagric.pojo.RecommendTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+/**
+ * @Auther: zhy
+ * @Date: 2019/5/9
+ * @Description: 推荐规则模板管理
+ */
+@Controller
+public class RecommendTemplateController {
+
+ @Autowired
+ private RuleServiceIN recommendTemplateService;
+
+
+ /**
+ * 添加推荐规则模板
+ * @Param recommendTemplate
+ * @return ResponseMessage
+ */
+ @RequestMapping("/recommend/template/add")
+ @ResponseBody
+ public ResponseMessage add(RecommendTemplate recommendTemplate) {
+ recommendTemplate.setId(UUID.randomUUID().toString().replaceAll("-",""));
+ recommendTemplate.setCreatedDate(new Date());
+ if (recommendTemplateService.addRecommendTemplate(recommendTemplate) == 1) {
+ return ResponseMessage.success();
+ } else {
+ return ResponseMessage.fail();
+ }
+ }
+
+
+ /**
+ * 删除推荐规则模板
+ * @Param id
+ * @return ResponseMessage
+ */
+ @RequestMapping("/recommend/template/delete")
+ @ResponseBody
+ public ResponseMessage delete(String id) {
+ if (recommendTemplateService.deleteRecommendTemplate(id) == 1) {
+ return ResponseMessage.success();
+ } else {
+ return ResponseMessage.fail();
+ }
+ }
+
+ /**
+ * 修改推荐规则模板
+ * @Param
+ * @return ResponseMessage
+ */
+ @RequestMapping("/recommend/template/edit")
+ @ResponseBody
+ public ResponseMessage edit(RecommendTemplate recommendTemplate) {
+ if (recommendTemplateService.editRecommendTemplate(recommendTemplate) == 1) {
+ return ResponseMessage.success();
+ } else {
+ return ResponseMessage.fail();
+ }
+ }
+
+
+ /**
+ * 查询推荐规则模板
+ * @return RecommendTemplate
+ */
+ @RequestMapping("/recommend/template/{id}")
+ @ResponseBody
+ public RecommendTemplate get(@PathVariable String id) {
+ return recommendTemplateService.queryRecommendTemplateById(id);
+ }
+
+ /**
+ * 根据推荐栏位查询推荐规则模板
+ * @return RecommendTemplate
+ */
+ @RequestMapping("/recommend/template/column/{id}")
+ @ResponseBody
+ public RecommendTemplate getByColumn(@PathVariable int id) {
+ return recommendTemplateService.getTemplateByColumnId(id);
+ }
+
+
+ /**
+ * 查询推荐规则模板列表
+ * @return LayuiDataGridResult
+ */
+ @RequestMapping("/recommend/template/list")
+ @ResponseBody
+ public LayuiDataGridResult getList() {
+ List recommendTemplateList = recommendTemplateService.queryRecommendTemplateList();
+ return LayuiDataGridResult.success().add(recommendTemplateList,recommendTemplateList.size());
+ }
+
+ /**
+ * 分页查询推荐规则模板列表
+ * @return LayuiDataGridResult
+ */
+ @RequestMapping("/recommend/template/page")
+ @ResponseBody
+ public LayuiDataGridResult getPage() {
+ List recommendTemplateList = recommendTemplateService.queryRecommendTemplateList();
+ return LayuiDataGridResult.success().add(recommendTemplateList,recommendTemplateList.size());
+ }
+
+}
diff --git a/intellagric-agriecom-web/src/main/resources/spring/applicationContext-redis.xml b/intellagric-agriecom-web/src/main/resources/spring/applicationContext-redis.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4e23f7404c2b4a94c67899f8f08faafcca3acdd7
--- /dev/null
+++ b/intellagric-agriecom-web/src/main/resources/spring/applicationContext-redis.xml
@@ -0,0 +1,56 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/intellagric-agriecom-web/src/main/resources/spring/springmvc.xml b/intellagric-agriecom-web/src/main/resources/spring/springmvc.xml
index 1f5f1912ba982940426d865f25f9b436932f0330..25a5dda8d7142efc7b5cee6a0d2859ba35f4a243 100644
--- a/intellagric-agriecom-web/src/main/resources/spring/springmvc.xml
+++ b/intellagric-agriecom-web/src/main/resources/spring/springmvc.xml
@@ -12,7 +12,9 @@
+
+
@@ -26,8 +28,10 @@
+
+
@@ -48,7 +52,7 @@
-
+
@@ -66,11 +70,18 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/intellagric-agriecom-web/src/main/webapp/WEB-INF/web.xml b/intellagric-agriecom-web/src/main/webapp/WEB-INF/web.xml
index f998d5d856fee9f34f45ae5f81fb90c41c4667e0..f57ec2249589593de3e3ea9a5cdc6d1f98385f87 100644
--- a/intellagric-agriecom-web/src/main/webapp/WEB-INF/web.xml
+++ b/intellagric-agriecom-web/src/main/webapp/WEB-INF/web.xml
@@ -35,7 +35,14 @@
CharacterEncodingFilter
/*
-
+
+
+ contextConfigLocation
+ classpath:spring/applicationContext-*.xml
+
+
+ org.springframework.web.context.ContextLoaderListener
+
intellagric-manager
diff --git a/intellagric-agriecom-web/src/main/webapp/about-us.html b/intellagric-agriecom-web/src/main/webapp/about-us.html
index fd821b003023e39ea514e306e5964c05c5d45a9f..26ce190a59a309f785682e8ce838454f91d9840c 100644
--- a/intellagric-agriecom-web/src/main/webapp/about-us.html
+++ b/intellagric-agriecom-web/src/main/webapp/about-us.html
@@ -382,7 +382,7 @@
- 
+