From 6d34e4093f9e6980fa5282dfe5e4c4e0f36868e0 Mon Sep 17 00:00:00 2001
From: zhaobangyu <763098346@QQ.com>
Date: Sat, 7 Oct 2023 17:32:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/robot/accord/accord_conf.lua           |   5 -
 .../accord/{src/bundle.lua => index.lua}      |   7 +-
 .../robot/accord/{src => page}/data_utils.js  |   0
 .../accord/{src => page}/format_utils.js      |   0
 server/robot/accord/{src => page}/index.html  |  14 +-
 .../robot/accord/{src => page}/net_utils.js   |   0
 server/robot/accord/{src => page}/style.css   |   0
 server/robot/accord/src_conf.lua              |   5 -
 server/robot/accord_mgr.lua                   |  41 +-----
 tools/accord/src_pack.lua                     | 136 ------------------
 tools/accord_pack.bat                         |   8 --
 tools/accordbuild.bat                         |  13 ++
 12 files changed, 31 insertions(+), 198 deletions(-)
 delete mode 100644 server/robot/accord/accord_conf.lua
 rename server/robot/accord/{src/bundle.lua => index.lua} (99%)
 rename server/robot/accord/{src => page}/data_utils.js (100%)
 rename server/robot/accord/{src => page}/format_utils.js (100%)
 rename server/robot/accord/{src => page}/index.html (99%)
 rename server/robot/accord/{src => page}/net_utils.js (100%)
 rename server/robot/accord/{src => page}/style.css (100%)
 delete mode 100644 server/robot/accord/src_conf.lua
 delete mode 100644 tools/accord/src_pack.lua
 delete mode 100644 tools/accord_pack.bat
 create mode 100644 tools/accordbuild.bat

