Browse Source

GBK --> UTF-8

lin.chen 6 years ago
parent
commit
3e79b344d3

+ 5 - 5
TRS.WCM.Developer/src/com/trs/web2frame/ServiceConfig.java

@@ -13,13 +13,13 @@ import java.util.Map;
 import com.trs.infra.util.Loader;
 
 /**
- * Title: TRS ����Э��ƽ̨��TRS WCM�� <BR>
+ * Title: TRS 内容协作平台(TRS WCM) <BR>
  * Description: <BR>
  * TODO <BR>
- * Copyright: Copyright (c) 2004-2005 TRS��Ϣ�������޹�˾ <BR>
- * Company: TRS��Ϣ�������޹�˾(www.trs.com.cn) <BR>
- * 
- * @author TRS��Ϣ�������޹�˾ LY
+ * Copyright: Copyright (c) 2004-2005 TRS信息技术有限公司 <BR>
+ * Company: TRS信息技术有限公司(www.trs.com.cn) <BR>
+ *
+ * @author TRS信息技术有限公司 LY
  * @version 1.0
  */
 

+ 9 - 9
TRS.WCM.Developer/src/com/trs/web2frame/ServiceObject.java

@@ -17,13 +17,13 @@ import com.trs.web2frame.eventhandler.ICallbackFailureHandler;
 import com.trs.web2frame.eventhandler.ICallbackSuccessHandler;
 
 /**
- * Title: TRS ÄÚÈÝЭ×÷ƽ̨£¨TRS WCM£© <BR>
+ * Title: TRS 内容�作平�(TRS WCM) <BR>
  * Description: <BR>
  * TODO <BR>
- * Copyright: Copyright (c) 2004-2005 TRSÐÅÏ¢¼¼ÊõÓÐÏÞ¹«Ë¾ <BR>
- * Company: TRSÐÅÏ¢¼¼ÊõÓÐÏÞ¹«Ë¾(www.trs.com.cn) <BR>
- * 
- * @author TRSÐÅÏ¢¼¼ÊõÓÐÏÞ¹«Ë¾ LY
+ * Copyright: Copyright (c) 2004-2005 TRS信�技术有�公� <BR>
+ * Company: TRS信�技术有�公�(www.trs.com.cn) <BR>
+ *
+ * @author TRS信�技术有�公� LY
  * @version 1.0
  */
 
