废弃collaboration模块

o2server/x_attendance_assemble_control/pom.xml

@@ -20,10 +20,6 @@
 			<groupId>o2oa</groupId>
 			<artifactId>x_attendance_core_entity</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>o2oa</groupId>
-			<artifactId>x_collaboration_core_message</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>o2oa</groupId>
 			<artifactId>x_organization_core_express</artifactId>

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/service/AttendanceNoticeService.java

 package com.x.attendance.assemble.control.service;
 
 import com.x.attendance.entity.AttendanceAppealInfo;
-import com.x.collaboration.core.message.Collaboration;
-import com.x.collaboration.core.message.notification.AttendanceAppealAcceptMessage;
-import com.x.collaboration.core.message.notification.AttendanceAppealInviteMessage;
-import com.x.collaboration.core.message.notification.AttendanceAppealRejectMessage;
-
 
 public class AttendanceNoticeService {
 
@@ -17,22 +12,23 @@ public class AttendanceNoticeService {
 	 * @param person
 	 * @throws Exception
 	 */
-	public void notifyAttendanceAppealAcceptMessage( AttendanceAppealInfo attendanceAppealInfo,
-			String person) throws Exception {
-		if( attendanceAppealInfo != null ){
+	public void notifyAttendanceAppealAcceptMessage(AttendanceAppealInfo attendanceAppealInfo, String person)
+			throws Exception {
+		if (attendanceAppealInfo != null) {
 			String targetName = attendanceAppealInfo.getEmpName();
 			String messageContent = "您好，[" + attendanceAppealInfo.getRecordDateString() + "]考勤结果的申诉已经通过审核。";
-			if( targetName != null && !targetName.isEmpty()){
-				String[] array = targetName.split( "," );
-				for(String name : array){
-					if( name != null && !name.trim().isEmpty()){
-						AttendanceAppealAcceptMessage message = new AttendanceAppealAcceptMessage( name, attendanceAppealInfo.getId(), attendanceAppealInfo.getDetailId(), messageContent );
-						Collaboration.send(message);
+			if (targetName != null && !targetName.isEmpty()) {
+				String[] array = targetName.split(",");
+				for (String name : array) {
+					if (name != null && !name.trim().isEmpty()) {
+						// @Todo
+//						AttendanceAppealAcceptMessage message = new AttendanceAppealAcceptMessage( name, attendanceAppealInfo.getId(), attendanceAppealInfo.getDetailId(), messageContent );
+//						Collaboration.send(message);
 					}
 				}
 			}
-		}else{
-			throw new Exception( "attendanceAppealInfo is null, can not send message!" );
+		} else {
+			throw new Exception("attendanceAppealInfo is null, can not send message!");
 		}
 	}
 
@@ -44,25 +40,26 @@ public class AttendanceNoticeService {
 	 * @param person
 	 * @throws Exception
 	 */
-	public void notifyAttendanceAppealRejectMessage( AttendanceAppealInfo attendanceAppealInfo,
-			String person) throws Exception {
-		if( attendanceAppealInfo != null ){
+	public void notifyAttendanceAppealRejectMessage(AttendanceAppealInfo attendanceAppealInfo, String person)
+			throws Exception {
+		if (attendanceAppealInfo != null) {
 			String targetName = attendanceAppealInfo.getEmpName();
 			String messageContent = "您好，[" + attendanceAppealInfo.getRecordDateString() + "]考勤结果的申诉未通过审核。";
-			if( targetName != null && !targetName.isEmpty()){
-				String[] array = targetName.split( "," );
-				for(String name : array){
-					if( name != null && !name.trim().isEmpty()){
-						AttendanceAppealRejectMessage message = new AttendanceAppealRejectMessage( name, attendanceAppealInfo.getId(), attendanceAppealInfo.getDetailId(), messageContent );
-						Collaboration.send(message);
+			if (targetName != null && !targetName.isEmpty()) {
+				String[] array = targetName.split(",");
+				for (String name : array) {
+					if (name != null && !name.trim().isEmpty()) {
+//						AttendanceAppealRejectMessage message = new AttendanceAppealRejectMessage(name,
+//								attendanceAppealInfo.getId(), attendanceAppealInfo.getDetailId(), messageContent);
+//						Collaboration.send(message);
 					}
 				}
 			}
-		}else{
-			throw new Exception( "attendanceAppealInfo is null, can not send message!" );
+		} else {
+			throw new Exception("attendanceAppealInfo is null, can not send message!");
 		}
 	}
-	
+
 	/**
 	 * 收到一份需要处理的申诉-处理人1
 	 * 
@@ -70,21 +67,23 @@ public class AttendanceNoticeService {
 	 * @param attendanceDetail
 	 * @throws Exception
 	 */
-	public void notifyAttendanceAppealProcessness1Message( AttendanceAppealInfo attendanceAppealInfo ) throws Exception {		
-		if( attendanceAppealInfo != null ){
+	public void notifyAttendanceAppealProcessness1Message(AttendanceAppealInfo attendanceAppealInfo) throws Exception {
+		if (attendanceAppealInfo != null) {
 			String targetName = attendanceAppealInfo.getCurrentProcessor();
-			String messageContent = "您收到了" + attendanceAppealInfo.getEmpName() + "的考勤结果申诉，申诉类型为[" + attendanceAppealInfo.getAppealReason() + "]，请您审核！";
-			if( targetName != null && !targetName.isEmpty()){
-				String[] array = targetName.split( "," );
-				for(String name : array){
-					if( name != null && !name.trim().isEmpty()){
-						AttendanceAppealInviteMessage message = new AttendanceAppealInviteMessage( name, attendanceAppealInfo.getId(), attendanceAppealInfo.getDetailId(), messageContent );
-						Collaboration.send(message);
+			String messageContent = "您收到了" + attendanceAppealInfo.getEmpName() + "的考勤结果申诉，申诉类型为["
+					+ attendanceAppealInfo.getAppealReason() + "]，请您审核！";
+			if (targetName != null && !targetName.isEmpty()) {
+				String[] array = targetName.split(",");
+				for (String name : array) {
+					if (name != null && !name.trim().isEmpty()) {
+//						AttendanceAppealInviteMessage message = new AttendanceAppealInviteMessage(name,
+//								attendanceAppealInfo.getId(), attendanceAppealInfo.getDetailId(), messageContent);
+//						Collaboration.send(message);
 					}
 				}
 			}
-		}else{
-			throw new Exception( "attendanceAppealInfo is null, can not send message!" );
+		} else {
+			throw new Exception("attendanceAppealInfo is null, can not send message!");
 		}
 	}
 
@@ -95,22 +94,23 @@ public class AttendanceNoticeService {
 	 * @param attendanceDetail
 	 * @throws Exception
 	 */
-	public void notifyAttendanceAppealProcessness2Message( AttendanceAppealInfo attendanceAppealInfo)
-			throws Exception {
-		if( attendanceAppealInfo != null ){
+	public void notifyAttendanceAppealProcessness2Message(AttendanceAppealInfo attendanceAppealInfo) throws Exception {
+		if (attendanceAppealInfo != null) {
 			String targetName = attendanceAppealInfo.getCurrentProcessor();
-			String messageContent = "您收到了" + attendanceAppealInfo.getEmpName() + "的考勤结果申诉，申诉类型为[" + attendanceAppealInfo.getAppealReason() + "]，请您复核！";
-			if( targetName != null && !targetName.isEmpty()){
-				String[] array = targetName.split( "," );
-				for(String name : array){
-					if( name != null && !name.trim().isEmpty()){
-						AttendanceAppealInviteMessage message = new AttendanceAppealInviteMessage( name, attendanceAppealInfo.getId(), attendanceAppealInfo.getDetailId(), messageContent );
-						Collaboration.send(message);
+			String messageContent = "您收到了" + attendanceAppealInfo.getEmpName() + "的考勤结果申诉，申诉类型为["
+					+ attendanceAppealInfo.getAppealReason() + "]，请您复核！";
+			if (targetName != null && !targetName.isEmpty()) {
+				String[] array = targetName.split(",");
+				for (String name : array) {
+					if (name != null && !name.trim().isEmpty()) {
+//						AttendanceAppealInviteMessage message = new AttendanceAppealInviteMessage(name,
+//								attendanceAppealInfo.getId(), attendanceAppealInfo.getDetailId(), messageContent);
+//						Collaboration.send(message);
 					}
 				}
 			}
-		}else{
-			throw new Exception( "attendanceAppealInfo is null, can not send message!" );
+		} else {
+			throw new Exception("attendanceAppealInfo is null, can not send message!");
 		}
 	}
 }

o2server/x_attendance_assemble_control/src/main/webapp/jest/describe.js

 var Describe = function() {
-//20180730
+	// 20180730
 }
 
 Describe.splitValue = function(str) {
@@ -38,7 +38,7 @@ Describe.doPost = function(address, m, data) {
 			xhrFields : {
 				'withCredentials' : true
 			},
-			data : ((m.contentType.indexOf('application/json') > -1) ? JSON.stringify(data) : data)
+			data : ((m.contentType.indexOf('application/json') > -1) && (!m.useStringParameter) ? JSON.stringify(data) : data)
 		}).always(function(resultJson) {
 			$('#result').html(JSON.stringify(resultJson, null, 4));
 			Describe.writeOut(m.outs, resultJson);
@@ -55,7 +55,7 @@ Describe.doPost = function(address, m, data) {
 			xhrFields : {
 				'withCredentials' : true
 			},
-			data : ((m.contentType.indexOf('application/json') > -1) ? JSON.stringify(data) : data)
+			data : ((m.contentType.indexOf('application/json') > -1) && (!m.useStringParameter) ? JSON.stringify(data) : data)
 		});
 	}
 }
@@ -74,7 +74,7 @@ Describe.doPut = function(address, m, data) {
 			xhrFields : {
 				'withCredentials' : true
 			},
-			data : ((m.contentType.indexOf('application/json') > -1) ? JSON.stringify(data) : data)
+			data : ((m.contentType.indexOf('application/json') > -1) && (!m.useStringParameter) ? JSON.stringify(data) : data)
 		}).always(function(resultJson) {
 			$('#result').html(JSON.stringify(resultJson, null, 4));
 			Describe.writeOut(m.outs, resultJson);
@@ -91,7 +91,7 @@ Describe.doPut = function(address, m, data) {
 			xhrFields : {
 				'withCredentials' : true
 			},
-			data : ((m.contentType.indexOf('application/json') > -1) ? JSON.stringify(data) : data)
+			data : ((m.contentType.indexOf('application/json') > -1) && (!m.useStringParameter) ? JSON.stringify(data) : data)
 		});
 	}
 }
@@ -269,6 +269,14 @@ Describe.prototype = {
 									txt += '</table>';
 									txt += '</fieldset>';
 								}
+								if (m.useStringParameter) {
+									txt += '<fieldset><legend>String</legend>';
+									txt += '<table><tr><td>';
+									txt += '<textarea id="string" style="height:300px; width:600px; padding:1px; border:1px #000000 solid"/>';
+									txt += '</td><td>string</td></tr>';
+									txt += '</table>';
+									txt += '</fieldset>';
+								}
 								if (m.outs && m.outs.length > 0) {
 									txt += '<fieldset id="outs"><legend>Out</legend>';
 									txt += '<table>';
@@ -318,6 +326,8 @@ Describe.prototype = {
 												});
 											} else if (m.useJsonElementParameter) {
 												data = $.parseJSON($('#jsonElement').val());
+											} else if (m.useStringParameter) {
+												data = $('#string').val();
 											}
 											Describe.doPost(address, m, data);
 											break;
@@ -340,6 +350,8 @@ Describe.prototype = {
 												});
 											} else if (m.useJsonElementParameter) {
 												data = $.parseJSON($('#jsonElement').val());
+											} else if (m.useStringParameter) {
+												data = $('#string').val();
 											}
 											Describe.doPut(address, m, data);
 											break;

o2server/x_calendar_assemble_control/pom.xml

@@ -24,10 +24,6 @@
 			<groupId>o2oa</groupId>
 			<artifactId>x_organization_core_express</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>o2oa</groupId>
-			<artifactId>x_collaboration_core_message</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>o2oa</groupId>
 			<artifactId>x_calendar_core_entity</artifactId>

o2server/x_calendar_assemble_control/src/main/webapp/jest/describe.js

 var Describe = function() {
-//20180730
+	// 20180730
 }
 
 Describe.splitValue = function(str) {
@@ -38,7 +38,7 @@ Describe.doPost = function(address, m, data) {
 			xhrFields : {
 				'withCredentials' : true
 			},
-			data : ((m.contentType.indexOf('application/json') > -1) ? JSON.stringify(data) : data)
+			data : ((m.contentType.indexOf('application/json') > -1) && (!m.useStringParameter) ? JSON.stringify(data) : data)
 		}).always(function(resultJson) {
 			$('#result').html(JSON.stringify(resultJson, null, 4));
 			Describe.writeOut(m.outs, resultJson);
@@ -55,7 +55,7 @@ Describe.doPost = function(address, m, data) {
 			xhrFields : {
 				'withCredentials' : true
 			},
-			data : ((m.contentType.indexOf('application/json') > -1) ? JSON.stringify(data) : data)
+			data : ((m.contentType.indexOf('application/json') > -1) && (!m.useStringParameter) ? JSON.stringify(data) : data)
 		});
 	}
 }
@@ -74,7 +74,7 @@ Describe.doPut = function(address, m, data) {
 			xhrFields : {
 				'withCredentials' : true
 			},
-			data : ((m.contentType.indexOf('application/json') > -1) ? JSON.stringify(data) : data)
+			data : ((m.contentType.indexOf('application/json') > -1) && (!m.useStringParameter) ? JSON.stringify(data) : data)
 		}).always(function(resultJson) {
 			$('#result').html(JSON.stringify(resultJson, null, 4));
 			Describe.writeOut(m.outs, resultJson);
@@ -91,7 +91,7 @@ Describe.doPut = function(address, m, data) {
 			xhrFields : {
 				'withCredentials' : true
 			},
-			data : ((m.contentType.indexOf('application/json') > -1) ? JSON.stringify(data) : data)
+			data : ((m.contentType.indexOf('application/json') > -1) && (!m.useStringParameter) ? JSON.stringify(data) : data)
 		});
 	}
 }
@@ -269,6 +269,14 @@ Describe.prototype = {
 									txt += '</table>';
 									txt += '</fieldset>';
 								}
+								if (m.useStringParameter) {
+									txt += '<fieldset><legend>String</legend>';
+									txt += '<table><tr><td>';
+									txt += '<textarea id="string" style="height:300px; width:600px; padding:1px; border:1px #000000 solid"/>';
+									txt += '</td><td>string</td></tr>';
+									txt += '</table>';
+									txt += '</fieldset>';
+								}
 								if (m.outs && m.outs.length > 0) {
 									txt += '<fieldset id="outs"><legend>Out</legend>';
 									txt += '<table>';
@@ -318,6 +326,8 @@ Describe.prototype = {
 												});
 											} else if (m.useJsonElementParameter) {
 												data = $.parseJSON($('#jsonElement').val());
+											} else if (m.useStringParameter) {
+												data = $('#string').val();
 											}
 											Describe.doPost(address, m, data);
 											break;
@@ -340,6 +350,8 @@ Describe.prototype = {
 												});
 											} else if (m.useJsonElementParameter) {
 												data = $.parseJSON($('#jsonElement').val());
+											} else if (m.useStringParameter) {
+												data = $('#string').val();
 											}
 											Describe.doPut(address, m, data);
 											break;

o2server/x_cms_assemble_control/pom.xml

@@ -24,10 +24,6 @@
 			<groupId>o2oa</groupId>
 			<artifactId>x_organization_core_express</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>o2oa</groupId>
-			<artifactId>x_collaboration_core_message</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>o2oa</groupId>
 			<artifactId>x_cms_core_entity</artifactId>

o2server/x_file_assemble_control/pom.xml

@@ -24,10 +24,6 @@
 			<groupId>o2oa</groupId>
 			<artifactId>x_organization_core_express</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>o2oa</groupId>
-			<artifactId>x_collaboration_core_message</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>o2oa</groupId>
 			<artifactId>x_file_core_entity</artifactId>

o2server/x_meeting_assemble_control/pom.xml

@@ -28,10 +28,6 @@
 			<groupId>o2oa</groupId>
 			<artifactId>x_meeting_core_entity</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>o2oa</groupId>
-			<artifactId>x_collaboration_core_message</artifactId>
-		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

o2server/x_mind_assemble_control/pom.xml

@@ -24,10 +24,6 @@
 			<groupId>o2oa</groupId>
 			<artifactId>x_mind_core_entity</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>o2oa</groupId>
-			<artifactId>x_collaboration_core_message</artifactId>
-		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

o2server/x_mind_assemble_control/src/main/webapp/jest/describe.js

 var Describe = function() {
-//20180730
+	// 20180730
 }
 
 Describe.splitValue = function(str) {
@@ -38,7 +38,7 @@ Describe.doPost = function(address, m, data) {
 			xhrFields : {
 				'withCredentials' : true
 			},
-			data : ((m.contentType.indexOf('application/json') > -1) ? JSON.stringify(data) : data)
+			data : ((m.contentType.indexOf('application/json') > -1) && (!m.useStringParameter) ? JSON.stringify(data) : data)
 		}).always(function(resultJson) {
 			$('#result').html(JSON.stringify(resultJson, null, 4));
 			Describe.writeOut(m.outs, resultJson);
@@ -55,7 +55,7 @@ Describe.doPost = function(address, m, data) {
 			xhrFields : {
 				'withCredentials' : true
 			},
-			data : ((m.contentType.indexOf('application/json') > -1) ? JSON.stringify(data) : data)
+			data : ((m.contentType.indexOf('application/json') > -1) && (!m.useStringParameter) ? JSON.stringify(data) : data)
 		});
 	}
 }
@@ -74,7 +74,7 @@ Describe.doPut = function(address, m, data) {
 			xhrFields : {
 				'withCredentials' : true
 			},
-			data : ((m.contentType.indexOf('application/json') > -1) ? JSON.stringify(data) : data)
+			data : ((m.contentType.indexOf('application/json') > -1) && (!m.useStringParameter) ? JSON.stringify(data) : data)
 		}).always(function(resultJson) {
 			$('#result').html(JSON.stringify(resultJson, null, 4));
 			Describe.writeOut(m.outs, resultJson);
@@ -91,7 +91,7 @@ Describe.doPut = function(address, m, data) {
 			xhrFields : {
 				'withCredentials' : true
 			},
-			data : ((m.contentType.indexOf('application/json') > -1) ? JSON.stringify(data) : data)
+			data : ((m.contentType.indexOf('application/json') > -1) && (!m.useStringParameter) ? JSON.stringify(data) : data)
 		});
 	}
 }
@@ -269,6 +269,14 @@ Describe.prototype = {
 									txt += '</table>';
 									txt += '</fieldset>';
 								}
+								if (m.useStringParameter) {
+									txt += '<fieldset><legend>String</legend>';
+									txt += '<table><tr><td>';
+									txt += '<textarea id="string" style="height:300px; width:600px; padding:1px; border:1px #000000 solid"/>';
+									txt += '</td><td>string</td></tr>';
+									txt += '</table>';
+									txt += '</fieldset>';
+								}
 								if (m.outs && m.outs.length > 0) {
 									txt += '<fieldset id="outs"><legend>Out</legend>';
 									txt += '<table>';
@@ -318,6 +326,8 @@ Describe.prototype = {
 												});
 											} else if (m.useJsonElementParameter) {
 												data = $.parseJSON($('#jsonElement').val());
+											} else if (m.useStringParameter) {
+												data = $('#string').val();
 											}
 											Describe.doPost(address, m, data);
 											break;
@@ -340,6 +350,8 @@ Describe.prototype = {
 												});
 											} else if (m.useJsonElementParameter) {
 												data = $.parseJSON($('#jsonElement').val());
+											} else if (m.useStringParameter) {
+												data = $('#string').val();
 											}
 											Describe.doPut(address, m, data);
 											break;

o2server/x_okr_assemble_control/pom.xml

@@ -24,10 +24,6 @@
 			<groupId>o2oa</groupId>
 			<artifactId>x_okr_core_entity</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>o2oa</groupId>
-			<artifactId>x_collaboration_core_message</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>o2oa</groupId>
 			<artifactId>x_processplatform_core_entity</artifactId>

o2server/x_processplatform_assemble_bam/pom.xml

@@ -32,10 +32,6 @@
 			<groupId>o2oa</groupId>
 			<artifactId>x_processplatform_core_entity</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>o2oa</groupId>
-			<artifactId>x_collaboration_core_message</artifactId>
-		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

o2server/x_processplatform_assemble_bam/src/main/webapp/jest/describe.js

 var Describe = function() {
-//20180730
+	// 20180730
 }
 
 Describe.splitValue = function(str) {
@@ -38,7 +38,7 @@ Describe.doPost = function(address, m, data) {
 			xhrFields : {
 				'withCredentials' : true
 			},
-			data : ((m.contentType.indexOf('application/json') > -1) ? JSON.stringify(data) : data)
+			data : ((m.contentType.indexOf('application/json') > -1) && (!m.useStringParameter) ? JSON.stringify(data) : data)
 		}).always(function(resultJson) {
 			$('#result').html(JSON.stringify(resultJson, null, 4));
 			Describe.writeOut(m.outs, resultJson);
@@ -55,7 +55,7 @@ Describe.doPost = function(address, m, data) {
 			xhrFields : {
 				'withCredentials' : true
 			},
-			data : ((m.contentType.indexOf('application/json') > -1) ? JSON.stringify(data) : data)
+			data : ((m.contentType.indexOf('application/json') > -1) && (!m.useStringParameter) ? JSON.stringify(data) : data)
 		});
 	}
 }
@@ -74,7 +74,7 @@ Describe.doPut = function(address, m, data) {
 			xhrFields : {
 				'withCredentials' : true
 			},
-			data : ((m.contentType.indexOf('application/json') > -1) ? JSON.stringify(data) : data)
+			data : ((m.contentType.indexOf('application/json') > -1) && (!m.useStringParameter) ? JSON.stringify(data) : data)
 		}).always(function(resultJson) {
 			$('#result').html(JSON.stringify(resultJson, null, 4));
 			Describe.writeOut(m.outs, resultJson);
@@ -91,7 +91,7 @@ Describe.doPut = function(address, m, data) {
 			xhrFields : {
 				'withCredentials' : true
 			},
-			data : ((m.contentType.indexOf('application/json') > -1) ? JSON.stringify(data) : data)
+			data : ((m.contentType.indexOf('application/json') > -1) && (!m.useStringParameter) ? JSON.stringify(data) : data)
 		});
 	}
 }
@@ -269,6 +269,14 @@ Describe.prototype = {
 									txt += '</table>';
 									txt += '</fieldset>';
 								}
+								if (m.useStringParameter) {
+									txt += '<fieldset><legend>String</legend>';
+									txt += '<table><tr><td>';
+									txt += '<textarea id="string" style="height:300px; width:600px; padding:1px; border:1px #000000 solid"/>';
+									txt += '</td><td>string</td></tr>';
+									txt += '</table>';
+									txt += '</fieldset>';
+								}
 								if (m.outs && m.outs.length > 0) {
 									txt += '<fieldset id="outs"><legend>Out</legend>';
 									txt += '<table>';
@@ -318,6 +326,8 @@ Describe.prototype = {
 												});
 											} else if (m.useJsonElementParameter) {
 												data = $.parseJSON($('#jsonElement').val());
+											} else if (m.useStringParameter) {
+												data = $('#string').val();
 											}
 											Describe.doPost(address, m, data);
 											break;
@@ -340,6 +350,8 @@ Describe.prototype = {
 												});
 											} else if (m.useJsonElementParameter) {
 												data = $.parseJSON($('#jsonElement').val());
+											} else if (m.useStringParameter) {
+												data = $('#string').val();
 											}
 											Describe.doPut(address, m, data);
 											break;

