liupeng 4 rokov pred
rodič
commit
b584655732

+ 3 - 3
code/sapparent/sapcms/src/main/java/org/fouram/controller/ApiController.java

@@ -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())) {

+ 1 - 1
code/sapparent/sapservice/src/main/java/org/fouram/core/plugin/weixin/cp/core/WXCpMailList.java

@@ -13,7 +13,7 @@ import me.chanjar.weixin.cp.config.impl.WxCpDefaultConfigImpl;
  *
  *
  * @author Liup
  * @author Liup
  */
  */
-public class WXCpMailList {
+public class WXCpMailBase {
 
 
 
 
 	public static final WxCpService service = new WxCpServiceImpl();
 	public static final WxCpService service = new WxCpServiceImpl();

+ 1 - 1
code/sapparent/sapservice/src/main/java/org/fouram/core/plugin/weixin/cp/core/WXCpMessage.java

@@ -11,7 +11,7 @@ import me.chanjar.weixin.cp.config.impl.WxCpDefaultConfigImpl;
  * 
  * 
  * @author Liup
  * @author Liup
  */
  */
-public class WXCpMessage {
+public class WXCpMessageBase {
 	
 	
 	public static final WxCpService service = new WxCpServiceImpl();
 	public static final WxCpService service = new WxCpServiceImpl();
 	static {
 	static {

+ 2 - 2
code/sapparent/sapservice/src/main/java/org/fouram/core/plugin/weixin/cp/util/WXCpMessageUtil.java

@@ -1,6 +1,6 @@
 package org.fouram.core.plugin.weixin.cp.util;
 package org.fouram.core.plugin.weixin.cp.util;
 
 
-import org.fouram.core.plugin.weixin.cp.core.WXCpMessage;
+import org.fouram.core.plugin.weixin.cp.core.WXCpMessageBase;
 import org.fouram.core.util.LoggerUtil;
 import org.fouram.core.util.LoggerUtil;
 
 
 import me.chanjar.weixin.common.api.WxConsts.KefuMsgType;
 import me.chanjar.weixin.common.api.WxConsts.KefuMsgType;
@@ -21,7 +21,7 @@ public class WXCpMessageUtil {
 			message.setToUser(toUser);
 			message.setToUser(toUser);
 			message.setMsgType(KefuMsgType.TEXT);
 			message.setMsgType(KefuMsgType.TEXT);
 			message.setContent(content);
 			message.setContent(content);
-			WxCpMessageSendResult sendResult = WXCpMessage.service.messageSend(message);
+			WxCpMessageSendResult sendResult = WXCpMessageBase.service.messageSend(message);
 			LoggerUtil.info(sendResult.toString());
 			LoggerUtil.info(sendResult.toString());
 		} catch (WxErrorException e) {
 		} catch (WxErrorException e) {
 			LoggerUtil.error(e);
 			LoggerUtil.error(e);