Query the Web thread pool list to add the framework logo (#819)

2 years ago · c587a3c5c2
parent c42283b970
commit c587a3c5c2
54 changed files with 95 additions and 1014 deletions
--- a/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ThreadPoolController.java
+++ b/hippo4j-server/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ThreadPoolController.java
@ -120,7 +120,8 @@ public class ThreadPoolController {
    }

    @GetMapping("/list/client/instance/{itemId}")
-    public Result listClientInstance(@PathVariable("itemId") String itemId) {
+    public Result listClientInstance(@PathVariable("itemId") String itemId,
+                                     @RequestParam(value = "mark", required = false) String mark) {
        List<Lease<InstanceInfo>> leases = baseInstanceRegistry.listInstance(itemId);
        Lease<InstanceInfo> first = CollectionUtil.getFirst(leases);
        if (first == null) {
@ -130,7 +131,7 @@ public class ThreadPoolController {
        for (Lease<InstanceInfo> each : leases) {
            Result poolBaseState;
            try {
-                poolBaseState = getPoolBaseState(each.getHolder().getCallBackUrl());
+                poolBaseState = getPoolBaseState(mark, each.getHolder().getCallBackUrl());
            } catch (Throwable ignored) {
                continue;
            }
@ -150,8 +151,9 @@ public class ThreadPoolController {
    }

    @GetMapping("/web/base/info")
-    public Result getPoolBaseState(@RequestParam(value = "clientAddress") String clientAddress) {
-        String urlString = StringUtil.newBuilder(HTTP, clientAddress, "/web/base/info");
+    public Result getPoolBaseState(@RequestParam(value = "mark") String mark,
+                                   @RequestParam(value = "clientAddress") String clientAddress) {
+        String urlString = StringUtil.newBuilder(HTTP, clientAddress, "/web/base/info", "?mark=", mark);
        return HttpUtil.get(urlString, Result.class);
    }

--- a/hippo4j-server/hippo4j-console/src/main/resources/static/index.html
+++ b/hippo4j-server/hippo4j-console/src/main/resources/static/index.html
--- a/hippo4j-server/hippo4j-console/src/main/resources/static/static/css/app.bafcd9e7.css
+++ b/hippo4j-server/hippo4j-console/src/main/resources/static/static/css/app.bafcd9e7.css
--- a/hippo4j-server/hippo4j-console/src/main/resources/static/static/css/app.f483a674.css
+++ b/hippo4j-server/hippo4j-console/src/main/resources/static/static/css/app.f483a674.css
--- a/hippo4j-server/hippo4j-console/src/main/resources/static/static/css/chunk-2fd02e04.adc5827d.css
+++ b/hippo4j-server/hippo4j-console/src/main/resources/static/static/css/chunk-2fd02e04.adc5827d.css
@ -1 +0,0 @@
-.editor-container[data-v-7505e034]{height:82vh;overflow:auto}
--- a/hippo4j-server/hippo4j-console/src/main/resources/static/static/css/chunk-7d41a2d3.55a106d0.css
+++ b/hippo4j-server/hippo4j-console/src/main/resources/static/static/css/chunk-7d41a2d3.55a106d0.css
--- a/hippo4j-server/hippo4j-console/src/main/resources/static/static/img/jsoneditor-icons.8e7baace.svg
+++ b/hippo4j-server/hippo4j-console/src/main/resources/static/static/img/jsoneditor-icons.8e7baace.svg
@ -1,893 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="216"
-   height="144"
-   id="svg4136"
-   version="1.1"
-   inkscape:version="0.91 r"
-   sodipodi:docname="jsoneditor-icons.svg">
-  <title
-     id="title6512">JSON Editor Icons</title>
-  <metadata
-     id="metadata4148">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>JSON Editor Icons</dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs4146" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1028"
-     id="namedview4144"
-     showgrid="true"
-     inkscape:zoom="4"
-     inkscape:cx="97.217248"
-     inkscape:cy="59.950227"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg4136"
-     showguides="false"
-     borderlayer="false"
-     inkscape:showpageshadow="true"
-     showborder="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4640"
-       empspacing="24" />
-  </sodipodi:namedview>
-  <!-- Created with SVG-edit - http://svg-edit.googlecode.com/ -->
-  <g
-     id="g4394">
-    <rect
-       x="4"
-       y="4"
-       width="16"
-       height="16"
-       id="svg_1"
-       style="fill:#1aae1c;fill-opacity:1;stroke:none;stroke-width:0" />
-    <rect
-       style="fill:#ec3f29;fill-opacity:0.94117647;stroke:none;stroke-width:0"
-       x="28.000006"
-       y="3.999995"
-       width="16"
-       height="16"
-       id="svg_1-7" />
-    <rect
-       id="rect4165"
-       height="16"
-       width="16"
-       y="3.999995"
-       x="52.000004"
-       style="fill:#4c4c4c;fill-opacity:1;stroke:none;stroke-width:0" />
-    <rect
-       style="fill:#4c4c4c;fill-opacity:1;stroke:none;stroke-width:0"
-       x="172.00002"
-       y="3.9999852"
-       width="16"
-       height="16"
-       id="rect4175" />
-    <rect
-       style="fill:#4c4c4c;fill-opacity:1;stroke:none;stroke-width:0"
-       x="196"
-       y="3.999995"
-       width="16"
-       height="16"
-       id="rect4175-3" />
-    <g
-       style="stroke:none"
-       id="g4299">
-      <rect
-         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0"
-         id="svg_1-1"
-         height="1.9999986"
-         width="9.9999924"
-         y="10.999998"
-         x="7.0000048" />
-      <rect
-         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0"
-         id="svg_1-1-1"
-         height="9.9999838"
-         width="1.9999955"
-         y="7.0000114"
-         x="11.000005" />
-    </g>
-    <g
-       style="stroke:none"
-       transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,19.029435,12.000001)"
-       id="g4299-3">
-      <rect
-         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0"
-         id="svg_1-1-0"
-         height="1.9999986"
-         width="9.9999924"
-         y="10.999998"
-         x="7.0000048" />
-      <rect
-         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0"
-         id="svg_1-1-1-9"
-         height="9.9999838"
-         width="1.9999955"
-         y="7.0000114"
-         x="11.000005" />
-    </g>
-    <rect
-       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0"
-       x="55.000004"
-       y="7.0000048"
-       width="6.9999909"
-       height="6.9999905"
-       id="svg_1-7-5" />
-    <rect
-       id="rect4354"
-       height="6.9999905"
-       width="6.9999909"
-       y="10.00001"
-       x="58"
-       style="fill:#ffffff;fill-opacity:1;stroke:#4c4c4c;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <rect
-       style="fill:#ffffff;fill-opacity:1;stroke:#3c80df;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.94117647"
-       x="58.000004"
-       y="10.000005"
-       width="6.9999909"
-       height="6.9999905"
-       id="svg_1-7-5-7" />
-    <g
-       id="g4378">
-      <rect
-         id="svg_1-7-5-3"
-         height="1.9999965"
-         width="7.9999909"
-         y="10.999999"
-         x="198"
-         style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0" />
-      <rect
-         style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0"
-         x="198"
-         y="7.0000005"
-         width="11.999995"
-         height="1.9999946"
-         id="rect4374" />
-      <rect
-         style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0"
-         x="198"
-         y="14.999996"
-         width="3.9999928"
-         height="1.9999995"
-         id="rect4376" />
-    </g>
-    <g
-       id="g4383"
-       transform="matrix(1,0,0,-1,-23.999995,23.999995)">
-      <rect
-         style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0"
-         x="198"
-         y="10.999999"
-         width="7.9999909"
-         height="1.9999965"
-         id="rect4385" />
-      <rect
-         id="rect4387"
-         height="1.9999946"
-         width="11.999995"
-         y="7.0000005"
-         x="198"
-         style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0" />
-      <rect
-         id="rect4389"
-         height="1.9999995"
-         width="3.9999928"
-         y="14.999996"
-         x="198"
-         style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0" />
-    </g>
-    <rect
-       y="3.9999199"
-       x="76"
-       height="16"
-       width="16"
-       id="rect3754-4"
-       style="fill:#4c4c4c;fill-opacity:1;stroke:none" />
-    <path
-       sodipodi:nodetypes="cccccccc"
-       inkscape:connector-curvature="0"
-       id="path4351"
-       d="m 85.10447,6.0157384 -0.0156,1.4063 c 3.02669,-0.2402 0.33008,3.6507996 2.48438,4.5780996 -2.18694,1.0938 0.49191,4.9069 -2.45313,4.5781 l -0.0156,1.4219 c 5.70828,0.559 1.03264,-5.1005 4.70313,-5.2656 l 0,-1.4063 c -3.61303,-0.027 1.11893,-5.7069996 -4.70313,-5.3124996 z"
-       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       sodipodi:nodetypes="cccccccc"
-       inkscape:connector-curvature="0"
-       id="path4351-9"
-       d="m 82.78125,5.9984384 0.0156,1.4063 c -3.02668,-0.2402 -0.33007,3.6506996 -2.48437,4.5780996 2.18694,1.0938 -0.49192,4.9069 2.45312,4.5781 l 0.0156,1.4219 c -5.70827,0.559 -1.03263,-5.1004 -4.70312,-5.2656 l 0,-1.4063 c 3.61303,-0.027 -1.11894,-5.7070996 4.70312,-5.3124996 z"
-       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <rect
-       y="3.9999199"
-       x="100"
-       height="16"
-       width="16"
-       id="rect3754-25"
-       style="fill:#4c4c4c;fill-opacity:1;stroke:none" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path2987"
-       d="m 103.719,5.6719384 0,12.7187996 3.03125,0 0,-1.5313 -1.34375,0 0,-9.6249996 1.375,0 0,-1.5625 z"
-       style="fill:#ffffff;fill-opacity:1;stroke:none" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path2987-1"
-       d="m 112.2185,5.6721984 0,12.7187996 -3.03125,0 0,-1.5313 1.34375,0 0,-9.6249996 -1.375,0 0,-1.5625 z"
-       style="fill:#ffffff;fill-opacity:1;stroke:none" />
-    <rect
-       y="3.9999199"
-       x="124"
-       height="16"
-       width="16"
-       id="rect3754-73"
-       style="fill:#4c4c4c;fill-opacity:1;stroke:none" />
-    <path
-       sodipodi:nodetypes="ccccccccc"
-       inkscape:connector-curvature="0"
-       id="path3780"
-       d="m 126.2824,17.602938 1.78957,0 1.14143,-2.8641 5.65364,0 1.14856,2.8641 1.76565,0 -4.78687,-11.1610996 -1.91903,0 z"
-       style="fill:#ffffff;fill-opacity:1;stroke:none" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path3782"
-       d="m 129.72704,13.478838 4.60852,0.01 -2.30426,-5.5497996 z"
-       style="fill:#4c4c4c;fill-opacity:1;stroke:none" />
-    <rect
-       y="3.9999199"
-       x="148"
-       height="16"
-       width="16"
-       id="rect3754-35"
-       style="fill:#4c4c4c;fill-opacity:1;stroke:none" />
-    <path
-       sodipodi:nodetypes="ccccccc"
-       inkscape:connector-curvature="0"
-       id="path5008-2"
-       d="m 156.47655,5.8917384 0,2.1797 0.46093,2.3983996 1.82813,0 0.39844,-2.3983996 0,-2.1797 z"
-       style="fill:#ffffff;fill-opacity:1;stroke:none" />
-    <path
-       sodipodi:nodetypes="ccccccc"
-       inkscape:connector-curvature="0"
-       id="path5008-2-8"
-       d="m 152.51561,5.8906384 0,2.1797 0.46094,2.3983996 1.82812,0 0.39844,-2.3983996 0,-2.1797 z"
-       style="fill:#ffffff;fill-opacity:1;stroke:none" />
-  </g>
-  <rect
-     x="4"
-     y="27.999994"
-     width="16"
-     height="16"
-     id="rect4432"
-     style="fill:#d3d3d3;fill-opacity:1;stroke:none;stroke-width:0" />
-  <rect
-     style="fill:#d3d3d3;fill-opacity:1;stroke:none;stroke-width:0"
-     x="28.000006"
-     y="27.99999"
-     width="16"
-     height="16"
-     id="rect4434" />
-  <rect
-     id="rect4436"
-     height="16"
-     width="16"
-     y="27.99999"
-     x="52.000004"
-     style="fill:#d3d3d3;fill-opacity:1;stroke:#000000;stroke-width:0" />
-  <rect
-     style="fill:#d3d3d3;stroke:#000000;stroke-width:0"
-     x="172.00002"
-     y="27.999981"
-     width="16"
-     height="16"
-     id="rect4446" />
-  <rect
-     style="fill:#d3d3d3;stroke:#000000;stroke-width:0"
-     x="196"
-     y="27.99999"
-     width="16"
-     height="16"
-     id="rect4448" />
-  <g
-     id="g4466"
-     style="stroke:none"
-     transform="translate(0,23.999995)">
-    <rect
-       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0"
-       id="rect4468"
-       height="1.9999986"
-       width="9.9999924"
-       y="10.999998"
-       x="7.0000048" />
-    <rect
-       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0"
-       id="rect4470"
-       height="9.9999838"
-       width="1.9999955"
-       y="7.0000114"
-       x="11.000005" />
-  </g>
-  <g
-     transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,19.029435,35.999996)"
-     id="g4472"
-     style="stroke:none">
-    <rect
-       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0"
-       id="rect4474"
-       height="1.9999986"
-       width="9.9999924"
-       y="10.999998"
-       x="7.0000048" />
-    <rect
-       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0"
-       id="rect4476"
-       height="9.9999838"
-       width="1.9999955"
-       y="7.0000114"
-       x="11.000005" />
-  </g>
-  <rect
-     style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0"
-     x="55.000004"
-     y="31"
-     width="6.9999909"
-     height="6.9999905"
-     id="rect4478" />
-  <rect
-     id="rect4480"
-     height="6.9999905"
-     width="6.9999909"
-     y="34.000008"
-     x="58"
-     style="fill:#ffffff;fill-opacity:1;stroke:#d3d3d3;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none" />
-  <rect
-     style="fill:#ffffff;fill-opacity:1;stroke:#d3d3d3;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-     x="58.000004"
-     y="34.000004"
-     width="6.9999909"
-     height="6.9999905"
-     id="rect4482" />
-  <g
-     id="g4484"
-     transform="translate(0,23.999995)">
-    <rect
-       id="rect4486"
-       height="1.9999965"
-       width="7.9999909"
-       y="10.999999"
-       x="198"
-       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0" />
-    <rect
-       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0"
-       x="198"
-       y="7.0000005"
-       width="11.999995"
-       height="1.9999946"
-       id="rect4488" />
-    <rect
-       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0"
-       x="198"
-       y="14.999996"
-       width="3.9999928"
-       height="1.9999995"
-       id="rect4490" />
-  </g>
-  <g
-     id="g4492"
-     transform="matrix(1,0,0,-1,-23.999995,47.99999)">
-    <rect
-       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0"
-       x="198"
-       y="10.999999"
-       width="7.9999909"
-       height="1.9999965"
-       id="rect4494" />
-    <rect
-       id="rect4496"
-       height="1.9999946"
-       width="11.999995"
-       y="7.0000005"
-       x="198"
-       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0" />
-    <rect
-       id="rect4498"
-       height="1.9999995"
-       width="3.9999928"
-       y="14.999996"
-       x="198"
-       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0" />
-  </g>
-  <rect
-     style="fill:#d3d3d3;fill-opacity:1;stroke:none"
-     id="rect3754-8"
-     width="16"
-     height="16"
-     x="76"
-     y="27.99992" />
-  <path
-     style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m 85.10448,30.015537 -0.0156,1.4063 c 3.02668,-0.2402 0.33007,3.6508 2.48438,4.5781 -2.18695,1.0938 0.49191,4.90688 -2.45313,4.57808 l -0.0156,1.4219 c 5.70827,0.559 1.03263,-5.10048 4.70313,-5.26558 l 0,-1.4063 c -3.61304,-0.027 1.11893,-5.707 -4.70313,-5.3125 z"
-     id="path4351-1"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cccccccc" />
-  <path
-     style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m 82.78126,29.998237 0.0156,1.4063 c -3.02668,-0.2402 -0.33008,3.6507 -2.48438,4.5781 2.18694,1.0938 -0.49191,4.90688 2.45313,4.57808 l 0.0156,1.4219 c -5.70828,0.559 -1.03264,-5.10038 -4.70313,-5.26558 l 0,-1.4063 c 3.61303,-0.027 -1.11893,-5.7071 4.70313,-5.3125 z"
-     id="path4351-9-5"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cccccccc" />
-  <rect
-     style="fill:#d3d3d3;fill-opacity:1;stroke:none"
-     id="rect3754-65"
-     width="16"
-     height="16"
-     x="100"
-     y="27.99992" />
-  <path
-     style="fill:#ffffff;fill-opacity:1;stroke:none"
-     d="m 103.719,29.671937 0,12.71878 3.03125,0 0,-1.5313 -1.34375,0 0,-9.62498 1.375,0 0,-1.5625 z"
-     id="path2987-8"
-     inkscape:connector-curvature="0" />
-  <path
-     style="fill:#ffffff;fill-opacity:1;stroke:none"
-     d="m 112.2185,29.671937 0,12.71878 -3.03125,0 0,-1.5313 1.34375,0 0,-9.62498 -1.375,0 0,-1.5625 z"
-     id="path2987-1-9"
-     inkscape:connector-curvature="0" />
-  <rect
-     style="fill:#d3d3d3;fill-opacity:1;stroke:none"
-     id="rect3754-92"
-     width="16"
-     height="16"
-     x="124"
-     y="27.99992" />
-  <path
-     style="fill:#ffffff;fill-opacity:1;stroke:none"
-     d="m 126.2824,41.602917 1.78957,0 1.14143,-2.86408 5.65364,0 1.14856,2.86408 1.76565,0 -4.78687,-11.16108 -1.91902,0 z"
-     id="path3780-9"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="ccccccccc" />
-  <path
-     style="fill:#d3d3d3;fill-opacity:1;stroke:none"
-     d="m 129.72704,37.478837 4.60852,0.01 -2.30426,-5.5498 z"
-     id="path3782-2"
-     inkscape:connector-curvature="0" />
-  <rect
-     style="fill:#d3d3d3;fill-opacity:1;stroke:none"
-     id="rect3754-47"
-     width="16"
-     height="16"
-     x="148"
-     y="27.99992" />
-  <path
-     style="fill:#ffffff;fill-opacity:1;stroke:none"
-     d="m 156.47656,29.891737 0,2.1797 0.46093,2.3984 1.82813,0 0.39844,-2.3984 0,-2.1797 z"
-     id="path5008-2-1"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="ccccccc" />
-  <path
-     style="fill:#ffffff;fill-opacity:1;stroke:none"
-     d="m 152.51562,29.890637 0,2.1797 0.46094,2.3984 1.82812,0 0.39844,-2.3984 0,-2.1797 z"
-     id="path5008-2-8-8"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="ccccccc" />
-  <rect
-     id="svg_1-7-2"
-     height="1.9999961"
-     width="11.999996"
-     y="64"
-     x="54"
-     style="fill:#4c4c4c;fill-opacity:0.98431373;stroke:none;stroke-width:0" />
-  <rect
-     id="svg_1-7-2-2"
-     height="2.9999905"
-     width="2.9999907"
-     y="52"
-     x="80.000008"
-     style="fill:#4c4c4c;fill-opacity:0.98431373;stroke:none;stroke-width:0" />
-  <rect
-     style="fill:#4c4c4c;fill-opacity:0.98431373;stroke:none;stroke-width:0"
-     x="85.000008"
-     y="52"
-     width="2.9999907"
-     height="2.9999905"
-     id="rect4561" />
-  <rect
-     style="fill:#4c4c4c;fill-opacity:0.98431373;stroke:none;stroke-width:0"
-     x="80.000008"
-     y="58"
-     width="2.9999907"
-     height="2.9999905"
-     id="rect4563" />
-  <rect
-     id="rect4565"
-     height="2.9999905"
-     width="2.9999907"
-     y="58"
-     x="85.000008"
-     style="fill:#4c4c4c;fill-opacity:0.98431373;stroke:none;stroke-width:0" />
-  <rect
-     id="rect4567"
-     height="2.9999905"
-     width="2.9999907"
-     y="64"
-     x="80.000008"
-     style="fill:#4c4c4c;fill-opacity:0.98431373;stroke:none;stroke-width:0" />
-  <rect
-     style="fill:#4c4c4c;fill-opacity:0.98431373;stroke:none;stroke-width:0"
-     x="85.000008"
-     y="64"
-     width="2.9999907"
-     height="2.9999905"
-     id="rect4569" />
-  <circle
-     style="opacity:1;fill:none;fill-opacity:1;stroke:#4c4c4c;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
-     id="path4571"
-     cx="110.06081"
-     cy="57.939209"
-     r="4.7438836" />
-  <rect
-     style="fill:#4c4c4c;fill-opacity:0.98431373;stroke:none;stroke-width:0"
-     x="116.64566"
-     y="-31.79752"
-     width="4.229713"
-     height="6.4053884"
-     id="rect4563-2"
-     transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)" />
-  <path
-     style="fill:#4c4c4c;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 125,56 138.77027,56.095 132,64 Z"
-     id="path4613"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cccc" />
-  <path
-     sodipodi:nodetypes="cccc"
-     inkscape:connector-curvature="0"
-     id="path4615"
-     d="M 149,64 162.77027,63.905 156,56 Z"
-     style="fill:#4c4c4c;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  <rect
-     style="fill:#4c4c4c;fill-opacity:0.98431373;stroke:none;stroke-width:0"
-     x="54"
-     y="53"
-     width="11.999996"
-     height="1.9999961"
-     id="rect4638" />
-  <rect
-     id="svg_1-7-2-24"
-     height="1.9999957"
-     width="12.99999"
-     y="-56"
-     x="53"
-     style="fill:#4c4c4c;fill-opacity:0.98431373;stroke:none;stroke-width:0"
-     transform="matrix(0,1,-1,0,0,0)" />
-  <rect
-     transform="matrix(0,1,-1,0,0,0)"
-     style="fill:#4c4c4c;fill-opacity:0.98431373;stroke:none;stroke-width:0"
-     x="53"
-     y="-66"
-     width="12.99999"
-     height="1.9999957"
-     id="rect4657" />
-  <rect
-     id="rect4659"
-     height="0.99999291"
-     width="11.999999"
-     y="57"
-     x="54"
-     style="fill:#4c4c4c;fill-opacity:0.98431373;stroke:none;stroke-width:0" />
-  <rect
-     style="fill:#d3d3d3;fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1"
-     x="54"
-     y="88.000122"
-     width="11.999996"
-     height="1.9999961"
-     id="rect4661" />
-  <rect
-     style="fill:#d3d3d3;fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1"
-     x="80.000008"
-     y="76.000122"
-     width="2.9999907"
-     height="2.9999905"
-     id="rect4663" />
-  <rect
-     id="rect4665"
-     height="2.9999905"
-     width="2.9999907"
-     y="76.000122"
-     x="85.000008"
-     style="fill:#d3d3d3;fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1" />
-  <rect
-     id="rect4667"
-     height="2.9999905"
-     width="2.9999907"
-     y="82.000122"
-     x="80.000008"
-     style="fill:#d3d3d3;fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1" />
-  <rect
-     style="fill:#d3d3d3;fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1"
-     x="85.000008"
-     y="82.000122"
-     width="2.9999907"
-     height="2.9999905"
-     id="rect4669" />
-  <rect
-     style="fill:#d3d3d3;fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1"
-     x="80.000008"
-     y="88.000122"
-     width="2.9999907"
-     height="2.9999905"
-     id="rect4671" />
-  <rect
-     id="rect4673"
-     height="2.9999905"
-     width="2.9999907"
-     y="88.000122"
-     x="85.000008"
-     style="fill:#d3d3d3;fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1" />
-  <circle
-     r="4.7438836"
-     cy="81.939331"
-     cx="110.06081"
-     id="circle4675"
-     style="opacity:1;fill:none;fill-opacity:1;stroke:#d3d3d3;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  <rect
-     transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)"
-     id="rect4677"
-     height="6.4053884"
-     width="4.229713"
-     y="-14.826816"
-     x="133.6163"
-     style="fill:#d3d3d3;fill-opacity:1;stroke:#d3d3d3;stroke-width:0;stroke-opacity:1" />
-  <path
-     sodipodi:nodetypes="cccc"
-     inkscape:connector-curvature="0"
-     id="path4679"
-     d="m 125,80.000005 13.77027,0.09499 L 132,87.999992 Z"
-     style="fill:#d3d3d3;fill-opacity:1;fill-rule:evenodd;stroke:#d3d3d3;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  <path
-     style="fill:#d3d3d3;fill-opacity:1;fill-rule:evenodd;stroke:#d3d3d3;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 149,88.0002 162.77027,87.9052 156,80.0002 Z"
-     id="path4681"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cccc" />
-  <rect
-     id="rect4683"
-     height="1.9999961"
-     width="11.999996"
-     y="77.000122"
-     x="54"
-     style="fill:#d3d3d3;fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1" />
-  <rect
-     transform="matrix(0,1,-1,0,0,0)"
-     style="fill:#d3d3d3;fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1"
-     x="77.000122"
-     y="-56"
-     width="12.99999"
-     height="1.9999957"
-     id="rect4685" />
-  <rect
-     id="rect4687"
-     height="1.9999957"
-     width="12.99999"
-     y="-66"
-     x="77.000122"
-     style="fill:#d3d3d3;fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1"
-     transform="matrix(0,1,-1,0,0,0)" />
-  <rect
-     style="fill:#d3d3d3;fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1"
-     x="54"
-     y="81.000122"
-     width="11.999999"
-     height="0.99999291"
-     id="rect4689" />
-  <rect
-     id="rect4761-1"
-     height="1.9999945"
-     width="15.99999"
-     y="101"
-     x="76.000008"
-     style="fill:#ffffff;fill-opacity:0.80000007;stroke:none;stroke-width:0" />
-  <rect
-     id="rect4761-0"
-     height="1.9999945"
-     width="15.99999"
-     y="105"
-     x="76.000008"
-     style="fill:#ffffff;fill-opacity:0.80000007;stroke:none;stroke-width:0" />
-  <rect
-     id="rect4761-7"
-     height="1.9999945"
-     width="9"
-     y="109"
-     x="76.000008"
-     style="fill:#ffffff;fill-opacity:0.80000007;stroke:none;stroke-width:0" />
-  <rect
-     id="rect4761-1-1"
-     height="1.9999945"
-     width="12"
-     y="125"
-     x="76.000008"
-     style="fill:#ffffff;fill-opacity:0.80000007;stroke:none;stroke-width:0" />
-  <rect
-     id="rect4761-1-1-4"
-     height="1.9999945"
-     width="10"
-     y="137"
-     x="76.000008"
-     style="fill:#ffffff;fill-opacity:0.80000007;stroke:none;stroke-width:0" />
-  <rect
-     id="rect4761-1-1-4-4"
-     height="1.9999945"
-     width="10"
-     y="129"
-     x="82"
-     style="fill:#ffffff;fill-opacity:0.80000007;stroke:none;stroke-width:0" />
-  <rect
-     id="rect4761-1-1-4-4-3"
-     height="1.9999945"
-     width="9"
-     y="133"
-     x="82"
-     style="fill:#ffffff;fill-opacity:0.80000007;stroke:none;stroke-width:0" />
-  <path
-     inkscape:connector-curvature="0"
-     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.8;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.66157866;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-     d="m 36.398438,100.0254 c -0.423362,-0.013 -0.846847,0.01 -1.265626,0.062 -1.656562,0.2196 -3.244567,0.9739 -4.507812,2.2266 L 29,100.5991 l -2.324219,7.7129 7.826172,-1.9062 -1.804687,-1.9063 c 1.597702,-1.5308 4.048706,-1.8453 5.984375,-0.7207 1.971162,1.1452 2.881954,3.3975 2.308593,5.5508 -0.573361,2.1533 -2.533865,3.6953 -4.830078,3.6953 l 0,3.0742 c 3.550756,0 6.710442,-2.4113 7.650391,-5.9414 0.939949,-3.5301 -0.618463,-7.2736 -3.710938,-9.0703 -1.159678,-0.6738 -2.431087,-1.0231 -3.701171,-1.0625 z"
-     id="path4138" />
-  <path
-     inkscape:connector-curvature="0"
-     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.8;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.66157866;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-     d="m 59.722656,99.9629 c -1.270084,0.039 -2.541493,0.3887 -3.701172,1.0625 -3.092475,1.7967 -4.650886,5.5402 -3.710937,9.0703 0.939949,3.5301 4.09768,5.9414 7.648437,5.9414 l 0,-3.0742 c -2.296214,0 -4.256717,-1.542 -4.830078,-3.6953 -0.573361,-2.1533 0.337432,-4.4056 2.308594,-5.5508 1.935731,-1.1246 4.38863,-0.8102 5.986326,0.7207 l -1.806638,1.9063 7.828128,1.9062 -2.32422,-7.7129 -1.62696,1.7168 c -1.26338,-1.2531 -2.848917,-2.0088 -4.505855,-2.2285 -0.418778,-0.055 -0.842263,-0.076 -1.265625,-0.062 z"
-     id="path4138-1" />
-  <path
-     inkscape:connector-curvature="0"
-     style="opacity:0.8;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.966;stroke-miterlimit:4;stroke-dasharray:none"
-     d="m 10.5,100 0,2 -2.4999996,0 L 12,107 l 4,-5 -2.5,0 0,-2 -3,0 z"
-     id="path3055-0-77" />
-  <path
-     style="opacity:0.8;fill:none;stroke:#ffffff;stroke-width:1.966;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m 4.9850574,108.015 14.0298856,-0.03"
-     id="path5244-5-0-5"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cc" />
-  <path
-     style="opacity:0.8;fill:none;stroke:#ffffff;stroke-width:1.966;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m 4.9849874,132.015 14.0298866,-0.03"
-     id="path5244-5-0-5-8"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cc" />
-  <path
-     inkscape:connector-curvature="0"
-     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.4;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.66157866;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-     d="m 36.398438,123.9629 c -0.423362,-0.013 -0.846847,0.01 -1.265626,0.062 -1.656562,0.2196 -3.244567,0.9739 -4.507812,2.2266 L 29,124.5366 l -2.324219,7.7129 7.826172,-1.9062 -1.804687,-1.9063 c 1.597702,-1.5308 4.048706,-1.8453 5.984375,-0.7207 1.971162,1.1453 2.881954,3.3975 2.308593,5.5508 -0.573361,2.1533 -2.533864,3.6953 -4.830078,3.6953 l 0,3.0742 c 3.550757,0 6.710442,-2.4093 7.650391,-5.9394 0.939949,-3.5301 -0.618463,-7.2756 -3.710938,-9.0723 -1.159678,-0.6737 -2.431087,-1.0231 -3.701171,-1.0625 z"
-     id="path4138-12" />
-  <path
-     inkscape:connector-curvature="0"
-     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.4;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.66157866;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-     d="m 59.722656,123.9629 c -1.270084,0.039 -2.541493,0.3888 -3.701172,1.0625 -3.092475,1.7967 -4.650886,5.5422 -3.710937,9.0723 0.939949,3.5301 4.09768,5.9394 7.648437,5.9394 l 0,-3.0742 c -2.296214,0 -4.256717,-1.542 -4.830078,-3.6953 -0.573361,-2.1533 0.337432,-4.4055 2.308594,-5.5508 1.935731,-1.1246 4.38863,-0.8102 5.986326,0.7207 l -1.806638,1.9063 7.828128,1.9062 -2.32422,-7.7129 -1.62696,1.7168 c -1.26338,-1.2531 -2.848917,-2.0088 -4.505855,-2.2285 -0.418778,-0.055 -0.842263,-0.076 -1.265625,-0.062 z"
-     id="path4138-1-3" />
-  <path
-     id="path6191"
-     d="m 10.5,116 0,-2 -2.4999996,0 L 12,109 l 4,5 -2.5,0 0,2 -3,0 z"
-     style="opacity:0.8;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.966;stroke-miterlimit:4;stroke-dasharray:none"
-     inkscape:connector-curvature="0" />
-  <path
-     inkscape:connector-curvature="0"
-     style="opacity:0.8;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.966;stroke-miterlimit:4;stroke-dasharray:none"
-     d="m 10.5,129 0,-2 -2.4999996,0 L 12,122 l 4,5 -2.5,0 0,2 -3,0 z"
-     id="path6193" />
-  <path
-     id="path6195"
-     d="m 10.5,135 0,2 -2.4999996,0 L 12,142 l 4,-5 -2.5,0 0,-2 -3,0 z"
-     style="opacity:0.8;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.966;stroke-miterlimit:4;stroke-dasharray:none"
-     inkscape:connector-curvature="0" />
-  <path
-     sodipodi:type="star"
-     style="fill:#4d4d4d;fill-opacity:0.90196078;stroke:#d3d3d3;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
-     id="path4500"
-     sodipodi:sides="3"
-     sodipodi:cx="11.55581"
-     sodipodi:cy="60.073242"
-     sodipodi:r1="5.1116104"
-     sodipodi:r2="2.5558052"
-     sodipodi:arg1="0"
-     sodipodi:arg2="1.0471976"
-     inkscape:flatsided="false"
-     inkscape:rounded="0"
-     inkscape:randomized="0"
-     d="m 16.66742,60.073242 -3.833708,2.213392 -3.8337072,2.213393 0,-4.426785 0,-4.426784 3.8337082,2.213392 z"
-     inkscape:transform-center-x="-1.2779026" />
-  <path
-     inkscape:transform-center-x="1.277902"
-     d="m -31.500004,60.073242 -3.833708,2.213392 -3.833707,2.213393 0,-4.426785 0,-4.426784 3.833707,2.213392 z"
-     inkscape:randomized="0"
-     inkscape:rounded="0"
-     inkscape:flatsided="false"
-     sodipodi:arg2="1.0471976"
-     sodipodi:arg1="0"
-     sodipodi:r2="2.5558052"
-     sodipodi:r1="5.1116104"
-     sodipodi:cy="60.073242"
-     sodipodi:cx="-36.611614"
-     sodipodi:sides="3"
-     id="path4502"
-     style="fill:#4d4d4d;fill-opacity:0.90196078;stroke:#d3d3d3;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
-     sodipodi:type="star"
-     transform="scale(-1,1)" />
-  <path
-     d="m 16.66742,60.073212 -3.833708,2.213392 -3.8337072,2.213392 0,-4.426784 0,-4.426785 3.8337082,2.213392 z"
-     inkscape:randomized="0"
-     inkscape:rounded="0"
-     inkscape:flatsided="false"
-     sodipodi:arg2="1.0471976"
-     sodipodi:arg1="0"
-     sodipodi:r2="2.5558052"
-     sodipodi:r1="5.1116104"
-     sodipodi:cy="60.073212"
-     sodipodi:cx="11.55581"
-     sodipodi:sides="3"
-     id="path4504"
-     style="fill:#4d4d4d;fill-opacity:0.90196078;stroke:#d3d3d3;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
-     sodipodi:type="star"
-     transform="matrix(0,1,-1,0,72.0074,71.7877)"
-     inkscape:transform-center-y="1.2779029" />
-  <path
-     inkscape:transform-center-y="-1.2779026"
-     transform="matrix(0,-1,-1,0,96,96)"
-     sodipodi:type="star"
-     style="fill:#4d4d4d;fill-opacity:0.90196078;stroke:#d3d3d3;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
-     id="path4506"
-     sodipodi:sides="3"
-     sodipodi:cx="11.55581"
-     sodipodi:cy="60.073212"
-     sodipodi:r1="5.1116104"
-     sodipodi:r2="2.5558052"
-     sodipodi:arg1="0"
-     sodipodi:arg2="1.0471976"
-     inkscape:flatsided="false"
-     inkscape:rounded="0"
-     inkscape:randomized="0"
-     d="m 16.66742,60.073212 -3.833708,2.213392 -3.8337072,2.213392 0,-4.426784 0,-4.426785 3.8337082,2.213392 z" />
-  <path
-     sodipodi:nodetypes="cccc"
-     inkscape:connector-curvature="0"
-     id="path4615-5"
-     d="m 171.82574,65.174193 16.34854,0 -8.17427,-13.348454 z"
-     style="fill:#fbb917;fill-opacity:1;fill-rule:evenodd;stroke:#fbb917;stroke-width:1.65161395;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  <path
-     style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 179,55 0,6 2,0 0,-6"
-     id="path4300"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cccc" />
-  <path
-     style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 179,62 0,2 2,0 0,-2"
-     id="path4300-6"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cccc" />
-</svg>
--- a/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/app.a27d19f1.js
+++ b/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/app.a27d19f1.js
--- a/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/app.bb4a0c23.js
+++ b/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/app.bb4a0c23.js
--- a/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-05d50b2c.426a28fe.js
+++ b/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-05d50b2c.426a28fe.js
--- a/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-078a7535.81c3fb35.js
+++ b/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-078a7535.81c3fb35.js
--- a/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-149a43cf.298679e1.js
+++ b/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-149a43cf.298679e1.js
--- a/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-149a43cf.b9de878f.js
+++ b/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-149a43cf.b9de878f.js
--- a/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-19132c4b.3b525d4f.js
+++ b/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-19132c4b.3b525d4f.js
--- a/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-19132c4b.64ef0af8.js
+++ b/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-19132c4b.64ef0af8.js
--- a/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-1b3cdbc8.16afc691.js
+++ b/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-1b3cdbc8.16afc691.js
--- a/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-1b3cdbc8.d5430fc7.js
+++ b/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-1b3cdbc8.d5430fc7.js
--- a/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-1c44a627.fc235931.js
+++ b/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-1c44a627.fc235931.js
--- a/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-2b48c09a.039174d3.js
+++ b/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-2b48c09a.039174d3.js
--- a/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-2d230a36.19c465ef.js
+++ b/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-2d230a36.19c465ef.js
--- a/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-2e217faa.914156a0.js
+++ b/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-2e217faa.914156a0.js
--- a/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-2fd02e04.e8ae8f80.js
+++ b/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-2fd02e04.e8ae8f80.js
@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2fd02e04"],{"64b7":function(e,t,n){"use strict";n("de5f")},ab3b:function(e,t,n){"use strict";n.r(t);var a=function(){var e=this,t=e.$createElement,n=e._self._c||t;return n("div",{staticClass:"app-container"},[n("split-pane",{attrs:{split:"vertical"},on:{resize:e.resize}},[n("template",{slot:"paneL"},[n("el-input",{attrs:{type:"textarea",rows:36,placeholder:"请输入内容",clearable:""},on:{change:e.originChange},model:{value:e.originText,callback:function(t){e.originText=t},expression:"originText"}})],1),e._v(" "),n("template",{slot:"paneR"},[n("div",{staticClass:"editor-container"},[n("JSONEditor",{attrs:{json:e.formatedValue}})],1)])],2)],1)},i=[],o=n("19ab"),r=n.n(o),s=n("33c3"),c={name:"JsonFormat",components:{splitPane:r.a,JSONEditor:s["a"]},data:function(){return{originText:"",formatedValue:""}},watch:{originText:function(e){try{this.formatedValue=JSON.parse(e)}catch(t){}}},methods:{resize:function(){},originChange:function(e){}}},l=c,u=(n("64b7"),n("2877")),p=Object(u["a"])(l,a,i,!1,null,"7505e034",null);t["default"]=p.exports},de5f:function(e,t,n){}}]);
--- a/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-3a6f2dc9.1670eebe.js
+++ b/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-3a6f2dc9.1670eebe.js
--- a/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-3a6f2dc9.a02b6a17.js
+++ b/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-3a6f2dc9.a02b6a17.js
--- a/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-4f40863a.64a22a74.js
+++ b/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-4f40863a.64a22a74.js
--- a/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-5428753b.167fd3d5.js
+++ b/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-5428753b.167fd3d5.js
--- a/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-5428753b.d8b17a8d.js
+++ b/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-5428753b.d8b17a8d.js
--- a/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-54487101.1e5e5070.js
+++ b/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-54487101.1e5e5070.js
--- a/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-54487101.ce0f78fd.js
+++ b/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-54487101.ce0f78fd.js
--- a/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-5911c282.4328de3b.js
+++ b/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-5911c282.4328de3b.js
--- a/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-5ee8c90c.51ee4f60.js
+++ b/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-5ee8c90c.51ee4f60.js
--- a/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-60c39f89.50159e71.js
+++ b/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-60c39f89.50159e71.js
--- a/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-60c39f89.5c47c6cc.js
+++ b/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-60c39f89.5c47c6cc.js
--- a/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-6a55e40a.29c20eb8.js
+++ b/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-6a55e40a.29c20eb8.js
--- a/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-6a55e40a.40d43eb0.js
+++ b/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-6a55e40a.40d43eb0.js
--- a/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-6b3c38c4.e81370de.js
+++ b/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-6b3c38c4.e81370de.js
--- a/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-70528506.efef5f3f.js
+++ b/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-70528506.efef5f3f.js
--- a/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-7d41a2d3.57adbaaa.js
+++ b/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-7d41a2d3.57adbaaa.js
--- a/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-90a072fe.2b067114.js
+++ b/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-90a072fe.2b067114.js
--- a/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-90a072fe.e939dd3d.js
+++ b/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-90a072fe.e939dd3d.js
--- a/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-a89383d2.2f667e97.js
+++ b/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-a89383d2.2f667e97.js
--- a/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-a89383d2.f006e752.js
+++ b/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-a89383d2.f006e752.js
--- a/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-adca2a60.b792d58d.js
+++ b/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-adca2a60.b792d58d.js
--- a/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-d6c1d344.481cb9eb.js
+++ b/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-d6c1d344.481cb9eb.js
--- a/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-d6c1d344.946471b9.js
+++ b/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-d6c1d344.946471b9.js
--- a/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-ef888edc.1836e38e.js
+++ b/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-ef888edc.1836e38e.js
--- a/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-libs.d3d4cbc2.js
+++ b/hippo4j-server/hippo4j-console/src/main/resources/static/static/js/chunk-libs.d3d4cbc2.js
--- a/hippo4j-server/hippo4j-ui/src/api/hippo4j-threadPool.js
+++ b/hippo4j-server/hippo4j-ui/src/api/hippo4j-threadPool.js
@ -1,102 +1,114 @@
-import request from '@/utils/request'
+import request from '@/utils/request';

 export function list(data) {
  return request({
    url: '/hippo4j/v1/cs/thread/pool/query/page',
    method: 'post',
-    data
-  })
+    data,
+  });
 }

 export function listClient(data) {
  return request({
-    url: '/hippo4j/v1/cs/thread/pool/list/client/instance/' + data.itemId,
+    url: '/hippo4j/v1/cs/thread/pool/list/client/instance/' + data.itemId + '?mark=' + data.mark,
    method: 'get',
-    data
-  })
+    data,
+  });
 }

 export function info(data) {
  return request({
-    url: '/hippo4j/v1/cs/configs?tpId=' + data.tpId + '&itemId=' + data.itemId + '&namespace=' + data.tenantId + '&instanceId=' + data.identify,
-    method: 'get'
-  })
+    url:
+      '/hippo4j/v1/cs/configs?tpId=' +
+      data.tpId +
+      '&itemId=' +
+      data.itemId +
+      '&namespace=' +
+      data.tenantId +
+      '&instanceId=' +
+      data.identify,
+    method: 'get',
+  });
 }

 export function runState(data) {
  return request({
-    url: '/hippo4j/v1/cs/thread/pool/run/state/' + data.tpId + '?clientAddress=' + data.clientAddress,
-    method: 'get'
-  })
+    url:
+      '/hippo4j/v1/cs/thread/pool/run/state/' + data.tpId + '?clientAddress=' + data.clientAddress,
+    method: 'get',
+  });
 }

 export function runThreadState(data) {
  return request({
-    url: '/hippo4j/v1/cs/thread/pool/run/thread/state/' + data.tpId + '?clientAddress=' + data.clientAddress,
-    method: 'get'
-  })
+    url:
+      '/hippo4j/v1/cs/thread/pool/run/thread/state/' +
+      data.tpId +
+      '?clientAddress=' +
+      data.clientAddress,
+    method: 'get',
+  });
 }

 export function webBaseInfo(data) {
  return request({
    // async: false,
    url: '/hippo4j/v1/cs/thread/pool/web/base/info' + '?clientAddress=' + data.clientAddress,
-    method: 'get'
-  })
+    method: 'get',
+  });
 }

 export function webBaseState(data) {
  return request({
    // async: false,
    url: '/hippo4j/v1/cs/thread/pool/web/run/state' + '?clientAddress=' + data.clientAddress,
-    method: 'get'
-  })
+    method: 'get',
+  });
 }

 export function webUpdatePool(data) {
  return request({
    url: '/hippo4j/v1/cs/thread/pool/web/update/pool',
    method: 'post',
-    data
-  })
+    data,
+  });
 }

 export function tenantList(data) {
  return request({
    url: '/hippo4j/v1/cs/item/query/page',
    method: 'post',
-    data
-  })
+    data,
+  });
 }

 export function updated(data) {
  return request({
    url: '/hippo4j/v1/cs/thread/pool/save_or_update',
    method: 'post',
-    data
-  })
+    data,
+  });
 }

 export function created(data) {
  return request({
    url: '/hippo4j/v1/cs/thread/pool/save_or_update',
    method: 'post',
-    data
-  })
+    data,
+  });
 }

 export function deleted(data) {
  return request({
    url: '/hippo4j/v1/cs/thread/pool/delete',
    method: 'delete',
-    data
-  })
+    data,
+  });
 }

 export function alarmEnable(data) {
  return request({
    url: '/hippo4j/v1/cs/thread/pool/alarm/enable/' + data.id + '/' + data.isAlarm,
-    method: 'post'
-  })
+    method: 'post',
+  });
 }
