修改

whole-estate/pom.xml

@@ -42,11 +42,11 @@
             <optional>true</optional>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.session</groupId>
-            <artifactId>spring-session-jdbc</artifactId>
-            <version>2.1.3.RELEASE</version>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.springframework.session</groupId>-->
+            <!--<artifactId>spring-session-jdbc</artifactId>-->
+            <!--<version>2.1.3.RELEASE</version>-->
+        <!--</dependency>-->
 
 
         <!-- 测试 -->

whole-estate/src/main/java/com/example/wholeestate/common/Constant.java

@@ -6,7 +6,9 @@ package com.example.wholeestate.common;
 public class Constant {
 
 
-    public static final String REQUEST_ERROR = "500";
+    public static final Integer REQUEST_ERROR = 500;
+
+    public static final Integer NOT_SESSION_USER = 401;
 
     /**
      * 用户 session

whole-estate/src/main/java/com/example/wholeestate/common/base/BaseController.java

@@ -36,4 +36,12 @@ public class BaseController {
         return sysUser;
     }
 
+    /**
+     * 移除 session 用户
+     * @param session
+     */
+    protected void removeSessionUser(HttpSession session) {
+        session.removeAttribute(Constant.USER_SESSION);
+    }
+
 }

whole-estate/src/main/java/com/example/wholeestate/common/resp/ResponseBean.java