o2server/x_processplatform_assemble_designer/pom.xml

@@ -32,10 +32,6 @@
 			<groupId>o2oa</groupId>
 			<artifactId>x_processplatform_core_entity</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>o2oa</groupId>
-			<artifactId>x_collaboration_core_message</artifactId>
-		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

o2server/x_processplatform_assemble_designer/src/main/webapp/jest/describe.js

 var Describe = function() {
-//20180730
+	// 20180730
 }
 
 Describe.splitValue = function(str) {
@@ -38,7 +38,7 @@ Describe.doPost = function(address, m, data) {
 			xhrFields : {
 				'withCredentials' : true
 			},
-			data : ((m.contentType.indexOf('application/json') > -1) ? JSON.stringify(data) : data)
+			data : ((m.contentType.indexOf('application/json') > -1) && (!m.useStringParameter) ? JSON.stringify(data) : data)
 		}).always(function(resultJson) {
 			$('#result').html(JSON.stringify(resultJson, null, 4));
 			Describe.writeOut(m.outs, resultJson);
@@ -55,7 +55,7 @@ Describe.doPost = function(address, m, data) {
 			xhrFields : {
 				'withCredentials' : true
 			},
-			data : ((m.contentType.indexOf('application/json') > -1) ? JSON.stringify(data) : data)
+			data : ((m.contentType.indexOf('application/json') > -1) && (!m.useStringParameter) ? JSON.stringify(data) : data)
 		});
 	}
 }