diff --git a/server/robot/accord/accord_conf.lua b/server/robot/accord/accord_conf.lua
deleted file mode 100644
index 9717999d..00000000
--- a/server/robot/accord/accord_conf.lua
+++ /dev/null
@@ -1,5 +0,0 @@
---luacheck: ignore 631
-return {
-    lua = {servers={[1]='127.0.0.1:20013'},cases={login={protocols={[1]={id=10009,name='NID_LOGIN_ROLE_CHOOSE_REQ',args={role_id=0,user_id=0}},[2]={id=10011,name='NID_LOGIN_ROLE_DELETE_REQ',args={role_id=0,user_id=0}}},name='login',openid='test001',password='123456',server='127.0.0.1:20013'}},accord={NID_LOGIN_ROLE_LOGOUT_REQ={msg_id=10015,name='NID_LOGIN_ROLE_LOGOUT_REQ',fields={role_id=0}},NID_LOGIN_ROLE_RELOAD_REQ={msg_id=10017,name='NID_LOGIN_ROLE_RELOAD_REQ',fields={role_id=0,token=0,lobby=0,user_id=0}},NID_HEARTBEAT_REQ={msg_id=1001,name='NID_HEARTBEAT_REQ',fields={time=0,serial=0}},NID_LOGIN_RANDOM_NAME_REQ={msg_id=10005,name='NID_LOGIN_RANDOM_NAME_REQ',fields={}},NID_LOGIN_ACCOUNT_RELOAD_REQ={msg_id=10003,name='NID_LOGIN_ACCOUNT_RELOAD_REQ',fields={openid='xxx',account_token=0}},NID_LOGIN_ROLE_CHOOSE_REQ={msg_id=10009,name='NID_LOGIN_ROLE_CHOOSE_REQ',fields={role_id=0,user_id=0}},NID_LOGIN_ROLE_CREATE_REQ={msg_id=10007,name='NID_LOGIN_ROLE_CREATE_REQ',fields={model=0,gender=0,name='xxx',user_id=0}},NID_LOGIN_ACCOUNT_LOGIN_REQ={msg_id=10001,name='NID_LOGIN_ACCOUNT_LOGIN_REQ',fields={platform=0,openid='xxx',session='xxx'}},NID_LOGIN_ROLE_LOGIN_REQ={msg_id=10013,name='NID_LOGIN_ROLE_LOGIN_REQ',fields={role_id=0,token=0,lobby=0,user_id=0}},NID_LOGIN_ROLE_DELETE_REQ={msg_id=10011,name='NID_LOGIN_ROLE_DELETE_REQ',fields={role_id=0,user_id=0}}}},
-    json = [[{"servers":["127.0.0.1:20013"],"cases":{"login":{"protocols":[{"id":10009,"name":"NID_LOGIN_ROLE_CHOOSE_REQ","args":{"role_id":0,"user_id":0}},{"id":10011,"name":"NID_LOGIN_ROLE_DELETE_REQ","args":{"role_id":0,"user_id":0}}],"name":"login","openid":"test001","password":"123456","server":"127.0.0.1:20013"}},"accord":{"NID_LOGIN_ROLE_LOGOUT_REQ":{"msg_id":10015,"name":"NID_LOGIN_ROLE_LOGOUT_REQ","fields":{"role_id":0}},"NID_LOGIN_ROLE_RELOAD_REQ":{"msg_id":10017,"name":"NID_LOGIN_ROLE_RELOAD_REQ","fields":{"role_id":0,"token":0,"lobby":0,"user_id":0}},"NID_HEARTBEAT_REQ":{"msg_id":1001,"name":"NID_HEARTBEAT_REQ","fields":{"time":0,"serial":0}},"NID_LOGIN_RANDOM_NAME_REQ":{"msg_id":10005,"name":"NID_LOGIN_RANDOM_NAME_REQ","fields":{}},"NID_LOGIN_ACCOUNT_RELOAD_REQ":{"msg_id":10003,"name":"NID_LOGIN_ACCOUNT_RELOAD_REQ","fields":{"openid":"xxx","account_token":0}},"NID_LOGIN_ROLE_CHOOSE_REQ":{"msg_id":10009,"name":"NID_LOGIN_ROLE_CHOOSE_REQ","fields":{"role_id":0,"user_id":0}},"NID_LOGIN_ROLE_CREATE_REQ":{"msg_id":10007,"name":"NID_LOGIN_ROLE_CREATE_REQ","fields":{"model":0,"gender":0,"name":"xxx","user_id":0}},"NID_LOGIN_ACCOUNT_LOGIN_REQ":{"msg_id":10001,"name":"NID_LOGIN_ACCOUNT_LOGIN_REQ","fields":{"platform":0,"openid":"xxx","session":"xxx"}},"NID_LOGIN_ROLE_LOGIN_REQ":{"msg_id":10013,"name":"NID_LOGIN_ROLE_LOGIN_REQ","fields":{"role_id":0,"token":0,"lobby":0,"user_id":0}},"NID_LOGIN_ROLE_DELETE_REQ":{"msg_id":10011,"name":"NID_LOGIN_ROLE_DELETE_REQ","fields":{"role_id":0,"user_id":0}}}}]]
-}
diff --git a/server/robot/accord/src/bundle.lua b/server/robot/accord/index.lua
similarity index 99%
rename from server/robot/accord/src/bundle.lua
rename to server/robot/accord/index.lua
index f2892a2c..de192c91 100644
--- a/server/robot/accord/src/bundle.lua
+++ b/server/robot/accord/index.lua
@@ -1,3 +1,4 @@
+-- luacheck: ignore
 return [[
 <html>
 
@@ -530,6 +531,7 @@ var DataUtils = {
         });
     }
 }
+
     var scope = null
     var http = null
     var app = angular.module('robot', [])
