del: 移除无用的mux路由函数

lib/core/account/account.go

@@ -1,54 +0,0 @@
-package account
-
-import (
-	"fmt"
-	"strconv"
-	"time"
-
-	sysMenuService "be.ems/features/sys_menu/service"
-	sysRoleService "be.ems/features/sys_role/service"
-	"be.ems/lib/core/cache"
-	"be.ems/lib/core/vo"
-	"be.ems/lib/dborm"
-	srcConfig "be.ems/src/framework/config"
-)
-
-// 登录缓存用户信息
-func CacheLoginUser(user *dborm.User) {
-	// 过期时间
-	expiresStr, err := dborm.XormGetConfigValue("Security", "sessionExpires")
-	if err != nil {
-		expiresStr = "18000"
-	}
-	expiresValue, _ := strconv.Atoi(expiresStr)
-	expireTime := time.Duration(expiresValue) * time.Second
-
-	nowTime := time.Now().UnixMilli()
-
-	// 登录用户
-	loginUser := vo.LoginUser{
-		UserID:     fmt.Sprint(user.Id),
-		UserName:   user.Name,
-		ExpireTime: nowTime + expireTime.Milliseconds(),
-		LoginTime:  nowTime,
-		User:       *user,
-	}
-
-	// 是否管理员
-	if srcConfig.IsAdmin(loginUser.UserID) {
-		loginUser.Permissions = []string{"*:*:*"}
-	} else {
-		// 获取权限标识
-		loginUser.Permissions = sysMenuService.NewRepoSysMenu.SelectMenuPermsByUserId(loginUser.UserID)
-		// 获取角色信息
-		loginUser.User.Roles = sysRoleService.NewRepoSysRole.SelectRoleListByUserId(loginUser.UserID)
-	}
-
-	// 缓存时间
-	cache.SetLocalTTL(user.AccountId, loginUser, time.Duration(expireTime))
-}
-
-// 清除缓存用户信息
-func ClearLoginUser(accountId string) {
-	cache.DeleteLocalTTL(accountId)
-}

lib/dborm/dborm.go

