Merge pull request #48 from pwnsky/dev

Dev

README.md

@@ -10,6 +10,8 @@
 
 **Unreal SDK**: [squick-unreal-sdk](https://github.com/pwnsky/squick-unreal-sdk)
 
+**Web Admin**: [squick-web](https://github.com/pwnsky/squick-web)
+
 **QQ Group：739065686**
 
 **Version:** 1.1.1

config/plugin/db_proxy.xml

@@ -1,12 +1,12 @@
 <XML>
-	<DbProxy>
-		<Plugin Name="core/net" />
-		<Plugin Name="core/log" />
-		
-		<Plugin Name="node/db_proxy/node" />
-		<Plugin Name="node/db_proxy/mysql" />
-		<Plugin Name="node/db_proxy/mongo" />
-		<Plugin Name="node/db_proxy/redis" />
-		<Plugin Name="node/db_proxy/clickhouse" />
+    <DbProxy>
+        <Plugin Name="core/net" />
+        <Plugin Name="core/log" />
+        <Plugin Name="core/node" />
+        <Plugin Name="node/db_proxy/mysql" />
+        <Plugin Name="node/db_proxy/mongo" />
+        <Plugin Name="node/db_proxy/redis" />
+        <Plugin Name="node/db_proxy/clickhouse" />
+        <Plugin Name="node/db_proxy/logic" />
     </DbProxy>
 </XML>

config/plugin/ds_mgr.xml

@@ -1,9 +1,8 @@
 <XML>
     <GameMgr>
-		<Plugin Name="core/net" />
-		<Plugin Name="core/log" />
-
-		<Plugin Name="node/ds_mgr/node" />
-		<Plugin Name="node/ds_mgr/logic" />
+        <Plugin Name="core/net" />
+        <Plugin Name="core/log" />
+        <Plugin Name="core/node" />
+        <Plugin Name="node/ds_mgr/logic" />
     </GameMgr>
 </XML>

config/plugin/game.xml

@@ -1,9 +1,8 @@
 <XML>
-	<Game>
-		<Plugin Name="core/net" />
-		<Plugin Name="core/log" />
-
-		<Plugin Name="node/game/node" />
+    <Game>
+        <Plugin Name="core/net" />
+        <Plugin Name="core/log" />
+        <Plugin Name="core/node" />
         <Plugin Name="node/game/logic" />
-	</Game>
+    </Game>
 </XML>

config/plugin/login.xml

@@ -2,8 +2,7 @@
     <Login>
 		<Plugin Name="core/net" />
 		<Plugin Name="core/log" />
-
-		<Plugin Name="node/login/node" />
+        <Plugin Name="core/node" />
 		<Plugin Name="node/login/logic" />
 	</Login>
 

config/plugin/master.xml

@@ -1,11 +1,8 @@
 <XML>    
     <Master>
-		<Plugin Name="core/net" />
-		<Plugin Name="core/log" />
-
-		<Plugin Name="node/master/logic" />
-		<Plugin Name="node/master/node" />
-		<Plugin Name="node/master/http" />
-
+        <Plugin Name="core/net" />
+        <Plugin Name="core/log" />
+        <Plugin Name="core/node" />
+        <Plugin Name="node/master/logic" />
     </Master>
 </XML>

config/plugin/player.xml

@@ -1,14 +1,14 @@
 <XML>
-        <Player>
-        <!-- The order is priority for destroy -->
-            <Plugin Name="core/log"/>
-		    <Plugin Name="core/net"/>
-		    <Plugin Name="core/config"/>
-		    <Plugin Name="core/world" />
-            <Plugin Name="core/utils" />
-            <Plugin Name="core/thread" />
-		    <Plugin Name="core/lua" />
-
-		    <Plugin Name="node/player/node" />
-        </Player>
+    <Player>
+    <!-- The order is priority for destroy -->
+        <Plugin Name="core/log"/>
+        <Plugin Name="core/net"/>
+        <Plugin Name="core/config"/>
+        <Plugin Name="core/world" />
+        <Plugin Name="core/utils" />
+        <Plugin Name="core/thread" />
+        <Plugin Name="core/lua" />
+        <Plugin Name="core/node" />
+        <Plugin Name="node/player/logic" />
+    </Player>
 </XML>

config/plugin/proxy.xml

@@ -4,8 +4,8 @@
 		<Plugin Name="core/config" />
         <Plugin Name="core/log" />
 		<Plugin Name="core/utils" />
+        <Plugin Name="core/node" />
 
 		<Plugin Name="node/proxy/logic" />
-		<Plugin Name="node/proxy/node" />
 	</Proxy>
 </XML>

config/plugin/sqkcli.xml

@@ -1,9 +1,8 @@
 <XML>
-	<Tester>
-		<Plugin Name="core/net" />
-		<Plugin Name="core/config" />
-		<Plugin Name="core/log" />
-
-		<Plugin Name="sqkcli/core" />
-	</Tester>
+    <Tester>
+        <Plugin Name="core/net" />
+        <Plugin Name="core/config" />
+        <Plugin Name="core/log" />
+        <Plugin Name="sqkcli/core" />
+    </Tester>
 </XML>

config/plugin/tutorial/t1_plugin.xml

@@ -1,5 +1,5 @@
 <XML>
-	<Tutorial>
-		<Plugin Name="tutorial/t1_plugin" />
-	</Tutorial>
+    <Tutorial>
+        <Plugin Name="tutorial/t1_plugin" />
+    </Tutorial>
 </XML>

config/plugin/tutorial/t2_property.xml

@@ -1,5 +1,5 @@
 <XML>
-	<Tutorial>
-		<Plugin Name="tutorial/t1_Property" />
-	</Tutorial>
+    <Tutorial>
+        <Plugin Name="tutorial/t1_Property" />
+    </Tutorial>
 </XML>

config/plugin/tutorial/t5_http.xml

@@ -2,7 +2,6 @@
     <Tutorial>
         <Plugin Name="core/net" />
         <Plugin Name="core/log" />
-
         <Plugin Name="tutorial/t5_http" />
     </Tutorial>
 </XML>

config/plugin/tutorial/t6_rpc.xml

@@ -2,7 +2,6 @@
     <Tutorial>
         <Plugin Name="core/net" />
         <Plugin Name="core/log" />
-
         <Plugin Name="tutorial/t6_rpc" />
     </Tutorial>
 </XML>

config/plugin/web.xml

@@ -1,10 +1,8 @@
 <XML>
     <Login>
-		<Plugin Name="core/net" />
-		<Plugin Name="core/log" />
-
-		<Plugin Name="node/web/node" />
-		<Plugin Name="node/web/logic" />
-	</Login>
-
+        <Plugin Name="core/net" />
+        <Plugin Name="core/log" />
+        <Plugin Name="core/node" />
+        <Plugin Name="node/web/logic" />
+    </Login>
 </XML>

config/plugin/world.xml

@@ -1,14 +1,13 @@
 <XML>
-	<World>
-		<Plugin Name="core/net" />
-		<Plugin Name="core/log" />
+    <World>
+        <Plugin Name="core/net" />
+        <Plugin Name="core/log" />
         <Plugin Name="core/config" />
-		<Plugin Name="core/world" />
+        <Plugin Name="core/world" />
         <Plugin Name="core/utils" />
         <Plugin Name="core/thread" />
-		<Plugin Name="core/lua" />
-
-		<Plugin Name="node/world/node" />
-		<Plugin Name="node/world/logic" />
-	</World>
+        <Plugin Name="core/lua" />
+        <Plugin Name="core/node" />
+        <Plugin Name="node/world/logic" />
+    </World>
 </XML>

src/lua/common/base.lua

@@ -1,16 +0,0 @@
-ServerType =
-{
-    ST_NONE = 0,
-    ST_MASTER = 1,
-    ST_LOGIN = 2,
-    ST_WORLD = 3,
-    ST_DB_PROXY = 4,
-    ST_PROXY = 5,
-    ST_PLAYER = 6,
-    ST_GAME_MGR = 7,
-    ST_GAME = 8,
-    ST_MICRO = 9,
-    ST_CDN = 10,
-    ST_ROBOT = 11,
-    ST_MAX = 12,
-};

src/lua/common/net.lua

@@ -8,6 +8,7 @@
 Net = {}
 -- function Table:func(uid, msg_data, msg_id, fd)
 function Net:Register(msg_id, this, func)
+    Squick:LogInfo("Lua Register msg: " .. tostring(msg_id))
     Squick:AddMsgCallBackAsServer(msg_id, this, func)
 end
 

src/lua/lib/db/clickhouse.lua

@@ -9,9 +9,9 @@ local DbClickhouseID = 0;
 Clickhouse = Clickhouse and Clickhouse or Object(QueryAsync).new()
 
 function Clickhouse:Bind()
-    Net:ClientRegister(ServerType.ST_DB_PROXY, NMsgId.IdNAckClickhouseExecute, self, self.AckExecute)
-    Net:ClientRegister(ServerType.ST_DB_PROXY, NMsgId.IdNAckClickhouseSelect, self, self.AckSelect)
-    Net:ClientRegister(ServerType.ST_DB_PROXY, NMsgId.IdNAckClickhouseInsert, self, self.AckInsert)
+    Net:ClientRegister(NodeType.ST_DB_PROXY, NMsgId.IdNAckClickhouseExecute, self, self.AckExecute)
+    Net:ClientRegister(NodeType.ST_DB_PROXY, NMsgId.IdNAckClickhouseSelect, self, self.AckSelect)
+    Net:ClientRegister(NodeType.ST_DB_PROXY, NMsgId.IdNAckClickhouseInsert, self, self.AckInsert)
     DbClickhouseID = GetDbProxyID()
 end
 

src/lua/lib/db/mongo.lua

@@ -9,11 +9,11 @@ local DbProxyID = 0;
 Mongo = Mongo and Mongo or Object(QueryAsync).new()
 
 function Mongo:Bind()
-    Net:ClientRegister(ServerType.ST_DB_PROXY, NMsgId.IdNAckMongoInsert, self, self.AckInsert)
-    Net:ClientRegister(ServerType.ST_DB_PROXY, NMsgId.IdNAckMongoFind, self, self.AckFind)
-    Net:ClientRegister(ServerType.ST_DB_PROXY, NMsgId.IdNAckMongoUpdate, self, self.AckUpdate)
-    Net:ClientRegister(ServerType.ST_DB_PROXY, NMsgId.IdNAckMongoDelete, self, self.AckDelete)
-    Net:ClientRegister(ServerType.ST_DB_PROXY, NMsgId.IdNAckMongoCreateIndex, self, self.AckCreateIndex)
+    Net:ClientRegister(NodeType.ST_DB_PROXY, NMsgId.IdNAckMongoInsert, self, self.AckInsert)
+    Net:ClientRegister(NodeType.ST_DB_PROXY, NMsgId.IdNAckMongoFind, self, self.AckFind)
+    Net:ClientRegister(NodeType.ST_DB_PROXY, NMsgId.IdNAckMongoUpdate, self, self.AckUpdate)
+    Net:ClientRegister(NodeType.ST_DB_PROXY, NMsgId.IdNAckMongoDelete, self, self.AckDelete)
+    Net:ClientRegister(NodeType.ST_DB_PROXY, NMsgId.IdNAckMongoCreateIndex, self, self.AckCreateIndex)
     DbProxyID = GetDbProxyID()
 end
 

src/lua/lib/db/mysql.lua

@@ -9,10 +9,10 @@ local DbMysqlID = 0;
 Mysql = Mysql and Mysql or Object(QueryAsync).new()
 
 function Mysql:Bind()
-    Net:ClientRegister(ServerType.ST_DB_PROXY, NMsgId.IdNAckMysqlExecute, self, self.AckExecute)
-    Net:ClientRegister(ServerType.ST_DB_PROXY, NMsgId.IdNAckMysqlSelect, self, self.AckSelect)
-    Net:ClientRegister(ServerType.ST_DB_PROXY, NMsgId.IdNAckMysqlInsert, self, self.AckInsert)
-    Net:ClientRegister(ServerType.ST_DB_PROXY, NMsgId.IdNAckMysqlUpdate, self, self.AckUpdate)
+    Net:ClientRegister(NodeType.ST_DB_PROXY, NMsgId.IdNAckMysqlExecute, self, self.AckExecute)
+    Net:ClientRegister(NodeType.ST_DB_PROXY, NMsgId.IdNAckMysqlSelect, self, self.AckSelect)
+    Net:ClientRegister(NodeType.ST_DB_PROXY, NMsgId.IdNAckMysqlInsert, self, self.AckInsert)
+    Net:ClientRegister(NodeType.ST_DB_PROXY, NMsgId.IdNAckMysqlUpdate, self, self.AckUpdate)
     DbMysqlID = GetDbProxyID()
 end
 

src/lua/lib/db/redis.lua

@@ -9,8 +9,8 @@ local DbProxyID = 0;
 Redis = Redis and Redis or Object(QueryAsync).new()
 
 function Redis:Bind()
-    Net:ClientRegister(ServerType.ST_DB_PROXY, NMsgId.IdNAckRedisGet, self, self.AckGetString)
-    Net:ClientRegister(ServerType.ST_DB_PROXY, NMsgId.IdNAckRedisSet, self, self.AckSetString)
+    Net:ClientRegister(NodeType.ST_DB_PROXY, NMsgId.IdNAckRedisGet, self, self.AckGetString)
+    Net:ClientRegister(NodeType.ST_DB_PROXY, NMsgId.IdNAckRedisSet, self, self.AckSetString)
     DbProxyID = GetDbProxyID()
 end
 

src/lua/main.lua

@@ -50,7 +50,7 @@ function ReadyUpdate()
     ModuleMgr:Start()
 end
 
--- Update for per second
+-- Update 10 fps
 function Update()
     ModuleMgr:Update()
 end
@@ -74,12 +74,12 @@ function Load()
     Require("lib.init")
 
     local node_init = {
-        [ServerType.ST_GAME ] = function()
+        [NodeType.ST_GAME ] = function()
             Require("node.game.init")
         end,
-        [ServerType.ST_PLAYER] = function ()
+        [NodeType.ST_PLAYER] = function ()
             Require("node.player.init")
-            --Require("test.init")
+            -- Require("test.init")
         end
     }
     if(node_init[Env.app_type]) then

src/node/db_proxy/CMakeLists.txt

@@ -1,5 +1,5 @@
-add_subdirectory(node)
 add_subdirectory(mysql)
 add_subdirectory(mongo)
 add_subdirectory(redis)
-add_subdirectory(clickhouse)
+add_subdirectory(clickhouse)
+add_subdirectory(logic)

src/node/db_proxy/node/CMakeLists.txt → src/node/db_proxy/logic/CMakeLists.txt

@@ -1,6 +1,6 @@
-set(ProjectName "db_proxy_node")
+set(ProjectName "db_proxy_logic")
 file(GLOB soruces *.cc)
 file(GLOB headers *.h)
 add_library(${ProjectName} SHARED ${soruces} ${headers})
 LinkSquick(${ProjectName})
-SquickOut(${ProjectName} "node/db_proxy" ${SQUICK_BUILD_PLUGIN_SERVER_PATH}/db_proxy "node")
+SquickOut(${ProjectName} "node/db_proxy" ${SQUICK_BUILD_PLUGIN_SERVER_PATH}/db_proxy "logic")

src/node/db_proxy/logic/i_logic_module.h

@@ -0,0 +1,7 @@
+#pragma once
+
+#include <squick/core/i_module.h>
+namespace db_proxy::logic {
+class ILogicModule : public IModule {};
+
+} // namespace db_proxy::logic

src/node/db_proxy/logic/logic_module.cc

@@ -0,0 +1,10 @@
+#include "logic_module.h"
+
+namespace db_proxy::logic {
+bool LogicModule::Start() {
+    m_node_ = pm_->FindModule<INodeModule>();
+    vector<int> node_types = {};
+    m_node_->AddSubscribeNode(node_types);
+    return true;
+}
+} // namespace db_proxy::logic

src/node/db_proxy/logic/logic_module.h

@@ -0,0 +1,19 @@
+#pragma once
+#include "i_logic_module.h"
+#include <squick/plugin/net/export.h>
+#include <squick/plugin/node/export.h>
+
+namespace db_proxy::logic {
+class LogicModule : public ILogicModule {
+  public:
+    LogicModule(IPluginManager *p) {
+        pm_ = p;
+        is_update_ = true; // Update
+    }
+    virtual bool Start() override;
+
+  private:
+    INodeModule *m_node_;
+};
+
+} // namespace db_proxy::logic