提交components.js

internal/const/const.go

@@ -1,9 +1,9 @@
 package teaconst
 
 const (
-	Version = "0.5.3.1"
+	Version = "0.5.5"
 
-	APINodeVersion = "0.5.3.1"
+	APINodeVersion = "0.5.5"
 
 	ProductName   = "Edge Admin"
 	ProcessName   = "edge-admin"

internal/rpc/rpc_client.go

@@ -174,18 +174,10 @@ func (this *RPCClient) APIMethodStatRPC() pb.APIMethodStatServiceClient {
 	return pb.NewAPIMethodStatServiceClient(this.pickConn())
 }
 
-func (this *RPCClient) UserNodeRPC() pb.UserNodeServiceClient {
-	return pb.NewUserNodeServiceClient(this.pickConn())
-}
-
 func (this *RPCClient) DBNodeRPC() pb.DBNodeServiceClient {
 	return pb.NewDBNodeServiceClient(this.pickConn())
 }
 
-func (this *RPCClient) MonitorNodeRPC() pb.MonitorNodeServiceClient {
-	return pb.NewMonitorNodeServiceClient(this.pickConn())
-}
-
 func (this *RPCClient) DBRPC() pb.DBServiceClient {
 	return pb.NewDBServiceClient(this.pickConn())
 }

internal/utils/service_linux.go

@@ -111,7 +111,8 @@ func (this *ServiceManager) installSystemdService(systemd, exePath string, args
 	shortName := teaconst.SystemdServiceName
 	longName := "GoEdge Admin" // TODO 将来可以修改
 
-	desc := `# Provides:          ` + shortName + `
+	desc := `### BEGIN INIT INFO
+# Provides:          ` + shortName + `
 # Required-Start:    $all
 # Required-Stop:
 # Default-Start:     2 3 4 5

internal/web/actions/default/servers/index.go

@@ -90,15 +90,16 @@ func (this *IndexAction) RunGet(params struct {
 
 	// 服务列表
 	serversResp, err := this.RPC().ServerRPC().ListEnabledServersMatch(this.AdminContext(), &pb.ListEnabledServersMatchRequest{
-		Offset:         page.Offset,
-		Size:           page.Size,
-		NodeClusterId:  params.ClusterId,
-		ServerGroupId:  params.GroupId,
-		Keyword:        params.Keyword,
-		AuditingFlag:   params.AuditingFlag,
-		TrafficOutDesc: params.TrafficOutOrder == "desc",
-		TrafficOutAsc:  params.TrafficOutOrder == "asc",
-		UserId:         params.UserId,
+		Offset:            page.Offset,
+		Size:              page.Size,
+		NodeClusterId:     params.ClusterId,
+		ServerGroupId:     params.GroupId,
+		Keyword:           params.Keyword,
+		AuditingFlag:      params.AuditingFlag,
+		TrafficOutDesc:    params.TrafficOutOrder == "desc",
+		TrafficOutAsc:     params.TrafficOutOrder == "asc",
+		UserId:            params.UserId,
+		IgnoreServerNames: true,
 	})
 	if err != nil {
 		this.ErrorPage(err)
@@ -176,27 +177,35 @@ func (this *IndexAction) RunGet(params struct {
 		}
 
 		// 域名列表
-		var serverNames = []*serverconfigs.ServerNameConfig{}
 		if server.IsAuditing || (server.AuditingResult != nil && !server.AuditingResult.IsOk) {
 			server.ServerNamesJSON = server.AuditingServerNamesJSON
+
+			if len(config.ServerNames) == 0 {
+				// 审核中的域名
+				if len(server.ServerNamesJSON) > 0 {
+					var serverNames = []*serverconfigs.ServerNameConfig{}
+					err = json.Unmarshal(server.ServerNamesJSON, &serverNames)
+					if err != nil {
+						this.ErrorPage(err)
+						return
+					}
+					config.ServerNames = serverNames
+				}
+			}
 		}
 		var auditingIsOk = true
 		if !server.IsAuditing && server.AuditingResult != nil && !server.AuditingResult.IsOk {
 			auditingIsOk = false
 		}
-		if len(server.ServerNamesJSON) > 0 {
-			err = json.Unmarshal(server.ServerNamesJSON, &serverNames)
-			if err != nil {
-				this.ErrorPage(err)
-				return
+		var firstServerName = ""
+		for _, serverNameConfig := range config.ServerNames {
+			if len(serverNameConfig.Name) > 0 {
+				firstServerName = serverNameConfig.Name
+				break
 			}
-		}
-		var countServerNames = 0
-		for _, serverName := range serverNames {
-			if len(serverName.SubNames) == 0 {
-				countServerNames++
-			} else {
-				countServerNames += len(serverName.SubNames)
+			if len(serverNameConfig.SubNames) > 0 {
+				firstServerName = serverNameConfig.SubNames[0]
+				break
 			}
 		}
 
@@ -232,8 +241,8 @@ func (this *IndexAction) RunGet(params struct {
 			"ports":            portMaps,
 			"serverTypeName":   serverconfigs.FindServerType(server.Type).GetString("name"),
 			"groups":           groupMaps,
-			"serverNames":      serverNames,
-			"countServerNames": countServerNames,
+			"firstServerName":  firstServerName,
+			"countServerNames": server.CountServerNames,
 			"isAuditing":       server.IsAuditing,
 			"auditingIsOk":     auditingIsOk,
 			"user":             userMap,

web/public/js/components.js

@@ -4636,7 +4636,7 @@ Vue.component("traffic-map-box",{props:["v-stats","v-is-attack"],mounted:functio
 	<tr>
 		<td colspan="2"><a href="" @click.prevent="show()"><span v-if="!isVisible">更多选项</span><span v-if="isVisible">收起选项</span><i class="icon angle" :class="{down:!isVisible, up:isVisible}"></i></a></td>
 	</tr>
-</tbody>`}),Vue.component("download-link",{props:["v-element","v-file","v-value"],created:function(){let e=this;setTimeout(function(){e.url=e.composeURL()},1e3)},data:function(){let e=this.vFile;return{file:e=null!=e&&0!=e.length?e:"unknown-file",url:this.composeURL()}},methods:{composeURL:function(){let e="";if(null!=this.vValue)e=this.vValue;else{var t=document.getElementById(this.vElement);if(null==t)return void teaweb.warn("找不到要下载的内容");null==(e=t.innerText)&&(e=t.textContent)}return Tea.url("/ui/download",{file:this.file,text:e})}},template:'<a :href="url" target="_blank" style="font-weight: normal"><slot></slot></a>'}),Vue.component("values-box",{props:["values","v-values","size","maxlength","name","placeholder"],data:function(){let e=this.values;return null==e&&(e=[]),{realValues:e=null!=this.vValues&&"object"==typeof this.vValues?this.vValues:e,isUpdating:!1,isAdding:!1,index:0,value:"",isEditing:!1}},methods:{create:function(){this.isAdding=!0;var e=this;setTimeout(function(){e.$refs.value.focus()},200)},update:function(e){this.cancel(),this.isUpdating=!0,this.index=e,this.value=this.realValues[e];var t=this;setTimeout(function(){t.$refs.value.focus()},200)},confirm:function(){0!=this.value.length&&(this.isUpdating?Vue.set(this.realValues,this.index,this.value):this.realValues.push(this.value),this.cancel(),this.$emit("change",this.realValues))},remove:function(e){this.realValues.$remove(e),this.$emit("change",this.realValues)},cancel:function(){this.isUpdating=!1,this.isAdding=!1,this.value=""},updateAll:function(e){this.realValues=e},addValue:function(e){this.realValues.push(e)},startEditing:function(){this.isEditing=!this.isEditing},allValues:function(){return this.realValues}},template:`<div>
+</tbody>`}),Vue.component("download-link",{props:["v-element","v-file","v-value"],created:function(){let e=this;setTimeout(function(){e.url=e.composeURL()},1e3)},data:function(){let e=this.vFile;return{file:e=null!=e&&0!=e.length?e:"unknown-file",url:this.composeURL()}},methods:{composeURL:function(){let e="";if(null!=this.vValue)e=this.vValue;else{var t=document.getElementById(this.vElement);if(null==t)return;null==(e=t.innerText)&&(e=t.textContent)}return Tea.url("/ui/download",{file:this.file,text:e})}},template:'<a :href="url" target="_blank" style="font-weight: normal"><slot></slot></a>'}),Vue.component("values-box",{props:["values","v-values","size","maxlength","name","placeholder"],data:function(){let e=this.values;return null==e&&(e=[]),{realValues:e=null!=this.vValues&&"object"==typeof this.vValues?this.vValues:e,isUpdating:!1,isAdding:!1,index:0,value:"",isEditing:!1}},methods:{create:function(){this.isAdding=!0;var e=this;setTimeout(function(){e.$refs.value.focus()},200)},update:function(e){this.cancel(),this.isUpdating=!0,this.index=e,this.value=this.realValues[e];var t=this;setTimeout(function(){t.$refs.value.focus()},200)},confirm:function(){0!=this.value.length&&(this.isUpdating?Vue.set(this.realValues,this.index,this.value):this.realValues.push(this.value),this.cancel(),this.$emit("change",this.realValues))},remove:function(e){this.realValues.$remove(e),this.$emit("change",this.realValues)},cancel:function(){this.isUpdating=!1,this.isAdding=!1,this.value=""},updateAll:function(e){this.realValues=e},addValue:function(e){this.realValues.push(e)},startEditing:function(){this.isEditing=!this.isEditing},allValues:function(){return this.realValues}},template:`<div>
 	<div v-show="!isEditing && realValues.length > 0">
 		<div class="ui label tiny basic" v-for="(value, index) in realValues" style="margin-top:0.4em;margin-bottom:0.4em">{{value}}</div>
 		<a href="" @click.prevent="startEditing" style="font-size: 0.8em; margin-left: 0.2em">[修改]</a>

web/public/js/components.src.js

@@ -13728,7 +13728,7 @@ Vue.component("download-link", {
 			} else {
 				let e = document.getElementById(this.vElement)
 				if (e == null) {
-					teaweb.warn("找不到要下载的内容")
+					// 不提示错误，因为此时可能页面未加载完整
 					return
 				}
 				text = e.innerText

web/public/js/components/common/download-link.js

@@ -24,7 +24,7 @@ Vue.component("download-link", {
 			} else {
 				let e = document.getElementById(this.vElement)
 				if (e == null) {
-					teaweb.warn("找不到要下载的内容")
+					// 不提示错误，因为此时可能页面未加载完整
 					return
 				}
 				text = e.innerText

web/views/@default/servers/index.html

@@ -80,9 +80,8 @@
 		</td>
 		<td>{{server.cluster.name}}</td>
 		<td>
-			<span v-if="server.serverNames.length > 0">
-                <span v-if="server.serverNames[0].subNames == null || server.serverNames[0].subNames.length == 0"><keyword :v-word="keyword">{{server.serverNames[0].name}}</keyword></span>
-                <span v-else><keyword :v-word="keyword">{{server.serverNames[0].subNames[0]}}</keyword></span>
+			<span v-if="server.firstServerName.length > 0">
+                <keyword :v-word="keyword">{{server.firstServerName}}</keyword>
 				<span v-if="server.countServerNames > 1">等{{server.countServerNames}}个域名 <popup-icon :href="'/servers/serverNamesPopup?serverId=' + server.id" height="20em"></popup-icon></span>
 			</span>
 			<span v-else class="disabled">-</span>