Merge branch 'fix/o2云collect.json配置问题' into 'develop'

Merge of fix/[中心服务]o2云collect.json配置问题 to develop

See merge request o2oa/o2oa!153

o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/collect/ActionUpdateUnit.java

@@ -43,6 +43,7 @@ class ActionUpdateUnit extends BaseAction {
 		Wo wo = new Wo();
 		wo.setValue(this.update(name, newName, mobile, codeAnswer, wi.getKey(), wi.getSecret()));
 		if (BooleanUtils.isTrue(wo.getValue()) && name.equals(Config.collect().getName())) {
+			Config.collect().setEnable(true);
 			Config.collect().setName(newName);
 			Config.collect().setKey(wi.getKey());
 			Config.collect().setSecret(wi.getSecret());

o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/collect/ActionValidate.java

@@ -3,6 +3,9 @@ package com.x.program.center.jaxrs.collect;
 import com.x.base.core.project.config.Config;
 import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.jaxrs.WrapBoolean;
+import com.x.program.center.ThisApplication;
+import com.x.program.center.schedule.CollectPerson;
+import org.apache.commons.lang3.BooleanUtils;
 
 class ActionValidate extends BaseAction {
 
@@ -12,11 +15,16 @@ class ActionValidate extends BaseAction {
 		wo.setValue(true);
 		if (!this.connect()) {
 			wo.setValue(false);
-			// throw new ExceptionUnableConnect();
+		}
+		if(BooleanUtils.isFalse(Config.collect().getEnable())){
+			wo.setValue(false);
 		}
 		if (!this.validate(Config.collect().getName(), Config.collect().getPassword())) {
 			wo.setValue(false);
-			// throw new ExceptionInvalidCredential();
+		}
+		if (BooleanUtils.isTrue(wo.getValue())) {
+			/* 提交人员同步 */
+			ThisApplication.context().scheduleLocal(CollectPerson.class);
 		}
 		result.setData(wo);
 		return result;

o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/collect/ActionValidateDirect.java

@@ -1,5 +1,9 @@
 package com.x.program.center.jaxrs.collect;
 
+import com.x.base.core.project.config.Config;
+import com.x.program.center.ThisApplication;
+import com.x.program.center.schedule.CollectPerson;
+import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import com.google.gson.JsonElement;
@@ -28,6 +32,15 @@ class ActionValidateDirect extends BaseAction {
 		if (!this.validate(name, password)) {
 			wo.setValue(false);
 		}
+		if (BooleanUtils.isTrue(wo.getValue())) {
+			Config.collect().setEnable(true);
+			Config.collect().setName(name);
+			Config.collect().setPassword(password);
+			Config.collect().save();
+			Config.flush();
+			/* 提交人员人员同步 */
+			ThisApplication.context().scheduleLocal(CollectPerson.class);
+		}
 		result.setData(wo);
 		return result;
 	}