验证码到云服务校验，本地验证码不保留

o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/code/ActionCreate.java

@@ -4,7 +4,6 @@ import org.apache.commons.lang3.BooleanUtils;
 
 import com.x.base.core.container.EntityManagerContainer;
 import com.x.base.core.container.factory.EntityManagerContainerFactory;
-import com.x.base.core.entity.annotation.CheckPersistType;
 import com.x.base.core.project.config.Config;
 import com.x.base.core.project.connection.ActionResponse;
 import com.x.base.core.project.connection.ConnectionAction;
@@ -14,8 +13,6 @@ import com.x.base.core.project.jaxrs.WrapBoolean;
 import com.x.base.core.project.jaxrs.WrapString;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
-import com.x.base.core.project.tools.StringTools;
-import com.x.program.center.core.entity.Code;
 
 class ActionCreate extends BaseAction {
 
@@ -25,21 +22,13 @@ class ActionCreate extends BaseAction {
 		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
 			ActionResult<Wo> result = new ActionResult<>();
 			Wo wo = new Wo();
-			Code code = new Code();
-			code.setMobile(mobile);
-			code.setAnswer(StringTools.randomNumber4());
-			emc.beginTransaction(Code.class);
-			emc.persist(code, CheckPersistType.all);
-			wo.setValue(code.getAnswer());
-			emc.commit();
 			if (BooleanUtils.isNotTrue(Config.collect().getEnable())) {
 				logger.warn("短信无法发送,系统没有启用O2云服务.");
 			} else {
 				Message message = new Message();
 				message.setUnit(Config.collect().getName());
-				message.setMobile(code.getMobile());
+				message.setMobile(mobile);
 				message.setPassword(Config.collect().getPassword());
-				message.setAnswer(code.getAnswer());
 				ActionResponse resp = ConnectionAction
 						.put(Config.collect().url() + "/o2_collect_assemble/jaxrs/code/transfer", null, message);
 				RespWi respWi = resp.getData(RespWi.class);
@@ -103,4 +92,4 @@ class ActionCreate extends BaseAction {
 
 	}
 
-}
+}

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

@@ -10,16 +10,17 @@ import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
 import com.x.base.core.container.EntityManagerContainer;
-import com.x.base.core.container.factory.EntityManagerContainerFactory;
+import com.x.base.core.project.config.Config;
+import com.x.base.core.project.connection.ActionResponse;
+import com.x.base.core.project.connection.ConnectionAction;
 import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.jaxrs.WrapBoolean;
 import com.x.program.center.core.entity.Code;
 import com.x.program.center.core.entity.Code_;
-import org.apache.commons.lang3.StringUtils;
 
 class ActionValidate extends BaseAction {
 	ActionResult<Wo> execute(String mobile, String answer) throws Exception {
-		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
+		/*try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
 			ActionResult<Wo> result = new ActionResult<>();
 			Wo wo = new Wo();
 			wo.setValue(false);
@@ -46,7 +47,14 @@ class ActionValidate extends BaseAction {
 			}
 			result.setData(wo);
 			return result;
-		}
+		}*/
+		ActionResult<Wo> result = new ActionResult<>();
+		ActionResponse resp = ConnectionAction.get(Config.collect().url()
+				+ "/o2_collect_assemble/jaxrs/code/validate/mobile/" + mobile + "/answer/" + answer, null);
+		Wo wo = new Wo();
+		wo.setValue(resp.getData(ActionValidateCascade.Wo.class).getValue());
+		result.setData(wo);
+		return result;
 	}
 
 	public static class Wo extends WrapBoolean {