-
--- a/hippo4j-server/hippo4j-ui/src/views/hippo4j/item/index.vue
+++ b/hippo4j-server/hippo4j-ui/src/views/hippo4j/item/index.vue
@ -48,9 +48,9 @@
      <el-table-column label="项目名称">
        <template slot-scope="scope">{{ scope.row.itemName }}</template>
      </el-table-column>
-      <el-table-column label="项目简介">
+      <!-- <el-table-column label="项目简介">
        <template slot-scope="scope">{{ scope.row.itemDesc | ellipsis }}</template>
-      </el-table-column>
+      </el-table-column> -->
      <el-table-column label="负责人">
        <template slot-scope="scope">{{ scope.row.owner }} </template>
      </el-table-column>
--- a/hippo4j-server/hippo4j-ui/src/views/hippo4j/server/jetty/index.vue
+++ b/hippo4j-server/hippo4j-ui/src/views/hippo4j/server/jetty/index.vue
@ -278,6 +278,7 @@ export default {
        size: 10,
        tpId: '',
        itemId: '',
+        mark: 'Jetty',
      },
      pluginTypeOptions: ['reader', 'writer'],
      dialogPluginVisible: false,
--- a/hippo4j-server/hippo4j-ui/src/views/hippo4j/server/tomcat/index.vue
+++ b/hippo4j-server/hippo4j-ui/src/views/hippo4j/server/tomcat/index.vue
@ -286,6 +286,7 @@ export default {
        size: 10,
        tpId: '',
        itemId: '',
+        mark: 'Tomcat',
      },
      pluginTypeOptions: ['reader', 'writer'],
      dialogPluginVisible: false,
