diff --git a/README.md b/README.md index d4ed6bc..f50a3ca 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# nms_nbi +# nms_cxy 网络管理系统-北向接口 @@ -43,5 +43,5 @@ go env -w GOOS=linux go env -w GOOS=windows -go build -o restagent -v -ldflags "-X 'nms_nbi/lib/global.Version=2.2311.8' -X 'nms_nbi/lib/global.BuildTime=`date`' -X 'nms_nbi/lib/global.GoVer=`go version`'" +go build -o restagent -v -ldflags "-X 'nms_cxy/lib/global.Version=2.2311.8' -X 'nms_cxy/lib/global.BuildTime=`date`' -X 'nms_cxy/lib/global.GoVer=`go version`'" ``` diff --git a/build.sh b/build.sh index 897af3f..bb698d8 100644 --- a/build.sh +++ b/build.sh @@ -10,29 +10,28 @@ Ky10Arch=ky10.aarch64 RpmPkgName=${ProjectL}-${RelVer}.ky10.aarch64.rpm RpmPkgRename=${ProjectL}-r${RelVer}-ky10.rpm DebPkgName=${ProjectL}-r${RelVer}-ub*.deb -GitLocalRoot=/home/agtuser/probject/nms_cxy -EmsBEDir=/home/agtuser/probject/nms_cxy -EmsBuildRoot=/home/agtuser/probject/nms_cxy/build +GitLocalRoot=${EmsBEDir} +EmsBEDir=${EmsBEDir} +EmsBuildRoot=${EmsBEDir}/build RpmArch=`arch` -RpmsDir=/home/agtuser/probject/nms_cxy/build/rpmbuild/RPMS/ -ReleaseDir=/home/agtuser/probject/nms_cxy/build/release - +RpmsDir=${EmsBEDir}/build/rpmbuild/RPMS/ +ReleaseDir=${EmsBEDir}/build/release PLATFORM=amd64 ARMPLATFORM=aarch64 -BuildDir=/home/agtuser/probject/nms_cxy/build/build -BuildOMCDir=/home/agtuser/probject/nms_cxy/build/build/usr/local/omc -BuildOMCBinDir=/home/agtuser/probject/nms_cxy/build/build/usr/local/omc/bin -BuildOMCEtcDir=/home/agtuser/probject/nms_cxy/build/build/usr/local/omc/etc -BuildLibSystemDir=/home/agtuser/probject/nms_cxy/build/build/lib/systemd/system -DebBuildDir=/home/agtuser/probject/nms_cxy/build/debbuild -DebFEBuildDir=/home/agtuser/probject/nms_cxy/build/debbuild/usr/local/omc/htdocs -DebBuild2204Dir=/home/agtuser/probject/nms_cxy/build/debbuild/22.04 -DebFEBuild2204Dir=/home/agtuser/probject/nms_cxy/build/debbuild/22.04/usr/local/omc/htdocs -RpmBuildDir=/home/agtuser/probject/nms_cxy/build/rpmbuild -RpmFEBuildDir=/home/agtuser/probject/nms_cxy/build/rpmbuild/BUILD/usr/local/omc/htdocs +BuildDir=${EmsBEDir}/build/build +BuildOMCDir=${EmsBEDir}/build/build/usr/local/omc +BuildOMCBinDir=${EmsBEDir}/build/build/usr/local/omc/bin +BuildOMCEtcDir=${EmsBEDir}/build/build/usr/local/omc/etc +BuildLibSystemDir=${EmsBEDir}/build/build/lib/systemd/system +DebBuildDir=${EmsBEDir}/build/debbuild +DebFEBuildDir=${EmsBEDir}/build/debbuild/usr/local/omc/htdocs +DebBuild2204Dir=${EmsBEDir}/build/debbuild/22.04 +DebFEBuild2204Dir=${EmsBEDir}/build/debbuild/22.04/usr/local/omc/htdocs +RpmBuildDir=${EmsBEDir}/build/rpmbuild +RpmFEBuildDir=${EmsBEDir}/build/rpmbuild/BUILD/usr/local/omc/htdocs OmcInstallDir=/usr/local/omc -ConfigEtcDir=/home/agtuser/probject/nms_cxy/build/config/etc -ConfigSystemdDir=/home/agtuser/probject/nms_cxy/build/config/systemd +ConfigEtcDir=${EmsBEDir}/build/config/etc +ConfigSystemdDir=${EmsBEDir}/build/config/systemd EmsFEVue3Dir=/home/agtuser/Docker/nginx/html/dist RESTAGENT=restagent CRONTASK=crontask @@ -42,15 +41,15 @@ Data2htmlBin=data2html NBI_ALARM=nbi_alarm NBI_AGENT=nbi_agent AAAA_AGENT=4a_agent -RestagentDir=/home/agtuser/probject/nms_cxy/restagent +RestagentDir=${EmsBEDir}/restagent CrontaskDir=/usr/local/omc/bin SshSvcDir=/usr/local/omc/bin CapTraceDir=/usr/local/omc/bin Data2htmlDir=/usr/local/omc/bin -DBSQLSrcDir=/home/agtuser/probject/nms_cxy/build/database -MiscDir=/home/agtuser/probject/nms_cxy/build/misc -FrontBuildDir=/home/agtuser/probject/nms_cxy/build/build/usr/local/omc/htdocs -ReleaseDebs=/home/agtuser/probject/nms_cxy/build/release/debs/amd64 +DBSQLSrcDir=${EmsBEDir}/build/database +MiscDir=${EmsBEDir}/build/misc +FrontBuildDir=${EmsBEDir}/build/build/usr/local/omc/htdocs +ReleaseDebs=${EmsBEDir}/build/release/debs/amd64 CrontaskSize=27788951 RestagentSize=29525312 @@ -74,7 +73,7 @@ case "$1" in # clear build cache rm -rf ${FrontBuildDir}/front/* rm -rf ${RpmFEBuildDir}/front/* - rm -rf /home/agtuser/probject/nms_cxy/build/rpmbuild/BUILD/usr/local/omc/etc/db/* + rm -rf ${EmsBEDir}/build/rpmbuild/BUILD/usr/local/omc/etc/db/* cp -rf ${RestagentDir}/restagent ${BuildOMCBinDir} cp -rf ${CrontaskDir}/crontask ${BuildOMCBinDir} @@ -100,11 +99,11 @@ case "$1" in cp -rf ${EmsFEVue3Dir}/* ${FrontBuildDir}/front >/dev/null chmod 755 ${BuildOMCBinDir}/* # chmod 755 ${BinDir2}/* - cp -rf /home/agtuser/probject/nms_cxy/build/build/* /home/agtuser/probject/nms_cxy/build/rpmbuild/BUILD/ - #cp -rf /home/agtuser/probject/nms_cxy/build/build/nginx /home/agtuser/probject/nms_cxy/build/rpmbuild/BUILD/etc/ - #cp -rf /home/agtuser/probject/nms_cxy/build/build/systemd /home/agtuser/probject/nms_cxy/build/rpmbuild/BUILD/lib/ - cd /home/agtuser/probject/nms_cxy/build/rpmbuild - rpmbuild -bb -D "_topdir /home/agtuser/probject/nms_cxy/build/rpmbuild" /home/agtuser/probject/nms_cxy/build/rpmbuild/SPECS/omc.spec + cp -rf ${EmsBEDir}/build/build/* ${EmsBEDir}/build/rpmbuild/BUILD/ + #cp -rf ${EmsBEDir}/build/build/nginx ${EmsBEDir}/build/rpmbuild/BUILD/etc/ + #cp -rf ${EmsBEDir}/build/build/systemd ${EmsBEDir}/build/rpmbuild/BUILD/lib/ + cd ${EmsBEDir}/build/rpmbuild + rpmbuild -bb -D "_topdir ${EmsBEDir}/build/rpmbuild" ${EmsBEDir}/build/rpmbuild/SPECS/omc.spec mv -f $RpmsDir/$RpmArch/$RpmPkgName $ReleaseDir/"$1"s/$RelArch/$RpmPkgRename cd $ReleaseDir/"$1"s/$RelArch @@ -125,7 +124,7 @@ case "$1" in exit 1 fi - cd /home/agtuser/probject/nms_cxy + cd ${EmsBEDir} #make deb # clear build cache @@ -152,9 +151,9 @@ case "$1" in chmod 755 ${DebBuildDir}/DEBIAN/preinst chmod 755 ${DebBuildDir}/DEBIAN/postinst chmod 755 ${DebBuildDir}/DEBIAN/postrm - cp -rf /home/agtuser/probject/nms_cxy/build/build/* ${DebBuildDir}/ - # cp -rf /home/agtuser/probject/nms_cxy/build/build/nginx/* ${DebBuildDir}/etc/nginx/conf.d - # cp -rf /home/agtuser/probject/nms_cxy/build/build/systemd/*.service ${DebBuildDir}/lib/systemd/system/ + cp -rf ${EmsBEDir}/build/build/* ${DebBuildDir}/ + # cp -rf ${EmsBEDir}/build/build/nginx/* ${DebBuildDir}/etc/nginx/conf.d + # cp -rf ${EmsBEDir}/build/build/systemd/*.service ${DebBuildDir}/lib/systemd/system/ chmod +x ${DebBuildDir}/usr/local/omc/bin/* sed -i "s/YYYYMMDD/${RelDate}/g" ${DebBuildDir}/DEBIAN/control perl -0777 -i -pe 's/ne:\n user: root/ne:\n user: agtuser/g' ${DebBuildDir}/usr/local/omc/etc/default/restconf.yaml diff --git a/build/build/etc/nginx/conf.d/default.conf b/build/build/etc/nginx/conf.d/default.conf new file mode 100644 index 0000000..018fa13 --- /dev/null +++ b/build/build/etc/nginx/conf.d/default.conf @@ -0,0 +1,64 @@ +server { + listen 80; + listen [::]:80; + server_name localhost; + + #access_log /var/log/nginx/host.access.log main; + + # ssl_certificate /usr/share/nginx/cert/www.x.cn_chain.crt; + # ssl_certificate_key /usr/share/nginx/cert/www.x.cn.key; + + ssl_protocols TLSv1.1 TLSv1.2 TLSv1.3; + ssl_session_timeout 5m; + ssl_ciphers EECDH+CHACHA20:EECDH+AES128:RSA+AES128:EECDH+AES256:RSA+AES256:EECDH+3DES:RSA+3DES:!MD5; + ssl_prefer_server_ciphers on; + ssl_dhparam /usr/share/nginx/cert/dhparams.pem; + + # OMC + location / { + root /usr/share/nginx/html/dist; + + try_files $uri $uri/ /index.html; + index index.html index.htm; + } + + location /omc-api/ { + proxy_pass http://192.168.5.57:33030/; + + proxy_http_version 1.1; + proxy_cache_bypass $http_upgrade; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Forwarded-Host $host; + proxy_set_header X-Forwarded-Port $server_port; + } + + location /api/rest/ { + proxy_pass http://192.168.5.57:33030/nms-cxy/api/rest/; + + proxy_http_version 1.1; + proxy_cache_bypass $http_upgrade; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Forwarded-Host $host; + proxy_set_header X-Forwarded-Port $server_port; + } + + #error_page 404 /404.html; + + # redirect server error pages to the static page /50x.html + # + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root /usr/share/nginx/html; + } +} + diff --git a/build/build/usr/local/omc/static/ba.d/db/customized.sql b/build/build/usr/local/omc/static/ba.d/db/customized.sql deleted file mode 100644 index 3572248..0000000 --- a/build/build/usr/local/omc/static/ba.d/db/customized.sql +++ /dev/null @@ -1,269 +0,0 @@ -SET FOREIGN_KEY_CHECKS = 0; - -REPLACE - INTO `omc_db`.`sys_config` ( - `config_id`, - `config_name`, - `config_key`, - `config_value`, - `config_type`, - `create_by`, - `create_time`, - `update_by`, - `update_time`, - `remark` - ) -VALUES ( - 106, - 'config.sys.title', - 'sys.title', - 'config.sys.titleValue', - 'Y', - 'supervisor', - 1698110000000, - NULL, - 0, - 'config.sys.titleRemark' - ); - -REPLACE - INTO `omc_db`.`sys_config` ( - `config_id`, - `config_name`, - `config_key`, - `config_value`, - `config_type`, - `create_by`, - `create_time`, - `update_by`, - `update_time`, - `remark` - ) -VALUES ( - 107, - 'config.sys.copyright', - 'sys.copyright', - 'config.sys.copyrightValue', - 'Y', - 'supervisor', - 1698110000000, - NULL, - 0, - 'config.sys.copyrightRemark' - ); - -REPLACE - INTO `omc_db`.`sys_config` ( - `config_id`, - `config_name`, - `config_key`, - `config_value`, - `config_type`, - `create_by`, - `create_time`, - `update_by`, - `update_time`, - `remark` - ) -VALUES ( - 108, - 'config.sys.i18nOpen', - 'sys.i18n.open', - 'false', - 'Y', - 'supervisor', - 1698110000000, - NULL, - 0, - 'config.sys.i18nOpenRemark' - ); - -REPLACE - INTO `omc_db`.`sys_config` ( - `config_id`, - `config_name`, - `config_key`, - `config_value`, - `config_type`, - `create_by`, - `create_time`, - `update_by`, - `update_time`, - `remark` - ) -VALUES ( - 109, - 'Internationalization Default Language', - 'sys.i18n.default', - 'en_US', - 'Y', - 'supervisor', - 1698110000000, - 'supervisor', - 1702632906566, - 'config.sys.i18nDefaultRemark' - ); - -REPLACE - INTO `omc_db`.`sys_config` ( - `config_id`, - `config_name`, - `config_key`, - `config_value`, - `config_type`, - `create_by`, - `create_time`, - `update_by`, - `update_time`, - `remark` - ) -VALUES ( - 6, - 'config.sys.officialUrl', - 'sys.officialUrl', - 'https://www.bluearcus.com', - 'Y', - 'supervisor', - 1698110000000, - 'admin', - 1700809804330, - 'config.sys.officialUrlRemark' - ); - -REPLACE - INTO `omc_db`.`sys_dict_data` ( - `dict_code`, - `dict_sort`, - `dict_label`, - `dict_value`, - `dict_type`, - `tag_class`, - `tag_type`, - `status`, - `create_by`, - `create_time`, - `update_by`, - `update_time`, - `remark` - ) -VALUES ( - 1660, - 1660, - 'config.sys.titleValue', - 'BlueArcus EMS', - 'i18n_zh', - NULL, - NULL, - '1', - 'supervisor', - 1699350000000, - NULL, - 0, - NULL - ); - -REPLACE - INTO `omc_db`.`sys_dict_data` ( - `dict_code`, - `dict_sort`, - `dict_label`, - `dict_value`, - `dict_type`, - `tag_class`, - `tag_type`, - `status`, - `create_by`, - `create_time`, - `update_by`, - `update_time`, - `remark` - ) -VALUES ( - 3660, - 3660, - 'config.sys.titleValue', - 'BlueArcus EMS', - 'i18n_en', - NULL, - NULL, - '1', - 'supervisor', - 1699350000000, - NULL, - 0, - NULL - ); - -REPLACE - INTO `omc_db`.`sys_dict_data` ( - `dict_code`, - `dict_sort`, - `dict_label`, - `dict_value`, - `dict_type`, - `tag_class`, - `tag_type`, - `status`, - `create_by`, - `create_time`, - `update_by`, - `update_time`, - `remark` - ) -VALUES ( - 1661, - 1661, - 'config.sys.copyrightValue', - 'Copyright ©2023 BlueArcus', - 'i18n_zh', - NULL, - NULL, - '1', - 'supervisor', - 1699350000000, - NULL, - 0, - NULL - ); - -REPLACE - INTO `omc_db`.`sys_dict_data` ( - `dict_code`, - `dict_sort`, - `dict_label`, - `dict_value`, - `dict_type`, - `tag_class`, - `tag_type`, - `status`, - `create_by`, - `create_time`, - `update_by`, - `update_time`, - `remark` - ) -VALUES ( - 3661, - 3661, - 'config.sys.copyrightValue', - 'Copyright ©2023 BlueArcus', - 'i18n_en', - NULL, - NULL, - '1', - 'supervisor', - 1699350000000, - NULL, - 0, - NULL - ); - --- set internationalization switching to OFF --- DELETE FROM `omc_db`.`sys_role_menu` WHERE `menu_id` = 2122; -UPDATE `omc_db`.`sys_menu` -SET - `status` = '0' -WHERE - `menu_id` = 2122; - -SET FOREIGN_KEY_CHECKS = 1; \ No newline at end of file diff --git a/build/build/usr/local/omc/static/ba.d/doc/en_doc.pdf b/build/build/usr/local/omc/static/ba.d/doc/en_doc.pdf deleted file mode 100644 index ab34753..0000000 Binary files a/build/build/usr/local/omc/static/ba.d/doc/en_doc.pdf and /dev/null differ diff --git a/build/build/usr/local/omc/static/ba.d/logo/en_brand.png b/build/build/usr/local/omc/static/ba.d/logo/en_brand.png deleted file mode 100644 index 5d04ab3..0000000 Binary files a/build/build/usr/local/omc/static/ba.d/logo/en_brand.png and /dev/null differ diff --git a/build/build/usr/local/omc/static/ba.d/logo/en_icon.png b/build/build/usr/local/omc/static/ba.d/logo/en_icon.png deleted file mode 100644 index 8ba330e..0000000 Binary files a/build/build/usr/local/omc/static/ba.d/logo/en_icon.png and /dev/null differ diff --git a/build/build/usr/local/omc/static/ba.d/logo/zh_brand.png b/build/build/usr/local/omc/static/ba.d/logo/zh_brand.png deleted file mode 100644 index 5d04ab3..0000000 Binary files a/build/build/usr/local/omc/static/ba.d/logo/zh_brand.png and /dev/null differ diff --git a/build/build/usr/local/omc/static/ba.d/logo/zh_icon.png b/build/build/usr/local/omc/static/ba.d/logo/zh_icon.png deleted file mode 100644 index 8ba330e..0000000 Binary files a/build/build/usr/local/omc/static/ba.d/logo/zh_icon.png and /dev/null differ diff --git a/build/build/usr/local/omc/static/agt.d/db/customized.sql b/build/build/usr/local/omc/static/db/customized.sql similarity index 100% rename from build/build/usr/local/omc/static/agt.d/db/customized.sql rename to build/build/usr/local/omc/static/db/customized.sql diff --git a/build/build/usr/local/omc/static/agt.d/doc/en_doc.pdf b/build/build/usr/local/omc/static/doc/en_doc.pdf similarity index 100% rename from build/build/usr/local/omc/static/agt.d/doc/en_doc.pdf rename to build/build/usr/local/omc/static/doc/en_doc.pdf diff --git a/build/build/usr/local/omc/static/agt.d/doc/zh_doc.pdf b/build/build/usr/local/omc/static/doc/zh_doc.pdf similarity index 100% rename from build/build/usr/local/omc/static/agt.d/doc/zh_doc.pdf rename to build/build/usr/local/omc/static/doc/zh_doc.pdf diff --git a/build/build/usr/local/omc/static/agt.d/logo/en_brand.png b/build/build/usr/local/omc/static/logo/en_brand.png similarity index 100% rename from build/build/usr/local/omc/static/agt.d/logo/en_brand.png rename to build/build/usr/local/omc/static/logo/en_brand.png diff --git a/build/build/usr/local/omc/static/agt.d/logo/en_icon.png b/build/build/usr/local/omc/static/logo/en_icon.png similarity index 100% rename from build/build/usr/local/omc/static/agt.d/logo/en_icon.png rename to build/build/usr/local/omc/static/logo/en_icon.png diff --git a/build/build/usr/local/omc/static/agt.d/logo/zh_brand.png b/build/build/usr/local/omc/static/logo/zh_brand.png similarity index 100% rename from build/build/usr/local/omc/static/agt.d/logo/zh_brand.png rename to build/build/usr/local/omc/static/logo/zh_brand.png diff --git a/build/build/usr/local/omc/static/agt.d/logo/zh_icon.png b/build/build/usr/local/omc/static/logo/zh_icon.png similarity index 100% rename from build/build/usr/local/omc/static/agt.d/logo/zh_icon.png rename to build/build/usr/local/omc/static/logo/zh_icon.png diff --git a/build/database/install/zinstall.sql b/build/database/install/zinstall.sql index a0ee0ca..454dde0 100644 --- a/build/database/install/zinstall.sql +++ b/build/database/install/zinstall.sql @@ -506,4 +506,18 @@ VALUES ( 0 ); +-- 性能数据文件的上报 +INSERT IGNORE INTO `sys_job` (`job_name`, `job_group`, `invoke_target`, `target_params`, `cron_expression`, `misfire_policy`, `concurrent`, `status`, `save_log`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ('job.nms_cxy.performance_upload_oss', 'SYSTEM', 'performance_upload_oss', '{\"interval\":15,\"neTypes\":[\"AMF\",\"UPF\"]}', '0 0/15 * * * ?', '3', '0', '1', '1', 'supervisor', 1698478134839, 'supervisor', 1710817306404, 'job.nms_cxy.performance_upload_oss_remark'); +INSERT IGNORE INTO `sys_dict_data` VALUES (210, 210, 'job.nms_cxy.performance_upload_oss', '性能数据文件的上报', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, ''); +INSERT IGNORE INTO `sys_dict_data` VALUES (211, 211, 'job.nms_cxy.performance_upload_oss_remark', 'interval周期为15分钟。neTypes为数组对应上报数据的网元类型。', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, ''); +INSERT IGNORE INTO `sys_dict_data` VALUES (212, 212, 'job.nms_cxy.performance_upload_oss', 'Reporting of performance data files', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, ''); +INSERT IGNORE INTO `sys_dict_data` VALUES (213, 213, 'job.nms_cxy.performance_upload_oss_remark', 'The interval period is 15 minutes. neTypes is an array corresponding to the type of network element for which the data was reported.', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, ''); + +-- 资源数据上报接口 +INSERT IGNORE INTO `sys_job` (`job_name`, `job_group`, `invoke_target`, `target_params`, `cron_expression`, `misfire_policy`, `concurrent`, `status`, `save_log`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ('job.nms_cxy.resource_upload_oss', 'SYSTEM', 'resource_upload_oss', '{\"interval\":15}', '0 0 0,12 * * ?', '3', '0', '1', '1', 'supervisor', 1698478134839, 'supervisor', 1710818082110, 'job.nms_cxy.resource_upload_oss_remark'); +INSERT IGNORE INTO `sys_dict_data` VALUES (215, 215, 'job.nms_cxy.resource_upload_oss', '资源数据上报接口', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, ''); +INSERT IGNORE INTO `sys_dict_data` VALUES (216, 216, 'job.nms_cxy.resource_upload_oss_remark', '每天的 0 时及 12 时上报网元的全量资源数据文件至 OSS。', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, ''); +INSERT IGNORE INTO `sys_dict_data` VALUES (217, 217, 'job.nms_cxy.resource_upload_oss', 'Resource data reporting interface', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, ''); +INSERT IGNORE INTO `sys_dict_data` VALUES (218, 218, 'job.nms_cxy.resource_upload_oss_remark', 'Full resource data files for network elements are reported to the OSS at 0000 and 1200 hours each day.', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, ''); + SET FOREIGN_KEY_CHECKS = 1; \ No newline at end of file diff --git a/build/database/upgrade/zupgrade.sql b/build/database/upgrade/zupgrade.sql index 227c00f..621f9eb 100644 --- a/build/database/upgrade/zupgrade.sql +++ b/build/database/upgrade/zupgrade.sql @@ -183,4 +183,19 @@ ADD INDEX IF NOT EXISTS `idx_severity_status` ( ) USING BTREE; ALTER TABLE `omc_db`.`mml_system` -ADD COLUMN IF NOT EXISTS `object_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'mml' AFTER `mml_display`; \ No newline at end of file +ADD COLUMN IF NOT EXISTS `object_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'mml' AFTER `mml_display`; + +-- 性能数据文件的上报 +INSERT IGNORE INTO `sys_job` (`job_name`, `job_group`, `invoke_target`, `target_params`, `cron_expression`, `misfire_policy`, `concurrent`, `status`, `save_log`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ('job.nms_cxy.performance_upload_oss', 'SYSTEM', 'performance_upload_oss', '{\"interval\":15,\"neTypes\":[\"AMF\",\"UPF\"]}', '0 0/15 * * * ?', '3', '0', '1', '1', 'supervisor', 1698478134839, 'supervisor', 1710817306404, 'job.nms_cxy.performance_upload_oss_remark'); +INSERT IGNORE INTO `sys_dict_data` VALUES (210, 210, 'job.nms_cxy.performance_upload_oss', '性能数据文件的上报', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, ''); +INSERT IGNORE INTO `sys_dict_data` VALUES (211, 211, 'job.nms_cxy.performance_upload_oss_remark', 'interval周期为15分钟。neTypes为数组对应上报数据的网元类型。', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, ''); +INSERT IGNORE INTO `sys_dict_data` VALUES (212, 212, 'job.nms_cxy.performance_upload_oss', 'Reporting of performance data files', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, ''); +INSERT IGNORE INTO `sys_dict_data` VALUES (213, 213, 'job.nms_cxy.performance_upload_oss_remark', 'The interval period is 15 minutes. neTypes is an array corresponding to the type of network element for which the data was reported.', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, ''); + +-- 资源数据上报接口 +INSERT IGNORE INTO `sys_job` (`job_name`, `job_group`, `invoke_target`, `target_params`, `cron_expression`, `misfire_policy`, `concurrent`, `status`, `save_log`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ('job.nms_cxy.resource_upload_oss', 'SYSTEM', 'resource_upload_oss', '{\"interval\":15}', '0 0 0,12 * * ?', '3', '0', '1', '1', 'supervisor', 1698478134839, 'supervisor', 1710818082110, 'job.nms_cxy.resource_upload_oss_remark'); +INSERT IGNORE INTO `sys_dict_data` VALUES (215, 215, 'job.nms_cxy.resource_upload_oss', '资源数据上报接口', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, ''); +INSERT IGNORE INTO `sys_dict_data` VALUES (216, 216, 'job.nms_cxy.resource_upload_oss_remark', '每天的 0 时及 12 时上报网元的全量资源数据文件至 OSS。', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, ''); +INSERT IGNORE INTO `sys_dict_data` VALUES (217, 217, 'job.nms_cxy.resource_upload_oss', 'Resource data reporting interface', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, ''); +INSERT IGNORE INTO `sys_dict_data` VALUES (218, 218, 'job.nms_cxy.resource_upload_oss_remark', 'Full resource data files for network elements are reported to the OSS at 0000 and 1200 hours each day.', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, ''); + diff --git a/features/aaaa/aaaa.go b/features/aaaa/aaaa.go index 5ea5719..f1e445d 100644 --- a/features/aaaa/aaaa.go +++ b/features/aaaa/aaaa.go @@ -9,11 +9,11 @@ import ( "github.com/go-resty/resty/v2" - "nms_nbi/lib/dborm" - "nms_nbi/lib/log" - "nms_nbi/lib/oauth" - "nms_nbi/lib/services" - "nms_nbi/restagent/config" + "nms_cxy/lib/dborm" + "nms_cxy/lib/log" + "nms_cxy/lib/oauth" + "nms_cxy/lib/services" + "nms_cxy/restagent/config" ) var ( diff --git a/features/cdr/cdrevent.go b/features/cdr/cdrevent.go index 329fee6..b341e5a 100644 --- a/features/cdr/cdrevent.go +++ b/features/cdr/cdrevent.go @@ -5,12 +5,12 @@ import ( "io" "net/http" - "nms_nbi/lib/dborm" - "nms_nbi/lib/global" - "nms_nbi/lib/log" - "nms_nbi/lib/services" - "nms_nbi/restagent/config" - wsService "nms_nbi/src/modules/ws/service" + "nms_cxy/lib/dborm" + "nms_cxy/lib/global" + "nms_cxy/lib/log" + "nms_cxy/lib/services" + "nms_cxy/restagent/config" + wsService "nms_cxy/src/modules/ws/service" ) var ( diff --git a/features/cm/exec_linux.go b/features/cm/exec_linux.go index 392e6c3..9ab21d2 100644 --- a/features/cm/exec_linux.go +++ b/features/cm/exec_linux.go @@ -9,7 +9,7 @@ import ( "os/exec" "time" - "nms_nbi/lib/log" + "nms_cxy/lib/log" ) func ExecCmd(command string) error { diff --git a/features/cm/exec_windows.go b/features/cm/exec_windows.go index a32f05f..a048209 100644 --- a/features/cm/exec_windows.go +++ b/features/cm/exec_windows.go @@ -9,7 +9,7 @@ import ( "os/exec" "time" - "nms_nbi/lib/log" + "nms_cxy/lib/log" ) func ExecCmd(command string) error { diff --git a/features/cm/license.go b/features/cm/license.go index 4389156..ef93df0 100644 --- a/features/cm/license.go +++ b/features/cm/license.go @@ -9,10 +9,10 @@ import ( "strings" "time" - "nms_nbi/lib/dborm" - "nms_nbi/lib/log" - "nms_nbi/lib/services" - "nms_nbi/restagent/config" + "nms_cxy/lib/dborm" + "nms_cxy/lib/log" + "nms_cxy/lib/services" + "nms_cxy/restagent/config" "github.com/gorilla/mux" ) diff --git a/features/cm/ne.go b/features/cm/ne.go index 99e18ab..c2f7282 100644 --- a/features/cm/ne.go +++ b/features/cm/ne.go @@ -10,13 +10,13 @@ import ( "strings" "time" - "nms_nbi/lib/dborm" - "nms_nbi/lib/global" - "nms_nbi/lib/log" - "nms_nbi/lib/services" - "nms_nbi/restagent/config" - tokenConst "nms_nbi/src/framework/constants/token" - neService "nms_nbi/src/modules/network_element/service" + "nms_cxy/lib/dborm" + "nms_cxy/lib/global" + "nms_cxy/lib/log" + "nms_cxy/lib/services" + "nms_cxy/restagent/config" + tokenConst "nms_cxy/src/framework/constants/token" + neService "nms_cxy/src/modules/network_element/service" "github.com/go-resty/resty/v2" "github.com/gorilla/mux" diff --git a/features/cm/param.go b/features/cm/param.go index e0e1cc4..1fcf696 100644 --- a/features/cm/param.go +++ b/features/cm/param.go @@ -3,18 +3,18 @@ package cm import ( "strings" - "nms_nbi/lib/dborm" - "nms_nbi/lib/global" - "nms_nbi/lib/log" - "nms_nbi/lib/services" - "nms_nbi/restagent/config" + "nms_cxy/lib/dborm" + "nms_cxy/lib/global" + "nms_cxy/lib/log" + "nms_cxy/lib/services" + "nms_cxy/restagent/config" "encoding/json" "fmt" "io" "net/http" - tokenConst "nms_nbi/src/framework/constants/token" + tokenConst "nms_cxy/src/framework/constants/token" "github.com/go-resty/resty/v2" "github.com/gorilla/mux" diff --git a/features/cm/software.go b/features/cm/software.go index dd46fa1..1f2d65e 100644 --- a/features/cm/software.go +++ b/features/cm/software.go @@ -10,11 +10,11 @@ import ( "strconv" "strings" - "nms_nbi/lib/dborm" - "nms_nbi/lib/global" - "nms_nbi/lib/log" - "nms_nbi/lib/services" - "nms_nbi/restagent/config" + "nms_cxy/lib/dborm" + "nms_cxy/lib/global" + "nms_cxy/lib/log" + "nms_cxy/lib/services" + "nms_cxy/restagent/config" "github.com/gorilla/mux" ) diff --git a/features/dbrest/backup.go b/features/dbrest/backup.go index f5ca992..28b6d31 100644 --- a/features/dbrest/backup.go +++ b/features/dbrest/backup.go @@ -10,11 +10,11 @@ import ( "path/filepath" "time" - "nms_nbi/lib/core/conf" - "nms_nbi/lib/dborm" - "nms_nbi/lib/log" - "nms_nbi/lib/services" - "nms_nbi/restagent/config" + "nms_cxy/lib/core/conf" + "nms_cxy/lib/dborm" + "nms_cxy/lib/log" + "nms_cxy/lib/services" + "nms_cxy/restagent/config" _ "github.com/go-sql-driver/mysql" ) diff --git a/features/dbrest/dbrest.go b/features/dbrest/dbrest.go index ce5153e..152b93e 100644 --- a/features/dbrest/dbrest.go +++ b/features/dbrest/dbrest.go @@ -9,12 +9,12 @@ import ( "strings" "time" - "nms_nbi/lib/core/utils/ctx" - "nms_nbi/lib/dborm" - "nms_nbi/lib/global" - "nms_nbi/lib/log" - "nms_nbi/lib/services" - "nms_nbi/restagent/config" + "nms_cxy/lib/core/utils/ctx" + "nms_cxy/lib/dborm" + "nms_cxy/lib/global" + "nms_cxy/lib/log" + "nms_cxy/lib/services" + "nms_cxy/restagent/config" "github.com/gorilla/mux" "xorm.io/xorm" diff --git a/features/event/event.go b/features/event/event.go index 0715489..864c183 100644 --- a/features/event/event.go +++ b/features/event/event.go @@ -5,11 +5,11 @@ import ( "io" "time" - "nms_nbi/lib/dborm" - "nms_nbi/lib/global" - "nms_nbi/lib/log" - "nms_nbi/lib/services" - wsService "nms_nbi/src/modules/ws/service" + "nms_cxy/lib/dborm" + "nms_cxy/lib/global" + "nms_cxy/lib/log" + "nms_cxy/lib/services" + wsService "nms_cxy/src/modules/ws/service" "github.com/gin-gonic/gin" ) diff --git a/features/file/file.go b/features/file/file.go index de0e43b..dd93f48 100644 --- a/features/file/file.go +++ b/features/file/file.go @@ -5,12 +5,12 @@ import ( "net/http" "path/filepath" - "nms_nbi/lib/core/utils/ctx" - "nms_nbi/lib/dborm" - "nms_nbi/lib/file" - "nms_nbi/lib/log" - "nms_nbi/lib/services" - "nms_nbi/restagent/config" + "nms_cxy/lib/core/utils/ctx" + "nms_cxy/lib/dborm" + "nms_cxy/lib/file" + "nms_cxy/lib/log" + "nms_cxy/lib/services" + "nms_cxy/restagent/config" "github.com/gorilla/mux" "github.com/shirou/gopsutil/disk" diff --git a/features/file/service.go b/features/file/service.go index c1605be..e105c3f 100644 --- a/features/file/service.go +++ b/features/file/service.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strings" - "nms_nbi/lib/file" + "nms_cxy/lib/file" "github.com/spf13/afero" ) diff --git a/features/fm/alarm.go b/features/fm/alarm.go index 3b6a251..07bb125 100644 --- a/features/fm/alarm.go +++ b/features/fm/alarm.go @@ -10,14 +10,14 @@ import ( "strings" "time" - "nms_nbi/lib/dborm" - "nms_nbi/lib/global" - "nms_nbi/lib/log" - "nms_nbi/lib/services" - "nms_nbi/restagent/config" - "nms_nbi/src/framework/utils/date" - neDataModel "nms_nbi/src/modules/network_data/model" - nmsCXYService "nms_nbi/src/modules/nms_cxy/service" + "nms_cxy/lib/dborm" + "nms_cxy/lib/global" + "nms_cxy/lib/log" + "nms_cxy/lib/services" + "nms_cxy/restagent/config" + "nms_cxy/src/framework/utils/date" + neDataModel "nms_cxy/src/modules/network_data/model" + nmsCXYService "nms_cxy/src/modules/nms_cxy/service" "xorm.io/xorm" diff --git a/features/fm/email.go b/features/fm/email.go index dd680d8..d221f25 100644 --- a/features/fm/email.go +++ b/features/fm/email.go @@ -6,9 +6,9 @@ import ( "fmt" "strings" - "nms_nbi/lib/dborm" - "nms_nbi/lib/log" - "nms_nbi/restagent/config" + "nms_cxy/lib/dborm" + "nms_cxy/lib/log" + "nms_cxy/restagent/config" "gopkg.in/gomail.v2" ) diff --git a/features/fm/smsforward.go b/features/fm/smsforward.go index e192fff..10d26e7 100644 --- a/features/fm/smsforward.go +++ b/features/fm/smsforward.go @@ -7,9 +7,9 @@ import ( "net/url" "time" - "nms_nbi/lib/dborm" - "nms_nbi/lib/log" - "nms_nbi/restagent/config" + "nms_cxy/lib/dborm" + "nms_cxy/lib/log" + "nms_cxy/restagent/config" "github.com/linxGnu/gosmpp" "github.com/linxGnu/gosmpp/data" diff --git a/features/fm/ucpcli.go b/features/fm/ucpcli.go index 2a4c349..3cd64ea 100644 --- a/features/fm/ucpcli.go +++ b/features/fm/ucpcli.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "nms_nbi/lib/log" - "nms_nbi/restagent/config" + "nms_cxy/lib/log" + "nms_cxy/restagent/config" "github.com/chzyer/readline" "github.com/go-gsm/ucp" diff --git a/features/handle/handle.go b/features/handle/handle.go index 5fc9445..145ce3e 100644 --- a/features/handle/handle.go +++ b/features/handle/handle.go @@ -8,17 +8,17 @@ import ( "strconv" "strings" - "nms_nbi/lib/dborm" + "nms_cxy/lib/dborm" "github.com/gorilla/mux" g "github.com/gosnmp/gosnmp" - "nms_nbi/lib/global" - "nms_nbi/lib/log" - "nms_nbi/lib/oauth" - "nms_nbi/lib/services" - "nms_nbi/lib/session" - "nms_nbi/restagent/config" + "nms_cxy/lib/global" + "nms_cxy/lib/log" + "nms_cxy/lib/oauth" + "nms_cxy/lib/services" + "nms_cxy/lib/session" + "nms_cxy/restagent/config" ) var TodoList []stTodo diff --git a/features/lm/logbak.go b/features/lm/logbak.go index 624b109..6fdd418 100644 --- a/features/lm/logbak.go +++ b/features/lm/logbak.go @@ -6,10 +6,10 @@ import ( "os/exec" "time" - "nms_nbi/lib/global" - "nms_nbi/lib/log" - "nms_nbi/lib/services" - "nms_nbi/restagent/config" + "nms_cxy/lib/global" + "nms_cxy/lib/log" + "nms_cxy/lib/services" + "nms_cxy/restagent/config" "github.com/gorilla/mux" "xorm.io/xorm" diff --git a/features/maintenance/maintenance.go b/features/maintenance/maintenance.go index 1b43b6f..08bc17e 100644 --- a/features/maintenance/maintenance.go +++ b/features/maintenance/maintenance.go @@ -10,11 +10,11 @@ import ( "runtime" "time" - "nms_nbi/lib/core/utils/ctx" - "nms_nbi/lib/dborm" - "nms_nbi/lib/log" - "nms_nbi/lib/services" - "nms_nbi/restagent/config" + "nms_cxy/lib/core/utils/ctx" + "nms_cxy/lib/dborm" + "nms_cxy/lib/log" + "nms_cxy/lib/services" + "nms_cxy/restagent/config" "github.com/shirou/gopsutil/cpu" "github.com/shirou/gopsutil/disk" diff --git a/features/mml/mml.go b/features/mml/mml.go index 9f67dc4..439544c 100644 --- a/features/mml/mml.go +++ b/features/mml/mml.go @@ -10,14 +10,14 @@ import ( "strings" "time" - "nms_nbi/lib/dborm" - "nms_nbi/lib/global" - "nms_nbi/lib/log" - "nms_nbi/lib/mmlp" - "nms_nbi/lib/services" - "nms_nbi/restagent/config" + "nms_cxy/lib/dborm" + "nms_cxy/lib/global" + "nms_cxy/lib/log" + "nms_cxy/lib/mmlp" + "nms_cxy/lib/services" + "nms_cxy/restagent/config" - tokenConst "nms_nbi/src/framework/constants/token" + tokenConst "nms_cxy/src/framework/constants/token" "github.com/gorilla/mux" ) diff --git a/features/monitor/monitor/monitor.go b/features/monitor/monitor/monitor.go index 2a789ba..bcd7f3e 100644 --- a/features/monitor/monitor/monitor.go +++ b/features/monitor/monitor/monitor.go @@ -6,10 +6,10 @@ import ( "strings" "time" - "nms_nbi/lib/core/utils/ctx" - "nms_nbi/lib/dborm" - "nms_nbi/lib/services" - "nms_nbi/restagent/config" + "nms_cxy/lib/core/utils/ctx" + "nms_cxy/lib/dborm" + "nms_cxy/lib/services" + "nms_cxy/restagent/config" "github.com/shirou/gopsutil/disk" "github.com/shirou/gopsutil/net" diff --git a/features/monitor/monitor/task.go b/features/monitor/monitor/task.go index 74d4977..d471236 100644 --- a/features/monitor/monitor/task.go +++ b/features/monitor/monitor/task.go @@ -6,9 +6,9 @@ import ( "strconv" "time" - "nms_nbi/lib/dborm" - "nms_nbi/lib/log" - "nms_nbi/restagent/config" + "nms_cxy/lib/dborm" + "nms_cxy/lib/log" + "nms_cxy/restagent/config" "github.com/robfig/cron/v3" "github.com/shirou/gopsutil/v3/cpu" diff --git a/features/monitor/psnet/psnet.go b/features/monitor/psnet/psnet.go index 8a12b4a..cd5719e 100644 --- a/features/monitor/psnet/psnet.go +++ b/features/monitor/psnet/psnet.go @@ -6,11 +6,11 @@ import ( "net/http" "time" - "nms_nbi/lib/core/utils/ctx" - "nms_nbi/lib/log" - "nms_nbi/lib/services" - "nms_nbi/lib/wsinfo" - "nms_nbi/restagent/config" + "nms_cxy/lib/core/utils/ctx" + "nms_cxy/lib/log" + "nms_cxy/lib/services" + "nms_cxy/lib/wsinfo" + "nms_cxy/restagent/config" "github.com/gorilla/websocket" "github.com/shirou/gopsutil/process" diff --git a/features/nbi/nbi.go b/features/nbi/nbi.go index df5e8cb..43bc5bf 100644 --- a/features/nbi/nbi.go +++ b/features/nbi/nbi.go @@ -6,18 +6,18 @@ import ( "net/http" "strings" - "nms_nbi/lib/dborm" + "nms_cxy/lib/dborm" "github.com/go-resty/resty/v2" "github.com/gorilla/mux" - "nms_nbi/lib/global" - "nms_nbi/lib/log" - "nms_nbi/lib/oauth" - "nms_nbi/lib/services" - "nms_nbi/lib/session" - "nms_nbi/restagent/config" + "nms_cxy/lib/global" + "nms_cxy/lib/log" + "nms_cxy/lib/oauth" + "nms_cxy/lib/services" + "nms_cxy/lib/session" + "nms_cxy/restagent/config" ) type ErrorOAuthResponse struct { diff --git a/features/nbi/snmp.go b/features/nbi/snmp.go index f288e90..d47747f 100644 --- a/features/nbi/snmp.go +++ b/features/nbi/snmp.go @@ -9,9 +9,9 @@ import ( "github.com/gorilla/mux" g "github.com/gosnmp/gosnmp" - "nms_nbi/lib/log" - "nms_nbi/lib/services" - "nms_nbi/restagent/config" + "nms_cxy/lib/log" + "nms_cxy/lib/services" + "nms_cxy/restagent/config" ) func init() { diff --git a/features/pm/performance.go b/features/pm/performance.go index 628152e..0634f54 100644 --- a/features/pm/performance.go +++ b/features/pm/performance.go @@ -10,15 +10,15 @@ import ( "strconv" "time" - "nms_nbi/lib/dborm" - "nms_nbi/lib/global" - "nms_nbi/lib/log" - "nms_nbi/lib/services" - "nms_nbi/restagent/config" + "nms_cxy/lib/dborm" + "nms_cxy/lib/global" + "nms_cxy/lib/log" + "nms_cxy/lib/services" + "nms_cxy/restagent/config" "xorm.io/xorm" - wsService "nms_nbi/src/modules/ws/service" + wsService "nms_cxy/src/modules/ws/service" "github.com/go-resty/resty/v2" _ "github.com/go-sql-driver/mysql" diff --git a/features/security/account.go b/features/security/account.go index faaf8f4..ed6ef26 100644 --- a/features/security/account.go +++ b/features/security/account.go @@ -10,22 +10,22 @@ import ( "strings" "time" - "nms_nbi/features/security/service" - sysConfigService "nms_nbi/features/sys_config/service" - "nms_nbi/lib/core/account" - "nms_nbi/lib/core/cache" - "nms_nbi/lib/core/constants/cachekey" - "nms_nbi/lib/core/utils/ctx" - "nms_nbi/lib/core/vo/result" - "nms_nbi/lib/dborm" - "nms_nbi/lib/global" - "nms_nbi/lib/log" - "nms_nbi/lib/oauth" - "nms_nbi/lib/services" - "nms_nbi/restagent/config" - srcConfig "nms_nbi/src/framework/config" - "nms_nbi/src/framework/i18n" - "nms_nbi/src/framework/redis" + "nms_cxy/features/security/service" + sysConfigService "nms_cxy/features/sys_config/service" + "nms_cxy/lib/core/account" + "nms_cxy/lib/core/cache" + "nms_cxy/lib/core/constants/cachekey" + "nms_cxy/lib/core/utils/ctx" + "nms_cxy/lib/core/vo/result" + "nms_cxy/lib/dborm" + "nms_cxy/lib/global" + "nms_cxy/lib/log" + "nms_cxy/lib/oauth" + "nms_cxy/lib/services" + "nms_cxy/restagent/config" + srcConfig "nms_cxy/src/framework/config" + "nms_cxy/src/framework/i18n" + "nms_cxy/src/framework/redis" "github.com/mojocn/base64Captcha" ) diff --git a/features/security/service/service_account.go b/features/security/service/service_account.go index ea722fa..39ae80c 100644 --- a/features/security/service/service_account.go +++ b/features/security/service/service_account.go @@ -1,11 +1,11 @@ package service import ( - menuService "nms_nbi/features/sys_menu/service" - roleService "nms_nbi/features/sys_role/service" - userService "nms_nbi/features/sys_user/service" - "nms_nbi/lib/core/utils/parse" - "nms_nbi/lib/core/vo" + menuService "nms_cxy/features/sys_menu/service" + roleService "nms_cxy/features/sys_role/service" + userService "nms_cxy/features/sys_user/service" + "nms_cxy/lib/core/utils/parse" + "nms_cxy/lib/core/vo" ) // 实例化服务层 ServiceAccount 结构体 diff --git a/features/sm/backup.go b/features/sm/backup.go index a8c0b0a..9673819 100644 --- a/features/sm/backup.go +++ b/features/sm/backup.go @@ -8,9 +8,9 @@ import ( "os/exec" "time" - "nms_nbi/lib/log" - "nms_nbi/lib/services" - "nms_nbi/restagent/config" + "nms_cxy/lib/log" + "nms_cxy/lib/services" + "nms_cxy/restagent/config" _ "github.com/go-sql-driver/mysql" ) diff --git a/features/state/getstate.go b/features/state/getstate.go index 95c8b7f..9499b74 100644 --- a/features/state/getstate.go +++ b/features/state/getstate.go @@ -14,12 +14,12 @@ import ( "github.com/go-resty/resty/v2" "github.com/gorilla/mux" - "nms_nbi/lib/dborm" - "nms_nbi/lib/global" - "nms_nbi/lib/log" - "nms_nbi/lib/services" - "nms_nbi/restagent/config" - tokenConst "nms_nbi/src/framework/constants/token" + "nms_cxy/lib/dborm" + "nms_cxy/lib/global" + "nms_cxy/lib/log" + "nms_cxy/lib/services" + "nms_cxy/restagent/config" + tokenConst "nms_cxy/src/framework/constants/token" ) type CpuUsage struct { diff --git a/features/state/state_linux.go b/features/state/state_linux.go index cc7f31d..54fae4a 100644 --- a/features/state/state_linux.go +++ b/features/state/state_linux.go @@ -11,7 +11,7 @@ import ( "syscall" "time" - "nms_nbi/lib/log" + "nms_cxy/lib/log" "github.com/shirou/gopsutil/v3/cpu" "github.com/shirou/gopsutil/v3/disk" diff --git a/features/state/sysinfo.go b/features/state/sysinfo.go index 171d211..83b3f23 100644 --- a/features/state/sysinfo.go +++ b/features/state/sysinfo.go @@ -1,7 +1,7 @@ package state import ( - "nms_nbi/lib/log" + "nms_cxy/lib/log" "github.com/shirou/gopsutil/cpu" "github.com/shirou/gopsutil/disk" diff --git a/features/sys_config/api_sys_config.go b/features/sys_config/api_sys_config.go index 806ac83..866121f 100644 --- a/features/sys_config/api_sys_config.go +++ b/features/sys_config/api_sys_config.go @@ -5,14 +5,14 @@ import ( "net/http" "strings" - "nms_nbi/features/sys_config/model" - "nms_nbi/features/sys_config/service" - "nms_nbi/lib/core/utils/ctx" - "nms_nbi/lib/core/utils/parse" - "nms_nbi/lib/core/vo/result" - "nms_nbi/lib/midware" - "nms_nbi/lib/services" - "nms_nbi/restagent/config" + "nms_cxy/features/sys_config/model" + "nms_cxy/features/sys_config/service" + "nms_cxy/lib/core/utils/ctx" + "nms_cxy/lib/core/utils/parse" + "nms_cxy/lib/core/vo/result" + "nms_cxy/lib/midware" + "nms_cxy/lib/services" + "nms_cxy/restagent/config" ) // 参数配置信息接口添加到路由 diff --git a/features/sys_config/service/repo_sys_config.go b/features/sys_config/service/repo_sys_config.go index 35ae982..51781ef 100644 --- a/features/sys_config/service/repo_sys_config.go +++ b/features/sys_config/service/repo_sys_config.go @@ -5,11 +5,11 @@ import ( "strings" "time" - "nms_nbi/features/sys_config/model" - "nms_nbi/lib/core/datasource" - "nms_nbi/lib/core/utils/date" - "nms_nbi/lib/core/utils/parse" - "nms_nbi/lib/log" + "nms_cxy/features/sys_config/model" + "nms_cxy/lib/core/datasource" + "nms_cxy/lib/core/utils/date" + "nms_cxy/lib/core/utils/parse" + "nms_cxy/lib/log" ) // 实例化数据层 RepoSysConfig 结构体 diff --git a/features/sys_config/service/service_sys_config.go b/features/sys_config/service/service_sys_config.go index 8e52875..a775845 100644 --- a/features/sys_config/service/service_sys_config.go +++ b/features/sys_config/service/service_sys_config.go @@ -3,9 +3,9 @@ package service import ( "errors" - "nms_nbi/features/sys_config/model" - "nms_nbi/lib/core/cache" - "nms_nbi/lib/core/constants/cachekey" + "nms_cxy/features/sys_config/model" + "nms_cxy/lib/core/cache" + "nms_cxy/lib/core/constants/cachekey" ) // 实例化服务层 ServiceSysConfig 结构体 diff --git a/features/sys_dict_data/api_sys_dict_data.go b/features/sys_dict_data/api_sys_dict_data.go index 756c3ad..6f61196 100644 --- a/features/sys_dict_data/api_sys_dict_data.go +++ b/features/sys_dict_data/api_sys_dict_data.go @@ -5,15 +5,15 @@ import ( "net/http" "strings" - "nms_nbi/features/sys_dict_data/model" - sysDictDataService "nms_nbi/features/sys_dict_data/service" - sysDictTypeService "nms_nbi/features/sys_dict_type/service" - "nms_nbi/lib/core/utils/ctx" - "nms_nbi/lib/core/utils/parse" - "nms_nbi/lib/core/vo/result" - "nms_nbi/lib/midware" - "nms_nbi/lib/services" - "nms_nbi/restagent/config" + "nms_cxy/features/sys_dict_data/model" + sysDictDataService "nms_cxy/features/sys_dict_data/service" + sysDictTypeService "nms_cxy/features/sys_dict_type/service" + "nms_cxy/lib/core/utils/ctx" + "nms_cxy/lib/core/utils/parse" + "nms_cxy/lib/core/vo/result" + "nms_cxy/lib/midware" + "nms_cxy/lib/services" + "nms_cxy/restagent/config" ) // 字典类型对应的字典数据信息接口添加到路由 diff --git a/features/sys_dict_data/repo/repo_sys_dict_data.go b/features/sys_dict_data/repo/repo_sys_dict_data.go index 0b16330..dab8409 100644 --- a/features/sys_dict_data/repo/repo_sys_dict_data.go +++ b/features/sys_dict_data/repo/repo_sys_dict_data.go @@ -5,10 +5,10 @@ import ( "strings" "time" - "nms_nbi/features/sys_dict_data/model" - "nms_nbi/lib/core/datasource" - "nms_nbi/lib/core/utils/parse" - "nms_nbi/lib/log" + "nms_cxy/features/sys_dict_data/model" + "nms_cxy/lib/core/datasource" + "nms_cxy/lib/core/utils/parse" + "nms_cxy/lib/log" ) // 实例化数据层 RepoSysDictData 结构体 diff --git a/features/sys_dict_data/service/service_sys_dict_data.go b/features/sys_dict_data/service/service_sys_dict_data.go index 1b663f9..ad363f8 100644 --- a/features/sys_dict_data/service/service_sys_dict_data.go +++ b/features/sys_dict_data/service/service_sys_dict_data.go @@ -3,9 +3,9 @@ package service import ( "errors" - "nms_nbi/features/sys_dict_data/model" - "nms_nbi/features/sys_dict_data/repo" - sysDictTypeService "nms_nbi/features/sys_dict_type/service" + "nms_cxy/features/sys_dict_data/model" + "nms_cxy/features/sys_dict_data/repo" + sysDictTypeService "nms_cxy/features/sys_dict_type/service" ) // 实例化服务层 ServiceSysDictData 结构体 diff --git a/features/sys_dict_type/api_sys_dict_type.go b/features/sys_dict_type/api_sys_dict_type.go index 3da9cba..bd34294 100644 --- a/features/sys_dict_type/api_sys_dict_type.go +++ b/features/sys_dict_type/api_sys_dict_type.go @@ -5,14 +5,14 @@ import ( "net/http" "strings" - "nms_nbi/features/sys_dict_type/model" - sysDictTypeService "nms_nbi/features/sys_dict_type/service" - "nms_nbi/lib/core/utils/ctx" - "nms_nbi/lib/core/utils/parse" - "nms_nbi/lib/core/vo/result" - "nms_nbi/lib/midware" - "nms_nbi/lib/services" - "nms_nbi/restagent/config" + "nms_cxy/features/sys_dict_type/model" + sysDictTypeService "nms_cxy/features/sys_dict_type/service" + "nms_cxy/lib/core/utils/ctx" + "nms_cxy/lib/core/utils/parse" + "nms_cxy/lib/core/vo/result" + "nms_cxy/lib/midware" + "nms_cxy/lib/services" + "nms_cxy/restagent/config" ) // 字典类型信息接口添加到路由 diff --git a/features/sys_dict_type/repo/repo_sys_dict_type.go b/features/sys_dict_type/repo/repo_sys_dict_type.go index 30f2212..26ef3ef 100644 --- a/features/sys_dict_type/repo/repo_sys_dict_type.go +++ b/features/sys_dict_type/repo/repo_sys_dict_type.go @@ -5,11 +5,11 @@ import ( "strings" "time" - "nms_nbi/features/sys_dict_type/model" - "nms_nbi/lib/core/datasource" - "nms_nbi/lib/core/utils/date" - "nms_nbi/lib/core/utils/parse" - "nms_nbi/lib/log" + "nms_cxy/features/sys_dict_type/model" + "nms_cxy/lib/core/datasource" + "nms_cxy/lib/core/utils/date" + "nms_cxy/lib/core/utils/parse" + "nms_cxy/lib/log" ) // 实例化数据层 RepoSysDictType 结构体 diff --git a/features/sys_dict_type/service/service_sys_dict_type.go b/features/sys_dict_type/service/service_sys_dict_type.go index 29f2765..9aafcf6 100644 --- a/features/sys_dict_type/service/service_sys_dict_type.go +++ b/features/sys_dict_type/service/service_sys_dict_type.go @@ -5,12 +5,12 @@ import ( "errors" "fmt" - sysDictDataModel "nms_nbi/features/sys_dict_data/model" - sysDictDataRepo "nms_nbi/features/sys_dict_data/repo" - sysDictTypeModel "nms_nbi/features/sys_dict_type/model" - "nms_nbi/features/sys_dict_type/repo" - "nms_nbi/lib/core/cache" - "nms_nbi/lib/core/constants/cachekey" + sysDictDataModel "nms_cxy/features/sys_dict_data/model" + sysDictDataRepo "nms_cxy/features/sys_dict_data/repo" + sysDictTypeModel "nms_cxy/features/sys_dict_type/model" + "nms_cxy/features/sys_dict_type/repo" + "nms_cxy/lib/core/cache" + "nms_cxy/lib/core/constants/cachekey" ) // 实例化服务层 ServiceSysDictType 结构体 diff --git a/features/sys_menu/api_sys_menu.go b/features/sys_menu/api_sys_menu.go index 1d03dd2..c8a74ea 100644 --- a/features/sys_menu/api_sys_menu.go +++ b/features/sys_menu/api_sys_menu.go @@ -4,16 +4,16 @@ import ( "fmt" "net/http" - "nms_nbi/features/sys_menu/consts" - "nms_nbi/features/sys_menu/model" - "nms_nbi/features/sys_menu/service" - "nms_nbi/lib/core/utils/ctx" - "nms_nbi/lib/core/utils/regular" - "nms_nbi/lib/core/vo/result" - "nms_nbi/lib/midware" - "nms_nbi/lib/services" - "nms_nbi/restagent/config" - srcConfig "nms_nbi/src/framework/config" + "nms_cxy/features/sys_menu/consts" + "nms_cxy/features/sys_menu/model" + "nms_cxy/features/sys_menu/service" + "nms_cxy/lib/core/utils/ctx" + "nms_cxy/lib/core/utils/regular" + "nms_cxy/lib/core/vo/result" + "nms_cxy/lib/midware" + "nms_cxy/lib/services" + "nms_cxy/restagent/config" + srcConfig "nms_cxy/src/framework/config" ) // 菜单接口添加到路由 diff --git a/features/sys_menu/service/repo_sys_menu.go b/features/sys_menu/service/repo_sys_menu.go index 319c839..4af0773 100644 --- a/features/sys_menu/service/repo_sys_menu.go +++ b/features/sys_menu/service/repo_sys_menu.go @@ -5,11 +5,11 @@ import ( "strings" "time" - "nms_nbi/features/sys_menu/consts" - "nms_nbi/features/sys_menu/model" - "nms_nbi/lib/core/datasource" - "nms_nbi/lib/core/utils/parse" - "nms_nbi/lib/log" + "nms_cxy/features/sys_menu/consts" + "nms_cxy/features/sys_menu/model" + "nms_cxy/lib/core/datasource" + "nms_cxy/lib/core/utils/parse" + "nms_cxy/lib/log" ) // 实例化数据层 RepoSysMenu 结构体 diff --git a/features/sys_menu/service/service_sys_menu.go b/features/sys_menu/service/service_sys_menu.go index 7401e9c..95f93b0 100644 --- a/features/sys_menu/service/service_sys_menu.go +++ b/features/sys_menu/service/service_sys_menu.go @@ -4,13 +4,13 @@ import ( "encoding/base64" "strings" - "nms_nbi/features/sys_menu/consts" - "nms_nbi/features/sys_menu/model" - sysRoleService "nms_nbi/features/sys_role/service" - sysrolemenu "nms_nbi/features/sys_role_menu" - "nms_nbi/lib/core/utils/parse" - "nms_nbi/lib/core/utils/regular" - "nms_nbi/lib/core/vo" + "nms_cxy/features/sys_menu/consts" + "nms_cxy/features/sys_menu/model" + sysRoleService "nms_cxy/features/sys_role/service" + sysrolemenu "nms_cxy/features/sys_role_menu" + "nms_cxy/lib/core/utils/parse" + "nms_cxy/lib/core/utils/regular" + "nms_cxy/lib/core/vo" ) // 实例化服务层 ServiceSysMenu 结构体 diff --git a/features/sys_role/api_sys_role.go b/features/sys_role/api_sys_role.go index b972e2e..9caefeb 100644 --- a/features/sys_role/api_sys_role.go +++ b/features/sys_role/api_sys_role.go @@ -5,15 +5,15 @@ import ( "net/http" "strings" - "nms_nbi/features/sys_role/model" - "nms_nbi/features/sys_role/service" - userService "nms_nbi/features/sys_user/service" - "nms_nbi/lib/core/utils/ctx" - "nms_nbi/lib/core/utils/parse" - "nms_nbi/lib/core/vo/result" - "nms_nbi/lib/midware" - "nms_nbi/lib/services" - "nms_nbi/restagent/config" + "nms_cxy/features/sys_role/model" + "nms_cxy/features/sys_role/service" + userService "nms_cxy/features/sys_user/service" + "nms_cxy/lib/core/utils/ctx" + "nms_cxy/lib/core/utils/parse" + "nms_cxy/lib/core/vo/result" + "nms_cxy/lib/midware" + "nms_cxy/lib/services" + "nms_cxy/restagent/config" ) // 角色接口添加到路由 diff --git a/features/sys_role/service/repo_sys_role.go b/features/sys_role/service/repo_sys_role.go index 64a715f..1fa9e6a 100644 --- a/features/sys_role/service/repo_sys_role.go +++ b/features/sys_role/service/repo_sys_role.go @@ -5,11 +5,11 @@ import ( "strings" "time" - "nms_nbi/features/sys_role/model" - "nms_nbi/lib/core/datasource" - "nms_nbi/lib/core/utils/date" - "nms_nbi/lib/core/utils/parse" - "nms_nbi/lib/log" + "nms_cxy/features/sys_role/model" + "nms_cxy/lib/core/datasource" + "nms_cxy/lib/core/utils/date" + "nms_cxy/lib/core/utils/parse" + "nms_cxy/lib/log" ) // 实例化数据层 RepoSysRole 结构体 diff --git a/features/sys_role/service/service_sys_role.go b/features/sys_role/service/service_sys_role.go index 4e3023e..7e4cc3b 100644 --- a/features/sys_role/service/service_sys_role.go +++ b/features/sys_role/service/service_sys_role.go @@ -4,9 +4,9 @@ import ( "errors" "fmt" - "nms_nbi/features/sys_role/model" - sysrolemenu "nms_nbi/features/sys_role_menu" - sysuserrole "nms_nbi/features/sys_user_role" + "nms_cxy/features/sys_role/model" + sysrolemenu "nms_cxy/features/sys_role_menu" + sysuserrole "nms_cxy/features/sys_user_role" ) // 实例化服务层 ServiceSysRole 结构体 diff --git a/features/sys_role_menu/repo_sys_role_menu.go b/features/sys_role_menu/repo_sys_role_menu.go index 1b143bc..cd8b9d7 100644 --- a/features/sys_role_menu/repo_sys_role_menu.go +++ b/features/sys_role_menu/repo_sys_role_menu.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "nms_nbi/lib/core/datasource" - "nms_nbi/lib/core/utils/parse" - "nms_nbi/lib/log" + "nms_cxy/lib/core/datasource" + "nms_cxy/lib/core/utils/parse" + "nms_cxy/lib/log" ) // 实例化数据层 RepoSysRoleMenu 结构体 diff --git a/features/sys_user/api_sys_user.go b/features/sys_user/api_sys_user.go index 2c5f554..8de0f1f 100644 --- a/features/sys_user/api_sys_user.go +++ b/features/sys_user/api_sys_user.go @@ -5,17 +5,17 @@ import ( "net/http" "strings" - sysRoleModel "nms_nbi/features/sys_role/model" - sysRoleService "nms_nbi/features/sys_role/service" - sysUserModel "nms_nbi/features/sys_user/model" - "nms_nbi/features/sys_user/service" - "nms_nbi/lib/core/utils/ctx" - "nms_nbi/lib/core/utils/parse" - "nms_nbi/lib/core/vo/result" - "nms_nbi/lib/midware" - "nms_nbi/lib/services" - "nms_nbi/restagent/config" - srcConfig "nms_nbi/src/framework/config" + sysRoleModel "nms_cxy/features/sys_role/model" + sysRoleService "nms_cxy/features/sys_role/service" + sysUserModel "nms_cxy/features/sys_user/model" + "nms_cxy/features/sys_user/service" + "nms_cxy/lib/core/utils/ctx" + "nms_cxy/lib/core/utils/parse" + "nms_cxy/lib/core/vo/result" + "nms_cxy/lib/midware" + "nms_cxy/lib/services" + "nms_cxy/restagent/config" + srcConfig "nms_cxy/src/framework/config" ) // 用户接口添加到路由 diff --git a/features/sys_user/model/sys_user.go b/features/sys_user/model/sys_user.go index 286f223..793f1ed 100644 --- a/features/sys_user/model/sys_user.go +++ b/features/sys_user/model/sys_user.go @@ -1,6 +1,6 @@ package model -import "nms_nbi/features/sys_role/model" +import "nms_cxy/features/sys_role/model" type SysUser struct { Id string `json:"id" xorm:"pk 'id' autoincr"` diff --git a/features/sys_user/service/repo_sys_user.go b/features/sys_user/service/repo_sys_user.go index 0acbee6..acd9b4d 100644 --- a/features/sys_user/service/repo_sys_user.go +++ b/features/sys_user/service/repo_sys_user.go @@ -5,13 +5,13 @@ import ( "strings" "time" - sysRoleModel "nms_nbi/features/sys_role/model" - sysUserModel "nms_nbi/features/sys_user/model" - "nms_nbi/lib/core/datasource" - "nms_nbi/lib/core/utils/date" - "nms_nbi/lib/core/utils/parse" - "nms_nbi/lib/log" - "nms_nbi/src/framework/utils/crypto" + sysRoleModel "nms_cxy/features/sys_role/model" + sysUserModel "nms_cxy/features/sys_user/model" + "nms_cxy/lib/core/datasource" + "nms_cxy/lib/core/utils/date" + "nms_cxy/lib/core/utils/parse" + "nms_cxy/lib/log" + "nms_cxy/src/framework/utils/crypto" ) // 实例化数据层 RepoSysUser 结构体 diff --git a/features/sys_user/service/service_sys_user.go b/features/sys_user/service/service_sys_user.go index 725239f..d89e3d0 100644 --- a/features/sys_user/service/service_sys_user.go +++ b/features/sys_user/service/service_sys_user.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" - sysUserModel "nms_nbi/features/sys_user/model" - sysuserrole "nms_nbi/features/sys_user_role" + sysUserModel "nms_cxy/features/sys_user/model" + sysuserrole "nms_cxy/features/sys_user_role" ) // 实例化服务层 ServiceSysUser 结构体 diff --git a/features/sys_user_role/repo_sys_user_role.go b/features/sys_user_role/repo_sys_user_role.go index 64d870b..d06db86 100644 --- a/features/sys_user_role/repo_sys_user_role.go +++ b/features/sys_user_role/repo_sys_user_role.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "nms_nbi/lib/core/datasource" - "nms_nbi/lib/core/utils/parse" - "nms_nbi/lib/log" + "nms_cxy/lib/core/datasource" + "nms_cxy/lib/core/utils/parse" + "nms_cxy/lib/log" ) // 实例化数据层 RepoSysUserRole 结构体 diff --git a/features/trace/tcpdump.go b/features/trace/tcpdump.go index d7e490b..df4b9fd 100644 --- a/features/trace/tcpdump.go +++ b/features/trace/tcpdump.go @@ -7,14 +7,14 @@ import ( "strings" "time" - "nms_nbi/lib/core/conf" - "nms_nbi/lib/core/utils/ctx" - "nms_nbi/lib/core/vo/result" - "nms_nbi/lib/dborm" - "nms_nbi/lib/log" - "nms_nbi/restagent/config" - "nms_nbi/src/framework/utils/cmd" - "nms_nbi/src/framework/utils/ssh" + "nms_cxy/lib/core/conf" + "nms_cxy/lib/core/utils/ctx" + "nms_cxy/lib/core/vo/result" + "nms_cxy/lib/dborm" + "nms_cxy/lib/log" + "nms_cxy/restagent/config" + "nms_cxy/src/framework/utils/cmd" + "nms_cxy/src/framework/utils/ssh" ) var ( diff --git a/features/trace/trace.go b/features/trace/trace.go index 5678261..c670a79 100644 --- a/features/trace/trace.go +++ b/features/trace/trace.go @@ -12,12 +12,12 @@ import ( "github.com/go-resty/resty/v2" "github.com/gorilla/mux" - "nms_nbi/lib/dborm" - "nms_nbi/lib/global" - "nms_nbi/lib/log" - "nms_nbi/lib/run" - "nms_nbi/lib/services" - "nms_nbi/restagent/config" + "nms_cxy/lib/dborm" + "nms_cxy/lib/global" + "nms_cxy/lib/log" + "nms_cxy/lib/run" + "nms_cxy/lib/services" + "nms_cxy/restagent/config" ) var ( diff --git a/features/udm_user/api_udm_user.go b/features/udm_user/api_udm_user.go index 120e251..8bc1221 100644 --- a/features/udm_user/api_udm_user.go +++ b/features/udm_user/api_udm_user.go @@ -7,20 +7,20 @@ import ( "strings" "time" - "nms_nbi/features/udm_user/model" - "nms_nbi/features/udm_user/service" - "nms_nbi/lib/core/conf" - mmlclient "nms_nbi/lib/core/mml_client" - "nms_nbi/lib/core/utils/ctx" - "nms_nbi/lib/core/vo/result" - "nms_nbi/lib/dborm" - "nms_nbi/lib/log" - "nms_nbi/lib/midware" - "nms_nbi/lib/services" - "nms_nbi/restagent/config" - "nms_nbi/src/framework/middleware/collectlogs" - "nms_nbi/src/framework/utils/file" - "nms_nbi/src/framework/utils/ssh" + "nms_cxy/features/udm_user/model" + "nms_cxy/features/udm_user/service" + "nms_cxy/lib/core/conf" + mmlclient "nms_cxy/lib/core/mml_client" + "nms_cxy/lib/core/utils/ctx" + "nms_cxy/lib/core/vo/result" + "nms_cxy/lib/dborm" + "nms_cxy/lib/log" + "nms_cxy/lib/midware" + "nms_cxy/lib/services" + "nms_cxy/restagent/config" + "nms_cxy/src/framework/middleware/collectlogs" + "nms_cxy/src/framework/utils/file" + "nms_cxy/src/framework/utils/ssh" ) // UDM 用户信息接口添加到路由 diff --git a/features/udm_user/repo/repo_udm_auth_user.go b/features/udm_user/repo/repo_udm_auth_user.go index fcd5d18..9d9f68e 100644 --- a/features/udm_user/repo/repo_udm_auth_user.go +++ b/features/udm_user/repo/repo_udm_auth_user.go @@ -4,10 +4,10 @@ import ( "strconv" "strings" - "nms_nbi/features/udm_user/model" - "nms_nbi/lib/core/datasource" - "nms_nbi/lib/core/utils/parse" - "nms_nbi/lib/log" + "nms_cxy/features/udm_user/model" + "nms_cxy/lib/core/datasource" + "nms_cxy/lib/core/utils/parse" + "nms_cxy/lib/log" ) // 实例化数据层 RepoUdmAuthUser 结构体 diff --git a/features/udm_user/repo/repo_udm_sub_user.go b/features/udm_user/repo/repo_udm_sub_user.go index e67761c..9317492 100644 --- a/features/udm_user/repo/repo_udm_sub_user.go +++ b/features/udm_user/repo/repo_udm_sub_user.go @@ -5,10 +5,10 @@ import ( "strconv" "strings" - "nms_nbi/features/udm_user/model" - "nms_nbi/lib/core/datasource" - "nms_nbi/lib/core/utils/parse" - "nms_nbi/lib/log" + "nms_cxy/features/udm_user/model" + "nms_cxy/lib/core/datasource" + "nms_cxy/lib/core/utils/parse" + "nms_cxy/lib/log" ) // 实例化数据层 RepoUdmSubUser 结构体 diff --git a/features/udm_user/service/service_redis_data.go b/features/udm_user/service/service_redis_data.go index f5f864e..addf6e0 100644 --- a/features/udm_user/service/service_redis_data.go +++ b/features/udm_user/service/service_redis_data.go @@ -3,8 +3,8 @@ package service import ( "strings" - "nms_nbi/features/udm_user/model" - "nms_nbi/src/framework/redis" + "nms_cxy/features/udm_user/model" + "nms_cxy/src/framework/redis" ) // phoneImsiList 获取所有imsi diff --git a/features/udm_user/service/service_udm_auth_user.go b/features/udm_user/service/service_udm_auth_user.go index 59ad888..30daa0d 100644 --- a/features/udm_user/service/service_udm_auth_user.go +++ b/features/udm_user/service/service_udm_auth_user.go @@ -4,8 +4,8 @@ import ( "fmt" "strconv" - "nms_nbi/features/udm_user/model" - "nms_nbi/features/udm_user/repo" + "nms_cxy/features/udm_user/model" + "nms_cxy/features/udm_user/repo" ) // 实例化服务层 ServiceUdmAuthUser 结构体 diff --git a/features/udm_user/service/service_udm_sub_user.go b/features/udm_user/service/service_udm_sub_user.go index 4e8f9b2..205bdc9 100644 --- a/features/udm_user/service/service_udm_sub_user.go +++ b/features/udm_user/service/service_udm_sub_user.go @@ -5,8 +5,8 @@ import ( "strconv" "strings" - "nms_nbi/features/udm_user/model" - "nms_nbi/features/udm_user/repo" + "nms_cxy/features/udm_user/model" + "nms_cxy/features/udm_user/repo" ) // 实例化服务层 ServiceUdmSubUser 结构体 diff --git a/features/ue/ue.go b/features/ue/ue.go index 2ed92d4..9b498a4 100644 --- a/features/ue/ue.go +++ b/features/ue/ue.go @@ -8,12 +8,12 @@ import ( "strings" "time" - "nms_nbi/lib/dborm" - "nms_nbi/lib/global" - "nms_nbi/lib/log" - "nms_nbi/lib/services" - "nms_nbi/restagent/config" - tokenConst "nms_nbi/src/framework/constants/token" + "nms_cxy/lib/dborm" + "nms_cxy/lib/global" + "nms_cxy/lib/log" + "nms_cxy/lib/services" + "nms_cxy/restagent/config" + tokenConst "nms_cxy/src/framework/constants/token" "github.com/go-resty/resty/v2" "github.com/gorilla/mux" diff --git a/go.mod b/go.mod index 5b5f8d0..07c18d6 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module nms_nbi +module nms_cxy go 1.21 diff --git a/lib/core/account/account.go b/lib/core/account/account.go index 752b564..98c0df3 100644 --- a/lib/core/account/account.go +++ b/lib/core/account/account.go @@ -5,12 +5,12 @@ import ( "strconv" "time" - sysMenuService "nms_nbi/features/sys_menu/service" - sysRoleService "nms_nbi/features/sys_role/service" - "nms_nbi/lib/core/cache" - "nms_nbi/lib/core/vo" - "nms_nbi/lib/dborm" - srcConfig "nms_nbi/src/framework/config" + sysMenuService "nms_cxy/features/sys_menu/service" + sysRoleService "nms_cxy/features/sys_role/service" + "nms_cxy/lib/core/cache" + "nms_cxy/lib/core/vo" + "nms_cxy/lib/dborm" + srcConfig "nms_cxy/src/framework/config" ) // 登录缓存用户信息 diff --git a/lib/core/datasource/datasource.go b/lib/core/datasource/datasource.go index ac92847..7146df3 100644 --- a/lib/core/datasource/datasource.go +++ b/lib/core/datasource/datasource.go @@ -4,7 +4,7 @@ import ( "database/sql" "regexp" - "nms_nbi/lib/dborm" + "nms_cxy/lib/dborm" "xorm.io/xorm" ) diff --git a/lib/core/mml_client/mml_client.go b/lib/core/mml_client/mml_client.go index c60a9a6..1513f3c 100644 --- a/lib/core/mml_client/mml_client.go +++ b/lib/core/mml_client/mml_client.go @@ -7,7 +7,7 @@ import ( "net" "time" - "nms_nbi/lib/core/conf" + "nms_cxy/lib/core/conf" ) // 定义MMLClient结构体 diff --git a/lib/core/utils/ctx/ctx.go b/lib/core/utils/ctx/ctx.go index af64a48..53e74b7 100644 --- a/lib/core/utils/ctx/ctx.go +++ b/lib/core/utils/ctx/ctx.go @@ -10,9 +10,9 @@ import ( "path/filepath" "strings" - "nms_nbi/lib/core/vo" - commonConstants "nms_nbi/src/framework/constants/common" - tokenConst "nms_nbi/src/framework/constants/token" + "nms_cxy/lib/core/vo" + commonConstants "nms_cxy/src/framework/constants/common" + tokenConst "nms_cxy/src/framework/constants/token" "github.com/gorilla/mux" "golang.org/x/text/language" diff --git a/lib/core/utils/date/date.go b/lib/core/utils/date/date.go index 865a499..51a0c0a 100644 --- a/lib/core/utils/date/date.go +++ b/lib/core/utils/date/date.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "nms_nbi/lib/log" + "nms_cxy/lib/log" ) const ( diff --git a/lib/core/vo/login_user.go b/lib/core/vo/login_user.go index a171d2d..cb32bcc 100644 --- a/lib/core/vo/login_user.go +++ b/lib/core/vo/login_user.go @@ -1,7 +1,7 @@ package vo import ( - "nms_nbi/lib/dborm" + "nms_cxy/lib/dborm" ) // LoginUser 登录用户身份权限信息对象 diff --git a/lib/core/vo/treeselect.go b/lib/core/vo/treeselect.go index 89fa19c..a732e58 100644 --- a/lib/core/vo/treeselect.go +++ b/lib/core/vo/treeselect.go @@ -1,6 +1,6 @@ package vo -// import sysmenu "nms_nbi/features/sys_menu" +// import sysmenu "nms_cxy/features/sys_menu" // TreeSelect 树结构实体类 type TreeSelect struct { diff --git a/lib/dborm/dborm.go b/lib/dborm/dborm.go index 646b5b3..3fd1490 100644 --- a/lib/dborm/dborm.go +++ b/lib/dborm/dborm.go @@ -10,9 +10,9 @@ import ( "strings" - "nms_nbi/features/sys_role/model" - "nms_nbi/lib/log" - "nms_nbi/lib/oauth" + "nms_cxy/features/sys_role/model" + "nms_cxy/lib/log" + "nms_cxy/lib/oauth" _ "github.com/go-sql-driver/mysql" "xorm.io/xorm" diff --git a/lib/midware/arrow_ip_addr.go b/lib/midware/arrow_ip_addr.go index bba209a..2e538ba 100644 --- a/lib/midware/arrow_ip_addr.go +++ b/lib/midware/arrow_ip_addr.go @@ -6,8 +6,8 @@ import ( "strings" "time" - "nms_nbi/lib/dborm" - "nms_nbi/lib/services" + "nms_cxy/lib/dborm" + "nms_cxy/lib/services" ) // 登录策略限制登录时间和访问ip范围 diff --git a/lib/midware/authorize.go b/lib/midware/authorize.go index 43b7031..d76dd02 100644 --- a/lib/midware/authorize.go +++ b/lib/midware/authorize.go @@ -5,13 +5,13 @@ import ( "fmt" "net/http" - "nms_nbi/lib/core/cache" - "nms_nbi/lib/core/utils/ctx" - "nms_nbi/lib/core/vo" - "nms_nbi/lib/core/vo/result" - "nms_nbi/lib/dborm" - commonConstants "nms_nbi/src/framework/constants/common" - tokenUtils "nms_nbi/src/framework/utils/token" + "nms_cxy/lib/core/cache" + "nms_cxy/lib/core/utils/ctx" + "nms_cxy/lib/core/vo" + "nms_cxy/lib/core/vo/result" + "nms_cxy/lib/dborm" + commonConstants "nms_cxy/src/framework/constants/common" + tokenUtils "nms_cxy/src/framework/utils/token" ) // Authorize 用户身份授权认证校验 diff --git a/lib/midware/midhandle.go b/lib/midware/midhandle.go index f4932c0..b598379 100644 --- a/lib/midware/midhandle.go +++ b/lib/midware/midhandle.go @@ -4,9 +4,9 @@ import ( "net/http" "strings" - "nms_nbi/lib/log" - "nms_nbi/lib/services" - tokenConst "nms_nbi/src/framework/constants/token" + "nms_cxy/lib/log" + "nms_cxy/lib/services" + tokenConst "nms_cxy/src/framework/constants/token" "github.com/gorilla/mux" ) diff --git a/lib/midware/mml_log.go b/lib/midware/mml_log.go index 804adbd..f3c7614 100644 --- a/lib/midware/mml_log.go +++ b/lib/midware/mml_log.go @@ -9,11 +9,11 @@ import ( "strings" "time" - "nms_nbi/lib/core/datasource" - "nms_nbi/lib/core/utils/ctx" - "nms_nbi/lib/core/utils/date" - "nms_nbi/lib/dborm" - "nms_nbi/lib/log" + "nms_cxy/lib/core/datasource" + "nms_cxy/lib/core/utils/ctx" + "nms_cxy/lib/core/utils/date" + "nms_cxy/lib/dborm" + "nms_cxy/lib/log" ) // LogMML mml操作日志搜集 diff --git a/lib/midware/operate_log.go b/lib/midware/operate_log.go index 5e1cae0..8cfedf5 100644 --- a/lib/midware/operate_log.go +++ b/lib/midware/operate_log.go @@ -11,13 +11,13 @@ import ( "strings" "time" - "nms_nbi/lib/core/utils/parse" - "nms_nbi/lib/dborm" - "nms_nbi/src/framework/constants/common" - "nms_nbi/src/framework/middleware/collectlogs" - "nms_nbi/src/framework/utils/ip2region" - "nms_nbi/src/modules/system/model" - "nms_nbi/src/modules/system/service" + "nms_cxy/lib/core/utils/parse" + "nms_cxy/lib/dborm" + "nms_cxy/src/framework/constants/common" + "nms_cxy/src/framework/middleware/collectlogs" + "nms_cxy/src/framework/utils/ip2region" + "nms_cxy/src/modules/system/model" + "nms_cxy/src/modules/system/service" ) // 敏感属性字段进行掩码 diff --git a/lib/mmlp/parse.go b/lib/mmlp/parse.go index adb99e4..e713242 100644 --- a/lib/mmlp/parse.go +++ b/lib/mmlp/parse.go @@ -11,11 +11,11 @@ import ( "strconv" "strings" - "nms_nbi/lib/dborm" - "nms_nbi/lib/global" - "nms_nbi/lib/log" - "nms_nbi/lib/run" - tokenConst "nms_nbi/src/framework/constants/token" + "nms_cxy/lib/dborm" + "nms_cxy/lib/global" + "nms_cxy/lib/log" + "nms_cxy/lib/run" + tokenConst "nms_cxy/src/framework/constants/token" "github.com/go-resty/resty/v2" ) diff --git a/lib/oauth/oauth.go b/lib/oauth/oauth.go index 376abf4..a2019b2 100644 --- a/lib/oauth/oauth.go +++ b/lib/oauth/oauth.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "nms_nbi/lib/log" + "nms_cxy/lib/log" "github.com/dgrijalva/jwt-go" "golang.org/x/crypto/bcrypt" diff --git a/lib/routes/routes.go b/lib/routes/routes.go index 8750dd3..bcb2099 100644 --- a/lib/routes/routes.go +++ b/lib/routes/routes.go @@ -5,33 +5,33 @@ import ( // "log" - "nms_nbi/features/aaaa" - "nms_nbi/features/cdr" - "nms_nbi/features/cm" - "nms_nbi/features/dbrest" - "nms_nbi/features/file" - "nms_nbi/features/fm" - "nms_nbi/features/lm" - "nms_nbi/features/mml" - "nms_nbi/features/monitor/monitor" - "nms_nbi/features/monitor/psnet" - "nms_nbi/features/nbi" - "nms_nbi/features/pm" - "nms_nbi/features/security" - "nms_nbi/features/sm" - "nms_nbi/features/state" - sysconfig "nms_nbi/features/sys_config" - sysdictdata "nms_nbi/features/sys_dict_data" - sysdicttype "nms_nbi/features/sys_dict_type" - sysmenu "nms_nbi/features/sys_menu" - sysrole "nms_nbi/features/sys_role" - sysuser "nms_nbi/features/sys_user" - "nms_nbi/features/trace" - udmuser "nms_nbi/features/udm_user" - "nms_nbi/features/ue" - "nms_nbi/lib/midware" - "nms_nbi/lib/services" - "nms_nbi/src/framework/middleware/collectlogs" + "nms_cxy/features/aaaa" + "nms_cxy/features/cdr" + "nms_cxy/features/cm" + "nms_cxy/features/dbrest" + "nms_cxy/features/file" + "nms_cxy/features/fm" + "nms_cxy/features/lm" + "nms_cxy/features/mml" + "nms_cxy/features/monitor/monitor" + "nms_cxy/features/monitor/psnet" + "nms_cxy/features/nbi" + "nms_cxy/features/pm" + "nms_cxy/features/security" + "nms_cxy/features/sm" + "nms_cxy/features/state" + sysconfig "nms_cxy/features/sys_config" + sysdictdata "nms_cxy/features/sys_dict_data" + sysdicttype "nms_cxy/features/sys_dict_type" + sysmenu "nms_cxy/features/sys_menu" + sysrole "nms_cxy/features/sys_role" + sysuser "nms_cxy/features/sys_user" + "nms_cxy/features/trace" + udmuser "nms_cxy/features/udm_user" + "nms_cxy/features/ue" + "nms_cxy/lib/midware" + "nms_cxy/lib/services" + "nms_cxy/src/framework/middleware/collectlogs" "github.com/gorilla/mux" ) diff --git a/lib/run/exec_linux.go b/lib/run/exec_linux.go index 00b5d72..ca0a1e0 100644 --- a/lib/run/exec_linux.go +++ b/lib/run/exec_linux.go @@ -7,7 +7,7 @@ import ( "bytes" "os/exec" - "nms_nbi/lib/log" + "nms_cxy/lib/log" ) func ExecCmd(command, path string) ([]byte, error) { diff --git a/lib/run/exec_wasm.go b/lib/run/exec_wasm.go index 985b0f3..be8ca79 100644 --- a/lib/run/exec_wasm.go +++ b/lib/run/exec_wasm.go @@ -6,7 +6,7 @@ package run import ( "os/exec" - "nms_nbi/lib/log" + "nms_cxy/lib/log" ) func ExecCmd(command, path string) ([]byte, error) { diff --git a/lib/run/exec_windows.go b/lib/run/exec_windows.go index 645a05b..1ddd3c7 100644 --- a/lib/run/exec_windows.go +++ b/lib/run/exec_windows.go @@ -6,7 +6,7 @@ package run import ( "os/exec" - "nms_nbi/lib/log" + "nms_cxy/lib/log" ) func ExecCmd(command, path string) ([]byte, error) { diff --git a/lib/services/file.go b/lib/services/file.go index 47215fb..7c6f98a 100644 --- a/lib/services/file.go +++ b/lib/services/file.go @@ -11,7 +11,7 @@ import ( "strconv" "strings" - "nms_nbi/lib/log" + "nms_cxy/lib/log" ) const ( diff --git a/lib/services/services.go b/lib/services/services.go index 8c4d722..2d75beb 100644 --- a/lib/services/services.go +++ b/lib/services/services.go @@ -16,11 +16,11 @@ import ( "strconv" "strings" - "nms_nbi/lib/dborm" - "nms_nbi/lib/global" - "nms_nbi/lib/log" - "nms_nbi/lib/oauth" - "nms_nbi/restagent/config" + "nms_cxy/lib/dborm" + "nms_cxy/lib/global" + "nms_cxy/lib/log" + "nms_cxy/lib/oauth" + "nms_cxy/restagent/config" "github.com/gorilla/mux" ) diff --git a/lib/session/session.go b/lib/session/session.go index 26cb03c..831dbf2 100644 --- a/lib/session/session.go +++ b/lib/session/session.go @@ -11,9 +11,9 @@ import ( "sync" "time" - "nms_nbi/lib/log" - "nms_nbi/lib/oauth" - "nms_nbi/restagent/config" + "nms_cxy/lib/log" + "nms_cxy/lib/oauth" + "nms_cxy/restagent/config" ) // SessionMgr session manager diff --git a/lib/wsinfo/process_data.go b/lib/wsinfo/process_data.go index d501acc..4bc4a01 100644 --- a/lib/wsinfo/process_data.go +++ b/lib/wsinfo/process_data.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "nms_nbi/lib/log" + "nms_cxy/lib/log" "github.com/shirou/gopsutil/v3/host" "github.com/shirou/gopsutil/v3/net" diff --git a/makefile b/makefile deleted file mode 100644 index 16fbd5b..0000000 --- a/makefile +++ /dev/null @@ -1,166 +0,0 @@ -# Makefile for AGrandTech EMS project - -ProjectL = omc -ProjectU = OMC -PROJECT = $(ProjectL) -VERSION = 2.2403.1 -RelDate = `date +%Y%m%d` -Release = $(RelDate) -RelVer = $(VERSION)-$(RelDate) -PLATFORM = amd64 -ARMPLATFORM = aarch64 -GitLocalRoot = $(HOME)/local.git -EmsBuildRoot=$(HOME)/local.git/build.ems -BuildDir = $(HOME)/local.git/build.ems/build -BuildOMCDir = $(HOME)/local.git/build.ems/build/usr/local/omc -BuildOMCBinDir = $(HOME)/local.git/build.ems/build/usr/local/omc/bin -BuildOMCEtcDir = $(HOME)/local.git/build.ems/build/usr/local/omc/etc -BuildLibDir = $(HOME)/local.git/build.ems/build/lib -BuildLibSystemDir = $(BuildLibDir)/systemd/system -DebBuildDir = $(HOME)/local.git/build.ems/debbuild -DebFEBuildDir = $(HOME)/local.git/build.ems/debbuild/usr/local/omc/htdocs -DebBuild2204Dir = $(HOME)/local.git/build.ems/debbuild/22.04 -DebFEBuild2204Dir = $(HOME)/local.git/build.ems/debbuild/22.04/usr/local/omc/htdocs -RpmBuildDir = $(HOME)/local.git/build.ems/rpmbuild -RpmFEBuildDir = $(RpmBuildDir)/BUILD/usr/local/omc/htdocs -OmcInstallDir = /usr/local/omc -ReleaseDir = $(HOME)/local.git/build.ems/release -EmsBEDir = $(HOME)/local.git/nms_nbi -ConfigEtcDir = $(HOME)/local.git/nms_nbi/config/etc -ConfigSystemdDir = $(HOME)/local.git/nms_nbi/config/systemd -EmsFEDir = $(HOME)/local.git/fe.ems -EmsFEVue3Dir = $(HOME)/local.git/fe.ems.vue3/dist -LibDir = $(HOME)/local.git/nms_nbi/lib -RESTAGENT = restagent -CRONTASK = crontask -SshSvcBin = sshsvc -CapTraceBin = captrace -Data2htmlBin = data2html -NBI_ALARM = nbi_alarm -NBI_AGENT = nbi_agent -4A_AGENT = 4a_agent -RestagentDir = $(HOME)/local.git/nms_nbi/restagent -CrontaskDir = $(HOME)/local.git/nms_nbi/crontask -SshSvcDir = $(HOME)/local.git/nms_nbi/sshsvc -CapTraceDir = $(HOME)/local.git/nms_nbi/captrace -Data2htmlDir = $(HOME)/local.git/nms_nbi/data2html -DBSQLSrcDir = $(HOME)/local.git/nms_nbi/database -MiscDir = $(HOME)/local.git/nms_nbi/misc -FrontBuildDir = $(HOME)/local.git/build.ems/build/usr/local/omc/htdocs -FrontSrcDir = $(HOME)/local.git/nms_nbi/front -ReleaseDebs = $(ReleaseDir)/debs/amd64 -CrontaskSize = 27788951 -RestagentSize = 29525312 -BinWriterDir = $(HOME)/bin -ifeq ($(shell grep VERSION_ID /etc/os-release), VERSION_ID="22.04") -DebBuildDir := $(DebBuild2204Dir) -DebFEBuildDir := $(DebFEBuild2204Dir) -#DebPkgFile := $(PROJECT)-$(VERSION)-22.04-$(Release).amd64.deb -DebPkgFile := $(PROJECT)-r$(VERSION)-$(Release)-ub22.deb -else ifeq ($(shell grep VERSION_ID /etc/os-release), VERSION_ID="18.04") -DebPkgFile := $(PROJECT)-r$(VERSION)-$(Release)-ub18.deb -endif - -.PHONY: all restagent crontask sshsvc captrace sshsvc -all: restagent crontask sshsvc captrace sshsvc - cd $(RestagentDir) - go build -o restagent -v -ldflags "-X 'nms_nbi/lib/conifg.Version=$(RelVer)' \ - -X '$(LibDir)/conifg.BuildTime=`date`' \ - -X '$(LibDir)/conifg.GoVer=`go version`'" - cd $(CrontaskDir) - go build -o crontask -v -ldflags "-X '$(LibDir)/conifg.Version=$(RelVer)' \ - -X '$(LibDir)/conifg.BuildTime=`date`' \ - -X '$(LibDir)/conifg.GoVer=`go version`'" - cd $(SshSvcDir) - go build -o sshsvc -v -ldflags "-X '$(LibDir)/conifg.Version=$(RelVer)' \ - -X '$(LibDir)/conifg.BuildTime=`date`' \ - -X '$(LibDir)/conifg.GoVer=`go version`'" - cd $(CapTraceDir) - go build -o captrace -v -ldflags "-X '$(LibDir)/conifg.Version=$(RelVer)' \ - -X '$(LibDir)/conifg.BuildTime=`date`' \ - -X '$(LibDir)/conifg.GoVer=`go version`'" - cd $(Data2htmlDir) - go build -o sshsvc -v -ldflags "-X '$(LibDir)/conifg.Version=$(RelVer)' \ - -X '$(LibDir)/conifg.BuildTime=`date`' \ - -X '$(LibDir)/conifg.GoVer=`go version`'" - -clean: - rm ./restagent/restagent ./crontask/crontask $(SshSvcDir)/sshsvc $(CapTraceDir)/captrace $(Data2htmlDir)/sshsvc - -dist: - tar -zvcPf $(ReleaseDir)/$(PROJECT)-src-$(VERSION).tar.gz \ - ../lib \ - ../restagent \ - ../crontask \ - ../initems \ - ../database \ - ../docs \ - ../misc \ - ../config \ - --exclude=../restagent/restagent \ - --exclude=../crontask/crontask \ - --exclude=../initems/initems - -deb: $(BINNAME) - # clear build cache - rm -rf $(FrontBuildDir)/front/* - rm -rf $(DebFEBuildDir)/front/* - rm -rf $(DebBuildDir)/usr/local/omc/etc/db/* - - cp -rf $(RestagentDir)/restagent $(BuildOMCBinDir) - cp -rf $(CrontaskDir)/crontask $(BuildOMCBinDir) - cp -rf $(SshSvcDir)/sshsvc $(BuildOMCBinDir) - cp -rf $(CapTraceDir)/captrace $(BuildOMCBinDir) - cp -rf $(Data2htmlDir)/sshsvc $(BuildOMCBinDir) - cp -rf $(MiscDir)/* $(BuildOMCBinDir) - cp -rf $(ConfigEtcDir)/* $(BuildOMCEtcDir) - rm -rf $(BuildOMCEtcDir)/db/* - cp -rf $(DBSQLSrcDir)/* $(BuildOMCEtcDir)/db/ - cp -rf $(ConfigSystemdDir)/* $(BuildLibSystemDir) - cp -rf $(EmsFEVue3Dir)/* $(FrontBuildDir)/front >/dev/null - chmod 755 $(BuildOMCBinDir)/* - chmod 755 $(DebBuildDir)/DEBIAN/preinst - chmod 755 $(DebBuildDir)/DEBIAN/postinst - chmod 755 $(DebBuildDir)/DEBIAN/postrm - cp -rf $(HOME)/local.git/build.ems/build/* $(DebBuildDir)/ - #cp -rf $(HOME)/local.git/build.ems/build/nginx/* $(DebBuildDir)/etc/nginx/conf.d - #cp -rf $(HOME)/local.git/build.ems/build/systemd/*.service $(DebBuildDir)/lib/systemd/system/ - chmod +x $(DebBuildDir)/usr/local/omc/bin/* - #sed -i.bak 's/YYYYMMDD/$(shell date +"%Y%m%d")/g' $(DebBuildDir)/DEBIAN/control - sed -i 's/YYYYMMDD/$(shell date +"%Y%m%d")/g' $(DebBuildDir)/DEBIAN/control - perl -0777 -i -pe 's/ne:\n user: root/ne:\n user: agtuser/g' $(DebBuildDir)/usr/local/omc/etc/default/restconf.yaml - dpkg -b $(DebBuildDir) $(ReleaseDebs)/$(DebPkgFile) - -rpm: $(BINNAME) - # clear build cache - rm -rf $(FrontBuildDir)/front/* - rm -rf $(RpmFEBuildDir)/front/* - rm -rf $(RpmBuildDir)/BUILD/usr/local/omc/etc/db/* - - cp -rf $(RestagentDir)/restagent $(BuildOMCBinDir) - cp -rf $(CrontaskDir)/crontask $(BuildOMCBinDir) - cp -rf $(SshSvcDir)/sshsvc $(BuildOMCBinDir) - cp -rf $(CapTraceDir)/captrace $(BuildOMCBinDir) - cp -rf $(Data2htmlDir)/sshsvc $(BuildOMCBinDir) -# $(BinWriterDir)/binWriter $(BuildOMCBinDir)/restagent $(RestagentSize) -# $(BinWriterDir)/binWriter $(BuildOMCBinDir)/crontask $(CrontaskSize) -# cp -rf $(MiscDir)/ne-hosts $(BuildOMCBinDir) -# cp -rf ./nbi/$(NBI_ALARM)/bin/$(NBI_ALARM) $(BinDir2) -# cp -rf ./nbi/$(NBI_AGENT)/bin/$(NBI_AGENT) $(BinDir2) -# cp -rf ./$(4A_AGENT)/bin/$(4A_AGENT) $(BinDir2) - cp -rf $(MiscDir)/* $(BuildOMCBinDir) -# rm -rf $(BinDir2)/ne-hosts - cp -rf $(ConfigEtcDir)/* $(BuildOMCEtcDir) - rm -rf $(BuildOMCEtcDir)/db/* - cp -rf $(DBSQLSrcDir)/* $(BuildOMCEtcDir)/db/ - cp -rf $(ConfigSystemdDir)/* $(BuildLibSystemDir) - #unzip $(FrontSrcDir)/front.zip -d $(FrontBuildDir) >/dev/null - mkdir -p $(FrontBuildDir)/front - cp -rf $(EmsFEVue3Dir)/* $(FrontBuildDir)/front >/dev/null - chmod 755 $(BuildOMCBinDir)/* -# chmod 755 $(BinDir2)/* - cp -rf $(HOME)/local.git/build.ems/build/* $(RpmBuildDir)/BUILD/ - #cp -rf $(HOME)/local.git/build.ems/build/nginx $(RpmBuildDir)/BUILD/etc/ - #cp -rf $(HOME)/local.git/build.ems/build/systemd $(RpmBuildDir)/BUILD/lib/ - cd $(RpmBuildDir) - rpmbuild -bb -D "_topdir $(RpmBuildDir)" $(RpmBuildDir)/SPECS/omc.spec diff --git a/mkpkg.sh b/mkpkg.sh deleted file mode 100644 index 41f6519..0000000 --- a/mkpkg.sh +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/bash - -ProcList="restagent crontask sshsvc captrace data2html" -ProjectL=omc -VERSION=2.2403.1 -RelDate=`date +%Y%m%d` -Release=${RelDate} -RelVer=${VERSION}-${RelDate} -Ky10Arch=ky10.aarch64 -RpmPkgName=${ProjectL}-${RelVer}.ky10.aarch64.rpm -RpmPkgRename=${ProjectL}-r${RelVer}-ky10.rpm -DebPkgName=${ProjectL}-r${RelVer}-ub*.deb -GitLocalRoot=${HOME}/local.git -EmsBEDir=${GitLocalRoot}/nms_nbi -EmsBuildRoot=${GitLocalRoot}/build.ems -RpmArch=`arch` -RpmsDir=${EmsBuildRoot}/rpmbuild/RPMS/ -ReleaseDir=${EmsBuildRoot}/release -DumpToolDir=${EmsBEDir}/tools/misc - -if [[ ${RpmArch} =~ "x86_64" ]];then - RelArch=amd64 -elif [[ $RpmArch =~ "aarch64" ]];then - RelArch=arm64 -fi - -cd $EmsBEDir -for procName in $ProcList;do - cd $EmsBEDir/$procName - echo "Make $procName ..." - make -done - -#Get SQL from database -if [ "$2" = "db" ]; then - cd ${DumpToolDir} - chmod +x ${DumpToolDir}/dumpdb.sh - ${DumpToolDir}/dumpdb.sh -fi - -case "$1" in - rpm) - cd $EmsBEDir - make rpm - mv -f $RpmsDir/$RpmArch/$RpmPkgName $ReleaseDir/"$1"s/$RelArch/$RpmPkgRename - cd $ReleaseDir/"$1"s/$RelArch - rm -f omc-md5sum.txt -# rpm --addsign *.rpm - md5sum $RpmPkgRename >omc-md5sum.txt - ;; - deb) - cd $EmsBEDir - make deb - cd $ReleaseDir/"$1"s/$RelArch - rm -f omc-md5sum.txt -# rpm --addsign *.rpm - md5sum $DebPkgName >omc-md5sum.txt - ;; - *) - echo "mkpkg" - echo "Usage: $0 rpm|deb" - ;; -esac \ No newline at end of file diff --git a/restagent/config/config.go b/restagent/config/config.go index 43a34dc..5ae5e8a 100644 --- a/restagent/config/config.go +++ b/restagent/config/config.go @@ -2,8 +2,8 @@ package config import ( "fmt" - "nms_nbi/lib/global" - "nms_nbi/lib/log" + "nms_cxy/lib/global" + "nms_cxy/lib/log" "os" "strings" diff --git a/restagent/config/map.go b/restagent/config/map.go index b2c29a2..1d54b5a 100644 --- a/restagent/config/map.go +++ b/restagent/config/map.go @@ -6,7 +6,7 @@ import ( "gopkg.in/yaml.v3" - "nms_nbi/lib/global" + "nms_cxy/lib/global" ) type Uri2Object struct { diff --git a/restagent/etc/restconf-t.yaml b/restagent/etc/restconf-t.yaml index 8bdccfb..31f0387 100644 --- a/restagent/etc/restconf-t.yaml +++ b/restagent/etc/restconf-t.yaml @@ -3,7 +3,7 @@ # duration: rotation time with xx hours, example: 1/12/24 hours # count: rotation count of log, default is 30 rotation logger: - file: d:/local.git/nms_nbi/restagent/log/restagent-t.log + file: d:/local.git/nms_cxy/restagent/log/restagent-t.log level: trace duration: 24 count: 2 @@ -25,7 +25,7 @@ database: host: 127.0.0.1 port: 33066 name: omc_db - backup: d:/local.git/nms_nbi/restagent/database + backup: d:/local.git/nms_cxy/restagent/database # Redis 缓存数据，数据源声明全小写 redis: diff --git a/restagent/etc/restconf.yaml b/restagent/etc/restconf.yaml index 2086e4f..e5d6476 100644 --- a/restagent/etc/restconf.yaml +++ b/restagent/etc/restconf.yaml @@ -3,7 +3,7 @@ # duration: rotation time with xx hours, example: 1/12/24 hours # count: rotation count of log, default is 30 rotation logger: - file: d:/local.git/nms_nbi/restagent/log/restagent.log + file: d:/local.git/nms_cxy/restagent/log/restagent.log level: trace duration: 24 count: 2 @@ -44,7 +44,7 @@ database: password: "root@1234" host: "192.168.5.59" port: 3306 - name: omc_db + name: omc_db_nms_cxy backup: d:/local.git/be.ems/restagent/database # Redis 缓存数据，数据源声明全小写 diff --git a/restagent/makefile b/restagent/makefile index 2fb0a28..132195a 100644 --- a/restagent/makefile +++ b/restagent/makefile @@ -2,7 +2,7 @@ PROJECT = OMC VERSION = 2.2403.1 -LIBDIR = nms_nbi/lib +LIBDIR = nms_cxy/lib BINNAME = restagent .PHONY: build $(BINNAME) diff --git a/restagent/restagent.go b/restagent/restagent.go index 4c3c33b..d3f8cc7 100644 --- a/restagent/restagent.go +++ b/restagent/restagent.go @@ -9,19 +9,19 @@ import ( "strconv" "strings" - "nms_nbi/features/dbrest" - "nms_nbi/features/event" - "nms_nbi/features/fm" - "nms_nbi/features/lm" - "nms_nbi/features/pm" - "nms_nbi/lib/dborm" - "nms_nbi/lib/global" - "nms_nbi/lib/log" - "nms_nbi/lib/routes" - "nms_nbi/restagent/config" - "nms_nbi/src" - "nms_nbi/src/framework/middleware" - libSession "nms_nbi/src/lib_features/session" + "nms_cxy/features/dbrest" + "nms_cxy/features/event" + "nms_cxy/features/fm" + "nms_cxy/features/lm" + "nms_cxy/features/pm" + "nms_cxy/lib/dborm" + "nms_cxy/lib/global" + "nms_cxy/lib/log" + "nms_cxy/lib/routes" + "nms_cxy/restagent/config" + "nms_cxy/src" + "nms_cxy/src/framework/middleware" + libSession "nms_cxy/src/lib_features/session" "github.com/gin-gonic/gin" "golang.org/x/net/http2" diff --git a/src/app.go b/src/app.go index 9f834f9..50d896c 100644 --- a/src/app.go +++ b/src/app.go @@ -4,20 +4,20 @@ import ( "embed" "fmt" - "nms_nbi/src/framework/config" - "nms_nbi/src/framework/errorcatch" - "nms_nbi/src/framework/middleware" - "nms_nbi/src/framework/middleware/security" - "nms_nbi/src/modules/chart" - "nms_nbi/src/modules/common" - "nms_nbi/src/modules/crontask" - "nms_nbi/src/modules/monitor" - networkdata "nms_nbi/src/modules/network_data" - networkelement "nms_nbi/src/modules/network_element" - nmscxy "nms_nbi/src/modules/nms_cxy" - "nms_nbi/src/modules/system" - "nms_nbi/src/modules/trace" - "nms_nbi/src/modules/ws" + "nms_cxy/src/framework/config" + "nms_cxy/src/framework/errorcatch" + "nms_cxy/src/framework/middleware" + "nms_cxy/src/framework/middleware/security" + "nms_cxy/src/modules/chart" + "nms_cxy/src/modules/common" + "nms_cxy/src/modules/crontask" + "nms_cxy/src/modules/monitor" + networkdata "nms_cxy/src/modules/network_data" + networkelement "nms_cxy/src/modules/network_element" + nmscxy "nms_cxy/src/modules/nms_cxy" + "nms_cxy/src/modules/system" + "nms_cxy/src/modules/trace" + "nms_cxy/src/modules/ws" "github.com/gin-gonic/gin" ) diff --git a/src/configuration.go b/src/configuration.go index c01adb7..3c1515e 100644 --- a/src/configuration.go +++ b/src/configuration.go @@ -1,11 +1,11 @@ package src import ( - "nms_nbi/src/framework/config" - "nms_nbi/src/framework/cron" - "nms_nbi/src/framework/datasource" - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/redis" + "nms_cxy/src/framework/config" + "nms_cxy/src/framework/cron" + "nms_cxy/src/framework/datasource" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/redis" ) // 配置中心初始加载 diff --git a/src/framework/config/config.go b/src/framework/config/config.go index a7461bd..66468f4 100644 --- a/src/framework/config/config.go +++ b/src/framework/config/config.go @@ -8,7 +8,7 @@ import ( "os" "time" - libConfig "nms_nbi/src/lib_features/config" + libConfig "nms_cxy/src/lib_features/config" "github.com/spf13/pflag" "github.com/spf13/viper" diff --git a/src/framework/cron/cron_test.go b/src/framework/cron/cron_test.go index 29002a2..426af69 100644 --- a/src/framework/cron/cron_test.go +++ b/src/framework/cron/cron_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "nms_nbi/src/framework/logger" + "nms_cxy/src/framework/logger" ) // 参考文章： diff --git a/src/framework/cron/log.go b/src/framework/cron/log.go index 20660ff..0970252 100644 --- a/src/framework/cron/log.go +++ b/src/framework/cron/log.go @@ -4,9 +4,9 @@ import ( "encoding/json" "time" - "nms_nbi/src/framework/constants/common" - "nms_nbi/src/modules/monitor/model" - "nms_nbi/src/modules/monitor/repository" + "nms_cxy/src/framework/constants/common" + "nms_cxy/src/modules/monitor/model" + "nms_cxy/src/modules/monitor/repository" ) // 实例任务执行日志收集 diff --git a/src/framework/datasource/datasource.go b/src/framework/datasource/datasource.go index fd50c90..2f1e101 100644 --- a/src/framework/datasource/datasource.go +++ b/src/framework/datasource/datasource.go @@ -7,8 +7,8 @@ import ( "regexp" "time" - "nms_nbi/src/framework/config" - "nms_nbi/src/framework/logger" + "nms_cxy/src/framework/config" + "nms_cxy/src/framework/logger" "gorm.io/driver/mysql" "gorm.io/gorm" diff --git a/src/framework/errorcatch/errorcatch.go b/src/framework/errorcatch/errorcatch.go index 363f348..b196311 100644 --- a/src/framework/errorcatch/errorcatch.go +++ b/src/framework/errorcatch/errorcatch.go @@ -3,9 +3,9 @@ package errorcatch import ( "fmt" - "nms_nbi/src/framework/config" - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/vo/result" + "nms_cxy/src/framework/config" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/vo/result" "github.com/gin-gonic/gin" ) diff --git a/src/framework/i18n/i18n.go b/src/framework/i18n/i18n.go index 9c1e37c..9967735 100644 --- a/src/framework/i18n/i18n.go +++ b/src/framework/i18n/i18n.go @@ -4,7 +4,7 @@ import ( "fmt" "regexp" - systemService "nms_nbi/src/modules/system/service" + systemService "nms_cxy/src/modules/system/service" ) // localeItem 国际化数据项 diff --git a/src/framework/middleware/collectlogs/operate_log.go b/src/framework/middleware/collectlogs/operate_log.go index d83896f..955dce7 100644 --- a/src/framework/middleware/collectlogs/operate_log.go +++ b/src/framework/middleware/collectlogs/operate_log.go @@ -7,13 +7,13 @@ import ( "strings" "time" - "nms_nbi/src/framework/constants/common" - "nms_nbi/src/framework/i18n" - "nms_nbi/src/framework/utils/ctx" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/vo/result" - "nms_nbi/src/modules/system/model" - "nms_nbi/src/modules/system/service" + "nms_cxy/src/framework/constants/common" + "nms_cxy/src/framework/i18n" + "nms_cxy/src/framework/utils/ctx" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/vo/result" + "nms_cxy/src/modules/system/model" + "nms_cxy/src/modules/system/service" "github.com/gin-gonic/gin" ) diff --git a/src/framework/middleware/cors.go b/src/framework/middleware/cors.go index ad2462f..37f8eb1 100644 --- a/src/framework/middleware/cors.go +++ b/src/framework/middleware/cors.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "nms_nbi/src/framework/config" + "nms_cxy/src/framework/config" "github.com/gin-gonic/gin" ) diff --git a/src/framework/middleware/pre_authorize.go b/src/framework/middleware/pre_authorize.go index ab038c5..e91ca96 100644 --- a/src/framework/middleware/pre_authorize.go +++ b/src/framework/middleware/pre_authorize.go @@ -3,12 +3,12 @@ package middleware import ( "strings" - AdminConstants "nms_nbi/src/framework/constants/admin" - commonConstants "nms_nbi/src/framework/constants/common" - "nms_nbi/src/framework/i18n" - ctxUtils "nms_nbi/src/framework/utils/ctx" - tokenUtils "nms_nbi/src/framework/utils/token" - "nms_nbi/src/framework/vo/result" + AdminConstants "nms_cxy/src/framework/constants/admin" + commonConstants "nms_cxy/src/framework/constants/common" + "nms_cxy/src/framework/i18n" + ctxUtils "nms_cxy/src/framework/utils/ctx" + tokenUtils "nms_cxy/src/framework/utils/token" + "nms_cxy/src/framework/vo/result" "github.com/gin-gonic/gin" ) diff --git a/src/framework/middleware/rate_limit.go b/src/framework/middleware/rate_limit.go index 8eb9e28..17888a8 100644 --- a/src/framework/middleware/rate_limit.go +++ b/src/framework/middleware/rate_limit.go @@ -5,12 +5,12 @@ import ( "strings" "time" - "nms_nbi/src/framework/constants/cachekey" - "nms_nbi/src/framework/i18n" - "nms_nbi/src/framework/redis" - "nms_nbi/src/framework/utils/ctx" - "nms_nbi/src/framework/utils/ip2region" - "nms_nbi/src/framework/vo/result" + "nms_cxy/src/framework/constants/cachekey" + "nms_cxy/src/framework/i18n" + "nms_cxy/src/framework/redis" + "nms_cxy/src/framework/utils/ctx" + "nms_cxy/src/framework/utils/ip2region" + "nms_cxy/src/framework/vo/result" "github.com/gin-gonic/gin" ) diff --git a/src/framework/middleware/repeat/repeat.go b/src/framework/middleware/repeat/repeat.go index 37e2aef..a2b109f 100644 --- a/src/framework/middleware/repeat/repeat.go +++ b/src/framework/middleware/repeat/repeat.go @@ -5,12 +5,12 @@ import ( "strconv" "time" - "nms_nbi/src/framework/constants/cachekey" - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/redis" - "nms_nbi/src/framework/utils/ctx" - "nms_nbi/src/framework/utils/ip2region" - "nms_nbi/src/framework/vo/result" + "nms_cxy/src/framework/constants/cachekey" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/redis" + "nms_cxy/src/framework/utils/ctx" + "nms_cxy/src/framework/utils/ip2region" + "nms_cxy/src/framework/vo/result" "github.com/gin-gonic/gin" ) diff --git a/src/framework/middleware/report.go b/src/framework/middleware/report.go index 2ac4f70..b700a5e 100644 --- a/src/framework/middleware/report.go +++ b/src/framework/middleware/report.go @@ -3,7 +3,7 @@ package middleware import ( "time" - "nms_nbi/src/framework/logger" + "nms_cxy/src/framework/logger" "github.com/gin-gonic/gin" ) diff --git a/src/framework/middleware/security/csp.go b/src/framework/middleware/security/csp.go index d319f55..c9afb22 100644 --- a/src/framework/middleware/security/csp.go +++ b/src/framework/middleware/security/csp.go @@ -1,8 +1,8 @@ package security import ( - "nms_nbi/src/framework/config" - "nms_nbi/src/framework/utils/generate" + "nms_cxy/src/framework/config" + "nms_cxy/src/framework/utils/generate" "github.com/gin-gonic/gin" ) diff --git a/src/framework/middleware/security/hsts.go b/src/framework/middleware/security/hsts.go index da9eedb..8f94945 100644 --- a/src/framework/middleware/security/hsts.go +++ b/src/framework/middleware/security/hsts.go @@ -3,7 +3,7 @@ package security import ( "fmt" - "nms_nbi/src/framework/config" + "nms_cxy/src/framework/config" "github.com/gin-gonic/gin" ) diff --git a/src/framework/middleware/security/noopen.go b/src/framework/middleware/security/noopen.go index d18ba5e..0bbeadc 100644 --- a/src/framework/middleware/security/noopen.go +++ b/src/framework/middleware/security/noopen.go @@ -1,7 +1,7 @@ package security import ( - "nms_nbi/src/framework/config" + "nms_cxy/src/framework/config" "github.com/gin-gonic/gin" ) diff --git a/src/framework/middleware/security/nosniff.go b/src/framework/middleware/security/nosniff.go index d300f52..fc1efee 100644 --- a/src/framework/middleware/security/nosniff.go +++ b/src/framework/middleware/security/nosniff.go @@ -1,7 +1,7 @@ package security import ( - "nms_nbi/src/framework/config" + "nms_cxy/src/framework/config" "github.com/gin-gonic/gin" ) diff --git a/src/framework/middleware/security/referer.go b/src/framework/middleware/security/referer.go index 947cae1..4c89f87 100644 --- a/src/framework/middleware/security/referer.go +++ b/src/framework/middleware/security/referer.go @@ -3,8 +3,8 @@ package security import ( "net/url" - "nms_nbi/src/framework/config" - "nms_nbi/src/framework/vo/result" + "nms_cxy/src/framework/config" + "nms_cxy/src/framework/vo/result" "github.com/gin-gonic/gin" ) diff --git a/src/framework/middleware/security/xframe.go b/src/framework/middleware/security/xframe.go index 411c208..ecb8470 100644 --- a/src/framework/middleware/security/xframe.go +++ b/src/framework/middleware/security/xframe.go @@ -1,7 +1,7 @@ package security import ( - "nms_nbi/src/framework/config" + "nms_cxy/src/framework/config" "github.com/gin-gonic/gin" ) diff --git a/src/framework/middleware/security/xss_protection.go b/src/framework/middleware/security/xss_protection.go index 8d75d74..ba6492d 100644 --- a/src/framework/middleware/security/xss_protection.go +++ b/src/framework/middleware/security/xss_protection.go @@ -1,7 +1,7 @@ package security import ( - "nms_nbi/src/framework/config" + "nms_cxy/src/framework/config" "github.com/gin-gonic/gin" ) diff --git a/src/framework/redis/redis.go b/src/framework/redis/redis.go index 8ea549d..244f907 100644 --- a/src/framework/redis/redis.go +++ b/src/framework/redis/redis.go @@ -6,8 +6,8 @@ import ( "strings" "time" - "nms_nbi/src/framework/config" - "nms_nbi/src/framework/logger" + "nms_cxy/src/framework/config" + "nms_cxy/src/framework/logger" "github.com/redis/go-redis/v9" ) diff --git a/src/framework/utils/ctx/ctx.go b/src/framework/utils/ctx/ctx.go index 1a13f5a..1b2864c 100644 --- a/src/framework/utils/ctx/ctx.go +++ b/src/framework/utils/ctx/ctx.go @@ -4,13 +4,13 @@ import ( "fmt" "strings" - "nms_nbi/src/framework/config" - "nms_nbi/src/framework/constants/common" - "nms_nbi/src/framework/constants/roledatascope" - "nms_nbi/src/framework/constants/token" - "nms_nbi/src/framework/utils/ip2region" - "nms_nbi/src/framework/utils/ua" - "nms_nbi/src/framework/vo" + "nms_cxy/src/framework/config" + "nms_cxy/src/framework/constants/common" + "nms_cxy/src/framework/constants/roledatascope" + "nms_cxy/src/framework/constants/token" + "nms_cxy/src/framework/utils/ip2region" + "nms_cxy/src/framework/utils/ua" + "nms_cxy/src/framework/vo" "golang.org/x/text/language" diff --git a/src/framework/utils/date/date.go b/src/framework/utils/date/date.go index dd03efb..00c1f33 100644 --- a/src/framework/utils/date/date.go +++ b/src/framework/utils/date/date.go @@ -3,7 +3,7 @@ package date import ( "time" - "nms_nbi/src/framework/logger" + "nms_cxy/src/framework/logger" ) const ( diff --git a/src/framework/utils/file/csv.go b/src/framework/utils/file/csv.go index 1574bf1..38091d2 100644 --- a/src/framework/utils/file/csv.go +++ b/src/framework/utils/file/csv.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strings" - "nms_nbi/src/framework/logger" + "nms_cxy/src/framework/logger" ) // 写入CSV文件，需要转换数据 diff --git a/src/framework/utils/file/excel.go b/src/framework/utils/file/excel.go index 6af40df..c1cf77d 100644 --- a/src/framework/utils/file/excel.go +++ b/src/framework/utils/file/excel.go @@ -7,9 +7,9 @@ import ( "path/filepath" "time" - "nms_nbi/src/framework/constants/uploadsubpath" - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/utils/date" + "nms_cxy/src/framework/constants/uploadsubpath" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/utils/date" "github.com/xuri/excelize/v2" ) diff --git a/src/framework/utils/file/file.go b/src/framework/utils/file/file.go index b9008c1..679ccac 100644 --- a/src/framework/utils/file/file.go +++ b/src/framework/utils/file/file.go @@ -11,13 +11,13 @@ import ( "strings" "time" - "nms_nbi/src/framework/config" - "nms_nbi/src/framework/constants/uploadsubpath" - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/utils/date" - "nms_nbi/src/framework/utils/generate" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/utils/regular" + "nms_cxy/src/framework/config" + "nms_cxy/src/framework/constants/uploadsubpath" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/utils/date" + "nms_cxy/src/framework/utils/generate" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/utils/regular" ) /**最大文件名长度 */ diff --git a/src/framework/utils/file/json.go b/src/framework/utils/file/json.go index e35a7c0..43bbd2b 100644 --- a/src/framework/utils/file/json.go +++ b/src/framework/utils/file/json.go @@ -7,7 +7,7 @@ import ( "os" "path/filepath" - "nms_nbi/src/framework/logger" + "nms_cxy/src/framework/logger" ) // WriterFileJSON 写入JSON文件 diff --git a/src/framework/utils/file/txt.go b/src/framework/utils/file/txt.go index 0627b18..0df9495 100644 --- a/src/framework/utils/file/txt.go +++ b/src/framework/utils/file/txt.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strings" - "nms_nbi/src/framework/logger" + "nms_cxy/src/framework/logger" ) // WriterFileTXT 写入txt文件 sep 分割符号 需要转换数据 diff --git a/src/framework/utils/file/utils.go b/src/framework/utils/file/utils.go index 6b8a40a..24ad059 100644 --- a/src/framework/utils/file/utils.go +++ b/src/framework/utils/file/utils.go @@ -9,7 +9,7 @@ import ( "sort" "strconv" - "nms_nbi/src/framework/logger" + "nms_cxy/src/framework/logger" ) // transferToNewFile 读取目标文件转移到新路径下 diff --git a/src/framework/utils/generate/generate.go b/src/framework/utils/generate/generate.go index 4de60db..7e52411 100644 --- a/src/framework/utils/generate/generate.go +++ b/src/framework/utils/generate/generate.go @@ -4,7 +4,7 @@ import ( "math/rand" "time" - "nms_nbi/src/framework/logger" + "nms_cxy/src/framework/logger" gonanoid "github.com/matoous/go-nanoid/v2" ) diff --git a/src/framework/utils/ip2region/ip2region.go b/src/framework/utils/ip2region/ip2region.go index f825d76..49a256d 100644 --- a/src/framework/utils/ip2region/ip2region.go +++ b/src/framework/utils/ip2region/ip2region.go @@ -5,7 +5,7 @@ import ( "strings" "time" - "nms_nbi/src/framework/logger" + "nms_cxy/src/framework/logger" ) // 网络地址(内网) diff --git a/src/framework/utils/repo/repo.go b/src/framework/utils/repo/repo.go index 08d75d4..ecf61f2 100644 --- a/src/framework/utils/repo/repo.go +++ b/src/framework/utils/repo/repo.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "nms_nbi/src/framework/utils/parse" + "nms_cxy/src/framework/utils/parse" ) // PageNumSize 分页页码记录数 diff --git a/src/framework/utils/ssh/files.go b/src/framework/utils/ssh/files.go index adad7af..0bf4556 100644 --- a/src/framework/utils/ssh/files.go +++ b/src/framework/utils/ssh/files.go @@ -4,10 +4,10 @@ import ( "fmt" "strings" - "nms_nbi/src/framework/config" - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/utils/cmd" - "nms_nbi/src/framework/utils/parse" + "nms_cxy/src/framework/config" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/utils/cmd" + "nms_cxy/src/framework/utils/parse" ) // FileListRow 文件列表行数据 diff --git a/src/framework/utils/ssh/scp.go b/src/framework/utils/ssh/scp.go index 0191109..639c028 100644 --- a/src/framework/utils/ssh/scp.go +++ b/src/framework/utils/ssh/scp.go @@ -6,8 +6,8 @@ import ( "os/exec" "path/filepath" - "nms_nbi/src/framework/config" - "nms_nbi/src/framework/logger" + "nms_cxy/src/framework/config" + "nms_cxy/src/framework/logger" ) // 网元NE 文件复制到远程文件 diff --git a/src/framework/utils/ssh/ssh.go b/src/framework/utils/ssh/ssh.go index 72c5531..e1e8a41 100644 --- a/src/framework/utils/ssh/ssh.go +++ b/src/framework/utils/ssh/ssh.go @@ -10,7 +10,7 @@ import ( "sync" "time" - "nms_nbi/src/framework/logger" + "nms_cxy/src/framework/logger" gossh "golang.org/x/crypto/ssh" ) diff --git a/src/framework/utils/token/token.go b/src/framework/utils/token/token.go index 8d013cb..6df979a 100644 --- a/src/framework/utils/token/token.go +++ b/src/framework/utils/token/token.go @@ -5,13 +5,13 @@ import ( "fmt" "time" - "nms_nbi/src/framework/config" - cachekeyConstants "nms_nbi/src/framework/constants/cachekey" - tokenConstants "nms_nbi/src/framework/constants/token" - "nms_nbi/src/framework/logger" - redisCahe "nms_nbi/src/framework/redis" - "nms_nbi/src/framework/utils/generate" - "nms_nbi/src/framework/vo" + "nms_cxy/src/framework/config" + cachekeyConstants "nms_cxy/src/framework/constants/cachekey" + tokenConstants "nms_cxy/src/framework/constants/token" + "nms_cxy/src/framework/logger" + redisCahe "nms_cxy/src/framework/redis" + "nms_cxy/src/framework/utils/generate" + "nms_cxy/src/framework/vo" jwt "github.com/golang-jwt/jwt/v5" ) diff --git a/src/framework/vo/loginuser.go b/src/framework/vo/loginuser.go index 71c9880..fd29483 100644 --- a/src/framework/vo/loginuser.go +++ b/src/framework/vo/loginuser.go @@ -1,6 +1,6 @@ package vo -import systemModel "nms_nbi/src/modules/system/model" +import systemModel "nms_cxy/src/modules/system/model" // LoginUser 登录用户身份权限信息对象 type LoginUser struct { diff --git a/src/framework/vo/result/result.go b/src/framework/vo/result/result.go index fde4261..379e45f 100644 --- a/src/framework/vo/result/result.go +++ b/src/framework/vo/result/result.go @@ -1,7 +1,7 @@ package result import ( - "nms_nbi/src/framework/constants/result" + "nms_cxy/src/framework/constants/result" ) // CodeMsg 响应结果 diff --git a/src/framework/vo/treeselect.go b/src/framework/vo/treeselect.go index 493e5ca..1f1bb13 100644 --- a/src/framework/vo/treeselect.go +++ b/src/framework/vo/treeselect.go @@ -1,6 +1,6 @@ package vo -import systemModel "nms_nbi/src/modules/system/model" +import systemModel "nms_cxy/src/modules/system/model" // TreeSelect 树结构实体类 type TreeSelect struct { diff --git a/src/lib_features/account/account.go b/src/lib_features/account/account.go index ffb9bcb..5fa3a22 100644 --- a/src/lib_features/account/account.go +++ b/src/lib_features/account/account.go @@ -3,11 +3,11 @@ package libfeatures import ( "time" - "nms_nbi/lib/dborm" - "nms_nbi/lib/oauth" - libConfig "nms_nbi/restagent/config" - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/redis" + "nms_cxy/lib/dborm" + "nms_cxy/lib/oauth" + libConfig "nms_cxy/restagent/config" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/redis" ) // SessionToken 设置登录会话-兼容旧登录方式 diff --git a/src/lib_features/config/config.go b/src/lib_features/config/config.go index f8e3aac..59b6497 100644 --- a/src/lib_features/config/config.go +++ b/src/lib_features/config/config.go @@ -3,9 +3,9 @@ package libfeatures import ( "fmt" - libConf "nms_nbi/lib/core/conf" - libGlobal "nms_nbi/lib/global" - libConfig "nms_nbi/restagent/config" + libConf "nms_cxy/lib/core/conf" + libGlobal "nms_cxy/lib/global" + libConfig "nms_cxy/restagent/config" "github.com/spf13/viper" ) diff --git a/src/lib_features/session/session.go b/src/lib_features/session/session.go index fb701e7..879c16c 100644 --- a/src/lib_features/session/session.go +++ b/src/lib_features/session/session.go @@ -3,8 +3,8 @@ package session import ( "time" - libConfig "nms_nbi/restagent/config" - "nms_nbi/src/framework/redis" + libConfig "nms_cxy/restagent/config" + "nms_cxy/src/framework/redis" "github.com/gin-gonic/gin" ) diff --git a/src/modules/chart/chart.go b/src/modules/chart/chart.go index 65fdacc..1908087 100644 --- a/src/modules/chart/chart.go +++ b/src/modules/chart/chart.go @@ -1,10 +1,10 @@ package chart import ( - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/middleware" - "nms_nbi/src/framework/middleware/collectlogs" - "nms_nbi/src/modules/chart/controller" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/middleware" + "nms_cxy/src/framework/middleware/collectlogs" + "nms_cxy/src/modules/chart/controller" "github.com/gin-gonic/gin" ) diff --git a/src/modules/chart/controller/chart_graph.go b/src/modules/chart/controller/chart_graph.go index 643ab65..7a19772 100644 --- a/src/modules/chart/controller/chart_graph.go +++ b/src/modules/chart/controller/chart_graph.go @@ -1,10 +1,10 @@ package controller import ( - "nms_nbi/src/framework/i18n" - "nms_nbi/src/framework/utils/ctx" - "nms_nbi/src/framework/vo/result" - chartService "nms_nbi/src/modules/chart/service" + "nms_cxy/src/framework/i18n" + "nms_cxy/src/framework/utils/ctx" + "nms_cxy/src/framework/vo/result" + chartService "nms_cxy/src/modules/chart/service" "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" diff --git a/src/modules/chart/repository/chart_graph.go b/src/modules/chart/repository/chart_graph.go index bd46a59..ca4d811 100644 --- a/src/modules/chart/repository/chart_graph.go +++ b/src/modules/chart/repository/chart_graph.go @@ -1,6 +1,6 @@ package repository -import "nms_nbi/src/modules/chart/model" +import "nms_cxy/src/modules/chart/model" // G6关系图数据 数据层接口 type IChartGraph interface { diff --git a/src/modules/chart/repository/chart_graph.impl.go b/src/modules/chart/repository/chart_graph.impl.go index 5f5a373..eb7efe7 100644 --- a/src/modules/chart/repository/chart_graph.impl.go +++ b/src/modules/chart/repository/chart_graph.impl.go @@ -3,11 +3,11 @@ package repository import ( "strings" - "nms_nbi/src/framework/datasource" - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/utils/repo" - "nms_nbi/src/modules/chart/model" + "nms_cxy/src/framework/datasource" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/utils/repo" + "nms_cxy/src/modules/chart/model" ) // 实例化数据层 NewChartGraphImpl 结构体 diff --git a/src/modules/chart/service/chart_graph.impl.go b/src/modules/chart/service/chart_graph.impl.go index e041aab..0294c45 100644 --- a/src/modules/chart/service/chart_graph.impl.go +++ b/src/modules/chart/service/chart_graph.impl.go @@ -3,9 +3,9 @@ package service import ( "strings" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/modules/chart/model" - chartRepository "nms_nbi/src/modules/chart/repository" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/modules/chart/model" + chartRepository "nms_cxy/src/modules/chart/repository" "github.com/goccy/go-json" ) diff --git a/src/modules/common/common.go b/src/modules/common/common.go index 2eace5b..1e9c1bc 100644 --- a/src/modules/common/common.go +++ b/src/modules/common/common.go @@ -1,9 +1,9 @@ package common import ( - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/middleware" - "nms_nbi/src/modules/common/controller" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/middleware" + "nms_cxy/src/modules/common/controller" "github.com/gin-gonic/gin" ) diff --git a/src/modules/common/controller/account.go b/src/modules/common/controller/account.go index 6a3b862..cb4a538 100644 --- a/src/modules/common/controller/account.go +++ b/src/modules/common/controller/account.go @@ -1,18 +1,18 @@ package controller import ( - "nms_nbi/src/framework/config" - commonConstants "nms_nbi/src/framework/constants/common" - tokenConstants "nms_nbi/src/framework/constants/token" - "nms_nbi/src/framework/i18n" - "nms_nbi/src/framework/utils/ctx" - tokenUtils "nms_nbi/src/framework/utils/token" - "nms_nbi/src/framework/vo" - "nms_nbi/src/framework/vo/result" - libAccount "nms_nbi/src/lib_features/account" - commonModel "nms_nbi/src/modules/common/model" - commonService "nms_nbi/src/modules/common/service" - systemService "nms_nbi/src/modules/system/service" + "nms_cxy/src/framework/config" + commonConstants "nms_cxy/src/framework/constants/common" + tokenConstants "nms_cxy/src/framework/constants/token" + "nms_cxy/src/framework/i18n" + "nms_cxy/src/framework/utils/ctx" + tokenUtils "nms_cxy/src/framework/utils/token" + "nms_cxy/src/framework/vo" + "nms_cxy/src/framework/vo/result" + libAccount "nms_cxy/src/lib_features/account" + commonModel "nms_cxy/src/modules/common/model" + commonService "nms_cxy/src/modules/common/service" + systemService "nms_cxy/src/modules/system/service" "github.com/gin-gonic/gin" ) diff --git a/src/modules/common/controller/captcha.go b/src/modules/common/controller/captcha.go index 0fbf230..b93598f 100644 --- a/src/modules/common/controller/captcha.go +++ b/src/modules/common/controller/captcha.go @@ -3,14 +3,14 @@ package controller import ( "time" - "nms_nbi/src/framework/config" - "nms_nbi/src/framework/constants/cachekey" - "nms_nbi/src/framework/constants/captcha" - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/redis" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/vo/result" - systemService "nms_nbi/src/modules/system/service" + "nms_cxy/src/framework/config" + "nms_cxy/src/framework/constants/cachekey" + "nms_cxy/src/framework/constants/captcha" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/redis" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/vo/result" + systemService "nms_cxy/src/modules/system/service" "github.com/gin-gonic/gin" "github.com/mojocn/base64Captcha" diff --git a/src/modules/common/controller/common.go b/src/modules/common/controller/common.go index 8a904b4..ff6e75d 100644 --- a/src/modules/common/controller/common.go +++ b/src/modules/common/controller/common.go @@ -1,10 +1,10 @@ package controller import ( - "nms_nbi/src/framework/i18n" - "nms_nbi/src/framework/utils/ctx" - "nms_nbi/src/framework/vo/result" - commonService "nms_nbi/src/modules/common/service" + "nms_cxy/src/framework/i18n" + "nms_cxy/src/framework/utils/ctx" + "nms_cxy/src/framework/vo/result" + commonService "nms_cxy/src/modules/common/service" "github.com/gin-gonic/gin" ) diff --git a/src/modules/common/controller/file.go b/src/modules/common/controller/file.go index 543b483..597c055 100644 --- a/src/modules/common/controller/file.go +++ b/src/modules/common/controller/file.go @@ -7,12 +7,12 @@ import ( "path/filepath" "strings" - "nms_nbi/src/framework/config" - "nms_nbi/src/framework/constants/uploadsubpath" - "nms_nbi/src/framework/i18n" - "nms_nbi/src/framework/utils/ctx" - "nms_nbi/src/framework/utils/file" - "nms_nbi/src/framework/vo/result" + "nms_cxy/src/framework/config" + "nms_cxy/src/framework/constants/uploadsubpath" + "nms_cxy/src/framework/i18n" + "nms_cxy/src/framework/utils/ctx" + "nms_cxy/src/framework/utils/file" + "nms_cxy/src/framework/vo/result" "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" diff --git a/src/modules/common/controller/index.go b/src/modules/common/controller/index.go index 2d45b01..dd80c35 100644 --- a/src/modules/common/controller/index.go +++ b/src/modules/common/controller/index.go @@ -3,8 +3,8 @@ package controller import ( "fmt" - "nms_nbi/src/framework/config" - "nms_nbi/src/framework/vo/result" + "nms_cxy/src/framework/config" + "nms_cxy/src/framework/vo/result" "github.com/gin-gonic/gin" ) diff --git a/src/modules/common/controller/register.go b/src/modules/common/controller/register.go index 966032f..526b8d6 100644 --- a/src/modules/common/controller/register.go +++ b/src/modules/common/controller/register.go @@ -1,14 +1,14 @@ package controller import ( - commonConstants "nms_nbi/src/framework/constants/common" - "nms_nbi/src/framework/i18n" - "nms_nbi/src/framework/utils/ctx" - "nms_nbi/src/framework/utils/regular" - "nms_nbi/src/framework/vo/result" - commonModel "nms_nbi/src/modules/common/model" - commonService "nms_nbi/src/modules/common/service" - systemService "nms_nbi/src/modules/system/service" + commonConstants "nms_cxy/src/framework/constants/common" + "nms_cxy/src/framework/i18n" + "nms_cxy/src/framework/utils/ctx" + "nms_cxy/src/framework/utils/regular" + "nms_cxy/src/framework/vo/result" + commonModel "nms_cxy/src/modules/common/model" + commonService "nms_cxy/src/modules/common/service" + systemService "nms_cxy/src/modules/system/service" "github.com/gin-gonic/gin" ) diff --git a/src/modules/common/service/account.go b/src/modules/common/service/account.go index 4523177..ad52af4 100644 --- a/src/modules/common/service/account.go +++ b/src/modules/common/service/account.go @@ -1,6 +1,6 @@ package service -import "nms_nbi/src/framework/vo" +import "nms_cxy/src/framework/vo" // 账号身份操作服务 服务层接口 type IAccount interface { diff --git a/src/modules/common/service/account.impl.go b/src/modules/common/service/account.impl.go index 3614173..d9a1631 100644 --- a/src/modules/common/service/account.impl.go +++ b/src/modules/common/service/account.impl.go @@ -4,16 +4,16 @@ import ( "fmt" "time" - "nms_nbi/src/framework/config" - adminConstants "nms_nbi/src/framework/constants/admin" - "nms_nbi/src/framework/constants/cachekey" - "nms_nbi/src/framework/constants/common" - "nms_nbi/src/framework/redis" - "nms_nbi/src/framework/utils/crypto" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/vo" - "nms_nbi/src/modules/system/model" - systemService "nms_nbi/src/modules/system/service" + "nms_cxy/src/framework/config" + adminConstants "nms_cxy/src/framework/constants/admin" + "nms_cxy/src/framework/constants/cachekey" + "nms_cxy/src/framework/constants/common" + "nms_cxy/src/framework/redis" + "nms_cxy/src/framework/utils/crypto" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/vo" + "nms_cxy/src/modules/system/model" + systemService "nms_cxy/src/modules/system/service" ) // 实例化服务层 AccountImpl 结构体 diff --git a/src/modules/common/service/commont.impl.go b/src/modules/common/service/commont.impl.go index c677ed7..42affd5 100644 --- a/src/modules/common/service/commont.impl.go +++ b/src/modules/common/service/commont.impl.go @@ -3,9 +3,9 @@ package service import ( "fmt" - "nms_nbi/lib/global" - "nms_nbi/src/framework/config" - systemService "nms_nbi/src/modules/system/service" + "nms_cxy/lib/global" + "nms_cxy/src/framework/config" + systemService "nms_cxy/src/modules/system/service" ) // 实例化服务层 CommontImpl 结构体 diff --git a/src/modules/common/service/register.impl.go b/src/modules/common/service/register.impl.go index a564a16..a292d1c 100644 --- a/src/modules/common/service/register.impl.go +++ b/src/modules/common/service/register.impl.go @@ -3,12 +3,12 @@ package service import ( "fmt" - "nms_nbi/src/framework/constants/cachekey" - "nms_nbi/src/framework/constants/common" - "nms_nbi/src/framework/redis" - "nms_nbi/src/framework/utils/parse" - systemModel "nms_nbi/src/modules/system/model" - systemService "nms_nbi/src/modules/system/service" + "nms_cxy/src/framework/constants/cachekey" + "nms_cxy/src/framework/constants/common" + "nms_cxy/src/framework/redis" + "nms_cxy/src/framework/utils/parse" + systemModel "nms_cxy/src/modules/system/model" + systemService "nms_cxy/src/modules/system/service" ) // 实例化服务层 RegisterImpl 结构体 diff --git a/src/modules/crontask/crontask.go b/src/modules/crontask/crontask.go index 7e8211c..2183908 100644 --- a/src/modules/crontask/crontask.go +++ b/src/modules/crontask/crontask.go @@ -1,8 +1,8 @@ package crontask import ( - "nms_nbi/src/framework/logger" - "nms_nbi/src/modules/crontask/processor" + "nms_cxy/src/framework/logger" + "nms_cxy/src/modules/crontask/processor" "github.com/gin-gonic/gin" ) diff --git a/src/modules/crontask/processor/backupEtcFromNE/backupEtcFromNE.go b/src/modules/crontask/processor/backupEtcFromNE/backupEtcFromNE.go index bdcc32d..0bcae18 100644 --- a/src/modules/crontask/processor/backupEtcFromNE/backupEtcFromNE.go +++ b/src/modules/crontask/processor/backupEtcFromNE/backupEtcFromNE.go @@ -6,11 +6,11 @@ import ( "strings" "time" - "nms_nbi/lib/dborm" - "nms_nbi/lib/global" - "nms_nbi/lib/log" - "nms_nbi/restagent/config" - "nms_nbi/src/framework/cron" + "nms_cxy/lib/dborm" + "nms_cxy/lib/global" + "nms_cxy/lib/log" + "nms_cxy/restagent/config" + "nms_cxy/src/framework/cron" ) var NewProcessor = &BarProcessor{ diff --git a/src/modules/crontask/processor/delExpiredNeBackup/delExpiredNeBackup.go b/src/modules/crontask/processor/delExpiredNeBackup/delExpiredNeBackup.go index f389d1e..a130344 100644 --- a/src/modules/crontask/processor/delExpiredNeBackup/delExpiredNeBackup.go +++ b/src/modules/crontask/processor/delExpiredNeBackup/delExpiredNeBackup.go @@ -4,9 +4,9 @@ import ( "encoding/json" "fmt" - "nms_nbi/lib/dborm" - "nms_nbi/lib/log" - "nms_nbi/src/framework/cron" + "nms_cxy/lib/dborm" + "nms_cxy/lib/log" + "nms_cxy/src/framework/cron" ) var NewProcessor = &BarProcessor{ diff --git a/src/modules/crontask/processor/deleteExpiredRecord/deleteExpiredRecord.go b/src/modules/crontask/processor/deleteExpiredRecord/deleteExpiredRecord.go index 8a0ea97..67cd919 100644 --- a/src/modules/crontask/processor/deleteExpiredRecord/deleteExpiredRecord.go +++ b/src/modules/crontask/processor/deleteExpiredRecord/deleteExpiredRecord.go @@ -4,9 +4,9 @@ import ( "encoding/json" "fmt" - "nms_nbi/lib/dborm" - "nms_nbi/lib/log" - "nms_nbi/src/framework/cron" + "nms_cxy/lib/dborm" + "nms_cxy/lib/log" + "nms_cxy/src/framework/cron" ) var NewProcessor = &BarProcessor{ diff --git a/src/modules/crontask/processor/genNeStateAlarm/genNeStateAlarm.go b/src/modules/crontask/processor/genNeStateAlarm/genNeStateAlarm.go index ff2ccfd..8e4b1be 100644 --- a/src/modules/crontask/processor/genNeStateAlarm/genNeStateAlarm.go +++ b/src/modules/crontask/processor/genNeStateAlarm/genNeStateAlarm.go @@ -8,12 +8,12 @@ import ( "strings" "time" - "nms_nbi/features/fm" - "nms_nbi/lib/dborm" - "nms_nbi/lib/global" - "nms_nbi/lib/log" - "nms_nbi/restagent/config" - "nms_nbi/src/framework/cron" + "nms_cxy/features/fm" + "nms_cxy/lib/dborm" + "nms_cxy/lib/global" + "nms_cxy/lib/log" + "nms_cxy/restagent/config" + "nms_cxy/src/framework/cron" "github.com/go-resty/resty/v2" ) diff --git a/src/modules/crontask/processor/getStateFromNE/getStateFromNE.go b/src/modules/crontask/processor/getStateFromNE/getStateFromNE.go index fc62959..686125b 100644 --- a/src/modules/crontask/processor/getStateFromNE/getStateFromNE.go +++ b/src/modules/crontask/processor/getStateFromNE/getStateFromNE.go @@ -7,10 +7,10 @@ import ( "strings" "time" - "nms_nbi/lib/dborm" - "nms_nbi/lib/log" - "nms_nbi/restagent/config" - "nms_nbi/src/framework/cron" + "nms_cxy/lib/dborm" + "nms_cxy/lib/log" + "nms_cxy/restagent/config" + "nms_cxy/src/framework/cron" "github.com/go-resty/resty/v2" ) diff --git a/src/modules/crontask/processor/monitor_sys_resource/monitor_sys_resource.go b/src/modules/crontask/processor/monitor_sys_resource/monitor_sys_resource.go index 6f3831f..19a1a27 100644 --- a/src/modules/crontask/processor/monitor_sys_resource/monitor_sys_resource.go +++ b/src/modules/crontask/processor/monitor_sys_resource/monitor_sys_resource.go @@ -4,9 +4,9 @@ import ( "encoding/json" "fmt" - "nms_nbi/src/framework/cron" - "nms_nbi/src/framework/logger" - monitorService "nms_nbi/src/modules/monitor/service" + "nms_cxy/src/framework/cron" + "nms_cxy/src/framework/logger" + monitorService "nms_cxy/src/modules/monitor/service" ) var NewProcessor = &MonitorSysResourceProcessor{ diff --git a/src/modules/crontask/processor/processor.go b/src/modules/crontask/processor/processor.go index 4e4b173..78df855 100644 --- a/src/modules/crontask/processor/processor.go +++ b/src/modules/crontask/processor/processor.go @@ -1,13 +1,13 @@ package processor import ( - "nms_nbi/src/framework/cron" - "nms_nbi/src/modules/crontask/processor/backupEtcFromNE" - "nms_nbi/src/modules/crontask/processor/delExpiredNeBackup" - "nms_nbi/src/modules/crontask/processor/deleteExpiredRecord" - "nms_nbi/src/modules/crontask/processor/genNeStateAlarm" - "nms_nbi/src/modules/crontask/processor/getStateFromNE" - monitorsysresource "nms_nbi/src/modules/crontask/processor/monitor_sys_resource" + "nms_cxy/src/framework/cron" + "nms_cxy/src/modules/crontask/processor/backupEtcFromNE" + "nms_cxy/src/modules/crontask/processor/delExpiredNeBackup" + "nms_cxy/src/modules/crontask/processor/deleteExpiredRecord" + "nms_cxy/src/modules/crontask/processor/genNeStateAlarm" + "nms_cxy/src/modules/crontask/processor/getStateFromNE" + monitorsysresource "nms_cxy/src/modules/crontask/processor/monitor_sys_resource" ) // InitCronQueue 初始定时任务队列 diff --git a/src/modules/monitor/controller/monitor.go b/src/modules/monitor/controller/monitor.go index 10b174f..64cfd89 100644 --- a/src/modules/monitor/controller/monitor.go +++ b/src/modules/monitor/controller/monitor.go @@ -1,10 +1,10 @@ package controller import ( - "nms_nbi/src/framework/i18n" - "nms_nbi/src/framework/utils/ctx" - "nms_nbi/src/framework/vo/result" - "nms_nbi/src/modules/monitor/service" + "nms_cxy/src/framework/i18n" + "nms_cxy/src/framework/utils/ctx" + "nms_cxy/src/framework/vo/result" + "nms_cxy/src/modules/monitor/service" "github.com/gin-gonic/gin" ) diff --git a/src/modules/monitor/controller/sys_cache.go b/src/modules/monitor/controller/sys_cache.go index 1500bac..7784c12 100644 --- a/src/modules/monitor/controller/sys_cache.go +++ b/src/modules/monitor/controller/sys_cache.go @@ -1,12 +1,12 @@ package controller import ( - "nms_nbi/src/framework/constants/cachekey" - "nms_nbi/src/framework/i18n" - "nms_nbi/src/framework/redis" - "nms_nbi/src/framework/utils/ctx" - "nms_nbi/src/framework/vo/result" - "nms_nbi/src/modules/monitor/model" + "nms_cxy/src/framework/constants/cachekey" + "nms_cxy/src/framework/i18n" + "nms_cxy/src/framework/redis" + "nms_cxy/src/framework/utils/ctx" + "nms_cxy/src/framework/vo/result" + "nms_cxy/src/modules/monitor/model" "github.com/gin-gonic/gin" ) diff --git a/src/modules/monitor/controller/sys_job.go b/src/modules/monitor/controller/sys_job.go index a1ea552..f8eaf11 100644 --- a/src/modules/monitor/controller/sys_job.go +++ b/src/modules/monitor/controller/sys_job.go @@ -7,14 +7,14 @@ import ( "strings" "time" - "nms_nbi/src/framework/i18n" - "nms_nbi/src/framework/utils/ctx" - "nms_nbi/src/framework/utils/file" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/vo/result" - "nms_nbi/src/modules/monitor/model" - "nms_nbi/src/modules/monitor/service" - systemService "nms_nbi/src/modules/system/service" + "nms_cxy/src/framework/i18n" + "nms_cxy/src/framework/utils/ctx" + "nms_cxy/src/framework/utils/file" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/vo/result" + "nms_cxy/src/modules/monitor/model" + "nms_cxy/src/modules/monitor/service" + systemService "nms_cxy/src/modules/system/service" "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" diff --git a/src/modules/monitor/controller/sys_job_log.go b/src/modules/monitor/controller/sys_job_log.go index 4816be2..6e89e0e 100644 --- a/src/modules/monitor/controller/sys_job_log.go +++ b/src/modules/monitor/controller/sys_job_log.go @@ -6,15 +6,15 @@ import ( "strings" "time" - "nms_nbi/src/framework/i18n" - "nms_nbi/src/framework/utils/ctx" - "nms_nbi/src/framework/utils/date" - "nms_nbi/src/framework/utils/file" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/vo/result" - "nms_nbi/src/modules/monitor/model" - "nms_nbi/src/modules/monitor/service" - systemService "nms_nbi/src/modules/system/service" + "nms_cxy/src/framework/i18n" + "nms_cxy/src/framework/utils/ctx" + "nms_cxy/src/framework/utils/date" + "nms_cxy/src/framework/utils/file" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/vo/result" + "nms_cxy/src/modules/monitor/model" + "nms_cxy/src/modules/monitor/service" + systemService "nms_cxy/src/modules/system/service" "github.com/gin-gonic/gin" ) diff --git a/src/modules/monitor/controller/sys_user_online.go b/src/modules/monitor/controller/sys_user_online.go index 942ab73..1b94ff9 100644 --- a/src/modules/monitor/controller/sys_user_online.go +++ b/src/modules/monitor/controller/sys_user_online.go @@ -5,14 +5,14 @@ import ( "sort" "strings" - "nms_nbi/src/framework/constants/cachekey" - "nms_nbi/src/framework/i18n" - "nms_nbi/src/framework/redis" - "nms_nbi/src/framework/utils/ctx" - "nms_nbi/src/framework/vo" - "nms_nbi/src/framework/vo/result" - "nms_nbi/src/modules/monitor/model" - "nms_nbi/src/modules/monitor/service" + "nms_cxy/src/framework/constants/cachekey" + "nms_cxy/src/framework/i18n" + "nms_cxy/src/framework/redis" + "nms_cxy/src/framework/utils/ctx" + "nms_cxy/src/framework/vo" + "nms_cxy/src/framework/vo/result" + "nms_cxy/src/modules/monitor/model" + "nms_cxy/src/modules/monitor/service" "github.com/gin-gonic/gin" ) diff --git a/src/modules/monitor/controller/system_info.go b/src/modules/monitor/controller/system_info.go index 009f1ab..0f12c0b 100644 --- a/src/modules/monitor/controller/system_info.go +++ b/src/modules/monitor/controller/system_info.go @@ -1,8 +1,8 @@ package controller import ( - "nms_nbi/src/framework/vo/result" - "nms_nbi/src/modules/monitor/service" + "nms_cxy/src/framework/vo/result" + "nms_cxy/src/modules/monitor/service" "github.com/gin-gonic/gin" ) diff --git a/src/modules/monitor/monitor.go b/src/modules/monitor/monitor.go index db4248f..c604634 100644 --- a/src/modules/monitor/monitor.go +++ b/src/modules/monitor/monitor.go @@ -1,13 +1,13 @@ package monitor import ( - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/middleware" - "nms_nbi/src/framework/middleware/collectlogs" - "nms_nbi/src/framework/middleware/repeat" - "nms_nbi/src/modules/monitor/controller" - "nms_nbi/src/modules/monitor/processor" - "nms_nbi/src/modules/monitor/service" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/middleware" + "nms_cxy/src/framework/middleware/collectlogs" + "nms_cxy/src/framework/middleware/repeat" + "nms_cxy/src/modules/monitor/controller" + "nms_cxy/src/modules/monitor/processor" + "nms_cxy/src/modules/monitor/service" "github.com/gin-gonic/gin" ) diff --git a/src/modules/monitor/processor/bar/bar.go b/src/modules/monitor/processor/bar/bar.go index fed56c9..df606c8 100644 --- a/src/modules/monitor/processor/bar/bar.go +++ b/src/modules/monitor/processor/bar/bar.go @@ -3,8 +3,8 @@ package bar import ( "time" - "nms_nbi/src/framework/cron" - "nms_nbi/src/framework/logger" + "nms_cxy/src/framework/cron" + "nms_cxy/src/framework/logger" ) var NewProcessor = &BarProcessor{ diff --git a/src/modules/monitor/processor/foo/foo.go b/src/modules/monitor/processor/foo/foo.go index 795c8e4..50dbab9 100644 --- a/src/modules/monitor/processor/foo/foo.go +++ b/src/modules/monitor/processor/foo/foo.go @@ -3,8 +3,8 @@ package foo import ( "time" - "nms_nbi/src/framework/cron" - "nms_nbi/src/framework/logger" + "nms_cxy/src/framework/cron" + "nms_cxy/src/framework/logger" ) var NewProcessor = &FooProcessor{ diff --git a/src/modules/monitor/processor/processor.go b/src/modules/monitor/processor/processor.go index f006925..afc86c0 100644 --- a/src/modules/monitor/processor/processor.go +++ b/src/modules/monitor/processor/processor.go @@ -1,10 +1,10 @@ package processor import ( - "nms_nbi/src/framework/cron" - "nms_nbi/src/modules/monitor/processor/bar" - "nms_nbi/src/modules/monitor/processor/foo" - "nms_nbi/src/modules/monitor/processor/simple" + "nms_cxy/src/framework/cron" + "nms_cxy/src/modules/monitor/processor/bar" + "nms_cxy/src/modules/monitor/processor/foo" + "nms_cxy/src/modules/monitor/processor/simple" ) // InitCronQueue 初始定时任务队列 diff --git a/src/modules/monitor/processor/simple/simple.go b/src/modules/monitor/processor/simple/simple.go index f5c0c56..8d87e6e 100644 --- a/src/modules/monitor/processor/simple/simple.go +++ b/src/modules/monitor/processor/simple/simple.go @@ -1,8 +1,8 @@ package simple import ( - "nms_nbi/src/framework/cron" - "nms_nbi/src/framework/logger" + "nms_cxy/src/framework/cron" + "nms_cxy/src/framework/logger" ) var NewProcessor = &simpleProcessor{} diff --git a/src/modules/monitor/repository/monitor.go b/src/modules/monitor/repository/monitor.go index 59f3315..cba98cc 100644 --- a/src/modules/monitor/repository/monitor.go +++ b/src/modules/monitor/repository/monitor.go @@ -1,6 +1,6 @@ package repository -import "nms_nbi/src/modules/monitor/model" +import "nms_cxy/src/modules/monitor/model" // IMonitor 监控服务资源相关信息 数据接口 type IMonitor interface { diff --git a/src/modules/monitor/repository/monitor.impl.go b/src/modules/monitor/repository/monitor.impl.go index 9fd4ca7..ba7ced3 100644 --- a/src/modules/monitor/repository/monitor.impl.go +++ b/src/modules/monitor/repository/monitor.impl.go @@ -1,9 +1,9 @@ package repository import ( - "nms_nbi/src/framework/datasource" - "nms_nbi/src/framework/logger" - "nms_nbi/src/modules/monitor/model" + "nms_cxy/src/framework/datasource" + "nms_cxy/src/framework/logger" + "nms_cxy/src/modules/monitor/model" "gorm.io/gorm" ) diff --git a/src/modules/monitor/repository/sys_job.go b/src/modules/monitor/repository/sys_job.go index 3bebce4..5a9a6ff 100644 --- a/src/modules/monitor/repository/sys_job.go +++ b/src/modules/monitor/repository/sys_job.go @@ -1,7 +1,7 @@ package repository import ( - "nms_nbi/src/modules/monitor/model" + "nms_cxy/src/modules/monitor/model" ) // ISysJob 调度任务表 数据层接口 diff --git a/src/modules/monitor/repository/sys_job.impl.go b/src/modules/monitor/repository/sys_job.impl.go index 7aa8794..075a1e0 100644 --- a/src/modules/monitor/repository/sys_job.impl.go +++ b/src/modules/monitor/repository/sys_job.impl.go @@ -5,11 +5,11 @@ import ( "strings" "time" - "nms_nbi/src/framework/datasource" - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/utils/repo" - "nms_nbi/src/modules/monitor/model" + "nms_cxy/src/framework/datasource" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/utils/repo" + "nms_cxy/src/modules/monitor/model" ) // 实例化数据层 SysJobImpl 结构体 diff --git a/src/modules/monitor/repository/sys_job_log.go b/src/modules/monitor/repository/sys_job_log.go index 74b86e5..11ffa07 100644 --- a/src/modules/monitor/repository/sys_job_log.go +++ b/src/modules/monitor/repository/sys_job_log.go @@ -1,7 +1,7 @@ package repository import ( - "nms_nbi/src/modules/monitor/model" + "nms_cxy/src/modules/monitor/model" ) // 调度任务日志表 数据层接口 diff --git a/src/modules/monitor/repository/sys_job_log.impl.go b/src/modules/monitor/repository/sys_job_log.impl.go index fd6b475..1e54c88 100644 --- a/src/modules/monitor/repository/sys_job_log.impl.go +++ b/src/modules/monitor/repository/sys_job_log.impl.go @@ -4,12 +4,12 @@ import ( "strings" "time" - "nms_nbi/src/framework/datasource" - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/utils/date" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/utils/repo" - "nms_nbi/src/modules/monitor/model" + "nms_cxy/src/framework/datasource" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/utils/date" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/utils/repo" + "nms_cxy/src/modules/monitor/model" ) // 实例化数据层 SysJobLogImpl 结构体 diff --git a/src/modules/monitor/service/monitor.impl.go b/src/modules/monitor/service/monitor.impl.go index d001307..c2b9efa 100644 --- a/src/modules/monitor/service/monitor.impl.go +++ b/src/modules/monitor/service/monitor.impl.go @@ -5,10 +5,10 @@ import ( "strconv" "time" - "nms_nbi/src/framework/logger" - "nms_nbi/src/modules/monitor/model" - "nms_nbi/src/modules/monitor/repository" - systemService "nms_nbi/src/modules/system/service" + "nms_cxy/src/framework/logger" + "nms_cxy/src/modules/monitor/model" + "nms_cxy/src/modules/monitor/repository" + systemService "nms_cxy/src/modules/system/service" "github.com/shirou/gopsutil/v3/cpu" "github.com/shirou/gopsutil/v3/disk" diff --git a/src/modules/monitor/service/sys_job.go b/src/modules/monitor/service/sys_job.go index 71fe196..999da23 100644 --- a/src/modules/monitor/service/sys_job.go +++ b/src/modules/monitor/service/sys_job.go @@ -1,7 +1,7 @@ package service import ( - "nms_nbi/src/modules/monitor/model" + "nms_cxy/src/modules/monitor/model" ) // ISysJob 调度任务信息 服务层接口 diff --git a/src/modules/monitor/service/sys_job.impl.go b/src/modules/monitor/service/sys_job.impl.go index 5a63241..c590155 100644 --- a/src/modules/monitor/service/sys_job.impl.go +++ b/src/modules/monitor/service/sys_job.impl.go @@ -3,10 +3,10 @@ package service import ( "fmt" - "nms_nbi/src/framework/constants/common" - "nms_nbi/src/framework/cron" - "nms_nbi/src/modules/monitor/model" - "nms_nbi/src/modules/monitor/repository" + "nms_cxy/src/framework/constants/common" + "nms_cxy/src/framework/cron" + "nms_cxy/src/modules/monitor/model" + "nms_cxy/src/modules/monitor/repository" ) // 实例化服务层 SysJobImpl 结构体 diff --git a/src/modules/monitor/service/sys_job_log.go b/src/modules/monitor/service/sys_job_log.go index 227a4ef..734a52d 100644 --- a/src/modules/monitor/service/sys_job_log.go +++ b/src/modules/monitor/service/sys_job_log.go @@ -1,7 +1,7 @@ package service import ( - "nms_nbi/src/modules/monitor/model" + "nms_cxy/src/modules/monitor/model" ) // ISysJobLog 调度任务日志 服务层接口 diff --git a/src/modules/monitor/service/sys_job_log.impl.go b/src/modules/monitor/service/sys_job_log.impl.go index d9ff155..37fb299 100644 --- a/src/modules/monitor/service/sys_job_log.impl.go +++ b/src/modules/monitor/service/sys_job_log.impl.go @@ -1,8 +1,8 @@ package service import ( - "nms_nbi/src/modules/monitor/model" - "nms_nbi/src/modules/monitor/repository" + "nms_cxy/src/modules/monitor/model" + "nms_cxy/src/modules/monitor/repository" ) // 实例化服务层 SysJobLogImpl 结构体 diff --git a/src/modules/monitor/service/sys_user_online.go b/src/modules/monitor/service/sys_user_online.go index c26a83e..12fa956 100644 --- a/src/modules/monitor/service/sys_user_online.go +++ b/src/modules/monitor/service/sys_user_online.go @@ -1,8 +1,8 @@ package service import ( - "nms_nbi/src/framework/vo" - "nms_nbi/src/modules/monitor/model" + "nms_cxy/src/framework/vo" + "nms_cxy/src/modules/monitor/model" ) // ISysUserOnline 在线用户 服务层接口 diff --git a/src/modules/monitor/service/sys_user_online.impl.go b/src/modules/monitor/service/sys_user_online.impl.go index 75b4f73..c90f61b 100644 --- a/src/modules/monitor/service/sys_user_online.impl.go +++ b/src/modules/monitor/service/sys_user_online.impl.go @@ -1,8 +1,8 @@ package service import ( - "nms_nbi/src/framework/vo" - "nms_nbi/src/modules/monitor/model" + "nms_cxy/src/framework/vo" + "nms_cxy/src/modules/monitor/model" ) // 实例化服务层 SysUserOnlineImpl 结构体 diff --git a/src/modules/monitor/service/system_info.impl.go b/src/modules/monitor/service/system_info.impl.go index ef31b3e..98dc237 100644 --- a/src/modules/monitor/service/system_info.impl.go +++ b/src/modules/monitor/service/system_info.impl.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "nms_nbi/src/framework/config" - "nms_nbi/src/framework/utils/parse" + "nms_cxy/src/framework/config" + "nms_cxy/src/framework/utils/parse" "github.com/shirou/gopsutil/v3/cpu" "github.com/shirou/gopsutil/v3/disk" diff --git a/src/modules/network_data/controller/alarm.go b/src/modules/network_data/controller/alarm.go index 866db69..8e8212c 100644 --- a/src/modules/network_data/controller/alarm.go +++ b/src/modules/network_data/controller/alarm.go @@ -3,13 +3,13 @@ package controller import ( "strings" - "nms_nbi/src/framework/i18n" - "nms_nbi/src/framework/utils/ctx" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/vo/result" - "nms_nbi/src/modules/network_data/model" - neDataService "nms_nbi/src/modules/network_data/service" - neService "nms_nbi/src/modules/network_element/service" + "nms_cxy/src/framework/i18n" + "nms_cxy/src/framework/utils/ctx" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/vo/result" + "nms_cxy/src/modules/network_data/model" + neDataService "nms_cxy/src/modules/network_data/service" + neService "nms_cxy/src/modules/network_element/service" "github.com/gin-gonic/gin" ) diff --git a/src/modules/network_data/controller/amf.go b/src/modules/network_data/controller/amf.go index 7fd225b..f019d1d 100644 --- a/src/modules/network_data/controller/amf.go +++ b/src/modules/network_data/controller/amf.go @@ -3,13 +3,13 @@ package controller import ( "strings" - "nms_nbi/src/framework/i18n" - "nms_nbi/src/framework/utils/ctx" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/vo/result" - "nms_nbi/src/modules/network_data/model" - neDataService "nms_nbi/src/modules/network_data/service" - neService "nms_nbi/src/modules/network_element/service" + "nms_cxy/src/framework/i18n" + "nms_cxy/src/framework/utils/ctx" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/vo/result" + "nms_cxy/src/modules/network_data/model" + neDataService "nms_cxy/src/modules/network_data/service" + neService "nms_cxy/src/modules/network_element/service" "github.com/gin-gonic/gin" ) diff --git a/src/modules/network_data/controller/ims.go b/src/modules/network_data/controller/ims.go index 6655521..079164d 100644 --- a/src/modules/network_data/controller/ims.go +++ b/src/modules/network_data/controller/ims.go @@ -3,13 +3,13 @@ package controller import ( "strings" - "nms_nbi/src/framework/i18n" - "nms_nbi/src/framework/utils/ctx" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/vo/result" - "nms_nbi/src/modules/network_data/model" - neDataService "nms_nbi/src/modules/network_data/service" - neService "nms_nbi/src/modules/network_element/service" + "nms_cxy/src/framework/i18n" + "nms_cxy/src/framework/utils/ctx" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/vo/result" + "nms_cxy/src/modules/network_data/model" + neDataService "nms_cxy/src/modules/network_data/service" + neService "nms_cxy/src/modules/network_element/service" "github.com/gin-gonic/gin" ) diff --git a/src/modules/network_data/controller/perf_kpi.go b/src/modules/network_data/controller/perf_kpi.go index 2d7f5f0..33eb9ab 100644 --- a/src/modules/network_data/controller/perf_kpi.go +++ b/src/modules/network_data/controller/perf_kpi.go @@ -1,13 +1,13 @@ package controller import ( - "nms_nbi/lib/core/utils/date" - "nms_nbi/src/framework/i18n" - "nms_nbi/src/framework/utils/ctx" - "nms_nbi/src/framework/vo/result" - "nms_nbi/src/modules/network_data/model" - neDataService "nms_nbi/src/modules/network_data/service" - neService "nms_nbi/src/modules/network_element/service" + "nms_cxy/lib/core/utils/date" + "nms_cxy/src/framework/i18n" + "nms_cxy/src/framework/utils/ctx" + "nms_cxy/src/framework/vo/result" + "nms_cxy/src/modules/network_data/model" + neDataService "nms_cxy/src/modules/network_data/service" + neService "nms_cxy/src/modules/network_element/service" "github.com/gin-gonic/gin" ) diff --git a/src/modules/network_data/controller/upf.go b/src/modules/network_data/controller/upf.go index 05ceabb..cc5005f 100644 --- a/src/modules/network_data/controller/upf.go +++ b/src/modules/network_data/controller/upf.go @@ -1,11 +1,11 @@ package controller import ( - "nms_nbi/src/framework/i18n" - "nms_nbi/src/framework/utils/ctx" - "nms_nbi/src/framework/vo/result" - neDataService "nms_nbi/src/modules/network_data/service" - neService "nms_nbi/src/modules/network_element/service" + "nms_cxy/src/framework/i18n" + "nms_cxy/src/framework/utils/ctx" + "nms_cxy/src/framework/vo/result" + neDataService "nms_cxy/src/modules/network_data/service" + neService "nms_cxy/src/modules/network_element/service" "github.com/gin-gonic/gin" ) diff --git a/src/modules/network_data/network_data.go b/src/modules/network_data/network_data.go index 2391200..e888bdc 100644 --- a/src/modules/network_data/network_data.go +++ b/src/modules/network_data/network_data.go @@ -1,10 +1,10 @@ package networkdata import ( - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/middleware" - "nms_nbi/src/framework/middleware/collectlogs" - "nms_nbi/src/modules/network_data/controller" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/middleware" + "nms_cxy/src/framework/middleware/collectlogs" + "nms_cxy/src/modules/network_data/controller" "github.com/gin-gonic/gin" ) diff --git a/src/modules/network_data/repository/alarm.go b/src/modules/network_data/repository/alarm.go index da97f5d..7d3e324 100644 --- a/src/modules/network_data/repository/alarm.go +++ b/src/modules/network_data/repository/alarm.go @@ -1,6 +1,6 @@ package repository -import "nms_nbi/src/modules/network_data/model" +import "nms_cxy/src/modules/network_data/model" // 告警 数据层接口 type IAlarm interface { diff --git a/src/modules/network_data/repository/alarm.impl.go b/src/modules/network_data/repository/alarm.impl.go index 69e12cb..7343396 100644 --- a/src/modules/network_data/repository/alarm.impl.go +++ b/src/modules/network_data/repository/alarm.impl.go @@ -4,11 +4,11 @@ import ( "fmt" "strings" - "nms_nbi/src/framework/datasource" - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/utils/repo" - "nms_nbi/src/modules/network_data/model" + "nms_cxy/src/framework/datasource" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/utils/repo" + "nms_cxy/src/modules/network_data/model" ) // 实例化数据层 AlarmImpl 结构体 diff --git a/src/modules/network_data/repository/cdr_event.go b/src/modules/network_data/repository/cdr_event.go index 534903a..cb86655 100644 --- a/src/modules/network_data/repository/cdr_event.go +++ b/src/modules/network_data/repository/cdr_event.go @@ -1,6 +1,6 @@ package repository -import "nms_nbi/src/modules/network_data/model" +import "nms_cxy/src/modules/network_data/model" // CDR会话事件 数据层接口 type ICDREvent interface { diff --git a/src/modules/network_data/repository/cdr_event.impl.go b/src/modules/network_data/repository/cdr_event.impl.go index 3fa5605..45d8391 100644 --- a/src/modules/network_data/repository/cdr_event.impl.go +++ b/src/modules/network_data/repository/cdr_event.impl.go @@ -4,12 +4,12 @@ import ( "fmt" "strings" - "nms_nbi/src/framework/datasource" - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/utils/date" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/utils/repo" - "nms_nbi/src/modules/network_data/model" + "nms_cxy/src/framework/datasource" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/utils/date" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/utils/repo" + "nms_cxy/src/modules/network_data/model" ) // 实例化数据层 CDREventImpl 结构体 diff --git a/src/modules/network_data/repository/perf_kpi.go b/src/modules/network_data/repository/perf_kpi.go index 914704d..ec2e302 100644 --- a/src/modules/network_data/repository/perf_kpi.go +++ b/src/modules/network_data/repository/perf_kpi.go @@ -1,6 +1,6 @@ package repository -import "nms_nbi/src/modules/network_data/model" +import "nms_cxy/src/modules/network_data/model" // 性能统计 数据层接口 type IPerfKPI interface { diff --git a/src/modules/network_data/repository/perf_kpi.impl.go b/src/modules/network_data/repository/perf_kpi.impl.go index 2272ead..4010e6d 100644 --- a/src/modules/network_data/repository/perf_kpi.impl.go +++ b/src/modules/network_data/repository/perf_kpi.impl.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "nms_nbi/src/framework/datasource" - "nms_nbi/src/framework/logger" - "nms_nbi/src/modules/network_data/model" + "nms_cxy/src/framework/datasource" + "nms_cxy/src/framework/logger" + "nms_cxy/src/modules/network_data/model" ) // 实例化数据层 PerfKPIImpl 结构体 diff --git a/src/modules/network_data/repository/ue_event.go b/src/modules/network_data/repository/ue_event.go index 5457af5..ced87de 100644 --- a/src/modules/network_data/repository/ue_event.go +++ b/src/modules/network_data/repository/ue_event.go @@ -1,6 +1,6 @@ package repository -import "nms_nbi/src/modules/network_data/model" +import "nms_cxy/src/modules/network_data/model" // UE会话事件 数据层接口 type IUEEvent interface { diff --git a/src/modules/network_data/repository/ue_event.impl.go b/src/modules/network_data/repository/ue_event.impl.go index 3630f1f..ec64605 100644 --- a/src/modules/network_data/repository/ue_event.impl.go +++ b/src/modules/network_data/repository/ue_event.impl.go @@ -4,12 +4,12 @@ import ( "fmt" "strings" - "nms_nbi/src/framework/datasource" - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/utils/date" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/utils/repo" - "nms_nbi/src/modules/network_data/model" + "nms_cxy/src/framework/datasource" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/utils/date" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/utils/repo" + "nms_cxy/src/modules/network_data/model" ) // 实例化数据层 UEEventImpl 结构体 diff --git a/src/modules/network_data/service/alarm.go b/src/modules/network_data/service/alarm.go index d9a1af4..8ff85be 100644 --- a/src/modules/network_data/service/alarm.go +++ b/src/modules/network_data/service/alarm.go @@ -1,6 +1,6 @@ package service -import "nms_nbi/src/modules/network_data/model" +import "nms_cxy/src/modules/network_data/model" // 告警 服务层接口 type IAlarm interface { diff --git a/src/modules/network_data/service/alarm.impl.go b/src/modules/network_data/service/alarm.impl.go index a6d3946..90c4e01 100644 --- a/src/modules/network_data/service/alarm.impl.go +++ b/src/modules/network_data/service/alarm.impl.go @@ -3,8 +3,8 @@ package service import ( "fmt" - "nms_nbi/src/modules/network_data/model" - "nms_nbi/src/modules/network_data/repository" + "nms_cxy/src/modules/network_data/model" + "nms_cxy/src/modules/network_data/repository" ) // 实例化数据层 AlarmImpl 结构体 diff --git a/src/modules/network_data/service/cdr_event.go b/src/modules/network_data/service/cdr_event.go index 6889d6b..5323a0b 100644 --- a/src/modules/network_data/service/cdr_event.go +++ b/src/modules/network_data/service/cdr_event.go @@ -1,6 +1,6 @@ package service -import "nms_nbi/src/modules/network_data/model" +import "nms_cxy/src/modules/network_data/model" // CDR会话事件 服务层接口 type ICDREvent interface { diff --git a/src/modules/network_data/service/cdr_event.impl.go b/src/modules/network_data/service/cdr_event.impl.go index 4aac465..2249041 100644 --- a/src/modules/network_data/service/cdr_event.impl.go +++ b/src/modules/network_data/service/cdr_event.impl.go @@ -3,8 +3,8 @@ package service import ( "fmt" - "nms_nbi/src/modules/network_data/model" - "nms_nbi/src/modules/network_data/repository" + "nms_cxy/src/modules/network_data/model" + "nms_cxy/src/modules/network_data/repository" ) // 实例化数据层 CDREventImpl 结构体 diff --git a/src/modules/network_data/service/perf_kpi.go b/src/modules/network_data/service/perf_kpi.go index a8b6919..00fbe35 100644 --- a/src/modules/network_data/service/perf_kpi.go +++ b/src/modules/network_data/service/perf_kpi.go @@ -1,6 +1,6 @@ package service -import "nms_nbi/src/modules/network_data/model" +import "nms_cxy/src/modules/network_data/model" // 性能统计 服务层接口 type IPerfKPI interface { diff --git a/src/modules/network_data/service/perf_kpi.impl.go b/src/modules/network_data/service/perf_kpi.impl.go index e56ddba..875242a 100644 --- a/src/modules/network_data/service/perf_kpi.impl.go +++ b/src/modules/network_data/service/perf_kpi.impl.go @@ -5,10 +5,10 @@ import ( "fmt" "time" - "nms_nbi/src/framework/constants/cachekey" - "nms_nbi/src/framework/redis" - "nms_nbi/src/modules/network_data/model" - "nms_nbi/src/modules/network_data/repository" + "nms_cxy/src/framework/constants/cachekey" + "nms_cxy/src/framework/redis" + "nms_cxy/src/modules/network_data/model" + "nms_cxy/src/modules/network_data/repository" ) // 实例化数据层 PerfKPIImpl 结构体 diff --git a/src/modules/network_data/service/ue_event.go b/src/modules/network_data/service/ue_event.go index cbab248..ed0097b 100644 --- a/src/modules/network_data/service/ue_event.go +++ b/src/modules/network_data/service/ue_event.go @@ -1,6 +1,6 @@ package service -import "nms_nbi/src/modules/network_data/model" +import "nms_cxy/src/modules/network_data/model" // UE会话事件 服务层接口 type IUEEvent interface { diff --git a/src/modules/network_data/service/ue_event.impl.go b/src/modules/network_data/service/ue_event.impl.go index 4443898..38d18c6 100644 --- a/src/modules/network_data/service/ue_event.impl.go +++ b/src/modules/network_data/service/ue_event.impl.go @@ -3,8 +3,8 @@ package service import ( "fmt" - "nms_nbi/src/modules/network_data/model" - "nms_nbi/src/modules/network_data/repository" + "nms_cxy/src/modules/network_data/model" + "nms_cxy/src/modules/network_data/repository" ) // 实例化数据层 UEEventImpl 结构体 diff --git a/src/modules/network_element/controller/ne_action.go b/src/modules/network_element/controller/ne_action.go index 22b9eae..2deb715 100644 --- a/src/modules/network_element/controller/ne_action.go +++ b/src/modules/network_element/controller/ne_action.go @@ -5,12 +5,12 @@ import ( "path/filepath" "strings" - "nms_nbi/src/framework/i18n" - "nms_nbi/src/framework/utils/ctx" - "nms_nbi/src/framework/utils/file" - "nms_nbi/src/framework/utils/ssh" - "nms_nbi/src/framework/vo/result" - neService "nms_nbi/src/modules/network_element/service" + "nms_cxy/src/framework/i18n" + "nms_cxy/src/framework/utils/ctx" + "nms_cxy/src/framework/utils/file" + "nms_cxy/src/framework/utils/ssh" + "nms_cxy/src/framework/vo/result" + neService "nms_cxy/src/modules/network_element/service" "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" diff --git a/src/modules/network_element/controller/ne_host.go b/src/modules/network_element/controller/ne_host.go index cdce60c..1fab3e8 100644 --- a/src/modules/network_element/controller/ne_host.go +++ b/src/modules/network_element/controller/ne_host.go @@ -3,14 +3,14 @@ package controller import ( "strings" - "nms_nbi/src/framework/i18n" - "nms_nbi/src/framework/utils/ctx" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/utils/ssh" - "nms_nbi/src/framework/utils/telnet" - "nms_nbi/src/framework/vo/result" - "nms_nbi/src/modules/network_element/model" - neService "nms_nbi/src/modules/network_element/service" + "nms_cxy/src/framework/i18n" + "nms_cxy/src/framework/utils/ctx" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/utils/ssh" + "nms_cxy/src/framework/utils/telnet" + "nms_cxy/src/framework/vo/result" + "nms_cxy/src/modules/network_element/model" + neService "nms_cxy/src/modules/network_element/service" "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" diff --git a/src/modules/network_element/controller/ne_host_cmd.go b/src/modules/network_element/controller/ne_host_cmd.go index 8aa8dd1..884e224 100644 --- a/src/modules/network_element/controller/ne_host_cmd.go +++ b/src/modules/network_element/controller/ne_host_cmd.go @@ -3,12 +3,12 @@ package controller import ( "strings" - "nms_nbi/src/framework/i18n" - "nms_nbi/src/framework/utils/ctx" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/vo/result" - "nms_nbi/src/modules/network_element/model" - neService "nms_nbi/src/modules/network_element/service" + "nms_cxy/src/framework/i18n" + "nms_cxy/src/framework/utils/ctx" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/vo/result" + "nms_cxy/src/modules/network_element/model" + neService "nms_cxy/src/modules/network_element/service" "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" diff --git a/src/modules/network_element/controller/ne_info.go b/src/modules/network_element/controller/ne_info.go index 5843147..3e71490 100644 --- a/src/modules/network_element/controller/ne_info.go +++ b/src/modules/network_element/controller/ne_info.go @@ -5,12 +5,12 @@ import ( "strings" "sync" - "nms_nbi/src/framework/i18n" - "nms_nbi/src/framework/utils/ctx" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/vo/result" - "nms_nbi/src/modules/network_element/model" - neService "nms_nbi/src/modules/network_element/service" + "nms_cxy/src/framework/i18n" + "nms_cxy/src/framework/utils/ctx" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/vo/result" + "nms_cxy/src/modules/network_element/model" + neService "nms_cxy/src/modules/network_element/service" "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" diff --git a/src/modules/network_element/controller/ne_software.go b/src/modules/network_element/controller/ne_software.go index ecf8386..934af8d 100644 --- a/src/modules/network_element/controller/ne_software.go +++ b/src/modules/network_element/controller/ne_software.go @@ -3,12 +3,12 @@ package controller import ( "strings" - "nms_nbi/src/framework/i18n" - "nms_nbi/src/framework/utils/ctx" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/vo/result" - "nms_nbi/src/modules/network_element/model" - neService "nms_nbi/src/modules/network_element/service" + "nms_cxy/src/framework/i18n" + "nms_cxy/src/framework/utils/ctx" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/vo/result" + "nms_cxy/src/modules/network_element/model" + neService "nms_cxy/src/modules/network_element/service" "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" diff --git a/src/modules/network_element/controller/ne_version.go b/src/modules/network_element/controller/ne_version.go index 9923405..cb32f47 100644 --- a/src/modules/network_element/controller/ne_version.go +++ b/src/modules/network_element/controller/ne_version.go @@ -3,12 +3,12 @@ package controller import ( "strings" - "nms_nbi/src/framework/i18n" - "nms_nbi/src/framework/utils/ctx" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/vo/result" - "nms_nbi/src/modules/network_element/model" - neService "nms_nbi/src/modules/network_element/service" + "nms_cxy/src/framework/i18n" + "nms_cxy/src/framework/utils/ctx" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/vo/result" + "nms_cxy/src/modules/network_element/model" + neService "nms_cxy/src/modules/network_element/service" "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" diff --git a/src/modules/network_element/controller/udm_auth.go b/src/modules/network_element/controller/udm_auth.go index 6a2bb1a..10d5272 100644 --- a/src/modules/network_element/controller/udm_auth.go +++ b/src/modules/network_element/controller/udm_auth.go @@ -5,16 +5,16 @@ import ( "strings" "time" - mmlclient "nms_nbi/lib/core/mml_client" - "nms_nbi/src/framework/constants/uploadsubpath" - "nms_nbi/src/framework/i18n" - "nms_nbi/src/framework/utils/ctx" - "nms_nbi/src/framework/utils/file" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/utils/ssh" - "nms_nbi/src/framework/vo/result" - "nms_nbi/src/modules/network_element/model" - neService "nms_nbi/src/modules/network_element/service" + mmlclient "nms_cxy/lib/core/mml_client" + "nms_cxy/src/framework/constants/uploadsubpath" + "nms_cxy/src/framework/i18n" + "nms_cxy/src/framework/utils/ctx" + "nms_cxy/src/framework/utils/file" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/utils/ssh" + "nms_cxy/src/framework/vo/result" + "nms_cxy/src/modules/network_element/model" + neService "nms_cxy/src/modules/network_element/service" "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" diff --git a/src/modules/network_element/controller/udm_sub.go b/src/modules/network_element/controller/udm_sub.go index 575d246..e38e84f 100644 --- a/src/modules/network_element/controller/udm_sub.go +++ b/src/modules/network_element/controller/udm_sub.go @@ -6,16 +6,16 @@ import ( "strings" "time" - mmlclient "nms_nbi/lib/core/mml_client" - "nms_nbi/src/framework/constants/uploadsubpath" - "nms_nbi/src/framework/i18n" - "nms_nbi/src/framework/utils/ctx" - "nms_nbi/src/framework/utils/file" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/utils/ssh" - "nms_nbi/src/framework/vo/result" - "nms_nbi/src/modules/network_element/model" - neService "nms_nbi/src/modules/network_element/service" + mmlclient "nms_cxy/lib/core/mml_client" + "nms_cxy/src/framework/constants/uploadsubpath" + "nms_cxy/src/framework/i18n" + "nms_cxy/src/framework/utils/ctx" + "nms_cxy/src/framework/utils/file" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/utils/ssh" + "nms_cxy/src/framework/vo/result" + "nms_cxy/src/modules/network_element/model" + neService "nms_cxy/src/modules/network_element/service" "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" diff --git a/src/modules/network_element/network_element.go b/src/modules/network_element/network_element.go index ee1453f..2c53d53 100644 --- a/src/modules/network_element/network_element.go +++ b/src/modules/network_element/network_element.go @@ -1,12 +1,12 @@ package networkelement import ( - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/middleware" - "nms_nbi/src/framework/middleware/collectlogs" - "nms_nbi/src/framework/middleware/repeat" - "nms_nbi/src/modules/network_element/controller" - "nms_nbi/src/modules/network_element/service" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/middleware" + "nms_cxy/src/framework/middleware/collectlogs" + "nms_cxy/src/framework/middleware/repeat" + "nms_cxy/src/modules/network_element/controller" + "nms_cxy/src/modules/network_element/service" "github.com/gin-gonic/gin" ) diff --git a/src/modules/network_element/repository/ne_host.go b/src/modules/network_element/repository/ne_host.go index d4ee631..a519d9b 100644 --- a/src/modules/network_element/repository/ne_host.go +++ b/src/modules/network_element/repository/ne_host.go @@ -1,6 +1,6 @@ package repository -import "nms_nbi/src/modules/network_element/model" +import "nms_cxy/src/modules/network_element/model" // INeHost 网元主机连接 数据层接口 type INeHost interface { diff --git a/src/modules/network_element/repository/ne_host.impl.go b/src/modules/network_element/repository/ne_host.impl.go index 6f42ee5..68bfa1a 100644 --- a/src/modules/network_element/repository/ne_host.impl.go +++ b/src/modules/network_element/repository/ne_host.impl.go @@ -5,12 +5,12 @@ import ( "strings" "time" - "nms_nbi/src/framework/datasource" - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/utils/crypto" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/utils/repo" - "nms_nbi/src/modules/network_element/model" + "nms_cxy/src/framework/datasource" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/utils/crypto" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/utils/repo" + "nms_cxy/src/modules/network_element/model" ) // 实例化数据层 NewNeHostImpl 结构体 diff --git a/src/modules/network_element/repository/ne_host_cmd.go b/src/modules/network_element/repository/ne_host_cmd.go index 437e66b..18245ba 100644 --- a/src/modules/network_element/repository/ne_host_cmd.go +++ b/src/modules/network_element/repository/ne_host_cmd.go @@ -1,6 +1,6 @@ package repository -import "nms_nbi/src/modules/network_element/model" +import "nms_cxy/src/modules/network_element/model" // INeHostCmd 网元主机命令 数据层接口 type INeHostCmd interface { diff --git a/src/modules/network_element/repository/ne_host_cmd.impl.go b/src/modules/network_element/repository/ne_host_cmd.impl.go index 84b3302..4e0e1a5 100644 --- a/src/modules/network_element/repository/ne_host_cmd.impl.go +++ b/src/modules/network_element/repository/ne_host_cmd.impl.go @@ -5,11 +5,11 @@ import ( "strings" "time" - "nms_nbi/src/framework/datasource" - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/utils/repo" - "nms_nbi/src/modules/network_element/model" + "nms_cxy/src/framework/datasource" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/utils/repo" + "nms_cxy/src/modules/network_element/model" ) // 实例化数据层 NewNeHostCmdImpl 结构体 diff --git a/src/modules/network_element/repository/ne_info.go b/src/modules/network_element/repository/ne_info.go index 01d2cbd..0b90832 100644 --- a/src/modules/network_element/repository/ne_info.go +++ b/src/modules/network_element/repository/ne_info.go @@ -1,7 +1,7 @@ package repository import ( - "nms_nbi/src/modules/network_element/model" + "nms_cxy/src/modules/network_element/model" ) // 网元信息 数据层接口 diff --git a/src/modules/network_element/repository/ne_info.impl.go b/src/modules/network_element/repository/ne_info.impl.go index f922256..fb4921c 100644 --- a/src/modules/network_element/repository/ne_info.impl.go +++ b/src/modules/network_element/repository/ne_info.impl.go @@ -6,11 +6,11 @@ import ( "strings" "time" - "nms_nbi/src/framework/datasource" - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/utils/repo" - "nms_nbi/src/modules/network_element/model" + "nms_cxy/src/framework/datasource" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/utils/repo" + "nms_cxy/src/modules/network_element/model" ) // neListSort 网元列表预设排序 diff --git a/src/modules/network_element/repository/ne_software.go b/src/modules/network_element/repository/ne_software.go index 83d50f4..dd2c574 100644 --- a/src/modules/network_element/repository/ne_software.go +++ b/src/modules/network_element/repository/ne_software.go @@ -1,6 +1,6 @@ package repository -import "nms_nbi/src/modules/network_element/model" +import "nms_cxy/src/modules/network_element/model" // INeSoftware 网元软件包信息 数据层接口 type INeSoftware interface { diff --git a/src/modules/network_element/repository/ne_software.impl.go b/src/modules/network_element/repository/ne_software.impl.go index fb1df1d..769f3a4 100644 --- a/src/modules/network_element/repository/ne_software.impl.go +++ b/src/modules/network_element/repository/ne_software.impl.go @@ -5,11 +5,11 @@ import ( "strings" "time" - "nms_nbi/src/framework/datasource" - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/utils/repo" - "nms_nbi/src/modules/network_element/model" + "nms_cxy/src/framework/datasource" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/utils/repo" + "nms_cxy/src/modules/network_element/model" ) // 实例化数据层 NewNeSoftware 结构体 diff --git a/src/modules/network_element/repository/ne_version.go b/src/modules/network_element/repository/ne_version.go index 134d7e1..60db37b 100644 --- a/src/modules/network_element/repository/ne_version.go +++ b/src/modules/network_element/repository/ne_version.go @@ -1,6 +1,6 @@ package repository -import "nms_nbi/src/modules/network_element/model" +import "nms_cxy/src/modules/network_element/model" // INeVersion 网元版本信息 数据层接口 type INeVersion interface { diff --git a/src/modules/network_element/repository/ne_version.impl.go b/src/modules/network_element/repository/ne_version.impl.go index 70fe59b..49b09a0 100644 --- a/src/modules/network_element/repository/ne_version.impl.go +++ b/src/modules/network_element/repository/ne_version.impl.go @@ -5,11 +5,11 @@ import ( "strings" "time" - "nms_nbi/src/framework/datasource" - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/utils/repo" - "nms_nbi/src/modules/network_element/model" + "nms_cxy/src/framework/datasource" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/utils/repo" + "nms_cxy/src/modules/network_element/model" ) // 实例化数据层 NewNeVersion 结构体 diff --git a/src/modules/network_element/repository/udm_auth.go b/src/modules/network_element/repository/udm_auth.go index 96f14ab..61921c8 100644 --- a/src/modules/network_element/repository/udm_auth.go +++ b/src/modules/network_element/repository/udm_auth.go @@ -1,7 +1,7 @@ package repository import ( - "nms_nbi/src/modules/network_element/model" + "nms_cxy/src/modules/network_element/model" ) // UDM鉴权信息 数据层接口 diff --git a/src/modules/network_element/repository/udm_auth.impl.go b/src/modules/network_element/repository/udm_auth.impl.go index cc13da1..670462f 100644 --- a/src/modules/network_element/repository/udm_auth.impl.go +++ b/src/modules/network_element/repository/udm_auth.impl.go @@ -3,11 +3,11 @@ package repository import ( "strings" - "nms_nbi/src/framework/datasource" - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/utils/repo" - "nms_nbi/src/modules/network_element/model" + "nms_cxy/src/framework/datasource" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/utils/repo" + "nms_cxy/src/modules/network_element/model" ) // 实例化数据层 UDMAuthImpl 结构体 diff --git a/src/modules/network_element/repository/udm_sub.go b/src/modules/network_element/repository/udm_sub.go index 2b4f3e0..cb46563 100644 --- a/src/modules/network_element/repository/udm_sub.go +++ b/src/modules/network_element/repository/udm_sub.go @@ -1,7 +1,7 @@ package repository import ( - "nms_nbi/src/modules/network_element/model" + "nms_cxy/src/modules/network_element/model" ) // UDM签约信息 数据层接口 diff --git a/src/modules/network_element/repository/udm_sub.impl.go b/src/modules/network_element/repository/udm_sub.impl.go index 8761a62..19ae926 100644 --- a/src/modules/network_element/repository/udm_sub.impl.go +++ b/src/modules/network_element/repository/udm_sub.impl.go @@ -4,11 +4,11 @@ import ( "strconv" "strings" - "nms_nbi/src/framework/datasource" - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/utils/repo" - "nms_nbi/src/modules/network_element/model" + "nms_cxy/src/framework/datasource" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/utils/repo" + "nms_cxy/src/modules/network_element/model" ) // 实例化数据层 UDMSubImpl 结构体 diff --git a/src/modules/network_element/service/ne_direct_link.go b/src/modules/network_element/service/ne_direct_link.go index f91e5c7..15d1138 100644 --- a/src/modules/network_element/service/ne_direct_link.go +++ b/src/modules/network_element/service/ne_direct_link.go @@ -6,9 +6,9 @@ import ( "strings" "time" - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/utils/fetch" - "nms_nbi/src/modules/network_element/model" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/utils/fetch" + "nms_cxy/src/modules/network_element/model" ) // NeState 获取网元端服务状态 diff --git a/src/modules/network_element/service/ne_host.go b/src/modules/network_element/service/ne_host.go index 95e4b83..6ce4b6c 100644 --- a/src/modules/network_element/service/ne_host.go +++ b/src/modules/network_element/service/ne_host.go @@ -1,6 +1,6 @@ package service -import "nms_nbi/src/modules/network_element/model" +import "nms_cxy/src/modules/network_element/model" // INeHost 网元主机连接 服务层接口 type INeHost interface { diff --git a/src/modules/network_element/service/ne_host.impl.go b/src/modules/network_element/service/ne_host.impl.go index 7357e79..b1d0e98 100644 --- a/src/modules/network_element/service/ne_host.impl.go +++ b/src/modules/network_element/service/ne_host.impl.go @@ -3,8 +3,8 @@ package service import ( "fmt" - "nms_nbi/src/modules/network_element/model" - "nms_nbi/src/modules/network_element/repository" + "nms_cxy/src/modules/network_element/model" + "nms_cxy/src/modules/network_element/repository" ) // 实例化服务层 NeHostImpl 结构体 diff --git a/src/modules/network_element/service/ne_host_cmd.go b/src/modules/network_element/service/ne_host_cmd.go index 46343a2..fecf1ab 100644 --- a/src/modules/network_element/service/ne_host_cmd.go +++ b/src/modules/network_element/service/ne_host_cmd.go @@ -1,6 +1,6 @@ package service -import "nms_nbi/src/modules/network_element/model" +import "nms_cxy/src/modules/network_element/model" // INeHostCmd 网元主机命令 服务层接口 type INeHostCmd interface { diff --git a/src/modules/network_element/service/ne_host_cmd.impl.go b/src/modules/network_element/service/ne_host_cmd.impl.go index 0c195e2..884d096 100644 --- a/src/modules/network_element/service/ne_host_cmd.impl.go +++ b/src/modules/network_element/service/ne_host_cmd.impl.go @@ -3,8 +3,8 @@ package service import ( "fmt" - "nms_nbi/src/modules/network_element/model" - "nms_nbi/src/modules/network_element/repository" + "nms_cxy/src/modules/network_element/model" + "nms_cxy/src/modules/network_element/repository" ) // 实例化服务层 NeHostCmdImpl 结构体 diff --git a/src/modules/network_element/service/ne_info.go b/src/modules/network_element/service/ne_info.go index 98fce6e..6093cbd 100644 --- a/src/modules/network_element/service/ne_info.go +++ b/src/modules/network_element/service/ne_info.go @@ -1,6 +1,6 @@ package service -import "nms_nbi/src/modules/network_element/model" +import "nms_cxy/src/modules/network_element/model" // 网元信息 服务层接口 type INeInfo interface { diff --git a/src/modules/network_element/service/ne_info.impl.go b/src/modules/network_element/service/ne_info.impl.go index 1ae1f3b..d4b4986 100644 --- a/src/modules/network_element/service/ne_info.impl.go +++ b/src/modules/network_element/service/ne_info.impl.go @@ -5,10 +5,10 @@ import ( "fmt" "strings" - "nms_nbi/src/framework/constants/cachekey" - "nms_nbi/src/framework/redis" - "nms_nbi/src/modules/network_element/model" - "nms_nbi/src/modules/network_element/repository" + "nms_cxy/src/framework/constants/cachekey" + "nms_cxy/src/framework/redis" + "nms_cxy/src/modules/network_element/model" + "nms_cxy/src/modules/network_element/repository" ) // 实例化服务层 NeInfoImpl 结构体 diff --git a/src/modules/network_element/service/ne_software.go b/src/modules/network_element/service/ne_software.go index 347e3fd..77bac86 100644 --- a/src/modules/network_element/service/ne_software.go +++ b/src/modules/network_element/service/ne_software.go @@ -1,6 +1,6 @@ package service -import "nms_nbi/src/modules/network_element/model" +import "nms_cxy/src/modules/network_element/model" // INeSoftware 网元软件包信息 服务层接口 type INeSoftware interface { diff --git a/src/modules/network_element/service/ne_software.impl.go b/src/modules/network_element/service/ne_software.impl.go index f199ef5..8851e85 100644 --- a/src/modules/network_element/service/ne_software.impl.go +++ b/src/modules/network_element/service/ne_software.impl.go @@ -3,8 +3,8 @@ package service import ( "fmt" - "nms_nbi/src/modules/network_element/model" - "nms_nbi/src/modules/network_element/repository" + "nms_cxy/src/modules/network_element/model" + "nms_cxy/src/modules/network_element/repository" ) // 实例化服务层 NeSoftwareImpl 结构体 diff --git a/src/modules/network_element/service/ne_version.go b/src/modules/network_element/service/ne_version.go index fd80f98..9e7ac0c 100644 --- a/src/modules/network_element/service/ne_version.go +++ b/src/modules/network_element/service/ne_version.go @@ -1,6 +1,6 @@ package service -import "nms_nbi/src/modules/network_element/model" +import "nms_cxy/src/modules/network_element/model" // INeVersion 网元版本信息 服务层接口 type INeVersion interface { diff --git a/src/modules/network_element/service/ne_version.impl.go b/src/modules/network_element/service/ne_version.impl.go index 3eedba5..2853db2 100644 --- a/src/modules/network_element/service/ne_version.impl.go +++ b/src/modules/network_element/service/ne_version.impl.go @@ -3,8 +3,8 @@ package service import ( "fmt" - "nms_nbi/src/modules/network_element/model" - "nms_nbi/src/modules/network_element/repository" + "nms_cxy/src/modules/network_element/model" + "nms_cxy/src/modules/network_element/repository" ) // 实例化服务层 NeVersionImpl 结构体 diff --git a/src/modules/network_element/service/udm_auth.go b/src/modules/network_element/service/udm_auth.go index 0cec3af..d469ce5 100644 --- a/src/modules/network_element/service/udm_auth.go +++ b/src/modules/network_element/service/udm_auth.go @@ -1,6 +1,6 @@ package service -import "nms_nbi/src/modules/network_element/model" +import "nms_cxy/src/modules/network_element/model" // UDM鉴权信息 服务层接口 type IUDMAuth interface { diff --git a/src/modules/network_element/service/udm_auth.impl.go b/src/modules/network_element/service/udm_auth.impl.go index 69f3ff5..b584f40 100644 --- a/src/modules/network_element/service/udm_auth.impl.go +++ b/src/modules/network_element/service/udm_auth.impl.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "nms_nbi/src/framework/redis" - "nms_nbi/src/modules/network_element/model" - "nms_nbi/src/modules/network_element/repository" + "nms_cxy/src/framework/redis" + "nms_cxy/src/modules/network_element/model" + "nms_cxy/src/modules/network_element/repository" ) // 实例化服务层 UDMAuthImpl 结构体 diff --git a/src/modules/network_element/service/udm_sub.go b/src/modules/network_element/service/udm_sub.go index b4b7dd7..8f6dd22 100644 --- a/src/modules/network_element/service/udm_sub.go +++ b/src/modules/network_element/service/udm_sub.go @@ -1,6 +1,6 @@ package service -import "nms_nbi/src/modules/network_element/model" +import "nms_cxy/src/modules/network_element/model" // UDM签约用户信息 服务层接口 type IUDMSub interface { diff --git a/src/modules/network_element/service/udm_sub.impl.go b/src/modules/network_element/service/udm_sub.impl.go index d8646ef..0b424f6 100644 --- a/src/modules/network_element/service/udm_sub.impl.go +++ b/src/modules/network_element/service/udm_sub.impl.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "nms_nbi/src/framework/redis" - "nms_nbi/src/modules/network_element/model" - "nms_nbi/src/modules/network_element/repository" + "nms_cxy/src/framework/redis" + "nms_cxy/src/modules/network_element/model" + "nms_cxy/src/modules/network_element/repository" ) // 实例化服务层 UDMSubImpl 结构体 diff --git a/src/modules/nms_cxy/controller/security.go b/src/modules/nms_cxy/controller/security.go index bea841b..dc1354a 100644 --- a/src/modules/nms_cxy/controller/security.go +++ b/src/modules/nms_cxy/controller/security.go @@ -1,14 +1,14 @@ package controller import ( - commonConstants "nms_nbi/src/framework/constants/common" - "nms_nbi/src/framework/constants/token" - "nms_nbi/src/framework/i18n" - "nms_nbi/src/framework/utils/ctx" - tokenUtils "nms_nbi/src/framework/utils/token" - "nms_nbi/src/framework/vo/result" - commonService "nms_nbi/src/modules/common/service" - systemService "nms_nbi/src/modules/system/service" + commonConstants "nms_cxy/src/framework/constants/common" + "nms_cxy/src/framework/constants/token" + "nms_cxy/src/framework/i18n" + "nms_cxy/src/framework/utils/ctx" + tokenUtils "nms_cxy/src/framework/utils/token" + "nms_cxy/src/framework/vo/result" + commonService "nms_cxy/src/modules/common/service" + systemService "nms_cxy/src/modules/system/service" "github.com/gin-gonic/gin" ) diff --git a/src/modules/nms_cxy/controller/system.go b/src/modules/nms_cxy/controller/system.go index 862c8ca..1700408 100644 --- a/src/modules/nms_cxy/controller/system.go +++ b/src/modules/nms_cxy/controller/system.go @@ -2,16 +2,16 @@ package controller import ( "fmt" - "nms_nbi/src/framework/config" - "nms_nbi/src/framework/i18n" - "nms_nbi/src/framework/utils/cmd" - "nms_nbi/src/framework/utils/ctx" - "nms_nbi/src/framework/utils/date" - "nms_nbi/src/framework/utils/ping" - "nms_nbi/src/framework/vo/result" - neService "nms_nbi/src/modules/network_element/service" - "nms_nbi/src/modules/nms_cxy/service" - "nms_nbi/src/modules/nms_cxy/utils/common" + "nms_cxy/src/framework/config" + "nms_cxy/src/framework/i18n" + "nms_cxy/src/framework/utils/cmd" + "nms_cxy/src/framework/utils/ctx" + "nms_cxy/src/framework/utils/date" + "nms_cxy/src/framework/utils/ping" + "nms_cxy/src/framework/vo/result" + neService "nms_cxy/src/modules/network_element/service" + "nms_cxy/src/modules/nms_cxy/service" + "nms_cxy/src/modules/nms_cxy/utils/common" "time" diff --git a/src/modules/nms_cxy/controller/test.go b/src/modules/nms_cxy/controller/test.go index f1241de..0ac1025 100644 --- a/src/modules/nms_cxy/controller/test.go +++ b/src/modules/nms_cxy/controller/test.go @@ -2,15 +2,15 @@ package controller import ( "encoding/json" - "nms_nbi/src/framework/i18n" - "nms_nbi/src/framework/utils/ctx" - "nms_nbi/src/framework/vo/result" - neDataModel "nms_nbi/src/modules/network_data/model" - neDataService "nms_nbi/src/modules/network_data/service" - neService "nms_nbi/src/modules/network_element/service" - "nms_nbi/src/modules/nms_cxy/service" - "nms_nbi/src/modules/nms_cxy/utils/kafka" - "nms_nbi/src/modules/nms_cxy/utils/oss" + "nms_cxy/src/framework/i18n" + "nms_cxy/src/framework/utils/ctx" + "nms_cxy/src/framework/vo/result" + neDataModel "nms_cxy/src/modules/network_data/model" + neDataService "nms_cxy/src/modules/network_data/service" + neService "nms_cxy/src/modules/network_element/service" + "nms_cxy/src/modules/nms_cxy/service" + "nms_cxy/src/modules/nms_cxy/utils/kafka" + "nms_cxy/src/modules/nms_cxy/utils/oss" "github.com/gin-gonic/gin" ) diff --git a/src/modules/nms_cxy/nms_cxy.go b/src/modules/nms_cxy/nms_cxy.go index ba08bf7..c762797 100644 --- a/src/modules/nms_cxy/nms_cxy.go +++ b/src/modules/nms_cxy/nms_cxy.go @@ -1,13 +1,13 @@ package nmscxy import ( - "nms_nbi/src/framework/config" - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/middleware" - "nms_nbi/src/modules/nms_cxy/controller" - "nms_nbi/src/modules/nms_cxy/processor" - "nms_nbi/src/modules/nms_cxy/utils/kafka" - "nms_nbi/src/modules/nms_cxy/utils/oss" + "nms_cxy/src/framework/config" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/middleware" + "nms_cxy/src/modules/nms_cxy/controller" + "nms_cxy/src/modules/nms_cxy/processor" + "nms_cxy/src/modules/nms_cxy/utils/kafka" + "nms_cxy/src/modules/nms_cxy/utils/oss" "github.com/gin-gonic/gin" ) @@ -134,7 +134,7 @@ func Setup(router *gin.Engine) { testManagementGroup := apiRest.Group("/testManagement") { // 默认测试 - testManagementGroup.POST("/", + testManagementGroup.POST("", middleware.PreAuthorize(nil), controller.NewTest.Demo, ) diff --git a/src/modules/nms_cxy/processor/performance/performance.go b/src/modules/nms_cxy/processor/performance/performance.go index f2d0d37..19c9a00 100644 --- a/src/modules/nms_cxy/processor/performance/performance.go +++ b/src/modules/nms_cxy/processor/performance/performance.go @@ -3,10 +3,10 @@ package performance import ( "encoding/json" "fmt" - "nms_nbi/src/framework/cron" - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/utils/date" - "nms_nbi/src/modules/nms_cxy/service" + "nms_cxy/src/framework/cron" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/utils/date" + "nms_cxy/src/modules/nms_cxy/service" "time" ) diff --git a/src/modules/nms_cxy/processor/processor.go b/src/modules/nms_cxy/processor/processor.go index 3f04170..7c65612 100644 --- a/src/modules/nms_cxy/processor/processor.go +++ b/src/modules/nms_cxy/processor/processor.go @@ -1,9 +1,9 @@ package processor import ( - "nms_nbi/src/framework/cron" - "nms_nbi/src/modules/nms_cxy/processor/performance" - "nms_nbi/src/modules/nms_cxy/processor/resource" + "nms_cxy/src/framework/cron" + "nms_cxy/src/modules/nms_cxy/processor/performance" + "nms_cxy/src/modules/nms_cxy/processor/resource" ) // InitCronQueue 初始定时任务队列 diff --git a/src/modules/nms_cxy/processor/resource/resource.go b/src/modules/nms_cxy/processor/resource/resource.go index 19d4d2b..03b0438 100644 --- a/src/modules/nms_cxy/processor/resource/resource.go +++ b/src/modules/nms_cxy/processor/resource/resource.go @@ -3,9 +3,9 @@ package resource import ( "encoding/json" "fmt" - "nms_nbi/src/framework/cron" - "nms_nbi/src/framework/logger" - "nms_nbi/src/modules/nms_cxy/service" + "nms_cxy/src/framework/cron" + "nms_cxy/src/framework/logger" + "nms_cxy/src/modules/nms_cxy/service" ) var NewProcessor = &ResourceProcessor{ diff --git a/src/modules/nms_cxy/service/alarm.go b/src/modules/nms_cxy/service/alarm.go index 5db654d..99d0d85 100644 --- a/src/modules/nms_cxy/service/alarm.go +++ b/src/modules/nms_cxy/service/alarm.go @@ -1,8 +1,8 @@ package service import ( - neDataModel "nms_nbi/src/modules/network_data/model" - "nms_nbi/src/modules/nms_cxy/model" + neDataModel "nms_cxy/src/modules/network_data/model" + "nms_cxy/src/modules/nms_cxy/model" ) // 告警数据处理服务 服务层接口 diff --git a/src/modules/nms_cxy/service/alarm.impl.go b/src/modules/nms_cxy/service/alarm.impl.go index 2f0c39a..25cb715 100644 --- a/src/modules/nms_cxy/service/alarm.impl.go +++ b/src/modules/nms_cxy/service/alarm.impl.go @@ -3,16 +3,16 @@ package service import ( "encoding/json" "fmt" - "nms_nbi/src/framework/constants/uploadsubpath" - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/utils/date" - "nms_nbi/src/framework/utils/file" - "nms_nbi/src/framework/utils/parse" - neDataModel "nms_nbi/src/modules/network_data/model" - neDataService "nms_nbi/src/modules/network_data/service" - "nms_nbi/src/modules/nms_cxy/model" - "nms_nbi/src/modules/nms_cxy/utils/common" - "nms_nbi/src/modules/nms_cxy/utils/kafka" + "nms_cxy/src/framework/constants/uploadsubpath" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/utils/date" + "nms_cxy/src/framework/utils/file" + "nms_cxy/src/framework/utils/parse" + neDataModel "nms_cxy/src/modules/network_data/model" + neDataService "nms_cxy/src/modules/network_data/service" + "nms_cxy/src/modules/nms_cxy/model" + "nms_cxy/src/modules/nms_cxy/utils/common" + "nms_cxy/src/modules/nms_cxy/utils/kafka" ) // 实例化数据层 AlarmImpl 结构体 diff --git a/src/modules/nms_cxy/service/config.impl.go b/src/modules/nms_cxy/service/config.impl.go index eb77e83..1e25c76 100644 --- a/src/modules/nms_cxy/service/config.impl.go +++ b/src/modules/nms_cxy/service/config.impl.go @@ -2,9 +2,9 @@ package service import ( "fmt" - "nms_nbi/src/framework/constants/uploadsubpath" - "nms_nbi/src/framework/utils/file" - "nms_nbi/src/modules/nms_cxy/utils/common" + "nms_cxy/src/framework/constants/uploadsubpath" + "nms_cxy/src/framework/utils/file" + "nms_cxy/src/modules/nms_cxy/utils/common" ) // 实例化数据层 ConfigImpl 结构体 @@ -16,7 +16,7 @@ type ConfigImpl struct{} // ConfigUploadOSS 配置数据上报 func (s *ConfigImpl) ConfigUploadOSS(neType string) error { // 配置文件目录 - dir := "C:\\usr\\local\\omc\\upload\\export\\2023\\12" + dir := "/usr/local/omc/etc" // 文件名 dataSaveFileName := common.DataSaveFileName{} diff --git a/src/modules/nms_cxy/service/log.impl.go b/src/modules/nms_cxy/service/log.impl.go index 55f47d2..b435064 100644 --- a/src/modules/nms_cxy/service/log.impl.go +++ b/src/modules/nms_cxy/service/log.impl.go @@ -2,13 +2,13 @@ package service import ( "fmt" - "nms_nbi/src/framework/constants/uploadsubpath" - "nms_nbi/src/framework/i18n" - "nms_nbi/src/framework/utils/file" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/modules/nms_cxy/utils/common" - systemModel "nms_nbi/src/modules/system/model" - systemService "nms_nbi/src/modules/system/service" + "nms_cxy/src/framework/constants/uploadsubpath" + "nms_cxy/src/framework/i18n" + "nms_cxy/src/framework/utils/file" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/modules/nms_cxy/utils/common" + systemModel "nms_cxy/src/modules/system/model" + systemService "nms_cxy/src/modules/system/service" ) // 实例化数据层 LogImpl 结构体 diff --git a/src/modules/nms_cxy/service/performance.impl.go b/src/modules/nms_cxy/service/performance.impl.go index 638dc66..512b421 100644 --- a/src/modules/nms_cxy/service/performance.impl.go +++ b/src/modules/nms_cxy/service/performance.impl.go @@ -2,11 +2,11 @@ package service import ( "fmt" - "nms_nbi/src/framework/constants/uploadsubpath" - "nms_nbi/src/framework/utils/file" - neDataModel "nms_nbi/src/modules/network_data/model" - neDataService "nms_nbi/src/modules/network_data/service" - "nms_nbi/src/modules/nms_cxy/utils/common" + "nms_cxy/src/framework/constants/uploadsubpath" + "nms_cxy/src/framework/utils/file" + neDataModel "nms_cxy/src/modules/network_data/model" + neDataService "nms_cxy/src/modules/network_data/service" + "nms_cxy/src/modules/nms_cxy/utils/common" ) // 实例化数据层 PerformanceImpl 结构体 diff --git a/src/modules/nms_cxy/service/resource.impl.go b/src/modules/nms_cxy/service/resource.impl.go index e25dba7..5d09af7 100644 --- a/src/modules/nms_cxy/service/resource.impl.go +++ b/src/modules/nms_cxy/service/resource.impl.go @@ -3,11 +3,11 @@ package service import ( "encoding/json" "fmt" - "nms_nbi/src/framework/constants/uploadsubpath" - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/utils/file" - "nms_nbi/src/modules/nms_cxy/utils/common" - "nms_nbi/src/modules/nms_cxy/utils/kafka" + "nms_cxy/src/framework/constants/uploadsubpath" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/utils/file" + "nms_cxy/src/modules/nms_cxy/utils/common" + "nms_cxy/src/modules/nms_cxy/utils/kafka" ) // 实例化数据层 ResourceImpl 结构体 diff --git a/src/modules/nms_cxy/utils/common/common.go b/src/modules/nms_cxy/utils/common/common.go index 58241bb..d591887 100644 --- a/src/modules/nms_cxy/utils/common/common.go +++ b/src/modules/nms_cxy/utils/common/common.go @@ -2,10 +2,10 @@ package common import ( "fmt" - "nms_nbi/src/framework/config" - "nms_nbi/src/framework/utils/date" - "nms_nbi/src/framework/utils/file" - "nms_nbi/src/modules/nms_cxy/utils/oss" + "nms_cxy/src/framework/config" + "nms_cxy/src/framework/utils/date" + "nms_cxy/src/framework/utils/file" + "nms_cxy/src/modules/nms_cxy/utils/oss" "path/filepath" "strings" "time" diff --git a/src/modules/nms_cxy/utils/kafka/kafka.go b/src/modules/nms_cxy/utils/kafka/kafka.go index 567cda7..01e0bd2 100644 --- a/src/modules/nms_cxy/utils/kafka/kafka.go +++ b/src/modules/nms_cxy/utils/kafka/kafka.go @@ -2,8 +2,8 @@ package kafka import ( "context" - "nms_nbi/src/framework/config" - "nms_nbi/src/framework/logger" + "nms_cxy/src/framework/config" + "nms_cxy/src/framework/logger" "time" "github.com/IBM/sarama" diff --git a/src/modules/nms_cxy/utils/oss/oss.go b/src/modules/nms_cxy/utils/oss/oss.go index 7fa8c44..066b6e7 100644 --- a/src/modules/nms_cxy/utils/oss/oss.go +++ b/src/modules/nms_cxy/utils/oss/oss.go @@ -2,8 +2,8 @@ package oss import ( "context" - "nms_nbi/src/framework/config" - "nms_nbi/src/framework/logger" + "nms_cxy/src/framework/config" + "nms_cxy/src/framework/logger" "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/credentials" diff --git a/src/modules/system/controller/sys_config.go b/src/modules/system/controller/sys_config.go index cad8782..5c645a5 100644 --- a/src/modules/system/controller/sys_config.go +++ b/src/modules/system/controller/sys_config.go @@ -6,13 +6,13 @@ import ( "strings" "time" - "nms_nbi/src/framework/i18n" - "nms_nbi/src/framework/utils/ctx" - "nms_nbi/src/framework/utils/file" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/vo/result" - "nms_nbi/src/modules/system/model" - "nms_nbi/src/modules/system/service" + "nms_cxy/src/framework/i18n" + "nms_cxy/src/framework/utils/ctx" + "nms_cxy/src/framework/utils/file" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/vo/result" + "nms_cxy/src/modules/system/model" + "nms_cxy/src/modules/system/service" "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" diff --git a/src/modules/system/controller/sys_dept.go b/src/modules/system/controller/sys_dept.go index feb94be..6b72381 100644 --- a/src/modules/system/controller/sys_dept.go +++ b/src/modules/system/controller/sys_dept.go @@ -3,13 +3,13 @@ package controller import ( "strings" - "nms_nbi/src/framework/constants/common" - "nms_nbi/src/framework/i18n" - "nms_nbi/src/framework/utils/ctx" - "nms_nbi/src/framework/vo" - "nms_nbi/src/framework/vo/result" - "nms_nbi/src/modules/system/model" - "nms_nbi/src/modules/system/service" + "nms_cxy/src/framework/constants/common" + "nms_cxy/src/framework/i18n" + "nms_cxy/src/framework/utils/ctx" + "nms_cxy/src/framework/vo" + "nms_cxy/src/framework/vo/result" + "nms_cxy/src/modules/system/model" + "nms_cxy/src/modules/system/service" "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" diff --git a/src/modules/system/controller/sys_dict_data.go b/src/modules/system/controller/sys_dict_data.go index f21db26..23dcc9f 100644 --- a/src/modules/system/controller/sys_dict_data.go +++ b/src/modules/system/controller/sys_dict_data.go @@ -6,13 +6,13 @@ import ( "strings" "time" - "nms_nbi/src/framework/i18n" - "nms_nbi/src/framework/utils/ctx" - "nms_nbi/src/framework/utils/file" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/vo/result" - "nms_nbi/src/modules/system/model" - "nms_nbi/src/modules/system/service" + "nms_cxy/src/framework/i18n" + "nms_cxy/src/framework/utils/ctx" + "nms_cxy/src/framework/utils/file" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/vo/result" + "nms_cxy/src/modules/system/model" + "nms_cxy/src/modules/system/service" "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" diff --git a/src/modules/system/controller/sys_dict_type.go b/src/modules/system/controller/sys_dict_type.go index e75ebca..033591e 100644 --- a/src/modules/system/controller/sys_dict_type.go +++ b/src/modules/system/controller/sys_dict_type.go @@ -6,14 +6,14 @@ import ( "strings" "time" - "nms_nbi/src/framework/constants/common" - "nms_nbi/src/framework/i18n" - "nms_nbi/src/framework/utils/ctx" - "nms_nbi/src/framework/utils/file" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/vo/result" - "nms_nbi/src/modules/system/model" - "nms_nbi/src/modules/system/service" + "nms_cxy/src/framework/constants/common" + "nms_cxy/src/framework/i18n" + "nms_cxy/src/framework/utils/ctx" + "nms_cxy/src/framework/utils/file" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/vo/result" + "nms_cxy/src/modules/system/model" + "nms_cxy/src/modules/system/service" "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" diff --git a/src/modules/system/controller/sys_log_login.go b/src/modules/system/controller/sys_log_login.go index c65853a..9ad2657 100644 --- a/src/modules/system/controller/sys_log_login.go +++ b/src/modules/system/controller/sys_log_login.go @@ -6,15 +6,15 @@ import ( "strings" "time" - "nms_nbi/src/framework/i18n" - "nms_nbi/src/framework/utils/ctx" - "nms_nbi/src/framework/utils/date" - "nms_nbi/src/framework/utils/file" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/vo/result" - commonService "nms_nbi/src/modules/common/service" - "nms_nbi/src/modules/system/model" - "nms_nbi/src/modules/system/service" + "nms_cxy/src/framework/i18n" + "nms_cxy/src/framework/utils/ctx" + "nms_cxy/src/framework/utils/date" + "nms_cxy/src/framework/utils/file" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/vo/result" + commonService "nms_cxy/src/modules/common/service" + "nms_cxy/src/modules/system/model" + "nms_cxy/src/modules/system/service" "github.com/gin-gonic/gin" ) diff --git a/src/modules/system/controller/sys_log_operate.go b/src/modules/system/controller/sys_log_operate.go index 1817705..80a0e0d 100644 --- a/src/modules/system/controller/sys_log_operate.go +++ b/src/modules/system/controller/sys_log_operate.go @@ -6,14 +6,14 @@ import ( "strings" "time" - "nms_nbi/src/framework/i18n" - "nms_nbi/src/framework/utils/ctx" - "nms_nbi/src/framework/utils/date" - "nms_nbi/src/framework/utils/file" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/vo/result" - "nms_nbi/src/modules/system/model" - "nms_nbi/src/modules/system/service" + "nms_cxy/src/framework/i18n" + "nms_cxy/src/framework/utils/ctx" + "nms_cxy/src/framework/utils/date" + "nms_cxy/src/framework/utils/file" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/vo/result" + "nms_cxy/src/modules/system/model" + "nms_cxy/src/modules/system/service" "github.com/gin-gonic/gin" ) diff --git a/src/modules/system/controller/sys_menu.go b/src/modules/system/controller/sys_menu.go index da823d2..5f1ddbc 100644 --- a/src/modules/system/controller/sys_menu.go +++ b/src/modules/system/controller/sys_menu.go @@ -1,16 +1,16 @@ package controller import ( - "nms_nbi/src/framework/config" - "nms_nbi/src/framework/constants/common" - "nms_nbi/src/framework/constants/menu" - "nms_nbi/src/framework/i18n" - "nms_nbi/src/framework/utils/ctx" - "nms_nbi/src/framework/utils/regular" - "nms_nbi/src/framework/vo" - "nms_nbi/src/framework/vo/result" - "nms_nbi/src/modules/system/model" - "nms_nbi/src/modules/system/service" + "nms_cxy/src/framework/config" + "nms_cxy/src/framework/constants/common" + "nms_cxy/src/framework/constants/menu" + "nms_cxy/src/framework/i18n" + "nms_cxy/src/framework/utils/ctx" + "nms_cxy/src/framework/utils/regular" + "nms_cxy/src/framework/vo" + "nms_cxy/src/framework/vo/result" + "nms_cxy/src/modules/system/model" + "nms_cxy/src/modules/system/service" "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" diff --git a/src/modules/system/controller/sys_post.go b/src/modules/system/controller/sys_post.go index 30a7fda..810eb16 100644 --- a/src/modules/system/controller/sys_post.go +++ b/src/modules/system/controller/sys_post.go @@ -6,13 +6,13 @@ import ( "strings" "time" - "nms_nbi/src/framework/i18n" - "nms_nbi/src/framework/utils/ctx" - "nms_nbi/src/framework/utils/file" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/vo/result" - "nms_nbi/src/modules/system/model" - "nms_nbi/src/modules/system/service" + "nms_cxy/src/framework/i18n" + "nms_cxy/src/framework/utils/ctx" + "nms_cxy/src/framework/utils/file" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/vo/result" + "nms_cxy/src/modules/system/model" + "nms_cxy/src/modules/system/service" "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" diff --git a/src/modules/system/controller/sys_profile.go b/src/modules/system/controller/sys_profile.go index 6e72625..758a05b 100644 --- a/src/modules/system/controller/sys_profile.go +++ b/src/modules/system/controller/sys_profile.go @@ -1,19 +1,19 @@ package controller import ( - "nms_nbi/src/framework/config" - "nms_nbi/src/framework/constants/admin" - "nms_nbi/src/framework/constants/uploadsubpath" - "nms_nbi/src/framework/i18n" - "nms_nbi/src/framework/utils/crypto" - "nms_nbi/src/framework/utils/ctx" - "nms_nbi/src/framework/utils/file" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/utils/regular" - "nms_nbi/src/framework/utils/token" - "nms_nbi/src/framework/vo/result" - "nms_nbi/src/modules/system/model" - "nms_nbi/src/modules/system/service" + "nms_cxy/src/framework/config" + "nms_cxy/src/framework/constants/admin" + "nms_cxy/src/framework/constants/uploadsubpath" + "nms_cxy/src/framework/i18n" + "nms_cxy/src/framework/utils/crypto" + "nms_cxy/src/framework/utils/ctx" + "nms_cxy/src/framework/utils/file" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/utils/regular" + "nms_cxy/src/framework/utils/token" + "nms_cxy/src/framework/vo/result" + "nms_cxy/src/modules/system/model" + "nms_cxy/src/modules/system/service" "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" diff --git a/src/modules/system/controller/sys_role.go b/src/modules/system/controller/sys_role.go index 283dca4..7c79049 100644 --- a/src/modules/system/controller/sys_role.go +++ b/src/modules/system/controller/sys_role.go @@ -6,14 +6,14 @@ import ( "strings" "time" - "nms_nbi/src/framework/constants/admin" - "nms_nbi/src/framework/i18n" - "nms_nbi/src/framework/utils/ctx" - "nms_nbi/src/framework/utils/file" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/vo/result" - "nms_nbi/src/modules/system/model" - "nms_nbi/src/modules/system/service" + "nms_cxy/src/framework/constants/admin" + "nms_cxy/src/framework/i18n" + "nms_cxy/src/framework/utils/ctx" + "nms_cxy/src/framework/utils/file" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/vo/result" + "nms_cxy/src/modules/system/model" + "nms_cxy/src/modules/system/service" "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" diff --git a/src/modules/system/controller/sys_user.go b/src/modules/system/controller/sys_user.go index a8493ed..e594ee3 100644 --- a/src/modules/system/controller/sys_user.go +++ b/src/modules/system/controller/sys_user.go @@ -6,18 +6,18 @@ import ( "strings" "time" - "nms_nbi/src/framework/config" - "nms_nbi/src/framework/constants/admin" - "nms_nbi/src/framework/constants/common" - "nms_nbi/src/framework/i18n" - "nms_nbi/src/framework/utils/ctx" - "nms_nbi/src/framework/utils/date" - "nms_nbi/src/framework/utils/file" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/utils/regular" - "nms_nbi/src/framework/vo/result" - "nms_nbi/src/modules/system/model" - "nms_nbi/src/modules/system/service" + "nms_cxy/src/framework/config" + "nms_cxy/src/framework/constants/admin" + "nms_cxy/src/framework/constants/common" + "nms_cxy/src/framework/i18n" + "nms_cxy/src/framework/utils/ctx" + "nms_cxy/src/framework/utils/date" + "nms_cxy/src/framework/utils/file" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/utils/regular" + "nms_cxy/src/framework/vo/result" + "nms_cxy/src/modules/system/model" + "nms_cxy/src/modules/system/service" "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" diff --git a/src/modules/system/repository/sys_config.go b/src/modules/system/repository/sys_config.go index f2dbd48..046fa0c 100644 --- a/src/modules/system/repository/sys_config.go +++ b/src/modules/system/repository/sys_config.go @@ -1,6 +1,6 @@ package repository -import "nms_nbi/src/modules/system/model" +import "nms_cxy/src/modules/system/model" // ISysConfig 参数配置表 数据层接口 type ISysConfig interface { diff --git a/src/modules/system/repository/sys_config.impl.go b/src/modules/system/repository/sys_config.impl.go index ea71533..026b6ea 100644 --- a/src/modules/system/repository/sys_config.impl.go +++ b/src/modules/system/repository/sys_config.impl.go @@ -5,12 +5,12 @@ import ( "strings" "time" - "nms_nbi/src/framework/datasource" - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/utils/date" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/utils/repo" - "nms_nbi/src/modules/system/model" + "nms_cxy/src/framework/datasource" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/utils/date" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/utils/repo" + "nms_cxy/src/modules/system/model" ) // 实例化数据层 SysConfigImpl 结构体 diff --git a/src/modules/system/repository/sys_dept.go b/src/modules/system/repository/sys_dept.go index 313ac13..efcd3e5 100644 --- a/src/modules/system/repository/sys_dept.go +++ b/src/modules/system/repository/sys_dept.go @@ -1,6 +1,6 @@ package repository -import "nms_nbi/src/modules/system/model" +import "nms_cxy/src/modules/system/model" // ISysDept 部门表 数据层接口 type ISysDept interface { diff --git a/src/modules/system/repository/sys_dept.impl.go b/src/modules/system/repository/sys_dept.impl.go index 718f61c..a155f3c 100644 --- a/src/modules/system/repository/sys_dept.impl.go +++ b/src/modules/system/repository/sys_dept.impl.go @@ -5,11 +5,11 @@ import ( "strings" "time" - "nms_nbi/src/framework/datasource" - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/utils/repo" - "nms_nbi/src/modules/system/model" + "nms_cxy/src/framework/datasource" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/utils/repo" + "nms_cxy/src/modules/system/model" ) // 实例化数据层 SysDeptImpl 结构体 diff --git a/src/modules/system/repository/sys_dict_data.go b/src/modules/system/repository/sys_dict_data.go index c3a44fa..ac1220f 100644 --- a/src/modules/system/repository/sys_dict_data.go +++ b/src/modules/system/repository/sys_dict_data.go @@ -1,6 +1,6 @@ package repository -import "nms_nbi/src/modules/system/model" +import "nms_cxy/src/modules/system/model" // ISysDictData 字典类型数据表 数据层接口 type ISysDictData interface { diff --git a/src/modules/system/repository/sys_dict_data.impl.go b/src/modules/system/repository/sys_dict_data.impl.go index bc682cc..33070dc 100644 --- a/src/modules/system/repository/sys_dict_data.impl.go +++ b/src/modules/system/repository/sys_dict_data.impl.go @@ -5,11 +5,11 @@ import ( "strings" "time" - "nms_nbi/src/framework/datasource" - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/utils/repo" - "nms_nbi/src/modules/system/model" + "nms_cxy/src/framework/datasource" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/utils/repo" + "nms_cxy/src/modules/system/model" ) // 实例化数据层 SysDictDataImpl 结构体 diff --git a/src/modules/system/repository/sys_dict_type.go b/src/modules/system/repository/sys_dict_type.go index 4e732e5..8e23b47 100644 --- a/src/modules/system/repository/sys_dict_type.go +++ b/src/modules/system/repository/sys_dict_type.go @@ -1,6 +1,6 @@ package repository -import "nms_nbi/src/modules/system/model" +import "nms_cxy/src/modules/system/model" // ISysDictType 字典类型表 数据层接口 type ISysDictType interface { diff --git a/src/modules/system/repository/sys_dict_type.impl.go b/src/modules/system/repository/sys_dict_type.impl.go index 8bb4851..984a513 100644 --- a/src/modules/system/repository/sys_dict_type.impl.go +++ b/src/modules/system/repository/sys_dict_type.impl.go @@ -5,12 +5,12 @@ import ( "strings" "time" - "nms_nbi/src/framework/datasource" - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/utils/date" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/utils/repo" - "nms_nbi/src/modules/system/model" + "nms_cxy/src/framework/datasource" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/utils/date" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/utils/repo" + "nms_cxy/src/modules/system/model" ) // 实例化数据层 SysDictTypeImpl 结构体 diff --git a/src/modules/system/repository/sys_log_login.go b/src/modules/system/repository/sys_log_login.go index ec26b87..51efdd5 100644 --- a/src/modules/system/repository/sys_log_login.go +++ b/src/modules/system/repository/sys_log_login.go @@ -1,6 +1,6 @@ package repository -import "nms_nbi/src/modules/system/model" +import "nms_cxy/src/modules/system/model" // ISysLogLogin 系统登录日志表 数据层接口 type ISysLogLogin interface { diff --git a/src/modules/system/repository/sys_log_login.impl.go b/src/modules/system/repository/sys_log_login.impl.go index ce182eb..8fcd52a 100644 --- a/src/modules/system/repository/sys_log_login.impl.go +++ b/src/modules/system/repository/sys_log_login.impl.go @@ -4,12 +4,12 @@ import ( "strings" "time" - "nms_nbi/src/framework/datasource" - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/utils/date" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/utils/repo" - "nms_nbi/src/modules/system/model" + "nms_cxy/src/framework/datasource" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/utils/date" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/utils/repo" + "nms_cxy/src/modules/system/model" ) // 实例化数据层 SysLogLoginImpl 结构体 diff --git a/src/modules/system/repository/sys_log_operate.go b/src/modules/system/repository/sys_log_operate.go index 1283d31..962f3ad 100644 --- a/src/modules/system/repository/sys_log_operate.go +++ b/src/modules/system/repository/sys_log_operate.go @@ -1,6 +1,6 @@ package repository -import "nms_nbi/src/modules/system/model" +import "nms_cxy/src/modules/system/model" // ISysLogOperate 操作日志表 数据层接口 type ISysLogOperate interface { diff --git a/src/modules/system/repository/sys_log_operate.impl.go b/src/modules/system/repository/sys_log_operate.impl.go index 719ceea..8a0d956 100644 --- a/src/modules/system/repository/sys_log_operate.impl.go +++ b/src/modules/system/repository/sys_log_operate.impl.go @@ -4,12 +4,12 @@ import ( "strings" "time" - "nms_nbi/src/framework/datasource" - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/utils/date" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/utils/repo" - "nms_nbi/src/modules/system/model" + "nms_cxy/src/framework/datasource" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/utils/date" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/utils/repo" + "nms_cxy/src/modules/system/model" ) // 实例化数据层 SysLogOperateImpl 结构体 diff --git a/src/modules/system/repository/sys_menu.go b/src/modules/system/repository/sys_menu.go index 2b2c202..75e7ac8 100644 --- a/src/modules/system/repository/sys_menu.go +++ b/src/modules/system/repository/sys_menu.go @@ -1,6 +1,6 @@ package repository -import "nms_nbi/src/modules/system/model" +import "nms_cxy/src/modules/system/model" // ISysMenu 菜单表 数据层接口 type ISysMenu interface { diff --git a/src/modules/system/repository/sys_menu.impl.go b/src/modules/system/repository/sys_menu.impl.go index a8acc22..62d0561 100644 --- a/src/modules/system/repository/sys_menu.impl.go +++ b/src/modules/system/repository/sys_menu.impl.go @@ -5,12 +5,12 @@ import ( "strings" "time" - "nms_nbi/src/framework/constants/menu" - "nms_nbi/src/framework/datasource" - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/utils/repo" - "nms_nbi/src/modules/system/model" + "nms_cxy/src/framework/constants/menu" + "nms_cxy/src/framework/datasource" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/utils/repo" + "nms_cxy/src/modules/system/model" ) // 实例化数据层 SysMenuImpl 结构体 diff --git a/src/modules/system/repository/sys_post.go b/src/modules/system/repository/sys_post.go index 3683ea9..9a20b77 100644 --- a/src/modules/system/repository/sys_post.go +++ b/src/modules/system/repository/sys_post.go @@ -1,6 +1,6 @@ package repository -import "nms_nbi/src/modules/system/model" +import "nms_cxy/src/modules/system/model" // ISysPost 岗位表 数据层接口 type ISysPost interface { diff --git a/src/modules/system/repository/sys_post.impl.go b/src/modules/system/repository/sys_post.impl.go index fef22df..9377328 100644 --- a/src/modules/system/repository/sys_post.impl.go +++ b/src/modules/system/repository/sys_post.impl.go @@ -5,11 +5,11 @@ import ( "strings" "time" - "nms_nbi/src/framework/datasource" - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/utils/repo" - "nms_nbi/src/modules/system/model" + "nms_cxy/src/framework/datasource" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/utils/repo" + "nms_cxy/src/modules/system/model" ) // 实例化数据层 SysPostImpl 结构体 diff --git a/src/modules/system/repository/sys_role.go b/src/modules/system/repository/sys_role.go index f15dad0..d78643c 100644 --- a/src/modules/system/repository/sys_role.go +++ b/src/modules/system/repository/sys_role.go @@ -1,6 +1,6 @@ package repository -import "nms_nbi/src/modules/system/model" +import "nms_cxy/src/modules/system/model" // ISysRole 角色表 数据层接口 type ISysRole interface { diff --git a/src/modules/system/repository/sys_role.impl.go b/src/modules/system/repository/sys_role.impl.go index e3d5265..bbbeeea 100644 --- a/src/modules/system/repository/sys_role.impl.go +++ b/src/modules/system/repository/sys_role.impl.go @@ -5,12 +5,12 @@ import ( "strings" "time" - "nms_nbi/src/framework/datasource" - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/utils/date" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/utils/repo" - "nms_nbi/src/modules/system/model" + "nms_cxy/src/framework/datasource" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/utils/date" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/utils/repo" + "nms_cxy/src/modules/system/model" ) // 实例化数据层 SysRoleImpl 结构体 diff --git a/src/modules/system/repository/sys_role_dept.go b/src/modules/system/repository/sys_role_dept.go index 885f1e3..b51f809 100644 --- a/src/modules/system/repository/sys_role_dept.go +++ b/src/modules/system/repository/sys_role_dept.go @@ -1,6 +1,6 @@ package repository -import "nms_nbi/src/modules/system/model" +import "nms_cxy/src/modules/system/model" // ISysRoleDept 角色与部门关联表 数据层接口 type ISysRoleDept interface { diff --git a/src/modules/system/repository/sys_role_dept.impl.go b/src/modules/system/repository/sys_role_dept.impl.go index 0ea52e6..6d84614 100644 --- a/src/modules/system/repository/sys_role_dept.impl.go +++ b/src/modules/system/repository/sys_role_dept.impl.go @@ -4,10 +4,10 @@ import ( "fmt" "strings" - "nms_nbi/src/framework/datasource" - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/utils/repo" - "nms_nbi/src/modules/system/model" + "nms_cxy/src/framework/datasource" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/utils/repo" + "nms_cxy/src/modules/system/model" ) // 实例化数据层 SysRoleDeptImpl 结构体 diff --git a/src/modules/system/repository/sys_role_menu.go b/src/modules/system/repository/sys_role_menu.go index 1fed97c..4642cef 100644 --- a/src/modules/system/repository/sys_role_menu.go +++ b/src/modules/system/repository/sys_role_menu.go @@ -1,6 +1,6 @@ package repository -import "nms_nbi/src/modules/system/model" +import "nms_cxy/src/modules/system/model" // ISysRoleMenu 角色与菜单关联表 数据层接口 type ISysRoleMenu interface { diff --git a/src/modules/system/repository/sys_role_menu.impl.go b/src/modules/system/repository/sys_role_menu.impl.go index 9307f2f..8e01ac5 100644 --- a/src/modules/system/repository/sys_role_menu.impl.go +++ b/src/modules/system/repository/sys_role_menu.impl.go @@ -4,11 +4,11 @@ import ( "fmt" "strings" - "nms_nbi/src/framework/datasource" - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/utils/repo" - "nms_nbi/src/modules/system/model" + "nms_cxy/src/framework/datasource" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/utils/repo" + "nms_cxy/src/modules/system/model" ) // 实例化数据层 SysRoleMenuImpl 结构体 diff --git a/src/modules/system/repository/sys_user.go b/src/modules/system/repository/sys_user.go index b4971fd..5542883 100644 --- a/src/modules/system/repository/sys_user.go +++ b/src/modules/system/repository/sys_user.go @@ -1,6 +1,6 @@ package repository -import "nms_nbi/src/modules/system/model" +import "nms_cxy/src/modules/system/model" // ISysUser 用户表 数据层接口 type ISysUser interface { diff --git a/src/modules/system/repository/sys_user.impl.go b/src/modules/system/repository/sys_user.impl.go index 4959002..d97348d 100644 --- a/src/modules/system/repository/sys_user.impl.go +++ b/src/modules/system/repository/sys_user.impl.go @@ -5,13 +5,13 @@ import ( "strings" "time" - "nms_nbi/src/framework/datasource" - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/utils/crypto" - "nms_nbi/src/framework/utils/date" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/utils/repo" - "nms_nbi/src/modules/system/model" + "nms_cxy/src/framework/datasource" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/utils/crypto" + "nms_cxy/src/framework/utils/date" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/utils/repo" + "nms_cxy/src/modules/system/model" ) // 实例化数据层 SysUserImpl 结构体 diff --git a/src/modules/system/repository/sys_user_post.go b/src/modules/system/repository/sys_user_post.go index ef87742..c358a17 100644 --- a/src/modules/system/repository/sys_user_post.go +++ b/src/modules/system/repository/sys_user_post.go @@ -1,6 +1,6 @@ package repository -import "nms_nbi/src/modules/system/model" +import "nms_cxy/src/modules/system/model" // ISysUserPost 用户与岗位关联表 数据层接口 type ISysUserPost interface { diff --git a/src/modules/system/repository/sys_user_post.impl.go b/src/modules/system/repository/sys_user_post.impl.go index 69ebbb7..e613858 100644 --- a/src/modules/system/repository/sys_user_post.impl.go +++ b/src/modules/system/repository/sys_user_post.impl.go @@ -4,11 +4,11 @@ import ( "fmt" "strings" - "nms_nbi/src/framework/datasource" - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/utils/repo" - "nms_nbi/src/modules/system/model" + "nms_cxy/src/framework/datasource" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/utils/repo" + "nms_cxy/src/modules/system/model" ) // 实例化数据层 SysUserPostImpl 结构体 diff --git a/src/modules/system/repository/sys_user_role.go b/src/modules/system/repository/sys_user_role.go index 9a5f77c..50e6573 100644 --- a/src/modules/system/repository/sys_user_role.go +++ b/src/modules/system/repository/sys_user_role.go @@ -1,6 +1,6 @@ package repository -import "nms_nbi/src/modules/system/model" +import "nms_cxy/src/modules/system/model" // ISysUserRole 用户与角色关联表 数据层接口 type ISysUserRole interface { diff --git a/src/modules/system/repository/sys_user_role.impl.go b/src/modules/system/repository/sys_user_role.impl.go index 5c4c095..18ff4d3 100644 --- a/src/modules/system/repository/sys_user_role.impl.go +++ b/src/modules/system/repository/sys_user_role.impl.go @@ -4,11 +4,11 @@ import ( "fmt" "strings" - "nms_nbi/src/framework/datasource" - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/utils/repo" - "nms_nbi/src/modules/system/model" + "nms_cxy/src/framework/datasource" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/utils/repo" + "nms_cxy/src/modules/system/model" ) // 实例化数据层 SysUserRoleImpl 结构体 diff --git a/src/modules/system/service/sys_config.go b/src/modules/system/service/sys_config.go index 67c9e47..140d110 100644 --- a/src/modules/system/service/sys_config.go +++ b/src/modules/system/service/sys_config.go @@ -1,6 +1,6 @@ package service -import "nms_nbi/src/modules/system/model" +import "nms_cxy/src/modules/system/model" // ISysConfig 参数配置 服务层接口 type ISysConfig interface { diff --git a/src/modules/system/service/sys_config.impl.go b/src/modules/system/service/sys_config.impl.go index 6907e5e..abf7b9a 100644 --- a/src/modules/system/service/sys_config.impl.go +++ b/src/modules/system/service/sys_config.impl.go @@ -3,10 +3,10 @@ package service import ( "fmt" - "nms_nbi/src/framework/constants/cachekey" - "nms_nbi/src/framework/redis" - "nms_nbi/src/modules/system/model" - "nms_nbi/src/modules/system/repository" + "nms_cxy/src/framework/constants/cachekey" + "nms_cxy/src/framework/redis" + "nms_cxy/src/modules/system/model" + "nms_cxy/src/modules/system/repository" ) // 实例化服务层 SysConfigImpl 结构体 diff --git a/src/modules/system/service/sys_dept.go b/src/modules/system/service/sys_dept.go index 4c21a8d..d0f14e9 100644 --- a/src/modules/system/service/sys_dept.go +++ b/src/modules/system/service/sys_dept.go @@ -1,8 +1,8 @@ package service import ( - "nms_nbi/src/framework/vo" - "nms_nbi/src/modules/system/model" + "nms_cxy/src/framework/vo" + "nms_cxy/src/modules/system/model" ) // ISysDept 部门管理 服务层接口 diff --git a/src/modules/system/service/sys_dept.impl.go b/src/modules/system/service/sys_dept.impl.go index 993764a..a3b145f 100644 --- a/src/modules/system/service/sys_dept.impl.go +++ b/src/modules/system/service/sys_dept.impl.go @@ -3,10 +3,10 @@ package service import ( "strings" - "nms_nbi/src/framework/constants/common" - "nms_nbi/src/framework/vo" - "nms_nbi/src/modules/system/model" - "nms_nbi/src/modules/system/repository" + "nms_cxy/src/framework/constants/common" + "nms_cxy/src/framework/vo" + "nms_cxy/src/modules/system/model" + "nms_cxy/src/modules/system/repository" ) // 实例化服务层 SysDeptImpl 结构体 diff --git a/src/modules/system/service/sys_dict_data.go b/src/modules/system/service/sys_dict_data.go index c45cc81..57ee43f 100644 --- a/src/modules/system/service/sys_dict_data.go +++ b/src/modules/system/service/sys_dict_data.go @@ -1,6 +1,6 @@ package service -import "nms_nbi/src/modules/system/model" +import "nms_cxy/src/modules/system/model" // ISysDictData 字典类型数据 服务层接口 type ISysDictData interface { diff --git a/src/modules/system/service/sys_dict_data.impl.go b/src/modules/system/service/sys_dict_data.impl.go index 243ed39..26c7b07 100644 --- a/src/modules/system/service/sys_dict_data.impl.go +++ b/src/modules/system/service/sys_dict_data.impl.go @@ -3,8 +3,8 @@ package service import ( "fmt" - "nms_nbi/src/modules/system/model" - "nms_nbi/src/modules/system/repository" + "nms_cxy/src/modules/system/model" + "nms_cxy/src/modules/system/repository" ) // 实例化服务层 SysDictDataImpl 结构体 diff --git a/src/modules/system/service/sys_dict_type.go b/src/modules/system/service/sys_dict_type.go index b2a0a86..c28db8e 100644 --- a/src/modules/system/service/sys_dict_type.go +++ b/src/modules/system/service/sys_dict_type.go @@ -1,6 +1,6 @@ package service -import "nms_nbi/src/modules/system/model" +import "nms_cxy/src/modules/system/model" // ISysDictType 字典类型 服务层接口 type ISysDictType interface { diff --git a/src/modules/system/service/sys_dict_type.impl.go b/src/modules/system/service/sys_dict_type.impl.go index 74949c5..d800aa1 100644 --- a/src/modules/system/service/sys_dict_type.impl.go +++ b/src/modules/system/service/sys_dict_type.impl.go @@ -4,11 +4,11 @@ import ( "encoding/json" "fmt" - "nms_nbi/src/framework/constants/cachekey" - "nms_nbi/src/framework/constants/common" - "nms_nbi/src/framework/redis" - "nms_nbi/src/modules/system/model" - "nms_nbi/src/modules/system/repository" + "nms_cxy/src/framework/constants/cachekey" + "nms_cxy/src/framework/constants/common" + "nms_cxy/src/framework/redis" + "nms_cxy/src/modules/system/model" + "nms_cxy/src/modules/system/repository" ) // 实例化服务层 SysDictTypeImpl 结构体 diff --git a/src/modules/system/service/sys_log_login.go b/src/modules/system/service/sys_log_login.go index a6908c6..8bfbadb 100644 --- a/src/modules/system/service/sys_log_login.go +++ b/src/modules/system/service/sys_log_login.go @@ -1,6 +1,6 @@ package service -import "nms_nbi/src/modules/system/model" +import "nms_cxy/src/modules/system/model" // ISysLogLogin 系统登录日志 服务层接口 type ISysLogLogin interface { diff --git a/src/modules/system/service/sys_log_login.impl.go b/src/modules/system/service/sys_log_login.impl.go index b2fd0f4..1b529a2 100644 --- a/src/modules/system/service/sys_log_login.impl.go +++ b/src/modules/system/service/sys_log_login.impl.go @@ -1,8 +1,8 @@ package service import ( - "nms_nbi/src/modules/system/model" - "nms_nbi/src/modules/system/repository" + "nms_cxy/src/modules/system/model" + "nms_cxy/src/modules/system/repository" ) // 实例化服务层 SysLogLoginImpl 结构体 diff --git a/src/modules/system/service/sys_log_operate.go b/src/modules/system/service/sys_log_operate.go index dfeec1d..e86120c 100644 --- a/src/modules/system/service/sys_log_operate.go +++ b/src/modules/system/service/sys_log_operate.go @@ -1,6 +1,6 @@ package service -import "nms_nbi/src/modules/system/model" +import "nms_cxy/src/modules/system/model" // ISysLogOperate 操作日志表 服务层接口 type ISysLogOperate interface { diff --git a/src/modules/system/service/sys_log_operate.impl.go b/src/modules/system/service/sys_log_operate.impl.go index 0250043..4726acc 100644 --- a/src/modules/system/service/sys_log_operate.impl.go +++ b/src/modules/system/service/sys_log_operate.impl.go @@ -1,8 +1,8 @@ package service import ( - "nms_nbi/src/modules/system/model" - "nms_nbi/src/modules/system/repository" + "nms_cxy/src/modules/system/model" + "nms_cxy/src/modules/system/repository" ) // 实例化服务层 SysLogOperateImpl 结构体 diff --git a/src/modules/system/service/sys_menu.go b/src/modules/system/service/sys_menu.go index 8322cf8..b14cbfc 100644 --- a/src/modules/system/service/sys_menu.go +++ b/src/modules/system/service/sys_menu.go @@ -1,8 +1,8 @@ package service import ( - "nms_nbi/src/framework/vo" - "nms_nbi/src/modules/system/model" + "nms_cxy/src/framework/vo" + "nms_cxy/src/modules/system/model" ) // ISysMenu 菜单 服务层接口 diff --git a/src/modules/system/service/sys_menu.impl.go b/src/modules/system/service/sys_menu.impl.go index 10e9078..af63955 100644 --- a/src/modules/system/service/sys_menu.impl.go +++ b/src/modules/system/service/sys_menu.impl.go @@ -4,13 +4,13 @@ import ( "encoding/base64" "strings" - "nms_nbi/src/framework/constants/common" - "nms_nbi/src/framework/constants/menu" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/utils/regular" - "nms_nbi/src/framework/vo" - "nms_nbi/src/modules/system/model" - "nms_nbi/src/modules/system/repository" + "nms_cxy/src/framework/constants/common" + "nms_cxy/src/framework/constants/menu" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/utils/regular" + "nms_cxy/src/framework/vo" + "nms_cxy/src/modules/system/model" + "nms_cxy/src/modules/system/repository" ) // 实例化服务层 SysMenuImpl 结构体 diff --git a/src/modules/system/service/sys_post.go b/src/modules/system/service/sys_post.go index 7326636..7af7014 100644 --- a/src/modules/system/service/sys_post.go +++ b/src/modules/system/service/sys_post.go @@ -1,6 +1,6 @@ package service -import "nms_nbi/src/modules/system/model" +import "nms_cxy/src/modules/system/model" // ISysPost 岗位信息 服务层接口 type ISysPost interface { diff --git a/src/modules/system/service/sys_post.impl.go b/src/modules/system/service/sys_post.impl.go index 1885253..270b6ed 100644 --- a/src/modules/system/service/sys_post.impl.go +++ b/src/modules/system/service/sys_post.impl.go @@ -3,8 +3,8 @@ package service import ( "fmt" - "nms_nbi/src/modules/system/model" - "nms_nbi/src/modules/system/repository" + "nms_cxy/src/modules/system/model" + "nms_cxy/src/modules/system/repository" ) // 实例化服务层 SysPostImpl 结构体 diff --git a/src/modules/system/service/sys_role.go b/src/modules/system/service/sys_role.go index cd22cc1..0217255 100644 --- a/src/modules/system/service/sys_role.go +++ b/src/modules/system/service/sys_role.go @@ -1,6 +1,6 @@ package service -import "nms_nbi/src/modules/system/model" +import "nms_cxy/src/modules/system/model" // ISysRole 角色 服务层接口 type ISysRole interface { diff --git a/src/modules/system/service/sys_role.impl.go b/src/modules/system/service/sys_role.impl.go index 934a63d..b968ffb 100644 --- a/src/modules/system/service/sys_role.impl.go +++ b/src/modules/system/service/sys_role.impl.go @@ -3,8 +3,8 @@ package service import ( "fmt" - "nms_nbi/src/modules/system/model" - "nms_nbi/src/modules/system/repository" + "nms_cxy/src/modules/system/model" + "nms_cxy/src/modules/system/repository" ) // 实例化服务层 SysRoleImpl 结构体 diff --git a/src/modules/system/service/sys_user.go b/src/modules/system/service/sys_user.go index 53fbd14..5d5d378 100644 --- a/src/modules/system/service/sys_user.go +++ b/src/modules/system/service/sys_user.go @@ -1,6 +1,6 @@ package service -import "nms_nbi/src/modules/system/model" +import "nms_cxy/src/modules/system/model" // ISysUser 用户 服务层接口 type ISysUser interface { diff --git a/src/modules/system/service/sys_user.impl.go b/src/modules/system/service/sys_user.impl.go index 3759c54..446488d 100644 --- a/src/modules/system/service/sys_user.impl.go +++ b/src/modules/system/service/sys_user.impl.go @@ -3,9 +3,9 @@ package service import ( "fmt" - "nms_nbi/src/framework/constants/admin" - "nms_nbi/src/modules/system/model" - "nms_nbi/src/modules/system/repository" + "nms_cxy/src/framework/constants/admin" + "nms_cxy/src/modules/system/model" + "nms_cxy/src/modules/system/repository" ) // 实例化服务层 SysUserImpl 结构体 diff --git a/src/modules/system/system.go b/src/modules/system/system.go index 0cc0567..794e04b 100644 --- a/src/modules/system/system.go +++ b/src/modules/system/system.go @@ -1,12 +1,12 @@ package system import ( - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/middleware" - "nms_nbi/src/framework/middleware/collectlogs" - "nms_nbi/src/framework/middleware/repeat" - "nms_nbi/src/modules/system/controller" - "nms_nbi/src/modules/system/service" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/middleware" + "nms_cxy/src/framework/middleware/collectlogs" + "nms_cxy/src/framework/middleware/repeat" + "nms_cxy/src/modules/system/controller" + "nms_cxy/src/modules/system/service" "github.com/gin-gonic/gin" ) diff --git a/src/modules/trace/controller/tcpdump.go b/src/modules/trace/controller/tcpdump.go index 7465590..5502c7d 100644 --- a/src/modules/trace/controller/tcpdump.go +++ b/src/modules/trace/controller/tcpdump.go @@ -1,10 +1,10 @@ package controller import ( - "nms_nbi/src/framework/i18n" - "nms_nbi/src/framework/utils/ctx" - "nms_nbi/src/framework/vo/result" - traceService "nms_nbi/src/modules/trace/service" + "nms_cxy/src/framework/i18n" + "nms_cxy/src/framework/utils/ctx" + "nms_cxy/src/framework/vo/result" + traceService "nms_cxy/src/modules/trace/service" "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" diff --git a/src/modules/trace/service/tcpdump.impl.go b/src/modules/trace/service/tcpdump.impl.go index c9a3d8e..00c3143 100644 --- a/src/modules/trace/service/tcpdump.impl.go +++ b/src/modules/trace/service/tcpdump.impl.go @@ -5,11 +5,11 @@ import ( "strings" "time" - "nms_nbi/src/framework/config" - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/utils/cmd" - "nms_nbi/src/framework/utils/date" - neService "nms_nbi/src/modules/network_element/service" + "nms_cxy/src/framework/config" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/utils/cmd" + "nms_cxy/src/framework/utils/date" + neService "nms_cxy/src/modules/network_element/service" ) // 实例化服务层 TcpdumpImpl 结构体 diff --git a/src/modules/trace/trace.go b/src/modules/trace/trace.go index 39a27bb..ad87290 100644 --- a/src/modules/trace/trace.go +++ b/src/modules/trace/trace.go @@ -1,10 +1,10 @@ package trace import ( - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/middleware" - "nms_nbi/src/framework/middleware/collectlogs" - "nms_nbi/src/modules/trace/controller" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/middleware" + "nms_cxy/src/framework/middleware/collectlogs" + "nms_cxy/src/modules/trace/controller" "github.com/gin-gonic/gin" ) diff --git a/src/modules/ws/controller/ws.go b/src/modules/ws/controller/ws.go index d2745c6..91a15b8 100644 --- a/src/modules/ws/controller/ws.go +++ b/src/modules/ws/controller/ws.go @@ -7,16 +7,16 @@ import ( "strings" "time" - neService "nms_nbi/src/modules/network_element/service" + neService "nms_cxy/src/modules/network_element/service" - "nms_nbi/src/framework/i18n" - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/utils/ctx" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/utils/ssh" - "nms_nbi/src/framework/utils/telnet" - "nms_nbi/src/framework/vo/result" - "nms_nbi/src/modules/ws/service" + "nms_cxy/src/framework/i18n" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/utils/ctx" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/utils/ssh" + "nms_cxy/src/framework/utils/telnet" + "nms_cxy/src/framework/vo/result" + "nms_cxy/src/modules/ws/service" "github.com/gin-gonic/gin" ) diff --git a/src/modules/ws/processor/cdr_connect.go b/src/modules/ws/processor/cdr_connect.go index 7b419fb..6e8cf3e 100644 --- a/src/modules/ws/processor/cdr_connect.go +++ b/src/modules/ws/processor/cdr_connect.go @@ -4,10 +4,10 @@ import ( "encoding/json" "fmt" - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/vo/result" - neDataModel "nms_nbi/src/modules/network_data/model" - neDataService "nms_nbi/src/modules/network_data/service" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/vo/result" + neDataModel "nms_cxy/src/modules/network_data/model" + neDataService "nms_cxy/src/modules/network_data/service" ) // GetCDRConnect 获取CDR会话事件-IMS diff --git a/src/modules/ws/processor/ne_state.go b/src/modules/ws/processor/ne_state.go index ef13c99..689f392 100644 --- a/src/modules/ws/processor/ne_state.go +++ b/src/modules/ws/processor/ne_state.go @@ -4,9 +4,9 @@ import ( "encoding/json" "fmt" - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/vo/result" - neService "nms_nbi/src/modules/network_element/service" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/vo/result" + neService "nms_cxy/src/modules/network_element/service" ) // GetNeState 获取网元服务状态 diff --git a/src/modules/ws/processor/net_connect.go b/src/modules/ws/processor/net_connect.go index 3042c36..383619a 100644 --- a/src/modules/ws/processor/net_connect.go +++ b/src/modules/ws/processor/net_connect.go @@ -5,9 +5,9 @@ import ( "fmt" "strings" - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/vo/result" - "nms_nbi/src/modules/ws/model" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/vo/result" + "nms_cxy/src/modules/ws/model" "github.com/shirou/gopsutil/v3/net" "github.com/shirou/gopsutil/v3/process" diff --git a/src/modules/ws/processor/ps_process.go b/src/modules/ws/processor/ps_process.go index f736bde..26c5edc 100644 --- a/src/modules/ws/processor/ps_process.go +++ b/src/modules/ws/processor/ps_process.go @@ -7,11 +7,11 @@ import ( "strings" "sync" - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/utils/date" - "nms_nbi/src/framework/utils/parse" - "nms_nbi/src/framework/vo/result" - "nms_nbi/src/modules/ws/model" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/utils/date" + "nms_cxy/src/framework/utils/parse" + "nms_cxy/src/framework/vo/result" + "nms_cxy/src/modules/ws/model" "github.com/shirou/gopsutil/v3/process" ) diff --git a/src/modules/ws/processor/ue_connect.go b/src/modules/ws/processor/ue_connect.go index 9058e72..0fc9d9b 100644 --- a/src/modules/ws/processor/ue_connect.go +++ b/src/modules/ws/processor/ue_connect.go @@ -4,10 +4,10 @@ import ( "encoding/json" "fmt" - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/vo/result" - neDataModel "nms_nbi/src/modules/network_data/model" - neDataService "nms_nbi/src/modules/network_data/service" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/vo/result" + neDataModel "nms_cxy/src/modules/network_data/model" + neDataService "nms_cxy/src/modules/network_data/service" ) // GetUEConnect 获取UE会话事件-AMF diff --git a/src/modules/ws/processor/upf_total_flow.go b/src/modules/ws/processor/upf_total_flow.go index ced15d3..8502245 100644 --- a/src/modules/ws/processor/upf_total_flow.go +++ b/src/modules/ws/processor/upf_total_flow.go @@ -4,10 +4,10 @@ import ( "encoding/json" "fmt" - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/vo/result" - neDataService "nms_nbi/src/modules/network_data/service" - neService "nms_nbi/src/modules/network_element/service" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/vo/result" + neDataService "nms_cxy/src/modules/network_data/service" + neService "nms_cxy/src/modules/network_element/service" ) // GetUPFTotalFlow 获取UPF-总流量数 N3上行 N6下行 单位比特(bit) diff --git a/src/modules/ws/service/ws.go b/src/modules/ws/service/ws.go index 34697e4..f88ea92 100644 --- a/src/modules/ws/service/ws.go +++ b/src/modules/ws/service/ws.go @@ -3,7 +3,7 @@ package service import ( "net/http" - "nms_nbi/src/modules/ws/model" + "nms_cxy/src/modules/ws/model" "github.com/gorilla/websocket" ) diff --git a/src/modules/ws/service/ws.impl.go b/src/modules/ws/service/ws.impl.go index 60b2fe9..eecc24f 100644 --- a/src/modules/ws/service/ws.impl.go +++ b/src/modules/ws/service/ws.impl.go @@ -6,10 +6,10 @@ import ( "sync" "time" - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/utils/generate" - "nms_nbi/src/framework/vo/result" - "nms_nbi/src/modules/ws/model" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/utils/generate" + "nms_cxy/src/framework/vo/result" + "nms_cxy/src/modules/ws/model" "github.com/gorilla/websocket" ) diff --git a/src/modules/ws/service/ws_receive.go b/src/modules/ws/service/ws_receive.go index ee7a0ae..4f11d6a 100644 --- a/src/modules/ws/service/ws_receive.go +++ b/src/modules/ws/service/ws_receive.go @@ -1,6 +1,6 @@ package service -import "nms_nbi/src/modules/ws/model" +import "nms_cxy/src/modules/ws/model" // IWSReceive WebSocket消息接收处理 服务层接口 type IWSReceive interface { diff --git a/src/modules/ws/service/ws_receive.impl.go b/src/modules/ws/service/ws_receive.impl.go index 373e43f..0d7e3f0 100644 --- a/src/modules/ws/service/ws_receive.impl.go +++ b/src/modules/ws/service/ws_receive.impl.go @@ -5,12 +5,12 @@ import ( "fmt" "time" - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/utils/ssh" - "nms_nbi/src/framework/utils/telnet" - "nms_nbi/src/framework/vo/result" - "nms_nbi/src/modules/ws/model" - "nms_nbi/src/modules/ws/processor" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/utils/ssh" + "nms_cxy/src/framework/utils/telnet" + "nms_cxy/src/framework/vo/result" + "nms_cxy/src/modules/ws/model" + "nms_cxy/src/modules/ws/processor" ) // 实例化服务层 WSReceiveImpl 结构体 diff --git a/src/modules/ws/service/ws_send.impl.go b/src/modules/ws/service/ws_send.impl.go index ad97c0e..f429e5e 100644 --- a/src/modules/ws/service/ws_send.impl.go +++ b/src/modules/ws/service/ws_send.impl.go @@ -4,8 +4,8 @@ import ( "encoding/json" "fmt" - "nms_nbi/src/framework/vo/result" - "nms_nbi/src/modules/ws/model" + "nms_cxy/src/framework/vo/result" + "nms_cxy/src/modules/ws/model" ) // 订阅组指定编号为支持服务器向客户端主动推送数据 diff --git a/src/modules/ws/ws.go b/src/modules/ws/ws.go index 1efdac5..8fc6270 100644 --- a/src/modules/ws/ws.go +++ b/src/modules/ws/ws.go @@ -1,10 +1,10 @@ package ws import ( - "nms_nbi/src/framework/logger" - "nms_nbi/src/framework/middleware" - "nms_nbi/src/framework/middleware/collectlogs" - "nms_nbi/src/modules/ws/controller" + "nms_cxy/src/framework/logger" + "nms_cxy/src/framework/middleware" + "nms_cxy/src/framework/middleware/collectlogs" + "nms_cxy/src/modules/ws/controller" "github.com/gin-gonic/gin" )