Merge branch 'developer' of http://git.caimei365.com/caimei-repository/caimei-mall into developer

pom.xml

@@ -77,6 +77,20 @@
             <artifactId>spring-boot-starter-tomcat</artifactId>
             <scope>compile</scope>
         </dependency>
+
+        <!--struts-->
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-core</artifactId>
+            <version>2.3.32</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>javassist</groupId>
+                    <artifactId>javassist</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
     </dependencies>
 
     <profiles>

src/main/java/com/caimei/controller/user/LoginController.java

@@ -6,6 +6,7 @@ import com.caimei.entity.CmOperationUser;
 import com.caimei.entity.WxJsonModel;
 import com.caimei.service.user.LoginService;
 import com.caimei.utils.HttpRequest;
+import com.caimei.utils.SessionHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
@@ -173,4 +175,21 @@ public class LoginController {
         WxJsonModel jsonModel = loginService.update(operationUser);
         return jsonModel;
     }
+
+    @RequestMapping("/testSession")
+    @ResponseBody
+    public WxJsonModel testSession(){
+        HttpSession session = SessionHelper.getSession();
+        session.setAttribute("testSession","测试传入session");
+        return new WxJsonModel();
+    }
+
+    @RequestMapping("/getSession")
+    @ResponseBody
+    public WxJsonModel getSession(){
+        HttpSession session = SessionHelper.getSession();
+        String getSession = (String)session.getAttribute("testSession");
+        return new WxJsonModel();
+    }
+
 }

src/main/java/com/caimei/utils/SessionHelper.java

@@ -0,0 +1,51 @@
+package com.caimei.utils;
+
+import com.opensymphony.xwork2.ActionContext;
+import org.apache.struts2.ServletActionContext;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+public class SessionHelper {
+	/**
+	 * 得到session里面的信息
+	 * 
+	 * @return
+	 */
+	public static HttpSession getSession() {
+		HttpServletRequest request;
+		if(ActionContext.getContext() == null) {
+			request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+		} else {
+			request = ServletActionContext.getRequest();
+		}
+		return request.getSession();
+	}
+
+
+	/**
+	 * 这个是用来设置cookie里面的信息
+	 *
+	 * @param name
+	 * @param value
+	 */
+	public static void setAttribute(String name, String value) {
+		getSession().setAttribute(name, value);
+	}
+
+	/**
+	 * 这个是用来读 cookie里面的信息
+	 * 
+	 * @param name
+	 * @return
+	 */
+	public static Object getAttribute(String name) {
+		return  getSession().getAttribute(name);
+	}
+
+	public static void removeSession(String name) {
+		getSession().removeAttribute(name);
+	}
+
+}