|
|
|
@@ -1,7 +1,6 @@ |
|
|
|
package com.simple.controller; |
|
|
|
|
|
|
|
import cn.binarywang.wx.miniapp.api.WxMaService; |
|
|
|
import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult; |
|
|
|
|
|
|
|
import com.simple.annotation.AuthIgnore; |
|
|
|
import com.simple.common.ErrorCode; |
|
|
|
import com.simple.domain.po.WxMall; |
|
|
|
@@ -10,14 +9,11 @@ import com.simple.service.WxMallService; |
|
|
|
import com.simple.service.WxMerchantService; |
|
|
|
import com.simple.utils.IPUtil; |
|
|
|
import io.swagger.annotations.Api; |
|
|
|
import me.chanjar.weixin.common.error.WxErrorException; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.apache.log4j.Logger; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.util.Assert; |
|
|
|
import org.springframework.web.bind.annotation.*; |
|
|
|
|
|
|
|
import com.github.pagehelper.PageInfo; |
|
|
|
import com.simple.common.Result; |
|
|
|
import com.simple.common.ResultData; |
|
|
|
|
|
|
|
@@ -95,8 +91,6 @@ public class WxMerchantBUserController extends BaseController |
|
|
|
String appId = map.get("appId"); |
|
|
|
String phone = map.get("phone"); |
|
|
|
String password = map.get("password"); |
|
|
|
String scene = map.get("scene"); |
|
|
|
String sceneAddress = map.get("sceneAddress"); |
|
|
|
//登录凭证不能为空 |
|
|
|
if (StringUtils.isBlank(phone)) { |
|
|
|
return new ResultData(ErrorCode.PARAMETER_NOT_NULL.getCode(), "phone不能为空"); |
|
|
|
@@ -106,8 +100,6 @@ public class WxMerchantBUserController extends BaseController |
|
|
|
} |
|
|
|
|
|
|
|
String token = null; |
|
|
|
String session_key = null; |
|
|
|
String openId = null; |
|
|
|
HttpServletRequest request = ((ServletRequestAttributes)RequestContextHolder.getRequestAttributes()).getRequest(); |
|
|
|
String ipaddress = IPUtil.getIpAddr(request); |
|
|
|
|
|
|
|
|