| @@ -26,7 +26,7 @@ spring: | |||||
| #date-format: yyyy-MM-dd HH:mm:ss | #date-format: yyyy-MM-dd HH:mm:ss | ||||
| # REDIS | # REDIS | ||||
| redis: | redis: | ||||
| host: 202.165.179.86 | |||||
| host: 101.201.103.81 | |||||
| port: 6379 | port: 6379 | ||||
| password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) | password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) | ||||
| timeout: 3600 | timeout: 3600 | ||||
| @@ -91,12 +91,12 @@ jasypt: | |||||
| wechat: | wechat: | ||||
| open: | open: | ||||
| componentAppId: "wx897e4673286c915d" | |||||
| componentSecret: "cdfdfda65c45689beb6766c4c427eed2" | |||||
| componentAppId: "wxdfc8fb4e62d6b52b" | |||||
| componentSecret: "98daa62b316dd6feabaad708327ce233" | |||||
| componentToken: "formall2018" | componentToken: "formall2018" | ||||
| componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN" | componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN" | ||||
| redis: | redis: | ||||
| host: 202.165.179.86 | |||||
| host: 101.201.103.81 | |||||
| port: 6379 | port: 6379 | ||||
| password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) | password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) | ||||
| timeout: 3600 | timeout: 3600 | ||||
| @@ -64,6 +64,7 @@ public class RedisCacheAspect { | |||||
| if (StringUtils.isBlank(token)) { | if (StringUtils.isBlank(token)) { | ||||
| token = request.getParameter("token"); | token = request.getParameter("token"); | ||||
| } | } | ||||
| log.info("token>>>>>>>>>>>>>>>"+token); | |||||
| String tenantId; | String tenantId; | ||||
| WxCUser wxCUser = null ; | WxCUser wxCUser = null ; | ||||
| if(StringUtils.isNotBlank(token)) { | if(StringUtils.isNotBlank(token)) { | ||||
| @@ -136,7 +136,7 @@ public class WxUserGrantController extends BaseController { | |||||
| @PostMapping("/login") | @PostMapping("/login") | ||||
| @ApiOperation(value = "用户登录", notes = "{\"appId\":\"string\",\"code\":\"string\",\"scene\":\"string\",\"sceneAddress\":\"string\",\"latitude\":\"string\",\"longitude\":\"string\",\"systemInfo\":\"string\"}") | @ApiOperation(value = "用户登录", notes = "{\"appId\":\"string\",\"code\":\"string\",\"scene\":\"string\",\"sceneAddress\":\"string\",\"latitude\":\"string\",\"longitude\":\"string\",\"systemInfo\":\"string\"}") | ||||
| public ResultData userLogin(@RequestBody Map<String, String> map) { | public ResultData userLogin(@RequestBody Map<String, String> map) { | ||||
| logger.debug(map.toString()); | |||||
| logger.info("dologin >>>>>>>>>>>>>>>>>"+map.toString()); | |||||
| Map resultMap = new HashMap(); | Map resultMap = new HashMap(); | ||||
| @@ -199,6 +199,11 @@ public class WxUserGrantController extends BaseController { | |||||
| try { | try { | ||||
| WxMaJscode2SessionResult session = wxMaService.jsCode2SessionInfo(code); | WxMaJscode2SessionResult session = wxMaService.jsCode2SessionInfo(code); | ||||
| logger.info("sessionResult: " + session); | |||||
| if (null != session) { | |||||
| logger.info("sessionResultDetail: [openid]" + session.getOpenid()+",[sessionkey]"+session.getSessionKey()+",[unionid]"+session.getUnionid()); | |||||
| } | |||||
| //获取会话密钥(session_key) | //获取会话密钥(session_key) | ||||
| session_key = session.getSessionKey(); | session_key = session.getSessionKey(); | ||||
| openId = session.getOpenid(); | openId = session.getOpenid(); | ||||
| @@ -29,6 +29,9 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter { | |||||
| @Override | @Override | ||||
| public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { | public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { | ||||
| System.out.println(" requesturi......"+request.getRequestURL()); | |||||
| AuthIgnore annotation; | AuthIgnore annotation; | ||||
| if(handler instanceof HandlerMethod) { | if(handler instanceof HandlerMethod) { | ||||
| annotation = ((HandlerMethod) handler).getMethodAnnotation(AuthIgnore.class); | annotation = ((HandlerMethod) handler).getMethodAnnotation(AuthIgnore.class); | ||||
| @@ -27,7 +27,7 @@ spring: | |||||
| # REDIS | # REDIS | ||||
| redis: | redis: | ||||
| host: 202.165.179.86 | |||||
| host: 101.201.103.81 | |||||
| port: 6379 | port: 6379 | ||||
| password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) | password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) | ||||
| timeout: 3600 | timeout: 3600 | ||||
| @@ -87,12 +87,12 @@ aws: | |||||
| wechat: | wechat: | ||||
| open: | open: | ||||
| componentAppId: "wx897e4673286c915d" | |||||
| componentSecret: "cdfdfda65c45689beb6766c4c427eed2" | |||||
| componentAppId: "wxdfc8fb4e62d6b52b" | |||||
| componentSecret: "98daa62b316dd6feabaad708327ce233" | |||||
| componentToken: "formall2018" | componentToken: "formall2018" | ||||
| componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN" | componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN" | ||||
| redis: | redis: | ||||
| host: 202.165.179.86 | |||||
| host: 101.201.103.81 | |||||
| port: 6379 | port: 6379 | ||||
| password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) | password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) | ||||
| timeout: 3600 | timeout: 3600 | ||||