Merge branch 'master' of http://10.100.5.99/jituan/tourist

# Conflicts:
#	src/main/java/com/yingying/tourist/request/SessionFilter.java

src/main/java/com/yingying/tourist/business/BusinessConstant.java

@@ -1,49 +1,66 @@
-package com.yingying.tourist.business;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.ResourceBundle;
-
-public class BusinessConstant {
-
-    public enum Identity{
-        A("A","自然的崇拜者"), B("B","洒脱的冒险家"), C("C","文化的朝圣者"),D("D","心灵的按摩师");
-
-        Identity(String key,String value){
-            this.key = key;
-            this.value = value;
-        }
-        public String key;
-        public String value;
-
-        public static String getValue(String key) {
-            if (key==null) return null;
-            for (Identity d : Identity.values()){
-                if (key.equals(d.key)) {
-                    return d.value;
-                }
-            }
-            return key;
-        }
-    }
-
-    public static Map<Integer, String> describeMap = new HashMap<>(16,1);
-    static {
-        describeMap.put(1,"在山西挖煤挖到300000斤");
-        describeMap.put(2,"做环卫工打扫400个公厕坑位");
-        describeMap.put(3,"去动物园完成200次小脑斧近身喂食");
-        describeMap.put(4,"埋伏在巷子口专业碰瓷150次");
-        describeMap.put(5,"出演神剧龙套装死1800次");
-        describeMap.put(6,"在鬼屋扮鬼被人毒打900次");
-        describeMap.put(7,"在路边卖掉12000张煎饼果子");
-        describeMap.put(8,"帮狗粮工厂试吃1111罐狗粮");
-        describeMap.put(9,"在澡堂搭毛巾帮人搓澡1700次");
-        describeMap.put(10,"骑三轮车拉完800个胖太太客人");
-        describeMap.put(11,"沿街收破烂走过600条街");
-        describeMap.put(12,"劝退300位斯巴达广场舞大妈");
-        describeMap.put(13,"猫在后厨边哭边刷30000个盘子");
-        describeMap.put(14,"去民政局门口卖唱500首分手快乐");
-        describeMap.put(15,"去黑帮老大家催收到200万欠款");
-        describeMap.put(16,"下乡给4000头公猪做绝育手术");
-    }
-}
+package com.yingying.tourist.business;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.ResourceBundle;
+
+public class BusinessConstant {
+
+    public enum Identity{
+        A("A","自然的崇拜者"), B("B","洒脱的冒险家"), C("C","文化的朝圣者"),D("D","心灵的按摩师");
+
+        Identity(String key,String value){
+            this.key = key;
+            this.value = value;
+        }
+        public String key;
+        public String value;
+
+        public static String getValue(String key) {
+            if (key==null) return null;
+            for (Identity d : Identity.values()){
+                if (key.equals(d.key)) {
+                    return d.value;
+                }
+            }
+            return key;
+        }
+    }
+
+    public static Map<Integer, String> describeMap = new HashMap<>(16,1);
+    public static Map<Integer, String> destinationMap = new HashMap<>(16,1);
+    static {
+        describeMap.put(1,"在山西挖煤挖到300000斤");
+        describeMap.put(2,"做环卫工打扫400个公厕坑位");
+        describeMap.put(3,"去动物园完成200次小脑斧近身喂食");
+        describeMap.put(4,"埋伏在巷子口专业碰瓷150次");
+        describeMap.put(5,"出演神剧龙套装死1800次");
+        describeMap.put(6,"在鬼屋扮鬼被人毒打900次");
+        describeMap.put(7,"在路边卖掉12000张煎饼果子");
+        describeMap.put(8,"帮狗粮工厂试吃1111罐狗粮");
+        describeMap.put(9,"在澡堂搭毛巾帮人搓澡1700次");
+        describeMap.put(10,"骑三轮车拉完800个胖太太客人");
+        describeMap.put(11,"沿街收破烂走过600条街");
+        describeMap.put(12,"劝退300位斯巴达广场舞大妈");
+        describeMap.put(13,"猫在后厨边哭边刷30000个盘子");
+        describeMap.put(14,"去民政局门口卖唱500首分手快乐");
+        describeMap.put(15,"去黑帮老大家催收到200万欠款");
+        describeMap.put(16,"下乡给4000头公猪做绝育手术");
+        destinationMap.put(1,"随着脚蹼滑动我开始下潜，世界越来越静谧，一个庞大的珊瑚王国占据眼前所有视线，色彩斑斓的珊瑚宝宝们正在开演盛大的舞台剧。");
+        destinationMap.put(2,"我站在自由女神像前，摆出了一样的姿势拍照纪念，这座见证了美国历史的雕像，在自由、民主的口号下高举火炬照亮了最深沉的夜。");
+        destinationMap.put(3,"我迈步走近了佛塔，双手合十虔诚祈祷，心灵的一切杂念此刻都先放下，耳边只剩下风的私语和寺庙的诵经声，这是心灵的修行。");
+        destinationMap.put(4,"我被告知获得了超能力，可以瞬移到世界上任何一个景点旅行，于是兴致勃勃地打包了行李拿上了相机，然后，梦醒了。");
+        destinationMap.put(5,"我从新西兰皇后镇15000英尺的飞机上纵身跃下，云朵在身边穿行，身体在空中舒展，大地变换了新奇的角度，这就是高空速降。");
+        destinationMap.put(6,"我喘着气爬到了长白山腰处，回首望去，身后是苍茫的林海，远处的天池波光粼粼，山顶层层云雾缭绕，敢问山中可有仙人修炼长生。");
+        destinationMap.put(7,"我席地盘坐在蒙古大草原的篝火边，饮下一口马奶酒，在主人悠扬的马头琴声中悠悠哼着草原小调，草原的夜空繁星无际，雄伟辽阔。");
+        destinationMap.put(8,"我坐在小酒馆的窗边，拿起酒杯小酌一口，窗外街上的游人行色匆匆，手指轻敲桌面打着节奏，轻声慢和一首回忆纯真的童谣。");
+        destinationMap.put(9,"我站在北极的冰原上仰头望向夜空，极光在天边摇曳，仿佛火狐狸经过时，尾巴扫过白雪而激起的花火，代表了幸运和希望。");
+        destinationMap.put(10,"大不列颠的夕阳将大本钟染成金黄色，我站在钟楼下，看着远处广场上飞起的鸽子，耳边响起英伦古典建筑上空浑厚的钟声。");
+        destinationMap.put(11,"我斜躺在近海的水屋里，环顾四周皆是湛蓝的大海，打开窗，海浪的声音温柔地抚摸着耳膜，千奇百怪的热带鱼在身下梭巡起舞。");
+        destinationMap.put(12,"我踩着轻快的步子下楼散步，期间共被广场舞大妈挡道7次，被业主的狗狂追10次，被小区的熊孩子撞飞8次，最后狼狈不堪逃回家。");
+        destinationMap.put(13,"我艰难地踩着雪崖攀上了最后一米，立足在珠峰之巅，风雪仍在咆哮，缺氧让人窒息，但是征服生命禁区后的心灵感觉自由无比。");
+        destinationMap.put(14,"我把遮沙的面罩重新带好，抬头望向面前的胡夫金字塔，斑驳的石砖满是风沙的痕迹，狮身人面像在旁沉默守护着最古老的文明荣光。");
+        destinationMap.put(15,"我乘坐探险者一号飞船顺利着陆，跨出舱的第一步激起了飘扬的火星尘，这是整个太阳系最高的山脉，能看到远处蓝宝石般的地球。");
+        destinationMap.put(16,"我头上搭着白毛巾，泡在樱花树下的露天温泉中，水面热气蒸腾，远处富士山顶白雪皑皑，空中樱花瓣打着旋缓缓飘落在水面上。");
+    }
+}

