feat: 支持静态资源路由配置 feat: 补充文档 feat: 优化部分代码和注释

Author: iamtsm

balance/tl_ops_balance_core_api.lua

@@ -8,11 +8,12 @@ local cjson                         = require("cjson.safe");
 local cache_api                     = require("cache.tl_ops_cache_core"):new("tl-ops-balance-api");
 local tl_ops_utils_func             = require("utils.tl_ops_utils_func");
 local tl_ops_constant_balance_api   = require("constant.tl_ops_constant_balance_api");
-local tl_ops_match_mode             = require("constant.tl_ops_constant_comm").tl_ops_match_mode;
-local tl_ops_constant_health        = require("constant.tl_ops_constant_health")
-local shared                        = ngx.shared.tlopsbalance
-local find                          = ngx.re.find
-
+local tl_ops_constant_comm          = require("constant.tl_ops_constant_comm");
+local tl_ops_constant_health        = require("constant.tl_ops_constant_health");
+local tl_ops_match_mode             = tl_ops_constant_comm.tl_ops_match_mode;
+local tl_ops_api_type               = tl_ops_constant_comm.tl_ops_api_type;
+local shared                        = ngx.shared.tlopsbalance;
+local find                          = ngx.re.find;
 
 -- 处理匹配逻辑
 local tl_ops_balance_api_matcher_mode = function (matcher, request_uri, obj)
@@ -81,6 +82,7 @@ end
 
 
 local tl_ops_balance_api_service_matcher = function(service_list_table)
+    
     local matcher = nil
     local node = nil
 
@@ -153,15 +155,26 @@ local tl_ops_balance_api_service_matcher = function(service_list_table)
     local node_state , _ = shared:get(key)
 
 
+    -- 静态页面代理路径
+    local api_type = matcher.api_type
+    if api_type and api_type == tl_ops_api_type.page then
+        ngx.req.set_uri_args({ 
+            url = request_uri
+        })
+        ngx.req.set_uri("/pageproxy", true)
+        return
+    end
+
     -- 需要重写url
     local rewrite_url = matcher.rewrite_url
     if rewrite_url and rewrite_url ~= '' then
         ngx.req.set_uri(rewrite_url, false)
+        return
     end
 
-    -- 需要转发到服务具体路径
+    -- 需要转发到服务下的具体路径
     local fake_prefix = matcher.fake_prefix
