123

common/dbproxy/tg_platform.lua

@@ -28,7 +28,7 @@ function M.addPlatform(msg_body)
     msg_body.material_platform_id,
     msg_body.pay_type,
     msg_body.parent_platform_id, 
-    cjson.encode(msg_body.filter_guajian_logic_list),msg_body.platform_shared_id,msg_body.mini_program_platform_id,id,msg_body.tg_platform_id,msg_body.tg_platform_name,msg_body.filter_guajian_logic)
+    cjson.encode(msg_body.filter_guajian_logic_list),msg_body.platform_shared_id,msg_body.mini_program_platform_id,id,msg_body.tg_platform_name,msg_body.filter_guajian_logic)
     skynet.error(sql)
     mysqldbx.query(sql)
     skynet.send("backmgr","lua","on_recv",nil,"ws_push_msg",cjson.encode({cmd="updatePlatformConfig"}))

log/2025_03_11.log

@@ -5466,7 +5466,42 @@ stack traceback:
 25/03/11 21:42:28:00000015(1741700548.48): 把任务放到队列
 25/03/11 21:42:28:00000017(1741700548.60): ............dump...........
 25/03/11 21:42:28:00000017(1741700548.60):  {"cmd":"tg_platform","fun":"getPlatformList","data":{}}
+<<<<<<< HEAD
+25/03/11 21:56:15:0000001d(1741701375.26): /
+25/03/11 21:56:15:0000001d(1741701375.26): 错误访问：
+25/03/11 21:56:15:0000001d(1741701375.26): ............dump...........
+25/03/11 21:56:15:0000001d(1741701375.26): {
+25/03/11 21:56:15:0000001d(1741701375.26):  addr = 127.0.0.1:53950 ,
+25/03/11 21:56:15:0000001d(1741701375.26):  id = 45 ,
+25/03/11 21:56:15:0000001d(1741701375.26):  address = 10 ,
+25/03/11 21:56:15:0000001d(1741701375.26): }
+25/03/11 21:56:16:0000001e(1741701376.64): /build/.env
+25/03/11 21:56:16:0000001e(1741701376.64): 错误访问：
+25/03/11 21:56:16:0000001e(1741701376.64): ............dump...........
+25/03/11 21:56:16:0000001e(1741701376.64): {
+25/03/11 21:56:16:0000001e(1741701376.64):  addr = 127.0.0.1:53952 ,
+25/03/11 21:56:16:0000001e(1741701376.64):  id = 46 ,
+25/03/11 21:56:16:0000001e(1741701376.64):  address = 10 ,
+25/03/11 21:56:16:0000001e(1741701376.64): }
+25/03/11 21:56:19:0000001f(1741701379.09): /config/.env
+25/03/11 21:56:19:0000001f(1741701379.09): 错误访问：
+25/03/11 21:56:19:0000001f(1741701379.09): ............dump...........
+25/03/11 21:56:19:0000001f(1741701379.09): {
+25/03/11 21:56:19:0000001f(1741701379.09):  addr = 127.0.0.1:53954 ,
+25/03/11 21:56:19:0000001f(1741701379.09):  id = 47 ,
+25/03/11 21:56:19:0000001f(1741701379.09):  address = 10 ,
+25/03/11 21:56:19:0000001f(1741701379.09): }
+25/03/11 21:56:20:00000020(1741701380.38): /.env.dev
+25/03/11 21:56:20:00000020(1741701380.38): 错误访问：
+25/03/11 21:56:20:00000020(1741701380.38): ............dump...........
+25/03/11 21:56:20:00000020(1741701380.38): {
+25/03/11 21:56:20:00000020(1741701380.38):  addr = 127.0.0.1:53956 ,
+25/03/11 21:56:20:00000020(1741701380.38):  id = 48 ,
+25/03/11 21:56:20:00000020(1741701380.38):  address = 10 ,
+25/03/11 21:56:20:00000020(1741701380.38): }
+=======
 >>>>>>> 6070fc9ca7804091fee7a7df1d55e7b7a51c52b3
+<<<<<<< HEAD
 25/03/11 21:50:56:00000001(1741701056.51): PROJ_ROOT:: ../jl_config_back
 25/03/11 21:50:56:00000003(1741701056.51): LAUNCH snlua launcher
 25/03/11 21:50:56:00000004(1741701056.51): LAUNCH snlua cdummy
@@ -5559,3 +5594,6 @@ stack traceback:
 25/03/11 21:53:57:00000017(1741701237.12):  {"cmd":"tg_platform","fun":"addPlatform","data":{"tg_platform_name":"番茄-抖小-付费","parent_platform_id":0,"material_platform_id":1,"platform_shared_id":"","filter_guajian_logic":"","filter_guajian_logic_list":[""],"mini_program_platform_id":1,"pay_type":1}}
 25/03/11 21:55:47:00000017(1741701347.04): ............dump...........
 25/03/11 21:55:47:00000017(1741701347.04):  {"cmd":"material_platform","fun":"search","data":{"name":"","page_number":1,"page_size":500}}
+=======
+>>>>>>> bf60de1a5c4ed88ed1e4367609eb7533afce2e3e
+>>>>>>> 84a8a565a4b6676feb3b2f264a58af5a171561e9