Merge branch 'master' into taobao_model

sop-common/sop-gateway-common/src/main/resources/i18n/open/error_en.properties

@@ -5,8 +5,8 @@ open.error_10000=Success
 # 格式：前缀 + 网关错误码 + "_"+  子错误码
 # open.error_（前缀）20000（网关错误码）_isp.unknow-error（子错误码）
 open.error_20000=Service is temporarily unavailable
-open.error_20000_isp.unknow-error=Service is temporarily unavailable
+open.error_20000_isp.unknown-error=Service is temporarily unavailable
-open.error_20000_aop.unknow-error=Service is temporarily unavailable
+open.error_20000_aop.unknown-error=Service is temporarily unavailable
 open.error_20000_isp.service-not-available=Service is temporarily unavailable
 open.error_20000_isv.service-busy=service busy
 

sop-common/sop-gateway-common/src/main/resources/i18n/open/error_zh_CN.properties

@@ -61,8 +61,8 @@ open.error_10000=Success
 # 格式：前缀 + 网关错误码 + "_"+  子错误码
 # open.error_（前缀）20000（网关错误码）_isp.unknow-error（子错误码）
 open.error_20000=\u670d\u52a1\u4e0d\u53ef\u7528
-open.error_20000_isp.unknow-error=\u670d\u52a1\u6682\u4e0d\u53ef\u7528
+open.error_20000_isp.unknown-error=\u670d\u52a1\u6682\u4e0d\u53ef\u7528
-open.error_20000_aop.unknow-error=\u670d\u52a1\u6682\u4e0d\u53ef\u7528
+open.error_20000_aop.unknown-error=\u670d\u52a1\u6682\u4e0d\u53ef\u7528
 open.error_20000_isp.service-not-available=\u670d\u52a1\u6682\u4e0d\u53ef\u7528
 open.error_20000_isv.service-busy=\u670d\u52a1\u5668\u5fd9