--- a/hippo4j-server/hippo4j-ui/src/views/hippo4j/server/undertow/index.vue
+++ b/hippo4j-server/hippo4j-ui/src/views/hippo4j/server/undertow/index.vue
@ -288,6 +288,7 @@ export default {
        size: 10,
        tpId: '',
        itemId: '',
+        mark: 'Undertow',
      },
      pluginTypeOptions: ['reader', 'writer'],
      dialogPluginVisible: false,
--- a/hippo4j-server/hippo4j-ui/src/views/hippo4j/tenant/index.vue
+++ b/hippo4j-server/hippo4j-ui/src/views/hippo4j/tenant/index.vue
@ -44,9 +44,9 @@
      <el-table-column label="租户名称">
        <template slot-scope="scope">{{ scope.row.tenantName }}</template>
      </el-table-column>
-      <el-table-column label="租户简介">
+      <!-- <el-table-column label="租户简介">
        <template slot-scope="scope">{{ scope.row.tenantDesc | ellipsis }}</template>
-      </el-table-column>
+      </el-table-column> -->
      <el-table-column label="负责人">
        <template slot-scope="scope">{{ scope.row.owner }} </template>
      </el-table-column>
--- a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/controller/WebThreadPoolController.java
+++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/controller/WebThreadPoolController.java
@ -18,6 +18,7 @@
 package cn.hippo4j.springboot.starter.controller;

 import cn.hippo4j.adapter.web.WebThreadPoolHandlerChoose;
