ibizdev提交

config.xml

+<?xml version='1.1' encoding='UTF-8'?>
+<project>
+  <actions/>
+  <description>ibzuaa</description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>para1</name>
+          <description></description>
+          <defaultValue>para1</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>para2</name>
+          <description></description>
+          <defaultValue>para2</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>        
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+  </properties>
+  <scm class="hudson.scm.NullSCM"/>
+  <canRoam>true</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers/>
+  <concurrentBuild>false</concurrentBuild>
+  <builders>
+    <hudson.tasks.Shell>
+      <command>
+      BUILD_ID=DONTKILLME
+      echo "registry.cn-shanghai.aliyuncs.com/ibizsys"
+      source /etc/profile
+      rm -rf ibzuaa
+	  git clone -b master $para2 ibzuaa/
+      export NODE_OPTIONS=--max-old-space-size=4096
+      cd ibzuaa/
+      mvn clean package -Puaaapi
+      cd ibzuaa-provider/ibzuaa-provider-uaaapi
+      mvn -Puaaapi docker:build
+      mvn -Puaaapi docker:push
+      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzuaa-provider-uaaapi.yaml dev --with-registry-auth      
+      </command>
+    </hudson.tasks.Shell>
+  </builders>
+  <publishers>
+    <hudson.plugins.ws__cleanup.WsCleanup plugin="ws-cleanup@0.34">
+      <patterns class="empty-list"/>
+      <deleteDirs>false</deleteDirs>
+      <skipWhenFailed>false</skipWhenFailed>
+      <cleanWhenSuccess>true</cleanWhenSuccess>
+      <cleanWhenUnstable>true</cleanWhenUnstable>
+      <cleanWhenFailure>true</cleanWhenFailure>
+      <cleanWhenNotBuilt>true</cleanWhenNotBuilt>
+      <cleanWhenAborted>true</cleanWhenAborted>
+      <notFailBuild>false</notFailBuild>
+      <cleanupMatrixParent>false</cleanupMatrixParent>
+      <externalDelete></externalDelete>
+    </hudson.plugins.ws__cleanup.WsCleanup>
+  </publishers>
+  <buildWrappers/>
+</project>

ibzuaa-app/ibzuaa-app-web/pom.xml

@@ -97,7 +97,7 @@
                             </execution>
                         </executions>
                     </plugin>
-
+                    
                     <plugin>
                             <groupId>com.spotify</groupId>
                             <artifactId>docker-maven-plugin</artifactId>

ibzuaa-app/ibzuaa-app-web/src/main/java/cn/ibizlab/web/webApplication.java