@@ -74,7 +74,7 @@ Describe.doPut = function(address, m, data) {
 			xhrFields : {
 				'withCredentials' : true
 			},
-			data : ((m.contentType.indexOf('application/json') > -1) ? JSON.stringify(data) : data)
+			data : ((m.contentType.indexOf('application/json') > -1) && (!m.useStringParameter) ? JSON.stringify(data) : data)
 		}).always(function(resultJson) {
 			$('#result').html(JSON.stringify(resultJson, null, 4));
 			Describe.writeOut(m.outs, resultJson);
@@ -91,7 +91,7 @@ Describe.doPut = function(address, m, data) {
 			xhrFields : {
 				'withCredentials' : true
 			},
-			data : ((m.contentType.indexOf('application/json') > -1) ? JSON.stringify(data) : data)
+			data : ((m.contentType.indexOf('application/json') > -1) && (!m.useStringParameter) ? JSON.stringify(data) : data)
 		});
 	}
 }
@@ -269,6 +269,14 @@ Describe.prototype = {
 									txt += '</table>';
 									txt += '</fieldset>';
 								}
+								if (m.useStringParameter) {
+									txt += '<fieldset><legend>String</legend>';
+									txt += '<table><tr><td>';
+									txt += '<textarea id="string" style="height:300px; width:600px; padding:1px; border:1px #000000 solid"/>';
+									txt += '</td><td>string</td></tr>';
+									txt += '</table>';
+									txt += '</fieldset>';
+								}
 								if (m.outs && m.outs.length > 0) {
 									txt += '<fieldset id="outs"><legend>Out</legend>';
 									txt += '<table>';
@@ -318,6 +326,8 @@ Describe.prototype = {
 												});
 											} else if (m.useJsonElementParameter) {
 												data = $.parseJSON($('#jsonElement').val());
+											} else if (m.useStringParameter) {
+												data = $('#string').val();
 											}
 											Describe.doPost(address, m, data);
 											break;