@@ -66,9 +66,9 @@ public class ServiceObject {
 
     /**
      * @param _sParamName
-     * ²ÎÊýÃû³Æ
+     * �数�称
      * @param _sParamValue
-     * ²ÎÊýÖµ
+     * �数值
      */
     public void setParameter(String _sParamName, String _sParamValue) {
         m_oPostData.put(_sParamName, _sParamValue);
@@ -76,9 +76,9 @@ public class ServiceObject {
 
     /**
      * @param _sParamName
-     * ²ÎÊýÃû³Æ
+     * �数�称
      * @param _nParamValue
-     * ²ÎÊýÖµ
+     * �数值
      */
     public void setParameter(String _sParamName, int _nParamValue) {
         m_oPostData.put(_sParamName, String.valueOf(_nParamValue));

+ 31 - 31
TRS.WCM.Developer/src/com/trs/web2frame/WCMServiceCaller.java

@@ -15,13 +15,13 @@ import com.trs.web2frame.httpclient.HttpClientBuddy;
 import com.trs.web2frame.httpclient.ResponseBuddy;
 
 /**
- * Title: TRS 内容协作平台(TRS WCM) <BR>
+ * Title: TRS 鍐呭�鍗忎綔骞冲彴锛圱RS WCM锛� <BR>
  * Description: <BR>
  * TODO <BR>
- * Copyright: Copyright (c) 2004-2005 TRS信息技术有限公司 <BR>
- * Company: TRS信息技术有限公司(www.trs.com.cn) <BR>
- * 
- * @author TRS信息技术有限公司 LY
+ * Copyright: Copyright (c) 2004-2005 TRS淇℃伅鎶€鏈�湁闄愬叕鍙� <BR>
+ * Company: TRS淇℃伅鎶€鏈�湁闄愬叕鍙�(www.trs.com.cn) <BR>
+ *
+ * @author TRS淇℃伅鎶€鏈�湁闄愬叕鍙� LY
  * @version 1.0
  */
 
@@ -32,7 +32,7 @@ public class WCMServiceCaller {
 				throws Web2frameClientException {
 			ResponseBuddy oResponseBuddy = _dispatch.getResponseBuddy();
 			if (isTRSNotLogin(oResponseBuddy)) {
-				System.out.println("用户未登陆.");
+				System.out.println("鐢ㄦ埛鏈�櫥闄�.");
 			} else if (isResponse500(oResponseBuddy)) {
 				System.out.println(_dispatch.getResponseText());
 			} else if (isFailure(oResponseBuddy)) {
@@ -66,7 +66,7 @@ public class WCMServiceCaller {
 			}
 		} catch (Exception ex) {
 			ex.printStackTrace();
-			// TODO 处理异常的情况
+			// TODO 澶勭悊寮傚父鐨勬儏鍐�
 		}
 		return oDispatch;
 	}
@@ -107,13 +107,13 @@ public class WCMServiceCaller {
 			HttpClientBuddy oHttpClientBuddy = new HttpClientBuddy(
 					ServiceConfig.WCM_SERVICE_CHARSET);
 
-			// add by caohui@2017年8月25日 下午4:02:00
-			// 如果是Post方式,需要在头部传入formdata头部信息
+			// add by caohui@2017骞�8鏈�25鏃� 涓嬪崍4:02:00
+			// 濡傛灉鏄疨ost鏂瑰紡锛岄渶瑕佸湪澶撮儴浼犲叆formdata澶撮儴淇℃伅
 			if (_bPost) {
 				oHttpClientBuddy = new HttpClientBuddy(
 						ServiceConfig.WCM_SERVICE_CHARSET, new String[][] { //
-								{ "formdata", "1" }//
-						});
+						{ "formdata", "1" }//
+				});
 			}
 
 			ResponseBuddy oResponseBuddy = null;
@@ -125,12 +125,12 @@ public class WCMServiceCaller {
 			// }
 			System.out.println(sQueryURL);
 			if (_bPost) {
-				// comment by caohui@2017年8月25日 下午4:03:37
-				// 老的WCM将Post作为XML处理,新的海云使用标准Post
+				// comment by caohui@2017骞�8鏈�25鏃� 涓嬪崍4:03:37
+				// 鑰佺殑WCM灏哖ost浣滀负XML澶勭悊锛屾柊鐨勬捣浜戜娇鐢ㄦ爣鍑哖ost
 				// oResponseBuddy = oHttpClientBuddy.doPost(sQueryURL,
 				// _oServiceObject.toPostXml());
 
-				// add by caohui@2017年8月25日 下午4:06:54
+				// add by caohui@2017骞�8鏈�25鏃� 涓嬪崍4:06:54
 //				if (sQueryURL.indexOf('?') < 0) {
 //					sQueryURL += '?';
 //				}
@@ -168,7 +168,7 @@ public class WCMServiceCaller {
 			}
 		} catch (Exception ex) {
 			ex.printStackTrace();
-			// TODO 处理异常的情况
+			// TODO 澶勭悊寮傚父鐨勬儏鍐�
 		}
 		return oDispatch;
 	}
@@ -205,7 +205,7 @@ public class WCMServiceCaller {
 	}
 
 	public static Dispatch Call(String _sServiceId, String _sMethodName,
-			Map _oPostData, boolean _bPost) {
+								Map _oPostData, boolean _bPost) {
 		ServiceObject oServiceObject = new ServiceObject(_sServiceId,
 				_sMethodName);
 		oServiceObject.setPostData(_oPostData);
@@ -213,8 +213,8 @@ public class WCMServiceCaller {
 	}
 
 	/**
-	 * 绑定
-	 * 
+	 * 缁戝畾
+	 *
 	 * @param _sServiceId
 	 * @param _sMethodName
 	 * @param _oPostData
@@ -223,8 +223,8 @@ public class WCMServiceCaller {
 	 * @return
 	 */
 	public static Dispatch Call(String _sServiceId, String _sMethodName,
-			Map _oPostData, ICallbackEventHandler[] _arrEventHandlers,
-			boolean _bPost) {
+								Map _oPostData, ICallbackEventHandler[] _arrEventHandlers,
+								boolean _bPost) {
 		ServiceObject oServiceObject = new ServiceObject(_sServiceId,
 				_sMethodName);
 		oServiceObject.setPostData(_oPostData);
@@ -233,8 +233,8 @@ public class WCMServiceCaller {
 	}
 
 	/**
-	 * 几个请求同时发送的服务
-	 * 
+	 * 鍑犱釜璇锋眰鍚屾椂鍙戦€佺殑鏈嶅姟
+	 *
 	 * @param _sServiceId
 	 * @param _sServiceName
 	 * @param _oPostData
@@ -247,22 +247,22 @@ public class WCMServiceCaller {
 	}
 
 	/**
-	 * JSP服务
-	 * 
+	 * JSP鏈嶅姟
+	 *
 	 * @param _sUrl
 	 * @param _oPostData
 	 * @param _bPost
 	 * @return
 	 */
 	public static Dispatch JspRequest(String _sUrl, Map _oPostData,
-			boolean _bPost) {
+									  boolean _bPost) {
 		// TODO
 		return null;
 	}
 
 	/**
-	 * 将参数对象转换成URL形式的QUERYSTRING部分
-	 * 
+	 * 灏嗗弬鏁板�璞¤浆鎹㈡垚URL褰㈠紡鐨凲UERYSTRING閮ㄥ垎
+	 *
 	 * @param _sServiceId
 	 * @param _sMethodName
 	 * @param _mapParams
@@ -270,7 +270,7 @@ public class WCMServiceCaller {
 	 * @throws UnsupportedEncodingException
 	 */
 	public static String makePostParams(String _sServiceId, String _sMethodName,
-			Map _mapParams) throws UnsupportedEncodingException {
+										Map _mapParams) throws UnsupportedEncodingException {
 		StringBuffer sb = new StringBuffer();
 
 		sb.append("serviceid").append("=").append(_sServiceId);
@@ -294,15 +294,15 @@ public class WCMServiceCaller {
 	}
 
 	/**
-	 * 将参数对象转换成xml结构的POST数据
-	 * 
+	 * 灏嗗弬鏁板�璞¤浆鎹㈡垚xml缁撴瀯鐨凱OST鏁版嵁
+	 *
 	 * @param _sServiceId
 	 * @param _sMethodName
 	 * @param _mapParams
 	 * @return
 	 */
 	public static String makePostData(String _sServiceId, String _sMethodName,
-			Map _mapParams) {
+									  Map _mapParams) {
 		StringBuffer sb = new StringBuffer();
 		sb.append("<post-data>");
 		sb.append("<method type=\"" + _sMethodName + "\">" + _sServiceId

+ 27 - 27
TRS.WCM.Developer/src/com/trs/web2frame/httpclient/HttpClientBuddy.java

@@ -28,13 +28,13 @@ import org.apache.commons.httpclient.protocol.Protocol;
 import org.apache.http.client.methods.HttpPost;
 
 /**
- * Title: TRS 内容协作平台(TRS WCM 6.0)<BR>
+ * Title: TRS 鍐呭�鍗忎綔骞冲彴锛圱RS WCM 6.0锛�<BR>
  * Description:<BR>
  * TODO<BR>
- * Copyright: Copyright (c) 2005-2006 TRS信息技术有限公司<BR>
- * Company: TRS信息技术有限公司(www.trs.com.cn)<BR>
- * 
- * @author TRS信息技术有限公司
+ * Copyright: Copyright (c) 2005-2006 TRS淇℃伅鎶€鏈�湁闄愬叕鍙�<BR>
+ * Company: TRS淇℃伅鎶€鏈�湁闄愬叕鍙�(www.trs.com.cn)<BR>
+ *
+ * @author TRS淇℃伅鎶€鏈�湁闄愬叕鍙�
  * @version 1.0
  */
 
@@ -42,7 +42,7 @@ public class HttpClientBuddy {
 	public static final String DEFAULT_CONTENT_ENCODING = "UTF-8";
 
 	/**
-	 * 向wcm发送数据时的流写编码
+	 * 鍚憌cm鍙戦€佹暟鎹�椂鐨勬祦鍐欑紪鐮�
 	 */
 	public static final String SERVICE_REQEUST_ENCODING = "ISO-8859-1";
 
@@ -71,8 +71,8 @@ public class HttpClientBuddy {
 	}
 
 	/**
-	 * 以POST方式发送请求,获取返回对象
-	 * 
+	 * 浠�OST鏂瑰紡鍙戦€佽�姹傦紝鑾峰彇杩斿洖瀵硅薄
+	 *
 	 * @param _sPostUri
 	 * @param sContent
 	 * @return
@@ -109,8 +109,8 @@ public class HttpClientBuddy {
 	}
 
 	/**
-	 * 上传文件,获取返回对象
-	 * 
+	 * 涓婁紶鏂囦欢锛岃幏鍙栬繑鍥炲�璞�
+	 *
 	 * @param _sPostUri
 	 * @param _oUpdateFile
 	 * @return
@@ -139,8 +139,8 @@ public class HttpClientBuddy {
 	}
 
 	/**
-	 * 以POST方式发送请求,获取返回对象
-	 * 
+	 * 浠�OST鏂瑰紡鍙戦€佽�姹傦紝鑾峰彇杩斿洖瀵硅薄
+	 *
 	 * @param _sPostUri
 	 * @param _btContent
 	 * @return
@@ -169,8 +169,8 @@ public class HttpClientBuddy {
 	}
 
 	/**
-	 * 以POST方式发送请求,获取返回对象
-	 * 
+	 * 浠�OST鏂瑰紡鍙戦€佽�姹傦紝鑾峰彇杩斿洖瀵硅薄
+	 *
 	 * @param _sPostUri
 	 * @param sContent
 	 * @param _bChunked
@@ -181,7 +181,7 @@ public class HttpClientBuddy {
 	 * @throws HttpClientRenderException
 	 */
 	public ResponseBuddy doPost(String _sPostUri, String sContent,
-			boolean _bChunked)
+								boolean _bChunked)
 			throws HttpClientExcuteException, UnsupportedEncodingException,
 			URIException, HttpClientRenderException {
 		return this.doPost(_sPostUri, sContent.getBytes(this.m_sEncoding),
@@ -189,8 +189,8 @@ public class HttpClientBuddy {
 	}
 
 	/**
-	 * 以POST方式发送请求,获取返回对象
-	 * 
+	 * 浠�OST鏂瑰紡鍙戦€佽�姹傦紝鑾峰彇杩斿洖瀵硅薄
+	 *
 	 * @param _sPostUri
 	 * @param _btContent
 	 * @param _bChunked
@@ -200,7 +200,7 @@ public class HttpClientBuddy {
 	 * @throws HttpClientRenderException
 	 */
 	public ResponseBuddy doPost(String _sPostUri, byte[] _btContent,
-			boolean _bChunked) throws HttpClientExcuteException, URIException,
+								boolean _bChunked) throws HttpClientExcuteException, URIException,
 			HttpClientRenderException {
 
 		validUrl(_sPostUri);
@@ -220,7 +220,7 @@ public class HttpClientBuddy {
 	}
 
 	public ResponseBuddy doPost(String _sPostUri,
-			Map<String, Object> _hParameters) throws Exception {
+								Map<String, Object> _hParameters) throws Exception {
 		validUrl(_sPostUri);
 
 		PostMethod post = new CharsetPostMethod(_sPostUri, m_sEncoding);
@@ -303,22 +303,22 @@ public class HttpClientBuddy {
 		try {
 			httpResult = m_oHttpClient.executeMethod(httpMethod);
 			if (httpResult == 302) {
-				throw new Exception("IDS的忽略地址中可能没有加入【" + sDoURL
-						+ "】或者【fileupload.do】项!"
-						+ "请修改配置文件【WEB-INF/classes/trsids-agent.properties】!");
+				throw new Exception("IDS鐨勫拷鐣ュ湴鍧€涓�彲鑳芥病鏈夊姞鍏ャ€�" + sDoURL
+						+ "銆戞垨鑰呫€恌ileupload.do銆戦」锛�"
+						+ "璇蜂慨鏀归厤缃�枃浠躲€怶EB-INF/classes/trsids-agent.properties銆戯紒");
 			}
 			return new ResponseBuddy(httpMethod);
 		} catch (Exception ex) {
-			throw new HttpClientExcuteException("向目标地址[" + _sMethodUri
-					+ "]提交数据时失败!(response编号[" + httpResult + "])", ex);
+			throw new HttpClientExcuteException("鍚戠洰鏍囧湴鍧€[" + _sMethodUri
+					+ "]鎻愪氦鏁版嵁鏃跺け璐ワ紒(response缂栧彿[" + httpResult + "])", ex);
 		} finally {
 			httpMethod.releaseConnection();
 		}
 	}
 
 	/**
-	 * 以GET方式发送请求,获取返回对象
-	 * 
+	 * 浠�ET鏂瑰紡鍙戦€佽�姹傦紝鑾峰彇杩斿洖瀵硅薄
+	 *
 	 * @param _sPostUri
 	 * @param _sQueryString
 	 * @return
@@ -351,7 +351,7 @@ public class HttpClientBuddy {
 			oUrl = new URL(_sPostUri);
 		} catch (MalformedURLException ex) {
 			throw new HttpClientRenderException(
-					"不是合法的HTTP请求的目标地址[" + _sPostUri + "]", ex);
+					"涓嶆槸鍚堟硶鐨凥TTP璇锋眰鐨勭洰鏍囧湴鍧€[" + _sPostUri + "]", ex);
 		}
 
 		if (oUrl.getProtocol().equalsIgnoreCase("https")) {

+ 7 - 7
TRS.WCM.Developer/src/com/trs/web2frame/httpclient/MySSLSocketFactory.java

@@ -21,13 +21,13 @@ import org.apache.commons.httpclient.params.HttpConnectionParams;
 import org.apache.commons.httpclient.protocol.ProtocolSocketFactory;
 
 /**
- * Title: TRS ÄÚÈÝЭ×÷ƽ̨£¨TRS WCM 6.0£©<BR>
+ * Title: TRS 内容�作平�(TRS WCM 6.0)<BR>
  * Description:<BR>
  * TODO<BR>
- * Copyright: Copyright (c) 2005-2006 TRSÐÅÏ¢¼¼ÊõÓÐÏÞ¹«Ë¾<BR>
- * Company: TRSÐÅÏ¢¼¼ÊõÓÐÏÞ¹«Ë¾(www.trs.com.cn)<BR>
- * 
- * @author TRSÐÅÏ¢¼¼ÊõÓÐÏÞ¹«Ë¾
+ * Copyright: Copyright (c) 2005-2006 TRS信�技术有�公�<BR>
+ * Company: TRS信�技术有�公�(www.trs.com.cn)<BR>
+ *
+ * @author TRS信�技术有�公�
  * @version 1.0
  */
 
@@ -55,13 +55,13 @@ public class MySSLSocketFactory implements ProtocolSocketFactory {
 	}
 
 	public Socket createSocket(String host, int port, InetAddress clientHost,
-			int clientPort) throws IOException, UnknownHostException {
+							   int clientPort) throws IOException, UnknownHostException {
 		return getSSLContext().getSocketFactory().createSocket(host, port,
 				clientHost, clientPort);
 	}
 
 	public Socket createSocket(String host, int port, InetAddress localAddress,
-			int localPort, HttpConnectionParams params) throws IOException,
+							   int localPort, HttpConnectionParams params) throws IOException,
 			UnknownHostException {
 		return createSocket(host, port, localAddress, localPort);
 	}

+ 6 - 6
TRS.WCM.Developer/src/com/trs/web2frame/httpclient/ResponseBuddy.java

@@ -19,13 +19,13 @@ import org.apache.commons.httpclient.HttpMethod;
 import org.apache.log4j.Logger;
 
 /**
- * Title: TRS ÄÚÈÝЭ×÷ƽ̨£¨TRS WCM£© <BR>
+ * Title: TRS 内容�作平�(TRS WCM) <BR>
  * Description: <BR>
  * TODO <BR>
- * Copyright: Copyright (c) 2004-2005 TRSÐÅÏ¢¼¼ÊõÓÐÏÞ¹«Ë¾ <BR>
- * Company: TRSÐÅÏ¢¼¼ÊõÓÐÏÞ¹«Ë¾(www.trs.com.cn) <BR>
- * 
- * @author TRSÐÅÏ¢¼¼ÊõÓÐÏÞ¹«Ë¾ LY
+ * Copyright: Copyright (c) 2004-2005 TRS信�技术有�公� <BR>
+ * Company: TRS信�技术有�公�(www.trs.com.cn) <BR>
+ *
+ * @author TRS信�技术有�公� LY
  * @version 1.0
  */
 
@@ -89,7 +89,7 @@ public class ResponseBuddy {
     }
 
     /**
-     * ²Â±àÂë
+     * 猜编�
      */
     private void guessCharset() {
         if (this.m_sCharset != null) {

+ 7 - 7
TRS.WCM.Developer/src/com/trs/web2frame/util/JsonHelper.java

@@ -10,13 +10,13 @@ import java.util.Map;
 import org.dom4j.Document;
 
 /**
- * Title: TRS 内容协作平台(TRS WCM) <BR>
+ * Title: TRS 鍐呭�鍗忎綔骞冲彴锛圱RS WCM锛� <BR>
  * Description: <BR>
  * TODO <BR>
- * Copyright: Copyright (c) 2004-2005 TRS信息技术有限公司 <BR>
- * Company: TRS信息技术有限公司(www.trs.com.cn) <BR>
- * 
- * @author TRS信息技术有限公司 LY
+ * Copyright: Copyright (c) 2004-2005 TRS淇℃伅鎶€鏈�湁闄愬叕鍙� <BR>
+ * Company: TRS淇℃伅鎶€鏈�湁闄愬叕鍙�(www.trs.com.cn) <BR>
+ *
+ * @author TRS淇℃伅鎶€鏈�湁闄愬叕鍙� LY
  * @version 1.0
  */
 
@@ -27,7 +27,7 @@ public class JsonHelper {
     }
 
     /**
-     * 根据XPath返回Json对象中相应的Json对象
+     * 鏍规嵁XPath杩斿洖Json瀵硅薄涓�浉搴旂殑Json瀵硅薄
      * @param _oJson
      * @param _sXpath
      * @return
@@ -50,7 +50,7 @@ public class JsonHelper {
     }
 
     /**
-     * 
+     *
      * @param _oJson
      * @param _sXpath
      * @return

+ 11 - 11
TRS.WCM.Developer/src/com/trs/web2frame/util/XmlHelper.java

@@ -19,21 +19,21 @@ import org.dom4j.io.SAXReader;
 import com.trs.web2frame.dispatch.DispatchConvertException;
 
 /**
- * Title: TRS 内容协作平台(TRS WCM) <BR>
+ * Title: TRS 鍐呭�鍗忎綔骞冲彴锛圱RS WCM锛� <BR>
  * Description: <BR>
  * TODO <BR>
- * Copyright: Copyright (c) 2004-2005 TRS信息技术有限公司 <BR>
- * Company: TRS信息技术有限公司(www.trs.com.cn) <BR>
- * 
- * @author TRS信息技术有限公司 LY
+ * Copyright: Copyright (c) 2004-2005 TRS淇℃伅鎶€鏈�湁闄愬叕鍙� <BR>
+ * Company: TRS淇℃伅鎶€鏈�湁闄愬叕鍙�(www.trs.com.cn) <BR>
+ *
+ * @author TRS淇℃伅鎶€鏈�湁闄愬叕鍙� LY
  * @version 1.0
  */
 
 public class XmlHelper {
 
     /**
-     * 将一个xml格式的字符串转换成dom4j的Document对象
-     * 
+     * 灏嗕竴涓獂ml鏍煎紡鐨勫瓧绗︿覆杞�崲鎴恉om4j鐨凞ocument瀵硅薄
+     *
      * @param _responseText
      * @return
      */
@@ -75,8 +75,8 @@ public class XmlHelper {
     }
 
     /**
-     * 将一个dom4j的Document对象转换成Map对象
-     * 
+     * 灏嗕竴涓猟om4j鐨凞ocument瀵硅薄杞�崲鎴怣ap瀵硅薄
+     *
      * @param _oXmlDocument
      * @return
      * @throws DispatchConvertException
@@ -91,8 +91,8 @@ public class XmlHelper {
     }
 
     /**
-     * 将一个dom4j的Element对象转换成Map对象
-     * 
+     * 灏嗕竴涓猟om4j鐨凟lement瀵硅薄杞�崲鎴怣ap瀵硅薄
+     *
      * @param _oElement
      * @return
      */

+ 47 - 47
TRS.WCM.Developer/test/com/trs/TRSParserBaseTest.java

@@ -5,10 +5,10 @@
  *      class TRSParserBaseTest
  * Update Log:
  *	2005.01.19	FuChengrui
- *		改用新的(只使用PublishPageContext)构造PublishTagContext对象
+ *		鏀圭敤鏂扮殑(鍙�娇鐢≒ublishPageContext)鏋勯€燩ublishTagContext瀵硅薄
  *
  *	2005.12.27	FuChengrui
- *		改用新的(使用TagItem)构造PublishTagContext对象
+ *		鏀圭敤鏂扮殑(浣跨敤TagItem)鏋勯€燩ublishTagContext瀵硅薄
  */
 package com.trs;
 
@@ -25,13 +25,13 @@ import com.trs.infra.common.WCMException;
 import com.trs.infra.util.CMyException;
 
 /**
- * Title: TRS 内容协作平台(TRS WCM) <BR>
+ * Title: TRS 鍐呭�鍗忎綔骞冲彴锛圱RS WCM锛� <BR>
  * Description: <BR>
  * TODO <BR>
- * Copyright: Copyright (c) 2004-2005 TRS信息技术有限公司 <BR>
- * Company: TRS信息技术有限公司(www.trs.com.cn) <BR>
- * 
- * @author TRS信息技术有限公司
+ * Copyright: Copyright (c) 2004-2005 TRS淇℃伅鎶€鏈�湁闄愬叕鍙� <BR>
+ * Company: TRS淇℃伅鎶€鏈�湁闄愬叕鍙�(www.trs.com.cn) <BR>
+ *
+ * @author TRS淇℃伅鎶€鏈�湁闄愬叕鍙�
  * @version 1.0
  */
 
@@ -40,16 +40,16 @@ public abstract class TRSParserBaseTest extends TRSWCMBaseTest {
 			.getLogger(TRSParserBaseTest.class);
 
 	/**
-	 * 构造一个指定的Content
-	 * 
+	 * 鏋勯€犱竴涓�寚瀹氱殑Content
+	 *
 	 * @param _contentContext
-	 *            长度为4的数组:1:FolderType 2:FolderId 3:ContentType 4:ContentId
+	 *            闀垮害涓�4鐨勬暟缁勶細1锛欶olderType 2锛欶olderId 3锛欳ontentType 4锛欳ontentId
 	 * @return
 	 */
 	protected IPublishContent makeContent(int[] _contentContext) {
 		if (_contentContext == null) {
-			logger.error("[makeContent]所需的测试数据不正确!需要传入长度为2或4的整型数组");
-			fail("[makeContent]所需的测试数据不正确!需要传入长度为2或4的整型数组");
+			logger.error("[makeContent]鎵€闇€鐨勬祴璇曟暟鎹�笉姝g‘锛侀渶瑕佷紶鍏ラ暱搴︿负2鎴�4鐨勬暣鍨嬫暟缁�");
+			fail("[makeContent]鎵€闇€鐨勬祴璇曟暟鎹�笉姝g‘锛侀渶瑕佷紶鍏ラ暱搴︿负2鎴�4鐨勬暣鍨嬫暟缁�");
 		}
 
 		int nFolderType = 0;
@@ -67,17 +67,17 @@ public abstract class TRSParserBaseTest extends TRSWCMBaseTest {
 			nContentType = _contentContext[2];
 			nContentId = _contentContext[3];
 		} else {
-			logger.error("[makeContent]所需的测试数据不正确!需要传入长度为2或4的整型数组");
-			fail("[makeContent]所需的测试数据不正确!需要传入长度为2或4的整型数组");
+			logger.error("[makeContent]鎵€闇€鐨勬祴璇曟暟鎹�笉姝g‘锛侀渶瑕佷紶鍏ラ暱搴︿负2鎴�4鐨勬暣鍨嬫暟缁�");
+			fail("[makeContent]鎵€闇€鐨勬祴璇曟暟鎹�笉姝g‘锛侀渶瑕佷紶鍏ラ暱搴︿负2鎴�4鐨勬暣鍨嬫暟缁�");
 		}
 
 		try {
 			IPublishContent content = (IPublishContent) PublishElementFactory
 					.lookupElement(nContentType, nContentId);
 			if (content == null) {
-				logger.error("[makeContent]所需的Content数据不正确!ContentTypeConfig="
+				logger.error("[makeContent]鎵€闇€鐨凜ontent鏁版嵁涓嶆�纭�紒ContentTypeConfig="
 						+ nContentType + " ContentId=" + nContentId);
-				fail("[makeContent]所需的Content数据不正确!ContentTypeConfig="
+				fail("[makeContent]鎵€闇€鐨凜ontent鏁版嵁涓嶆�纭�紒ContentTypeConfig="
 						+ nContentType + " ContentId=" + nContentId);
 			}
 
@@ -88,16 +88,16 @@ public abstract class TRSParserBaseTest extends TRSWCMBaseTest {
 							.lookupElement(nFolderType, nFolderId);
 					if (folder == null) {
 						logger
-								.error("[makeContent]所需的Folder数据不正确!FolderTypeConfig="
+								.error("[makeContent]鎵€闇€鐨凢older鏁版嵁涓嶆�纭�紒FolderTypeConfig="
 										+ nFolderType
 										+ " FolderId="
 										+ nFolderId);
-						fail("[makeContent]所需的Folder数据不正确!FolderTypeConfig="
+						fail("[makeContent]鎵€闇€鐨凢older鏁版嵁涓嶆�纭�紒FolderTypeConfig="
 								+ nFolderType + " FolderId=" + nFolderId);
 					}
 				} catch (Exception ex) {
-					logger.error("测试[makeContent]-获取Folder出现异常!", ex);
-					fail("测试[makeContent]-获取Folder出现异常!\n"
+					logger.error("娴嬭瘯[makeContent]-鑾峰彇Folder鍑虹幇寮傚父锛�", ex);
+					fail("娴嬭瘯[makeContent]-鑾峰彇Folder鍑虹幇寮傚父锛乗n"
 							+ CMyException.getStackTraceText(ex));
 				}
 			} else {
@@ -107,8 +107,8 @@ public abstract class TRSParserBaseTest extends TRSWCMBaseTest {
 			content.setFolder(folder);
 			return content;
 		} catch (Exception ex) {
-			logger.error("测试[makeContent]-makeContent出现异常!", ex);
-			fail("测试[makeContent]-makeContent出现异常!\n"
+			logger.error("娴嬭瘯[makeContent]-makeContent鍑虹幇寮傚父锛�", ex);
+			fail("娴嬭瘯[makeContent]-makeContent鍑虹幇寮傚父锛乗n"
 					+ CMyException.getStackTraceText(ex));
 		}
 
@@ -116,16 +116,16 @@ public abstract class TRSParserBaseTest extends TRSWCMBaseTest {
 	}
 
 	/**
-	 * 构造指定的Folder
-	 * 
+	 * 鏋勯€犳寚瀹氱殑Folder
+	 *
 	 * @param _folderContext
-	 *            长度为2的数组:1:Folder Type 2:Folder Id
+	 *            闀垮害涓�2鐨勬暟缁勶細1锛欶older Type 2锛欶older Id
 	 * @return
 	 */
 	protected IPublishFolder makeFolder(int[] _folderContext) {
 		if (_folderContext == null || _folderContext.length < 2) {
-			logger.error("[makeContent]所需的测试数据不正确!需要传入长度为4的整型数组");
-			fail("[makeContent]所需的测试数据不正确!需要传入长度为4的整型数组");
+			logger.error("[makeContent]鎵€闇€鐨勬祴璇曟暟鎹�笉姝g‘锛侀渶瑕佷紶鍏ラ暱搴︿负4鐨勬暣鍨嬫暟缁�");
+			fail("[makeContent]鎵€闇€鐨勬祴璇曟暟鎹�笉姝g‘锛侀渶瑕佷紶鍏ラ暱搴︿负4鐨勬暣鍨嬫暟缁�");
 		}
 
 		int nFolderType = _folderContext[0];
@@ -136,14 +136,14 @@ public abstract class TRSParserBaseTest extends TRSWCMBaseTest {
 			folder = (IPublishFolder) PublishElementFactory.lookupElement(
 					nFolderType, nFolderId);
 			if (folder == null) {
-				logger.error("[makeFolder]所需的Folder数据不正确!FolderTypeConfig="
+				logger.error("[makeFolder]鎵€闇€鐨凢older鏁版嵁涓嶆�纭�紒FolderTypeConfig="
 						+ nFolderType + " FolderId=" + nFolderId);
-				fail("[makeFolder]所需的Folder数据不正确!FolderTypeConfig="
+				fail("[makeFolder]鎵€闇€鐨凢older鏁版嵁涓嶆�纭�紒FolderTypeConfig="
 						+ nFolderType + " FolderId=" + nFolderId);
 			}
 		} catch (Exception ex) {
-			logger.error("测试[makeFolder]-获取Folder出现异常!", ex);
-			fail("测试[makeFolder]-获取Folder出现异常!\n"
+			logger.error("娴嬭瘯[makeFolder]-鑾峰彇Folder鍑虹幇寮傚父锛�", ex);
+			fail("娴嬭瘯[makeFolder]-鑾峰彇Folder鍑虹幇寮傚父锛乗n"
 					+ CMyException.getStackTraceText(ex));
 		}
 		return folder;
@@ -155,14 +155,14 @@ public abstract class TRSParserBaseTest extends TRSWCMBaseTest {
 	 * @throws Exception
 	 */
 	protected void parse(String[] data, IPublishElement _pageElement,
-			IPublishElement _upperHost) throws WCMException, Exception {
-		// 3.构造发布的相关上下文参数
+						 IPublishElement _upperHost) throws WCMException, Exception {
+		// 3.鏋勯€犲彂甯冪殑鐩稿叧涓婁笅鏂囧弬鏁�
 		PublishTaskContext taskContent = new PublishTaskContext(null,
 				_pageElement.getFolder());
 		PublishPageContext pageContext = new PublishPageContext(_pageElement,
 				taskContent);
 		PublishTagContext tagContext = new PublishTagContext(pageContext);
-		// 4.遍历测试
+		// 4.閬嶅巻娴嬭瘯
 		TagItem tagItem;
 		String[] results = null;
 		for (int i = 0; i < data.length; i++) {
@@ -205,9 +205,9 @@ public abstract class TRSParserBaseTest extends TRSWCMBaseTest {
 			IPublishFolder folder = makeFolder(arFolder[i]);
 			IPublishContent content = makeContent(arContent[i]);
 
-			if (arContent[i].length > 4 && arContent[i][4] == 1) {// 在细览页面中解析
+			if (arContent[i].length > 4 && arContent[i][4] == 1) {// 鍦ㄧ粏瑙堥〉闈�腑瑙f瀽
 				parse(data, content, content);
-			} else {// 在概览页面中解析
+			} else {// 鍦ㄦ�瑙堥〉闈�腑瑙f瀽
 				parse(data, folder, content);
 			}
 		}
@@ -215,13 +215,13 @@ public abstract class TRSParserBaseTest extends TRSWCMBaseTest {
 	}
 
 	/**
-	 * 在指定的站点或栏目下发布指定的模板片段
-	 * 
+	 * 鍦ㄦ寚瀹氱殑绔欑偣鎴栨爮鐩�笅鍙戝竷鎸囧畾鐨勬ā鏉跨墖娈�
+	 *
 	 * @param data
-	 *            需要发布的模板片段内容,参数类型为字符串数组,可以指定多个需要发布的模板片段
+	 *            闇€瑕佸彂甯冪殑妯℃澘鐗囨�鍐呭�锛屽弬鏁扮被鍨嬩负瀛楃�涓叉暟缁勶紝鍙�互鎸囧畾澶氫釜闇€瑕佸彂甯冪殑妯℃澘鐗囨�
 	 * @param arFolder
-	 *            当前模板片段所依赖的站点或栏目的信息,因为同一个模板在不同站点或栏目对象下发布出来的内容是不一样的;
-	 *            指定站点或栏目对象的FolderType和FolderId,同时可以指定多个,如:{{101, 2}, {103, 1}}
+	 *            褰撳墠妯℃澘鐗囨�鎵€渚濊禆鐨勭珯鐐规垨鏍忕洰鐨勪俊鎭�紝鍥犱负鍚屼竴涓�ā鏉垮湪涓嶅悓绔欑偣鎴栨爮鐩��璞′笅鍙戝竷鍑烘潵鐨勫唴瀹规槸涓嶄竴鏍风殑锛�
+	 *            鎸囧畾绔欑偣鎴栨爮鐩��璞$殑FolderType鍜孎olderId锛屽悓鏃跺彲浠ユ寚瀹氬�涓�紝濡傦細{{101, 2}, {103, 1}}
 	 * @throws WCMException
 	 * @throws Exception
 	 */
@@ -234,14 +234,14 @@ public abstract class TRSParserBaseTest extends TRSWCMBaseTest {
 	}
 
 	/**
-	 * 在指定的文档对象下发布指定的模板片段
-	 * 
+	 * 鍦ㄦ寚瀹氱殑鏂囨。瀵硅薄涓嬪彂甯冩寚瀹氱殑妯℃澘鐗囨�
+	 *
 	 * @param data
-	 *            需要发布的模板片段内容,参数类型为字符串数组,可以指定多个需要发布的模板片段
+	 *            闇€瑕佸彂甯冪殑妯℃澘鐗囨�鍐呭�锛屽弬鏁扮被鍨嬩负瀛楃�涓叉暟缁勶紝鍙�互鎸囧畾澶氫釜闇€瑕佸彂甯冪殑妯℃澘鐗囨�
 	 * @param arFolder
-	 *            当前模板片段所依赖的文档的信息,因为同一个模板在不同文档下发布出来的内容是不一样的;
-	 *            指定文档对象的FolderType、FolderId
-	 *            (可选,默认为当前文档自身所在的栏目)及ContentType和ContentId ,同时可以指定多个,如:{{101,
+	 *            褰撳墠妯℃澘鐗囨�鎵€渚濊禆鐨勬枃妗g殑淇℃伅锛屽洜涓哄悓涓€涓�ā鏉垮湪涓嶅悓鏂囨。涓嬪彂甯冨嚭鏉ョ殑鍐呭�鏄�笉涓€鏍风殑锛�
+	 *            鎸囧畾鏂囨。瀵硅薄鐨凢olderType銆丗olderId
+	 *            锛堝彲閫夛紝榛樿�涓哄綋鍓嶆枃妗h嚜韬�墍鍦ㄧ殑鏍忕洰锛夊強ContentType鍜孋ontentId 锛屽悓鏃跺彲浠ユ寚瀹氬�涓�紝濡傦細{{101,
 	 *            2, 605, 32}, {605, 2}}
 	 * @throws WCMException
 	 * @throws Exception

+ 20 - 20
TRS.WCM.Developer/test/com/trs/TRSWCMBaseTest.java

@@ -29,13 +29,13 @@ import com.trs.infra.util.store.FileService;
 import com.trs.infra.util.store.FileStore;
 
 /**
- * Title: TRS 内容协作平台(TRS WCM) <BR>
+ * Title: TRS 鍐呭�鍗忎綔骞冲彴锛圱RS WCM锛� <BR>
  * Description: <BR>
- * 测试用例的父类 <BR>
- * Copyright: Copyright (c) 2004-2005 TRS信息技术有限公司 <BR>
- * Company: TRS信息技术有限公司(www.trs.com.cn) <BR>
- * 
- * @author TRS信息技术有限公司
+ * 娴嬭瘯鐢ㄤ緥鐨勭埗绫� <BR>
+ * Copyright: Copyright (c) 2004-2005 TRS淇℃伅鎶€鏈�湁闄愬叕鍙� <BR>
+ * Company: TRS淇℃伅鎶€鏈�湁闄愬叕鍙�(www.trs.com.cn) <BR>
+ *
+ * @author TRS淇℃伅鎶€鏈�湁闄愬叕鍙�
  * @version 1.0
  */
 public class TRSWCMBaseTest extends TestCase {
@@ -72,23 +72,23 @@ public class TRSWCMBaseTest extends TestCase {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see junit.framework.TestCase#setUp()
      */
     protected void setUp() throws Exception {
         super.setUp();
 
-        // 设置当前在Eclipse中运行
+        // 璁剧疆褰撳墠鍦‥clipse涓�繍琛�
         ConfigHelper.RUN_IN_ECLISPE = true;
 
         ArrayList arClassPaths = ConfigHelper.getClassPaths();
         // File[] pClassesDirs = TestHelper.getClassFilePaths();
         FileStore[] pClassesDirs = new FileService[arClassPaths.size()];
-		for (int i = 0; i < pClassesDirs.length; i++) {
-			pClassesDirs[i] = new FileService((String) arClassPaths.get(i));
-		}
+        for (int i = 0; i < pClassesDirs.length; i++) {
+            pClassesDirs[i] = new FileService((String) arClassPaths.get(i));
+        }
 
-		FileService fileWCMLib = new FileService("./libs/WCM/");
+        FileService fileWCMLib = new FileService("./libs/WCM/");
         String sExtLibPath = getWCMLibs();
         System.out.println("sExtLibPath:" + sExtLibPath);
         if (sExtLibPath != null) {
@@ -107,7 +107,7 @@ public class TRSWCMBaseTest extends TestCase {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see junit.framework.TestCase#tearDown()
      */
     protected void tearDown() throws Exception {
@@ -127,13 +127,13 @@ public class TRSWCMBaseTest extends TestCase {
         try {
             aChannel = Channel.findById(_nChannelId);
         } catch (Exception ex) {
-            s_logger.error("测试[getChannelById]出现异常!", ex);
-            fail("测试[getChannelById]出现异常!");
+            s_logger.error("娴嬭瘯[getChannelById]鍑虹幇寮傚父锛�", ex);
+            fail("娴嬭瘯[getChannelById]鍑虹幇寮傚父锛�");
         }
         if (aChannel == null) {
-            s_logger.error("[getChannelById]所需的测试数据不正确!ChannelId:["
+            s_logger.error("[getChannelById]鎵€闇€鐨勬祴璇曟暟鎹�笉姝g‘锛丆hannelId:["
                     + _nChannelId + "]");
-            fail("[getChannelById]所需的测试数据不正确!ChannelId:[" + _nChannelId + "]");
+            fail("[getChannelById]鎵€闇€鐨勬祴璇曟暟鎹�笉姝g‘锛丆hannelId:[" + _nChannelId + "]");
         }
         return aChannel;
     }
@@ -146,7 +146,7 @@ public class TRSWCMBaseTest extends TestCase {
     protected WebSite findSiteById(int _nSiteId) throws WCMException {
         WebSite currSite = WebSite.findById(_nSiteId);
         if (currSite == null)
-            fail("指定的Site[" + currSite + "]不存在!");
+            fail("鎸囧畾鐨凷ite[" + currSite + "]涓嶅瓨鍦�紒");
         return currSite;
     }
 
@@ -158,7 +158,7 @@ public class TRSWCMBaseTest extends TestCase {
     protected User findUserById(int _nUserId) throws WCMException {
         User currUser = User.findById(_nUserId);
         if (currUser == null)
-            fail("指定的User[" + _nUserId + "]不存在!");
+            fail("鎸囧畾鐨刄ser[" + _nUserId + "]涓嶅瓨鍦�紒");
         return currUser;
     }
 
@@ -174,7 +174,7 @@ public class TRSWCMBaseTest extends TestCase {
         }
 
         if (group == null) {
-            fail("用户[" + _user.getId() + "]没有所属组织!");
+            fail("鐢ㄦ埛[" + _user.getId() + "]娌℃湁鎵€灞炵粍缁囷紒");
         }
 
         return group;

+ 24 - 24
TRS.WCM.Developer/test/com/trs/web2frame/WCMRoleRightCallerTest.java

@@ -19,13 +19,13 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * Title: TRS 内容协作平台(TRS WCM) <BR>
+ * Title: TRS 鍐呭�鍗忎綔骞冲彴锛圱RS WCM锛� <BR>
  * Description: <BR>
  * TODO <BR>
- * Copyright: Copyright (c) 2004-2005 TRS信息技术有限公司 <BR>
- * Company: TRS信息技术有限公司(www.trs.com.cn) <BR>
+ * Copyright: Copyright (c) 2004-2005 TRS淇℃伅鎶€鏈�湁闄愬叕鍙� <BR>
+ * Company: TRS淇℃伅鎶€鏈�湁闄愬叕鍙�(www.trs.com.cn) <BR>
  *
- * @author TRS信息技术有限公司 LY
+ * @author TRS淇℃伅鎶€鏈�湁闄愬叕鍙� LY
  * @version 1.0
  */
 
@@ -56,39 +56,39 @@ public class WCMRoleRightCallerTest extends TestCase {
     }
 
     /**
-     * 批量创建模板
+     * 鎵归噺鍒涘缓妯℃澘
      */
     public void testCreateRightTemplate() throws WCMException {
 
-        String filePath = Loader.getResource("template").getPath() + "/贵州-权限数据-填充模板.xlsx";
+        String filePath = Loader.getResource("template").getPath() + "/璐靛窞-鏉冮檺鏁版嵁-濉�厖妯℃澘.xlsx";
 
 
         String[][] values = ExcelReader.readExcel(new File(filePath), 0, 1, 0);
-        //获取站点的偏移量
+        //鑾峰彇绔欑偣鐨勫亸绉婚噺
         List<Map<String, Object>> siteOffset = querySiteOffset();
         if (siteOffset == null || siteOffset.isEmpty()) {
-            throw new BizError("偏移量表未获取到数据");
+            throw new BizError("鍋忕Щ閲忚〃鏈�幏鍙栧埌鏁版嵁");
         }
         testRightTemplate(values, siteOffset);
     }
 
     /**
-     * 批量创建角色,授权
+     * 鎵归噺鍒涘缓瑙掕壊锛屾巿鏉�
      */
     public void testCreateRole() throws WCMException {
 
-        String filePath = Loader.getResource("template").getPath() + "/贵州-权限数据-填充模板.xlsx";
+        String filePath = Loader.getResource("template").getPath() + "/璐靛窞-鏉冮檺鏁版嵁-濉�厖妯℃澘.xlsx";
 
         String[][] values = ExcelReader.readExcel(new File(filePath), 1, 1, 0);
-        //获取站点的偏移量
+        //鑾峰彇绔欑偣鐨勫亸绉婚噺
         List<Map<String, Object>> siteOffset = querySiteOffset();
         if (siteOffset == null || siteOffset.isEmpty()) {
-            throw new BizError("偏移量表未获取到数据");
+            throw new BizError("鍋忕Щ閲忚〃鏈�幏鍙栧埌鏁版嵁");
         }
-        //获取栏目的偏移量
+        //鑾峰彇鏍忕洰鐨勫亸绉婚噺
         List<Map<String, Object>> channelOffset = queryChannelOffset();
         if (channelOffset == null || channelOffset.isEmpty()) {
-            throw new BizError("偏移量表未获取到数据");
+            throw new BizError("鍋忕Щ閲忚〃鏈�幏鍙栧埌鏁版嵁");
         }
         testRole(values, siteOffset, channelOffset);
     }
@@ -103,9 +103,9 @@ public class WCMRoleRightCallerTest extends TestCase {
 
             HashMap<String, Object> hParameters = new HashMap<>();
 
-            hParameters.put("CurrUserName", "admin"); // 当前操作的用户
+            hParameters.put("CurrUserName", "admin"); // 褰撳墠鎿嶄綔鐨勭敤鎴�
             if (CMyString.isEmpty(strings[0])) {
-                throw new BizError("权限模板名称不能为空");
+                throw new BizError("鏉冮檺妯℃澘鍚嶇О涓嶈兘涓虹┖");
             }
             hParameters.put("RTName", strings[0]);
 
@@ -115,13 +115,13 @@ public class WCMRoleRightCallerTest extends TestCase {
                 hParameters.put("SITEID", siteId + offsetNum);
             }
             if (CMyString.isEmpty(strings[2])) {
-                throw new BizError("权限值不能为空");
+                throw new BizError("鏉冮檺鍊间笉鑳戒负绌�");
             }
             hParameters.put("RIGHTVALUE", strings[2]);
 
             Dispatch oResult = WCMServiceCaller.Call(sServiceId, sMethodName, hParameters, true);
 
-            System.out.println("结果:" + oResult.getResponseText());
+            System.out.println("缁撴灉:" + oResult.getResponseText());
         }
 
     }
@@ -135,13 +135,13 @@ public class WCMRoleRightCallerTest extends TestCase {
         for (String[] strings : values) {
 
             HashMap<String, Object> hParameters = new HashMap<>();
-            hParameters.put("CurrUserName", "admin"); // 当前操作的用户
+            hParameters.put("CurrUserName", "admin"); // 褰撳墠鎿嶄綔鐨勭敤鎴�
             if (CMyString.isEmpty(strings[0])) {
-                throw new BizError("角色名称不能为空");
+                throw new BizError("瑙掕壊鍚嶇О涓嶈兘涓虹┖");
             }
             hParameters.put("ROLENAME", strings[0]);
             if (CMyString.isEmpty(strings[1])) {
-                throw new BizError("权限模板名称不能为空");
+                throw new BizError("鏉冮檺妯℃澘鍚嶇О涓嶈兘涓虹┖");
             }
             hParameters.put("RIGHTTEMNAME", strings[1]);
             if (!CMyString.isEmpty(strings[2])) {
@@ -162,7 +162,7 @@ public class WCMRoleRightCallerTest extends TestCase {
             }
             if (!CMyString.isEmpty(strings[6])) {
                 String channelIds = strings[6];
-                channelIds = channelIds.replaceAll("", ",");
+                channelIds = channelIds.replaceAll("锛�", ",");
                 String[] channelIdStrs = CMyString.split(channelIds, ",");
                 StringBuilder stringBuilder = new StringBuilder();
                 for (String channelIdStr : channelIdStrs) {
@@ -175,7 +175,7 @@ public class WCMRoleRightCallerTest extends TestCase {
             }
             Dispatch oResult = WCMServiceCaller.Call(sServiceId, sMethodName, hParameters, true);
 
-            System.out.println("结果:" + oResult.getResponseText());
+            System.out.println("缁撴灉:" + oResult.getResponseText());
 
         }
     }
@@ -206,7 +206,7 @@ public class WCMRoleRightCallerTest extends TestCase {
             }
         }
         if (offsetNum == -1) {
-            throw new BizError("没有找到对应的偏移量");
+            throw new BizError("娌℃湁鎵惧埌瀵瑰簲鐨勫亸绉婚噺");
         }
         return offsetNum;
     }