Преглед изворни кода

Merge remote-tracking branch 'origin/aliyun' into aliyun

release_toaliyun_real
xhxuc пре 6 година
родитељ
комит
d5d627b1ad
5 измењених фајлова са 18 додато и 9 уклоњено
  1. +4
    -4
      mallinkBApi/src/main/resources/application-dev.yml
  2. +1
    -0
      mallinkCApi/src/main/java/com/iformall/aop/RedisCacheAspect.java
  3. +6
    -1
      mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java
  4. +3
    -0
      mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java
  5. +4
    -4
      mallinkCApi/src/main/resources/application-dev.yml

+ 4
- 4
mallinkBApi/src/main/resources/application-dev.yml Прегледај датотеку

@@ -26,7 +26,7 @@ spring:
#date-format: yyyy-MM-dd HH:mm:ss
# REDIS
redis:
host: 202.165.179.86
host: 101.201.103.81
port: 6379
password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk)
timeout: 3600
@@ -91,12 +91,12 @@ jasypt:

wechat:
open:
componentAppId: "wx897e4673286c915d"
componentSecret: "cdfdfda65c45689beb6766c4c427eed2"
componentAppId: "wxdfc8fb4e62d6b52b"
componentSecret: "98daa62b316dd6feabaad708327ce233"
componentToken: "formall2018"
componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN"
redis:
host: 202.165.179.86
host: 101.201.103.81
port: 6379
password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk)
timeout: 3600


+ 1
- 0
mallinkCApi/src/main/java/com/iformall/aop/RedisCacheAspect.java Прегледај датотеку

@@ -64,6 +64,7 @@ public class RedisCacheAspect {
if (StringUtils.isBlank(token)) {
token = request.getParameter("token");
}
log.info("token>>>>>>>>>>>>>>>"+token);
String tenantId;
WxCUser wxCUser = null ;
if(StringUtils.isNotBlank(token)) {


+ 6
- 1
mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java Прегледај датотеку

@@ -136,7 +136,7 @@ public class WxUserGrantController extends BaseController {
@PostMapping("/login")
@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) {
logger.debug(map.toString());
logger.info("dologin >>>>>>>>>>>>>>>>>"+map.toString());

Map resultMap = new HashMap();

@@ -199,6 +199,11 @@ public class WxUserGrantController extends BaseController {

try {
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.getSessionKey();
openId = session.getOpenid();


+ 3
- 0
mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java Прегледај датотеку

@@ -29,6 +29,9 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter {

@Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
System.out.println(" requesturi......"+request.getRequestURL());
AuthIgnore annotation;
if(handler instanceof HandlerMethod) {
annotation = ((HandlerMethod) handler).getMethodAnnotation(AuthIgnore.class);


+ 4
- 4
mallinkCApi/src/main/resources/application-dev.yml Прегледај датотеку

@@ -27,7 +27,7 @@ spring:

# REDIS
redis:
host: 202.165.179.86
host: 101.201.103.81
port: 6379
password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk)
timeout: 3600
@@ -87,12 +87,12 @@ aws:

wechat:
open:
componentAppId: "wx897e4673286c915d"
componentSecret: "cdfdfda65c45689beb6766c4c427eed2"
componentAppId: "wxdfc8fb4e62d6b52b"
componentSecret: "98daa62b316dd6feabaad708327ce233"
componentToken: "formall2018"
componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN"
redis:
host: 202.165.179.86
host: 101.201.103.81
port: 6379
password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk)
timeout: 3600


Loading…
Откажи
Сачувај