diff --git a/web-ui/arthasWebConsole/.env.tunnel b/web-ui/arthasWebConsole/.env.tunnel index 5aaf1f490..1fe3c3366 100644 --- a/web-ui/arthasWebConsole/.env.tunnel +++ b/web-ui/arthasWebConsole/.env.tunnel @@ -1,2 +1,3 @@ # NODE_ENV=production -VITE_AGENT=true \ No newline at end of file +VITE_ARTHAS_PORT=7777 +VITE_ARTHAS_PROXY_PORT=8080 \ No newline at end of file diff --git a/web-ui/arthasWebConsole/.env.ui b/web-ui/arthasWebConsole/.env.ui index 04da6f0fd..6767c1da4 100644 --- a/web-ui/arthasWebConsole/.env.ui +++ b/web-ui/arthasWebConsole/.env.ui @@ -1,2 +1,3 @@ # NODE_ENV=production -VITE_AGENT=false \ No newline at end of file +VITE_ARTHAS_PORT=8563 +VITE_ARTHAS_PROXY_PORT=8563 \ No newline at end of file diff --git a/web-ui/arthasWebConsole/src/env.d.ts b/web-ui/arthasWebConsole/all/env.d.ts similarity index 91% rename from web-ui/arthasWebConsole/src/env.d.ts rename to web-ui/arthasWebConsole/all/env.d.ts index 4f9c20631..df4a71947 100644 --- a/web-ui/arthasWebConsole/src/env.d.ts +++ b/web-ui/arthasWebConsole/all/env.d.ts @@ -6,7 +6,7 @@ declare module '*.vue' { export default component } interface ImportMetaEnv { - readonly VITE_AGENT:string + readonly VITE_ARTHAS_PORT:string } interface ImportMeta { diff --git a/web-ui/arthasWebConsole/public/arthas.png b/web-ui/arthasWebConsole/all/share/assert/arthas.png similarity index 100% rename from web-ui/arthasWebConsole/public/arthas.png rename to web-ui/arthasWebConsole/all/share/assert/arthas.png diff --git a/web-ui/arthasWebConsole/public/fullsc.png b/web-ui/arthasWebConsole/all/share/assert/fullsc.png similarity index 100% rename from web-ui/arthasWebConsole/public/fullsc.png rename to web-ui/arthasWebConsole/all/share/assert/fullsc.png diff --git a/web-ui/arthasWebConsole/src/App.vue b/web-ui/arthasWebConsole/all/share/component/Console.vue similarity index 59% rename from web-ui/arthasWebConsole/src/App.vue rename to web-ui/arthasWebConsole/all/share/component/Console.vue index 0e6ed4adf..a04ddcdb0 100644 --- a/web-ui/arthasWebConsole/src/App.vue +++ b/web-ui/arthasWebConsole/all/share/component/Console.vue @@ -1,21 +1,31 @@ diff --git a/web-ui/arthasWebConsole/all/share/main.css b/web-ui/arthasWebConsole/all/share/main.css new file mode 100644 index 000000000..bd6213e1d --- /dev/null +++ b/web-ui/arthasWebConsole/all/share/main.css @@ -0,0 +1,3 @@ +@tailwind base; +@tailwind components; +@tailwind utilities; \ No newline at end of file diff --git a/web-ui/arthasWebConsole/public/favicon.ico b/web-ui/arthasWebConsole/all/share/public/favicon.ico similarity index 100% rename from web-ui/arthasWebConsole/public/favicon.ico rename to web-ui/arthasWebConsole/all/share/public/favicon.ico diff --git a/web-ui/arthasWebConsole/all/tunnel/agents.html b/web-ui/arthasWebConsole/all/tunnel/agents.html new file mode 100644 index 000000000..a2ce24e97 --- /dev/null +++ b/web-ui/arthasWebConsole/all/tunnel/agents.html @@ -0,0 +1,17 @@ + + + + + + + Arthas Tutorials + + + + +
+
+ + + + \ No newline at end of file diff --git a/web-ui/arthasWebConsole/all/tunnel/apps.html b/web-ui/arthasWebConsole/all/tunnel/apps.html new file mode 100644 index 000000000..92c093be0 --- /dev/null +++ b/web-ui/arthasWebConsole/all/tunnel/apps.html @@ -0,0 +1,16 @@ + + + + + + + Arthas Tutorials + + + +
+
+ + + + \ No newline at end of file diff --git a/web-ui/arthasWebConsole/index.html b/web-ui/arthasWebConsole/all/tunnel/index.html similarity index 100% rename from web-ui/arthasWebConsole/index.html rename to web-ui/arthasWebConsole/all/tunnel/index.html diff --git a/web-ui/arthasWebConsole/all/tunnel/src/Agent.vue b/web-ui/arthasWebConsole/all/tunnel/src/Agent.vue new file mode 100644 index 000000000..bbfde0039 --- /dev/null +++ b/web-ui/arthasWebConsole/all/tunnel/src/Agent.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/web-ui/arthasWebConsole/all/tunnel/src/Apps.vue b/web-ui/arthasWebConsole/all/tunnel/src/Apps.vue new file mode 100644 index 000000000..7802892de --- /dev/null +++ b/web-ui/arthasWebConsole/all/tunnel/src/Apps.vue @@ -0,0 +1,42 @@ + + + + + \ No newline at end of file diff --git a/web-ui/arthasWebConsole/all/tunnel/src/agents.ts b/web-ui/arthasWebConsole/all/tunnel/src/agents.ts new file mode 100644 index 000000000..a94303218 --- /dev/null +++ b/web-ui/arthasWebConsole/all/tunnel/src/agents.ts @@ -0,0 +1,6 @@ +import { createApp } from "vue"; +import App from "./Agent.vue"; +const app = createApp(App); +import "~/main.css"; +app + .mount("#app"); diff --git a/web-ui/arthasWebConsole/all/tunnel/src/apps.ts b/web-ui/arthasWebConsole/all/tunnel/src/apps.ts new file mode 100644 index 000000000..6ef530d37 --- /dev/null +++ b/web-ui/arthasWebConsole/all/tunnel/src/apps.ts @@ -0,0 +1,5 @@ +import App from "./Apps.vue" +import { createApp } from "vue" +import "~/main.css"; +createApp(App) + .mount("#app"); \ No newline at end of file diff --git a/web-ui/arthasWebConsole/all/tunnel/src/main.css b/web-ui/arthasWebConsole/all/tunnel/src/main.css new file mode 100644 index 000000000..bd6213e1d --- /dev/null +++ b/web-ui/arthasWebConsole/all/tunnel/src/main.css @@ -0,0 +1,3 @@ +@tailwind base; +@tailwind components; +@tailwind utilities; \ No newline at end of file diff --git a/web-ui/arthasWebConsole/all/tunnel/src/main.ts b/web-ui/arthasWebConsole/all/tunnel/src/main.ts new file mode 100644 index 000000000..c5a78b68a --- /dev/null +++ b/web-ui/arthasWebConsole/all/tunnel/src/main.ts @@ -0,0 +1,7 @@ +import { createApp, h } from "vue"; +import App from "~/component/Console.vue"; +const app = createApp(h(App, { isTunnel: true })); +import "xterm/css/xterm.css"; +import "~/main.css"; +app + .mount("#app"); diff --git a/web-ui/arthasWebConsole/all/tunnel/tunnel.d.ts b/web-ui/arthasWebConsole/all/tunnel/tunnel.d.ts new file mode 100644 index 000000000..6b7934781 --- /dev/null +++ b/web-ui/arthasWebConsole/all/tunnel/tunnel.d.ts @@ -0,0 +1,6 @@ +type AgentInfo = { + clientConnectHost:string, + host:string, + port:number, + arthasVersion:string +} \ No newline at end of file diff --git a/web-ui/arthasWebConsole/all/ui/index.html b/web-ui/arthasWebConsole/all/ui/index.html new file mode 100644 index 000000000..19b1b7432 --- /dev/null +++ b/web-ui/arthasWebConsole/all/ui/index.html @@ -0,0 +1,16 @@ + + + + + + + + Arthas Console + + + +
+ + + + \ No newline at end of file diff --git a/web-ui/arthasWebConsole/src/main.css b/web-ui/arthasWebConsole/all/ui/src/main.css similarity index 100% rename from web-ui/arthasWebConsole/src/main.css rename to web-ui/arthasWebConsole/all/ui/src/main.css diff --git a/web-ui/arthasWebConsole/src/main.ts b/web-ui/arthasWebConsole/all/ui/src/main.ts similarity index 54% rename from web-ui/arthasWebConsole/src/main.ts rename to web-ui/arthasWebConsole/all/ui/src/main.ts index 11b4c0c76..21378c90c 100644 --- a/web-ui/arthasWebConsole/src/main.ts +++ b/web-ui/arthasWebConsole/all/ui/src/main.ts @@ -1,7 +1,7 @@ import { createApp } from "vue"; -import App from "./App.vue"; +import App from "~/component/Console.vue"; const app = createApp(App); import "xterm/css/xterm.css" -import "./main.css" +import "~/main.css" app .mount("#app"); \ No newline at end of file diff --git a/web-ui/arthasWebConsole/ui/index.html b/web-ui/arthasWebConsole/all/ui/ui/index.html similarity index 100% rename from web-ui/arthasWebConsole/ui/index.html rename to web-ui/arthasWebConsole/all/ui/ui/index.html diff --git a/web-ui/arthasWebConsole/ui/src/App.vue b/web-ui/arthasWebConsole/all/ui/ui/src/App.vue similarity index 82% rename from web-ui/arthasWebConsole/ui/src/App.vue rename to web-ui/arthasWebConsole/all/ui/ui/src/App.vue index 6e3ebe4d9..f064f356a 100644 --- a/web-ui/arthasWebConsole/ui/src/App.vue +++ b/web-ui/arthasWebConsole/all/ui/ui/src/App.vue @@ -18,14 +18,9 @@ onBeforeUnmount(() => {