@@ -9,10 +9,10 @@ public class ResponseBean<T> implements Serializable {
 
     private static final long serialVersionUID = 3593827217136880822L;
 
-    public static final String CODE_SUCCESS =  "0";
-    public static final String CODE_FAIL =  "1";
+    public static final Integer CODE_SUCCESS =  200;
+    public static final Integer CODE_FAIL =  400;
 
-    private String code = "0";
+    private Integer code = 200;
 
     private String message = "成功";
 
@@ -22,27 +22,27 @@ public class ResponseBean<T> implements Serializable {
     }
 
     public void addDefaultError() {
-        this.code = "1";
+        this.code = 400;
         this.message = "失败";
     }
 
     public void addError(String message) {
-        this.code = "1";
+        this.code = 400;
         this.message = message;
     }
 
-    public void addError(String code, String message) {
+    public void addError(Integer code, String message) {
         this.code = code;
         this.message = message;
     }
 
     public void addSuccess(String message) {
-        this.code = "0";
+        this.code = 200;
         this.message = message;
     }
 
     public void addSuccess(T data) {
-        this.code = "0";
+        this.code = 200;
         this.message = "成功";
         this.data = data;
     }
@@ -51,7 +51,7 @@ public class ResponseBean<T> implements Serializable {
         return this.data;
     }
 
-    public String getCode() {
+    public Integer getCode() {
         return this.code;
     }
 

whole-estate/src/main/java/com/example/wholeestate/config/SessionConfig.java

@@ -2,21 +2,21 @@ package com.example.wholeestate.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.session.jdbc.config.annotation.web.http.EnableJdbcHttpSession;
-import org.springframework.session.web.http.HeaderHttpSessionIdResolver;
-import org.springframework.session.web.http.HttpSessionIdResolver;
+//import org.springframework.session.jdbc.config.annotation.web.http.EnableJdbcHttpSession;
+//import org.springframework.session.web.http.HeaderHttpSessionIdResolver;
+//import org.springframework.session.web.http.HttpSessionIdResolver;
 
 /**
  * session 配置
  * @author weiximei
  */
- @Configuration
- @EnableJdbcHttpSession
+// @Configuration
+// @EnableJdbcHttpSession
 public class SessionConfig {
 
-    @Bean
-    public HttpSessionIdResolver httpSessionIdResolver() {
-        return HeaderHttpSessionIdResolver.xAuthToken();
-    }
+//    @Bean
+//    public HttpSessionIdResolver httpSessionIdResolver() {
+//        return HeaderHttpSessionIdResolver.xAuthToken();
+//    }
 
 }

whole-estate/src/main/java/com/example/wholeestate/controller/ActivityController.java

@@ -63,8 +63,7 @@ public class ActivityController extends BaseController {
     @RequestMapping(value = "/activity/add", method = RequestMethod.POST)
     @ApiOperation(value = "添加活动", notes = "添加活动")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "title活动标题;activityDate活动时间;beginDate活动开始时间;endDate活动截止时间;maxNum人数限制;context内容;imgUrl图片地址"),
-//            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "title活动标题;activityDate活动时间;beginDate活动开始时间;endDate活动截止时间;maxNum人数限制;context内容;imgUrl图片地址")
     })
     public ResponseBean add(@RequestBody String parameter) {
         ResponseBean responseBean = new ResponseBean();
@@ -77,8 +76,7 @@ public class ActivityController extends BaseController {
     @RequestMapping(value = "/activity/update", method = RequestMethod.PUT)
     @ApiOperation(value = "修改活动", notes = "修改活动")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "activityId活动编号;title活动标题;activityDate活动时间;beginDate活动开始时间;endDate活动截止时间;maxNum人数限制;context内容;imgUrl图片地址"),
-//            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "activityId活动编号;title活动标题;activityDate活动时间;beginDate活动开始时间;endDate活动截止时间;maxNum人数限制;context内容;imgUrl图片地址")
     })
     public ResponseBean update(@RequestBody String parameter) {
         ResponseBean responseBean = new ResponseBean();
@@ -91,9 +89,6 @@ public class ActivityController extends BaseController {
 
     @RequestMapping(value = "/activity/delete/{activityId}", method = RequestMethod.DELETE)
     @ApiOperation(value = "删除活动", notes = "删除活动")
-    @ApiImplicitParams({
-//            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
-    })
     public ResponseBean delete(@PathVariable String activityId) {
         ResponseBean responseBean = new ResponseBean();
         Activity activity = iActivityService.getById(activityId);
@@ -114,7 +109,6 @@ public class ActivityController extends BaseController {
     @ApiOperation(value = "根据活动id查询活动报名列表", notes = "根据活动id查询活动报名列表")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "pageNum第几页;pageSize一页多少行")
-//            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
     })
     public ResponseBean activityEnrollList(@PathVariable("activityId") String activityId, @RequestBody String parameter) {
         ResponseBean responseBean = new ResponseBean();

whole-estate/src/main/java/com/example/wholeestate/controller/CommentController.java

@@ -60,4 +60,6 @@ public class CommentController extends BaseController {
         return responseBean;
     }
 
+
+
 }

whole-estate/src/main/java/com/example/wholeestate/controller/SysUserController.java

@@ -47,4 +47,22 @@ public class SysUserController extends BaseController {
         return responseBean;
     }
 
+    @RequestMapping(value = "/user/loginOut", method = RequestMethod.GET)
+    @ApiOperation(value = "退出登陆", notes = "退出登陆")
+    public ResponseBean loginOut(HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        removeSessionUser(session);
+        responseBean.addSuccess("退出登陆成功!");
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/user/info", method = RequestMethod.GET)
+    @ApiOperation(value = "获取登陆的用户信息", notes = "获取登陆的用户信息")
+    public ResponseBean loginInfo(HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        SysUser sessionUser = getSessionUser(session);
+        responseBean.addSuccess(sessionUser);
+        return responseBean;
+    }
+
 }

whole-estate/src/main/java/com/example/wholeestate/exception/ExceptionHandleAdice.java

@@ -34,7 +34,12 @@ public class ExceptionHandleAdice {
     public ResponseBean handleException(WholeEstateException e) {
         log.error(e.getMessage(),e);
         ResponseBean response = new ResponseBean();
-        response.addError(e.getMessage());
+        String message = e.getMessage();
+        if (message.equals("用户 session 不存在!")) {
+            response.addError(Constant.NOT_SESSION_USER, message);
+            return response;
+        }
+        response.addError(message);
         return response;
     }
 

whole-estate/src/main/java/com/example/wholeestate/service/IActivityEnrollService.java

@@ -15,7 +15,7 @@ import com.example.wholeestate.model.ActivityEnroll;
 public interface IActivityEnrollService extends IService<ActivityEnroll> {
 
     /**
-     * 活动报名
+     * 根据活动id 查询 活动报名列表
      * @param parameter
      * @return
      */

whole-estate/src/main/java/com/example/wholeestate/service/ICommentService.java

@@ -3,6 +3,7 @@ package com.example.wholeestate.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.example.wholeestate.common.resp.ResponseBean;
 import com.example.wholeestate.model.Comment;
+import com.example.wholeestate.model.SysUser;
 
 /**
  * <p>
@@ -16,10 +17,9 @@ public interface ICommentService extends IService<Comment> {
 
     /**
      * 回复评论
-     * @param commentId
      * @param parameter
      * @return
      */
-    ResponseBean addComment(String commentId, String parameter);
+    ResponseBean addComment(SysUser user, String parameter);
 
 }

whole-estate/src/main/java/com/example/wholeestate/service/impl/CommentServiceImpl.java

@@ -1,13 +1,22 @@
 package com.example.wholeestate.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.example.wholeestate.common.resp.ResponseBean;
 import com.example.wholeestate.dao.CommentMapper;
+import com.example.wholeestate.dao.CustomerMapper;
 import com.example.wholeestate.model.Activity;
 import com.example.wholeestate.model.Comment;
+import com.example.wholeestate.model.Customer;
+import com.example.wholeestate.model.SysUser;
 import com.example.wholeestate.service.ICommentService;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 评论表 服务实现类
@@ -19,11 +28,33 @@ import org.springframework.stereotype.Service;
 @Service
 public class CommentServiceImpl extends ServiceImpl<CommentMapper, Comment> implements ICommentService {
 
+    @Autowired
+    private CommentMapper commentMapper;
+
+    @Autowired
+    private CustomerMapper customerMapper;
+
     @Override
-    public ResponseBean addComment(String commentId, String parameter) {
+    public ResponseBean addComment(SysUser user, String parameter) {
         ResponseBean responseBean = new ResponseBean();
+        Comment comment = JSONObject.parseObject(parameter, Comment.class);
+        comment.setCreateDate(LocalDateTime.now());
+        comment.setStatus(1);
 
+        QueryWrapper<Customer> customerQueryWrapper = new QueryWrapper<>();
+        customerQueryWrapper.eq("customer_id", comment.getCustomerId());
+        Customer customer = customerMapper.selectOne(customerQueryWrapper);
+        if (null == customer) {
+            responseBean.addError("用户不存在!");
+            return responseBean;
+        }
 
+        int insert = commentMapper.insert(comment);
+        if (insert <= 0) {
+            responseBean.addError("评论失败!");
+            return responseBean;
+        }
+        responseBean.addSuccess("评论成功!");
         return responseBean;
     }
 }

whole-estate/src/main/java/com/example/wholeestate/utils/MD5Utils.java

@@ -0,0 +1,51 @@
+package com.example.wholeestate.utils;
+
+import java.io.UnsupportedEncodingException;
+import java.security.MessageDigest;
+
+/**
+ * 用户密码加密
+ * Created by Administrator on 2015/8/9.
+ */
+public class MD5Utils {
+    /**
+     * MD5加密
+     *
+     * @param s 字符串
+     * @return MD5加密 字符串
+     */
+    public static String encode(String s) {
+        try {
+            return encode(s.getBytes("utf-8"));
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    private static String encode(byte[] b) {
+        char hexDigits[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+                'a', 'b', 'c', 'd', 'e', 'f'};
+        try {
+            byte[] strTemp;
+            strTemp = b;
+            MessageDigest mdTemp = MessageDigest.getInstance("MD5");
+            mdTemp.update(strTemp);
+            byte[] md = mdTemp.digest();
+            int j = md.length;
+            char str[] = new char[j * 2];
+            int k = 0;
+            for (byte byte0 : md) {
+                str[k++] = hexDigits[byte0 >>> 4 & 0xf];
+                str[k++] = hexDigits[byte0 & 0xf];
+            }
+            return new String(str);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    public static void main(String[] arge) throws Exception {
+       System.out.println(MD5Utils.encode("123456"));
+    }
+}