文件清理

EdgeAPI/internal/accesslogs/storage_manager.go

@@ -13,6 +13,7 @@ import (
 	"github.com/iwind/TeaGo/dbs"
 	"github.com/iwind/TeaGo/lists"
 	"github.com/iwind/TeaGo/types"
+	"strings"
 	"sync"
 	"time"
 )
@@ -126,6 +127,7 @@ func (this *StorageManager) Loop() error {
 						continue
 					}
 				}
+				this.applyFileStorageFallback(policy.Type, storage)
 
 				storage.SetVersion(types.Int(policy.Version))
 				storage.SetFirewallOnly(policy.FirewallOnly == 1)
@@ -143,6 +145,7 @@ func (this *StorageManager) Loop() error {
 				remotelogs.Error("ACCESS_LOG_STORAGE_MANAGER", "create policy '"+types.String(policyId)+"' failed: "+err.Error())
 				continue
 			}
+			this.applyFileStorageFallback(policy.Type, storage)
 			storage.SetVersion(types.Int(policy.Version))
 			storage.SetFirewallOnly(policy.FirewallOnly == 1)
 			this.storageMap[policyId] = storage
@@ -238,3 +241,20 @@ func (this *StorageManager) createStorage(storageType string, optionsJSON []byte
 
 	return nil, errors.New("invalid policy type '" + storageType + "'")
 }
+
+func (this *StorageManager) applyFileStorageFallback(policyType string, storage StorageInterface) {
+	if !serverconfigs.IsFileBasedStorageType(policyType) {
+		return
+	}
+
+	config, ok := storage.Config().(*serverconfigs.AccessLogFileStorageConfig)
+	if !ok || config == nil || strings.TrimSpace(config.Path) != "" {
+		return
+	}
+
+	// file_clickhouse / file_mysql_clickhouse 未填写 path 时回退到默认文件路径，避免启动失败。
+	if policyType == serverconfigs.AccessLogStorageTypeFileClickhouse || policyType == serverconfigs.AccessLogStorageTypeFileMySQLClickhouse {
+		config.Path = Tea.Root + "/logs/access-${date}.log"
+		config.AutoCreate = true
+	}
+}

EdgeAdmin/web/public/js/components.js

