Просмотр исходного кода

修改agent和invoke 默认注释

zhourui 5 лет назад
Родитель
Сommit
8a4b25f9d2

+ 1 - 1
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/agent/ActionEdit.java

@@ -38,7 +38,7 @@ class ActionEdit extends BaseAction {
 			}
 			}
 			emc.beginTransaction(Agent.class);
 			emc.beginTransaction(Agent.class);
 			Wi.copier.copy(wi, agent);
 			Wi.copier.copy(wi, agent);
-			this.addComment(agent);
+			//this.addComment(agent);
 			emc.check(agent, CheckPersistType.all);
 			emc.check(agent, CheckPersistType.all);
 			emc.commit();
 			emc.commit();
 			CacheManager.notify(Agent.class);
 			CacheManager.notify(Agent.class);

+ 2 - 2
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/agent/ActionUpdate.java

@@ -17,14 +17,14 @@ class ActionUpdate extends BaseAction {
 		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
 		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
 			ActionResult<Wo> result = new ActionResult<>();
 			ActionResult<Wo> result = new ActionResult<>();
 			Wo wo = new Wo();
 			Wo wo = new Wo();
-			Agent agent = emc.flag(flag, Agent.class );
+			Agent agent = emc.flag(flag, Agent.class);
 			if (null == agent) {
 			if (null == agent) {
 				throw new ExceptionAgentNotExist(flag);
 				throw new ExceptionAgentNotExist(flag);
 			}
 			}
 			String text = new String(bytes, DefaultCharset.name);
 			String text = new String(bytes, DefaultCharset.name);
 			emc.beginTransaction(Agent.class);
 			emc.beginTransaction(Agent.class);
 			agent.setText(text);
 			agent.setText(text);
-			this.addComment(agent);
+			// this.addComment(agent);
 			emc.commit();
 			emc.commit();
 			wo.setId(agent.getId());
 			wo.setId(agent.getId());
 			result.setData(wo);
 			result.setData(wo);

+ 26 - 26
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/agent/BaseAction.java

@@ -9,31 +9,31 @@ import com.x.base.core.project.jaxrs.StandardJaxrsAction;
 import com.x.program.center.core.entity.Agent;
 import com.x.program.center.core.entity.Agent;
 
 
 abstract class BaseAction extends StandardJaxrsAction {
 abstract class BaseAction extends StandardJaxrsAction {
-	private static String COMMENT = "";
-
-	private static final Pattern COMMENT_REGEX = Pattern.compile("^\\/\\*(\\s|.)*?\\*\\/");
-
-	static {
-		COMMENT = "/*" + StringUtils.LF;
-		COMMENT += "* resources.getEntityManagerContainer() // 实体管理容器." + StringUtils.LF;
-		COMMENT += "* resources.getContext() //上下文根." + StringUtils.LF;
-		COMMENT += "* resources.getOrganization() //组织访问接口." + StringUtils.LF;
-		COMMENT += "* requestText //请求内容." + StringUtils.LF;
-		COMMENT += "* request //请求对象." + StringUtils.LF;
-		COMMENT += "*/" + StringUtils.LF;
-	}
-
-	protected void addComment(Agent agent) {
-		if (StringUtils.isEmpty(agent.getText())) {
-			agent.setText(COMMENT);
-		} else {
-			Matcher m = COMMENT_REGEX.matcher(agent.getText());
-			if (m.find()) {
-				agent.setText(COMMENT + m.replaceFirst(""));
-			} else {
-				agent.setText(COMMENT + agent.getText());
-			}
-		}
-	}
+//	private static String COMMENT = "";
+//
+//	private static final Pattern COMMENT_REGEX = Pattern.compile("^\\/\\*(\\s|.)*?\\*\\/");
+//
+//	static {
+//		COMMENT = "/*" + StringUtils.LF;
+//		COMMENT += "* resources.getEntityManagerContainer() // 实体管理容器." + StringUtils.LF;
+//		COMMENT += "* resources.getContext() //上下文根." + StringUtils.LF;
+//		COMMENT += "* resources.getOrganization() //组织访问接口." + StringUtils.LF;
+//		COMMENT += "* requestText //请求内容." + StringUtils.LF;
+//		COMMENT += "* request //请求对象." + StringUtils.LF;
+//		COMMENT += "*/" + StringUtils.LF;
+//	}
+//
+//	protected void addComment(Agent agent) {
+//		if (StringUtils.isEmpty(agent.getText())) {
+//			agent.setText(COMMENT);
+//		} else {
+//			Matcher m = COMMENT_REGEX.matcher(agent.getText());
+//			if (m.find()) {
+//				agent.setText(COMMENT + m.replaceFirst(""));
+//			} else {
+//				agent.setText(COMMENT + agent.getText());
+//			}
+//		}
+//	}
 
 
 }
 }

+ 2 - 2
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/invoke/ActionEdit.java

@@ -24,7 +24,7 @@ class ActionEdit extends BaseAction {
 		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
 		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
 			ActionResult<Wo> result = new ActionResult<>();
 			ActionResult<Wo> result = new ActionResult<>();
 			Wi wi = this.convertToWrapIn(jsonElement, Wi.class);
 			Wi wi = this.convertToWrapIn(jsonElement, Wi.class);
-			Invoke invoke = emc.flag(flag, Invoke.class );
+			Invoke invoke = emc.flag(flag, Invoke.class);
 			if (StringUtils.isEmpty(wi.getName())) {
 			if (StringUtils.isEmpty(wi.getName())) {
 				throw new ExceptionEmptyName();
 				throw new ExceptionEmptyName();
 			}
 			}
@@ -38,7 +38,7 @@ class ActionEdit extends BaseAction {
 			}
 			}
 			emc.beginTransaction(Invoke.class);
 			emc.beginTransaction(Invoke.class);
 			Wi.copier.copy(wi, invoke);
 			Wi.copier.copy(wi, invoke);
-			this.addComment(invoke);
+			// this.addComment(invoke);
 			emc.check(invoke, CheckPersistType.all);
 			emc.check(invoke, CheckPersistType.all);
 			emc.commit();
 			emc.commit();
 			CacheManager.notify(Invoke.class);
 			CacheManager.notify(Invoke.class);

+ 2 - 2
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/invoke/ActionUpdate.java

@@ -17,14 +17,14 @@ class ActionUpdate extends BaseAction {
 		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
 		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
 			ActionResult<Wo> result = new ActionResult<>();
 			ActionResult<Wo> result = new ActionResult<>();
 			Wo wo = new Wo();
 			Wo wo = new Wo();
-			Invoke invoke = emc.flag(flag, Invoke.class );
+			Invoke invoke = emc.flag(flag, Invoke.class);
 			if (null == invoke) {
 			if (null == invoke) {
 				throw new ExceptionInvokeNotExist(flag);
 				throw new ExceptionInvokeNotExist(flag);
 			}
 			}
 			String text = new String(bytes, DefaultCharset.name);
 			String text = new String(bytes, DefaultCharset.name);
 			emc.beginTransaction(Invoke.class);
 			emc.beginTransaction(Invoke.class);
 			invoke.setText(text);
 			invoke.setText(text);
-			this.addComment(invoke);
+			// this.addComment(invoke);
 			emc.commit();
 			emc.commit();
 			wo.setId(invoke.getId());
 			wo.setId(invoke.getId());
 			result.setData(wo);
 			result.setData(wo);