src/main/java/com/yingying/tourist/business/BusinessYml.java

@@ -1,13 +0,0 @@
-package com.yingying.tourist.business;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-@Component
-public class BusinessYml {
-    @Value("${session.domain}")private String COOKIEDOMAIN;
-
-    public String getCookieDomain() {
-        return COOKIEDOMAIN;
-    }
-}

src/main/java/com/yingying/tourist/common/WeChatConstants.java

@@ -0,0 +1,7 @@
+package com.yingying.tourist.common;
+
+public class WeChatConstants {
+	
+	public static String WECHAT_REDIRECT_URI = "http://wx.yingyinglicai.com/index";
+
+}

src/main/java/com/yingying/tourist/domain/Question.java

@@ -1,12 +1,13 @@
-package com.yingying.tourist.domain;
-
-import lombok.Data;
-
-@Data
-public class Question {
-    private Integer id;
-    private String questionPath;
-    private String resultDestination;
-    private String resultOutter;
-    private String resultInner;
-}
+package com.yingying.tourist.domain;
+
+import lombok.Data;
+
+@Data
+public class Question {
+    private Integer id;
+    private String questionPath;
+    private Integer resultOrder;
+    private String resultDestination;
+    private String resultOutter;
+    private String resultInner;
+}

src/main/java/com/yingying/tourist/interceptor/WeChatInterceptor.java

