Merge pull request #59 from pwnsky/dev

Dev
pwnsky · Oct 28, 2024 · d6eb338 · d6eb338
2 parents b1bc5ce + 6dd20b6
commit d6eb338
Show file tree

Hide file tree

Showing 372 changed files with 521 additions and 509 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -124,9 +124,8 @@ add_definitions(-D_X64 -D_CONSOLE -DSQUICK_DYNAMIC_PLUGIN -DSQUICK_ENABLE_SSL)
 add_definitions(-DSQUICK_LOG_OPEN_STDOUT) # Log stdout print
 
 add_subdirectory(src/struct)
-add_subdirectory(src/squick)
-add_subdirectory(src/node)
-add_subdirectory(src/tutorial)
+add_subdirectory(src/core)
+add_subdirectory(src/plugin)
 
 
 if( EXTRA STREQUAL "EXTRA" )

diff --git a/res b/res
diff --git a/script/benchmark.bat b/script/benchmark.bat
diff --git a/script/benchmark.sh b/script/benchmark.sh
diff --git a/script/db/clickhouse/admin_log.sql → script/db_sql/clickhouse/admin_log.sql b/script/db/clickhouse/admin_log.sql → script/db_sql/clickhouse/admin_log.sql
diff --git a/script/db/clickhouse/node_log.sql → script/db_sql/clickhouse/node_log.sql b/script/db/clickhouse/node_log.sql → script/db_sql/clickhouse/node_log.sql
diff --git a/script/db/clickhouse/player_log.sql → script/db_sql/clickhouse/player_log.sql b/script/db/clickhouse/player_log.sql → script/db_sql/clickhouse/player_log.sql
diff --git a/script/db/mysql/admin.sql → script/db_sql/mysql/admin.sql b/script/db/mysql/admin.sql → script/db_sql/mysql/admin.sql
diff --git a/script/db/mysql/player.sql → script/db_sql/mysql/player.sql b/script/db/mysql/player.sql → script/db_sql/mysql/player.sql
diff --git a/script/env.bat b/script/env.bat
@@ -0,0 +1 @@
+set SQUICK_RUN_ENV=ten
diff --git a/script/gen_env_config.py b/script/gen_env_config.py
@@ -0,0 +1,56 @@
+#! /usr/bin/python3
+import os
+import collections
+import sys
+
+if len(sys.argv) < 2:
+    env='dev'
+else:
+    env=sys.argv[1]
+
+print('Gen env: ' + env)
+
+tmpl_path = '../config/tmpl'
+tmpl_value_path = '../config/tmpl/env'
+cfg_path = '../config/node'
+
+cfg_map = {}
+conf_content = ''
+
+def GetFileContent(path):
+    fd = open(path, 'r')
+    return fd.read()
+
+for root, dirs, files in os.walk(tmpl_path):
+    for f in files:
+        if f.endswith('.json'):
+            print("json file: ", f)
+            cfg_map[f] = GetFileContent(tmpl_path + '/' + f)
+        elif f.endswith('.conf'):
+            print("conf file: ", f)
+            if f == env + '.conf':
+                conf_content = GetFileContent(tmpl_path + '/env/' + f)
+
+
+# replace
+if (len(conf_content) > 0):
+    conf_arr = conf_content.split('\n')
+    for conf_line in conf_arr:
+        conf = conf_line.split('=')
+        if len(conf) < 2:
+            continue
+        key = conf[0]
+        value = conf[1]
+        for k2 in cfg_map:
+            tmp = cfg_map[k2]
+            tmp = tmp.replace('{' + key + '}', value)
+            cfg_map[k2] = tmp 
+else:
+    print("Get " + env + " error")
+    exit(-1)
+
+# save
+for k in cfg_map:
+    fd = open(cfg_path + '/' + k, 'w')
+    fd.write(cfg_map[k])
+    fd.close()
diff --git a/script/sqkcli.sh b/script/sqkcli.sh
diff --git a/script/squick.bat b/script/squick.bat
@@ -5,6 +5,9 @@ rem Date  : 2022-11-27
 rem Github: https://github.com/pwnsky/squick
 rem Description: Start all servers script
 
+call env.bat
+python gen_env_config.py %SQUICK_RUN_ENV%
+
 cd ..\bin
 
 start /b .\squick
diff --git a/script/squick.sh b/script/squick.sh
@@ -16,6 +16,12 @@ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/lib
 # for macos
 export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:`pwd`
 