@@ -1667,7 +1669,7 @@ var DataUtils = {
 </html>
 
 <style>
-pre {
+    pre {
     outline: 1px solid #ccc;
 }
 
@@ -2678,4 +2680,5 @@ body {
 .pre-text { 
     white-space: pre-wrap;
 }
-</style>]]
+</style>
+]]
\ No newline at end of file
diff --git a/server/robot/accord/src/data_utils.js b/server/robot/accord/page/data_utils.js
similarity index 100%
rename from server/robot/accord/src/data_utils.js
rename to server/robot/accord/page/data_utils.js
diff --git a/server/robot/accord/src/format_utils.js b/server/robot/accord/page/format_utils.js
similarity index 100%
rename from server/robot/accord/src/format_utils.js
rename to server/robot/accord/page/format_utils.js
diff --git a/server/robot/accord/src/index.html b/server/robot/accord/page/index.html
similarity index 99%
rename from server/robot/accord/src/index.html
rename to server/robot/accord/page/index.html
index 8c65e1cc..b328446a 100644
--- a/server/robot/accord/src/index.html
+++ b/server/robot/accord/page/index.html
@@ -1,3 +1,5 @@
+-- luacheck: ignore
+return [[
 <html>
 
 <head>
@@ -364,9 +366,10 @@ <h3 class="container-title first-ctitle">
     </div>
 </body>
 <script>
-    /* codeBlock=data_utils.js */
-    /* codeBlock=format_utils.js */
-    /* codeBlock=net_utils.js */
+    {{%= DATA_UTILS_JS %}}
+    {{%= FORMAT_UTILS_JS %}}
+    {{%= NET_UTILS_JS %}}
+
     var scope = null
     var http = null
     var app = angular.module('robot', [])
@@ -1504,5 +1507,6 @@ <h3 class="container-title first-ctitle">
 </html>
 
 <style>
-/* codeBlock=style.css */
-</style>
\ No newline at end of file
+    {{%= STYLE_CSS %}}
+</style>
+]]
\ No newline at end of file
diff --git a/server/robot/accord/src/net_utils.js b/server/robot/accord/page/net_utils.js
similarity index 100%
rename from server/robot/accord/src/net_utils.js
rename to server/robot/accord/page/net_utils.js
diff --git a/server/robot/accord/src/style.css b/server/robot/accord/page/style.css
similarity index 100%
rename from server/robot/accord/src/style.css
rename to server/robot/accord/page/style.css
diff --git a/server/robot/accord/src_conf.lua b/server/robot/accord/src_conf.lua
deleted file mode 100644
index c3fcc22b..00000000
--- a/server/robot/accord/src_conf.lua
+++ /dev/null
@@ -1,5 +0,0 @@
-return {
-src_list={
-		[1]="../server/robot/accord/src/bundle.lua",
-	}
-}
diff --git a/server/robot/accord_mgr.lua b/server/robot/accord_mgr.lua
index 0ae53739..9c158c30 100644
--- a/server/robot/accord_mgr.lua
+++ b/server/robot/accord_mgr.lua
@@ -6,7 +6,6 @@ local json_pretty  = json.pretty
 local tinsert      = table.insert
 
 local HttpServer   = import("network/http_server.lua")
-local src_conf     = import("robot/accord/src_conf.lua")
 
 local robot_mgr    = quanta.get("robot_mgr")
 local update_mgr   = quanta.get("update_mgr")
@@ -21,13 +20,10 @@ local AccordMgr    = singleton()
 local prop         = property(AccordMgr)
 prop:reader("http_server", nil)
 prop:reader("accord_html", "") -- html
-prop:reader("accord_css", "")  -- css
-prop:reader("accord_js", {})   -- js
 prop:reader("server_list", {}) -- 服务列表
 prop:reader("accord_list", {}) -- 协议列表(添加的数据)
 prop:reader("case_group", {})  -- 用例分组
 prop:reader("load_db_status", false)
-prop:reader("src_map", {})     -- 资源映射
 
 function AccordMgr:__init()
     -- 创建HTTP服务器