@@ -0,0 +1,69 @@
+package com.yingying.tourist.interceptor;
+
+import java.net.URLEncoder;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.HandlerInterceptor;
+import org.springframework.web.servlet.ModelAndView;
+
+import com.alibaba.fastjson.JSONObject;
+import com.yingying.tourist.common.WeChatConstants;
+
+@Component
+public class WeChatInterceptor implements HandlerInterceptor {
+
+	@Value("${weixin.appid}")
+	private String appid;
+	@Value("${weixin.authorization}")
+	private Boolean authorization;
+
+	@Override
+	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
+			throws Exception {
+		String result = "";
+		
+		System.out.println(result);
+		
+		// 判断是否需要微信授权
+		if (authorization) {
+			// 判断是否来自微信浏览器
+			String ua = ((HttpServletRequest) request).getHeader("user-agent").toLowerCase();
+			if (ua.contains("micromessenger")) {
+				String redirectUrl = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=" + appid
+						+ "&redirect_uri=" + URLEncoder.encode(WeChatConstants.WECHAT_REDIRECT_URI, "utf-8")
+						+ "&response_type=code&scope=snsapi_userinfo&state=123#wechat_redirect";
+				JSONObject redirectJson = new JSONObject();
+				redirectJson.put("redirectUrl", redirectUrl);
+				response.setContentType("application/json");
+				response.getWriter().write(redirectJson.toString());
+				response.getWriter().flush();
+				return false;
+			} else {
+				// 非微信浏览器
+				return true;
+			}
+		} else {
+			return true;
+		}
+
+	}
+
+	@Override
+	public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler,
+			ModelAndView modelAndView) throws Exception {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex)
+			throws Exception {
+		// TODO Auto-generated method stub
+
+	}
+
+}

src/main/java/com/yingying/tourist/request/SessionFilter.java

