This is an automated email from the ASF dual-hosted git repository. hyunkun pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-ops.git
The following commit(s) were added to refs/heads/master by this push: new adef23a Update i18n and helpUrl configuration adef23a is described below commit adef23a1fbf2d0451bd04b5fe35a70e45c89914a Author: QingDeng <zrl...@163.com> AuthorDate: Tue Jul 24 10:54:03 2018 +0800 Update i18n and helpUrl configuration * Add $helpUrl configuration & Fix provider detail page error. --- .../java/com/alibaba/dubboadmin/governance/util/WebConstants.java | 5 +++++ .../main/java/com/alibaba/dubboadmin/web/mvc/BaseController.java | 1 + .../java/com/alibaba/dubboadmin/web/mvc/home/IndexController.java | 2 ++ dubbo-admin/src/main/resources/i18n/message.properties | 3 +-- dubbo-admin/src/main/resources/i18n/message_en.properties | 6 ++++++ dubbo-admin/src/main/resources/i18n/message_zh.properties | 6 ++++++ .../i18n/{message_zh.properties => message_zh_CN.properties} | 6 ++++++ dubbo-admin/src/main/resources/i18n/message_zh_TW.properties | 6 ++++++ 8 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dubbo-admin/src/main/java/com/alibaba/dubboadmin/governance/util/WebConstants.java b/dubbo-admin/src/main/java/com/alibaba/dubboadmin/governance/util/WebConstants.java index c08f405..9d6cc3f 100644 --- a/dubbo-admin/src/main/java/com/alibaba/dubboadmin/governance/util/WebConstants.java +++ b/dubbo-admin/src/main/java/com/alibaba/dubboadmin/governance/util/WebConstants.java @@ -57,6 +57,11 @@ public class WebConstants { * Operation record page The default page record shows the number of records */ public static final Integer OPRATION_RECORDS_PAGE_SIZE = 100; + + /** + * Help Url + */ + public static final String HELP_URL="https://github.com/apache/incubator-dubbo-ops"; Map<String, Object> context; public static final Map<String, String> mapper = new HashMap<>(); diff --git a/dubbo-admin/src/main/java/com/alibaba/dubboadmin/web/mvc/BaseController.java b/dubbo-admin/src/main/java/com/alibaba/dubboadmin/web/mvc/BaseController.java index ff7bd64..4cab02f 100644 --- a/dubbo-admin/src/main/java/com/alibaba/dubboadmin/web/mvc/BaseController.java +++ b/dubbo-admin/src/main/java/com/alibaba/dubboadmin/web/mvc/BaseController.java @@ -68,6 +68,7 @@ public class BaseController { model.addAttribute("rootContextPath", new RootContextPath(request.getContextPath())); model.addAttribute("tool", tool); model.addAttribute("_method", methodName); + model.addAttribute("helpUrl", WebConstants.HELP_URL); model.addAttribute("_type", type); } diff --git a/dubbo-admin/src/main/java/com/alibaba/dubboadmin/web/mvc/home/IndexController.java b/dubbo-admin/src/main/java/com/alibaba/dubboadmin/web/mvc/home/IndexController.java index 63c3215..b6bb565 100644 --- a/dubbo-admin/src/main/java/com/alibaba/dubboadmin/web/mvc/home/IndexController.java +++ b/dubbo-admin/src/main/java/com/alibaba/dubboadmin/web/mvc/home/IndexController.java @@ -28,6 +28,7 @@ import com.alibaba.dubbo.common.logger.Logger; import com.alibaba.dubbo.common.logger.LoggerFactory; import com.alibaba.dubboadmin.governance.service.ConsumerService; import com.alibaba.dubboadmin.governance.service.ProviderService; +import com.alibaba.dubboadmin.governance.util.WebConstants; import com.alibaba.dubboadmin.registry.common.domain.Consumer; import com.alibaba.dubboadmin.registry.common.domain.Provider; import com.alibaba.dubboadmin.web.pulltool.RootContextPath; @@ -77,6 +78,7 @@ public class IndexController { model.addAttribute("providers", pList.size()); model.addAttribute("consumers", cList.size()); model.addAttribute("applications", applications.size()); + model.addAttribute("helpUrl", WebConstants.HELP_URL); model.addAttribute("tool", new Tool()); return "home/screen/index"; diff --git a/dubbo-admin/src/main/resources/i18n/message.properties b/dubbo-admin/src/main/resources/i18n/message.properties index 6222972..a9fd83f 100644 --- a/dubbo-admin/src/main/resources/i18n/message.properties +++ b/dubbo-admin/src/main/resources/i18n/message.properties @@ -13,5 +13,4 @@ # 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. -# - +# \ No newline at end of file diff --git a/dubbo-admin/src/main/resources/i18n/message_en.properties b/dubbo-admin/src/main/resources/i18n/message_en.properties index 13e2af9..431bca0 100644 --- a/dubbo-admin/src/main/resources/i18n/message_en.properties +++ b/dubbo-admin/src/main/resources/i18n/message_en.properties @@ -760,3 +760,9 @@ NoSuchOperationData=NoSuchOperationData CanNotDeleteDynamicData=CanNotDeleteDynamicData HaveNoServicePrivilege=HaveNoServicePrivilege dynamic.parameters.tip=dynamic.parameters.tip +default.owner=Owner +logger=logger +default.server=default.server +default.actives=default.actives +default.client=default.client +default.connections=default.connections diff --git a/dubbo-admin/src/main/resources/i18n/message_zh.properties b/dubbo-admin/src/main/resources/i18n/message_zh.properties index ab5b863..83e8753 100644 --- a/dubbo-admin/src/main/resources/i18n/message_zh.properties +++ b/dubbo-admin/src/main/resources/i18n/message_zh.properties @@ -794,3 +794,9 @@ NoSuchOperationData=\u64CD\u4F5C\u7684\u6570\u636E\u4E0D\u5B58\u5728\u3002 CanNotDeleteDynamicData=\u4E0D\u80FD\u5220\u9664\u52A8\u6001\u6570\u636E\u3002 HaveNoServicePrivilege=\u60A8\u6CA1\u6709\u8BE5\u670D\u52A1\u7684\u6743\u9650\u3002 dynamic.parameters.tip=\u52A8\u6001URL\u4E0D\u80FD\u76F4\u63A5\u4FEE\u6539\uFF0C\u9700\u901A\u8FC7\u52A8\u6001\u914D\u7F6E\u8FDB\u884C\u8986\u76D6\uFF0C\u683C\u5F0F\u4E0EURL\u53C2\u6570\u76F8\u540C\u3002 +default.owner=\u8d1f\u8d23\u4eba +logger=\u65e5\u5fd7 +default.server=\u9ed8\u8ba4\u670d\u52a1\u7aef +default.actives=\u5e76\u53d1\u8c03\u7528\u6570 +default.client=\u9ed8\u8ba4\u5ba2\u6237\u7aef +default.connections=\u6700\u5927\u8fde\u63a5\u6570 diff --git a/dubbo-admin/src/main/resources/i18n/message_zh.properties b/dubbo-admin/src/main/resources/i18n/message_zh_CN.properties similarity index 99% copy from dubbo-admin/src/main/resources/i18n/message_zh.properties copy to dubbo-admin/src/main/resources/i18n/message_zh_CN.properties index ab5b863..83e8753 100644 --- a/dubbo-admin/src/main/resources/i18n/message_zh.properties +++ b/dubbo-admin/src/main/resources/i18n/message_zh_CN.properties @@ -794,3 +794,9 @@ NoSuchOperationData=\u64CD\u4F5C\u7684\u6570\u636E\u4E0D\u5B58\u5728\u3002 CanNotDeleteDynamicData=\u4E0D\u80FD\u5220\u9664\u52A8\u6001\u6570\u636E\u3002 HaveNoServicePrivilege=\u60A8\u6CA1\u6709\u8BE5\u670D\u52A1\u7684\u6743\u9650\u3002 dynamic.parameters.tip=\u52A8\u6001URL\u4E0D\u80FD\u76F4\u63A5\u4FEE\u6539\uFF0C\u9700\u901A\u8FC7\u52A8\u6001\u914D\u7F6E\u8FDB\u884C\u8986\u76D6\uFF0C\u683C\u5F0F\u4E0EURL\u53C2\u6570\u76F8\u540C\u3002 +default.owner=\u8d1f\u8d23\u4eba +logger=\u65e5\u5fd7 +default.server=\u9ed8\u8ba4\u670d\u52a1\u7aef +default.actives=\u5e76\u53d1\u8c03\u7528\u6570 +default.client=\u9ed8\u8ba4\u5ba2\u6237\u7aef +default.connections=\u6700\u5927\u8fde\u63a5\u6570 diff --git a/dubbo-admin/src/main/resources/i18n/message_zh_TW.properties b/dubbo-admin/src/main/resources/i18n/message_zh_TW.properties index e636803..56ae82e 100644 --- a/dubbo-admin/src/main/resources/i18n/message_zh_TW.properties +++ b/dubbo-admin/src/main/resources/i18n/message_zh_TW.properties @@ -718,3 +718,9 @@ parameter.value=\u53c3\u6578\u503c mock.all.method=\u6240\u6709\u65b9\u6cd5\u7684Mock\u503c mock.method=\u65b9\u6cd5 mock.value=\u7684Mock\u503c +default.owner=\u8ca0\u8cac\u4eba +logger=\u65e5\u8a8c +default.server=\u9ed8\u8a8d\u670d\u52d9\u7aef +default.actives=\u4e26\u767c\u8abf\u7528\u6578 +default.client=\u9ed8\u8a8d\u5ba2\u6236\u7aef +default.connections=\u6700\u5927\u9023\u63a5\u6578