From ab5fab4040fb250b1bfabe2e4e7bed03fad458fb Mon Sep 17 00:00:00 2001 From: wangjuntao Date: Sat, 24 Jun 2023 11:43:03 +0800 Subject: [PATCH] update mod --- app/app.go | 12 +++---- app/cwmp.go | 14 ++++---- app/cwmp_preset.go | 8 ++--- app/cwmp_scheduled.go | 8 ++--- app/cwmp_test.go | 2 +- app/database.go | 4 +-- app/i18n.go | 4 +-- app/i18n_test.go | 4 +-- app/initdb.go | 4 +-- app/inittest.go | 4 +-- app/jobs.go | 6 ++-- app/pagefunc.go | 2 +- app/radius_metrics.go | 2 +- app/tr069_metrics.go | 2 +- commands/benchmark/benchmark.go | 2 +- commands/benchmark/bmtest.go | 4 +-- commands/initdb/initdb.go | 4 +-- commands/initdevcfg/initdevcfg.go | 2 +- commands/inittest/inittest.go | 4 +-- common/cwmp/Download.go | 2 +- common/cwmp/DownloadResponse.go | 2 +- common/cwmp/FactoryReset.go | 2 +- common/cwmp/FactoryResetResponse.go | 2 +- common/cwmp/GetParameterNames.go | 2 +- common/cwmp/GetParameterNamesResponse.go | 2 +- common/cwmp/GetParameterNames_test.go | 2 +- common/cwmp/GetParameterValues.go | 2 +- common/cwmp/GetParameterValuesResponse.go | 2 +- common/cwmp/GetRPCMethods.go | 2 +- common/cwmp/GetRPCMethodsResponse.go | 2 +- common/cwmp/Inform.go | 2 +- common/cwmp/InformResponse.go | 2 +- common/cwmp/Message.go | 2 +- common/cwmp/OnlineInform.go | 2 +- common/cwmp/Parser.go | 2 +- common/cwmp/Reboot.go | 2 +- common/cwmp/RebootResponse.go | 2 +- common/cwmp/ScheduleInform.go | 2 +- common/cwmp/ScheduleInformResponse.go | 2 +- common/cwmp/SetParameterValues.go | 2 +- common/cwmp/SetParameterValuesResponse.go | 2 +- common/cwmp/TransferComplete.go | 2 +- common/cwmp/TransferCompleteResponse.go | 2 +- common/cwmp/Upload.go | 2 +- common/cwmp/UploadResponse.go | 2 +- common/cwmp/ValueChange.go | 2 +- common/cwmp/utils.go | 2 +- common/excel/excel.go | 2 +- common/lokiquery/lokiquery.go | 2 +- common/lokiquery/lokiquery_test.go | 4 +-- common/snmp/iface.go | 2 +- common/snmp/snmp.go | 4 +-- common/snmp/snmp_test.go | 2 +- common/web/prequery.go | 2 +- common/web/web.go | 2 +- common/wfs-local/drive.go | 2 +- common/zaplog/loki.go | 2 +- common/zaplog/zaplog_test.go | 2 +- config/config.go | 2 +- controllers/apitoken/apitoken.go | 10 +++--- controllers/charts/charts.go | 10 +++--- controllers/cpe/cpe.go | 32 +++++++++--------- controllers/crontoller.go | 34 ++++++++++---------- controllers/cwmpconfig/cwmpconfig.go | 28 ++++++++-------- controllers/cwmpconfig/cwmpconfig_session.go | 30 ++++++++--------- controllers/cwmppreset/cwmp.go | 32 +++++++++--------- controllers/dashboard/dashboard.go | 10 +++--- controllers/dashboard/radius.go | 8 ++--- controllers/dashboard/system.go | 8 ++--- controllers/dashboard/tr069.go | 10 +++--- controllers/factoryreset/factoryreset.go | 10 +++--- controllers/firmwareconfig/firmwareconfig.go | 10 +++--- controllers/index/index.go | 12 +++---- controllers/logs/loki.go | 10 +++--- controllers/logs/oplog.go | 10 +++--- controllers/metrics/metrics.go | 4 +-- controllers/node/node.go | 10 +++--- controllers/opr/opr.go | 10 +++--- controllers/radius/logs.go | 10 +++--- controllers/radius/profile.go | 10 +++--- controllers/radius/session.go | 10 +++--- controllers/radius/user.go | 10 +++--- controllers/settings/settings.go | 12 +++---- controllers/supervise/cwmp.go | 12 +++---- controllers/supervise/cwmp_factorycfg.go | 14 ++++---- controllers/supervise/cwmp_updatefirmware.go | 14 ++++---- controllers/supervise/cwmpconfig.go | 14 ++++---- controllers/supervise/supervise.go | 16 ++++----- controllers/translate/translate.go | 8 ++--- controllers/vpe/vpe.go | 10 +++--- freeradius/freeradius.go | 10 +++--- freeradius/handlers.go | 12 +++---- freeradius/server.go | 6 ++-- go.mod | 2 +- installer/installer.go | 4 +-- main.go | 24 +++++++------- models/cwmp.go | 2 +- models/marshal.go | 2 +- toughradius/acct_ops.go | 4 +-- toughradius/acct_start.go | 4 +-- toughradius/acct_stop.go | 4 +-- toughradius/acct_update.go | 6 ++-- toughradius/auth_accept_config.go | 16 ++++----- toughradius/auth_bind_check.go | 6 ++-- toughradius/auth_check_online.go | 2 +- toughradius/auth_ldap_accept_config.go | 18 +++++------ toughradius/auth_passwd_check.go | 8 ++--- toughradius/errors.go | 2 +- toughradius/radius.go | 8 ++--- toughradius/radius_acct.go | 6 ++-- toughradius/radius_auth.go | 8 ++--- toughradius/radius_ldap_acct.go | 2 +- toughradius/radius_ldap_auth.go | 10 +++--- toughradius/radsec_server.go | 6 ++-- toughradius/radsec_service.go | 2 +- toughradius/server.go | 8 ++--- toughradius/vendor_parse.go | 6 ++-- tr069/handlers.go | 12 +++---- tr069/server.go | 8 ++--- webserver/server.go | 16 ++++----- 120 files changed, 414 insertions(+), 414 deletions(-) diff --git a/app/app.go b/app/app.go index 5db8affa..8d594df2 100644 --- a/app/app.go +++ b/app/app.go @@ -11,12 +11,12 @@ import ( "github.com/robfig/cron/v3" "github.com/spf13/cast" - "github.com/talkincode/toughradius/assets" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/common/zaplog" - "github.com/talkincode/toughradius/common/zaplog/log" - "github.com/talkincode/toughradius/config" - "github.com/talkincode/toughradius/models" + "github.com/talkincode/toughradius/v8/assets" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/common/zaplog" + "github.com/talkincode/toughradius/v8/common/zaplog/log" + "github.com/talkincode/toughradius/v8/config" + "github.com/talkincode/toughradius/v8/models" bolt "go.etcd.io/bbolt" "gorm.io/gorm" ) diff --git a/app/cwmp.go b/app/cwmp.go index 3a815904..ccb14ccd 100644 --- a/app/cwmp.go +++ b/app/cwmp.go @@ -10,13 +10,13 @@ import ( "text/template" "time" - "github.com/talkincode/toughradius/assets" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/common/cwmp" - "github.com/talkincode/toughradius/common/timeutil" - "github.com/talkincode/toughradius/common/web" - "github.com/talkincode/toughradius/common/zaplog/log" - "github.com/talkincode/toughradius/models" + "github.com/talkincode/toughradius/v8/assets" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/common/cwmp" + "github.com/talkincode/toughradius/v8/common/timeutil" + "github.com/talkincode/toughradius/v8/common/web" + "github.com/talkincode/toughradius/v8/common/zaplog/log" + "github.com/talkincode/toughradius/v8/models" ) type CwmpEventTable struct { diff --git a/app/cwmp_preset.go b/app/cwmp_preset.go index ba661d5c..e0f06037 100644 --- a/app/cwmp_preset.go +++ b/app/cwmp_preset.go @@ -5,10 +5,10 @@ import ( "strings" "time" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/common/cwmp" - "github.com/talkincode/toughradius/common/zaplog/log" - "github.com/talkincode/toughradius/models" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/common/cwmp" + "github.com/talkincode/toughradius/v8/common/zaplog/log" + "github.com/talkincode/toughradius/v8/models" "gopkg.in/yaml.v2" ) diff --git a/app/cwmp_scheduled.go b/app/cwmp_scheduled.go index 70ae9870..b2644401 100644 --- a/app/cwmp_scheduled.go +++ b/app/cwmp_scheduled.go @@ -4,10 +4,10 @@ import ( "fmt" "time" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/common/cwmp" - "github.com/talkincode/toughradius/common/zaplog/log" - "github.com/talkincode/toughradius/models" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/common/cwmp" + "github.com/talkincode/toughradius/v8/common/zaplog/log" + "github.com/talkincode/toughradius/v8/models" "gopkg.in/yaml.v2" ) diff --git a/app/cwmp_test.go b/app/cwmp_test.go index f1531173..e85227d4 100644 --- a/app/cwmp_test.go +++ b/app/cwmp_test.go @@ -3,7 +3,7 @@ package app import ( "testing" - "github.com/talkincode/toughradius/models" + "github.com/talkincode/toughradius/v8/models" ) func TestMatchTaskTags(t *testing.T) { diff --git a/app/database.go b/app/database.go index 944ac616..b27ae0ed 100644 --- a/app/database.go +++ b/app/database.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/config" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/config" "go.uber.org/zap" "gorm.io/driver/postgres" "gorm.io/gorm" diff --git a/app/i18n.go b/app/i18n.go index f02f2710..012be0fc 100644 --- a/app/i18n.go +++ b/app/i18n.go @@ -6,8 +6,8 @@ import ( "sort" "strings" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/common/zaplog/log" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/common/zaplog/log" bolt "go.etcd.io/bbolt" ) diff --git a/app/i18n_test.go b/app/i18n_test.go index d07a1a3f..d3634b8f 100644 --- a/app/i18n_test.go +++ b/app/i18n_test.go @@ -3,8 +3,8 @@ package app import ( "testing" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/config" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/config" ) func TestApplication_Translate(t *testing.T) { diff --git a/app/initdb.go b/app/initdb.go index 6779d1ca..cedcbddf 100644 --- a/app/initdb.go +++ b/app/initdb.go @@ -3,8 +3,8 @@ package app import ( "time" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/models" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/models" ) func (a *Application) checkSuper() { diff --git a/app/inittest.go b/app/inittest.go index 9286b8d9..d38c845e 100644 --- a/app/inittest.go +++ b/app/inittest.go @@ -3,8 +3,8 @@ package app import ( "time" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/models" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/models" ) func (a *Application) InitTest() { diff --git a/app/jobs.go b/app/jobs.go index 7a20e5bc..193976e4 100644 --- a/app/jobs.go +++ b/app/jobs.go @@ -11,9 +11,9 @@ import ( "github.com/shirou/gopsutil/mem" "github.com/shirou/gopsutil/process" "github.com/spf13/cast" - "github.com/talkincode/toughradius/common/zaplog" - "github.com/talkincode/toughradius/common/zaplog/log" - "github.com/talkincode/toughradius/models" + "github.com/talkincode/toughradius/v8/common/zaplog" + "github.com/talkincode/toughradius/v8/common/zaplog/log" + "github.com/talkincode/toughradius/v8/models" ) var cronParser = cron.NewParser( diff --git a/app/pagefunc.go b/app/pagefunc.go index cc57ddfb..02db6a35 100644 --- a/app/pagefunc.go +++ b/app/pagefunc.go @@ -4,7 +4,7 @@ import ( "strings" "time" - "github.com/talkincode/toughradius/assets" + "github.com/talkincode/toughradius/v8/assets" ) func (a *Application) GetTemplateFuncMap() map[string]interface{} { diff --git a/app/radius_metrics.go b/app/radius_metrics.go index e6292353..e0a60a7e 100644 --- a/app/radius_metrics.go +++ b/app/radius_metrics.go @@ -4,7 +4,7 @@ import ( "time" istats "github.com/montanaflynn/stats" - "github.com/talkincode/toughradius/common/zaplog" + "github.com/talkincode/toughradius/v8/common/zaplog" ) const ( diff --git a/app/tr069_metrics.go b/app/tr069_metrics.go index 530673b1..e66c8b14 100644 --- a/app/tr069_metrics.go +++ b/app/tr069_metrics.go @@ -4,7 +4,7 @@ import ( "time" istats "github.com/montanaflynn/stats" - "github.com/talkincode/toughradius/common/zaplog" + "github.com/talkincode/toughradius/v8/common/zaplog" ) const ( diff --git a/commands/benchmark/benchmark.go b/commands/benchmark/benchmark.go index 14b6c403..8ca40d83 100644 --- a/commands/benchmark/benchmark.go +++ b/commands/benchmark/benchmark.go @@ -7,7 +7,7 @@ import ( "sync/atomic" "time" - "github.com/talkincode/toughradius/common/timeutil" + "github.com/talkincode/toughradius/v8/common/timeutil" ) type BenchmarkStat struct { diff --git a/commands/benchmark/bmtest.go b/commands/benchmark/bmtest.go index 3779f4ff..8f4a6d6b 100644 --- a/commands/benchmark/bmtest.go +++ b/commands/benchmark/bmtest.go @@ -15,8 +15,8 @@ import ( "github.com/shirou/gopsutil/cpu" "github.com/shirou/gopsutil/host" "github.com/shirou/gopsutil/mem" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/toughradius" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/toughradius" "layeh.com/radius" "layeh.com/radius/rfc2865" "layeh.com/radius/rfc2866" diff --git a/commands/initdb/initdb.go b/commands/initdb/initdb.go index 83d8fc75..02b6ce6c 100644 --- a/commands/initdb/initdb.go +++ b/commands/initdb/initdb.go @@ -1,8 +1,8 @@ package main import ( - "github.com/talkincode/toughradius/app" - "github.com/talkincode/toughradius/config" + "github.com/talkincode/toughradius/v8/app" + "github.com/talkincode/toughradius/v8/config" ) // 开发环境初始化数据库 diff --git a/commands/initdevcfg/initdevcfg.go b/commands/initdevcfg/initdevcfg.go index 280a28a8..b0eed672 100644 --- a/commands/initdevcfg/initdevcfg.go +++ b/commands/initdevcfg/initdevcfg.go @@ -3,7 +3,7 @@ package main import ( "os" - "github.com/talkincode/toughradius/config" + "github.com/talkincode/toughradius/v8/config" "gopkg.in/yaml.v2" ) diff --git a/commands/inittest/inittest.go b/commands/inittest/inittest.go index 77ef4d16..1ca16e3b 100644 --- a/commands/inittest/inittest.go +++ b/commands/inittest/inittest.go @@ -1,8 +1,8 @@ package main import ( - "github.com/talkincode/toughradius/app" - "github.com/talkincode/toughradius/config" + "github.com/talkincode/toughradius/v8/app" + "github.com/talkincode/toughradius/v8/config" ) func main() { diff --git a/common/cwmp/Download.go b/common/cwmp/Download.go index 806dc1d4..6fbfdc74 100644 --- a/common/cwmp/Download.go +++ b/common/cwmp/Download.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/talkincode/toughradius/common/xmlx" + "github.com/talkincode/toughradius/v8/common/xmlx" ) // Download type diff --git a/common/cwmp/DownloadResponse.go b/common/cwmp/DownloadResponse.go index fa369cad..43b65939 100644 --- a/common/cwmp/DownloadResponse.go +++ b/common/cwmp/DownloadResponse.go @@ -6,7 +6,7 @@ import ( "strconv" "time" - "github.com/talkincode/toughradius/common/xmlx" + "github.com/talkincode/toughradius/v8/common/xmlx" ) // DownloadResponse download response diff --git a/common/cwmp/FactoryReset.go b/common/cwmp/FactoryReset.go index 89deec32..0788abd4 100644 --- a/common/cwmp/FactoryReset.go +++ b/common/cwmp/FactoryReset.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/talkincode/toughradius/common/xmlx" + "github.com/talkincode/toughradius/v8/common/xmlx" ) // FactoryReset cpe diff --git a/common/cwmp/FactoryResetResponse.go b/common/cwmp/FactoryResetResponse.go index ff9dd0f0..6336116b 100644 --- a/common/cwmp/FactoryResetResponse.go +++ b/common/cwmp/FactoryResetResponse.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/talkincode/toughradius/common/xmlx" + "github.com/talkincode/toughradius/v8/common/xmlx" ) // FactoryResetResponse diff --git a/common/cwmp/GetParameterNames.go b/common/cwmp/GetParameterNames.go index b963dc41..ce0779ae 100644 --- a/common/cwmp/GetParameterNames.go +++ b/common/cwmp/GetParameterNames.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/talkincode/toughradius/common/xmlx" + "github.com/talkincode/toughradius/v8/common/xmlx" ) // GetParameterNames get rpc methods diff --git a/common/cwmp/GetParameterNamesResponse.go b/common/cwmp/GetParameterNamesResponse.go index 1fb9943d..8140a34e 100644 --- a/common/cwmp/GetParameterNamesResponse.go +++ b/common/cwmp/GetParameterNamesResponse.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/talkincode/toughradius/common/xmlx" + "github.com/talkincode/toughradius/v8/common/xmlx" ) // GetParameterNamesResponse GetParameterNames reponse diff --git a/common/cwmp/GetParameterNames_test.go b/common/cwmp/GetParameterNames_test.go index e42117e1..7aa9b26c 100644 --- a/common/cwmp/GetParameterNames_test.go +++ b/common/cwmp/GetParameterNames_test.go @@ -4,7 +4,7 @@ import ( _ "embed" "testing" - "github.com/talkincode/toughradius/common" + "github.com/talkincode/toughradius/v8/common" ) //go:embed GetParameterNames.xml diff --git a/common/cwmp/GetParameterValues.go b/common/cwmp/GetParameterValues.go index 04318c15..f4bde803 100644 --- a/common/cwmp/GetParameterValues.go +++ b/common/cwmp/GetParameterValues.go @@ -6,7 +6,7 @@ import ( "strconv" "time" - "github.com/talkincode/toughradius/common/xmlx" + "github.com/talkincode/toughradius/v8/common/xmlx" ) // GetParameterValues get paramvalues diff --git a/common/cwmp/GetParameterValuesResponse.go b/common/cwmp/GetParameterValuesResponse.go index dae9d8fd..6f92d1de 100644 --- a/common/cwmp/GetParameterValuesResponse.go +++ b/common/cwmp/GetParameterValuesResponse.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/talkincode/toughradius/common/xmlx" + "github.com/talkincode/toughradius/v8/common/xmlx" ) // GetParameterValuesResponse getParameterValues response diff --git a/common/cwmp/GetRPCMethods.go b/common/cwmp/GetRPCMethods.go index e231e9aa..9f5742ba 100644 --- a/common/cwmp/GetRPCMethods.go +++ b/common/cwmp/GetRPCMethods.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/talkincode/toughradius/common/xmlx" + "github.com/talkincode/toughradius/v8/common/xmlx" ) // GetRPCMethods get rpc methods diff --git a/common/cwmp/GetRPCMethodsResponse.go b/common/cwmp/GetRPCMethodsResponse.go index c7be122a..7e382d89 100644 --- a/common/cwmp/GetRPCMethodsResponse.go +++ b/common/cwmp/GetRPCMethodsResponse.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/talkincode/toughradius/common/xmlx" + "github.com/talkincode/toughradius/v8/common/xmlx" ) // GetRPCMethodsResponse getRPCMethods reponse diff --git a/common/cwmp/Inform.go b/common/cwmp/Inform.go index 525e89a7..516b2bc6 100644 --- a/common/cwmp/Inform.go +++ b/common/cwmp/Inform.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/talkincode/toughradius/common/xmlx" + "github.com/talkincode/toughradius/v8/common/xmlx" ) // Inform tr069 inform (heartbeat) diff --git a/common/cwmp/InformResponse.go b/common/cwmp/InformResponse.go index fa918263..f65836d7 100644 --- a/common/cwmp/InformResponse.go +++ b/common/cwmp/InformResponse.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/talkincode/toughradius/common/xmlx" + "github.com/talkincode/toughradius/v8/common/xmlx" ) // InformResponse infrom response diff --git a/common/cwmp/Message.go b/common/cwmp/Message.go index 106a9734..c4072712 100644 --- a/common/cwmp/Message.go +++ b/common/cwmp/Message.go @@ -3,7 +3,7 @@ package cwmp import ( "encoding/xml" - "github.com/talkincode/toughradius/common/xmlx" + "github.com/talkincode/toughradius/v8/common/xmlx" ) const ( diff --git a/common/cwmp/OnlineInform.go b/common/cwmp/OnlineInform.go index 16219127..41902a67 100644 --- a/common/cwmp/OnlineInform.go +++ b/common/cwmp/OnlineInform.go @@ -1,7 +1,7 @@ package cwmp import ( - "github.com/talkincode/toughradius/common/xmlx" + "github.com/talkincode/toughradius/v8/common/xmlx" ) // OnlineInform online client diff --git a/common/cwmp/Parser.go b/common/cwmp/Parser.go index 90abe097..f2aa63f5 100644 --- a/common/cwmp/Parser.go +++ b/common/cwmp/Parser.go @@ -3,7 +3,7 @@ package cwmp import ( "errors" - "github.com/talkincode/toughradius/common/xmlx" + "github.com/talkincode/toughradius/v8/common/xmlx" ) // ParseXML parse xml msg diff --git a/common/cwmp/Reboot.go b/common/cwmp/Reboot.go index b270e0bf..d2f9926f 100644 --- a/common/cwmp/Reboot.go +++ b/common/cwmp/Reboot.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/talkincode/toughradius/common/xmlx" + "github.com/talkincode/toughradius/v8/common/xmlx" ) // Reboot reboot cpe diff --git a/common/cwmp/RebootResponse.go b/common/cwmp/RebootResponse.go index ca1f892b..d7685710 100644 --- a/common/cwmp/RebootResponse.go +++ b/common/cwmp/RebootResponse.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/talkincode/toughradius/common/xmlx" + "github.com/talkincode/toughradius/v8/common/xmlx" ) // RebootResponse reboot response diff --git a/common/cwmp/ScheduleInform.go b/common/cwmp/ScheduleInform.go index 22e0a949..d704dc25 100644 --- a/common/cwmp/ScheduleInform.go +++ b/common/cwmp/ScheduleInform.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/talkincode/toughradius/common/xmlx" + "github.com/talkincode/toughradius/v8/common/xmlx" ) // ScheduleInform cpe diff --git a/common/cwmp/ScheduleInformResponse.go b/common/cwmp/ScheduleInformResponse.go index 129b998d..83862a9d 100644 --- a/common/cwmp/ScheduleInformResponse.go +++ b/common/cwmp/ScheduleInformResponse.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/talkincode/toughradius/common/xmlx" + "github.com/talkincode/toughradius/v8/common/xmlx" ) // ScheduleInformResponse resp diff --git a/common/cwmp/SetParameterValues.go b/common/cwmp/SetParameterValues.go index 051b0e2b..3bba7501 100644 --- a/common/cwmp/SetParameterValues.go +++ b/common/cwmp/SetParameterValues.go @@ -6,7 +6,7 @@ import ( "strconv" "time" - "github.com/talkincode/toughradius/common/xmlx" + "github.com/talkincode/toughradius/v8/common/xmlx" ) // SetParameterValues set param diff --git a/common/cwmp/SetParameterValuesResponse.go b/common/cwmp/SetParameterValuesResponse.go index da1c0601..37413796 100644 --- a/common/cwmp/SetParameterValuesResponse.go +++ b/common/cwmp/SetParameterValuesResponse.go @@ -6,7 +6,7 @@ import ( "strconv" "time" - "github.com/talkincode/toughradius/common/xmlx" + "github.com/talkincode/toughradius/v8/common/xmlx" ) // SetParameterValuesResponse set param reponse diff --git a/common/cwmp/TransferComplete.go b/common/cwmp/TransferComplete.go index f952f8d2..9cb9d0d7 100644 --- a/common/cwmp/TransferComplete.go +++ b/common/cwmp/TransferComplete.go @@ -6,7 +6,7 @@ import ( "strconv" "time" - "github.com/talkincode/toughradius/common/xmlx" + "github.com/talkincode/toughradius/v8/common/xmlx" ) // TransferComplete download complete diff --git a/common/cwmp/TransferCompleteResponse.go b/common/cwmp/TransferCompleteResponse.go index 60d81a5c..1b1f3f5f 100644 --- a/common/cwmp/TransferCompleteResponse.go +++ b/common/cwmp/TransferCompleteResponse.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/talkincode/toughradius/common/xmlx" + "github.com/talkincode/toughradius/v8/common/xmlx" ) // TransferCompleteResponse transferComplete response diff --git a/common/cwmp/Upload.go b/common/cwmp/Upload.go index 5f01999f..c627611d 100644 --- a/common/cwmp/Upload.go +++ b/common/cwmp/Upload.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/talkincode/toughradius/common/xmlx" + "github.com/talkincode/toughradius/v8/common/xmlx" ) // Upload tr069 upload msg diff --git a/common/cwmp/UploadResponse.go b/common/cwmp/UploadResponse.go index d0cebef8..c8921ed0 100644 --- a/common/cwmp/UploadResponse.go +++ b/common/cwmp/UploadResponse.go @@ -6,7 +6,7 @@ import ( "strconv" "time" - "github.com/talkincode/toughradius/common/xmlx" + "github.com/talkincode/toughradius/v8/common/xmlx" ) // UploadResponse upload response diff --git a/common/cwmp/ValueChange.go b/common/cwmp/ValueChange.go index f11dd109..1d3702ac 100644 --- a/common/cwmp/ValueChange.go +++ b/common/cwmp/ValueChange.go @@ -1,7 +1,7 @@ package cwmp import ( - "github.com/talkincode/toughradius/common/xmlx" + "github.com/talkincode/toughradius/v8/common/xmlx" ) // ValueChange value change diff --git a/common/cwmp/utils.go b/common/cwmp/utils.go index d54ccbc6..407a1ec7 100644 --- a/common/cwmp/utils.go +++ b/common/cwmp/utils.go @@ -1,7 +1,7 @@ package cwmp import ( - "github.com/talkincode/toughradius/common/xmlx" + "github.com/talkincode/toughradius/v8/common/xmlx" ) func getDocNodeValue(doc *xmlx.Document, ns string, name string) string { diff --git a/common/excel/excel.go b/common/excel/excel.go index 7960ed47..4c54092f 100644 --- a/common/excel/excel.go +++ b/common/excel/excel.go @@ -9,7 +9,7 @@ import ( "time" "github.com/360EntSecGroup-Skylar/excelize" - "github.com/talkincode/toughradius/common/timeutil" + "github.com/talkincode/toughradius/v8/common/timeutil" ) func WriteToFile(sheet string, records []interface{}, filepath string) error { diff --git a/common/lokiquery/lokiquery.go b/common/lokiquery/lokiquery.go index 3e14f938..9936447f 100644 --- a/common/lokiquery/lokiquery.go +++ b/common/lokiquery/lokiquery.go @@ -6,7 +6,7 @@ import ( "time" "github.com/guonaihong/gout" - "github.com/talkincode/toughradius/common" + "github.com/talkincode/toughradius/v8/common" ) func LokiQuery(q *LokiQueryForm) ([]Lokilog, error) { diff --git a/common/lokiquery/lokiquery_test.go b/common/lokiquery/lokiquery_test.go index fcd00375..72da5a0b 100644 --- a/common/lokiquery/lokiquery_test.go +++ b/common/lokiquery/lokiquery_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - "github.com/talkincode/toughradius/app" - "github.com/talkincode/toughradius/config" + "github.com/talkincode/toughradius/v8/app" + "github.com/talkincode/toughradius/v8/config" ) func TestLokiQuery_QueryString(t *testing.T) { diff --git a/common/snmp/iface.go b/common/snmp/iface.go index 1cbca046..3cf8d127 100644 --- a/common/snmp/iface.go +++ b/common/snmp/iface.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/gosnmp/gosnmp" - "github.com/talkincode/toughradius/common/snmp/mibs/hostresmib" + "github.com/talkincode/toughradius/v8/common/snmp/mibs/hostresmib" ) type DeviceIfOctets struct { diff --git a/common/snmp/snmp.go b/common/snmp/snmp.go index 7d06481b..b1441215 100644 --- a/common/snmp/snmp.go +++ b/common/snmp/snmp.go @@ -9,8 +9,8 @@ import ( "time" "github.com/montanaflynn/stats" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/common/snmp/mibs/hostresmib" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/common/snmp/mibs/hostresmib" "github.com/gosnmp/gosnmp" ) diff --git a/common/snmp/snmp_test.go b/common/snmp/snmp_test.go index b3ad2ad7..c1eedbfb 100644 --- a/common/snmp/snmp_test.go +++ b/common/snmp/snmp_test.go @@ -10,7 +10,7 @@ import ( "github.com/gosnmp/gosnmp" "github.com/hallidave/mibtool/smi" - "github.com/talkincode/toughradius/common/snmp/mibs/hostresmib" + "github.com/talkincode/toughradius/v8/common/snmp/mibs/hostresmib" ) func TestWalk(t *testing.T) { diff --git a/common/web/prequery.go b/common/web/prequery.go index 0ed3338a..4dcf054c 100644 --- a/common/web/prequery.go +++ b/common/web/prequery.go @@ -5,7 +5,7 @@ import ( "time" "github.com/labstack/echo/v4" - "github.com/talkincode/toughradius/common" + "github.com/talkincode/toughradius/v8/common" "gorm.io/gorm" ) diff --git a/common/web/web.go b/common/web/web.go index 1a56b2ed..44823f74 100644 --- a/common/web/web.go +++ b/common/web/web.go @@ -32,7 +32,7 @@ import ( "github.com/golang-jwt/jwt/v4" "github.com/labstack/echo/v4" "github.com/spf13/cast" - "github.com/talkincode/toughradius/common" + "github.com/talkincode/toughradius/v8/common" "gorm.io/gorm" ) diff --git a/common/wfs-local/drive.go b/common/wfs-local/drive.go index cea4e148..98007d44 100644 --- a/common/wfs-local/drive.go +++ b/common/wfs-local/drive.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strings" - "github.com/talkincode/toughradius/common/wfs" + "github.com/talkincode/toughradius/v8/common/wfs" ) type LocalDrive struct { diff --git a/common/zaplog/loki.go b/common/zaplog/loki.go index 89e4ca0b..fa76f3e7 100644 --- a/common/zaplog/loki.go +++ b/common/zaplog/loki.go @@ -8,7 +8,7 @@ import ( "time" "github.com/guonaihong/gout" - "github.com/talkincode/toughradius/common" + "github.com/talkincode/toughradius/v8/common" ) // loki diff --git a/common/zaplog/zaplog_test.go b/common/zaplog/zaplog_test.go index d8ff4278..fada0f21 100644 --- a/common/zaplog/zaplog_test.go +++ b/common/zaplog/zaplog_test.go @@ -3,7 +3,7 @@ package zaplog import ( "testing" - "github.com/talkincode/toughradius/common/zaplog/log" + "github.com/talkincode/toughradius/v8/common/zaplog/log" ) func TestInfo(t *testing.T) { diff --git a/config/config.go b/config/config.go index deba487c..487d2407 100644 --- a/config/config.go +++ b/config/config.go @@ -5,7 +5,7 @@ import ( "path" "strconv" - "github.com/talkincode/toughradius/common" + "github.com/talkincode/toughradius/v8/common" "gopkg.in/yaml.v3" ) diff --git a/controllers/apitoken/apitoken.go b/controllers/apitoken/apitoken.go index 6995a9bb..56091c5d 100644 --- a/controllers/apitoken/apitoken.go +++ b/controllers/apitoken/apitoken.go @@ -7,11 +7,11 @@ import ( "time" "github.com/labstack/echo/v4" - "github.com/talkincode/toughradius/app" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/common/web" - "github.com/talkincode/toughradius/models" - "github.com/talkincode/toughradius/webserver" + "github.com/talkincode/toughradius/v8/app" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/common/web" + "github.com/talkincode/toughradius/v8/models" + "github.com/talkincode/toughradius/v8/webserver" ) func InitRouter() { diff --git a/controllers/charts/charts.go b/controllers/charts/charts.go index eef66280..2b4c8558 100644 --- a/controllers/charts/charts.go +++ b/controllers/charts/charts.go @@ -4,11 +4,11 @@ import ( "net/http" "github.com/labstack/echo/v4" - "github.com/talkincode/toughradius/app" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/common/echarts" - "github.com/talkincode/toughradius/models" - "github.com/talkincode/toughradius/webserver" + "github.com/talkincode/toughradius/v8/app" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/common/echarts" + "github.com/talkincode/toughradius/v8/models" + "github.com/talkincode/toughradius/v8/webserver" ) func InitRouter() { diff --git a/controllers/cpe/cpe.go b/controllers/cpe/cpe.go index 84aaad2e..5f6f9dcf 100644 --- a/controllers/cpe/cpe.go +++ b/controllers/cpe/cpe.go @@ -8,11 +8,11 @@ import ( "github.com/labstack/echo/v4" "github.com/spf13/cast" - "github.com/talkincode/toughradius/app" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/common/web" - "github.com/talkincode/toughradius/models" - "github.com/talkincode/toughradius/webserver" + "github.com/talkincode/toughradius/v8/app" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/common/web" + "github.com/talkincode/toughradius/v8/models" + "github.com/talkincode/toughradius/v8/webserver" "gorm.io/gorm/clause" ) @@ -149,17 +149,17 @@ func InitRouter() { } -// @Summary Query CPE list -// @Description Query cpe list -// @Tags CPE -// @Accept json -// @Produce json -// @Param node_id query string false "node_id" -// @Param customer_id query string false "customer_id" -// @Param keyword query string false "keyword" -// @Security BearerAuth -// @Success 200 {array} models.NetCpe -// @Router /api/cpe/query [get] +// @Summary Query CPE list +// @Description Query cpe list +// @Tags CPE +// @Accept json +// @Produce json +// @Param node_id query string false "node_id" +// @Param customer_id query string false "customer_id" +// @Param keyword query string false "keyword" +// @Security BearerAuth +// @Success 200 {array} models.NetCpe +// @Router /api/cpe/query [get] func queryCpe(c echo.Context) error { prequery := web.NewPreQuery(c). DefaultOrderBy("name asc"). diff --git a/controllers/crontoller.go b/controllers/crontoller.go index e90b7570..5129440a 100644 --- a/controllers/crontoller.go +++ b/controllers/crontoller.go @@ -1,23 +1,23 @@ package controllers import ( - "github.com/talkincode/toughradius/controllers/apitoken" - "github.com/talkincode/toughradius/controllers/cpe" - "github.com/talkincode/toughradius/controllers/cwmpconfig" - "github.com/talkincode/toughradius/controllers/cwmppreset" - "github.com/talkincode/toughradius/controllers/dashboard" - "github.com/talkincode/toughradius/controllers/factoryreset" - "github.com/talkincode/toughradius/controllers/firmwareconfig" - "github.com/talkincode/toughradius/controllers/index" - "github.com/talkincode/toughradius/controllers/logs" - "github.com/talkincode/toughradius/controllers/metrics" - "github.com/talkincode/toughradius/controllers/node" - "github.com/talkincode/toughradius/controllers/opr" - "github.com/talkincode/toughradius/controllers/radius" - "github.com/talkincode/toughradius/controllers/settings" - "github.com/talkincode/toughradius/controllers/supervise" - "github.com/talkincode/toughradius/controllers/translate" - "github.com/talkincode/toughradius/controllers/vpe" + "github.com/talkincode/toughradius/v8/controllers/apitoken" + "github.com/talkincode/toughradius/v8/controllers/cpe" + "github.com/talkincode/toughradius/v8/controllers/cwmpconfig" + "github.com/talkincode/toughradius/v8/controllers/cwmppreset" + "github.com/talkincode/toughradius/v8/controllers/dashboard" + "github.com/talkincode/toughradius/v8/controllers/factoryreset" + "github.com/talkincode/toughradius/v8/controllers/firmwareconfig" + "github.com/talkincode/toughradius/v8/controllers/index" + "github.com/talkincode/toughradius/v8/controllers/logs" + "github.com/talkincode/toughradius/v8/controllers/metrics" + "github.com/talkincode/toughradius/v8/controllers/node" + "github.com/talkincode/toughradius/v8/controllers/opr" + "github.com/talkincode/toughradius/v8/controllers/radius" + "github.com/talkincode/toughradius/v8/controllers/settings" + "github.com/talkincode/toughradius/v8/controllers/supervise" + "github.com/talkincode/toughradius/v8/controllers/translate" + "github.com/talkincode/toughradius/v8/controllers/vpe" ) // Init web 控制器初始化 diff --git a/controllers/cwmpconfig/cwmpconfig.go b/controllers/cwmpconfig/cwmpconfig.go index b21b713d..02099c37 100644 --- a/controllers/cwmpconfig/cwmpconfig.go +++ b/controllers/cwmpconfig/cwmpconfig.go @@ -6,11 +6,11 @@ import ( "strings" "github.com/labstack/echo/v4" - "github.com/talkincode/toughradius/app" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/common/web" - "github.com/talkincode/toughradius/models" - "github.com/talkincode/toughradius/webserver" + "github.com/talkincode/toughradius/v8/app" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/common/web" + "github.com/talkincode/toughradius/v8/models" + "github.com/talkincode/toughradius/v8/webserver" ) func initTemplateRouter() { @@ -97,15 +97,15 @@ func initTemplateRouter() { } -// @Summary Query cwmp config list -// @Description Query cwmp config list -// @Tags TR069 -// @Accept json -// @Produce json -// @Param keyword query string false "keyword" -// @Security BearerAuth -// @Success 200 {array} models.CwmpConfig -// @Router /api/cwmp/config/query [get] +// @Summary Query cwmp config list +// @Description Query cwmp config list +// @Tags TR069 +// @Accept json +// @Produce json +// @Param keyword query string false "keyword" +// @Security BearerAuth +// @Success 200 {array} models.CwmpConfig +// @Router /api/cwmp/config/query [get] func queryCwmpConfig(c echo.Context) error { prequery := web.NewPreQuery(c). DefaultOrderBy("name asc"). diff --git a/controllers/cwmpconfig/cwmpconfig_session.go b/controllers/cwmpconfig/cwmpconfig_session.go index a6d3690c..7f2c5759 100644 --- a/controllers/cwmpconfig/cwmpconfig_session.go +++ b/controllers/cwmpconfig/cwmpconfig_session.go @@ -9,11 +9,11 @@ import ( "time" "github.com/labstack/echo/v4" - "github.com/talkincode/toughradius/app" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/common/web" - "github.com/talkincode/toughradius/models" - "github.com/talkincode/toughradius/webserver" + "github.com/talkincode/toughradius/v8/app" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/common/web" + "github.com/talkincode/toughradius/v8/models" + "github.com/talkincode/toughradius/v8/webserver" ) // Mikrotik 脚本管理 @@ -69,16 +69,16 @@ func InitRouter() { } -// @Summary Query cwmp config sessions -// @Description Query cwmp config sessions -// @Tags TR069 -// @Accept json -// @Produce json -// @Param cpe_id query string false "cpe_id" -// @Param keyword query string false "keyword" -// @Security BearerAuth -// @Success 200 {array} models.CwmpConfigSession -// @Router /api/cwmp/config/session/query [get] +// @Summary Query cwmp config sessions +// @Description Query cwmp config sessions +// @Tags TR069 +// @Accept json +// @Produce json +// @Param cpe_id query string false "cpe_id" +// @Param keyword query string false "keyword" +// @Security BearerAuth +// @Success 200 {array} models.CwmpConfigSession +// @Router /api/cwmp/config/session/query [get] func queryCwmpConfigSession(c echo.Context) error { prequery := web.NewPreQuery(c). DefaultOrderBy("name asc"). diff --git a/controllers/cwmppreset/cwmp.go b/controllers/cwmppreset/cwmp.go index d529ac0d..e0e6c8a6 100644 --- a/controllers/cwmppreset/cwmp.go +++ b/controllers/cwmppreset/cwmp.go @@ -8,12 +8,12 @@ import ( "github.com/labstack/echo/v4" "github.com/spf13/cast" - "github.com/talkincode/toughradius/app" - "github.com/talkincode/toughradius/assets" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/common/web" - "github.com/talkincode/toughradius/models" - "github.com/talkincode/toughradius/webserver" + "github.com/talkincode/toughradius/v8/app" + "github.com/talkincode/toughradius/v8/assets" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/common/web" + "github.com/talkincode/toughradius/v8/models" + "github.com/talkincode/toughradius/v8/webserver" "gopkg.in/yaml.v2" ) @@ -154,16 +154,16 @@ func InitRouter() { } -// @Summary Query cwmp preset task -// @Description Query cwmp preset task -// @Tags TR069 -// @Accept json -// @Produce json -// @Param cpe_id query string false "cpe_id" -// @Param keyword query string false "keyword" -// @Security BearerAuth -// @Success 200 {array} models.CwmpPresetTask -// @Router /api/cwmp/preset/task/query [get] +// @Summary Query cwmp preset task +// @Description Query cwmp preset task +// @Tags TR069 +// @Accept json +// @Produce json +// @Param cpe_id query string false "cpe_id" +// @Param keyword query string false "keyword" +// @Security BearerAuth +// @Success 200 {array} models.CwmpPresetTask +// @Router /api/cwmp/preset/task/query [get] func queryCwmpPresetTask(c echo.Context) error { prequery := web.NewPreQuery(c). DefaultOrderBy("created_at desc"). diff --git a/controllers/dashboard/dashboard.go b/controllers/dashboard/dashboard.go index 5c27f943..287b1d5a 100644 --- a/controllers/dashboard/dashboard.go +++ b/controllers/dashboard/dashboard.go @@ -4,11 +4,11 @@ import ( "net/http" "github.com/labstack/echo/v4" - "github.com/talkincode/toughradius/app" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/common/echarts" - "github.com/talkincode/toughradius/models" - "github.com/talkincode/toughradius/webserver" + "github.com/talkincode/toughradius/v8/app" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/common/echarts" + "github.com/talkincode/toughradius/v8/models" + "github.com/talkincode/toughradius/v8/webserver" ) func InitRouter() { diff --git a/controllers/dashboard/radius.go b/controllers/dashboard/radius.go index 089d954e..5ffcb72d 100644 --- a/controllers/dashboard/radius.go +++ b/controllers/dashboard/radius.go @@ -5,10 +5,10 @@ import ( "time" "github.com/labstack/echo/v4" - "github.com/talkincode/toughradius/app" - "github.com/talkincode/toughradius/common/echarts" - "github.com/talkincode/toughradius/common/zaplog" - "github.com/talkincode/toughradius/webserver" + "github.com/talkincode/toughradius/v8/app" + "github.com/talkincode/toughradius/v8/common/echarts" + "github.com/talkincode/toughradius/v8/common/zaplog" + "github.com/talkincode/toughradius/v8/webserver" ) func initRadiusMetricsRouter() { diff --git a/controllers/dashboard/system.go b/controllers/dashboard/system.go index 66ef653f..eea3d9fd 100644 --- a/controllers/dashboard/system.go +++ b/controllers/dashboard/system.go @@ -4,10 +4,10 @@ import ( "time" "github.com/labstack/echo/v4" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/common/echarts" - "github.com/talkincode/toughradius/common/zaplog" - "github.com/talkincode/toughradius/webserver" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/common/echarts" + "github.com/talkincode/toughradius/v8/common/zaplog" + "github.com/talkincode/toughradius/v8/webserver" ) func initSystemMetricsRouter() { diff --git a/controllers/dashboard/tr069.go b/controllers/dashboard/tr069.go index 67699bfe..57554613 100644 --- a/controllers/dashboard/tr069.go +++ b/controllers/dashboard/tr069.go @@ -5,11 +5,11 @@ import ( "time" "github.com/labstack/echo/v4" - "github.com/talkincode/toughradius/app" - "github.com/talkincode/toughradius/common/echarts" - "github.com/talkincode/toughradius/common/zaplog" - "github.com/talkincode/toughradius/models" - "github.com/talkincode/toughradius/webserver" + "github.com/talkincode/toughradius/v8/app" + "github.com/talkincode/toughradius/v8/common/echarts" + "github.com/talkincode/toughradius/v8/common/zaplog" + "github.com/talkincode/toughradius/v8/models" + "github.com/talkincode/toughradius/v8/webserver" ) func initTr069MetricsRouter() { diff --git a/controllers/factoryreset/factoryreset.go b/controllers/factoryreset/factoryreset.go index 9a39bdc1..4ca8cf25 100644 --- a/controllers/factoryreset/factoryreset.go +++ b/controllers/factoryreset/factoryreset.go @@ -7,11 +7,11 @@ import ( "github.com/labstack/echo/v4" "github.com/spf13/cast" - "github.com/talkincode/toughradius/app" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/common/web" - "github.com/talkincode/toughradius/models" - "github.com/talkincode/toughradius/webserver" + "github.com/talkincode/toughradius/v8/app" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/common/web" + "github.com/talkincode/toughradius/v8/models" + "github.com/talkincode/toughradius/v8/webserver" ) func InitRouter() { diff --git a/controllers/firmwareconfig/firmwareconfig.go b/controllers/firmwareconfig/firmwareconfig.go index 13c882b9..b29e7db2 100644 --- a/controllers/firmwareconfig/firmwareconfig.go +++ b/controllers/firmwareconfig/firmwareconfig.go @@ -7,11 +7,11 @@ import ( "github.com/labstack/echo/v4" "github.com/spf13/cast" - "github.com/talkincode/toughradius/app" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/common/web" - "github.com/talkincode/toughradius/models" - "github.com/talkincode/toughradius/webserver" + "github.com/talkincode/toughradius/v8/app" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/common/web" + "github.com/talkincode/toughradius/v8/models" + "github.com/talkincode/toughradius/v8/webserver" ) func InitRouter() { diff --git a/controllers/index/index.go b/controllers/index/index.go index ff987d0d..e6099e30 100644 --- a/controllers/index/index.go +++ b/controllers/index/index.go @@ -8,12 +8,12 @@ import ( "github.com/labstack/echo-contrib/session" "github.com/labstack/echo/v4" - "github.com/talkincode/toughradius/app" - "github.com/talkincode/toughradius/assets" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/common/web" - "github.com/talkincode/toughradius/models" - "github.com/talkincode/toughradius/webserver" + "github.com/talkincode/toughradius/v8/app" + "github.com/talkincode/toughradius/v8/assets" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/common/web" + "github.com/talkincode/toughradius/v8/models" + "github.com/talkincode/toughradius/v8/webserver" ) var pushers = []string{ diff --git a/controllers/logs/loki.go b/controllers/logs/loki.go index bfa5c371..f9a88494 100644 --- a/controllers/logs/loki.go +++ b/controllers/logs/loki.go @@ -7,11 +7,11 @@ import ( "time" "github.com/labstack/echo/v4" - "github.com/talkincode/toughradius/app" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/common/lokiquery" - "github.com/talkincode/toughradius/common/web" - "github.com/talkincode/toughradius/webserver" + "github.com/talkincode/toughradius/v8/app" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/common/lokiquery" + "github.com/talkincode/toughradius/v8/common/web" + "github.com/talkincode/toughradius/v8/webserver" ) func initLokiRouter() { diff --git a/controllers/logs/oplog.go b/controllers/logs/oplog.go index a05caa78..b067b476 100644 --- a/controllers/logs/oplog.go +++ b/controllers/logs/oplog.go @@ -5,11 +5,11 @@ import ( "time" "github.com/labstack/echo/v4" - "github.com/talkincode/toughradius/app" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/common/web" - "github.com/talkincode/toughradius/models" - "github.com/talkincode/toughradius/webserver" + "github.com/talkincode/toughradius/v8/app" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/common/web" + "github.com/talkincode/toughradius/v8/models" + "github.com/talkincode/toughradius/v8/webserver" ) // 操作日志查询 diff --git a/controllers/metrics/metrics.go b/controllers/metrics/metrics.go index f795d448..b576bdf9 100644 --- a/controllers/metrics/metrics.go +++ b/controllers/metrics/metrics.go @@ -11,8 +11,8 @@ import ( "github.com/shirou/gopsutil/host" "github.com/shirou/gopsutil/mem" "github.com/shirou/gopsutil/process" - "github.com/talkincode/toughradius/common/web" - "github.com/talkincode/toughradius/webserver" + "github.com/talkincode/toughradius/v8/common/web" + "github.com/talkincode/toughradius/v8/webserver" ) func InitRouter() { diff --git a/controllers/node/node.go b/controllers/node/node.go index cd2e325c..83b97d4e 100644 --- a/controllers/node/node.go +++ b/controllers/node/node.go @@ -7,11 +7,11 @@ import ( "github.com/labstack/echo/v4" "github.com/spf13/cast" - "github.com/talkincode/toughradius/app" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/common/web" - "github.com/talkincode/toughradius/models" - "github.com/talkincode/toughradius/webserver" + "github.com/talkincode/toughradius/v8/app" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/common/web" + "github.com/talkincode/toughradius/v8/models" + "github.com/talkincode/toughradius/v8/webserver" "gorm.io/gorm/clause" ) diff --git a/controllers/opr/opr.go b/controllers/opr/opr.go index e0dbb690..25e5ddef 100644 --- a/controllers/opr/opr.go +++ b/controllers/opr/opr.go @@ -8,11 +8,11 @@ import ( "github.com/labstack/echo-contrib/session" "github.com/labstack/echo/v4" "github.com/spf13/cast" - "github.com/talkincode/toughradius/app" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/common/web" - "github.com/talkincode/toughradius/models" - "github.com/talkincode/toughradius/webserver" + "github.com/talkincode/toughradius/v8/app" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/common/web" + "github.com/talkincode/toughradius/v8/models" + "github.com/talkincode/toughradius/v8/webserver" "gorm.io/gorm" ) diff --git a/controllers/radius/logs.go b/controllers/radius/logs.go index 255dee86..d9e28f70 100644 --- a/controllers/radius/logs.go +++ b/controllers/radius/logs.go @@ -5,11 +5,11 @@ import ( "time" "github.com/labstack/echo/v4" - "github.com/talkincode/toughradius/app" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/common/web" - "github.com/talkincode/toughradius/models" - "github.com/talkincode/toughradius/webserver" + "github.com/talkincode/toughradius/v8/app" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/common/web" + "github.com/talkincode/toughradius/v8/models" + "github.com/talkincode/toughradius/v8/webserver" ) func InitLogsRouter() { diff --git a/controllers/radius/profile.go b/controllers/radius/profile.go index 4af95b62..dd68e763 100644 --- a/controllers/radius/profile.go +++ b/controllers/radius/profile.go @@ -7,11 +7,11 @@ import ( "github.com/labstack/echo/v4" "github.com/spf13/cast" - "github.com/talkincode/toughradius/app" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/common/web" - "github.com/talkincode/toughradius/models" - "github.com/talkincode/toughradius/webserver" + "github.com/talkincode/toughradius/v8/app" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/common/web" + "github.com/talkincode/toughradius/v8/models" + "github.com/talkincode/toughradius/v8/webserver" "gorm.io/gorm" "gorm.io/gorm/clause" ) diff --git a/controllers/radius/session.go b/controllers/radius/session.go index 8dd06b7a..bf478826 100644 --- a/controllers/radius/session.go +++ b/controllers/radius/session.go @@ -6,11 +6,11 @@ import ( "strings" "github.com/labstack/echo/v4" - "github.com/talkincode/toughradius/app" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/common/web" - "github.com/talkincode/toughradius/models" - "github.com/talkincode/toughradius/webserver" + "github.com/talkincode/toughradius/v8/app" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/common/web" + "github.com/talkincode/toughradius/v8/models" + "github.com/talkincode/toughradius/v8/webserver" "gorm.io/gorm" ) diff --git a/controllers/radius/user.go b/controllers/radius/user.go index 606066bc..46bbaaab 100644 --- a/controllers/radius/user.go +++ b/controllers/radius/user.go @@ -8,11 +8,11 @@ import ( "github.com/labstack/echo/v4" "github.com/spf13/cast" - "github.com/talkincode/toughradius/app" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/common/web" - "github.com/talkincode/toughradius/models" - "github.com/talkincode/toughradius/webserver" + "github.com/talkincode/toughradius/v8/app" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/common/web" + "github.com/talkincode/toughradius/v8/models" + "github.com/talkincode/toughradius/v8/webserver" "gorm.io/gorm" "gorm.io/gorm/clause" ) diff --git a/controllers/settings/settings.go b/controllers/settings/settings.go index 2028f8e3..d2ffdb3c 100644 --- a/controllers/settings/settings.go +++ b/controllers/settings/settings.go @@ -8,12 +8,12 @@ import ( "github.com/labstack/echo/v4" "github.com/labstack/gommon/log" - "github.com/talkincode/toughradius/app" - "github.com/talkincode/toughradius/assets" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/common/web" - "github.com/talkincode/toughradius/models" - "github.com/talkincode/toughradius/webserver" + "github.com/talkincode/toughradius/v8/app" + "github.com/talkincode/toughradius/v8/assets" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/common/web" + "github.com/talkincode/toughradius/v8/models" + "github.com/talkincode/toughradius/v8/webserver" ) func InitRouter() { diff --git a/controllers/supervise/cwmp.go b/controllers/supervise/cwmp.go index 4caca7a8..203db1e9 100644 --- a/controllers/supervise/cwmp.go +++ b/controllers/supervise/cwmp.go @@ -6,12 +6,12 @@ import ( "time" "github.com/labstack/echo/v4" - "github.com/talkincode/toughradius/app" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/common/cwmp" - "github.com/talkincode/toughradius/common/web" - "github.com/talkincode/toughradius/events" - "github.com/talkincode/toughradius/models" + "github.com/talkincode/toughradius/v8/app" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/common/cwmp" + "github.com/talkincode/toughradius/v8/common/web" + "github.com/talkincode/toughradius/v8/events" + "github.com/talkincode/toughradius/v8/models" ) func getCwmpCmds(vendor string) []SuperviseAction { diff --git a/controllers/supervise/cwmp_factorycfg.go b/controllers/supervise/cwmp_factorycfg.go index d9701fdf..b04af241 100644 --- a/controllers/supervise/cwmp_factorycfg.go +++ b/controllers/supervise/cwmp_factorycfg.go @@ -7,13 +7,13 @@ import ( "github.com/labstack/echo/v4" "github.com/spf13/cast" - "github.com/talkincode/toughradius/app" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/common/cwmp" - "github.com/talkincode/toughradius/common/timeutil" - "github.com/talkincode/toughradius/common/web" - "github.com/talkincode/toughradius/events" - "github.com/talkincode/toughradius/models" + "github.com/talkincode/toughradius/v8/app" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/common/cwmp" + "github.com/talkincode/toughradius/v8/common/timeutil" + "github.com/talkincode/toughradius/v8/common/web" + "github.com/talkincode/toughradius/v8/events" + "github.com/talkincode/toughradius/v8/models" ) func execCwmpMikrotikFactoryConfiguration(c echo.Context, id string, deviceId int64, session string) error { diff --git a/controllers/supervise/cwmp_updatefirmware.go b/controllers/supervise/cwmp_updatefirmware.go index 1abc77ea..1517b4c1 100644 --- a/controllers/supervise/cwmp_updatefirmware.go +++ b/controllers/supervise/cwmp_updatefirmware.go @@ -7,13 +7,13 @@ import ( "github.com/labstack/echo/v4" "github.com/spf13/cast" - "github.com/talkincode/toughradius/app" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/common/cwmp" - "github.com/talkincode/toughradius/common/timeutil" - "github.com/talkincode/toughradius/common/web" - "github.com/talkincode/toughradius/events" - "github.com/talkincode/toughradius/models" + "github.com/talkincode/toughradius/v8/app" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/common/cwmp" + "github.com/talkincode/toughradius/v8/common/timeutil" + "github.com/talkincode/toughradius/v8/common/web" + "github.com/talkincode/toughradius/v8/events" + "github.com/talkincode/toughradius/v8/models" ) func execCwmpUpdateFirmware(c echo.Context, devids []string, firmwareId, session string) error { diff --git a/controllers/supervise/cwmpconfig.go b/controllers/supervise/cwmpconfig.go index 2b3fa978..e6fb5db4 100644 --- a/controllers/supervise/cwmpconfig.go +++ b/controllers/supervise/cwmpconfig.go @@ -6,13 +6,13 @@ import ( "time" "github.com/labstack/echo/v4" - "github.com/talkincode/toughradius/app" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/common/cwmp" - "github.com/talkincode/toughradius/common/timeutil" - "github.com/talkincode/toughradius/common/web" - "github.com/talkincode/toughradius/events" - "github.com/talkincode/toughradius/models" + "github.com/talkincode/toughradius/v8/app" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/common/cwmp" + "github.com/talkincode/toughradius/v8/common/timeutil" + "github.com/talkincode/toughradius/v8/common/web" + "github.com/talkincode/toughradius/v8/events" + "github.com/talkincode/toughradius/v8/models" ) func execCwmpConfig(c echo.Context, id string, deviceId int64, session string) error { diff --git a/controllers/supervise/supervise.go b/controllers/supervise/supervise.go index e12e166f..abbb11a3 100644 --- a/controllers/supervise/supervise.go +++ b/controllers/supervise/supervise.go @@ -7,14 +7,14 @@ import ( "time" "github.com/labstack/echo/v4" - "github.com/talkincode/toughradius/app" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/common/snmp" - "github.com/talkincode/toughradius/common/web" - "github.com/talkincode/toughradius/common/zaplog/log" - "github.com/talkincode/toughradius/events" - "github.com/talkincode/toughradius/models" - "github.com/talkincode/toughradius/webserver" + "github.com/talkincode/toughradius/v8/app" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/common/snmp" + "github.com/talkincode/toughradius/v8/common/web" + "github.com/talkincode/toughradius/v8/common/zaplog/log" + "github.com/talkincode/toughradius/v8/events" + "github.com/talkincode/toughradius/v8/models" + "github.com/talkincode/toughradius/v8/webserver" ) func InitRouter() { diff --git a/controllers/translate/translate.go b/controllers/translate/translate.go index 8aceb4a8..4e0356bd 100644 --- a/controllers/translate/translate.go +++ b/controllers/translate/translate.go @@ -5,10 +5,10 @@ import ( "path" "github.com/labstack/echo/v4" - "github.com/talkincode/toughradius/app" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/common/web" - "github.com/talkincode/toughradius/webserver" + "github.com/talkincode/toughradius/v8/app" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/common/web" + "github.com/talkincode/toughradius/v8/webserver" ) func InitRouter() { diff --git a/controllers/vpe/vpe.go b/controllers/vpe/vpe.go index 438c47fd..6c836b5d 100644 --- a/controllers/vpe/vpe.go +++ b/controllers/vpe/vpe.go @@ -8,11 +8,11 @@ import ( "github.com/labstack/echo/v4" "github.com/spf13/cast" - "github.com/talkincode/toughradius/app" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/common/web" - "github.com/talkincode/toughradius/models" - "github.com/talkincode/toughradius/webserver" + "github.com/talkincode/toughradius/v8/app" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/common/web" + "github.com/talkincode/toughradius/v8/models" + "github.com/talkincode/toughradius/v8/webserver" "gorm.io/gorm" "gorm.io/gorm/clause" ) diff --git a/freeradius/freeradius.go b/freeradius/freeradius.go index eb3a3ebd..cf70d772 100644 --- a/freeradius/freeradius.go +++ b/freeradius/freeradius.go @@ -4,11 +4,11 @@ import ( "fmt" "time" - "github.com/talkincode/toughradius/app" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/common/web" - "github.com/talkincode/toughradius/common/zaplog/log" - "github.com/talkincode/toughradius/models" + "github.com/talkincode/toughradius/v8/app" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/common/web" + "github.com/talkincode/toughradius/v8/common/zaplog/log" + "github.com/talkincode/toughradius/v8/models" "go.uber.org/zap" ) diff --git a/freeradius/handlers.go b/freeradius/handlers.go index 5b9707d0..5337aaf7 100644 --- a/freeradius/handlers.go +++ b/freeradius/handlers.go @@ -23,12 +23,12 @@ import ( "time" "github.com/labstack/echo/v4" - "github.com/talkincode/toughradius/app" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/common/validutil" - "github.com/talkincode/toughradius/common/web" - "github.com/talkincode/toughradius/common/zaplog/log" - "github.com/talkincode/toughradius/models" + "github.com/talkincode/toughradius/v8/app" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/common/validutil" + "github.com/talkincode/toughradius/v8/common/web" + "github.com/talkincode/toughradius/v8/common/zaplog/log" + "github.com/talkincode/toughradius/v8/models" "go.uber.org/zap" ) diff --git a/freeradius/server.go b/freeradius/server.go index d245ea7a..0ff58b97 100644 --- a/freeradius/server.go +++ b/freeradius/server.go @@ -8,9 +8,9 @@ import ( "github.com/labstack/echo/v4" "github.com/labstack/echo/v4/middleware" elog "github.com/labstack/gommon/log" - "github.com/talkincode/toughradius/app" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/common/zaplog/log" + "github.com/talkincode/toughradius/v8/app" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/common/zaplog/log" "go.uber.org/zap" ) diff --git a/go.mod b/go.mod index 87492e06..31343dde 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/talkincode/toughradius +module github.com/talkincode/toughradius/v8 go 1.19 diff --git a/installer/installer.go b/installer/installer.go index 1c8ed851..5300d08e 100644 --- a/installer/installer.go +++ b/installer/installer.go @@ -6,8 +6,8 @@ import ( "path/filepath" "strings" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/config" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/config" "gopkg.in/yaml.v3" ) diff --git a/main.go b/main.go index 4adf6569..6c35ba83 100644 --- a/main.go +++ b/main.go @@ -7,16 +7,16 @@ import ( "runtime" _ "time/tzdata" - "github.com/talkincode/toughradius/app" - "github.com/talkincode/toughradius/common/zaplog/log" - "github.com/talkincode/toughradius/config" - "github.com/talkincode/toughradius/controllers" - "github.com/talkincode/toughradius/docs" - "github.com/talkincode/toughradius/freeradius" - "github.com/talkincode/toughradius/installer" - "github.com/talkincode/toughradius/toughradius" - "github.com/talkincode/toughradius/tr069" - "github.com/talkincode/toughradius/webserver" + "github.com/talkincode/toughradius/v8/app" + "github.com/talkincode/toughradius/v8/common/zaplog/log" + "github.com/talkincode/toughradius/v8/config" + "github.com/talkincode/toughradius/v8/controllers" + "github.com/talkincode/toughradius/v8/docs" + "github.com/talkincode/toughradius/v8/freeradius" + "github.com/talkincode/toughradius/v8/installer" + "github.com/talkincode/toughradius/v8/toughradius" + "github.com/talkincode/toughradius/v8/tr069" + "github.com/talkincode/toughradius/v8/webserver" "golang.org/x/sync/errgroup" ) @@ -80,8 +80,8 @@ func printHelp() { // @name Authorization // @description Accesskey based security scheme to secure api -// @host 127.0.0.1:1816 -// @BasePath / +// @host 127.0.0.1:1816 +// @BasePath / func main() { runtime.GOMAXPROCS(runtime.NumCPU()) flag.Parse() diff --git a/models/cwmp.go b/models/cwmp.go index 3653b5ac..f2e801e7 100644 --- a/models/cwmp.go +++ b/models/cwmp.go @@ -3,7 +3,7 @@ package models import ( "time" - "github.com/talkincode/toughradius/common/cwmp" + "github.com/talkincode/toughradius/v8/common/cwmp" ) type CwmpConfig struct { diff --git a/models/marshal.go b/models/marshal.go index 61ff5c82..5b33bba7 100644 --- a/models/marshal.go +++ b/models/marshal.go @@ -5,7 +5,7 @@ import ( "time" "github.com/araddon/dateparse" - "github.com/talkincode/toughradius/common/timeutil" + "github.com/talkincode/toughradius/v8/common/timeutil" ) func (d NetCpe) MarshalJSON() ([]byte, error) { diff --git a/toughradius/acct_ops.go b/toughradius/acct_ops.go index 92532595..bc340e92 100644 --- a/toughradius/acct_ops.go +++ b/toughradius/acct_ops.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/talkincode/toughradius/common/zaplog/log" - "github.com/talkincode/toughradius/models" + "github.com/talkincode/toughradius/v8/common/zaplog/log" + "github.com/talkincode/toughradius/v8/models" "go.uber.org/zap" "layeh.com/radius" "layeh.com/radius/rfc2865" diff --git a/toughradius/acct_start.go b/toughradius/acct_start.go index b473c74d..165c7e3d 100644 --- a/toughradius/acct_start.go +++ b/toughradius/acct_start.go @@ -1,8 +1,8 @@ package toughradius import ( - "github.com/talkincode/toughradius/common/zaplog/log" - "github.com/talkincode/toughradius/models" + "github.com/talkincode/toughradius/v8/common/zaplog/log" + "github.com/talkincode/toughradius/v8/models" "go.uber.org/zap" "layeh.com/radius" ) diff --git a/toughradius/acct_stop.go b/toughradius/acct_stop.go index c08d545d..2f218c96 100644 --- a/toughradius/acct_stop.go +++ b/toughradius/acct_stop.go @@ -1,8 +1,8 @@ package toughradius import ( - "github.com/talkincode/toughradius/common/zaplog/log" - "github.com/talkincode/toughradius/models" + "github.com/talkincode/toughradius/v8/common/zaplog/log" + "github.com/talkincode/toughradius/v8/models" "go.uber.org/zap" "layeh.com/radius" ) diff --git a/toughradius/acct_update.go b/toughradius/acct_update.go index 53a57baf..3bdf58ec 100644 --- a/toughradius/acct_update.go +++ b/toughradius/acct_update.go @@ -3,9 +3,9 @@ package toughradius import ( "time" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/common/zaplog/log" - "github.com/talkincode/toughradius/models" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/common/zaplog/log" + "github.com/talkincode/toughradius/v8/models" "go.uber.org/zap" "layeh.com/radius" "layeh.com/radius/rfc2866" diff --git a/toughradius/auth_accept_config.go b/toughradius/auth_accept_config.go index 59b483fb..44efa29d 100644 --- a/toughradius/auth_accept_config.go +++ b/toughradius/auth_accept_config.go @@ -6,14 +6,14 @@ import ( "net" "time" - "github.com/talkincode/toughradius/app" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/models" - "github.com/talkincode/toughradius/toughradius/vendors/h3c" - "github.com/talkincode/toughradius/toughradius/vendors/huawei" - "github.com/talkincode/toughradius/toughradius/vendors/ikuai" - "github.com/talkincode/toughradius/toughradius/vendors/mikrotik" - "github.com/talkincode/toughradius/toughradius/vendors/zte" + "github.com/talkincode/toughradius/v8/app" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/models" + "github.com/talkincode/toughradius/v8/toughradius/vendors/h3c" + "github.com/talkincode/toughradius/v8/toughradius/vendors/huawei" + "github.com/talkincode/toughradius/v8/toughradius/vendors/ikuai" + "github.com/talkincode/toughradius/v8/toughradius/vendors/mikrotik" + "github.com/talkincode/toughradius/v8/toughradius/vendors/zte" "layeh.com/radius" "layeh.com/radius/rfc2865" "layeh.com/radius/rfc2869" diff --git a/toughradius/auth_bind_check.go b/toughradius/auth_bind_check.go index b3e53085..e6cf9ec8 100644 --- a/toughradius/auth_bind_check.go +++ b/toughradius/auth_bind_check.go @@ -1,9 +1,9 @@ package toughradius import ( - "github.com/talkincode/toughradius/app" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/models" + "github.com/talkincode/toughradius/v8/app" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/models" ) // CheckVlanBind diff --git a/toughradius/auth_check_online.go b/toughradius/auth_check_online.go index 59ab4b35..e93a399f 100644 --- a/toughradius/auth_check_online.go +++ b/toughradius/auth_check_online.go @@ -1,7 +1,7 @@ package toughradius import ( - "github.com/talkincode/toughradius/app" + "github.com/talkincode/toughradius/v8/app" ) func (s *AuthService) CheckOnlineCount(username string, activeNUm int) error { diff --git a/toughradius/auth_ldap_accept_config.go b/toughradius/auth_ldap_accept_config.go index 20170a92..cb5f1cf9 100644 --- a/toughradius/auth_ldap_accept_config.go +++ b/toughradius/auth_ldap_accept_config.go @@ -6,15 +6,15 @@ import ( "net" "time" - "github.com/talkincode/toughradius/app" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/toughradius/vendors/cisco" - "github.com/talkincode/toughradius/toughradius/vendors/h3c" - "github.com/talkincode/toughradius/toughradius/vendors/huawei" - "github.com/talkincode/toughradius/toughradius/vendors/ikuai" - "github.com/talkincode/toughradius/toughradius/vendors/mikrotik" - "github.com/talkincode/toughradius/toughradius/vendors/radback" - "github.com/talkincode/toughradius/toughradius/vendors/zte" + "github.com/talkincode/toughradius/v8/app" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/toughradius/vendors/cisco" + "github.com/talkincode/toughradius/v8/toughradius/vendors/h3c" + "github.com/talkincode/toughradius/v8/toughradius/vendors/huawei" + "github.com/talkincode/toughradius/v8/toughradius/vendors/ikuai" + "github.com/talkincode/toughradius/v8/toughradius/vendors/mikrotik" + "github.com/talkincode/toughradius/v8/toughradius/vendors/radback" + "github.com/talkincode/toughradius/v8/toughradius/vendors/zte" "layeh.com/radius" "layeh.com/radius/rfc2865" "layeh.com/radius/rfc2869" diff --git a/toughradius/auth_passwd_check.go b/toughradius/auth_passwd_check.go index f829c1b4..23037044 100644 --- a/toughradius/auth_passwd_check.go +++ b/toughradius/auth_passwd_check.go @@ -6,10 +6,10 @@ import ( "fmt" "strings" - "github.com/talkincode/toughradius/app" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/models" - "github.com/talkincode/toughradius/toughradius/vendors/microsoft" + "github.com/talkincode/toughradius/v8/app" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/models" + "github.com/talkincode/toughradius/v8/toughradius/vendors/microsoft" "layeh.com/radius" "layeh.com/radius/rfc2759" "layeh.com/radius/rfc2865" diff --git a/toughradius/errors.go b/toughradius/errors.go index e0818c50..cbe48388 100644 --- a/toughradius/errors.go +++ b/toughradius/errors.go @@ -3,7 +3,7 @@ package toughradius import ( "errors" - "github.com/talkincode/toughradius/app" + "github.com/talkincode/toughradius/v8/app" ) type AuthError struct { diff --git a/toughradius/radius.go b/toughradius/radius.go index ebdc35e6..2a71e9dd 100644 --- a/toughradius/radius.go +++ b/toughradius/radius.go @@ -14,10 +14,10 @@ import ( "time" "github.com/panjf2000/ants/v2" - "github.com/talkincode/toughradius/app" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/common/zaplog/log" - "github.com/talkincode/toughradius/models" + "github.com/talkincode/toughradius/v8/app" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/common/zaplog/log" + "github.com/talkincode/toughradius/v8/models" "go.uber.org/zap" "gorm.io/gorm" "layeh.com/radius" diff --git a/toughradius/radius_acct.go b/toughradius/radius_acct.go index f5dad309..79400c9c 100644 --- a/toughradius/radius_acct.go +++ b/toughradius/radius_acct.go @@ -4,9 +4,9 @@ import ( "errors" "strings" - "github.com/talkincode/toughradius/app" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/common/zaplog/log" + "github.com/talkincode/toughradius/v8/app" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/common/zaplog/log" "go.uber.org/zap" "layeh.com/radius" "layeh.com/radius/rfc2865" diff --git a/toughradius/radius_auth.go b/toughradius/radius_auth.go index 649ac287..50c59c15 100644 --- a/toughradius/radius_auth.go +++ b/toughradius/radius_auth.go @@ -3,10 +3,10 @@ package toughradius import ( "strings" - "github.com/talkincode/toughradius/app" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/common/zaplog/log" - "github.com/talkincode/toughradius/models" + "github.com/talkincode/toughradius/v8/app" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/common/zaplog/log" + "github.com/talkincode/toughradius/v8/models" "go.uber.org/zap" "layeh.com/radius" "layeh.com/radius/rfc2865" diff --git a/toughradius/radius_ldap_acct.go b/toughradius/radius_ldap_acct.go index 85c1afbc..2e95d5f1 100644 --- a/toughradius/radius_ldap_acct.go +++ b/toughradius/radius_ldap_acct.go @@ -1,7 +1,7 @@ package toughradius import ( - "github.com/talkincode/toughradius/models" + "github.com/talkincode/toughradius/v8/models" "layeh.com/radius" "layeh.com/radius/rfc2866" ) diff --git a/toughradius/radius_ldap_auth.go b/toughradius/radius_ldap_auth.go index 1b912aca..4b9ac2ad 100644 --- a/toughradius/radius_ldap_auth.go +++ b/toughradius/radius_ldap_auth.go @@ -8,11 +8,11 @@ import ( "time" "github.com/go-ldap/ldap/v3" - "github.com/talkincode/toughradius/app" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/common/timeutil" - "github.com/talkincode/toughradius/models" - "github.com/talkincode/toughradius/toughradius/vendors/microsoft" + "github.com/talkincode/toughradius/v8/app" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/common/timeutil" + "github.com/talkincode/toughradius/v8/models" + "github.com/talkincode/toughradius/v8/toughradius/vendors/microsoft" "layeh.com/radius" "layeh.com/radius/rfc2865" ) diff --git a/toughradius/radsec_server.go b/toughradius/radsec_server.go index dcbc6349..c3a263a3 100644 --- a/toughradius/radsec_server.go +++ b/toughradius/radsec_server.go @@ -17,9 +17,9 @@ import ( "time" "unsafe" - "github.com/talkincode/toughradius/app" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/common/zaplog/log" + "github.com/talkincode/toughradius/v8/app" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/common/zaplog/log" "layeh.com/radius" ) diff --git a/toughradius/radsec_service.go b/toughradius/radsec_service.go index c2f1b889..93010e32 100644 --- a/toughradius/radsec_service.go +++ b/toughradius/radsec_service.go @@ -4,7 +4,7 @@ import ( "context" "net" - "github.com/talkincode/toughradius/common/zaplog/log" + "github.com/talkincode/toughradius/v8/common/zaplog/log" "go.uber.org/zap" "layeh.com/radius" ) diff --git a/toughradius/server.go b/toughradius/server.go index c9f8b2b9..b5aeccd1 100644 --- a/toughradius/server.go +++ b/toughradius/server.go @@ -5,10 +5,10 @@ import ( "os" "path" - "github.com/talkincode/toughradius/app" - "github.com/talkincode/toughradius/assets" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/common/zaplog/log" + "github.com/talkincode/toughradius/v8/app" + "github.com/talkincode/toughradius/v8/assets" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/common/zaplog/log" "layeh.com/radius" ) diff --git a/toughradius/vendor_parse.go b/toughradius/vendor_parse.go index f2cd173a..8c28158e 100644 --- a/toughradius/vendor_parse.go +++ b/toughradius/vendor_parse.go @@ -6,9 +6,9 @@ import ( "strconv" "strings" - "github.com/talkincode/toughradius/common/zaplog/log" - "github.com/talkincode/toughradius/toughradius/vendors/h3c" - "github.com/talkincode/toughradius/toughradius/vendors/radback" + "github.com/talkincode/toughradius/v8/common/zaplog/log" + "github.com/talkincode/toughradius/v8/toughradius/vendors/h3c" + "github.com/talkincode/toughradius/v8/toughradius/vendors/radback" "go.uber.org/zap" "layeh.com/radius" "layeh.com/radius/rfc2865" diff --git a/tr069/handlers.go b/tr069/handlers.go index 498add40..6d841d37 100644 --- a/tr069/handlers.go +++ b/tr069/handlers.go @@ -10,12 +10,12 @@ import ( "time" "github.com/labstack/echo/v4" - "github.com/talkincode/toughradius/app" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/common/cwmp" - "github.com/talkincode/toughradius/common/zaplog/log" - "github.com/talkincode/toughradius/events" - "github.com/talkincode/toughradius/models" + "github.com/talkincode/toughradius/v8/app" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/common/cwmp" + "github.com/talkincode/toughradius/v8/common/zaplog/log" + "github.com/talkincode/toughradius/v8/events" + "github.com/talkincode/toughradius/v8/models" "go.uber.org/zap" "gorm.io/gorm" ) diff --git a/tr069/server.go b/tr069/server.go index e313a22b..63400150 100644 --- a/tr069/server.go +++ b/tr069/server.go @@ -16,10 +16,10 @@ import ( "github.com/labstack/echo/v4" "github.com/labstack/echo/v4/middleware" elog "github.com/labstack/gommon/log" - "github.com/talkincode/toughradius/app" - "github.com/talkincode/toughradius/assets" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/common/zaplog/log" + "github.com/talkincode/toughradius/v8/app" + "github.com/talkincode/toughradius/v8/assets" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/common/zaplog/log" "go.uber.org/zap" ) diff --git a/webserver/server.go b/webserver/server.go index 56c323f7..9b4ec142 100644 --- a/webserver/server.go +++ b/webserver/server.go @@ -21,14 +21,14 @@ import ( "github.com/golang-jwt/jwt/v4" "github.com/labstack/echo-jwt/v4" "github.com/spf13/cast" - "github.com/talkincode/toughradius/app" - "github.com/talkincode/toughradius/assets" - "github.com/talkincode/toughradius/common" - "github.com/talkincode/toughradius/common/excel" - "github.com/talkincode/toughradius/common/tpl" - "github.com/talkincode/toughradius/common/web" - "github.com/talkincode/toughradius/common/zaplog/log" - "github.com/talkincode/toughradius/models" + "github.com/talkincode/toughradius/v8/app" + "github.com/talkincode/toughradius/v8/assets" + "github.com/talkincode/toughradius/v8/common" + "github.com/talkincode/toughradius/v8/common/excel" + "github.com/talkincode/toughradius/v8/common/tpl" + "github.com/talkincode/toughradius/v8/common/web" + "github.com/talkincode/toughradius/v8/common/zaplog/log" + "github.com/talkincode/toughradius/v8/models" "github.com/gorilla/sessions" "github.com/labstack/echo-contrib/session"