@@ -1,87 +1,77 @@
-package com.yingying.tourist.request;
-
-import java.io.IOException;
-import java.util.UUID;
-
-import javax.annotation.Resource;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.annotation.WebFilter;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Component;
-import org.springframework.web.util.WebUtils;
-
-import com.alibaba.fastjson.JSONObject;
-import com.yingying.tourist.business.BusinessYml;
-import com.yingying.tourist.common.UrlUtils;
-
-import lombok.extern.slf4j.Slf4j;
-
-@Component
-@Order(2)
-@WebFilter(filterName = "SessionFilter", urlPatterns = "/*")
-@Slf4j
-public class SessionFilter implements Filter {
-	
-	@Resource
-	private BusinessYml businessYml;
-
-	@Override
-	public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
-		// 检查sessionId的cookie是否存在,不存在即为新连接，需要初始化sessionId到cookie中
-		checkRemoteSession((HttpServletRequest) request, (HttpServletResponse) response);
-		chain.doFilter(request, response);
-	}
-
-	@Override
-	public void destroy() {
-	}
-
-	@Override
-	public void init(FilterConfig filterConfig) throws ServletException {
-		
-	}
-
-	private void checkRemoteSession(HttpServletRequest request, HttpServletResponse response) {
-		String sessionKey = null;
-		String token = request.getParameter("token");
-		log.info("token------>>>first:[{}]",token);
-        if (StringUtils.isEmpty(token)) {
-            String payload = UrlUtils.getRequestPayload(request);
-            if (!StringUtils.isEmpty(payload)) {
-                JSONObject jsonObject = JSONObject.parseObject(payload);
-                token = jsonObject.getString("token");
-            }
-        }
-		
-		if (StringUtils.isNotEmpty(token)) {
-			sessionKey = token;
-			log.info("sessionKey------>>>second:[{}]",sessionKey);
-		} else {
-			Cookie sessionKeyCookie = WebUtils.getCookie(request, SessionAuthorization.SESSION_KEY_COOKIE_NAME);
-			if (sessionKeyCookie == null) {
-				sessionKey = UUID.randomUUID().toString();
-				sessionKeyCookie = new Cookie(SessionAuthorization.SESSION_KEY_COOKIE_NAME, sessionKey);
-			} else {
-				sessionKey = sessionKeyCookie.getValue();
-			}
-			log.info("sessionKey------>>>third:[{}]",sessionKey);
-			sessionKeyCookie.setPath("/");
-			sessionKeyCookie.setDomain(businessYml.getCookieDomain());
-			sessionKeyCookie.setMaxAge(SessionAuthorization.DEFAULT_SESSION_COOKIE_EXPIRE);
-			sessionKeyCookie.setHttpOnly(true);
-			response.addCookie(sessionKeyCookie);
-		}
-		RequestSessionKey.putSessionKey(sessionKey);
-	}
-	
+package com.yingying.tourist.request;
+
+import com.alibaba.fastjson.JSONObject;
+import com.yingying.tourist.common.UrlUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+import org.springframework.web.util.WebUtils;
+
+import javax.servlet.*;
+import javax.servlet.annotation.WebFilter;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.UUID;
+
+@Component
+@Order(2)
+@WebFilter(filterName = "SessionFilter", urlPatterns = "/*")
+@Slf4j
+public class SessionFilter implements Filter {
+
+	@Value("${session.domain}")private String COOKIEDOMAIN;
+
+	@Override
+	public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+		// 检查sessionId的cookie是否存在,不存在即为新连接，需要初始化sessionId到cookie中
+		checkRemoteSession((HttpServletRequest) request, (HttpServletResponse) response);
+		chain.doFilter(request, response);
+	}
+
+	@Override
+	public void destroy() {
+	}
+
+	@Override
+	public void init(FilterConfig filterConfig) throws ServletException {
+		
+	}
+
+	private void checkRemoteSession(HttpServletRequest request, HttpServletResponse response) {
+		String sessionKey = null;
+		String token = request.getParameter("token");
+		log.info("token------>>>first:[{}]",token);
+        if (StringUtils.isEmpty(token)) {
+            String payload = UrlUtils.getRequestPayload(request);
+            if (!StringUtils.isEmpty(payload)) {
+                JSONObject jsonObject = JSONObject.parseObject(payload);
+                token = jsonObject.getString("token");
+            }
+        }
+		
+		if (StringUtils.isNotEmpty(token)) {
+			sessionKey = token;
+			log.info("sessionKey------>>>second:[{}]",sessionKey);
+		} else {
+			Cookie sessionKeyCookie = WebUtils.getCookie(request, SessionAuthorization.SESSION_KEY_COOKIE_NAME);
+			if (sessionKeyCookie == null) {
+				sessionKey = UUID.randomUUID().toString();
+				sessionKeyCookie = new Cookie(SessionAuthorization.SESSION_KEY_COOKIE_NAME, sessionKey);
+			} else {
+				sessionKey = sessionKeyCookie.getValue();
+			}
+			log.info("sessionKey------>>>third:[{}]",sessionKey);
+			sessionKeyCookie.setPath("/");
+			sessionKeyCookie.setDomain(COOKIEDOMAIN);
+			sessionKeyCookie.setMaxAge(SessionAuthorization.DEFAULT_SESSION_COOKIE_EXPIRE);
+			sessionKeyCookie.setHttpOnly(true);
+			response.addCookie(sessionKeyCookie);
+		}
+		RequestSessionKey.putSessionKey(sessionKey);
+	}
+	
 }

src/main/java/com/yingying/tourist/vo/QuestionVo.java

@@ -1,13 +1,14 @@
-package com.yingying.tourist.vo;
-
-import lombok.Data;
-
-@Data
-public class QuestionVo {
-    private String nickname;
-    private String resultDestination;
-    private String resultOutter;
-    private String resultInner;
-    private String resultIdentity;
-    private String resultDescribe;
-}
+package com.yingying.tourist.vo;
+
+import lombok.Data;
+
+@Data
+public class QuestionVo {
+    private String nickname;
+    private String resultDestination;
+    private String resultDestinationInfo;
+    private String resultOutter;
+    private String resultInner;
+    private String resultIdentity;
+    private String resultDescribe;
+}

