git-svn-id: https://192.168.57.71/svn/jsgkj@1910 931142cf-59ea-a443-aa0e-51397b428577

gkoa/trunk/gkoa/WebContent/static/xt/js/common/xt.js

@@ -137,10 +137,12 @@
             showGryjDialog : function(config) {
                 var opinion= config.yj;
                 if(!isEmpty(config.yj)){
-                    opinion = opinion.replace(/&amp/g, "&");
-                    opinion = opinion.replace(/&lt/g, "<");
-                    opinion = opinion.replace(/&gt/g, ">");
-                    opinion = opinion.replace(/&quot/g, "\"");
+                    opinion = opinion.replace(/&amp;/g, "&");
+                    opinion = opinion.replace(/&lt;/g, "<");
+                    opinion = opinion.replace(/&gt;/g, ">");
+                    opinion = opinion.replace(/&quot;/g, "\"");
+                    opinion = opinion.replace(/&#x27;/g, "//");
+                    opinion = opinion.replace(/&#x2F;/g, "\\\\");
                 }
                 var href = ctx + '/wf/task/gryj?yj='+encodeURI(encodeURI(opinion));
                 if (!(Xt.gryjDialog)) {

gkoa/trunk/gkoa/WebContent/static/xt/js/fwgl/dbfw/detail.js

@@ -33,6 +33,15 @@ fwgl.dbfw.detail.initpage = function() {
 
 /**弹出选择节点界面*/
 fwgl.dbfw.detail.pop = function(flag) {
+    var opinion= $("#opinion").val();
+    if(!isEmpty(opinion)){
+        opinion = opinion.replace(/&/g, "&");
+        opinion = opinion.replace(/&lt;/g, "<");
+        opinion = opinion.replace(/&gt;/g, ">");
+        opinion = opinion.replace(/&quot;/g, "\"");
+        opinion = opinion.replace(/&#x27;/g, "//");
+        opinion = opinion.replace(/&#x2F;/g, "\\\\");
+    }
     if(flag=="th"){
     	 $.post($.ctx + "/wf/task/isEnd", {
     	     bussKey:$("#fwid").val()
@@ -48,7 +57,7 @@ fwgl.dbfw.detail.pop = function(flag) {
 				            step:rows[0].step,
 				            usersStr:encodeURI(rows[0].users),
 				            id:$("#fwid").val(),
-				            yj:$("#opinion").val(),
+				            yj:opinion,
 				            days:rows[0].days
 				        }, function(data, status) {
 				            if (data.success) {
@@ -71,13 +80,6 @@ fwgl.dbfw.detail.pop = function(flag) {
              }
          }, "json");		
     }else{
-        var opinion= $("#opinion").val();
-        if(!isEmpty(opinion)){
-            opinion = opinion.replace(/&amp/g, "&");
-            opinion = opinion.replace(/&lt/g, "<");
-            opinion = opinion.replace(/&gt/g, ">");
-            opinion = opinion.replace(/&quot/g, "\"");
-        }
         $.post($.ctx + "/dbfw/isLastStep", {
             wfid : 'fw',
             taskId:$("#taskid").val(),

gkoa/trunk/gkoa/WebContent/static/xt/js/jsta/dbjsta/detail.js

@@ -33,6 +33,15 @@ jsta.dbjsta.detail.initpage = function() {
 
 /**弹出选择节点界面*/
 jsta.dbjsta.detail.pop = function(flag) {
+    var opinion= $("#opinion").val();
+    if(!isEmpty(opinion)){
+        opinion = opinion.replace(/&/g, "&");
+        opinion = opinion.replace(/&lt;/g, "<");
+        opinion = opinion.replace(/&gt;/g, ">");
+        opinion = opinion.replace(/&quot;/g, "\"");
+        opinion = opinion.replace(/&#x27;/g, "//");
+        opinion = opinion.replace(/&#x2F;/g, "\\\\");
+    }
     if(flag=="th"){
     	 $.post($.ctx + "/wf/task/isEnd", {
     	     bussKey:$("#jstaid").val()
@@ -48,7 +57,7 @@ jsta.dbjsta.detail.pop = function(flag) {
 				            step:rows[0].step,
 				            usersStr:encodeURI(rows[0].users),
 				            id:$("#jstaid").val(),
-				            yj:$("#opinion").val(),
+				            yj:opinion,
 				            days:rows[0].days
 				        }, function(data, status) {
 				            if (data.success) {
@@ -71,13 +80,7 @@ jsta.dbjsta.detail.pop = function(flag) {
              }
          }, "json");		
     }else{
-        var opinion= $("#opinion").val();
-        if(!isEmpty(opinion)){
-            opinion = opinion.replace(/&amp/g, "&");
-            opinion = opinion.replace(/&lt/g, "<");
-            opinion = opinion.replace(/&gt/g, ">");
-            opinion = opinion.replace(/&quot/g, "\"");
-        }
+      
         $.post($.ctx + "/dbjsta/isLastStep", {
             wfid : 'jsta',
             taskId:$("#taskid").val(),

gkoa/trunk/gkoa/WebContent/static/xt/js/qbgl/dbqb/detail.js

@@ -165,6 +165,15 @@ function isEmpty(str){
  * 保存菜单
  */
 qbgl.dbqb.detail.showWin = function(flag) {
+    var opinion= $("#opinion").val();
+    if(!isEmpty(opinion)){
+        opinion = opinion.replace(/&/g, "&");
+        opinion = opinion.replace(/&lt;/g, "<");
+        opinion = opinion.replace(/&gt;/g, ">");
+        opinion = opinion.replace(/&quot;/g, "\"");
+        opinion = opinion.replace(/&#x27;/g, "//");
+        opinion = opinion.replace(/&#x2F;/g, "\\\\");
+    }
     if(flag == "th"){
     	  $.post($.ctx + "/wf/task/isEnd", {
     		  bussKey:$("#id").val()
@@ -179,7 +188,7 @@ qbgl.dbqb.detail.showWin = function(flag) {
 		                $.post($.ctx + "/dbqb/back", {
 		                    step:rows[0].step,
 		                    usersStr:encodeURI(rows[0].users),
-		                    opStr:encodeURI($("#opinion").val()),
+		                    opStr:opinion,
 		                    id:$("#id").val(),
 		                    days:rows[0].days
 		                }, function(data, status) {
@@ -202,13 +211,7 @@ qbgl.dbqb.detail.showWin = function(flag) {
               }
           }, "json");
     }else{
-        var opinion= $("#opinion").val();
-        if(!isEmpty(opinion)){
-            opinion = opinion.replace(/&amp/g, "&");
-            opinion = opinion.replace(/&lt/g, "<");
-            opinion = opinion.replace(/&gt/g, ">");
-            opinion = opinion.replace(/&quot/g, "\"");
-        }
+      
         $.post($.ctx + "/dbqb/isLastStep", {
             wfid : 'qb',
             taskId:$("#taskId").val(),

gkoa/trunk/gkoa/WebContent/static/xt/js/qlgk/gwcc/detail.js

@@ -119,6 +119,15 @@ qlgk.gwcc.detail.showWin=function(flag){
 		$.messager.alert("提示","意见过长");
 		return false;
 	}
+	 var opinion= $("#opinion").val();
+     if(!isEmpty(opinion)){
+         opinion = opinion.replace(/&/g, "&");
+         opinion = opinion.replace(/&lt;/g, "<");
+         opinion = opinion.replace(/&gt;/g, ">");
+         opinion = opinion.replace(/&quot;/g, "\"");
+         opinion = opinion.replace(/&#x27;/g, "//");
+         opinion = opinion.replace(/&#x2F;/g, "\\\\");
+     }
     if(flag == "th"){
     	$.post($.ctx + "/wf/task/isEnd", {
     		bussKey:$("#id").val()
@@ -133,7 +142,7 @@ qlgk.gwcc.detail.showWin=function(flag){
 			            $.post($.ctx + "/gwcc/back", {
 			                step:rows[0].step,
 			                usersStr:encodeURI(rows[0].users),
-			                opStr:encodeURI($("#opinion").val()),
+			                opStr:opinion,
 			                id:$("#id").val()
 			            }, function(data, status) {
 			                if (data.success) {
@@ -156,13 +165,7 @@ qlgk.gwcc.detail.showWin=function(flag){
             }
         }, "json");
     }else{
-        var opinion= $("#opinion").val();
-        if(!isEmpty(opinion)){
-            opinion = opinion.replace(/&amp/g, "&");
-            opinion = opinion.replace(/&lt/g, "<");
-            opinion = opinion.replace(/&gt/g, ">");
-            opinion = opinion.replace(/&quot/g, "\"");
-        }
+       
         $.post($.ctx + "/gwcc/isLastStep", {
             wfid : 'gwcc',
             taskId:$("#taskId").val(),

gkoa/trunk/gkoa/WebContent/static/xt/js/qlgk/ygcg/detail.js

@@ -118,6 +118,15 @@ qlgk.ygcg.detail.showWin=function(flag){
 			return false;
 		}
 	}
+	 var opinion= $("#opinion").val();
+     if(!isEmpty(opinion)){
+         opinion = opinion.replace(/&/g, "&");
+         opinion = opinion.replace(/&lt;/g, "<");
+         opinion = opinion.replace(/&gt;/g, ">");
+         opinion = opinion.replace(/&quot;/g, "\"");
+         opinion = opinion.replace(/&#x27;/g, "//");
+         opinion = opinion.replace(/&#x2F;/g, "\\\\");
+     }
     if(flag == "th"){
     	$.post($.ctx + "/wf/task/isEnd", {
     		bussKey:$("#id").val()
@@ -132,7 +141,7 @@ qlgk.ygcg.detail.showWin=function(flag){
 			            $.post($.ctx + "/ygcg/back", {
 			                step:rows[0].step,
 			                usersStr:encodeURI(rows[0].users),
-			                opStr:encodeURI($("#opinion").val()),
+			                opStr:opinion,
 			                id:$("#id").val()
 			            }, function(data, status) {
 			                if (data.success) {
@@ -155,13 +164,7 @@ qlgk.ygcg.detail.showWin=function(flag){
             }
         }, "json");
     }else{
-        var opinion= $("#opinion").val();
-        if(!isEmpty(opinion)){
-            opinion = opinion.replace(/&amp/g, "&");
-            opinion = opinion.replace(/&lt/g, "<");
-            opinion = opinion.replace(/&gt/g, ">");
-            opinion = opinion.replace(/&quot/g, "\"");
-        }
+       
         $.post($.ctx + "/ygcg/isLastStep", {
             wfid : 'ygcg',
             taskId:$("#taskId").val(),

gkoa/trunk/gkoa/WebContent/static/xt/js/qlgk/yszx/detail.js

@@ -111,6 +111,15 @@ qlgk.yszx.detail.showWin=function(flag){
 			return false;
 		}
 	}
+	var opinion= $("#opinion").val();
+    if(!isEmpty(opinion)){
+        opinion = opinion.replace(/&/g, "&");
+        opinion = opinion.replace(/&lt;/g, "<");
+        opinion = opinion.replace(/&gt;/g, ">");
+        opinion = opinion.replace(/&quot;/g, "\"");
+        opinion = opinion.replace(/&#x27;/g, "//");
+        opinion = opinion.replace(/&#x2F;/g, "\\\\");
+    }
     if(flag == "th"){
     	$.post($.ctx + "/wf/task/isEnd", {
     		bussKey:$("#id").val()
@@ -125,7 +134,7 @@ qlgk.yszx.detail.showWin=function(flag){
 			            $.post($.ctx + "/yszx/back", {
 			                step:rows[0].step,
 			                usersStr:encodeURI(rows[0].users),
-			                opStr:encodeURI($("#opinion").val()),
+			                opStr:opinion,
 			                id:$("#id").val()
 			            }, function(data, status) {
 			                if (data.success) {
@@ -148,13 +157,6 @@ qlgk.yszx.detail.showWin=function(flag){
             }
         }, "json");
     }else{
-        var opinion= $("#opinion").val();
-        if(!isEmpty(opinion)){
-            opinion = opinion.replace(/&amp/g, "&");
-            opinion = opinion.replace(/&lt/g, "<");
-            opinion = opinion.replace(/&gt/g, ">");
-            opinion = opinion.replace(/&quot/g, "\"");
-        }
         $.post($.ctx + "/yszx/isLastStep", {
             wfid : 'yszx',
             taskId:$("#taskId").val(),

gkoa/trunk/gkoa/WebContent/static/xt/js/swgl/dbsw/detail.js

@@ -159,6 +159,15 @@ swgl.dbsw.detail.save = function() {
  * 流程选择人员框
  */
 swgl.dbsw.detail.showWin=function(flag){
+    var opinion= $("#opinion").val();
+    if(!isEmpty(opinion)){
+        opinion = opinion.replace(/&/g, "&");
+        opinion = opinion.replace(/&lt;/g, "<");
+        opinion = opinion.replace(/&gt;/g, ">");
+        opinion = opinion.replace(/&quot;/g, "\"");
+        opinion = opinion.replace(/&#x27;/g, "//");
+        opinion = opinion.replace(/&#x2F;/g, "\\\\");
+    }
     if(flag == "th"){
     	$.post($.ctx + "/wf/task/isEnd", {
     	    bussKey:$("#id").val()
@@ -175,7 +184,7 @@ swgl.dbsw.detail.showWin=function(flag){
 			            $.post($.ctx + "/dbsw/back", {
 			                step:rows[0].step,
 			                usersStr:encodeURI(rows[0].users),
-			                opStr:encodeURI($("#opinion").val()),
+			                opStr:opinion,
 			                id:$("#id").val(),
 			                days:rows[0].days
 			            }, function(data, status) {
@@ -199,13 +208,7 @@ swgl.dbsw.detail.showWin=function(flag){
             }
         }, "json");
     }else{
-        var opinion= $("#opinion").val();
-        if(!isEmpty(opinion)){
-            opinion = opinion.replace(/&amp/g, "&");
-            opinion = opinion.replace(/&lt/g, "<");
-            opinion = opinion.replace(/&gt/g, ">");
-            opinion = opinion.replace(/&quot/g, "\"");
-        }
+      
         $.post($.ctx + "/dbsw/isLastStep", {
             wfid : 'sw',
             taskId:$("#taskId").val(),

gkoa/trunk/gkoa/WebContent/static/xt/js/xfjbl/dbxfj/detail.js

@@ -120,6 +120,15 @@ xfjbl.dbxfj.detail.save = function() {
  * 流程选择人员框
  */
 xfjbl.dbxfj.detail.showWin=function(flag){
+    var opinion= $("#opinion").val();
+    if(!isEmpty(opinion)){
+        opinion = opinion.replace(/&/g, "&");
+        opinion = opinion.replace(/&lt;/g, "<");
+        opinion = opinion.replace(/&gt;/g, ">");
+        opinion = opinion.replace(/&quot;/g, "\"");
+        opinion = opinion.replace(/&#x27;/g, "//");
+        opinion = opinion.replace(/&#x2F;/g, "\\\\");
+    }
     if(flag == "th"){
     	$.post($.ctx + "/wf/task/isEnd", {
     	    bussKey:$("#id").val()
@@ -134,7 +143,7 @@ xfjbl.dbxfj.detail.showWin=function(flag){
 			            $.post($.ctx + "/dbxfj/back", {
 			                step:rows[0].step,
 			                usersStr:encodeURI(rows[0].users),
-			                yj:encodeURI($("#opinion").val()),
+			                yj:opinion,
 			                id:$("#id").val(),
 			                days:rows[0].days
 			            }, function(data, status) {
@@ -158,13 +167,7 @@ xfjbl.dbxfj.detail.showWin=function(flag){
             }
         }, "json");
     }else{
-        var opinion= $("#opinion").val();
-        if(!isEmpty(opinion)){
-            opinion = opinion.replace(/&amp/g, "&");
-            opinion = opinion.replace(/&lt/g, "<");
-            opinion = opinion.replace(/&gt/g, ">");
-            opinion = opinion.replace(/&quot/g, "\"");
-        }
+       
         $.post($.ctx + "/dbxfj/isLastStep", {
             wfid : 'xfjbl',
             taskId:$("#taskId").val(),

gkoa/trunk/gkoa/WebContent/static/xt/js/zwxx/dbzw/detail.js

@@ -86,6 +86,15 @@ zwxx.dbzw.detail.save = function() {
  * 流程选择人员框
  */
 zwxx.dbzw.detail.showWin = function(flag) {
+    var opinion= $("#opinion").val();
+    if(!isEmpty(opinion)){
+        opinion = opinion.replace(/&/g, "&");
+        opinion = opinion.replace(/&lt;/g, "<");
+        opinion = opinion.replace(/&gt;/g, ">");
+        opinion = opinion.replace(/&quot;/g, "\"");
+        opinion = opinion.replace(/&#x27;/g, "//");
+        opinion = opinion.replace(/&#x2F;/g, "\\\\");
+    }
     if (flag == "th") {
         $.post($.ctx + "/wf/task/isEnd", {
         	bussKey:$("#id").val()
@@ -100,7 +109,7 @@ zwxx.dbzw.detail.showWin = function(flag) {
                         $.post($.ctx + "/dbzw/back", {
                             step : rows[0].step,
                             usersStr : encodeURI(rows[0].users),
-                            opStr : encodeURI($("#opinion").val()),
+                            opStr : opinion,
                             id : $("#id").val()
                         }, function(data, status) {
                             if (data.success) {
@@ -127,13 +136,7 @@ zwxx.dbzw.detail.showWin = function(flag) {
         }, "json");
     }
     else {
-        var opinion= $("#opinion").val();
-        if(!isEmpty(opinion)){
-            opinion = opinion.replace(/&amp/g, "&");
-            opinion = opinion.replace(/&lt/g, "<");
-            opinion = opinion.replace(/&gt/g, ">");
-            opinion = opinion.replace(/&quot/g, "\"");
-        }
+       
         $.post($.ctx + "/dbzw/isLastStep", {
             wfid : 'zw',
             taskId : $("#taskId").val(),

gkoa/trunk/gkoa/src/com/xt/gkoa/common/BaseWebCtl.java

@@ -66,8 +66,6 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.InitBinder;
 
-import rtx.RTXSvrApi;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.xt.gkoa.bltx.entity.BltxEntity;
@@ -652,6 +650,14 @@ public class BaseWebCtl extends BaseCtl {
 	 */
 	// 参数顺序 限时天数，系统用户id，步骤，rtx提醒内荣，办理提醒内同，业务key，模块(PC)
 	public void inserttx(String days, String userid, String step, String rtxmsg, String bltxmsg, String buskey, String lx) {
+		if (!StringUtils.isEmpty(rtxmsg)) {
+			rtxmsg = rtxmsg.replaceAll("&", "&");
+			rtxmsg = rtxmsg.replaceAll("&lt;", "<");
+			rtxmsg = rtxmsg.replaceAll("&gt;", ">");
+			rtxmsg = rtxmsg.replaceAll("&quot;", "\"");
+			rtxmsg = rtxmsg.replaceAll("&#x27;", "//");
+			rtxmsg = rtxmsg.replaceAll("&#x2F;", "\\\\");
+		}
 		try {
 			if (!StringUtils.isEmpty(days)) {
 				int daynum = Integer.parseInt(days.trim());
@@ -743,30 +749,19 @@ public class BaseWebCtl extends BaseCtl {
 		/**
 		 * rtx推送
 		 */
-		String url="http://10.1.30.119:8012/sendnotify.cgi?msg="+content+"&receiver="+uname+"&title="+title;
+		String url = "http://10.1.30.119:8012/sendnotify.cgi?msg=" + content + "&receiver=" + uname + "&title=" + title;
 		getURLContent(url);
-		/*try {
-			String type = "0";
-			String delayTime = "0";
-			int iRet = -1;
-			String SvrIP = "10.1.30.119"; // rtx服务器所在ip地址，请修改
-			int iPort = 6000; // 端口
-			RTXSvrApi RtxsvrapiObj = new RTXSvrApi();
-			if (RtxsvrapiObj.Init()) {
-				System.out.println("操作成功" + "\n" + "服务器地址:" + SvrIP + "\n" + "服务器端口:" + iPort);
-				iRet = RtxsvrapiObj.sendNotify(uname, title, content, type, delayTime);
-				if (iRet == 0) {
-					System.out.println("发送成功");
-				} else {
-					flag = false;
-					System.out.println("发送失败");
-				}
-			}
-			RtxsvrapiObj.UnInit();
-		} catch (Throwable e) {
-			// flag=false;
-			e.printStackTrace();
-		}*/
+		/*
+		 * try { String type = "0"; String delayTime = "0"; int iRet = -1;
+		 * String SvrIP = "10.1.30.119"; // rtx服务器所在ip地址，请修改 int iPort = 6000;
+		 * // 端口 RTXSvrApi RtxsvrapiObj = new RTXSvrApi(); if
+		 * (RtxsvrapiObj.Init()) { System.out.println("操作成功" + "\n" + "服务器地址:" +
+		 * SvrIP + "\n" + "服务器端口:" + iPort); iRet =
+		 * RtxsvrapiObj.sendNotify(uname, title, content, type, delayTime); if
+		 * (iRet == 0) { System.out.println("发送成功"); } else { flag = false;
+		 * System.out.println("发送失败"); } } RtxsvrapiObj.UnInit(); } catch
+		 * (Throwable e) { // flag=false; e.printStackTrace(); }
+		 */
 		// if(!flag){
 		// flag=false;
 		// }
@@ -962,25 +957,15 @@ public class BaseWebCtl extends BaseCtl {
 	}
 
 	public static void main(String[] args) {
-		//getURLContent("http://192.168.30.142:81/");
-	/*	try {
-			String type = "0";
-			String delayTime = "0";
-			int iRet = -1;
-			RTXSvrApi RtxsvrapiObj = new RTXSvrApi();
-			if (RtxsvrapiObj.Init()) {
-
-				iRet = RtxsvrapiObj.sendNotify("zhaoj", "标题", "内容", "0", "0");
-				if (iRet == 0) {
-					System.out.println("发送成功");
-				} else {
-					System.out.println("发送失败");
-				}
-			}
-			RtxsvrapiObj.UnInit();
-		} catch (Throwable e) {
-			// flag=false;
-			e.printStackTrace();
-		}*/
+		// getURLContent("http://192.168.30.142:81/");
+		/*
+		 * try { String type = "0"; String delayTime = "0"; int iRet = -1;
+		 * RTXSvrApi RtxsvrapiObj = new RTXSvrApi(); if (RtxsvrapiObj.Init()) {
+		 * 
+		 * iRet = RtxsvrapiObj.sendNotify("zhaoj", "标题", "内容", "0", "0"); if
+		 * (iRet == 0) { System.out.println("发送成功"); } else {
+		 * System.out.println("发送失败"); } } RtxsvrapiObj.UnInit(); } catch
+		 * (Throwable e) { // flag=false; e.printStackTrace(); }
+		 */
 	}
 }