Merge branch 'master' of https://git.jiinfo.cn/cmc-project/cmc_weixin_sap

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

@@ -14,6 +14,7 @@ import org.fouram.core.util.AppUtil;
 import org.fouram.core.util.AppUtil.ResultConstant;
 import org.fouram.core.util.ConfConfig;
 import org.fouram.core.util.LoggerUtil;
+import org.fouram.entity.SapOrg;
 import org.fouram.service.SapOrgService;
 import org.fouram.service.SapUserService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,8 +36,8 @@ public class ApiController extends BaseController {
 	private SapUserService sapUserService;
 	@Autowired
 	private static final String TOKEN="UserId";
-	
-	
+
+
 	/**
 	 * 获取授权url
 	 * @return
@@ -45,8 +46,9 @@ public class ApiController extends BaseController {
 	@ResponseBody
 	public Object getAuthUrl(String url) {
 		try {
-			String redirectUri = ConfConfig.getConfigString("wxCp.redirectUri");
+			String redirectUri = ConfConfig.getConfigString("wxCp.redirectUri")+"/API/wxCpLogin";
 			String authUri = WXCpMailList.oauth2Service.buildAuthorizationUrl(redirectUri,url);
+			System.out.println(authUri);
 			return AppUtil.success(authUri, null);
 		} catch (Exception e) {
 			LoggerUtil.error(e);
@@ -75,14 +77,22 @@ public class ApiController extends BaseController {
 	@ResponseBody
 	public Object getChildDepartAndUserListByDepartId(HttpServletRequest request) {
 		if(!isLogin(request)){
-			return AppUtil.error(ResultConstant.TOKEN_ERR_MSG);
+			return AppUtil.error(ResultConstant.NO_TOKEN,ResultConstant.TOKEN_ERR_MSG);
 		}
 		try {
 			String departId = getPageData().getString("departId");
-			if (StringUtils.isBlank(departId)) {
+			SapOrg sapOrg = null;
+			if (StringUtils.isBlank(departId)
+					||WebConstants.TOP_DEPART.toString().equals(departId)) {
 				departId = WebConstants.TOP_DEPART.toString();
+				sapOrg=SapOrg.builder()
+						.id(WebConstants.TOP_DEPART.toString())
+						.sapName(WebConstants.TOP_DEPART_NAME).build();
+			}else{
+				sapOrg=sapOrgService.selectById(departId);
 			}
 			Map<String, Object> result = Maps.newHashMap();
+			result.put("departInfo",sapOrg);
 			result.put("departList", sapOrgService.selectListByParentId(departId));
 			result.put("userList", sapUserService.selectListByDepartIdAndLevel(departId));
 			return AppUtil.success(result, null);
@@ -100,7 +110,7 @@ public class ApiController extends BaseController {
 	@ResponseBody
 	public Object getDepartAndUserListByName(HttpServletRequest request) {
 		if(!isLogin(request)){
-			return AppUtil.error(ResultConstant.TOKEN_ERR_MSG);
+			return AppUtil.error(ResultConstant.NO_TOKEN,ResultConstant.TOKEN_ERR_MSG);
 		}
 		try {
 			String name = getPageData().getString("name");
@@ -122,7 +132,7 @@ public class ApiController extends BaseController {
 	@ResponseBody
 	public Object getUserInfoById(HttpServletRequest request) {
 		if(!isLogin(request)){
-			return AppUtil.error(ResultConstant.TOKEN_ERR_MSG);
+			return AppUtil.error(ResultConstant.NO_TOKEN,ResultConstant.TOKEN_ERR_MSG);
 		}
 		try {
 			String userId = getPageData().getString("userId");
@@ -139,10 +149,10 @@ public class ApiController extends BaseController {
 	 * @return
 	 */
 	public boolean isLogin(HttpServletRequest request){
-//		HttpSession httpSession = request.getSession();
-//		if(null==httpSession.getAttribute(TOKEN)){
-//			return false;
-//		}
+		HttpSession httpSession = request.getSession();
+		if(null==httpSession.getAttribute(TOKEN)){
+			return false;
+		}
 		return true;
 	}
 

code/sapparent/sapservice/src/main/java/org/fouram/constants/WebConstants.java

@@ -3,10 +3,12 @@ package org.fouram.constants;
 import org.fouram.core.util.ConfConfig;
 
 public final class WebConstants {
-	
+
 	public static final Long TOP_DEPART = 1L;
-	
+
+	public static final String TOP_DEPART_NAME = "华人文化集团";
+
 	public static final String INGORE_PERSONIDS = ConfConfig.getConfigString("ingorePersonIds");
-	
+
 	public static final String SUCCESS = "SUCCESS";
-}
+}

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

