Merge remote-tracking branch 'origin/master'

hsweb-i18n/hsweb-i18n-en/src/main/resources/messages_en_US.properties

@@ -0,0 +1,24 @@
+#
+# /*
+#  * Copyright 2016 http://www.hswebframework.org
+#  *
+#  * Licensed under the Apache License, Version 2.0 (the "License");
+#  * you may not use this file except in compliance with the License.
+#  * You may obtain a copy of the License at
+#  *
+#  *     http://www.apache.org/licenses/LICENSE-2.0
+#  *
+#  * Unless required by applicable law or agreed to in writing, software
+#  * distributed under the License is distributed on an "AS IS" BASIS,
+#  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  * See the License for the specific language governing permissions and
+#  * limitations under the License.
+#  */
+#
+error=Error
+decrypt_param_error=Error in decrypting parameters
+user_not_exists=The user does not exist
+user_is_disabled=The user is disabled
+password_error=Wrong password
+private_key_is_null=Private key is empty
+verify_code_error=Wrong verification code

hsweb-system/hsweb-system-oauth2-client/hsweb-system-oauth2-client-service/hsweb-system-oauth2-client-service-api/src/main/java/org/hswebframework/web/service/oauth2.client/request/definition/ResponseConvertForServerIdDefinition.java

@@ -0,0 +1,30 @@
+/*
+ *  Copyright 2016 http://www.hswebframework.org
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *
+ */
+
+package org.hswebframework.web.service.oauth2.client.request.definition;
+
+import org.hswebframework.web.service.oauth2.client.request.ResponseConvertHandler;
+
+/**
+ * TODO 完成注释
+ *
+ * @author zhouhao
+ */
+public interface ResponseConvertForServerIdDefinition extends ResponseConvertHandler {
+    String getServerId();
+}