+import cn.hippo4j.adapter.web.WebThreadPoolService;
 import cn.hippo4j.common.model.ThreadPoolBaseInfo;
 import cn.hippo4j.common.model.ThreadPoolParameterInfo;
 import cn.hippo4j.common.model.ThreadPoolRunStateInfo;
@ -39,9 +40,12 @@ public class WebThreadPoolController {
    private final WebThreadPoolHandlerChoose webThreadPoolServiceChoose;

    @GetMapping("/web/base/info")
-    public Result<ThreadPoolBaseInfo> getPoolBaseState() {
-        ThreadPoolBaseInfo result = webThreadPoolServiceChoose.choose().simpleInfo();
-        return Results.success(result);
+    public Result<ThreadPoolBaseInfo> getPoolBaseState(@RequestParam(value = "mark") String mark) {
+        WebThreadPoolService webThreadPoolService = webThreadPoolServiceChoose.choose();
+        if (webThreadPoolService != null && webThreadPoolService.getClass().getSimpleName().contains(mark)) {
+            return Results.success(webThreadPoolService.simpleInfo());
+        }
+        return Results.success(null);
    }

    @GetMapping("/web/run/state")
				`@ -1 +0,0 @@`
				`.editor-container[data-v-7505e034]{height:82vh;overflow:auto}`
				`@ -1 +0,0 @@`
				(window["webpackJsonp"]=window["webpackJsonp"]\|\|[]).push([["chunk-2fd02e04"],{"64b7":function(e,t,n){"use strict";n("de5f")},ab3b:function(e,t,n){"use strict";n.r(t);var a=function(){var e=this,t=e.$createElement,n=e._self._c\|\|t;return n("div",{staticClass:"app-container"},[n("split-pane",{attrs:{split:"vertical"},on:{resize:e.resize}},[n("template",{slot:"paneL"},[n("el-input",{attrs:{type:"textarea",rows:36,placeholder:"请输入内容",clearable:""},on:{change:e.originChange},model:{value:e.originText,callback:function(t){e.originText=t},expression:"originText"}})],1),e._v(" "),n("template",{slot:"paneR"},[n("div",{staticClass:"editor-container"},[n("JSONEditor",{attrs:{json:e.formatedValue}})],1)])],2)],1)},i=[],o=n("19ab"),r=n.n(o),s=n("33c3"),c={name:"JsonFormat",components:{splitPane:r.a,JSONEditor:s["a"]},data:function(){return{originText:"",formatedValue:""}},watch:{originText:function(e){try{this.formatedValue=JSON.parse(e)}catch(t){}}},methods:{resize:function(){},originChange:function(e){}}},l=c,u=(n("64b7"),n("2877")),p=Object(u["a"])(l,a,i,!1,null,"7505e034",null);t["default"]=p.exports},de5f:function(e,t,n){}}]);