@@ -11,6 +11,9 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
+import org.springframework.web.method.support.HandlerMethodArgumentResolver;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import java.util.List;
 
 @Slf4j
 @Import({
@@ -25,9 +28,15 @@ import org.springframework.boot.SpringApplication;
 @SpringBootApplication(exclude = {
         org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class,
 })
-public class webApplication{
+public class webApplication extends WebMvcConfigurerAdapter{
 
     public static void main(String[] args) {
         SpringApplication.run(webApplication.class,args);
     }
+
+    @Override
+    public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
+        super.addArgumentResolvers(argumentResolvers);
+        argumentResolvers.add(new cn.ibizlab.util.web.SearchContextHandlerMethodArgumentResolver());
+    }
 }

ibzuaa-boot/src/main/java/cn/ibizlab/DevBootApplication.java

@@ -7,6 +7,9 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.springframework.boot.SpringApplication;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.web.method.support.HandlerMethodArgumentResolver;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import java.util.List;
 
 @Slf4j
 @EnableDiscoveryClient
@@ -14,9 +17,15 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 @EnableTransactionManagement
 @SpringBootApplication
 @EnableFeignClients(basePackages = {"cn.ibizlab" })
-public class DevBootApplication{
+public class DevBootApplication extends WebMvcConfigurerAdapter{
 
     public static void main(String[] args) {
         SpringApplication.run(DevBootApplication.class,args);
     }
+
+    @Override
+    public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
+        super.addArgumentResolvers(argumentResolvers);
+        argumentResolvers.add(new cn.ibizlab.util.web.SearchContextHandlerMethodArgumentResolver());
+    }
 }

ibzuaa-boot/src/main/resources/application-dev.yml

 server:
-  port: 8080
\ No newline at end of file
+  port: 40002
\ No newline at end of file

ibzuaa-provider/ibzuaa-provider-uaaapi/pom.xml

@@ -66,6 +66,7 @@
                             </execution>
                         </executions>
                     </plugin>
+
                     <plugin>
                             <groupId>com.spotify</groupId>
                             <artifactId>docker-maven-plugin</artifactId>

ibzuaa-provider/ibzuaa-provider-uaaapi/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzuaa-provider-uaaapi.jar
 
-EXPOSE 8081
+EXPOSE 40002
 
 ADD ibzuaa-provider-uaaapi.jar /ibzuaa-provider-uaaapi.jar

ibzuaa-provider/ibzuaa-provider-uaaapi/src/main/docker/ibzuaa-provider-uaaapi.yaml

@@ -3,7 +3,7 @@ services:
   ibzuaa-provider-uaaapi:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-provider-uaaapi:latest
     ports:
-      - "8081:8081"
+      - "40002:40002"
     networks:
       - agent_network
     deploy:

ibzuaa-provider/ibzuaa-provider-uaaapi/src/main/java/cn/ibizlab/uaaapi/ibzuaauaaapiApplication.java

@@ -9,6 +9,9 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.data.mongodb.repository.config.EnableMongoRepositories;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.web.method.support.HandlerMethodArgumentResolver;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import java.util.List;
 
 @Slf4j
 @EnableDiscoveryClient
@@ -20,9 +23,15 @@ import org.mybatis.spring.annotation.MapperScan;
 @SpringBootApplication(exclude = {
         org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class,
 })
-public class ibzuaauaaapiApplication{
+public class ibzuaauaaapiApplication extends WebMvcConfigurerAdapter{
 
     public static void main(String[] args) {
         SpringApplication.run(ibzuaauaaapiApplication.class, args);
     }
+
+    @Override
+    public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
+        super.addArgumentResolvers(argumentResolvers);
+        argumentResolvers.add(new cn.ibizlab.util.web.SearchContextHandlerMethodArgumentResolver());
+    }
 }

ibzuaa-provider/ibzuaa-provider-uaaapi/src/main/resources/application-uaaapi-dev.yml

 server:
-  port: 8081
\ No newline at end of file
+  port: 40002
\ No newline at end of file

ibzuaa-provider/ibzuaa-provider-uaaapi/src/main/resources/application-uaaapi-prod.yml

 server:
-  port: 8081
+  port: 40002

ibzuaa-util/src/main/java/cn/ibizlab/util/filter/SearchContextBase.java

 package cn.ibizlab.util.filter;
 
+import cn.ibizlab.util.security.AuthenticationUser;
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -106,16 +107,11 @@ public class SearchContextBase implements ISearchContext{
     }
 
     /**
-	 * 用户上下文参数
-	 */
-	Map<String,Object> sessionparams = new HashMap<String,Object>() ;
-
-    /**
-    * 获取用户上下文
-    * @return
-    */
+     * 获取用户上下文
+     * @return
+     */
     public Map<String,Object> getSessioncontext() {
-    	return sessionparams;
+        return AuthenticationUser.getAuthenticationUser().getSessionParams();
     }
 
     @JsonAnyGetter

ibzuaa-util/src/main/java/cn/ibizlab/util/security/AuthenticationUser.java

@@ -55,7 +55,7 @@ public class AuthenticationUser implements UserDetails
 	private String fontsize;
 	private String lang;
 	private String memo;
-	private Map <String,String> sessionParams;
+	private Map <String,Object> sessionParams;
 	@JsonIgnore
 	private   Collection<GrantedAuthority> authorities;
     @JsonIgnore
@@ -65,7 +65,7 @@ public class AuthenticationUser implements UserDetails
     private String orglevel;//单位级别
     private String deptlevel;//部门级别
     @JsonIgnore
-    private Map<String,String> userSessionParam;//用户自定义session值
+    private Map<String,Object> userSessionParam;//用户自定义session值
     @JsonIgnore
     private JSONObject orgInfo;//上下级组织信息
 
@@ -115,7 +115,7 @@ public class AuthenticationUser implements UserDetails
 	 	return authuserdetail;
 	}
 
-    public Map <String,String> getSessionParams()
+    public Map <String,Object> getSessionParams()
     {
 		if(this.sessionParams==null)
 		{
@@ -139,7 +139,7 @@ public class AuthenticationUser implements UserDetails
 		}
 		return this.sessionParams;
     }
-    private Map<String, String> getUserSessionParam() {
+    private Map<String, Object> getUserSessionParam() {
 		if(userSessionParam!=null)
 			return userSessionParam;
 		else

ibzuaa-util/src/main/java/cn/ibizlab/util/web/SearchContextHandlerMethodArgumentResolver.java

+package cn.ibizlab.util.web;
+
+import cn.ibizlab.util.filter.SearchContextBase;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.MethodParameter;
+import org.springframework.web.bind.support.WebDataBinderFactory;
+import org.springframework.web.context.request.NativeWebRequest;
+import org.springframework.web.method.support.HandlerMethodArgumentResolver;
+import org.springframework.web.method.support.ModelAndViewContainer;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+@Slf4j
+public class SearchContextHandlerMethodArgumentResolver implements HandlerMethodArgumentResolver {
+
+    private static ObjectMapper objectMapper=new ObjectMapper();
+
+	@Override
+	public boolean supportsParameter(MethodParameter parameter) {
+		return SearchContextBase.class.isAssignableFrom(parameter.getParameterType());
+	}
+
+	@Override
+	public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer,
+								  NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception {
+		Map<String, String[]> params = webRequest.getParameterMap();
+		LinkedHashMap<String,Object> set=new LinkedHashMap<>();
+		for (String key : params.keySet()) {
+			set.put(key,params.get(key)[0]);
+		}
+		String json=objectMapper.writeValueAsString(set);
+		return objectMapper.readValue(json,parameter.getParameterType());
+	}
+
+
+
+}
\ No newline at end of file