src/main/java/com/yingying/tourist/web/QuestionController.java

@@ -1,46 +1,54 @@
-package com.yingying.tourist.web;
-
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.yingying.tourist.business.BusinessConstant;
-import com.yingying.tourist.common.Util;
-import com.yingying.tourist.domain.Question;
-import com.yingying.tourist.domain.User;
-import com.yingying.tourist.exception.ErrorCode;
-import com.yingying.tourist.result.MessageResult;
-import com.yingying.tourist.service.QuestionService;
-import com.yingying.tourist.service.UserService;
-import com.yingying.tourist.vo.QuestionVo;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-public class QuestionController {
-
-    @Autowired
-    private QuestionService questionService;
-
-    @Autowired
-    private UserService userService;
-
-    @GetMapping("question/pick")
-    public MessageResult<QuestionVo> question(String openid, String pickOne, String pickTwo, String pickThird, String pickFourth){
-        if (Util.isNull(openid) || Util.isNull(pickOne) || Util.isNull(pickTwo) || Util.isNull(pickThird) || Util.isNull(pickFourth)) {
-            return new MessageResult<QuestionVo>().failure(ErrorCode.PARAMETERS_ERROR);
-        }
-        QuestionVo questionVo = new QuestionVo();
-        String pick = pickOne + pickTwo + pickThird;
-        EntityWrapper<Question> questionWrapper = new EntityWrapper<>();
-        questionWrapper.eq("question_path", pick);
-        Question question = questionService.selectOne(questionWrapper);
-        EntityWrapper<User> userWrapper = new EntityWrapper<>();
-        userWrapper.eq("openid", openid);
-        User user = userService.selectOne(userWrapper);
-        BeanUtils.copyProperties(question, questionVo);
-        questionVo.setResultDescribe(BusinessConstant.describeMap.get(Util.getRandomInt(1,16)));
-        questionVo.setResultIdentity(BusinessConstant.Identity.getValue(pickFourth));
-        questionVo.setNickname(user.getNickname());
-        return new MessageResult<QuestionVo>().ok(questionVo);
-    }
-}
+package com.yingying.tourist.web;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.yingying.tourist.business.BusinessConstant;
+import com.yingying.tourist.common.Util;
+import com.yingying.tourist.domain.Question;
+import com.yingying.tourist.domain.User;
+import com.yingying.tourist.exception.ErrorCode;
+import com.yingying.tourist.result.MessageResult;
+import com.yingying.tourist.service.QuestionService;
+import com.yingying.tourist.service.UserService;
+import com.yingying.tourist.vo.QuestionVo;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Arrays;
+import java.util.List;
+
+@RestController
+public class QuestionController {
+
+    @Autowired
+    private QuestionService questionService;
+
+    @Autowired
+    private UserService userService;
+
+    @GetMapping("question/pick")
+    public MessageResult<QuestionVo> question(String openid, String pick){
+        if (Util.isNull(pick)) {
+            return new MessageResult<QuestionVo>().failure(ErrorCode.PARAMETERS_ERROR);
+        }
+        QuestionVo questionVo = new QuestionVo();
+        String[] pickList = pick.split(",");
+        String pickLast = pickList[3];
+        String pickBegin = pickList[0] + pickList[1] + pickList[2];
+        EntityWrapper<Question> questionWrapper = new EntityWrapper<>();
+        questionWrapper.eq("question_path", pickBegin);
+        Question question = questionService.selectOne(questionWrapper);
+        BeanUtils.copyProperties(question, questionVo);
+        questionVo.setResultDestinationInfo(BusinessConstant.destinationMap.get(question.getResultOrder()));
+        questionVo.setResultDescribe(BusinessConstant.describeMap.get(Util.getRandomInt(1,16)));
+        questionVo.setResultIdentity(BusinessConstant.Identity.getValue(pickLast));
+        if (Util.isNotNull(openid)) {
+            EntityWrapper<User> userWrapper = new EntityWrapper<>();
+            userWrapper.eq("openid", openid);
+            User user = userService.selectOne(userWrapper);
+            questionVo.setNickname(user.getNickname());
+        }
+        return new MessageResult<QuestionVo>().ok(questionVo);
+    }
+}