Merge branch 'master' into 20180306-QQ_gdt

src/main/java/cn/quantgroup/xyqb/controller/internal/login/AuthInfoController.java

@@ -8,6 +8,8 @@ import cn.quantgroup.xyqb.model.session.SessionStruct;
 import cn.quantgroup.xyqb.service.http.IHttpService;
 import cn.quantgroup.xyqb.service.user.IUserBtRegisterService;
 import cn.quantgroup.xyqb.service.user.IUserService;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -46,6 +48,8 @@ public class AuthInfoController implements IBaseController {
       context.setBtMerchantId(sessionStruct.getValues().getLoginProperties().getBtMerchantId());
       //有ThreadLocal不释放的问题，不可再使用原来方式了
       loginInfo.setLoginContext(context);
+      log.info("[/auth/info/login] SessionStruct数据：{}", JSONObject.toJSONString(sessionStruct));
+      log.info("[/auth/info/login] LoginInfo数据：{}", JSONObject.toJSONString(loginInfo));
       return JsonResult.buildSuccessResult("", loginInfo);
     }
     return JsonResult.buildErrorStateResult("用户未登录",null);

src/main/java/cn/quantgroup/xyqb/service/session/impl/SessionServiceImpl.java

@@ -62,6 +62,7 @@ public class SessionServiceImpl implements ISessionService {
             sessionStruct.setAttribute("channelId", String.valueOf(channelId));
             sessionStruct.setAttribute("createdFrom", String.valueOf(createdFrom));
             sessionStruct.setAttribute("appChannel", String.valueOf(appChannel));
+            sessionStruct.getValues().setLoginProperties(properties);
             authBean.setPhoneNo(user.getPhoneNo());
             authBean.setToken(sessionStruct.getSid());
             persistSession(sessionStruct.getSid(), sessionStruct.getValues());

src/main/java/cn/quantgroup/xyqb/service/sms/impl/SmsServiceImpl.java

@@ -48,12 +48,16 @@ public class SmsServiceImpl implements ISmsService {
     }
 
 
-
+  /**
+   * 24-“【信用钱包】么么哒，等您好久了~感谢您注册信用钱包，我们来给您送钱啦，点击提交借款申请，万元现金立即到手 s.xyqb.com/a”
+   * 1005-“【信用钱包】等您好久了~感谢您的注册，尊享息费5折优惠。登录 s.xyqb.com/a 享更多优惠（合理消费，理性借贷）”
+   * @param phoneNo
+   */
   @Override
   public void sendAfterRegister(String phoneNo) {
     try {
       MsgParams msgParams =
-          new MsgParams(Collections.singletonList(2), phoneNo, "1", "24", Collections.emptyList());
+          new MsgParams(Collections.singletonList(2), phoneNo, "1", "1005", Collections.emptyList());
       getSmsSender().sendMsg(msgParams);
       //smsSender.sendAndForget(new SendAndForgetMsg(Collections.emptyList(), "24", "1", phoneNo));
       log.info("注册完成，发送短信, phoneNo:{}", phoneNo);