From 1260faa8bcffd7db70e6e042a1dc400066779885 Mon Sep 17 00:00:00 2001
From: xiehonglong <599179587@qq.com>
Date: Fri, 22 Sep 2017 16:28:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=96=87=E4=BB=B6=E4=B8=8A?=
=?UTF-8?q?=E4=BC=A0=EF=BC=8C=E8=B4=A6=E5=8D=95=E9=94=99=E8=AF=AF=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pom.xml | 7 +
.../java/com/ifish/action/AdInfoAction.java | 4 +-
.../com/ifish/action/IfishGoodsAction.java | 1 +
.../com/ifish/action/InformationAction.java | 293 +++++-----
.../java/com/ifish/action/PublicAction.java | 384 +++++++------
.../com/ifish/action/ShopsInfoAction.java | 10 +-
.../ifish/serviceImpl/AdminServiceImpl.java | 3 +
.../java/com/ifish/util/IfishFileUtils.java | 112 ++--
.../com/ifishNew/config/MybatisConfig.java | 1 -
.../java/com/ifishNew/help/FastDFSClient.java | 45 +-
.../com/ifishNew/help/FastDFSClientI.java | 5 +
src/main/resources/application-security.xml | 1 +
src/main/resources/property.properties | 4 +-
.../lib/mysql-connector-java-5.1.42-bin.jar | Bin 0 -> 996444 bytes
.../webapp/WEB-INF/view/adInfo/adInfo.jsp | 544 +++++++++---------
src/main/webapp/WEB-INF/view/htm/taglib.jsp | 36 +-
src/main/webapp/WEB-INF/view/test/test.jsp | 21 +
17 files changed, 797 insertions(+), 674 deletions(-)
create mode 100644 src/main/webapp/WEB-INF/lib/mysql-connector-java-5.1.42-bin.jar
create mode 100644 src/main/webapp/WEB-INF/view/test/test.jsp
diff --git a/pom.xml b/pom.xml
index 036d990..5743e63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -196,6 +196,12 @@
system
${basedir}/src/main/webapp/WEB-INF/lib/fastdfs-client-java-1.25.jar
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 3.5.1
+
ifishSystem
@@ -242,6 +248,7 @@
**/*.xml
**/*.properties
+ **/*.conf
diff --git a/src/main/java/com/ifish/action/AdInfoAction.java b/src/main/java/com/ifish/action/AdInfoAction.java
index afb0719..e56297d 100644
--- a/src/main/java/com/ifish/action/AdInfoAction.java
+++ b/src/main/java/com/ifish/action/AdInfoAction.java
@@ -18,6 +18,7 @@ import com.ifish.service.AdInfoService;
import com.ifish.util.IfishFileDirectory;
import com.ifish.util.IfishFileUtils;
import com.ifish.util.ResultUtil;
+import com.ifishNew.help.FastDFSClientI;
/**
* 广告信息
@@ -30,7 +31,6 @@ public class AdInfoAction {
@Autowired
private AdInfoService adInfoService;
-
/**
* 广告信息页面
*
@@ -91,7 +91,7 @@ public class AdInfoAction {
}
adInfo.setAdImage(newImgName);
//新增广告
- return adInfoService.addAdInfo(adInfo);
+ return adInfoService.addAdInfo(adInfo);
}
/**
diff --git a/src/main/java/com/ifish/action/IfishGoodsAction.java b/src/main/java/com/ifish/action/IfishGoodsAction.java
index ecd5496..05bbc92 100644
--- a/src/main/java/com/ifish/action/IfishGoodsAction.java
+++ b/src/main/java/com/ifish/action/IfishGoodsAction.java
@@ -23,6 +23,7 @@ import com.ifish.service.IfishShopService;
import com.ifish.util.IfishFileDirectory;
import com.ifish.util.IfishFileUtils;
import com.ifish.util.ResultUtil;
+import com.ifishNew.help.FastDFSClientI;
/**
* 商品管理action
diff --git a/src/main/java/com/ifish/action/InformationAction.java b/src/main/java/com/ifish/action/InformationAction.java
index e613d9b..a2662da 100644
--- a/src/main/java/com/ifish/action/InformationAction.java
+++ b/src/main/java/com/ifish/action/InformationAction.java
@@ -21,156 +21,165 @@ import com.ifish.service.InformationService;
import com.ifish.util.IfishFileDirectory;
import com.ifish.util.IfishFileUtils;
import com.ifish.util.ResultUtil;
+import com.ifishNew.help.FastDFSClientI;
/**
* 资讯信息
+ *
* @author Administrator
*
*/
@Controller
public class InformationAction {
-
- @Autowired
- private InformationService infoService;
-
- /**
- * 资讯信息页面
- * @return
- */
- @RequestMapping(value="/information.do")
- public ModelAndView information(Model model){
- model.addAttribute("ueditorMap", infoService.getUeditors());
- return new ModelAndView("information/information");
- }
-
- /**
- * 资讯信息分页数据
- * @param pageData
- * @param information
- * @return
- */
- @RequestMapping(value="/informationData.do")
- @ResponseBody
- public PageDataDto getInformationByPage(PageDataDto pageData,Information information){
- pageData.pageData(infoService.getInformationByPage(pageData, information));
- return pageData;
- }
-
- /**
- * app展示
- * @param infoId
- * @param appShow
- * @return
- */
- @RequestMapping("/informationShowUpdate.do")
- @ResponseBody
- public JsonResult informationShowUpdate(@RequestParam Integer infoId,@RequestParam boolean appShow) {
- return infoService.informationShowUpdate(infoId,appShow);
- }
-
- /**
- * 新增资讯
- * @param information
- * @param fileUpload
- * @return
- */
- @RequestMapping(value="/addInformation.do")
- @ResponseBody
- public JsonResult addInformation(Information information,MultipartFile fileUpload){
- //上传文件不能为空
- if(fileUpload==null){
- throw new IfishException(SysUserEnum.warn114);
- }
- //上传图片
- String newImgName = null;
- try {
- //上传文件
- newImgName = String.valueOf(System.currentTimeMillis())+".png";
- IfishFileUtils.uploadFile(IfishFileDirectory.path_img_information,newImgName,fileUpload);
- } catch (IfishException e){
- throw e;
- } catch (Exception e) {
- throw new IfishException(SysUserEnum.warn113);
- }
- information.setImage(newImgName);
- //新增资讯
- return infoService.addInformation(information);
- }
-
- /**
- * 修改资讯信息
- * @param information
- * @param fileUpload
- * @return
- */
- @RequestMapping(value="/updateInformation.do")
- @ResponseBody
- public JsonResult updateInformation(Information information,MultipartFile fileUpload){
- String newImgName = null;
- //String oldImgName = information.getImage();
- //上传新资讯图
- if(fileUpload!=null){
- try {
- //上传文件
- newImgName = String.valueOf(System.currentTimeMillis())+".png";
- IfishFileUtils.uploadFile(IfishFileDirectory.path_img_information,newImgName,fileUpload);
- } catch (IfishException e){
- throw e;
- } catch (Exception e) {
- throw new IfishException(SysUserEnum.warn113);
- }
- information.setImage(newImgName);
- }
- JsonResult jsonResult = infoService.updateInformation(information);
- //删除老资讯图
- /*if(newImgName!=null && StringUtils.isNotBlank(oldImgName)){
+
+ @Autowired
+ private InformationService infoService;
+
+ /**
+ * 资讯信息页面
+ *
+ * @return
+ */
+ @RequestMapping(value = "/information.do")
+ public ModelAndView information(Model model) {
+ model.addAttribute("ueditorMap", infoService.getUeditors());
+ return new ModelAndView("information/information");
+ }
+
+ /**
+ * 资讯信息分页数据
+ *
+ * @param pageData
+ * @param information
+ * @return
+ */
+ @RequestMapping(value = "/informationData.do")
+ @ResponseBody
+ public PageDataDto getInformationByPage(PageDataDto pageData, Information information) {
+ pageData.pageData(infoService.getInformationByPage(pageData, information));
+ return pageData;
+ }
+
+ /**
+ * app展示
+ *
+ * @param infoId
+ * @param appShow
+ * @return
+ */
+ @RequestMapping("/informationShowUpdate.do")
+ @ResponseBody
+ public JsonResult informationShowUpdate(@RequestParam Integer infoId, @RequestParam boolean appShow) {
+ return infoService.informationShowUpdate(infoId, appShow);
+ }
+
+ /**
+ * 新增资讯
+ *
+ * @param information
+ * @param fileUpload
+ * @return
+ */
+ @RequestMapping(value = "/addInformation.do")
+ @ResponseBody
+ public JsonResult addInformation(Information information, MultipartFile fileUpload) {
+ //上传文件不能为空
+ if (fileUpload == null) {
+ throw new IfishException(SysUserEnum.warn114);
+ }
+ //上传图片
+ String newImgName = null;
+ try {
+ //上传文件
+ newImgName = String.valueOf(System.currentTimeMillis()) + ".png";
+ IfishFileUtils.uploadFile(IfishFileDirectory.path_img_information, newImgName, fileUpload);
+ } catch (IfishException e) {
+ throw e;
+ } catch (Exception e) {
+ throw new IfishException(SysUserEnum.warn113);
+ }
+ information.setImage(newImgName);
+ //新增资讯
+ return infoService.addInformation(information);
+ }
+
+ /**
+ * 修改资讯信息
+ *
+ * @param information
+ * @param fileUpload
+ * @return
+ */
+ @RequestMapping(value = "/updateInformation.do")
+ @ResponseBody
+ public JsonResult updateInformation(Information information, MultipartFile fileUpload) {
+ String newImgName = null;
+ //String oldImgName = information.getImage();
+ //上传新资讯图
+ if (fileUpload != null) {
+ try {
+ //上传文件
+ newImgName = String.valueOf(System.currentTimeMillis()) + ".png";
+ IfishFileUtils.uploadFile(IfishFileDirectory.path_img_information, newImgName, fileUpload);
+ } catch (IfishException e) {
+ throw e;
+ } catch (Exception e) {
+ throw new IfishException(SysUserEnum.warn113);
+ }
+ information.setImage(newImgName);
+ }
+ JsonResult jsonResult = infoService.updateInformation(information);
+ //删除老资讯图
+ /*if(newImgName!=null && StringUtils.isNotBlank(oldImgName)){
IfishFileUtils.deleteFile(IfishFileDirectory.path_img_information, oldImgName);
}*/
- return jsonResult;
- }
-
- /**
- * 删除资讯
- * @param infoId
- * @return
- */
- @RequestMapping(value="/deleteInformation.do")
- @ResponseBody
- public JsonResult deleteInformation(Integer infoId){
- String image = infoService.deleteInformation(infoId);
- //删除资讯图
- if(StringUtils.isNotBlank(image)){
- IfishFileUtils.deleteFile(IfishFileDirectory.path_img_information, image);
- }
- return ResultUtil.success();
- }
-
- /**
- * 根据ID查询资讯信息
- * @param infoId
- * @return
- */
- @RequestMapping(value="/getInformationById.do")
- @ResponseBody
- public Information getInformationById(Integer infoId){
- Information info = infoService.getInformationById(infoId);
- if(info.getUeditorId()!=null){
- info.setSource(InformationSourceEnum.ueditor.getKey());
- }
- else{
- info.setSource(InformationSourceEnum.other.getKey());
- }
- return info;
- }
-
- /**
- * 根据ID查找编辑器信息
- * @param ueditorId
- * @return
- */
- @RequestMapping("/information/getUeditorById.do")
- @ResponseBody
- public Ueditor editUeditor(Integer ueditorId) {
- return infoService.getUeditorById(ueditorId);
- }
+ return jsonResult;
+ }
+
+ /**
+ * 删除资讯
+ *
+ * @param infoId
+ * @return
+ */
+ @RequestMapping(value = "/deleteInformation.do")
+ @ResponseBody
+ public JsonResult deleteInformation(Integer infoId) {
+ String image = infoService.deleteInformation(infoId);
+ //删除资讯图
+ if (StringUtils.isNotBlank(image)) {
+ IfishFileUtils.deleteFile(IfishFileDirectory.path_img_information, image);
+ }
+ return ResultUtil.success();
+ }
+
+ /**
+ * 根据ID查询资讯信息
+ *
+ * @param infoId
+ * @return
+ */
+ @RequestMapping(value = "/getInformationById.do")
+ @ResponseBody
+ public Information getInformationById(Integer infoId) {
+ Information info = infoService.getInformationById(infoId);
+ if (info.getUeditorId() != null) {
+ info.setSource(InformationSourceEnum.ueditor.getKey());
+ } else {
+ info.setSource(InformationSourceEnum.other.getKey());
+ }
+ return info;
+ }
+
+ /**
+ * 根据ID查找编辑器信息
+ *
+ * @param ueditorId
+ * @return
+ */
+ @RequestMapping("/information/getUeditorById.do")
+ @ResponseBody
+ public Ueditor editUeditor(Integer ueditorId) {
+ return infoService.getUeditorById(ueditorId);
+ }
}
diff --git a/src/main/java/com/ifish/action/PublicAction.java b/src/main/java/com/ifish/action/PublicAction.java
index b39a179..1e65ff5 100644
--- a/src/main/java/com/ifish/action/PublicAction.java
+++ b/src/main/java/com/ifish/action/PublicAction.java
@@ -25,199 +25,217 @@ import com.alibaba.fastjson.JSONObject;
import com.ifish.entity.Menu;
import com.ifish.entity.Role;
import com.ifish.entity.SecurityUser;
+import com.ifish.enums.AdTypeEnum;
import com.ifish.enums.RoleEnum;
import com.ifish.enums.SysUserEnum;
+import com.ifish.exception.IfishException;
import com.ifish.menu.IfishMenu;
import com.ifish.service.AdminService;
import com.ifish.service.PublicService;
import com.ifish.ueditor.ActionEnter;
+import com.ifish.util.IfishFileDirectory;
+import com.ifish.util.IfishFileUtils;
+import com.ifish.util.IfishUtil;
import com.ifish.util.getRemoteAddress;
+import com.ifishNew.bean.CommodityInfoBean;
+import com.ifishNew.help.FastDFSClientI;
+import com.ifishNew.mapper.Tbl_Commodity_Info_Mapper;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.multipart.MultipartFile;
-/**
- * @ClassName: PublicAction
- * @Description: 公共页面
- * @author ggw
+/**
+ * @ClassName: PublicAction
+ * @Description: 公共页面
+ * @author ggw
*/
-
@Controller("publicAction")
@RequestMapping("/public")
public class PublicAction {
-
- @Autowired
- private PublicService publicService;
-
- @Autowired
- private AdminService adminService;
-
- private static Logger log = LoggerFactory.getLogger(PublicAction.class);
-
- /**
- * 登陆页面
- * @return
- */
- @RequestMapping("/login.do")
- public ModelAndView login(String status) {
- return new ModelAndView("roleAll/login","status",status);
- }
-
- /**
- * 文本编辑器配置
- * @param request
- * @param response
- */
- @RequestMapping("/config.do")
- public void config(HttpServletRequest request,HttpServletResponse response){
- try {
- request.setCharacterEncoding( "utf-8" );
- response.setHeader("Content-Type" , "text/html");
- response.setContentType("application/json");
- String rootPath = request.getSession().getServletContext().getRealPath( "/" );
- String exec = new ActionEnter( request, rootPath ).exec();
- PrintWriter writer = response.getWriter();
- writer.write(exec);
- writer.flush();
- writer.close();
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- /**
- * 主页
- * @return
- */
- @RequestMapping("/index.do")
- public ModelAndView index() {
- String role = null;
- String userName = null;
- try {
- //登录用户
- UserDetails userDetails = (UserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
- userName = userDetails.getUsername();
- //根据登录用户角色类型跳转
- Collection authorities = SecurityContextHolder.getContext().getAuthentication().getAuthorities();
- for(GrantedAuthority grantedAuthority : authorities) {
- role = grantedAuthority.getAuthority();
- }
- //菜单初始化
- if(role!=null && userName!=null){
- Role curRole = this.adminService.get(role);
- List