zxs 1 kuukausi sitten
vanhempi
commit
d36379097a
3 muutettua tiedostoa jossa 8 lisäystä ja 7 poistoa
  1. 5 5
      src/config/config.xml
  2. 2 1
      src/controllers/general.hpp
  3. 1 1
      src/network/http_network.hpp

+ 5 - 5
src/config/config.xml

@@ -4,12 +4,12 @@
         <item id="1" modify_time="2025-06-02 19:53:32" name="管理员" code="admin" password="123456" enable="true" remarks="管理员"/>
     </users>
     <after>
-        <item id="1" modify_time="" enable="true" remarks="售后配置信息"/>
+        <item id="1" modify_time="2025-06-13 16:53:40" value="VggJGwBRnmpSx3dZzCkJtB2+QTs4/DqqdJr00ifspyObshLf68GKNS+K8GwN2YzdMFlK1rwFU1XQnorbU+1YEdl4nBSlGtMIHkSCbp6K92r2hJR7Q9/KYiLSvxaRnXOxbPt23VXljjWHjcZQuDdacSd51xo+qxfXOIWPUbxGLsdPM5d+mXYbNI18nF5NzXrYWbyNGrnQ+wkBn6cASbCsWKtfK1Ud3kDm8v16QDb1fYw=" enable="true" remarks="售后配置信息"/>
     </after>
     <general>
-        <item id="4" modify_time="2025-06-12 22:42:29" key="100" value="http://127.0.0.1:8002/api/base/config" enable="true" remarks="配置服务器地址"/>
-        <item id="5" modify_time="2025-06-13 13:57:45" key="1" value="2" enable="true" remarks="售后方式 1:rpc,2:老分布式,3:新分布式"/>
-        <item id="6" modify_time="2025-06-13 13:57:45" key="2" value="1900" enable="true" remarks="RPC售后服务端口"/>
-        <item id="7" modify_time="2025-06-13 13:57:49" key="3" value="http://127.0.0.1:8002/api/after/get_after" enable="true" remarks="获取售后配置数据接口"/>
+        <item id="4" modify_time="2025-06-12 22:42:29" key="4" value="http://127.0.0.1:8002/api/base/config" enable="true" remarks="配置服务器地址"/>
+        <item id="5" modify_time="2025-06-14 15:54:31" key="1" value="2" enable="true" remarks="售后方式 1:rpc,2:老分布式,3:新分布式"/>
+        <item id="6" modify_time="2025-06-14 15:54:31" key="2" value="1900" enable="true" remarks="RPC售后服务端口"/>
+        <item id="7" modify_time="2025-06-14 15:54:31" key="3" value="http://127.0.0.1:8002/api/after/get_after" enable="true" remarks="获取售后配置数据接口"/>
     </general>
 </root>

+ 2 - 1
src/controllers/general.hpp

@@ -2,6 +2,7 @@
 //robotics
 #include <robotics/mvc.hpp>
 #include <robotics/logger.hpp>
+#include <robotics/message_bus.hpp>
 //local
 #include "../xml/xml_context.hpp"
 #include "../response/response.hpp"
@@ -9,6 +10,7 @@
 #include "../models/web_response_info.h"
 
 using namespace robotics;
+extern v3::message_bus g_message_bus;
 using WebResponse		= robotics::v3::mvc::web_result_response;
 using HttpContext		= robotics::v3::mvc::http_context::curr;
 using JumpResponse		= robotics::v3::mvc::jump_response;
@@ -18,7 +20,6 @@ using StreamResponse	= robotics::v3::mvc::stream_response;
 using DownloadResponse	= robotics::v3::mvc::download_response;
 using HtmlResponse		= robotics::v3::mvc::html_response;
 using View				= robotics::v3::mvc::view;
-
 /* ************************************************
 * 作者:Lenovo
 * 时间:2024/5/24 11:04:02

+ 1 - 1
src/network/http_network.hpp

@@ -52,7 +52,7 @@ public:
 	 * @return 包含通用配置信息的 web_response_info<web_general_config_info> 对象。
 	 */
 	web_response_info<web_general_config_info> request_general(int key) {
-		auto url_config = xml_context::from<web_general_config_info>().where([](auto it) {return it->enable && it->key == 100; }).first();
+		auto url_config = xml_context::from<web_general_config_info>().where([](auto it) {return it->enable && it->key == 4; }).first();
 		if (!url_config) {
 			url_config.reset(new web_general_config_info());
 			url_config->value = "http://127.0.0.1:8002/api/base/config";