+echo $SQUICK_MEMORY_CHECK
+if [ "1" == "$SQUICK_MEMORY_CHECK" ];then
+        valgrind --leak-check=full ./squick $@
+        exit
+fi
+
 echo $SQUICK_ARGS
 if [ -z $SQUICK_ARGS ];then
         ./squick $@

diff --git a/script/start.bat b/script/start.bat
@@ -5,6 +5,9 @@ rem Date  : 2024-04-08
 rem Github: https://github.com/pwnsky/squick
 rem Description: Start all nodes
 
+call env.bat
+python gen_env_config.py %SQUICK_RUN_ENV%
+
 cd ..\bin
 
 start cmd /c " squick type=master id=1 area=0 ip=127.0.0.1 port=10001 web_port=50000"

diff --git a/script/stop_benchmark.bat b/script/stop_benchmark.bat
diff --git a/script/stop_benchmark.sh b/script/stop_benchmark.sh
diff --git a/src/squick/core/CMakeLists.txt → src/core/CMakeLists.txt b/src/squick/core/CMakeLists.txt → src/core/CMakeLists.txt
diff --git a/src/squick/core/base.cc → src/core/base.cc b/src/squick/core/base.cc → src/core/base.cc
diff --git a/src/squick/core/base.h → src/core/base.h b/src/squick/core/base.h → src/core/base.h
diff --git a/src/squick/core/consistent_hash.h → src/core/consistent_hash.h b/src/squick/core/consistent_hash.h → src/core/consistent_hash.h
diff --git a/src/squick/core/data_list.h → src/core/data_list.h b/src/squick/core/data_list.h → src/core/data_list.h
diff --git a/src/squick/core/date_time.h → src/core/date_time.h b/src/squick/core/date_time.h → src/core/date_time.h
diff --git a/src/squick/core/dyn_lib.cc → src/core/dyn_lib.cc b/src/squick/core/dyn_lib.cc → src/core/dyn_lib.cc
diff --git a/src/squick/core/dyn_lib.h → src/core/dyn_lib.h b/src/squick/core/dyn_lib.h → src/core/dyn_lib.h
diff --git a/src/squick/core/exception.cc → src/core/exception.cc b/src/squick/core/exception.cc → src/core/exception.cc
diff --git a/src/squick/core/exception.h → src/core/exception.h b/src/squick/core/exception.h → src/core/exception.h
diff --git a/src/squick/core/guid.h → src/core/guid.h b/src/squick/core/guid.h → src/core/guid.h
diff --git a/src/squick/core/i_module.h → src/core/i_module.h b/src/squick/core/i_module.h → src/core/i_module.h
diff --git a/src/squick/core/i_object.h → src/core/i_object.h b/src/squick/core/i_object.h → src/core/i_object.h
diff --git a/src/squick/core/i_plugin.h → src/core/i_plugin.h b/src/squick/core/i_plugin.h → src/core/i_plugin.h
diff --git a/src/squick/core/i_plugin_manager.h → src/core/i_plugin_manager.h b/src/squick/core/i_plugin_manager.h → src/core/i_plugin_manager.h
@@ -3,7 +3,7 @@
 #include "platform.h"
 #include <functional>
 #include <list>
-#include <squick/core/guid.h>
+#include <core/guid.h>
 #include <vector>
 
 class IPlugin;