@@ -21,7 +21,7 @@ public class WXCpMailList {
 	static {
 		WxCpDefaultConfigImpl configStorage = new WxCpDefaultConfigImpl();
 		configStorage.setCorpId(ConfConfig.getConfigString("wxCp.corpId"));
-		configStorage.setCorpSecret(ConfConfig.getConfigString("wxCp.corpSecret"));
+		configStorage.setCorpSecret(ConfConfig.getConfigString("wxCp.mailList.corpSecret"));
 		// 初始化基础service
 		service.setWxCpConfigStorage(configStorage);
 		// 初始化用户service

code/sapparent/sapservice/src/main/java/org/fouram/core/util/AppUtil.java

@@ -3,12 +3,14 @@ package org.fouram.core.util;
 import org.fouram.core.base.model.PageData;
 
 public class AppUtil {
-	
+
 	public interface ResultConstant {
 		/** 成功 */
 		String SUCCESS = "01";
 		/** 错误 */
 		String ERROR = "999";
+		/** 无效 */
+		String NO_TOKEN = "998";
 		/** 错误 */
 		String TOKEN_ERR_MSG = "TOKEN无效";
 		String WEB_ERR_MSG = "系统异常";
@@ -19,7 +21,7 @@ public class AppUtil {
 		result.put("result", ResultConstant.SUCCESS);
 		return result;
 	}
-	
+
 	public static PageData success(Object data, String msg) {
 		PageData result = success();
 		result.put("data", data);
@@ -27,13 +29,20 @@ public class AppUtil {
 		return result;
 	}
 
+	public static PageData error(String code, String msg) {
+		PageData result = success();
+		result.put("result", code);
+		result.put("msg", msg);
+		return result;
+	}
+
 	public static PageData error(String msg) {
 		PageData result = new PageData();
 		result.put("result", ResultConstant.ERROR);
 		result.put("msg", msg);
 		return result;
 	}
-	
+
 	public static PageData error() {
 		PageData result = new PageData();
 		result.put("result", ResultConstant.ERROR);

code/sapparent/sapservice/src/main/resources/env/develop/config.properties

@@ -1,14 +1,14 @@
 #fouram
-wxCp.corpId = ww51602aeb8dab7a95
+#wxCp.corpId = ww51602aeb8dab7a95
 wxCp.corpSecret = 0i1jzYxLcriGTXhoatAGYaCFUXshfASbavRScZQxVmI
 
 wxCp.mailList.corpSecret = aI66cnVoFAd381rgd3NpyZaEP2qnuZJ2ogpZKWmz9qg
-wxCp.redirectUri = http://test.jiinfo.cn/
+wxCp.redirectUri = http://hanwj.jiinfo.cn/sapcms_war
 #test
 #wxCp.corpId = ww3fa314d9782219c7
 #wxCp.corpSecret = 80lhnjKd6hKNp1tNkRsN9i0wOtrSZ7Sg_apJDNa1RDQ
 #prod
-#wxCp.corpId = ww911e29458d3a46fd
+wxCp.corpId = ww911e29458d3a46fd
 #wxCp.corpSecret = amUNgH2lo-szEYkLmClZN2jMYcDu0NnXIAtWfW729P4
 
 #test