ibizdev提交

README.md

-# 系统概览
+# 系统概览 iBiz4j Spring R7 dev

config.xml

@@ -38,6 +38,11 @@
 	  git clone -b master $para2 ibzou/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibzou/
+      mvn clean package -Papi
+      cd ibzou-provider/ibzou-provider-api
+      mvn -Papi docker:build
+      mvn -Papi docker:push
+      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzou-provider-api.yaml dev --with-registry-auth      
       </command>
     </hudson.tasks.Shell>
   </builders>

ibzou-app/ibzou-app-web/src/main/java/cn/ibizlab/web/config/webSecurityConfig.java

@@ -20,6 +20,7 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 import org.springframework.context.annotation.Profile;
+import org.springframework.beans.factory.annotation.Qualifier;
 
 @Profile("web-prod")
 @Configuration
@@ -30,6 +31,7 @@ public class webSecurityConfig extends WebSecurityConfigurerAdapter {
     private AuthenticationEntryPoint unauthorizedHandler;
 
     @Autowired
+    @Qualifier("IBZUAAUserService")
     private AuthenticationUserService userDetailsService;
 
     /**

ibzou-app/ibzou-app-web/src/main/resources/application-web-prod.yml

@@ -19,6 +19,6 @@ zuul:
     wfcore:
       path: /wfcore/**
       serviceId: ibzwf-api
-      stripPrefix: false
+      stripPrefix: true
   sensitive-headers:
     - Cookie,Set-Cookie,Authorization

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

 server:
-  port: 8080
+  port: 40001
 

ibzou-core/src/main/java/cn/ibizlab/core/ou/mapper/IBZDepartmentMapper.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import java.util.Map;
+import java.util.HashMap;
 import org.apache.ibatis.annotations.Select;
 import cn.ibizlab.core.ou.domain.IBZDepartment;
 import cn.ibizlab.core.ou.filter.IBZDepartmentSearchContext;

ibzou-core/src/main/java/cn/ibizlab/core/ou/mapper/IBZEmployeeMapper.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import java.util.Map;
+import java.util.HashMap;
 import org.apache.ibatis.annotations.Select;
 import cn.ibizlab.core.ou.domain.IBZEmployee;
 import cn.ibizlab.core.ou.filter.IBZEmployeeSearchContext;

ibzou-core/src/main/java/cn/ibizlab/core/ou/mapper/IBZOrganizationMapper.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import java.util.Map;
+import java.util.HashMap;
 import org.apache.ibatis.annotations.Select;
 import cn.ibizlab.core.ou.domain.IBZOrganization;
 import cn.ibizlab.core.ou.filter.IBZOrganizationSearchContext;

ibzou-core/src/main/java/cn/ibizlab/core/ou/service/impl/IBZDepartmentServiceImpl.java

@@ -5,6 +5,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 import java.util.HashSet;
+import java.util.HashMap;
 import java.util.Collection;
 import java.util.Objects;
 import java.util.Optional;

ibzou-core/src/main/java/cn/ibizlab/core/ou/service/impl/IBZEmployeeServiceImpl.java

@@ -5,6 +5,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 import java.util.HashSet;
+import java.util.HashMap;
 import java.util.Collection;
 import java.util.Objects;
 import java.util.Optional;

ibzou-core/src/main/java/cn/ibizlab/core/ou/service/impl/IBZOrganizationServiceImpl.java

@@ -5,6 +5,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 import java.util.HashSet;
+import java.util.HashMap;
 import java.util.Collection;
 import java.util.Objects;
 import java.util.Optional;

ibzou-provider/ibzou-provider-api/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 /ibzou-provider-api.jar
 
-EXPOSE 8081
+EXPOSE 40001
 
 ADD ibzou-provider-api.jar /ibzou-provider-api.jar

ibzou-provider/ibzou-provider-api/src/main/docker/ibzou-provider-api.yaml

@@ -3,9 +3,11 @@ services:
   ibzou-provider-api:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzou-provider-api:latest
     ports:
-      - "8081:8081"
+      - "40001:40001"
     networks:
       - agent_network
+    environment:
+      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.180.237
     deploy:
       mode: replicated
       replicas: 1

ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/config/apiSecurityConfig.java

@@ -20,6 +20,7 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 import org.springframework.context.annotation.Profile;
+import org.springframework.beans.factory.annotation.Qualifier;
 
 @Profile("api-prod")
 @Configuration
@@ -30,6 +31,7 @@ public class apiSecurityConfig extends WebSecurityConfigurerAdapter {
     private AuthenticationEntryPoint unauthorizedHandler;
 
     @Autowired
+    @Qualifier("IBZUAAUserService")
     private AuthenticationUserService userDetailsService;
 
     /**

ibzou-provider/ibzou-provider-api/src/main/resources/application-api-dev.yml

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

ibzou-provider/ibzou-provider-api/src/main/resources/application-api-prod.yml

 server:
-  port: 8081
+  port: 40001

ibzou-util/src/main/java/cn/ibizlab/util/client/IBZOUFallback.java

 package cn.ibizlab.util.client;
 
-import com.alibaba.fastjson.JSONObject;
 import org.springframework.stereotype.Component;
 
+import java.util.Map;
+import java.util.Set;
+
 @Component
 public class IBZOUFallback implements IBZOUFeignClient {
 
     @Override
-    public JSONObject getOrgInfo(String loginName) {
+    public Map<String, Set<String>> getOUMapsByUserId(String userId) {
         return null;
     }
 }

ibzou-util/src/main/java/cn/ibizlab/util/client/IBZOUFeignClient.java

 package cn.ibizlab.util.client;
 
-import com.alibaba.fastjson.JSONObject;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 
-@FeignClient(value = "ibzou",fallback = IBZOUFallback.class)
+import java.util.Map;
+import java.util.Set;
+
+@FeignClient(value = "ibzou-api",fallback = IBZOUFallback.class)
 public interface IBZOUFeignClient
 {
-
 	/**
 	 * 从ou中获取当前上下级组织、部门信息
-	 * @param loginName 登录名
+	 * @param userId
 	 * @return
 	 */
-	@GetMapping(value = "/ibzou/org/{loginname}")
-	JSONObject getOrgInfo(@PathVariable("loginname") String loginName);
+	@GetMapping("/ibzemployees/{userId}/oumaps")
+	Map<String, Set<String>> getOUMapsByUserId(@PathVariable("userId") String userId);
+
 }

