更新钉钉,政务钉钉,企业微信初始化密码转义的bug

o2server/x_program_center/src/main/java/com/x/program/center/dingding/SyncOrganization.java

@@ -17,12 +17,14 @@ import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
-import javax.script.ScriptEngine;
-import javax.script.ScriptEngineManager;
+import javax.script.Bindings;
+import javax.script.ScriptContext;
+import javax.script.SimpleScriptContext;
 
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.collections4.ListUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.text.StringEscapeUtils;
 
 import com.x.base.core.container.EntityManagerContainer;
 import com.x.base.core.entity.annotation.CheckPersistType;
@@ -34,6 +36,7 @@ import com.x.base.core.project.gson.GsonPropertyObject;
 import com.x.base.core.project.gson.XGsonBuilder;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
+import com.x.base.core.project.script.ScriptFactory;
 import com.x.base.core.project.tools.ListTools;
 import com.x.organization.core.entity.Identity;
 import com.x.organization.core.entity.Identity_;
@@ -51,10 +54,6 @@ public class SyncOrganization {
 
 	private static Logger logger = LoggerFactory.getLogger(SyncOrganization.class);
 
-	private ScriptEngineManager scriptEngineManager = new ScriptEngineManager();
-	private ScriptEngine engine = scriptEngineManager.getEngineByName(Config.SCRIPTING_ENGINE_NAME);
-	private Pattern pattern = Pattern.compile(com.x.base.core.project.config.Person.REGULAREXPRESSION_SCRIPT);
-
 	public PullResult execute(Business business) throws Exception {
 		logger.print("钉钉进行人员同步.");
 		PullResult result = new PullResult();
@@ -274,7 +273,7 @@ public class SyncOrganization {
 			person.setOfficePhone(user.getMobile());
 			person.setGenderType(GenderType.d);
 			/* 新增人员需要增加密码 */
-			business.person().setPassword(person, this.getPassword(engine, pattern, person));
+			business.person().setPassword(person, this.initPassword(business, person));
 			emc.persist(person, CheckPersistType.all);
 			result.getCreatePersonList().add(person.getDistinguishedName());
 		}
@@ -282,14 +281,17 @@ public class SyncOrganization {
 		return person;
 	}
 
-	private String getPassword(ScriptEngine engine, Pattern pattern, Person person) throws Exception {
+	private String initPassword(Business business, Person person) throws Exception {
 		String str = Config.person().getPassword();
+		Pattern pattern = Pattern.compile(com.x.base.core.project.config.Person.REGULAREXPRESSION_SCRIPT);
 		Matcher matcher = pattern.matcher(str);
 		if (matcher.matches()) {
-			String eval = matcher.group(1);
-			engine.put("person", person);
-			String pass = engine.eval(eval).toString();
-			return pass;
+			String eval = ScriptFactory.functionalization(StringEscapeUtils.unescapeJson(matcher.group(1)));
+			ScriptContext scriptContext = new SimpleScriptContext();
+			Bindings bindings = scriptContext.getBindings(ScriptContext.ENGINE_SCOPE);
+			bindings.put("person", person);
+			Object o = ScriptFactory.scriptEngine.eval(eval, scriptContext);
+			return o.toString();
 		} else {
 			return str;
 		}

o2server/x_program_center/src/main/java/com/x/program/center/qiyeweixin/SyncOrganization.java

@@ -14,12 +14,14 @@ import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
-import javax.script.ScriptEngine;
-import javax.script.ScriptEngineManager;
+import javax.script.Bindings;
+import javax.script.ScriptContext;
+import javax.script.SimpleScriptContext;
 
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.collections4.ListUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.text.StringEscapeUtils;
 
 import com.x.base.core.container.EntityManagerContainer;
 import com.x.base.core.entity.annotation.CheckPersistType;
@@ -31,6 +33,7 @@ import com.x.base.core.project.gson.GsonPropertyObject;
 import com.x.base.core.project.gson.XGsonBuilder;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
+import com.x.base.core.project.script.ScriptFactory;
 import com.x.base.core.project.tools.ListTools;
 import com.x.organization.core.entity.Identity;
 import com.x.organization.core.entity.Identity_;
@@ -49,10 +52,6 @@ public class SyncOrganization {
 
 	private static Logger logger = LoggerFactory.getLogger(SyncOrganization.class);
 
-	private ScriptEngineManager scriptEngineManager = new ScriptEngineManager();
-	private ScriptEngine engine = scriptEngineManager.getEngineByName(Config.SCRIPTING_ENGINE_NAME);
-	private Pattern pattern = Pattern.compile(com.x.base.core.project.config.Person.REGULAREXPRESSION_SCRIPT);
-
 	public PullResult execute(Business business) throws Exception {
 		logger.print("开始与企业微信同步人员,方向:拉入.");
 		PullResult result = new PullResult();
@@ -271,7 +270,7 @@ public class SyncOrganization {
 			person.setOfficePhone(user.getTelephone());
 			person.setGenderType(Objects.equals("1", user.getGender()) ? GenderType.m : GenderType.f);
 			/* 新增人员需要增加密码 */
-			business.person().setPassword(person, this.getPassword(engine, pattern, person));
+			business.person().setPassword(person, this.initPassword(business, person));
 			emc.persist(person, CheckPersistType.all);
 			result.getCreatePersonList().add(person.getDistinguishedName());
 		}
@@ -279,14 +278,30 @@ public class SyncOrganization {
 		return person;
 	}
 
-	private String getPassword(ScriptEngine engine, Pattern pattern, Person person) throws Exception {
+//	private String getPassword(ScriptEngine engine, Pattern pattern, Person person) throws Exception {
+//		String str = Config.person().getPassword();
+//		Matcher matcher = pattern.matcher(str);
+//		if (matcher.matches()) {
+//			String eval = matcher.group(1);
+//			engine.put("person", person);
+//			String pass = engine.eval(eval).toString();
+//			return pass;
+//		} else {
+//			return str;
+//		}
+//	}
+
+	private String initPassword(Business business, Person person) throws Exception {
 		String str = Config.person().getPassword();
+		Pattern pattern = Pattern.compile(com.x.base.core.project.config.Person.REGULAREXPRESSION_SCRIPT);
 		Matcher matcher = pattern.matcher(str);
 		if (matcher.matches()) {
-			String eval = matcher.group(1);
-			engine.put("person", person);
-			String pass = engine.eval(eval).toString();
-			return pass;
+			String eval = ScriptFactory.functionalization(StringEscapeUtils.unescapeJson(matcher.group(1)));
+			ScriptContext scriptContext = new SimpleScriptContext();
+			Bindings bindings = scriptContext.getBindings(ScriptContext.ENGINE_SCOPE);
+			bindings.put("person", person);
+			Object o = ScriptFactory.scriptEngine.eval(eval, scriptContext);
+			return o.toString();
 		} else {
 			return str;
 		}

o2server/x_program_center/src/main/java/com/x/program/center/zhengwudingding/SyncOrganization.java

@@ -14,12 +14,14 @@ import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
-import javax.script.ScriptEngine;
-import javax.script.ScriptEngineManager;
+import javax.script.Bindings;
+import javax.script.ScriptContext;
+import javax.script.SimpleScriptContext;
 
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.collections4.ListUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.text.StringEscapeUtils;
 
 import com.x.base.core.container.EntityManagerContainer;
 import com.x.base.core.entity.annotation.CheckPersistType;
@@ -31,6 +33,7 @@ import com.x.base.core.project.gson.GsonPropertyObject;
 import com.x.base.core.project.gson.XGsonBuilder;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
+import com.x.base.core.project.script.ScriptFactory;
 import com.x.base.core.project.tools.ListTools;
 import com.x.organization.core.entity.Identity;
 import com.x.organization.core.entity.Identity_;
@@ -48,10 +51,6 @@ public class SyncOrganization {
 
 	private static Logger logger = LoggerFactory.getLogger(SyncOrganization.class);
 
-	private ScriptEngineManager scriptEngineManager = new ScriptEngineManager();
-	private ScriptEngine engine = scriptEngineManager.getEngineByName(Config.SCRIPTING_ENGINE_NAME);
-	private Pattern pattern = Pattern.compile(com.x.base.core.project.config.Person.REGULAREXPRESSION_SCRIPT);
-
 	public PullResult execute(Business business) throws Exception {
 		logger.print("开始与政务钉钉同步人员,方向:拉入.");
 		PullResult result = new PullResult();
@@ -269,7 +268,7 @@ public class SyncOrganization {
 			person.setMail(user.getEmail());
 			person.setOfficePhone(user.getOfficeTel());
 			/* 新增人员需要增加密码 */
-			business.person().setPassword(person, this.getPassword(engine, pattern, person));
+			business.person().setPassword(person, this.initPassword(business, person));
 			emc.persist(person, CheckPersistType.all);
 			result.getCreatePersonList().add(person.getDistinguishedName());
 		}
@@ -277,14 +276,17 @@ public class SyncOrganization {
 		return person;
 	}
 
-	private String getPassword(ScriptEngine engine, Pattern pattern, Person person) throws Exception {
+	private String initPassword(Business business, Person person) throws Exception {
 		String str = Config.person().getPassword();
+		Pattern pattern = Pattern.compile(com.x.base.core.project.config.Person.REGULAREXPRESSION_SCRIPT);
 		Matcher matcher = pattern.matcher(str);
 		if (matcher.matches()) {
-			String eval = matcher.group(1);
-			engine.put("person", person);
-			String pass = engine.eval(eval).toString();
-			return pass;
+			String eval = ScriptFactory.functionalization(StringEscapeUtils.unescapeJson(matcher.group(1)));
+			ScriptContext scriptContext = new SimpleScriptContext();
+			Bindings bindings = scriptContext.getBindings(ScriptContext.ENGINE_SCOPE);
+			bindings.put("person", person);
+			Object o = ScriptFactory.scriptEngine.eval(eval, scriptContext);
+			return o.toString();
 		} else {
 			return str;
 		}