缴费库 代码修改

yifu-common/yifu-common-ldap/src/main/java/com/yifu/cloud/plus/v1/yifu/common/ldap/config/LdapProperties.java

+package com.yifu.cloud.plus.v1.yifu.common.ldap.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.stereotype.Component;
+
+@Data
+@Component
+@PropertySource("classpath:ldapConfig.properties")
+@ConfigurationProperties(value = "ldap", ignoreInvalidFields = false)
+public class LdapProperties {
+
+	String url;
+
+	String dn;
+
+	String password;
+
+	Integer port;
+
+	String userName;
+
+	String baseDn;
+}

yifu-common/yifu-common-ldap/src/main/java/com/yifu/cloud/plus/v1/yifu/common/ldap/entity/PersonVo.java

@@ -56,13 +56,13 @@ public class PersonVo {
 	private String homeDirectory;
 
 	/**
-	 * 主键
+	 * 部门名称
 	 */
 	@Attribute(name = "ou")
 	private String deptName;
 
 	/**
-	 * 主键
+	 * 用户密码
 	 */
 	@Attribute(name = "userPassword")
 	private String password;

yifu-common/yifu-common-ldap/src/main/java/com/yifu/cloud/plus/v1/yifu/common/ldap/util/LdapCheck.java

-package com.yifu.cloud.plus.v1.yifu.common.ldap.util;
-
-import javax.naming.AuthenticationException;
-import javax.naming.Context;
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-import javax.naming.directory.SearchControls;
-import javax.naming.directory.SearchResult;
-import javax.naming.ldap.Control;
-import javax.naming.ldap.InitialLdapContext;
-import javax.naming.ldap.LdapContext;
-import java.util.Hashtable;
-
-/**
- * 用户登陆认证,LDAP跨域认证，通过LDAP对用户进行更新
- *
- */
-public class LdapCheck {
-	private static LdapContext ctx = null;
-	private static Control[] connCtls = null;
-
-	/**** 定义LDAP的基本连接信息 ******/
-	// LDAP的连接地址（ldap://ip:port/）port默认为389
-	private static String URL = "192.168.1.65";
-	//port
-	private static String port = "389";
-	// LDAP的根DN
-	private static String BASEDN = "dc=worfu,dc=com";
-	// LDAP的连接账号（身份认证管理平台添加的应用账号，应用账号格式：uid=?,ou=?,dc=????）
-	private static String PRINCIPAL = "cn=admin,dc=worfu,dc=com";
-	// LDAP的连接账号的密码（身份认证管理平台添加的应用账号的密码）
-	private static String PASSWORD = "yifu123456!";
-
-	// 校验用户名密码的方法
-	public static boolean authenticate(String usr, String pwd) {
-		boolean valide = false;
-		if (pwd == null || pwd == "")
-			return false;
-		if (ctx == null) {
-			getCtx();
-		}
-		String userDN = getUserDN(usr);
-		if ("".equals(userDN) || userDN == null) {
-			return false;
-		}
-		try {
-			ctx.addToEnvironment(Context.SECURITY_PRINCIPAL, userDN);
-			ctx.addToEnvironment(Context.SECURITY_CREDENTIALS, pwd);
-			ctx.reconnect(connCtls);
-			valide = true;
-			closeCtx();
-		} catch (AuthenticationException e) {
-			System.out.println(userDN + " is not authenticated");
-			System.out.println(e.toString());
-			valide = false;
-		} catch (NamingException e) {
-			System.out.println(userDN + " is not authenticated");
-			valide = false;
-		}
-		return valide;
-	}
-
-	public static void getCtx() {
-		if (ctx != null) {
-			return;
-		}
-		Hashtable<String, String> env = new Hashtable<String, String>();
-		env.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory");
-		env.put(Context.PROVIDER_URL, URL + ":" + port + BASEDN);
-		env.put(Context.SECURITY_AUTHENTICATION, "simple");
-		env.put(Context.SECURITY_PRINCIPAL, PRINCIPAL);
-		env.put(Context.SECURITY_CREDENTIALS, PASSWORD);
-		try {
-			// 链接ldap
-			ctx = new InitialLdapContext(env, connCtls);
-		} catch (AuthenticationException e) {
-			System.out.println("Authentication faild: " + e.toString());
-		} catch (Exception e) {
-			System.out.println("Something wrong while authenticating: " + e.toString());
-		}
-	}
-
-	public static void closeCtx() {
-		try {
-			if (ctx != null)
-				ctx.close();
-		} catch (NamingException ex) {
-
-		}
-	}
-
-	public static String getUserDN(String uid) {
-		String userDN = "";
-		try {
-			SearchControls constraints = new SearchControls();
-			constraints.setSearchScope(SearchControls.SUBTREE_SCOPE);
-			NamingEnumeration<?> en = ctx.search("", "uid=" + uid, constraints);
-			if (en == null) {
-				System.out.println("Have no NamingEnumeration.");
-			}
-			if (!en.hasMoreElements()) {
-				System.out.println("Have no element.");
-			}
-			while (en != null && en.hasMoreElements()) {
-				Object obj = en.nextElement();
-				if (obj instanceof SearchResult) {
-					SearchResult si = (SearchResult) obj;
-					userDN += si.getName();
-					userDN += "," + BASEDN;
-				} else {
-					System.out.println(obj);
-				}
-				System.out.println();
-			}
-		} catch (Exception e) {
-			System.out.println("Exception in search():" + e);
-		}
-
-		return userDN;
-	}
-}
\ No newline at end of file

yifu-common/yifu-common-ldap/src/main/java/com/yifu/cloud/plus/v1/yifu/common/ldap/util/LdapUtil.java

@@ -2,10 +2,12 @@ package com.yifu.cloud.plus.v1.yifu.common.ldap.util;
 
 import com.unboundid.ldap.sdk.*;
 import com.unboundid.ldap.sdk.controls.SubentriesRequestControl;
+import com.yifu.cloud.plus.v1.yifu.common.ldap.config.LdapProperties;
 import com.yifu.cloud.plus.v1.yifu.common.ldap.entity.PersonVo;
 import com.yifu.cloud.plus.v1.yifu.common.ldap.mapper.PersonAttributesMapper;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.ldap.core.LdapTemplate;
 
 import javax.naming.AuthenticationException;
@@ -23,26 +25,19 @@ import java.util.List;
 import static org.springframework.ldap.query.LdapQueryBuilder.query;
 
 @Log4j2
+@EnableConfigurationProperties(LdapProperties.class)
 public class LdapUtil {
 
 	@Autowired
 	private LdapTemplate ldapTemplate;
 
+	@Autowired
+	private LdapProperties ldapProperties;
+
 	private static LdapContext ctx = null;
 
 	private static Control[] connCtls = null;
 
-	/**** 定义LDAP的基本连接信息 ******/
-	// LDAP的连接地址（ldap://ip:port/）port默认为389
-	private static String URL = "ldap://192.168.1.65:389/";
-	// LDAP的根DN
-	private static String BASEDN = "dc=worfu,dc=com";
-	// LDAP的连接账号（身份认证管理平台添加的应用账号，应用账号格式：uid=?,ou=?,dc=????）
-	private static String PRINCIPAL = "cn=admin,dc=worfu,dc=com";
-	// LDAP的连接账号的密码（身份认证管理平台添加的应用账号的密码）
-	private static String PASSWORD = "yifu123456!";
-
-
 	/**
 	 * @return List<SearchResultEntry>
 	 * @author huyc
@@ -52,8 +47,9 @@ public class LdapUtil {
 	public List<SearchResultEntry> getAllPersonNamesWithTraditionalWay() {
 		List<SearchResultEntry> result = new ArrayList<SearchResultEntry>();
 		try {
-			LDAPConnection connection = new LDAPConnection("192.168.1.65", 389, "cn=admin,dc=worfu,dc=com", "yifu123456!");
-			SearchRequest searchRequest = new SearchRequest("ou=安徽皖信人力资源管理有限公司,ou=wanxin,dc=worfu,dc=com", SearchScope.SUB, "(objectclass=*)");
+			LDAPConnection connection = new LDAPConnection(ldapProperties.getUrl(), ldapProperties.getPort(),
+					ldapProperties.getUserName(), ldapProperties.getPassword());
+			SearchRequest searchRequest = new SearchRequest(ldapProperties.getBaseDn(), SearchScope.SUB, "(objectclass=*)");
 			searchRequest.addControl(new SubentriesRequestControl());
 			SearchResult searchResult = connection.search(searchRequest);
 			for (SearchResultEntry entry : searchResult.getSearchEntries()) {
@@ -99,16 +95,17 @@ public class LdapUtil {
 		return valide;
 	}
 
-	public static void getCtx() {
+	public void getCtx() {
 		if (ctx != null) {
 			return;
 		}
 		Hashtable<String, String> env = new Hashtable<String, String>();
 		env.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory");
-		env.put(Context.PROVIDER_URL, URL + BASEDN);
+		env.put(Context.PROVIDER_URL, "ldap://" + ldapProperties.getUrl() + ":" + ldapProperties.getPort() +
+				"/" + ldapProperties.getDn());
 		env.put(Context.SECURITY_AUTHENTICATION, "simple");
-		env.put(Context.SECURITY_PRINCIPAL, PRINCIPAL);
-		env.put(Context.SECURITY_CREDENTIALS, PASSWORD);
+		env.put(Context.SECURITY_PRINCIPAL, ldapProperties.getUserName());
+		env.put(Context.SECURITY_CREDENTIALS, ldapProperties.getPassword());
 		try {
 			// 链接ldap
 			ctx = new InitialLdapContext(env, connCtls);
@@ -117,12 +114,12 @@ public class LdapUtil {
 		}
 	}
 
-	public static void closeCtx() throws NamingException {
+	public void closeCtx() throws NamingException {
 		if (ctx != null)
 			ctx.close();
 	}
 
-	public static String getUserDN(String uid) {
+	public String getUserDN(String uid) {
 		String userDN = "";
 		try {
 			SearchControls constraints = new SearchControls();
@@ -133,7 +130,7 @@ public class LdapUtil {
 				if (obj instanceof javax.naming.directory.SearchResult) {
 					javax.naming.directory.SearchResult si = (javax.naming.directory.SearchResult) obj;
 					userDN += si.getName();
-					userDN += "," + BASEDN;
+					userDN += "," + ldapProperties.getDn();
 				}
 			}
 		} catch (Exception e) {

yifu-common/yifu-common-ldap/src/main/resources/META-INF/spring.factories

 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-  com.yifu.cloud.plus.v1.yifu.common.ldap.config.LdapAutoConfigue\
+  com.yifu.cloud.plus.v1.yifu.common.ldap.util.LdapUtil\

yifu-common/yifu-common-ldap/src/main/resources/ldapConfig.properties

+ldap.url=192.168.1.65
+ldap.port=389
+ldap.userName=cn=admin,dc=worfu,dc=com
+ldap.password=yifu123456!
+ldap.dn=dc=worfu,dc=com
+ldap.baseDn=ou=\u5B89\u5FBD\u7696\u4FE1\u4EBA\u529B\u8D44\u6E90\u7BA1\u7406\u6709\u9650\u516C\u53F8,ou=wanxin,dc=worfu,dc=com
\ No newline at end of file

yifu-upms/yifu-upms-biz/src/main/java/com/yifu.cloud.plus.v1/yifu/admin/service/impl/SysDeptServiceImpl.java

@@ -26,13 +26,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.unboundid.ldap.sdk.SearchResultEntry;
 import com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysDept;
 import com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysDeptRelation;
-import com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysUser;
 import com.yifu.cloud.plus.v1.yifu.admin.mapper.SysDeptMapper;
 import com.yifu.cloud.plus.v1.yifu.admin.mapper.SysUserMapper;
 import com.yifu.cloud.plus.v1.yifu.admin.service.SysDeptRelationService;
 import com.yifu.cloud.plus.v1.yifu.admin.service.SysDeptService;
-import com.yifu.cloud.plus.v1.yifu.admin.service.SysUserService;
-import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.common.ldap.util.LdapUtil;
 import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
@@ -44,7 +42,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * <p>
@@ -214,6 +211,9 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
 					SysDept insertSysDept = new SysDept();
 					insertSysDept.setName(deptName);
 					insertSysDept.setParentId(0L);
+					if (Common.isNotNull(entry.getAttributeValue("x-ouid"))) {
+						insertSysDept.setDeptId(Long.valueOf(entry.getAttributeValue("x-ouid")));
+					}
 					insertSysDept.setDeptDn(dn);
 					this.save(insertSysDept);
 				} else {
@@ -231,6 +231,9 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
 								insertSysDept.setName(deptName);
 								insertSysDept.setParentId(sysDept.getDeptId());
 								insertSysDept.setDeptDn(dn);
+								if (Common.isNotNull(entry.getAttributeValue("x-ouid"))) {
+									insertSysDept.setDeptId(Long.valueOf(entry.getAttributeValue("x-ouid")));
+								}
 								this.save(insertSysDept);
 							}
 						} else {

yifu-upms/yifu-upms-biz/src/main/java/com/yifu.cloud.plus.v1/yifu/admin/service/impl/SysUserServiceImpl.java

@@ -424,7 +424,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 			if (null != list) {
 				List<SysUser> listUser = this.list(Wrappers.<SysUser>query().lambda().eq(SysUser::getDelFlag, CommonConstants.STATUS_NORMAL));
 				List<String> list1 = listUser.stream().map(SysUser::getUsername).collect(Collectors.toList());
-				Map<String, String> map = listUser.stream().collect(HashMap::new, (m, v) -> m.put(v.getUsername(), v.getUserId()), HashMap::putAll);
 				List<PersonVo> updateList = new ArrayList<>();
 				List<PersonVo> insertList = new ArrayList<>();
 				for (PersonVo personVo : list) {
@@ -469,6 +468,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 						insertSysDept.setName(deptName);
 						insertSysDept.setParentId(0L);
 						insertSysDept.setDeptDn(dn);
+						if (Common.isNotNull(entry.getAttributeValue("x-ouid"))) {
+							insertSysDept.setDeptId(Long.valueOf(entry.getAttributeValue("x-ouid")));
+						}
 						sysDeptMapper.insert(insertSysDept);
 					} else {
 						sysDept.setName(deptName);
@@ -484,6 +486,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 								insertSysDept.setName(deptName);
 								insertSysDept.setParentId(sysDept.getDeptId());
 								insertSysDept.setDeptDn(dn);
+								if (Common.isNotNull(entry.getAttributeValue("x-ouid"))) {
+									insertSysDept.setDeptId(Long.valueOf(entry.getAttributeValue("x-ouid")));
+								}
 								sysDeptMapper.insert(insertSysDept);
 							}
 						} else {

yifu-upms/yifu-upms-biz/src/main/resources/mapper/SysUserMapper.xml

@@ -210,7 +210,7 @@
 
 	<insert id="batchInsertUser" parameterType="java.util.List">
 	insert into sys_user
-	(user_id,username,phone,email,password,nickname,create_time)
+	(user_id,username,phone,email,password,nickname,deptId,create_time)
 	VALUES
 	<foreach collection="list" item="item" index="index" separator=",">
 	(
@@ -220,6 +220,7 @@
 		#{item.email,jdbcType=VARCHAR},
 		#{item.password,jdbcType=VARCHAR},
 		#{item.personName,jdbcType=VARCHAR},
+		#{item.deptId,jdbcType=VARCHAR},
 		now()
 	)
 	</foreach>
@@ -256,6 +257,13 @@
 					</if>
 				</foreach>
 			</trim>
+			<trim prefix="deptId =case" suffix="end," >
+				<foreach collection="list" item="i" index="index">
+					<if test="i.deptId!=null">
+						when username=#{i.uid} then #{i.deptId}
+					</if>
+				</foreach>
+			</trim>
 			<trim prefix="update_time =case" suffix="end,">
 				<foreach collection="list" item="i" index="index">
 					when username=#{i.uid} then now()