@@ -17773,7 +17773,7 @@ Vue.component("http-hls-config-box", {
 	<table class="ui table definition selectable" v-show="isOn()">
 		<tbody>
 			<tr>
-				<td class="title">启用HLS加密</td>
+				<td class="title">启用HLS加密配置</td>
 				<td>
 					<checkbox v-model="encryptingConfig.isOn"></checkbox>
 					<p class="comment">启用后，系统会自动在<code-label>.m3u8</code-label>文件中加入<code-label>#EXT-X-KEY:METHOD=AES-128...</code-label>，并将其中的<code-label>.ts</code-label>文件内容进行加密。</p>
@@ -17806,6 +17806,7 @@ Vue.component("http-hls-config-box", {
 </div>`
 })
 
+
 Vue.component("http-host-redirect-box", {
 	props: ["v-redirects"],
 	mounted: function () {

EdgeAdmin/web/public/js/components.src.js

@@ -17773,7 +17773,7 @@ Vue.component("http-hls-config-box", {
 	<table class="ui table definition selectable" v-show="isOn()">
 		<tbody>
 			<tr>
-				<td class="title">启用HLS加密</td>
+				<td class="title">启用HLS加密配置</td>
 				<td>
 					<checkbox v-model="encryptingConfig.isOn"></checkbox>
 					<p class="comment">启用后，系统会自动在<code-label>.m3u8</code-label>文件中加入<code-label>#EXT-X-KEY:METHOD=AES-128...</code-label>，并将其中的<code-label>.ts</code-label>文件内容进行加密。</p>
@@ -17806,6 +17806,7 @@ Vue.component("http-hls-config-box", {
 </div>`
 })
 
+
 Vue.component("http-host-redirect-box", {
 	props: ["v-redirects"],
 	mounted: function () {

EdgeAdmin/web/public/js/components/server/http-hls-config-box-plus.js

@@ -43,7 +43,7 @@ Vue.component("http-hls-config-box", {
 	<table class="ui table definition selectable" v-show="isOn()">
 		<tbody>
 			<tr>
-				<td class="title">启用HLS加密</td>
+				<td class="title">启用HLS加密配置</td>
 				<td>
 					<checkbox v-model="encryptingConfig.isOn"></checkbox>
 					<p class="comment">启用后，系统会自动在<code-label>.m3u8</code-label>文件中加入<code-label>#EXT-X-KEY:METHOD=AES-128...</code-label>，并将其中的<code-label>.ts</code-label>文件内容进行加密。</p>
@@ -74,4 +74,4 @@ Vue.component("http-hls-config-box", {
 	</table>
 	<div class="margin"></div>
 </div>`
-})
+})

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

@@ -6,9 +6,8 @@
 <table class="ui table celled selectable" v-if="policies.length > 0">
     <thead>
         <tr>
-            <th>策略名称</th>
+            <th style="width: 14em;">策略名称</th>
-            <th class="three op">类型</th>
+            <th class="op" style="width: 12em; white-space: nowrap;">类型</th>
-            <th>主要参数</th>
             <th class="two wide">状态</th>
             <th class="two op">操作</th>
         </tr>
@@ -21,19 +20,7 @@
                 <span class="ui label tiny basic" v-if="policy.disableDefaultDB">停用默认数据库</span>
             </div>
         </td>
-        <td>{{policy.typeName}}</td>
+        <td style="white-space: nowrap;">{{policy.typeName}}</td>
-        <td>
-            <span v-if="policy.options == null" class="disabled">-</span>
-            <span v-else-if="policy.type == 'es'">Endpoint: {{policy.options.endpoint}}</span>
-            <span v-else-if="policy.type == 'file'">文件路径：{{policy.options.path}}</span>
-            <span v-else-if="policy.type == 'tcp'">网络地址：{{policy.options.addr}}</span>
-            <span v-else-if="policy.type == 'command'">可执行命令：{{policy.options.command}}</span>
-            <span v-else-if="policy.type == 'syslog'">
-                <span v-if="policy.options.protocol == 'tcp'">TCP {{policy.options.serverAddr}}</span>
-                <span v-if="policy.options.protocol == 'udp'">UDP {{policy.options.serverAddr}}</span>
-                <span v-if="policy.options.protocol == 'socket'">SOCK {{policy.options.socket}}</span>
-            </span>
-        </td>
         <td>
             <label-on :v-is-on="policy.isOn"></label-on>
         </td>
@@ -43,4 +30,4 @@
     </tr>
 </table>
 
-<div class="page" v-html="page"></div>
+<div class="page" v-html="page"></div>

EdgeAdmin/web/views/@default/servers/server/settings/locations/multimedia/@menu.html

@@ -1,3 +1,3 @@
 <first-menu>
-    <menu-item code="hls" :href="'.hls?serverId=' + server.id">HLS设置</menu-item>
+    <menu-item code="hls" :href="'.hls?serverId=' + server.id">启用HLS加密配置</menu-item>
-</first-menu>
+</first-menu>

EdgeAdmin/web/views/@default/servers/server/settings/locations/multimedia/hls.html

@@ -10,11 +10,9 @@
         <form class="ui form" data-tea-success="success" data-tea-action="$">
             <csrf-token></csrf-token>
             <input type="hidden" name="webId" :value="webId"/>
-
-            <h4>HLS加密设置</h4>
             <http-hls-config-box v-model="hlsConfig" :v-is-location="true"></http-hls-config-box>
 
             <submit-btn></submit-btn>
         </form>
     </div>
-</div>
+</div>

EdgeAdmin/web/views/@default/servers/server/settings/multimedia/@menu.html

@@ -1,3 +1,3 @@
 <first-menu>
-    <menu-item code="hls" :href="'.hls?serverId=' + server.id">HLS设置</menu-item>
+    <menu-item code="hls" :href="'.hls?serverId=' + server.id">启用HLS加密配置</menu-item>
-</first-menu>
+</first-menu>

EdgeAdmin/web/views/@default/servers/server/settings/multimedia/hls.html

@@ -3,14 +3,12 @@
 {$template "/left_menu_with_menu"}
 
 <div class="right-box with-menu">
-    {$template "menu"}
     <form class="ui form" data-tea-success="success" data-tea-action="$">
         <csrf-token></csrf-token>
         <input type="hidden" name="webId" :value="webId"/>
 
-        <h4>HLS加密设置</h4>
         <http-hls-config-box v-model="hlsConfig"></http-hls-config-box>
 
         <submit-btn></submit-btn>
     </form>
-</div>
+</div>

EdgeCommon/pkg/iplibrary/internal-ip-library-test.db

@@ -1 +0,0 @@
-G!Dg

EdgeUser/internal/web/actions/default/servers/create.go

@@ -5,6 +5,7 @@ import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/langs/codes"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/ossconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/sslconfigs"
@@ -14,6 +15,7 @@ import (
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/lists"
 	"github.com/iwind/TeaGo/maps"
+	"github.com/iwind/TeaGo/types"
 	"net"
 	"strings"
 )
@@ -145,9 +147,9 @@ func (this *CreateAction) RunPost(params struct {
 		return
 	}
 
-	// 协议
+	// 协议：未选择时默认 HTTP
 	if len(params.Protocols) == 0 {
-		this.Fail("请选择至少一个域名协议")
+		params.Protocols = []string{"http"}
 	}
 
 	httpConfig := &serverconfigs.HTTPProtocolConfig{}
@@ -551,25 +553,108 @@ func (this *CreateAction) RunPost(params struct {
 		return
 	}
 
-	// 统计
+	// ========== 默认开启的功能 ==========
-	if userServerConfig != nil && userServerConfig.EnableStat {
+
-		var statConfig = &serverconfigs.HTTPStatRef{
+	// 1. 访问日志
-			IsPrior: false,
+	_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebAccessLog(this.UserContext(), &pb.UpdateHTTPWebAccessLogRequest{
-			IsOn:    true,
+		HttpWebId: webId,
-		}
+		AccessLogJSON: []byte(`{
-		statJSON, err := json.Marshal(statConfig)
+			"isPrior": false,
-		if err != nil {
+			"isOn": true,
-			this.ErrorPage(err)
+			"fields": [1, 2, 6, 7],
-			return
+			"status1": true,
-		}
+			"status2": true,
-		_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebStat(this.UserContext(), &pb.UpdateHTTPWebStatRequest{
+			"status3": true,
-			HttpWebId: webId,
+			"status4": true,
-			StatJSON:  statJSON,
+			"status5": true,
-		})
+			"storageOnly": false,
-		if err != nil {
+			"storagePolicies": [],
-			this.ErrorPage(err)
+			"firewallOnly": false
-			return
+		}`),
-		}
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	// 2. WebSocket
+	createWebSocketResp, err := this.RPC().HTTPWebsocketRPC().CreateHTTPWebsocket(this.UserContext(), &pb.CreateHTTPWebsocketRequest{
+		HandshakeTimeoutJSON: []byte(`{"count": 30, "unit": "second"}`),
+		AllowAllOrigins:      true,
+		AllowedOrigins:       nil,
+		RequestSameOrigin:    true,
+		RequestOrigin:        "",
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebWebsocket(this.UserContext(), &pb.UpdateHTTPWebWebsocketRequest{
+		HttpWebId: webId,
+		WebsocketJSON: []byte(`{"isPrior": false, "isOn": true, "websocketId": ` + types.String(createWebSocketResp.WebsocketId) + `}`),
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	// 3. WAF 防火墙
+	var firewallRef = &firewallconfigs.HTTPFirewallRef{
+		IsPrior:          false,
+		IsOn:             true,
+		FirewallPolicyId: 0,
+	}
+	firewallRefJSON, err := json.Marshal(firewallRef)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebFirewall(this.UserContext(), &pb.UpdateHTTPWebFirewallRequest{
+		HttpWebId:    webId,
+		FirewallJSON: firewallRefJSON,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	// 4. 从上级代理中读取IP
+	var remoteAddrConfig = &serverconfigs.HTTPRemoteAddrConfig{
+		IsOn:  true,
+		Value: "${remoteAddr}",
+		Type:  serverconfigs.HTTPRemoteAddrTypeProxy,
+	}
+	remoteAddrConfigJSON, err := json.Marshal(remoteAddrConfig)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebRemoteAddr(this.UserContext(), &pb.UpdateHTTPWebRemoteAddrRequest{
+		HttpWebId:      webId,
+		RemoteAddrJSON: remoteAddrConfigJSON,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	// 5. 统计
+	var statConfig = &serverconfigs.HTTPStatRef{
+		IsPrior: false,
+		IsOn:    true,
+	}
+	statJSON, err := json.Marshal(statConfig)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebStat(this.UserContext(), &pb.UpdateHTTPWebStatRequest{
+		HttpWebId: webId,
+		StatJSON:  statJSON,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
 	}
 
 	// 绑定套餐

EdgeUser/internal/web/helpers/user_must_auth.go

@@ -325,7 +325,7 @@ func (this *userMustAuth) modules(userId int64, isVerified bool, isIdentified bo
 				"code": "dns",
 				"name": "域名解析",
 				"icon": "globe",
-				"isOn": true,
+				"isOn": false,
 				//"subItems": []maps.Map{
 				//	{
 				//		"name": "域名管理",

EdgeUser/web/public/js/components.js

@@ -11247,7 +11247,7 @@ Vue.component("http-hls-config-box", {
 	<table class="ui table definition selectable" v-show="isOn()">
 		<tbody>
 			<tr>
-				<td class="title">启用HLS加密</td>
+				<td class="title">启用HLS加密配置</td>
 				<td>
 					<checkbox v-model="encryptingConfig.isOn"></checkbox>
 					<p class="comment">启用后，系统会自动在<code-label>.m3u8</code-label>文件中加入<code-label>#EXT-X-KEY:METHOD=AES-128...</code-label>，并将其中的<code-label>.ts</code-label>文件内容进行加密。</p>
@@ -11280,6 +11280,7 @@ Vue.component("http-hls-config-box", {
 </div>`
 })
 
+
 Vue.component("http-host-redirect-box", {
 	props: ["v-redirects"],
 	mounted: function () {

EdgeUser/web/public/js/components.src.js

@@ -11247,7 +11247,7 @@ Vue.component("http-hls-config-box", {
 	<table class="ui table definition selectable" v-show="isOn()">
 		<tbody>
 			<tr>
-				<td class="title">启用HLS加密</td>
+				<td class="title">启用HLS加密配置</td>
 				<td>
 					<checkbox v-model="encryptingConfig.isOn"></checkbox>
 					<p class="comment">启用后，系统会自动在<code-label>.m3u8</code-label>文件中加入<code-label>#EXT-X-KEY:METHOD=AES-128...</code-label>，并将其中的<code-label>.ts</code-label>文件内容进行加密。</p>
@@ -11280,6 +11280,7 @@ Vue.component("http-hls-config-box", {
 </div>`
 })
 
+
 Vue.component("http-host-redirect-box", {
 	props: ["v-redirects"],
 	mounted: function () {

EdgeUser/web/public/js/components/server/http-hls-config-box-plus.js

@@ -43,7 +43,7 @@ Vue.component("http-hls-config-box", {
 	<table class="ui table definition selectable" v-show="isOn()">
 		<tbody>
 			<tr>
-				<td class="title">启用HLS加密</td>
+				<td class="title">启用HLS加密配置</td>
 				<td>
 					<checkbox v-model="encryptingConfig.isOn"></checkbox>
 					<p class="comment">启用后，系统会自动在<code-label>.m3u8</code-label>文件中加入<code-label>#EXT-X-KEY:METHOD=AES-128...</code-label>，并将其中的<code-label>.ts</code-label>文件内容进行加密。</p>
@@ -74,4 +74,4 @@ Vue.component("http-hls-config-box", {
 	</table>
 	<div class="margin"></div>
 </div>`
-})
+})

EdgeUser/web/views/@default/servers/server/settings/multimedia/@menu.html

@@ -1,3 +1,3 @@
 <first-menu>
-    <menu-item code="hls" :href="'.hls?serverId=' + server.id">HLS设置</menu-item>
+    <menu-item code="hls" :href="'.hls?serverId=' + server.id">启用HLS加密配置</menu-item>
-</first-menu>
+</first-menu>

EdgeUser/web/views/@default/servers/server/settings/multimedia/hls.html

@@ -3,14 +3,12 @@
 {$template "/left_menu_with_menu"}
 
 <div class="right-box with-menu">
-    {$template "menu"}
     <form class="ui form" data-tea-success="success" data-tea-action="$">
         <csrf-token></csrf-token>
         <input type="hidden" name="webId" :value="webId"/>
 
-        <h4>HLS加密设置</h4>
         <http-hls-config-box v-model="hlsConfig"></http-hls-config-box>
 
         <submit-btn></submit-btn>
     </form>
-</div>
+</div>