ipcc表将配置信息增加至全局上下文

ibps-api-root/modules/api-base/src/main/java/com/lc/ibps/api/base/context/CurrentContext.java

@@ -73,6 +73,18 @@ public interface CurrentContext {
 	 * @return String
 	 */
 	String getCurrentUserId();
+
+	/**
+	 * 获取ipcc表配置字段
+	 * @return String
+	 */
+	String getSetting();
+
+	/**
+	 * 设置ipcc表配置字段
+	 * @return String
+	 */
+	void setSetting(String setting);
 	
 	/**
 	 * 获取当前执行人account
@@ -255,6 +267,8 @@ public interface CurrentContext {
 		public static final String CONTEXT_CLIENT_ID = "context.client.id";
 		
 		public static final String CONTEXT_VAR = "context.var";
+
+		public static final String CONTEXT_SETTING ="context.setting";
 	}
 
 }

ibps-base-root/modules/base-web/src/main/java/com/lc/ibps/base/web/context/AbstractContext.java

@@ -1,9 +1,12 @@
 package com.lc.ibps.base.web.context;
 
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+import com.lc.ibps.base.core.util.AppUtil;
+import com.lc.ibps.base.framework.table.ICommonDao;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -23,6 +26,28 @@ public abstract class AbstractContext implements CurrentContext {
 	 * 当前上下文副本
 	 */
 	private static final ThreadLocal<Map<String, Object>> contextLocal = new InheritableThreadLocal<Map<String, Object>>();
+
+	private ICommonDao<?> commonDao = AppUtil.getBean(ICommonDao.class);
+
+	@Override
+	public String getSetting() {
+		if(getContextLocal().get(CurrentContext.Keys.CONTEXT_SETTING) != null){
+			String setting =(String) getContextLocal().get(Keys.CONTEXT_SETTING);
+			return setting;
+		}
+		String sql = "select id_,setting from t_ipcc where id_ = '1'";
+		List<Map<String, Object>> list = (List<Map<String, Object>>) commonDao.query(sql);
+		String toString = list.get(0).get("setting").toString();
+		return toString;
+	}
+
+	@Override
+	public void setSetting(String setting) {
+		if(BeanUtils.isEmpty(setting)){
+			return;
+		}
+		getContextLocal().put(CurrentContext.Keys.CONTEXT_SETTING, setting);
+	}
 	
 	private Map<String, Object> getContextLocal() {
 		Map<String, Object> contextLocalMap = null;

ibps-base-root/modules/base-web/src/main/java/com/lc/ibps/base/web/context/ContextUtil.java

@@ -60,7 +60,7 @@ public class ContextUtil {
 	/**
 	 * 获取当前令牌
 	 * 
-	 * @param accessToken
+	 * @param
 	 */
 	public static String getCurrentAccessToken() {
 		return contextUtil.currentContext.getCurrentAccessToken();
@@ -69,7 +69,7 @@ public class ContextUtil {
 	/**
 	 * 获取当前clientId
 	 * 
-	 * @param clientId
+	 * @param
 	 * @since 3.1.2
 	 */
 	public static String getCurrentClientId() {
@@ -94,7 +94,16 @@ public class ContextUtil {
 	public static String getCurrentUserId() {
 		return contextUtil.currentContext.getCurrentUserId();
 	}
-	
+
+
+	public static String getSetting() {
+		return contextUtil.currentContext.getSetting();
+	}
+
+	public static void  setSetting(String setting) {
+		contextUtil.currentContext.setSetting(setting);
+	}
+
 	/**
 	 * 当前用户账号
 	 *
@@ -251,7 +260,7 @@ public class ContextUtil {
 	/**
 	 * 设置当前执行人租户IDs
 	 * 
-	 * @param tenantId
+	 * @param
 	 */
 	public static void setCurrentTenantIds(String tenantIds) {
 		contextUtil.currentContext.setCurrentTenantIds(tenantIds);
@@ -279,7 +288,7 @@ public class ContextUtil {
 	/**
 	 * 设置当前组织
 	 * 
-	 * @param user
+	 * @param
 	 */
 	public static void setCurrentOrg(PartyEntity org) {
 		contextUtil.currentContext.setCurrentOrg(org);
@@ -288,7 +297,7 @@ public class ContextUtil {
 	/**
 	 * 设置当前主岗位
 	 * 
-	 * @param user
+	 * @param
 	 */
 	public static void setCurrentPosition(PartyEntity position) {
 		contextUtil.currentContext.setCurrentPosition(position);

ibps-common-root/modules/org-biz/src/main/java/com/lc/ibps/org/party/repository/PartyPositionRepository.java

@@ -143,7 +143,13 @@ public interface PartyPositionRepository extends IRepository<String, PartyPositi
 	 * @return 
 	 */
 	List<PartyPositionPo> findByUserId(String userId);
-	
+
+
+	/**
+	 * 查ipcc表
+	 */
+	String finSetting();
+
 	/**
 	 * 根據用戶Id查詢主崗位
 	 * @param userId

ibps-common-root/modules/org-biz/src/main/java/com/lc/ibps/org/party/repository/impl/PartyPositionRepositoryImpl.java

@@ -2,9 +2,11 @@ package com.lc.ibps.org.party.repository.impl;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 import javax.annotation.Resource;
 
+import com.lc.ibps.base.framework.table.ICommonDao;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Repository;
 
@@ -47,6 +49,8 @@ public class PartyPositionRepositoryImpl extends AbstractRepository<String, Part
 	@Lazy
 	@Resource
 	private PartyEntityRepository partyEntityRepository;
+
+	private ICommonDao<?> commonDao = AppUtil.getBean(ICommonDao.class);
 	
 	@Override
 	public PartyPosition newInstance() {
@@ -195,6 +199,14 @@ public class PartyPositionRepositoryImpl extends AbstractRepository<String, Part
 		return findByIds(posIds);
 	}
 
+	@Override
+	public String finSetting() {
+		String sql = "select id_,setting from t_ipcc where id_ = '1'";
+		List<Map<String, Object>> list = (List<Map<String, Object>>) commonDao.query(sql);
+		String toString = list.get(0).get("setting").toString();
+		return toString;
+		}
+
 	@Override
 	public PartyPositionPo findMainPostByUserId(String userId) {
         PartyPositionPo partyPositionPo = partyPositionQueryDao.getByKey("findIdsByUserId", 

ibps-oauth-root/modules/oauth-client-httpclient/src/main/java/com/lc/ibps/cloud/oauth/client/service/TokenVerify.java

@@ -74,6 +74,7 @@ public class TokenVerify implements ITokenVerify {
 		APIResult<Map<String, Object>> result = null;
 	
 		logger.debug("contextUrl =====> {}", authorizationConfig.getHttpContextUrl());
+		System.out.println("contextUrl =====>" + authorizationConfig.getHttpContextUrl());
 		String responseData = null;
 		List<NameValuePair> nameValuePairs = new ArrayList<NameValuePair>();
 		nameValuePairs.add(new BasicNameValuePair(ParameterKey.PARAMETER_USERNAME, username));
@@ -92,7 +93,10 @@ public class TokenVerify implements ITokenVerify {
 		Map<String, Object> data = result.getData();
 		if(StateEnum.SUCCESS.getCode() == result.getState() && BeanUtils.isNotEmpty(data)) {
 			logger.debug("set current data {}", data);
-			
+
+			String setting = data.get("setting").toString();
+			ContextUtil.setSetting(setting);
+
 			PartyUserPo user = PartyUserPo.fromJsonString(JacksonUtil.toJsonString(data.get("user")));
 			ContextUtil.setCurrentUser(user);
 			

ibps-oauth-root/modules/oauth-server2-default/src/main/java/com/lc/ibps/cloud/oauth/server/provider/UserProvider.java

@@ -834,6 +834,10 @@ public class UserProvider extends BaseProvider implements IUserService {
 					}
 				}
 				PartyEmployeePo employee = getEmploye(user.getUserId());
+				//查ipcc表
+				String setting = partyPositionRepository.finSetting();
+				data.put("setting",setting); //全局配置信息
+
 				data.put("employee", employee);
 				
 				PartyOrgPo org = getOrg(employee);