ibzou-util/src/main/java/cn/ibizlab/util/client/IBZUAAFallback.java

 package cn.ibizlab.util.client;
 
-import com.alibaba.fastjson.JSONObject;
+import cn.ibizlab.util.security.AuthenticationUser;
+import cn.ibizlab.util.security.AuthorizationLogin;
 import org.springframework.stereotype.Component;
 import java.util.Map;
 
@@ -8,13 +9,17 @@ import java.util.Map;
 public class IBZUAAFallback implements IBZUAAFeignClient {
 
     @Override
-    public JSONObject getUserPermissionData(String loginName, String systemId) {
+    public Map<String, Object> pushSystemPermissionData(Map<String, Object> systemPermissionData, String systemId) {
         return null;
     }
 
     @Override
-    public Map<String, Object> pushSystemPermissionData(Map<String, Object> systemPermissionData, String systemId) {
+    public AuthenticationUser login(AuthorizationLogin authorizationLogin) {
         return null;
     }
 
+	@Override
+    public AuthenticationUser loginByUsername(String username) {
+        return null;
+    }
 }

ibzou-util/src/main/java/cn/ibizlab/util/client/IBZUAAFeignClient.java

 package cn.ibizlab.util.client;
 
-import com.alibaba.fastjson.JSONObject;
+import cn.ibizlab.util.security.AuthenticationUser;
+import cn.ibizlab.util.security.AuthorizationLogin;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 import java.util.Map;
 
-@FeignClient(value = "ibzuaa",fallback = IBZUAAFallback.class)
+@FeignClient(value = "ibzuaa-api",fallback = IBZUAAFallback.class)
 public interface IBZUAAFeignClient
 {
-
-	/**
-	 * 从uaa中获取当前用户权限
-	 * @param loginName
-	 * @param systemId
-	 * @return
-	 */
-	@GetMapping(value = "/uaa/permission/{loginname}")
-    JSONObject getUserPermissionData(@PathVariable("loginname") String loginName, @RequestParam("systemid") String systemId);
-
 	/**
 	 * 推送系统权限数据到uaa
 	 * @param systemPermissionData
@@ -27,4 +18,15 @@ public interface IBZUAAFeignClient
 	@PostMapping("/uaa/permission/save")
 	Map<String,Object> pushSystemPermissionData(@RequestBody Map<String, Object> systemPermissionData,  @RequestParam("systemid") String systemId);
 
+	/**
+	 * 用户登录
+	 * @param authorizationLogin 登录信息
+	 * @return
+	 */
+	@PostMapping(value = "/uaa/login")
+	AuthenticationUser login(@RequestBody AuthorizationLogin authorizationLogin);
+
+
+	@PostMapping(value = "/uaa/loginbyusername")
+	AuthenticationUser loginByUsername(@RequestBody String username);
 }

ibzou-util/src/main/java/cn/ibizlab/util/rest/AuthenticationController.java

@@ -14,6 +14,7 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.beans.factory.annotation.Qualifier;
 
 @RestController
 @RequestMapping("/")
@@ -27,12 +28,13 @@ public class AuthenticationController
     private AuthTokenUtil jwtTokenUtil;
 
     @Autowired
+    @Qualifier("IBZUAAUserService")
     private AuthenticationUserService userDetailsService;
 
     @PostMapping(value = "${ibiz.auth.path:v7/login}")
     public ResponseEntity<AuthenticationInfo> login(@Validated @RequestBody AuthorizationLogin authorizationLogin){
         userDetailsService.resetByUsername(authorizationLogin.getUsername());
-        final AuthenticationUser authuserdetail = userDetailsService.loadUserByLogin(authorizationLogin.getDomain(),authorizationLogin.getLoginname(),authorizationLogin.getPassword());
+        final AuthenticationUser authuserdetail = userDetailsService.loadUserByLogin(authorizationLogin.getUsername(),authorizationLogin.getPassword());
         // 生成令牌
         final String token = jwtTokenUtil.generateToken(authuserdetail);
         // 返回 token

ibzou-util/src/main/java/cn/ibizlab/util/security/AuthPermissionEvaluator.java

@@ -4,8 +4,6 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.mongodb.BasicDBList;
-import com.mongodb.BasicDBObject;
 import com.mongodb.QueryBuilder;
 import cn.ibizlab.util.annotation.DEField;
 import cn.ibizlab.util.domain.EntityBase;
@@ -13,9 +11,7 @@ import cn.ibizlab.util.enums.DEPredefinedFieldType;
 import cn.ibizlab.util.filter.QueryBuildContext;
 import cn.ibizlab.util.filter.QueryWrapperContext;
 import cn.ibizlab.util.helper.DEFieldCacheMap;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.domain.PageImpl;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.BasicQuery;
 import org.springframework.data.mongodb.core.query.Query;
@@ -25,13 +21,9 @@ import org.springframework.stereotype.Component;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 import javax.annotation.Resource;
-import javax.swing.text.html.parser.Entity;
 import java.io.Serializable;
 import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * spring security 权限管理类
@@ -126,7 +118,7 @@ public class AuthPermissionEvaluator implements PermissionEvaluator {
             //拼接权限条件
             deDataSetFillPermissionSQLRouter(deStorageMode, searchContext, entity , dataSetName , permissionList);
         }
-            return true;
+                return true;
     }
 
 
@@ -440,13 +432,11 @@ public class AuthPermissionEvaluator implements PermissionEvaluator {
         String orgDeptField=permissionField.get("orgsecfield");
         String createManField=permissionField.get("createmanfield");
         AuthenticationUser authenticationUser = AuthenticationUser.getAuthenticationUser();
-        JSONObject userInfo = authenticationUser.getOrgInfo();
-        JSONObject orgObject = userInfo.getJSONObject("org");
-        JSONArray orgParent = orgObject.getJSONArray("porg");
-        JSONArray orgChild = orgObject.getJSONArray("sorg");
-        JSONObject orgDeptObject = userInfo.getJSONObject("orgdept");
-        JSONArray orgDeptParent = orgDeptObject.getJSONArray("porgdept");
-        JSONArray orgDeptChild = orgDeptObject.getJSONArray("sorgdept");
+        Map<String, Set<String>> userInfo = authenticationUser.getOrgInfo();
+        Set<String> orgParent = userInfo.get("parentorg");
+        Set<String> orgChild = userInfo.get("suborg");
+        Set<String> orgDeptParent = userInfo.get("parentdept");
+        Set<String> orgDeptChild = userInfo.get("subdept");
 
         for(int i=0;i<oppriList.size();i++){
             String permissionCond=oppriList.getString(i);//权限配置条件
@@ -492,13 +482,11 @@ public class AuthPermissionEvaluator implements PermissionEvaluator {
         String createManField=permissionField.get("createmanfield");
         StringBuffer permissionSQL=new StringBuffer();
         AuthenticationUser authenticationUser = AuthenticationUser.getAuthenticationUser();
-        JSONObject userInfo = authenticationUser.getOrgInfo();
-        JSONObject orgObject = userInfo.getJSONObject("org");
-        JSONArray orgParent = orgObject.getJSONArray("porg");
-        JSONArray orgChild = orgObject.getJSONArray("sorg");
-        JSONObject orgDeptObject = userInfo.getJSONObject("orgdept");
-        JSONArray orgDeptParent = orgDeptObject.getJSONArray("porgdept");
-        JSONArray orgDeptChild = orgDeptObject.getJSONArray("sorgdept");
+        Map<String, Set<String>> userInfo = authenticationUser.getOrgInfo();
+        Set<String> orgParent = userInfo.get("parentorg");
+        Set<String> orgChild = userInfo.get("suborg");
+        Set<String> orgDeptParent = userInfo.get("parentdept");
+        Set<String> orgDeptChild = userInfo.get("subdept");
 
         for(int i=0;i<oppriList.size();i++){
             permissionSQL.append("OR");
@@ -607,7 +595,7 @@ public class AuthPermissionEvaluator implements PermissionEvaluator {
      * 转换[a,b]格式字符串到 'a','b'格式
      * @return
      */
-    private String formatStringArr(JSONArray array) {
+    private String formatStringArr(Set<String> array) {
 
         String[] arr = array.toArray(new String[array.size()]);
         return "'" + String.join("','", arr) + "'";

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

@@ -12,6 +12,7 @@ import java.util.Map;
 import java.util.HashMap;
 import java.sql.Timestamp;
 import java.util.Collection;
+import java.util.Set;
 import com.alibaba.fastjson.JSONObject;
 
 @Data
@@ -60,14 +61,12 @@ public class AuthenticationUser implements UserDetails
 	private   Collection<GrantedAuthority> authorities;
     @JsonIgnore
     private int superuser;
-    @JsonIgnore
     private JSONObject permisionList;
     private String orglevel;//单位级别
     private String deptlevel;//部门级别
     @JsonIgnore
     private Map<String,Object> userSessionParam;//用户自定义session值
-    @JsonIgnore
-    private JSONObject orgInfo;//上下级组织信息
+    private Map<String, Set<String>> orgInfo;//上下级组织信息
 
 
 	@JsonIgnore

ibzou-util/src/main/java/cn/ibizlab/util/security/AuthorizationTokenFilter.java

@@ -11,6 +11,7 @@ import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
 import org.springframework.stereotype.Component;
 import org.springframework.web.filter.OncePerRequestFilter;
+import org.springframework.beans.factory.annotation.Qualifier;
 
 import javax.servlet.FilterChain;
 import javax.servlet.ServletException;
@@ -26,7 +27,7 @@ public class AuthorizationTokenFilter extends OncePerRequestFilter {
     private final AuthTokenUtil authTokenUtil;
     private final String tokenHeader;
 
-    public AuthorizationTokenFilter(AuthenticationUserService userDetailsService, AuthTokenUtil authTokenUtil, @Value("${ibiz.jwt.header:Authorization}") String tokenHeader) {
+    public AuthorizationTokenFilter(@Qualifier("IBZUAAUserService") AuthenticationUserService userDetailsService, AuthTokenUtil authTokenUtil, @Value("${ibiz.jwt.header:Authorization}") String tokenHeader) {
         this.userDetailsService = userDetailsService;
         this.authTokenUtil = authTokenUtil;
         this.tokenHeader = tokenHeader;

ibzou-util/src/main/java/cn/ibizlab/util/service/AuthenticationUserService.java

@@ -13,16 +13,14 @@ import org.springframework.stereotype.Service;
 
 public interface AuthenticationUserService extends UserDetailsService {
 
+
     @Override
-    @Cacheable( value="ibzdict_users",key = "'getByUsername:'+#p0")
+    @Cacheable( value="ibzuaa_users",key = "'getByUsername:'+#p0")
     AuthenticationUser loadUserByUsername(String username);
 
-    @Cacheable( value="ibzdict_users",key = "'getByUsername:'+#p0")
+    @Cacheable( value="ibzuaa_users",key = "'getByUsername:'+#p0")
     AuthenticationUser loadUserByLogin(String username,String password);
 
-    @Cacheable( value="ibzdict_users",key = "'getByUsername:'+#p1")
-    AuthenticationUser loadUserByLogin(String domain,String username,String password);
-
-    @CacheEvict( value="ibzdict_users",key = "'getByUsername:'+#p0")
+    @CacheEvict( value="ibzuaa_users",key = "'getByUsername:'+#p0")
     void resetByUsername(String username);
 }

ibzou-util/src/main/java/cn/ibizlab/util/service/IBZUAAUserService.java

+package cn.ibizlab.util.service;
+
+import com.alibaba.fastjson.JSONObject;
+import cn.ibizlab.util.client.IBZOUFeignClient;
+import cn.ibizlab.util.errors.BadRequestAlertException;
+import cn.ibizlab.util.client.IBZUAAFeignClient;
+import cn.ibizlab.util.security.AuthenticationUser;
+import cn.ibizlab.util.security.AuthorizationLogin;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Primary;
+import org.springframework.stereotype.Service;
+import org.springframework.util.DigestUtils;
+import org.springframework.util.StringUtils;
+
+/**
+ * 实体[IBZUSER] 服务对象接口实现
+ */
+@Service("IBZUAAUserService")
+public class IBZUAAUserService implements AuthenticationUserService{
+
+	@Autowired
+	private IBZUAAFeignClient uaaFeignClient;
+
+	@Override
+	public AuthenticationUser loadUserByUsername(String username) {
+
+		AuthenticationUser user=uaaFeignClient.loginByUsername(username);
+		if(user==null)
+			throw new BadRequestAlertException("登录失败","IBZUAAUser",username);
+		return user;
+	}
+
+	@Override
+	public AuthenticationUser loadUserByLogin(String username, String password) {
+		String[] data=username.split("[|]");
+		String loginname=username;
+		String domains="";
+
+		if(data.length==2) {
+			loginname=data[0].trim();
+			domains=data[1].trim();
+		}
+		AuthorizationLogin logininfo = new AuthorizationLogin();
+		logininfo.setDomain(domains);
+		logininfo.setLoginname(loginname);
+		logininfo.setPassword(password);
+		AuthenticationUser user=uaaFeignClient.login(logininfo);
+		if(user==null)
+			throw new BadRequestAlertException("登录失败","IBZUAAUser",username);
+		return user;
+	}
+
+
+	@Override
+	public void resetByUsername(String username) {
+
+	}
+
+}

ibzou-util/src/main/java/cn/ibizlab/util/service/IBZUSERServiceImpl.java

@@ -62,12 +62,6 @@ public class IBZUSERServiceImpl extends ServiceImpl<IBZUSERMapper, IBZUSER> impl
 		return authuserdetail;
 	}
 
-	@Override
-	public AuthenticationUser loadUserByLogin(String domain, String username, String password) {
-		if(!StringUtils.isEmpty(domain))
-			username = username+"|"+domain;
-		return loadUserByLogin(username,password);
-	}
 
 	public void resetByUsername(String username) {
 

ibzou-util/src/main/java/cn/ibizlab/util/service/SimpleUserService.java

@@ -19,18 +19,6 @@ import org.springframework.beans.factory.annotation.Value;
 @Service("SimpleUserService")
 public class SimpleUserService implements AuthenticationUserService{
 
-	@Value("${ibiz.enablePermissionValid:false}")
-	boolean enablePermissionValid;  //是否开启权限校验
-
-    @Value("${ibiz.systemid:2C40DFCD-0DF5-47BF-91A5-C45F810B0001}")
-    private String systemid;
-
-	@Autowired
-	private IBZUAAFeignClient uaaFeignClient;
-
-	@Autowired
-	private IBZOUFeignClient ouFeignClient;
-
 	@Override
 	public AuthenticationUser loadUserByUsername(String username) {
 		AuthenticationUser user = new AuthenticationUser();
@@ -39,17 +27,12 @@ public class SimpleUserService implements AuthenticationUserService{
 		String domains="";
 		String password="";
 
-		if(data.length==3) {
+		if(data.length==2) {
 			loginname=data[0].trim();
 			domains=data[1].trim();
-			password=data[2].trim();
-		}
-		else if(data.length==2) {
-			loginname=data[0].trim();
-			password=data[1].trim();
 		}
 
-		user.setUserid(DigestUtils.md5DigestAsHex(username.getBytes()));
+		user.setUserid(username);
 		user.setUsercode(loginname);
 		user.setUsername(username);
 		user.setLoginname(loginname);
@@ -60,55 +43,20 @@ public class SimpleUserService implements AuthenticationUserService{
 		user.setOrgcode(domains);
 		user.setOrgname(domains);
 
-		setUserPermission(user);
-		setUserOrgInfo(user);
-
 		return user;
 	}
 
 	@Override
 	public AuthenticationUser loadUserByLogin(String username, String password) {
-		password = DigestUtils.md5DigestAsHex(String.format("%1$s||%2$s", username, password).getBytes());
-		AuthenticationUser authuserdetail = loadUserByUsername(username+"|"+password);
+		AuthenticationUser authuserdetail = loadUserByUsername(username);
 		return authuserdetail;
 	}
 
-	@Override
-	public AuthenticationUser loadUserByLogin(String domain, String username, String password) {
-		if(!StringUtils.isEmpty(domain))
-			username = username+"|"+domain;
-		return loadUserByLogin(username,password);
-	}
+
 
 	@Override
 	public void resetByUsername(String username) {
 
 	}
 
-	/**
-	 * 设置用户权限
-	 */
-	private void setUserPermission(AuthenticationUser user) {
-		if(enablePermissionValid){
-			JSONObject permission= uaaFeignClient.getUserPermissionData(user.getLoginname(),systemid);
-			user.setPermisionList(permission);
-		}
-	}
-
-	/**
-	 * 设置用户组织相关信息
-	 * @param user
-	 */
-	private void setUserOrgInfo(AuthenticationUser user) {
-		if(enablePermissionValid) {
-			JSONObject orgInfo=ouFeignClient.getOrgInfo(user.getLoginname());
-			if(orgInfo==null)
-				throw new RuntimeException("获取用户信息失败，请检查用户中心[IBZOU]中是否存在当前用户!");
-			JSONObject curUser=orgInfo.getJSONObject("curuser");
-			user.setOrgInfo(orgInfo);
-			user.setMdeptid(curUser.getString("orgdept"));
-			user.setOrgid(curUser.getString("org"));
-		}
-	}
-
 }