|
@@ -11,7 +11,7 @@ import javax.servlet.http.HttpSession;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.fouram.constants.WebConstants;
|
|
import org.fouram.constants.WebConstants;
|
|
import org.fouram.core.base.controller.BaseController;
|
|
import org.fouram.core.base.controller.BaseController;
|
|
-import org.fouram.core.plugin.weixin.cp.core.WXCpMailList;
|
|
|
|
|
|
+import org.fouram.core.plugin.weixin.cp.core.WXCpMailBase;
|
|
import org.fouram.core.util.AppUtil;
|
|
import org.fouram.core.util.AppUtil;
|
|
import org.fouram.core.util.AppUtil.ResultConstant;
|
|
import org.fouram.core.util.AppUtil.ResultConstant;
|
|
import org.fouram.core.util.ConfConfig;
|
|
import org.fouram.core.util.ConfConfig;
|
|
@@ -76,7 +76,7 @@ public class ApiController extends BaseController {
|
|
@ResponseBody
|
|
@ResponseBody
|
|
public Object getAuthUrl(String url) {
|
|
public Object getAuthUrl(String url) {
|
|
String redirectUri = ConfConfig.getConfigString("wxCp.redirectUri") + "/API/wxCpLogin";
|
|
String redirectUri = ConfConfig.getConfigString("wxCp.redirectUri") + "/API/wxCpLogin";
|
|
- String authUri = WXCpMailList.oauth2Service.buildAuthorizationUrl(redirectUri, url);
|
|
|
|
|
|
+ String authUri = WXCpMailBase.oauth2Service.buildAuthorizationUrl(redirectUri, url);
|
|
System.out.println(authUri);
|
|
System.out.println(authUri);
|
|
return AppUtil.success(authUri, null);
|
|
return AppUtil.success(authUri, null);
|
|
}
|
|
}
|
|
@@ -85,7 +85,7 @@ public class ApiController extends BaseController {
|
|
@ResponseBody
|
|
@ResponseBody
|
|
public void wxCpLogin(String code, String state, HttpServletRequest request, HttpServletResponse response)
|
|
public void wxCpLogin(String code, String state, HttpServletRequest request, HttpServletResponse response)
|
|
throws Exception {
|
|
throws Exception {
|
|
- WxCpOauth2UserInfo userInfo = WXCpMailList.oauth2Service.getUserInfo(code);
|
|
|
|
|
|
+ WxCpOauth2UserInfo userInfo = WXCpMailBase.oauth2Service.getUserInfo(code);
|
|
String userId = ConfConfig.getConfigString("wxCp.mailList.userId");
|
|
String userId = ConfConfig.getConfigString("wxCp.mailList.userId");
|
|
List<String> userIdList = Arrays.asList(userId.split(","));
|
|
List<String> userIdList = Arrays.asList(userId.split(","));
|
|
if (!userIdList.contains(userInfo.getUserId())) {
|
|
if (!userIdList.contains(userInfo.getUserId())) {
|