@@ -10,9 +10,9 @@ import (
 
 	"strings"
 
-	"be.ems/features/sys_role/model"
 	"be.ems/lib/log"
 	"be.ems/lib/oauth"
+	"be.ems/src/modules/system/model"
 
 	_ "github.com/go-sql-driver/mysql"
 	"xorm.io/xorm"

lib/midware/arrow_ip_addr.go

@@ -10,6 +10,7 @@ import (
 	"be.ems/lib/services"
 )
 
+// 已禁用
 // 登录策略限制登录时间和访问ip范围
 func ArrowIPAddr(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

lib/midware/authorize.go

@@ -14,6 +14,7 @@ import (
 	tokenUtils "be.ems/src/framework/utils/token"
 )
 
+// 已禁用由Gin部分接管
 // Authorize 用户身份授权认证校验
 //
 // 只需含有其中角色 "hasRoles": {"xxx"},

lib/midware/cors.go

@@ -5,6 +5,7 @@ import (
 	"strings"
 )
 
+// 已禁用由Gin部分接管
 // Cors 跨域
 func Cors(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

lib/midware/operate_log.go

@@ -11,8 +11,8 @@ import (
 	"strings"
 	"time"
 
+	"be.ems/lib/core/utils/ctx"
 	"be.ems/lib/core/utils/parse"
-	"be.ems/lib/dborm"
 	"be.ems/src/framework/constants/common"
 	"be.ems/src/framework/middleware/collectlogs"
 	"be.ems/src/framework/utils/ip2region"
@@ -47,13 +47,7 @@ func LogOperate(options collectlogs.Options) func(http.Handler) http.Handler {
 			funcName = funcName[lastDotIndex+1:]
 
 			// 用户名
-			username := "-"
-			accessToken := r.Header.Get("AccessToken")
-			if accessToken != "" {
-				// 验证令牌 == 这里直接查数据库session
-				se, _ := dborm.XormUpdateSessionShakeTime(accessToken)
-				username = se.AccountId
-			}
+			username := ctx.LoginUserToUserName(r)
 
 			// 解析ip地址
 			ip := strings.Split(r.RemoteAddr, ":")[0]

lib/routes/routes.go

@@ -13,21 +13,12 @@ import (
 	"be.ems/features/fm"
 	"be.ems/features/lm"
 	"be.ems/features/mml"
-	"be.ems/features/monitor/monitor"
-	"be.ems/features/monitor/psnet"
 	"be.ems/features/nbi"
 	"be.ems/features/pm"
 	"be.ems/features/security"
 	"be.ems/features/sm"
 	"be.ems/features/state"
-	sysconfig "be.ems/features/sys_config"
-	sysdictdata "be.ems/features/sys_dict_data"
-	sysdicttype "be.ems/features/sys_dict_type"
-	sysmenu "be.ems/features/sys_menu"
-	sysrole "be.ems/features/sys_role"
-	sysuser "be.ems/features/sys_user"
 	"be.ems/features/trace"
-	udmuser "be.ems/features/udm_user"
 	"be.ems/features/ue"
 	"be.ems/lib/midware"
 	"be.ems/lib/services"
@@ -233,16 +224,6 @@ func init() {
 	Register("PUT", trace.CustomUriTraceTask, trace.PutTraceTaskToNF, nil)
 	Register("DELETE", trace.CustomUriTraceTask, trace.DeleteTraceTaskToNF, nil)
 
-	// 网元发送执行 pcap抓包任务
-	Register("POST", trace.UriTcpdumpTask, trace.TcpdumpNeTask, midware.LogOperate(collectlogs.OptionNew("Packet Capturing Task", collectlogs.BUSINESS_TYPE_INSERT)))
-	Register("POST", trace.CustomUriTcpdumpTask, trace.TcpdumpNeTask, midware.LogOperate(collectlogs.OptionNew("Packet Capturing Task", collectlogs.BUSINESS_TYPE_INSERT)))
-	// 网元发送执行 抓包下载pcap文件
-	Register("POST", trace.UriTcpdumpPcapDownload, trace.TcpdumpPcapDownload, midware.LogOperate(collectlogs.OptionNew("Packet Capturing Task", collectlogs.BUSINESS_TYPE_EXPORT)))
-	Register("POST", trace.CustomUriTcpdumpPcapDownload, trace.TcpdumpPcapDownload, midware.LogOperate(collectlogs.OptionNew("Packet Capturing Task", collectlogs.BUSINESS_TYPE_EXPORT)))
-	// 网元发送执行UPF pcap抓包
-	Register("POST", trace.UriTcpdumpNeUPFTask, trace.TcpdumpNeUPFTask, midware.LogOperate(collectlogs.OptionNew("Packet Capturing Task", collectlogs.BUSINESS_TYPE_INSERT)))
-	Register("POST", trace.CustomUriTcpdumpNeUPFTask, trace.TcpdumpNeUPFTask, midware.LogOperate(collectlogs.OptionNew("Packet Capturing Task", collectlogs.BUSINESS_TYPE_INSERT)))
-
 	// file management
 	Register("POST", file.UriFile, file.UploadFile, midware.LogOperate(collectlogs.OptionNew("File", collectlogs.BUSINESS_TYPE_INSERT)))
 	Register("GET", file.UriFile, file.DownloadFile, midware.LogOperate(collectlogs.OptionNew("File", collectlogs.BUSINESS_TYPE_OTHER)))
@@ -303,20 +284,9 @@ func init() {
 	Register("POST", cdr.UriCDREvent, cdr.PostCDREventFromNF, nil)
 	Register("POST", cdr.CustomUriCDREvent, cdr.PostCDREventFromNF, nil)
 
-	// UE event
+	// UE event AMF上报的UE事件, 无前缀给到Gin处理
 	//Register("POST", event.UriUEEvent, event.PostUEEventFromAMF, nil)
 
-	// 进程网络
-	Register("GET", psnet.UriWs, psnet.ProcessWs, nil)
-	Register("POST", psnet.UriStop, psnet.StopProcess, nil)
-	Register("POST", psnet.UriPing, psnet.Ping, nil)
-
-	// 主机CPU内存监控
-	Register("POST", monitor.UriLoad, monitor.LoadMonitor, nil)
-	Register("GET", monitor.UriNetOpt, monitor.Netoptions, nil)
-	Register("GET", monitor.UriIPAddr, monitor.IPAddr, nil)
-	Register("GET", monitor.UriIoOpt, monitor.Iooptions, nil)
-
 	// 文件资源
 	Register("GET", file.UriDiskList, file.DiskList, nil)
 	Register("POST", file.UriListFiles, file.ListFiles, nil)
@@ -337,56 +307,6 @@ func init() {
 	Register("POST", lm.ExtBackupDataUri, lm.ExtDatabaseBackupData, nil)
 	Register("POST", lm.CustomExtBackupDataUri, lm.ExtDatabaseBackupData, nil)
 
-	// 系统登录
-	Register("POST", security.UriLogin, security.LoginOMC, nil)
-	Register("POST", security.CustomUriLogin, security.LoginOMC, nil)
-
-	// 获取验证码
-	Register("GET", security.UriCaptchaImage, security.CaptchaImage, nil)
-	Register("GET", security.CustomUriCaptchaImage, security.CaptchaImage, nil)
-
-	// 登录用户信息
-	Register("GET", security.UriUserInfo, security.UserInfo, midware.Authorize(nil))
-	Register("GET", security.CustomUriUserInfo, security.UserInfo, midware.Authorize(nil))
-
-	// 登录用户路由信息
-	Register("GET", security.UriRouters, security.Routers, midware.Authorize(nil))
-	Register("GET", security.CustomUriRouters, security.Routers, midware.Authorize(nil))
-
-	// 参数配置信息接口添加到路由
-	for _, v := range sysconfig.Routers() {
-		Register(v.Method, v.Pattern, v.Handler, v.Middleware)
-	}
-
-	// 字典类型信息接口添加到路由
-	for _, v := range sysdicttype.Routers() {
-		Register(v.Method, v.Pattern, v.Handler, v.Middleware)
-	}
-
-	// 字典类型对应的字典数据信息接口添加到路由
-	for _, v := range sysdictdata.Routers() {
-		Register(v.Method, v.Pattern, v.Handler, v.Middleware)
-	}
-
-	// 菜单接口添加到路由
-	for _, v := range sysmenu.Routers() {
-		Register(v.Method, v.Pattern, v.Handler, v.Middleware)
-	}
-
-	// 角色接口添加到路由
-	for _, v := range sysrole.Routers() {
-		Register(v.Method, v.Pattern, v.Handler, v.Middleware)
-	}
-
-	// 用户接口添加到路由
-	for _, v := range sysuser.Routers() {
-		Register(v.Method, v.Pattern, v.Handler, v.Middleware)
-	}
-
-	// UDM 用户信息接口添加到路由
-	for _, v := range udmuser.Routers() {
-		Register(v.Method, v.Pattern, v.Handler, v.Middleware)
-	}
 }
 
 // To resolv rest POST/PUT/DELETE/PATCH cross domain