@@ -340,6 +350,8 @@ Describe.prototype = {
 												});
 											} else if (m.useJsonElementParameter) {
 												data = $.parseJSON($('#jsonElement').val());
+											} else if (m.useStringParameter) {
+												data = $('#string').val();
 											}
 											Describe.doPut(address, m, data);
 											break;

o2server/x_processplatform_assemble_surface/pom.xml

@@ -32,10 +32,6 @@
 			<groupId>o2oa</groupId>
 			<artifactId>x_processplatform_core_entity</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>o2oa</groupId>
-			<artifactId>x_collaboration_core_message</artifactId>
-		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

o2server/x_processplatform_service_processing/pom.xml

@@ -32,10 +32,6 @@
 			<groupId>o2oa</groupId>
 			<artifactId>x_processplatform_core_entity</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>o2oa</groupId>
-			<artifactId>x_collaboration_core_message</artifactId>
-		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

o2server/x_query_assemble_designer/pom.xml

@@ -36,10 +36,6 @@
 			<groupId>o2oa</groupId>
 			<artifactId>x_processplatform_core_entity</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>o2oa</groupId>
-			<artifactId>x_collaboration_core_message</artifactId>
-		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

o2server/x_query_assemble_surface/pom.xml

@@ -36,10 +36,6 @@
 			<groupId>o2oa</groupId>
 			<artifactId>x_processplatform_core_entity</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>o2oa</groupId>
-			<artifactId>x_collaboration_core_message</artifactId>
-		</dependency>
 	</dependencies>
 	<build>
 		<plugins>