增强对实例的控制

2025-10-05 00:44:01 +08:00 · 2020-02-14 09:54:53 +08:00
11 changed files with 27 additions and 16 deletions
--- a/monica/index.go
+++ b/monica/index.go
@@ -10,7 +10,7 @@ import (
 )

 var ConfigRaw []byte
-var Version = "0.2.4"
+var Version = "0.2.5"
 var EngineInfo = &struct {
 	Version   string
 	StartTime time.Time
--- a/plugins/gateway/index.go
+++ b/plugins/gateway/index.go
@@ -99,6 +99,7 @@ func summary(w http.ResponseWriter, r *http.Request) {
 	}
 }
 func sysInfo(w http.ResponseWriter, r *http.Request) {
+	w.Header().Set("Access-Control-Allow-Origin", "*")
 	bytes, err := json.Marshal(EngineInfo)
 	if err == nil {
 		_, err = w.Write(bytes)
--- a/pm/dist/index.html
+++ b/pm/dist/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/favicon.ico><title>Monibuca Instance Manager</title><script src=ajax.js></script><link href=/css/app.200d2f8f.css rel=preload as=style><link href=/css/chunk-vendors.22ebf426.css rel=preload as=style><link href=/js/app.fab2a06f.js rel=preload as=script><link href=/js/chunk-vendors.f701a5a3.js rel=preload as=script><link href=/css/chunk-vendors.22ebf426.css rel=stylesheet><link href=/css/app.200d2f8f.css rel=stylesheet></head><body><noscript><strong>We're sorry but pm doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.f701a5a3.js></script><script src=/js/app.fab2a06f.js></script></body></html>
+<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/favicon.ico><title>Monibuca Instance Manager</title><script src=ajax.js></script><link href=/css/app.200d2f8f.css rel=preload as=style><link href=/css/chunk-vendors.22ebf426.css rel=preload as=style><link href=/js/app.5c3b9309.js rel=preload as=script><link href=/js/chunk-vendors.f693d643.js rel=preload as=script><link href=/css/chunk-vendors.22ebf426.css rel=stylesheet><link href=/css/app.200d2f8f.css rel=stylesheet></head><body><noscript><strong>We're sorry but pm doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.f693d643.js></script><script src=/js/app.5c3b9309.js></script></body></html>
--- a/pm/dist/js/app.5c3b9309.js
+++ b/pm/dist/js/app.5c3b9309.js
--- a/pm/dist/js/app.5c3b9309.js.map
+++ b/pm/dist/js/app.5c3b9309.js.map
--- a/pm/dist/js/app.fab2a06f.js.map
+++ b/pm/dist/js/app.fab2a06f.js.map
--- a/pm/dist/js/chunk-vendors.f693d643.js
+++ b/pm/dist/js/chunk-vendors.f693d643.js
--- a/pm/dist/js/chunk-vendors.f693d643.js.map
+++ b/pm/dist/js/chunk-vendors.f693d643.js.map
--- a/pm/dist/js/chunk-vendors.f701a5a3.js.map
+++ b/pm/dist/js/chunk-vendors.f701a5a3.js.map
--- a/pm/src/components/ImportInstance.vue
+++ b/pm/src/components/ImportInstance.vue
@@ -1,5 +1,6 @@
 <template>
    <div>
+        <i-input v-model="instanceName" :placeholder="defaultInstanceName"></i-input>
        <i-input prefix="ios-home" v-model="instancePath" placeholder="输入实例所在的路径" search enter-button="Import" @on-search="doImport">
        </i-input>
    </div>
@@ -10,12 +11,18 @@
        name: "ImportInstance",
        data(){
            return {
-                instancePath:""
+                instancePath:"",
+                instanceName:""
+            }
+        },
+        computed:{
+            defaultInstanceName(){
+                return this.instancePath.replace(/\\/g,"/").split("/").pop()
            }
        },
        methods:{
            doImport(){
-                window.ajax.get("/instance/import?path="+this.instancePath).then(x=>{
+                window.ajax.get("/instance/import?path="+this.instancePath+"&name="+this.instanceName).then(x=>{
                    if(x=="success"){
                        this.$Message.success("导入成功！")
                    }else{
--- a/pm/src/components/InstanceList.vue
+++ b/pm/src/components/InstanceList.vue
@@ -9,7 +9,7 @@
                        <Icon type="ios-settings"/>
                        修改配置
                    </li>
-                    <li v-if="hasGateway(item)" @click="window.open(gateWayHref(item),'_blank')">
+                    <li v-if="hasGateway(item)" @click="openGateway(item)">
                        <Icon type="md-browsers"/>
                        管理界面
                    </li>
@@ -93,6 +93,9 @@
                    this.$Message.error(e)
                }
            },
+            openGateway(item){
+                window.open(this.gateWayHref(item),'_blank')
+            },
            hasGateway(item) {
                return item.Config.Plugins.hasOwnProperty("GateWay")
            },