diff --git a/src/squick/core/i_property.h → src/core/i_property.h b/src/squick/core/i_property.h → src/core/i_property.h
diff --git a/src/squick/core/i_property_manager.h → src/core/i_property_manager.h b/src/squick/core/i_property_manager.h → src/core/i_property_manager.h
diff --git a/src/squick/core/i_record.h → src/core/i_record.h b/src/squick/core/i_record.h → src/core/i_record.h
diff --git a/src/squick/core/i_record_manager.h → src/core/i_record_manager.h b/src/squick/core/i_record_manager.h → src/core/i_record_manager.h
diff --git a/src/squick/core/i_tag_module.h → src/core/i_tag_module.h b/src/squick/core/i_tag_module.h → src/core/i_tag_module.h
diff --git a/src/squick/core/list.h → src/core/list.h b/src/squick/core/list.h → src/core/list.h
diff --git a/src/squick/core/map.h → src/core/map.h b/src/squick/core/map.h → src/core/map.h
diff --git a/src/squick/core/map_ex.h → src/core/map_ex.h b/src/squick/core/map_ex.h → src/core/map_ex.h
diff --git a/src/squick/core/math.h → src/core/math.h b/src/squick/core/math.h → src/core/math.h
diff --git a/src/squick/core/mem_manager.h → src/core/mem_manager.h b/src/squick/core/mem_manager.h → src/core/mem_manager.h
diff --git a/src/squick/core/memory_counter.cc → src/core/memory_counter.cc b/src/squick/core/memory_counter.cc → src/core/memory_counter.cc
diff --git a/src/squick/core/memory_counter.h → src/core/memory_counter.h b/src/squick/core/memory_counter.h → src/core/memory_counter.h
diff --git a/src/squick/core/object.cc → src/core/object.cc b/src/squick/core/object.cc → src/core/object.cc
diff --git a/src/squick/core/object.h → src/core/object.h b/src/squick/core/object.h → src/core/object.h
diff --git a/src/squick/core/performance.h → src/core/performance.h b/src/squick/core/performance.h → src/core/performance.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <iostream>
-#include <squick/core/base.h>
+#include <core/base.h>
 #include <time.h>
 class Performance {
   private:

diff --git a/src/squick/core/platform.h → src/core/platform.h b/src/squick/core/platform.h → src/core/platform.h
diff --git a/src/squick/core/plugin_manager.cc → src/core/plugin_manager.cc b/src/squick/core/plugin_manager.cc → src/core/plugin_manager.cc
@@ -5,7 +5,7 @@
 #include "third_party/rapidxml/rapidxml_iterators.hpp"
 #include "third_party/rapidxml/rapidxml_print.hpp"
 #include "third_party/rapidxml/rapidxml_utils.hpp"
-#include <squick/core/base.h>
+#include <core/base.h>
 
 PluginManager::PluginManager() : IPluginManager() {
     appID = 0;
@@ -20,7 +20,7 @@ PluginManager::PluginManager() : IPluginManager() {
     mGetFileContentFunctor = nullptr;
 
     configPath = "..";                       // 主要服务路径
-    configName = "config/plugin/plugin.xml"; // 默认插件加载路径
+    configName = "config/plugin.xml"; // 默认插件加载路径
 }
 
 PluginManager::~PluginManager() {}
@@ -64,7 +64,7 @@ bool PluginManager::LoadPluginConfig() {
     rapidxml::xml_node<> *pRoot = xDoc.first_node();
     if (pRoot == nullptr) {
         SQUICK_PRINT("Cannot load plugin config from :" + strFilePath);
-        SQUICK_PRINT("Please check your working directory, make sure config file in the [../config/plugin/] directory.");
+        SQUICK_PRINT("Please check your working directory, make sure config file in the [../config/] directory.");
         return false;
     }
     rapidxml::xml_node<> *pAppNameNode = pRoot->first_node(appName.c_str());

diff --git a/src/squick/core/plugin_manager.h → src/core/plugin_manager.h b/src/squick/core/plugin_manager.h → src/core/plugin_manager.h
diff --git a/src/squick/core/plugin_server.cc → src/core/plugin_server.cc b/src/squick/core/plugin_server.cc → src/core/plugin_server.cc
@@ -1,6 +1,6 @@
 #include "plugin_server.h"
-#include <squick/core/base.h>
-#include <squick/core/exception.h>
+#include <core/base.h>
+#include <core/exception.h>
 #include <algorithm>
 
 PluginServer::PluginServer(const std::string &strArgv) {

diff --git a/src/squick/core/plugin_server.h → src/core/plugin_server.h b/src/squick/core/plugin_server.h → src/core/plugin_server.h
diff --git a/src/squick/core/property.cc → src/core/property.cc b/src/squick/core/property.cc → src/core/property.cc
diff --git a/src/squick/core/property.h → src/core/property.h b/src/squick/core/property.h → src/core/property.h
diff --git a/src/squick/core/property_manager.cc → src/core/property_manager.cc b/src/squick/core/property_manager.cc → src/core/property_manager.cc
diff --git a/src/squick/core/property_manager.h → src/core/property_manager.h b/src/squick/core/property_manager.h → src/core/property_manager.h
diff --git a/src/squick/core/queue.h → src/core/queue.h b/src/squick/core/queue.h → src/core/queue.h
diff --git a/src/squick/core/record.cc → src/core/record.cc b/src/squick/core/record.cc → src/core/record.cc
diff --git a/src/squick/core/record.h → src/core/record.h b/src/squick/core/record.h → src/core/record.h
diff --git a/src/squick/core/recordManager.cc → src/core/recordManager.cc b/src/squick/core/recordManager.cc → src/core/recordManager.cc
diff --git a/src/squick/core/record_manager.h → src/core/record_manager.h b/src/squick/core/record_manager.h → src/core/record_manager.h
diff --git a/src/squick/core/smart_enum.h → src/core/smart_enum.h b/src/squick/core/smart_enum.h → src/core/smart_enum.h
diff --git a/src/squick/core/string_ring_buffer.h → src/core/string_ring_buffer.h b/src/squick/core/string_ring_buffer.h → src/core/string_ring_buffer.h
diff --git a/src/squick/core/termcolor.h → src/core/termcolor.h b/src/squick/core/termcolor.h → src/core/termcolor.h
diff --git a/src/squick/core/vector2.h → src/core/vector2.h b/src/squick/core/vector2.h → src/core/vector2.h
diff --git a/src/squick/core/vector3.h → src/core/vector3.h b/src/squick/core/vector3.h → src/core/vector3.h
diff --git a/src/squick/core/vector4.h → src/core/vector4.h b/src/squick/core/vector4.h → src/core/vector4.h
diff --git a/src/main.cc b/src/main.cc
@@ -1,6 +1,6 @@
 #include <iostream>
-#include <squick/core/base.h>
-#include <squick/core/plugin_server.h>
+#include <core/base.h>
+#include <core/plugin_server.h>
 #include <struct/struct.h>
 
 #if PLATFORM == PLATFORM_WIN
@@ -139,6 +139,7 @@ int main(int argc, char *argv[]) {
     SetConsoleCtrlHandler(HandlerRoutine, TRUE);
 #else
     signal(SIGINT, SquickExit);
+    signal(SIGTERM, SquickExit);
 #endif
 
     for (auto item : serverList) {

diff --git a/src/plugin/CMakeLists.txt b/src/plugin/CMakeLists.txt
@@ -0,0 +1,6 @@
+add_subdirectory(core)
+add_subdirectory(node)
+
+if( MODE STREQUAL "dev" )
+    add_subdirectory(tutorial)
+endif()
diff --git a/src/squick/plugin/CMakeLists.txt → src/plugin/core/CMakeLists.txt b/src/squick/plugin/CMakeLists.txt → src/plugin/core/CMakeLists.txt
diff --git a/src/squick/plugin/actor/CMakeLists.txt → src/plugin/core/actor/CMakeLists.txt b/src/squick/plugin/actor/CMakeLists.txt → src/plugin/core/actor/CMakeLists.txt
diff --git a/src/squick/plugin/actor/actor.cc → src/plugin/core/actor/actor.cc b/src/squick/plugin/actor/actor.cc → src/plugin/core/actor/actor.cc
@@ -1,5 +1,5 @@
 #include "actor.h"
-#include <squick/core/i_plugin_manager.h>
+#include <core/i_plugin_manager.h>
 
 Actor::Actor(const Guid id, IActorModule *pModule) {
     this->id = id;

diff --git a/src/squick/plugin/actor/actor.h → src/plugin/core/actor/actor.h b/src/squick/plugin/actor/actor.h → src/plugin/core/actor/actor.h
@@ -3,10 +3,10 @@
 #include "i_actor_module.h"
 #include "i_component_module.h"
 #include <map>
-#include <squick/core/guid.h>
-#include <squick/core/map_ex.h>
-#include <squick/core/platform.h>
-#include <squick/core/queue.h>
+#include <core/guid.h>
+#include <core/map_ex.h>
+#include <core/platform.h>
+#include <core/queue.h>
 #include <string>
 
 class Actor : public IActor {

diff --git a/src/squick/plugin/actor/actor_module.cc → src/plugin/core/actor/actor_module.cc b/src/squick/plugin/actor/actor_module.cc → src/plugin/core/actor/actor_module.cc
diff --git a/src/squick/plugin/actor/actor_module.h → src/plugin/core/actor/actor_module.h b/src/squick/plugin/actor/actor_module.h → src/plugin/core/actor/actor_module.h
@@ -4,8 +4,8 @@
 #include <queue>
 #include <string>
 
-#include <squick/core/queue.h>
-#include <squick/plugin/thread/export.h>
+#include <core/queue.h>
+#include <plugin/core/thread/export.h>
 
 #include "actor.h"
 #include "i_actor_module.h"

diff --git a/src/squick/plugin/actor/export.h → src/plugin/core/actor/export.h b/src/squick/plugin/actor/export.h → src/plugin/core/actor/export.h
diff --git a/src/squick/plugin/actor/i_actor_module.h → src/plugin/core/actor/i_actor_module.h b/src/squick/plugin/actor/i_actor_module.h → src/plugin/core/actor/i_actor_module.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "i_component_module.h"
-#include <squick/core/i_module.h>
+#include <core/i_module.h>
 
 class IActorModule : public IModule {
   public:

diff --git a/src/squick/plugin/actor/i_component_module.h → src/plugin/core/actor/i_component_module.h b/src/squick/plugin/actor/i_component_module.h → src/plugin/core/actor/i_component_module.h
@@ -1,9 +1,9 @@
 #pragma once
 #include <memory>
-#include <squick/core/guid.h>
-#include <squick/core/i_module.h>
-#include <squick/core/memory_counter.h>
-#include <squick/core/platform.h>
+#include <core/guid.h>
+#include <core/i_module.h>
+#include <core/memory_counter.h>
+#include <core/platform.h>
 
 class ActorMessage;
 class IComponent;

diff --git a/src/squick/plugin/actor/plugin.cc → src/plugin/core/actor/plugin.cc b/src/squick/plugin/actor/plugin.cc → src/plugin/core/actor/plugin.cc
@@ -1,6 +1,6 @@
 #include "plugin.h"
 #include "actor_module.h"
-#include <squick/core/i_module.h>
+#include <core/i_module.h>
 
 SQUICK_EXPORT void SquickPluginLoad(IPluginManager *pm){CREATE_PLUGIN(pm, ActorPlugin)};
 

diff --git a/src/squick/plugin/actor/plugin.h → src/plugin/core/actor/plugin.h b/src/squick/plugin/actor/plugin.h → src/plugin/core/actor/plugin.h
@@ -1,6 +1,6 @@
 
-#include <squick/core/i_plugin.h>
-#include <squick/core/i_plugin_manager.h>
+#include <core/i_plugin.h>
+#include <core/i_plugin_manager.h>
 
 //////////////////////////////////////////////////////////////////////////
 class ActorPlugin : public IPlugin {

diff --git a/src/squick/plugin/config/CMakeLists.txt → src/plugin/core/config/CMakeLists.txt b/src/squick/plugin/config/CMakeLists.txt → src/plugin/core/config/CMakeLists.txt
diff --git a/src/squick/plugin/config/class_module.cc → src/plugin/core/config/class_module.cc b/src/squick/plugin/config/class_module.cc → src/plugin/core/config/class_module.cc
diff --git a/src/squick/plugin/config/class_module.cc~ → src/plugin/core/config/class_module.cc~ b/src/squick/plugin/config/class_module.cc~ → src/plugin/core/config/class_module.cc~
diff --git a/src/squick/plugin/config/class_module.h → src/plugin/core/config/class_module.h b/src/squick/plugin/config/class_module.h → src/plugin/core/config/class_module.h
@@ -5,13 +5,13 @@
 #include "i_element_module.h"
 #include <iostream>
 #include <map>
-#include <squick/core/data_list.h>
-#include <squick/core/i_plugin_manager.h>
-#include <squick/core/list.h>
-#include <squick/core/map.h>
-#include <squick/core/property_manager.h>
-#include <squick/core/record.h>
-#include <squick/core/record_manager.h>
+#include <core/data_list.h>
+#include <core/i_plugin_manager.h>
+#include <core/list.h>
+#include <core/map.h>
+#include <core/property_manager.h>
+#include <core/record.h>
+#include <core/record_manager.h>
 #include <string>
 #include <third_party/rapidxml/rapidxml.hpp>
 #include <thread>

diff --git a/src/squick/plugin/config/config_module.cc → src/plugin/core/config/config_module.cc b/src/squick/plugin/config/config_module.cc → src/plugin/core/config/config_module.cc
diff --git a/src/squick/plugin/config/config_module.h → src/plugin/core/config/config_module.h b/src/squick/plugin/config/config_module.h → src/plugin/core/config/config_module.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include "i_common_config_module.h"
-#include <squick/core/i_plugin_manager.h>
-#include <squick/core/map_ex.h>
-#include <squick/core/platform.h>
+#include <core/i_plugin_manager.h>
+#include <core/map_ex.h>
+#include <core/platform.h>
 class ConfigModule : public ICommonConfigModule {
   public:
   public:

diff --git a/src/squick/plugin/config/element_module.cc → src/plugin/core/config/element_module.cc b/src/squick/plugin/config/element_module.cc → src/plugin/core/config/element_module.cc
+1 −1		Tools/proto/gen_msgid.py
+1 −1		ToolsSrc/sqkctl/excel/config_generator.h
+1 −1		ToolsSrc/sqkctl/excel/mini_excel_reader.h
+1 −1		ToolsSrc/sqkctl/files.h
+1 −1		ToolsSrc/sqkctl/main.cc