diff --git a/README.md b/README.md index b886e491..b36fbf4c 100644 --- a/README.md +++ b/README.md @@ -108,7 +108,7 @@ sudo bash /usr/local/etc/omc/script/setup.sh -u # Deb sudo dpkg -r omc -sudo M_PARAM=standard C_PARAM=agt dpkg -i omc-r2.2503.2-20250320-ubuntu-amd64.deb +sudo M_PARAM=std C_PARAM=agt dpkg -i omc-r2.2503.2-20250320-ubuntu-amd64.deb sudo M_PARAM=lite C_PARAM=agt dpkg -i omc-r2.2503.2-20250320-ubuntu-amd64.deb # Rpm @@ -130,9 +130,9 @@ INSERT INTO cdr_event_smsc_bak SELECT * FROM cdr_event_smsc WHERE TIMESTAMP <= 1 DELETE FROM cdr_event_smsc WHERE TIMESTAMP <= 1739540000 # 执行数据库脚本 -./omc.exe -c ./local/omc.yaml --sqlPath ./build/linux/usr/local/etc/omc/database/standard/common --sqlSource standard -./omc.exe -c ./local/omc.yaml --sqlPath ./build/linux/usr/local/etc/omc/database/standard/install --sqlSource standard -./omc.exe -c ./local/omc.yaml --sqlPath ./build/linux/usr/local/etc/omc/database/standard/upgrade/upg_sys_dict_data.sql --sqlSource standard +./omc.exe -c ./local/omc.yaml --sqlPath ./build/linux/usr/local/etc/omc/database/std/common --sqlSource std +./omc.exe -c ./local/omc.yaml --sqlPath ./build/linux/usr/local/etc/omc/database/std/install --sqlSource std +./omc.exe -c ./local/omc.yaml --sqlPath ./build/linux/usr/local/etc/omc/database/std/upgrade/upg_sys_dict_data.sql --sqlSource std ./omc.exe -c ./local/omc.yaml --sqlPath ./build/linux/usr/local/etc/omc/database/lite/common --sqlSource lite ./omc.exe -c ./local/omc.yaml --sqlPath ./build/linux/usr/local/etc/omc/database/lite/install --sqlSource lite diff --git a/build/database/standard/common/alarm_define.sql b/build/database/std/common/alarm_define.sql similarity index 100% rename from build/database/standard/common/alarm_define.sql rename to build/database/std/common/alarm_define.sql diff --git a/build/database/standard/common/chart_graph.sql b/build/database/std/common/chart_graph.sql similarity index 100% rename from build/database/standard/common/chart_graph.sql rename to build/database/std/common/chart_graph.sql diff --git a/build/database/standard/common/cm_title.sql b/build/database/std/common/cm_title.sql similarity index 100% rename from build/database/standard/common/cm_title.sql rename to build/database/std/common/cm_title.sql diff --git a/build/database/standard/common/config.sql b/build/database/std/common/config.sql similarity index 100% rename from build/database/standard/common/config.sql rename to build/database/std/common/config.sql diff --git a/build/database/standard/common/group.sql b/build/database/std/common/group.sql similarity index 100% rename from build/database/standard/common/group.sql rename to build/database/std/common/group.sql diff --git a/build/database/standard/common/kpi_title.sql b/build/database/std/common/kpi_title.sql similarity index 100% rename from build/database/standard/common/kpi_title.sql rename to build/database/std/common/kpi_title.sql diff --git a/build/database/standard/common/measure_title.sql b/build/database/std/common/measure_title.sql similarity index 100% rename from build/database/standard/common/measure_title.sql rename to build/database/std/common/measure_title.sql diff --git a/build/database/standard/common/mml_command.sql b/build/database/std/common/mml_command.sql similarity index 100% rename from build/database/standard/common/mml_command.sql rename to build/database/std/common/mml_command.sql diff --git a/build/database/standard/common/mml_http_map.sql b/build/database/std/common/mml_http_map.sql similarity index 100% rename from build/database/standard/common/mml_http_map.sql rename to build/database/std/common/mml_http_map.sql diff --git a/build/database/standard/common/mml_subscriber.sql b/build/database/std/common/mml_subscriber.sql similarity index 100% rename from build/database/standard/common/mml_subscriber.sql rename to build/database/std/common/mml_subscriber.sql diff --git a/build/database/standard/common/mml_system.sql b/build/database/std/common/mml_system.sql similarity index 100% rename from build/database/standard/common/mml_system.sql rename to build/database/std/common/mml_system.sql diff --git a/build/database/standard/common/ne_config.sql b/build/database/std/common/ne_config.sql similarity index 100% rename from build/database/standard/common/ne_config.sql rename to build/database/std/common/ne_config.sql diff --git a/build/database/standard/common/pm_custom_title.sql b/build/database/std/common/pm_custom_title.sql similarity index 100% rename from build/database/standard/common/pm_custom_title.sql rename to build/database/std/common/pm_custom_title.sql diff --git a/build/database/standard/common/title_info.sql b/build/database/std/common/title_info.sql similarity index 100% rename from build/database/standard/common/title_info.sql rename to build/database/std/common/title_info.sql diff --git a/build/database/standard/common/trace_info.sql b/build/database/std/common/trace_info.sql similarity index 100% rename from build/database/standard/common/trace_info.sql rename to build/database/std/common/trace_info.sql diff --git a/build/database/standard/install/4a_log.sql b/build/database/std/install/4a_log.sql similarity index 100% rename from build/database/standard/install/4a_log.sql rename to build/database/std/install/4a_log.sql diff --git a/build/database/standard/install/alarm.sql b/build/database/std/install/alarm.sql similarity index 100% rename from build/database/standard/install/alarm.sql rename to build/database/std/install/alarm.sql diff --git a/build/database/standard/install/alarm_event.sql b/build/database/std/install/alarm_event.sql similarity index 100% rename from build/database/standard/install/alarm_event.sql rename to build/database/std/install/alarm_event.sql diff --git a/build/database/standard/install/alarm_forward_log.sql b/build/database/std/install/alarm_forward_log.sql similarity index 100% rename from build/database/standard/install/alarm_forward_log.sql rename to build/database/std/install/alarm_forward_log.sql diff --git a/build/database/standard/install/alarm_log.sql b/build/database/std/install/alarm_log.sql similarity index 100% rename from build/database/standard/install/alarm_log.sql rename to build/database/std/install/alarm_log.sql diff --git a/build/database/standard/install/alarm_relation.sql b/build/database/std/install/alarm_relation.sql similarity index 100% rename from build/database/standard/install/alarm_relation.sql rename to build/database/std/install/alarm_relation.sql diff --git a/build/database/standard/install/alarm_subscribe.sql b/build/database/std/install/alarm_subscribe.sql similarity index 100% rename from build/database/standard/install/alarm_subscribe.sql rename to build/database/std/install/alarm_subscribe.sql diff --git a/build/database/standard/install/cdr_event.sql b/build/database/std/install/cdr_event.sql similarity index 100% rename from build/database/standard/install/cdr_event.sql rename to build/database/std/install/cdr_event.sql diff --git a/build/database/standard/install/cdr_event_ims.sql b/build/database/std/install/cdr_event_ims.sql similarity index 100% rename from build/database/standard/install/cdr_event_ims.sql rename to build/database/std/install/cdr_event_ims.sql diff --git a/build/database/standard/install/cdr_event_sgwc.sql b/build/database/std/install/cdr_event_sgwc.sql similarity index 100% rename from build/database/standard/install/cdr_event_sgwc.sql rename to build/database/std/install/cdr_event_sgwc.sql diff --git a/build/database/standard/install/cdr_event_smf.sql b/build/database/std/install/cdr_event_smf.sql similarity index 100% rename from build/database/standard/install/cdr_event_smf.sql rename to build/database/std/install/cdr_event_smf.sql diff --git a/build/database/standard/install/cdr_event_smsc.sql b/build/database/std/install/cdr_event_smsc.sql similarity index 100% rename from build/database/standard/install/cdr_event_smsc.sql rename to build/database/std/install/cdr_event_smsc.sql diff --git a/build/database/standard/install/cert_info.sql b/build/database/std/install/cert_info.sql similarity index 100% rename from build/database/standard/install/cert_info.sql rename to build/database/std/install/cert_info.sql diff --git a/build/database/standard/install/event_log.sql b/build/database/std/install/event_log.sql similarity index 100% rename from build/database/standard/install/event_log.sql rename to build/database/std/install/event_log.sql diff --git a/build/database/standard/install/kpi_c_report.sql b/build/database/std/install/kpi_c_report.sql similarity index 100% rename from build/database/standard/install/kpi_c_report.sql rename to build/database/std/install/kpi_c_report.sql diff --git a/build/database/standard/install/kpi_c_report_amf.sql b/build/database/std/install/kpi_c_report_amf.sql similarity index 100% rename from build/database/standard/install/kpi_c_report_amf.sql rename to build/database/std/install/kpi_c_report_amf.sql diff --git a/build/database/standard/install/kpi_c_report_ims.sql b/build/database/std/install/kpi_c_report_ims.sql similarity index 100% rename from build/database/standard/install/kpi_c_report_ims.sql rename to build/database/std/install/kpi_c_report_ims.sql diff --git a/build/database/standard/install/kpi_c_report_mme.sql b/build/database/std/install/kpi_c_report_mme.sql similarity index 100% rename from build/database/standard/install/kpi_c_report_mme.sql rename to build/database/std/install/kpi_c_report_mme.sql diff --git a/build/database/standard/install/kpi_c_report_smf.sql b/build/database/std/install/kpi_c_report_smf.sql similarity index 100% rename from build/database/standard/install/kpi_c_report_smf.sql rename to build/database/std/install/kpi_c_report_smf.sql diff --git a/build/database/standard/install/kpi_c_report_udm.sql b/build/database/std/install/kpi_c_report_udm.sql similarity index 100% rename from build/database/standard/install/kpi_c_report_udm.sql rename to build/database/std/install/kpi_c_report_udm.sql diff --git a/build/database/standard/install/kpi_c_report_upf.sql b/build/database/std/install/kpi_c_report_upf.sql similarity index 100% rename from build/database/standard/install/kpi_c_report_upf.sql rename to build/database/std/install/kpi_c_report_upf.sql diff --git a/build/database/standard/install/kpi_c_title.sql b/build/database/std/install/kpi_c_title.sql similarity index 100% rename from build/database/standard/install/kpi_c_title.sql rename to build/database/std/install/kpi_c_title.sql diff --git a/build/database/standard/install/kpi_report.sql b/build/database/std/install/kpi_report.sql similarity index 100% rename from build/database/standard/install/kpi_report.sql rename to build/database/std/install/kpi_report.sql diff --git a/build/database/standard/install/kpi_report_amf.sql b/build/database/std/install/kpi_report_amf.sql similarity index 100% rename from build/database/standard/install/kpi_report_amf.sql rename to build/database/std/install/kpi_report_amf.sql diff --git a/build/database/standard/install/kpi_report_ausf.sql b/build/database/std/install/kpi_report_ausf.sql similarity index 100% rename from build/database/standard/install/kpi_report_ausf.sql rename to build/database/std/install/kpi_report_ausf.sql diff --git a/build/database/standard/install/kpi_report_cbc.sql b/build/database/std/install/kpi_report_cbc.sql similarity index 100% rename from build/database/standard/install/kpi_report_cbc.sql rename to build/database/std/install/kpi_report_cbc.sql diff --git a/build/database/standard/install/kpi_report_hlr.sql b/build/database/std/install/kpi_report_hlr.sql similarity index 100% rename from build/database/standard/install/kpi_report_hlr.sql rename to build/database/std/install/kpi_report_hlr.sql diff --git a/build/database/standard/install/kpi_report_ims.sql b/build/database/std/install/kpi_report_ims.sql similarity index 100% rename from build/database/standard/install/kpi_report_ims.sql rename to build/database/std/install/kpi_report_ims.sql diff --git a/build/database/standard/install/kpi_report_mme.sql b/build/database/std/install/kpi_report_mme.sql similarity index 100% rename from build/database/standard/install/kpi_report_mme.sql rename to build/database/std/install/kpi_report_mme.sql diff --git a/build/database/standard/install/kpi_report_mocngw.sql b/build/database/std/install/kpi_report_mocngw.sql similarity index 100% rename from build/database/standard/install/kpi_report_mocngw.sql rename to build/database/std/install/kpi_report_mocngw.sql diff --git a/build/database/standard/install/kpi_report_nssf.sql b/build/database/std/install/kpi_report_nssf.sql similarity index 100% rename from build/database/standard/install/kpi_report_nssf.sql rename to build/database/std/install/kpi_report_nssf.sql diff --git a/build/database/standard/install/kpi_report_pcf.sql b/build/database/std/install/kpi_report_pcf.sql similarity index 100% rename from build/database/standard/install/kpi_report_pcf.sql rename to build/database/std/install/kpi_report_pcf.sql diff --git a/build/database/standard/install/kpi_report_smf.sql b/build/database/std/install/kpi_report_smf.sql similarity index 100% rename from build/database/standard/install/kpi_report_smf.sql rename to build/database/std/install/kpi_report_smf.sql diff --git a/build/database/standard/install/kpi_report_smsc.sql b/build/database/std/install/kpi_report_smsc.sql similarity index 100% rename from build/database/standard/install/kpi_report_smsc.sql rename to build/database/std/install/kpi_report_smsc.sql diff --git a/build/database/standard/install/kpi_report_udm.sql b/build/database/std/install/kpi_report_udm.sql similarity index 100% rename from build/database/standard/install/kpi_report_udm.sql rename to build/database/std/install/kpi_report_udm.sql diff --git a/build/database/standard/install/kpi_report_upf.sql b/build/database/std/install/kpi_report_upf.sql similarity index 100% rename from build/database/standard/install/kpi_report_upf.sql rename to build/database/std/install/kpi_report_upf.sql diff --git a/build/database/standard/install/measure_data.sql b/build/database/std/install/measure_data.sql similarity index 100% rename from build/database/standard/install/measure_data.sql rename to build/database/std/install/measure_data.sql diff --git a/build/database/standard/install/measure_task.sql b/build/database/std/install/measure_task.sql similarity index 100% rename from build/database/standard/install/measure_task.sql rename to build/database/std/install/measure_task.sql diff --git a/build/database/standard/install/measure_threshold.sql b/build/database/std/install/measure_threshold.sql similarity index 100% rename from build/database/standard/install/measure_threshold.sql rename to build/database/std/install/measure_threshold.sql diff --git a/build/database/standard/install/mml_log.sql b/build/database/std/install/mml_log.sql similarity index 100% rename from build/database/standard/install/mml_log.sql rename to build/database/std/install/mml_log.sql diff --git a/build/database/standard/install/monitor_base.sql b/build/database/std/install/monitor_base.sql similarity index 100% rename from build/database/standard/install/monitor_base.sql rename to build/database/std/install/monitor_base.sql diff --git a/build/database/standard/install/monitor_io.sql b/build/database/std/install/monitor_io.sql similarity index 100% rename from build/database/standard/install/monitor_io.sql rename to build/database/std/install/monitor_io.sql diff --git a/build/database/standard/install/monitor_network.sql b/build/database/std/install/monitor_network.sql similarity index 100% rename from build/database/standard/install/monitor_network.sql rename to build/database/std/install/monitor_network.sql diff --git a/build/database/standard/install/nb_state.sql b/build/database/std/install/nb_state.sql similarity index 100% rename from build/database/standard/install/nb_state.sql rename to build/database/std/install/nb_state.sql diff --git a/build/database/standard/install/nbi_alarm_log.sql b/build/database/std/install/nbi_alarm_log.sql similarity index 100% rename from build/database/standard/install/nbi_alarm_log.sql rename to build/database/std/install/nbi_alarm_log.sql diff --git a/build/database/standard/install/nbi_cm.sql b/build/database/std/install/nbi_cm.sql similarity index 100% rename from build/database/standard/install/nbi_cm.sql rename to build/database/std/install/nbi_cm.sql diff --git a/build/database/standard/install/nbi_operation_log.sql b/build/database/std/install/nbi_operation_log.sql similarity index 100% rename from build/database/standard/install/nbi_operation_log.sql rename to build/database/std/install/nbi_operation_log.sql diff --git a/build/database/standard/install/nbi_pm.sql b/build/database/std/install/nbi_pm.sql similarity index 100% rename from build/database/standard/install/nbi_pm.sql rename to build/database/std/install/nbi_pm.sql diff --git a/build/database/standard/install/nbi_secure_log.sql b/build/database/std/install/nbi_secure_log.sql similarity index 100% rename from build/database/standard/install/nbi_secure_log.sql rename to build/database/std/install/nbi_secure_log.sql diff --git a/build/database/standard/install/ne_check.sql b/build/database/std/install/ne_check.sql similarity index 100% rename from build/database/standard/install/ne_check.sql rename to build/database/std/install/ne_check.sql diff --git a/build/database/standard/install/ne_config_backup.sql b/build/database/std/install/ne_config_backup.sql similarity index 100% rename from build/database/standard/install/ne_config_backup.sql rename to build/database/std/install/ne_config_backup.sql diff --git a/build/database/standard/install/ne_host.sql b/build/database/std/install/ne_host.sql similarity index 100% rename from build/database/standard/install/ne_host.sql rename to build/database/std/install/ne_host.sql diff --git a/build/database/standard/install/ne_host_cmd.sql b/build/database/std/install/ne_host_cmd.sql similarity index 100% rename from build/database/standard/install/ne_host_cmd.sql rename to build/database/std/install/ne_host_cmd.sql diff --git a/build/database/standard/install/ne_info.sql b/build/database/std/install/ne_info.sql similarity index 100% rename from build/database/standard/install/ne_info.sql rename to build/database/std/install/ne_info.sql diff --git a/build/database/standard/install/ne_license.sql b/build/database/std/install/ne_license.sql similarity index 100% rename from build/database/standard/install/ne_license.sql rename to build/database/std/install/ne_license.sql diff --git a/build/database/standard/install/ne_link.sql b/build/database/std/install/ne_link.sql similarity index 100% rename from build/database/standard/install/ne_link.sql rename to build/database/std/install/ne_link.sql diff --git a/build/database/standard/install/ne_pool.sql b/build/database/std/install/ne_pool.sql similarity index 100% rename from build/database/standard/install/ne_pool.sql rename to build/database/std/install/ne_pool.sql diff --git a/build/database/standard/install/ne_software.sql b/build/database/std/install/ne_software.sql similarity index 100% rename from build/database/standard/install/ne_software.sql rename to build/database/std/install/ne_software.sql diff --git a/build/database/standard/install/ne_state.sql b/build/database/std/install/ne_state.sql similarity index 100% rename from build/database/standard/install/ne_state.sql rename to build/database/std/install/ne_state.sql diff --git a/build/database/standard/install/ne_version.sql b/build/database/std/install/ne_version.sql similarity index 100% rename from build/database/standard/install/ne_version.sql rename to build/database/std/install/ne_version.sql diff --git a/build/database/standard/install/northbound_cm.sql b/build/database/std/install/northbound_cm.sql similarity index 100% rename from build/database/standard/install/northbound_cm.sql rename to build/database/std/install/northbound_cm.sql diff --git a/build/database/standard/install/northbound_pm.sql b/build/database/std/install/northbound_pm.sql similarity index 100% rename from build/database/standard/install/northbound_pm.sql rename to build/database/std/install/northbound_pm.sql diff --git a/build/database/standard/install/param_value.sql b/build/database/std/install/param_value.sql similarity index 100% rename from build/database/standard/install/param_value.sql rename to build/database/std/install/param_value.sql diff --git a/build/database/standard/install/pm_custom_data.sql b/build/database/std/install/pm_custom_data.sql similarity index 100% rename from build/database/standard/install/pm_custom_data.sql rename to build/database/std/install/pm_custom_data.sql diff --git a/build/database/standard/install/pm_template.sql b/build/database/std/install/pm_template.sql similarity index 100% rename from build/database/standard/install/pm_template.sql rename to build/database/std/install/pm_template.sql diff --git a/build/database/standard/install/sys_config.sql b/build/database/std/install/sys_config.sql similarity index 100% rename from build/database/standard/install/sys_config.sql rename to build/database/std/install/sys_config.sql diff --git a/build/database/standard/install/sys_dept.sql b/build/database/std/install/sys_dept.sql similarity index 100% rename from build/database/standard/install/sys_dept.sql rename to build/database/std/install/sys_dept.sql diff --git a/build/database/standard/install/sys_dict_data.sql b/build/database/std/install/sys_dict_data.sql similarity index 100% rename from build/database/standard/install/sys_dict_data.sql rename to build/database/std/install/sys_dict_data.sql diff --git a/build/database/standard/install/sys_dict_type.sql b/build/database/std/install/sys_dict_type.sql similarity index 100% rename from build/database/standard/install/sys_dict_type.sql rename to build/database/std/install/sys_dict_type.sql diff --git a/build/database/standard/install/sys_i18n.sql b/build/database/std/install/sys_i18n.sql similarity index 100% rename from build/database/standard/install/sys_i18n.sql rename to build/database/std/install/sys_i18n.sql diff --git a/build/database/standard/install/sys_job.sql b/build/database/std/install/sys_job.sql similarity index 100% rename from build/database/standard/install/sys_job.sql rename to build/database/std/install/sys_job.sql diff --git a/build/database/standard/install/sys_job_log.sql b/build/database/std/install/sys_job_log.sql similarity index 100% rename from build/database/standard/install/sys_job_log.sql rename to build/database/std/install/sys_job_log.sql diff --git a/build/database/standard/install/sys_log_login.sql b/build/database/std/install/sys_log_login.sql similarity index 100% rename from build/database/standard/install/sys_log_login.sql rename to build/database/std/install/sys_log_login.sql diff --git a/build/database/standard/install/sys_log_operate.sql b/build/database/std/install/sys_log_operate.sql similarity index 100% rename from build/database/standard/install/sys_log_operate.sql rename to build/database/std/install/sys_log_operate.sql diff --git a/build/database/standard/install/sys_menu.sql b/build/database/std/install/sys_menu.sql similarity index 100% rename from build/database/standard/install/sys_menu.sql rename to build/database/std/install/sys_menu.sql diff --git a/build/database/standard/install/sys_post.sql b/build/database/std/install/sys_post.sql similarity index 100% rename from build/database/standard/install/sys_post.sql rename to build/database/std/install/sys_post.sql diff --git a/build/database/standard/install/sys_role.sql b/build/database/std/install/sys_role.sql similarity index 100% rename from build/database/standard/install/sys_role.sql rename to build/database/std/install/sys_role.sql diff --git a/build/database/standard/install/sys_role_dept.sql b/build/database/std/install/sys_role_dept.sql similarity index 100% rename from build/database/standard/install/sys_role_dept.sql rename to build/database/std/install/sys_role_dept.sql diff --git a/build/database/standard/install/sys_role_menu.sql b/build/database/std/install/sys_role_menu.sql similarity index 100% rename from build/database/standard/install/sys_role_menu.sql rename to build/database/std/install/sys_role_menu.sql diff --git a/build/database/standard/install/sys_user.sql b/build/database/std/install/sys_user.sql similarity index 100% rename from build/database/standard/install/sys_user.sql rename to build/database/std/install/sys_user.sql diff --git a/build/database/standard/install/sys_user_post.sql b/build/database/std/install/sys_user_post.sql similarity index 100% rename from build/database/standard/install/sys_user_post.sql rename to build/database/std/install/sys_user_post.sql diff --git a/build/database/standard/install/sys_user_role.sql b/build/database/std/install/sys_user_role.sql similarity index 100% rename from build/database/standard/install/sys_user_role.sql rename to build/database/std/install/sys_user_role.sql diff --git a/build/database/standard/install/trace_data.sql b/build/database/std/install/trace_data.sql similarity index 100% rename from build/database/standard/install/trace_data.sql rename to build/database/std/install/trace_data.sql diff --git a/build/database/standard/install/trace_task.sql b/build/database/std/install/trace_task.sql similarity index 100% rename from build/database/standard/install/trace_task.sql rename to build/database/std/install/trace_task.sql diff --git a/build/database/standard/install/trace_task_hlr.sql b/build/database/std/install/trace_task_hlr.sql similarity index 100% rename from build/database/standard/install/trace_task_hlr.sql rename to build/database/std/install/trace_task_hlr.sql diff --git a/build/database/standard/install/udm_auth.sql b/build/database/std/install/udm_auth.sql similarity index 100% rename from build/database/standard/install/udm_auth.sql rename to build/database/std/install/udm_auth.sql diff --git a/build/database/standard/install/udm_extend.sql b/build/database/std/install/udm_extend.sql similarity index 100% rename from build/database/standard/install/udm_extend.sql rename to build/database/std/install/udm_extend.sql diff --git a/build/database/standard/install/udm_sub.sql b/build/database/std/install/udm_sub.sql similarity index 100% rename from build/database/standard/install/udm_sub.sql rename to build/database/std/install/udm_sub.sql diff --git a/build/database/standard/install/ue_event.sql b/build/database/std/install/ue_event.sql similarity index 100% rename from build/database/standard/install/ue_event.sql rename to build/database/std/install/ue_event.sql diff --git a/build/database/standard/install/ue_event_amf.sql b/build/database/std/install/ue_event_amf.sql similarity index 100% rename from build/database/standard/install/ue_event_amf.sql rename to build/database/std/install/ue_event_amf.sql diff --git a/build/database/standard/install/ue_event_mme.sql b/build/database/std/install/ue_event_mme.sql similarity index 100% rename from build/database/standard/install/ue_event_mme.sql rename to build/database/std/install/ue_event_mme.sql diff --git a/build/database/standard/install/zinstall.sql b/build/database/std/install/zinstall.sql similarity index 100% rename from build/database/standard/install/zinstall.sql rename to build/database/std/install/zinstall.sql diff --git a/build/database/standard/upgrade/upg_sys_dict_data.sql b/build/database/std/upgrade/upg_sys_dict_data.sql similarity index 100% rename from build/database/standard/upgrade/upg_sys_dict_data.sql rename to build/database/std/upgrade/upg_sys_dict_data.sql diff --git a/build/database/standard/upgrade/zupgrade.sql b/build/database/std/upgrade/zupgrade.sql similarity index 100% rename from build/database/standard/upgrade/zupgrade.sql rename to build/database/std/upgrade/zupgrade.sql diff --git a/build/default/omc.conf b/build/default/omc.conf index 1bd47880..a024bba6 100644 --- a/build/default/omc.conf +++ b/build/default/omc.conf @@ -3,7 +3,7 @@ ### omc agt ba VENDORS=omc -### standard lite -MODE=standard +### std lite +MODE=std ## Other diff --git a/build/default/omc.yaml b/build/default/omc.yaml index 74924c25..6c823e8b 100644 --- a/build/default/omc.yaml +++ b/build/default/omc.yaml @@ -1,9 +1,9 @@ -# server version: standard/lite/tenant -serverVersion: "standard" +# server version: std/lite +serverVersion: "std" # database for server version database: - defaultDataSourceName: "standard" + defaultDataSourceName: "std" # file: log file name # level: /trace/debug/info/warn/error/fatal, default: debug diff --git a/build/vendor/agt/database/standard/install/customized.sql b/build/vendor/agt/database/std/install/customized.sql similarity index 100% rename from build/vendor/agt/database/standard/install/customized.sql rename to build/vendor/agt/database/std/install/customized.sql diff --git a/build/vendor/agt/database/standard/upgrade/zupgrade.sql b/build/vendor/agt/database/std/upgrade/zupgrade.sql similarity index 100% rename from build/vendor/agt/database/standard/upgrade/zupgrade.sql rename to build/vendor/agt/database/std/upgrade/zupgrade.sql diff --git a/build/vendor/ba/database/standard/install/customized.sql b/build/vendor/ba/database/std/install/customized.sql similarity index 100% rename from build/vendor/ba/database/standard/install/customized.sql rename to build/vendor/ba/database/std/install/customized.sql diff --git a/build/vendor/ba/database/standard/upgrade/zupgrade.sql b/build/vendor/ba/database/std/upgrade/zupgrade.sql similarity index 100% rename from build/vendor/ba/database/standard/upgrade/zupgrade.sql rename to build/vendor/ba/database/std/upgrade/zupgrade.sql diff --git a/build/vendor/omc/database/standard/install/customized.sql b/build/vendor/omc/database/std/install/customized.sql similarity index 100% rename from build/vendor/omc/database/standard/install/customized.sql rename to build/vendor/omc/database/std/install/customized.sql diff --git a/build/vendor/omc/database/standard/upgrade/zupgrade.sql b/build/vendor/omc/database/std/upgrade/zupgrade.sql similarity index 100% rename from build/vendor/omc/database/standard/upgrade/zupgrade.sql rename to build/vendor/omc/database/std/upgrade/zupgrade.sql diff --git a/local/omc.yaml b/local/omc.yaml index 40cea7e3..75598b8c 100644 --- a/local/omc.yaml +++ b/local/omc.yaml @@ -1,3 +1,6 @@ +# server version: std/lite +serverVersion: "std" + # file: log file name # level: /trace/debug/info/warn/error/fatal, default: debug # duration: rotation time with xx hours, example: 1/12/24 hours @@ -53,7 +56,7 @@ staticFile: database: dataSource: # Default database instance - standard: + std: type: "mysql" host: "192.168.9.58" port: 13306 @@ -67,7 +70,7 @@ database: database: "./local/omc_db.sqlite" logging: true # used to specify the default data source for multiple data resourece - defaultDataSourceName: "standard" + defaultDataSourceName: "std" # Redis data cache redis: diff --git a/src/config/config.default.yaml b/src/config/config.default.yaml index 7eeb29b9..4b379992 100644 --- a/src/config/config.default.yaml +++ b/src/config/config.default.yaml @@ -1,5 +1,5 @@ -# 运行版本 standard/lite/tenant -serverVersion: "standard" +# 运行版本 std/lite +serverVersion: "std" # 运行模式 system/docker serverMode: "system" # 登录认证,默认打开 @@ -147,7 +147,7 @@ jwt: database: dataSource: # 默认数据库实例 - standard: + std: type: "mysql" host: "127.0.0.1" port: 3306 @@ -161,7 +161,7 @@ database: database: "" logging: false # 多个数据源时可以用这个指定默认的数据源 - defaultDataSourceName: "standard" + defaultDataSourceName: "std" # Redis 缓存数据 redis: diff --git a/src/config/config.local.yaml b/src/config/config.local.yaml index e176b6ec..92189351 100644 --- a/src/config/config.local.yaml +++ b/src/config/config.local.yaml @@ -21,7 +21,7 @@ staticFile: database: dataSource: # 默认数据库实例 - standard: + std: type: "mysql" host: "127.0.0.1" port: 3306 @@ -35,7 +35,7 @@ database: database: "/usr/local/etc/omc/database/omc_db.sqlite" logging: true # 多个数据源时可以用这个指定默认的数据源 - defaultDataSourceName: "standard" + defaultDataSourceName: "std" # Redis 缓存数据 redis: diff --git a/src/config/config.prod.yaml b/src/config/config.prod.yaml index 40fd08b4..39fda875 100644 --- a/src/config/config.prod.yaml +++ b/src/config/config.prod.yaml @@ -2,7 +2,7 @@ database: dataSource: # 默认数据库实例 - standard: + std: type: "mysql" host: "127.0.0.1" port: 33066 @@ -16,7 +16,7 @@ database: database: "/usr/local/etc/omc/database/omc_db.sqlite" logging: false # 多个数据源时可以用这个指定默认的数据源 - defaultDataSourceName: "standard" + defaultDataSourceName: "std" # Redis 缓存数据 redis: diff --git a/src/modules/open_api/open_api.go b/src/modules/open_api/open_api.go new file mode 100644 index 00000000..aa882097 --- /dev/null +++ b/src/modules/open_api/open_api.go @@ -0,0 +1,12 @@ +package open_api + +import ( + "be.ems/src/framework/logger" + + "github.com/gin-gonic/gin" +) + +// 模块路由注册 +func Setup(router *gin.Engine) { + logger.Infof("开始加载 ====> open_api 模块路由") +}