-    if fake_prefix and matcher.fake_prefix ~= '' then
+    if fake_prefix and fake_prefix ~= '' then
         -- 通过虚拟前缀截取后缀
         local fake_sub = string.sub(request_uri, #fake_prefix + 1, #request_uri)
         if fake_sub then

bin/install_centeros.sh

@@ -6,7 +6,7 @@ TL_OPS_PATH="/usr/local/tl-ops-manage/"
 TL_OPS_CONF_PATH="/usr/local/tl-ops-manage/conf/tl_ops_manage.conf"
 TL_OPS_LUA_PATH="/usr/local/openresty/lualib/?.lua;;/usr/local/tl-ops-manage/?.lua;;"
 TL_OPS_LUAC_PATH="/usr/local/openresty/lualib/?.so;;"
-TL_OPS_VER="v3.2.0"
+TL_OPS_VER="v3.3.0"
 
 echo_msg(){
     cur_time=$(date "+%Y-%m-%d %H:%M:%S")

bin/install_ubuntu.sh

@@ -6,7 +6,7 @@ TL_OPS_PATH="/usr/local/tl-ops-manage/"
 TL_OPS_CONF_PATH="/usr/local/tl-ops-manage/conf/tl_ops_manage.conf"
 TL_OPS_LUA_PATH="/usr/local/openresty/lualib/?.lua;;/usr/local/tl-ops-manage/?.lua;;"
 TL_OPS_LUAC_PATH="/usr/local/openresty/lualib/?.so;;"
-TL_OPS_VER="v3.2.0"
+TL_OPS_VER="v3.3.0"
 
 echo_msg(){
     cur_time=$(date "+%Y-%m-%d %H:%M:%S")

conf/tl_ops_manage.conf

@@ -66,6 +66,14 @@ server {
 		}
 	}
 
+	location = /pageproxy {
+		set $pageproxy "";
+		alias $pageproxy;
+		rewrite_by_lua_block {
+			tlops:tl_ops_process_init_rewrite('onlyplugin');
+		}
+	}
+
 	location /balanceerr/ {
 		content_by_lua_block {
 			tlops:tl_ops_process_init_content();			

constant/tl_ops_constant_balance_api.lua

@@ -1,4 +1,5 @@
 local match_mode = require("constant.tl_ops_constant_comm").tl_ops_match_mode;
+local api_type = require("constant.tl_ops_constant_comm").tl_ops_api_type;
 
 -- api 默认列表
 local tl_ops_constant_balance_api = {
@@ -23,6 +24,7 @@ local tl_ops_constant_balance_api = {
             host = "tlops1.com",                    -- 当前url处理的域名范围
             rewrite_url = "",                       -- 当前url重写后的url
             fake_prefix = "",                       -- 当前uri规则的虚拟前缀
+            api_type = api_type.api,                -- 当前uri规则的类型
         },
         random = {
             id = 1,
@@ -32,6 +34,7 @@ local tl_ops_constant_balance_api = {
             host = "tlops1.com",                    -- 当前url处理的域名范围
             rewrite_url = "",                       -- 当前url重写后的url
             fake_prefix = "",                       -- 当前uri规则的虚拟前缀
+            api_type = api_type.api,                -- 当前uri规则的类型
         }
     },
     rule = {-- api rule 策略

constant/tl_ops_constant_comm.lua

@@ -1,14 +1,22 @@
 local tl_ops_constant_comm = {
     tl_ops_status = {-- service status 状态
+        -- 在线
         online = 0,
+        -- 下线
         offline = 1,
+        -- 错误
         error = 2
     }, 
     tl_ops_rt = {-- rt 返回值
+        -- 成功
         ok = 0,
+        -- 错误
         error = -1,
+        -- 参数有误
         args_error = -2,
+        -- 找不到
         not_found = -3,
+        -- 解析错误
         parse_error = -4
     },
     tl_ops_match_mode = {-- api匹配模式
@@ -20,6 +28,12 @@ local tl_ops_constant_comm = {
         regi = "joi",
         -- 最长字符串匹配
         regid = "joid"
+    },
+    tl_ops_api_type = {-- api类型
+        -- 接口类型
+        api = "api",
+        -- 文件资源
+        page = "page"
     }
 };
 

doc/change.md

@@ -1,6 +1,17 @@
 
 ## 事务更新日程
 
+2023-03-05
+
+    1. 支持静态资源路由配置
+
+    2. 同步补充文档
+
+    3. 优化部分代码
+
+    4. 事务日程调整
+
+
 2023-02-27
 
     1. 支持api路由指定虚拟前缀

err/tl_ops_err_content.lua

@@ -4,7 +4,7 @@
 -- @author iamtsm
 -- @email 1905333456@qq.com
 
-local tl_ops_err_content_core = require(".err.tl_ops_err_content_core");
+local tl_ops_err_content_core = require("err.tl_ops_err_content_core");
 
 local _M = {}
 

gitbook/SUMMARY.md

@@ -49,8 +49,6 @@
 
         * [多规则匹配](code/balance/README_RULE.md)
 
-        * [多模式匹配](code/balance/README_RULE.md)
-
     * [路由统计](code/balancecount/README.md)
 
     * [动态配置](code/dynamic/README.md)

gitbook/code/pageproxy/README.md

@@ -30,8 +30,7 @@ location xxx {
 
 #### 动态调整路径
 
-还有一个好处就是支持动态调整静态资源路径，当然，前提是你已经支持了可视化操作修改路径
-
+还有一个好处就是支持动态调整静态资源路径，v-3.3.0以上已支持动态配置静态资源路由
 
 ## 实现