@@ -38,9 +34,6 @@ function AccordMgr:__init()
     server:register_post("/destory", "on_destory", self)
     server:register_post("/run", "on_run", self)
 
-    server:register_get("/src_list", "on_src_list", self)
-    server:register_get("/load_src", "on_load_src", self)
-
     -- 服务器操作
     server:register_post("/server_list", "on_server_list", self)
     server:register_post("/server_edit", "on_server_edit", self)
@@ -123,17 +116,13 @@ function AccordMgr:load_db_data()
 end
 
 -- 加载资源
-function AccordMgr:load_src()
-    for _,name in pairs(src_conf.src_list) do
-        local file_path = name
-        local file = import(file_path)
-        self.src_map[self:get_src_name(file_path)] = file
-    end
+function AccordMgr:load_html()
+    self.accord_html = import("../server/robot/accord/index.lua")
 end
 
 -- 定时更新
 function AccordMgr:on_second5()
-    self:load_src()
+    self:load_html()
 end
 
 -- http 回调
@@ -141,7 +130,7 @@ end
 -- accord_html
 function AccordMgr:on_accord_page(url, body)
     if self.load_db_status then
-        return self.src_map["bundle"], {
+        return self.accord_html, {
             ["Access-Control-Allow-Origin"] = "*"
         }
     end
@@ -165,28 +154,6 @@ function AccordMgr:get_src_name(src_path)
     return src_name
 end
 
--- 资源列表
-function AccordMgr:on_src_list(url, params)
-    local src_list = {}
-    for _,name in pairs(src_conf.src_list) do
-        local src_name = self:get_src_name(name)
-        if src_name then
-            tinsert(src_list, src_name)
-        end
-    end
-    return src_list, {
-        ["Access-Control-Allow-Origin"] = "*"
-    }
-end
-
--- 加载资源
-function AccordMgr:on_load_src(url, params)
-    local name = params.name
-    return self.src_map[name], {
-        ["Access-Control-Allow-Origin"] = "*"
-    }
-end
-
 -- 拉取日志
 function AccordMgr:on_message(url, params)
     -- log_debug("[AccordMgr][on_message] open_id: %s", params.open_id)
diff --git a/tools/accord/src_pack.lua b/tools/accord/src_pack.lua
deleted file mode 100644
index f72ef516..00000000
--- a/tools/accord/src_pack.lua
+++ /dev/null
@@ -1,136 +0,0 @@
---系统验证
-local function is_linux()
-    if package.config:sub(1, 1) == "\\" then
-        return false
-    end
-    return true
-end
-
---文件遍历
-local function traverse(src_path)
-    local files = {}
-    local dirs = {}
-    local pfile = is_linux()==false and 'dir /b "'..src_path..'"' or  'ls -p "'..src_path..'"'
-    for file in io.popen(pfile):lines() do
-        local filepath = src_path..'/'..file
-        local index = string.find(file,"%.")
-        if index == nil then
-            table.insert(dirs, filepath)
-            local subdir_files,sub_dirs = traverse(filepath)
-            for _, v in ipairs(subdir_files) do
-                table.insert(files, v)
-            end
-            for _, v in ipairs(sub_dirs) do
-                table.insert(dirs, v)
-            end
-        else
-            if file ~= '.' and file ~= '..' then
-                local attr = io.open(filepath, 'r')
-                if attr then
-                    io.close(attr)
-                    if file:sub(-1) == '/' then
-                        table.insert(dirs, filepath)
-                        local subdir_files,sub_dirs = traverse(filepath)
-                        for _, v in ipairs(subdir_files) do
-                            table.insert(files, v)
-                        end
-                        for _, v in ipairs(sub_dirs) do
-                            table.insert(dirs, v)
-                        end
-                    else
-                        table.insert(files, {
-                            name=file,
-                            path=filepath,
-                        })
-                    end
-                end
-            end
-        end
-    end
-    return files,dirs
-end
-
--- 保存配置列表
-local function save_conf(file, list)
-    local input_file = io.open(file, 'w')
-    input_file:write('return {\nsrc_list={\n')
-    for i, v in ipairs(list) do
-        input_file:write('\t\t['..i..']="'.. v ..'",\n')
-        print("v="..v)
-    end
-    input_file:write('\t}\n}\n')
-    input_file:close()
-end
-
--- 基础路径
-local base_path = nil
--- 资源路径
-local src_path = nil
--- 配置路径
-local conf_path = nil
-
--- 读取启动参数
-for _, v in ipairs(arg) do
-    base_path = v
-    print("base_path="..base_path)
-    break;
-end
-
-if base_path == nil then
-    print("非法的基础路径,请检查启动脚本")
-    return
-end
-
--- 路径初始化
-src_path = base_path..'/src'
-conf_path = base_path.."/src_conf.lua"
-print("src_path="..src_path)
-
-
--- 遍历文件和目录
-local files,_ = traverse(src_path)
-
--- index
-local htmlContent = ""
--- index路径
-local htmlPath = ""
--- 其它资源文件
-local contents = {}
--- 读取文件
-for _,item in pairs(files) do
-    local file = io.open(item.path, "r")
-    local content = file:read("*a")
-    local ext = item.name:match("^.+(%.%w+)")
-    if ext then
-        ext =ext:sub(2)
-    end
-    if ext ~= "html" then
-        contents[item.name] = {
-            name = item.name,
-            ext = ext,
-            content = content
-        }
-    else
-        htmlContent = content
-        htmlPath = item.path
-    end
-end
-
-
--- 查找代码块并替换
-for _,item in pairs(contents) do
-    local replaceStr = string.gsub(item.content, "%%", "%%%%")
-    htmlContent = htmlContent:gsub("/%*%s*codeBlock="..item.name.."%s*%*/", replaceStr)
-    print("item.name="..item.name)
-end
-
-local bundlePath = string.gsub(htmlPath, "index.html", "bundle.lua")
--- 将打包后的内容保存到新的文件中
-local outputFile = io.open(bundlePath, "w")
-outputFile:write('return [[\n' .. htmlContent .. ']]\n')
-outputFile:close()
-
-local conf_list = {}
-table.insert(conf_list, base_path.."/src/bundle.lua")
--- 将lua文件列表写入lua配置
-save_conf(conf_path, conf_list)
\ No newline at end of file
diff --git a/tools/accord_pack.bat b/tools/accord_pack.bat
deleted file mode 100644
index abbf393f..00000000
--- a/tools/accord_pack.bat
+++ /dev/null
@@ -1,8 +0,0 @@
-@echo off
-
-chcp 65001
-
-:: 将src目录下的html、css、js打包到html中
-..\bin\lua.exe ../tools/accord/src_pack.lua ../server/robot/accord
-pause
-
diff --git a/tools/accordbuild.bat b/tools/accordbuild.bat
new file mode 100644
index 00000000..5b244d36
--- /dev/null
+++ b/tools/accordbuild.bat
@@ -0,0 +1,13 @@
+@echo off
+set DATA_UTILS_JS=../server/robot/accord/page/data_utils.js
+set FORMAT_UTILS_JS=../server/robot/accord/page/format_utils.js
+set NET_UTILS_JS=../server/robot/accord/page/net_utils.js
+set STYLE_CSS=../server/robot/accord/page/style.css
+set TPL=../server/robot/accord/page/index.html
+set OUT=../server/robot/accord/index.lua
+set SCRIPT=../extend/lmake/ltemplate.lua
+
+..\bin\lua.exe %SCRIPT% %TPL% %OUT% DATA_UTILS_JS %DATA_UTILS_JS% FORMAT_UTILS_JS %FORMAT_UTILS_JS% NET_UTILS_JS %NET_UTILS_JS% STYLE_CSS %STYLE_CSS%
+
+pause
+