first commit

README.md

@@ -1,3 +1,3 @@
-## go 平江智慧路灯大数据平台
+## go 退伍军人App
 
 ### 常见问题

app/middleware/checkAuth.go

@@ -1,60 +1,53 @@
 package middleware
 
-import (
-	"bytes"
-	"github.com/gin-gonic/gin"
-	"iot_manager_service/util/common"
-	"net/http"
-	"strings"
-)
+//type CustomResponseWriter struct {
+//	gin.ResponseWriter
+//	body *bytes.Buffer
+//	Host string
+//}
+//
+//func (w CustomResponseWriter) Write(b []byte) (int, error) {
+//	w.body.Write(b)
+//	if strings.Contains(w.Host, "cloud.long-chi.com") {
+//		old := string(b)
+//		//为兼容https，此处需要修改下
+//		new := strings.ReplaceAll(old, "http://110.40.223.170:9000/", "https://cloud.long-chi.com/")
+//		new = strings.ReplaceAll(new, "http://106.52.134.22:9099/", "https://cloud.long-chi.com/")
+//		b = []byte(new)
+//	}
+//	return w.ResponseWriter.Write(b)
+//}
+//
+//func (w CustomResponseWriter) WriteString(s string) (int, error) {
+//	w.body.WriteString(s)
+//	return w.ResponseWriter.WriteString(s)
+//}
 
-type CustomResponseWriter struct {
-	gin.ResponseWriter
-	body *bytes.Buffer
-	Host string
-}
-
-func (w CustomResponseWriter) Write(b []byte) (int, error) {
-	w.body.Write(b)
-	if strings.Contains(w.Host, "cloud.long-chi.com") {
-		old := string(b)
-		//为兼容https，此处需要修改下
-		new := strings.ReplaceAll(old, "http://110.40.223.170:9000/", "https://cloud.long-chi.com/")
-		new = strings.ReplaceAll(new, "http://106.52.134.22:9099/", "https://cloud.long-chi.com/")
-		b = []byte(new)
-	}
-	return w.ResponseWriter.Write(b)
-}
-
-func (w CustomResponseWriter) WriteString(s string) (int, error) {
-	w.body.WriteString(s)
-	return w.ResponseWriter.WriteString(s)
-}
-func CheckAuth() gin.HandlerFunc {
-	return func(ctx *gin.Context) {
-		//该路由下不校验token
-		if strings.Contains(ctx.Request.RequestURI, "/login") ||
-			strings.Contains(ctx.Request.RequestURI, "/captcha") ||
-			strings.Contains(ctx.Request.RequestURI, "/tenant/info") ||
-			strings.Contains(ctx.Request.RequestURI, "/api/ctwing/aep/callback") ||
-			strings.Contains(ctx.Request.RequestURI, "/token") {
-			ctx.Next()
-			return
-		}
-
-		authorization := ctx.GetHeader(Authorization)
-		if authorization != "" {
-			token := ParseAccessToken(authorization)
-			if token != nil {
-				ctx.Set(Authorization, token)
-
-				blw := &CustomResponseWriter{body: bytes.NewBufferString(""), ResponseWriter: ctx.Writer, Host: ctx.Request.Host}
-				ctx.Writer = blw
-				ctx.Next()
-				return
-			}
-		}
-		ctx.JSON(http.StatusUnauthorized, common.NormalResponse(http.StatusUnauthorized, "token is invalid", nil))
-		ctx.Abort()
-	}
-}
+//func CheckAuth() gin.HandlerFunc {
+//	return func(ctx *gin.Context) {
+//		//该路由下不校验token
+//		if strings.Contains(ctx.Request.RequestURI, "/login") ||
+//			strings.Contains(ctx.Request.RequestURI, "/captcha") ||
+//			strings.Contains(ctx.Request.RequestURI, "/tenant/info") ||
+//			strings.Contains(ctx.Request.RequestURI, "/api/ctwing/aep/callback") ||
+//			strings.Contains(ctx.Request.RequestURI, "/token") {
+//			ctx.Next()
+//			return
+//		}
+//
+//		authorization := ctx.GetHeader(Authorization)
+//		if authorization != "" {
+//			token := ParseAccessToken(authorization)
+//			if token != nil {
+//				ctx.Set(Authorization, token)
+//
+//				blw := &CustomResponseWriter{body: bytes.NewBufferString(""), ResponseWriter: ctx.Writer, Host: ctx.Request.Host}
+//				ctx.Writer = blw
+//				ctx.Next()
+//				return
+//			}
+//		}
+//		ctx.JSON(http.StatusUnauthorized, common.NormalResponse(http.StatusUnauthorized, "token is invalid", nil))
+//		ctx.Abort()
+//	}
+//}

app/middleware/token.go

@@ -1,54 +1,44 @@
 package middleware
 
 import (
-	"github.com/golang-jwt/jwt"
-	"iot_manager_service/config"
-	"time"
+	"github.com/gin-gonic/gin"
+	"iot_manager_service/util/cache"
+	"iot_manager_service/util/common"
+	"iot_manager_service/util/token"
+	"net/http"
+	"strings"
 )
 
-const (
-	Authorization = "Authorization"
-	Audience      = "audience"
-	Issuer        = "issuser"
-)
-
-var EmptyKeyFunc = func(t *jwt.Token) (interface{}, error) { return []byte(config.Instance().Server.TokenSign), nil }
-
-type Claims struct {
-	jwt.StandardClaims
-	TenantId string `json:"tenant_id"`
-	UserId   int    `json:"user_id"`
-	RoleId   int    `json:"role_id"`
-	UserName string `json:"user_name"`
-	Random   string `json:"random"`
-}
-
-func GetAccessToken(userId, roleId int, tenantId string, userName string, random string) (string, error) {
-	jwtToken := Claims{StandardClaims: jwt.StandardClaims{
-		Audience:  Audience,
-		Issuer:    Issuer,
-		ExpiresAt: time.Now().Add(2 * time.Hour).Unix(),
-		NotBefore: time.Now().Unix(),
-	},
-		UserId:   userId,
-		TenantId: tenantId,
-		RoleId:   roleId,
-		UserName: userName,
-		Random:   random,
-	}
-
-	claims := jwt.NewWithClaims(jwt.SigningMethodHS512, jwtToken)
-	return claims.SignedString([]byte(config.Instance().Server.TokenSign))
-}
-
-func ParseAccessToken(authorization string) *Claims {
-	token, err := jwt.ParseWithClaims(authorization, &Claims{}, EmptyKeyFunc)
-	if err != nil {
-		return nil
-	}
-	claims, ok := token.Claims.(*Claims)
-	if !ok {
-		return nil
+// 验证token令牌的中间件
+func AuthMiddleware() gin.HandlerFunc {
+	return func(c *gin.Context) {
+		//如果包含路径/login则放行，其余的都要进行token认证
+		if strings.Contains(c.Request.RequestURI, "/login") ||
+			strings.Contains(c.Request.RequestURI, "/getpublicKey") {
+			c.Next()
+			return
+		}
+		// 从请求头中获取token
+		tokeString := c.GetHeader("Authorization")
+		if tokeString == "" {
+			c.JSON(http.StatusOK, common.ParamsInvalidResponse("Authorization不能为空", nil))
+			c.Abort()
+			return
+		}
+		//解析token
+		claims, err := token.JwtClaims.ParseJwtToken(tokeString)
+		if err != nil {
+			c.JSON(http.StatusOK, common.ParamsInvalidResponse("Authorization解析错误", nil))
+			c.Abort()
+			return
+		}
+		//判断是不是最新一次的token，只有最新的有效，否则无效，不放行
+		redis_uuid, err := cache.GetToken(claims.ID)
+		if redis_uuid != claims.UUID || redis_uuid == "" || err != nil {
+			c.JSON(http.StatusOK, common.ParamsInvalidResponse("Authorization失效", nil))
+			c.Abort()
+			return
+		}
+		c.Next()
 	}
-	return claims
 }

app/user/controller/user.go

@@ -0,0 +1,33 @@
+package controller
+
+import (
+	"fmt"
+	"github.com/gin-gonic/gin"
+	"iot_manager_service/app/user/model"
+	"iot_manager_service/app/user/service"
+	"iot_manager_service/util/common"
+	"net/http"
+)
+
+var User = new(user)
+
+type user struct{}
+
+func (u *user) Login(c *gin.Context) {
+	loginUser := model.LoginUser{}
+	if err := c.ShouldBindJSON(&loginUser); err != nil {
+		c.JSON(http.StatusOK, common.ParamsInvalidResponse(err.Error(), nil))
+		return
+	}
+	info := service.UserService.Login(loginUser.Account, loginUser.PassWord)
+	c.JSON(http.StatusOK, info)
+}
+
+func (u *user) GetPublicKey(c *gin.Context) {
+	key := service.UserService.GetPublicKey()
+	c.JSON(http.StatusOK, key)
+}
+
+func (u *user) GetUser(c *gin.Context) {
+	fmt.Println("demo。。。")
+}

app/user/dao/common.go

@@ -0,0 +1,18 @@
+package dao
+
+import (
+	"fmt"
+	"gorm.io/gorm"
+)
+
+var Db *gorm.DB
+
+func InitDB(db *gorm.DB) {
+	Db = db
+	err := Db.AutoMigrate(
+		&User{},
+	)
+	if err != nil {
+		panic(fmt.Sprintf("AutoMigrate err : %v", err))
+	}
+}

app/user/dao/user.go

@@ -0,0 +1,103 @@
+package dao
+
+import (
+	"time"
+)
+
+// User 用户
+type User struct {
+	ID         int       `gorm:"primary_key;type:int" json:"id"`                                    //编号
+	UserName   string    `gorm:"type:varchar(12)" json:"userName"`                                  //姓名
+	Sex        int       `gorm:"type:smallint;default:1" json:"sex"`                                //性别                                      //用户编号
+	Account    string    `gorm:"type:varchar(45)" json:"account"`                                   //账号
+	Password   string    `gorm:"type:text" json:"password"`                                         //密码
+	Avatar     string    `gorm:"type:varchar(500)" json:"avatar"`                                   //头像
+	Email      string    `gorm:"type:varchar(45)" json:"email"`                                     //邮箱
+	Phone      string    `gorm:"type:varchar(45)" json:"phone"`                                     //手机
+	RoleName   string    `gorm:"type:varchar(12)" json:"roleName"`                                  //角色名
+	Birthday   time.Time `gorm:"type:datetime" json:"birthday"`                                     //生日
+	DeptId     int       `gorm:"type:int" json:"deptId"`                                            //部门id
+	Status     int       `gorm:"type:int;default:0" json:"status"`                                  //状态 0=可用，1禁用
+	IsDeleted  int       `gorm:"type:int" json:"isDeleted"`                                         //是否删除 0=未删除,1=删除
+	CreateTime time.Time `gorm:"autoCreateTime;column:create_time;type:datetime" json:"createTime"` //新增时间
+	AuthId     string    `gorm:"type:varchar(12);default:'100'" json:"authId"`                      //权限id
+}
+
+func (*User) TableName() string {
+	return "user"
+}
+
+func (c *User) LoginFindAccount(acc string) (*User, error) {
+	var user User
+	err := Db.Debug().Model(&user).Where("account = ? and status = 0", acc).First(&user).Error
+	return &user, err
+}
+
+//func (c *User) GetUser() error {
+//	return Db.Model(&c).Where(" is_deleted = 0").Find(&c).Error
+//}
+//
+//func (c *User) GetUserByTenantId() error {
+//	return Db.Model(&c).Where("tenant_id = ? and is_deleted = 0", c.TenantId).Find(&c).Error
+//}
+//
+//func (c *User) GetUserByPwd() error {
+//	return Db.Model(&c).Where("tenant_id = ? and account = ? and password = ? and is_deleted = 0", c.TenantId, c.Account, c.Password).First(&c).Error
+//}
+//
+//func (c *User) GetUsers(offset, limit int) ([]User, int, error) {
+//	var users []User
+//	var counts int64
+//	db := Db.Model(&c)
+//
+//	if c.Account != "" {
+//		db = db.Where("account like ?", "%"+c.Account+"%")
+//	}
+//	if c.RealName != "" {
+//		db = db.Where("real_name like ?", "%"+c.RealName+"%")
+//	}
+//	err := db.Where("is_deleted = 0").Offset(offset).Limit(limit).Find(&users).Error
+//	db1 := Db.Model(&c)
+//	db1.Where("is_deleted = 0").Count(&counts)
+//	return users, int(counts), err
+//}
+//
+//func (c *User) Save() error {
+//	return Db.Model(&c).Save(&c).Error
+//}
+//
+//func (c *User) Update() error {
+//	return Db.Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
+//}
+//
+//func (c *User) Remove() error {
+//	return Db.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime, "update_user": c.UpdateUser, "is_deleted": c.IsDeleted}).Error
+//}
+//
+//func (c *User) UpdatePwd(pwd string) error {
+//	return Db.Model(&c).Where(" id = ? ", c.ID).Updates(map[string]interface{}{"password": pwd}).Error
+//}
+//
+//func (c *User) GetAll() ([]User, error) {
+//	var users []User
+//	err := Db.Model(&c).Where("is_deleted = 0").Find(&users).Error
+//	return users, err
+//}
+//
+//func (c *User) UpdateRoles(userIds []string, roleIds string) error {
+//	err := Db.Model(&c).Where("id in ?", userIds).Updates(map[string]interface{}{"role_id": roleIds}).Error
+//	return err
+//}
+//
+//// IsExist :account是否已存在 true为存在,false不存在
+//func (c *User) IsExist() bool {
+//	var s string
+//	Db.Model(&c).Select("account").Where("account = ?", c.Account).First(&s)
+//	return s != ""
+//}
+//
+//// GetAvatar 查 avatar
+//func (c *User) GetAvatar() {
+//	tx := Db.Model(&c)
+//	tx.Select("avatar").Where("tenant_id = ?", c.TenantId).Find(&c)
+//}

app/user/model/user.go

@@ -0,0 +1,6 @@
+package model
+
+type LoginUser struct {
+	Account  string `json:"account"`  //账号
+	PassWord string `json:"passWord"` //密码
+}

app/user/service/userService.go

@@ -0,0 +1,65 @@
+package service
+
+import (
+	"bytes"
+	"encoding/base64"
+	"github.com/gin-gonic/gin"
+	"github.com/google/uuid"
+	"iot_manager_service/util/cache"
+	"iot_manager_service/util/rsa"
+	"iot_manager_service/util/token"
+	"strconv"
+
+	//"github.com/google/uuid"
+	"gorm.io/gorm"
+	"iot_manager_service/app/user/dao"
+	"iot_manager_service/util/common"
+	//"iot_manager_service/util/rsa"
+	//"iot_manager_service/util/token"
+	//"strconv"
+)
+
+// 用户管理服务
+var UserService = new(userService)
+
+type userService struct{}
+
+func (s *userService) Login(acc string, pwd string) *common.Errors {
+	userdao := &dao.User{}
+	user, err := userdao.LoginFindAccount(acc)
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return common.ParamsInvalidResponse("很抱歉，由于您的账号未完成注册或已被禁用，暂时无法使用。", nil)
+		}
+		return common.FailResponse(err.Error(), nil)
+	}
+
+	//加密
+	//encryption := rsa.Encryption([]byte("123456"))
+	//base64.StdEncoding.EncodeToString(encryption))
+	//解密前端密文
+	a, _ := base64.StdEncoding.DecodeString(pwd)
+	client := rsa.Decryption(a)
+
+	//解密数据库密文
+	b, _ := base64.StdEncoding.DecodeString(user.Password)
+	mysql := rsa.Decryption(b)
+	if !bytes.Equal(client, mysql) {
+		return common.ParamsInvalidResponse("密码错误", err)
+	}
+
+	//登录成功则生成token
+	UUID := uuid.New().String()
+	USERID := strconv.Itoa(user.ID)
+	jwtToken, _ := token.JwtClaims.CreateJwtToken(USERID, user.UserName, UUID)
+	cache.SetToken(USERID, UUID)
+	return common.SuccessResponse("登录成功", gin.H{"token": jwtToken})
+}
+
+func (s *userService) GetPublicKey() *common.Errors {
+	pub, err := rsa.GetPubKey()
+	if err != nil {
+		return common.FailResponse(err.Error(), nil)
+	}
+	return common.SuccessResponse("获取公钥成功", gin.H{"publicKey": pub})
+}

config/config.yaml

@@ -1,6 +1,6 @@
 # HTTP Server.
 server:
-  address: ":8199"
+  address: ":8085"
   code_enabled: true
   token_sign: "6MTY2MDcxMjgzNiwi"
 
@@ -19,45 +19,21 @@ database:
   #db.host : 106.52.134.22
   #db.host : 120.77.219.16
   host: "localhost"
-  user: "root"
-  password: "root"
+  Auth: "root"
+  password: "123456"
   #password : "lczm@2019oS"
   port: "3306"
-  name: "iot"
-  prefix: "t_"
+  name: "lc_veterans"
+  prefix: ""
   timezone: "Asia/Shanghai"
 
 redis:
   host: "localhost:6379"
-  #password: "123456"
-  #password: "lczm*2019"
-
-minio:
-  endpoint: "110.40.223.170:9000"
-  link: "http://110.40.223.170:9000"
-  access_key: "lczm*minio"
-  secret_key: "lczm*minio"
+  #password: ""
+  #password: ""
 
 #接口
-foreign:
-  iot_edge_url: "http://192.168.110.248:8195"
-  security_rewind_url: "http://192.168.110.28:9099"
-  ip_cast_edge_url: "http://1.117.161.196:10063"
-
-#告警通知相关
-monit-notice:
-  email:
-    host: "smtp.163.com"
-    port: "465"
-    user-name: "hn_longchi@163.com"
-    pass-word: "XDTEFFVZVLANOBSU"
-  sms:
-    tencent:
-      app_id: "1400729214"
-      secret_id: "AKID0tkPq1wc9TXMvEHZ5NRFo7AxVotkNltl"
-      secret_key: "g7MNBk36tuhIgplSuAE6lCRVLvFTYR5U"
-      sms_key: "湖南省龙驰照明"
-      warn_sms_template_id: "1533523"
-# switch 0-关闭 其他(1)-开启
-es:
-  es_url: "localhost:9200"
+#foreign:
+#  iot_edge_url: "http://192.168.110.248:8195"
+#  security_rewind_url: "http://192.168.110.28:9099"
+#  ip_cast_edge_url: "http://1.117.161.196:10063"

config/private.pem

@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQD5VdURNBvulnBXj13ZFCsDhNkV6xZc5q28VYUgWTFuVWbFsNmx
+feQJDpZOQ2jLW9MRJU1q+AubYtX9oVtLeGDzqGJs3oj0W2CkShy4JWzNoPC/O5JX
+txrQSImIilp4S0mOmhclcrKpQZtA8PSyewB/5FWZ4erGLqFFWcZ9sAHniwIDAQAB
+AoGAMFEtxPOwJgAJLS6fJR3/Z+MqnlC8OKyLJl/8OFSQe60ZCV5IEVkwA4FMJ0Zw
+3FejA0OTSRNgTHBOv6OxKWLehndDydKJyG/soDsWXqgWo9b7ZoxX0nEi7oxkaVgD
+/orOvceBZ4iVCeGXsclel3ZmwQixlxQAeqG2LVhQATanOKECQQD81hd47vi1HwCz
+5Z14RpswjrMtNEFgEIQMYPKLR5WgaeECX0sH4cz7J49qaTSJWykmHvwwJU02wLCR
+8N4WcXi1AkEA/HSGnWfFboUK4SYOXv4gGnJiVdanSxRNYJ/Ndg561x0bNDzALCem
+MzrxSEp8y4s54336YwE/MW5EV6aqgw9HPwJAECU3wIA6H47IQ7Sg9qJDnLkwFe3l
+UtYbKJM0SdKbam/4b2dYajtwFIW1Mc1gDnlkyktmPUjUgm+RlvAzrmk2lQJBAKT5
+VPrJ1GgbwvdM0jlbYglGVGJ5yosysjoBU9fhMH8ggyWIyaBRLLfvvbsbCiBNVEAI
+lDZcmzonL7wDqwvIUSsCQD8MnZmP14uMTHHSay+pJiMR5gbj4Z3cPZfjQdofGDH+
+E1wcg6Om9XZshU3PgpLoF1WSGF6wCahOXChjW9AZWv4=
+-----END RSA PRIVATE KEY-----

config/public.pem

@@ -0,0 +1,6 @@
+-----BEGIN PUBLIC KEY-----
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD5VdURNBvulnBXj13ZFCsDhNkV
+6xZc5q28VYUgWTFuVWbFsNmxfeQJDpZOQ2jLW9MRJU1q+AubYtX9oVtLeGDzqGJs
+3oj0W2CkShy4JWzNoPC/O5JXtxrQSImIilp4S0mOmhclcrKpQZtA8PSyewB/5FWZ
+4erGLqFFWcZ9sAHniwIDAQAB
+-----END PUBLIC KEY-----

go.mod

@@ -3,19 +3,13 @@ module iot_manager_service
 go 1.17
 
 require (
+	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/druidcaesa/gotool v0.0.0-20220613023420-645c641d1304
 	github.com/gin-gonic/gin v1.8.1
 	github.com/go-redis/redis v6.15.9+incompatible
-	github.com/goccy/go-json v0.9.7
-	github.com/golang-jwt/jwt v3.2.2+incompatible
-	github.com/google/uuid v1.3.0
 	github.com/lestrrat/go-file-rotatelogs v0.0.0-20180223000712-d3151e2a480f
 	github.com/minio/minio-go/v7 v7.0.43
-	github.com/mitchellh/mapstructure v1.5.0
-	github.com/mojocn/base64Captcha v1.3.5
 	github.com/olivere/elastic v6.2.37+incompatible
-	github.com/robfig/cron v1.2.0
-	github.com/satori/go.uuid v1.2.0
 	github.com/sirupsen/logrus v1.9.0
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.572
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/sms v1.0.572
@@ -35,8 +29,10 @@ require (
 	github.com/go-playground/universal-translator v0.18.0 // indirect
 	github.com/go-playground/validator/v10 v10.10.0 // indirect
 	github.com/go-sql-driver/mysql v1.6.0 // indirect
+	github.com/goccy/go-json v0.9.7 // indirect
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
 	github.com/google/go-cmp v0.5.8 // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect

main.go

@@ -5,20 +5,12 @@ import (
 	"gorm.io/driver/mysql"
 	"gorm.io/gorm"
 	gormLogger "gorm.io/gorm/logger"
-	"iot_manager_service/app/data/controller"
-	data "iot_manager_service/app/data/dao"
-	device "iot_manager_service/app/device/dao"
-	multimedia "iot_manager_service/app/multimedia/dao"
-	operation "iot_manager_service/app/operation/dao"
-	record "iot_manager_service/app/record/dao"
-	system "iot_manager_service/app/system/dao"
-	warn "iot_manager_service/app/warn/dao"
+	user "iot_manager_service/app/user/dao"
 	"iot_manager_service/config"
 	_ "iot_manager_service/config"
 	"iot_manager_service/router"
 	"iot_manager_service/util/cache"
 	"iot_manager_service/util/logger"
-	"iot_manager_service/util/minio"
 	"net/url"
 	"time"
 )
@@ -38,11 +30,10 @@ func main() {
 	if err != nil {
 		panic(err)
 	}
-	minio.InitMinio()
-	controller.CalcTask()
 	engine := gin.Default()
 
 	router.InitRouter(engine)
+
 	if cfg.Logger.DbShowLog == 1 {
 		println(gin.DebugMode + "当前为开发环境，会产生较多调试日志")
 	} else {
@@ -86,12 +77,5 @@ func initDB() {
 		sqlDB.SetMaxOpenConns(5)
 		sqlDB.SetConnMaxLifetime(time.Hour * 4) //括号里面是超时时间，要小于数据库的超时时间  返回 invalid connection的问题
 	}
-	device.InitDB(db)
-	system.InitDB(db)
-	multimedia.InitDB(db)
-	data.InitDB(db)
-	record.InitDB(db)
-	warn.InitDB(db)
-	operation.InitDB(db)
-
+	user.InitDB(db)
 }

router/router.go

@@ -2,14 +2,8 @@ package router
 
 import (
 	"github.com/gin-gonic/gin"
-	device "iot_manager_service/app/device/controller"
 	"iot_manager_service/app/middleware"
-	multimedia "iot_manager_service/app/multimedia/controller"
-	operation "iot_manager_service/app/operation/controller"
-	record "iot_manager_service/app/record/controller"
-	security "iot_manager_service/app/security/controller"
-	system "iot_manager_service/app/system/controller"
-	warn "iot_manager_service/app/warn/controller"
+	user "iot_manager_service/app/user/controller"
 	"iot_manager_service/config"
 	"iot_manager_service/util/logger"
 )
@@ -17,654 +11,31 @@ import (
 func InitRouter(engine *gin.Engine) {
 	// 跨域处理
 	engine.Use(middleware.Cors())
-	// 校验权限
-	engine.Use(middleware.CheckAuth())
+	// 校验token令牌
+	engine.Use(middleware.AuthMiddleware())
+
 	engine.Use(gin.Recovery())
 	if config.Instance().Logger.Switch == 1 {
 		engine.Use(logger.LogToFile())
 	}
 	engine.Use(logger.Recover)
 
-	// 操作历史记录
-	handleHistory := engine.Group("/api/longchi/handlehistory")
-	{
-		handleHistory.GET("/list", system.HandleHistory.List)
-	}
-
-	// 设备管理
-	deviceMgr := engine.Group("/api/longchi/device/")
-
-	//设备模型
-	vendor := deviceMgr.Group("vender")
-	{
-		vendor.GET("/getModelList", device.Util.GetModelList)
-		vendor.GET("/getTypeList", device.Util.GetModelList)
-		vendor.GET("/list", device.Util.GetVenderList)
-		vendor.GET("/detail", device.Util.GetVenderDetail)
-		vendor.GET("/remove", device.Util.GetVenderRemove)
-		vendor.GET("/submit", device.Util.GetVenderSubmit)
-	}
-
-	//公共方法
-	share := engine.Group("/api/longchi/share")
-	{
-		share.GET("/tenantcode/getTenantCode", device.Util.GetTenantCode)
-	}
-
-	//桥梁
-	bridge := deviceMgr.Group("bridge")
-	{
-		bridge.GET("/detail", device.Bridge.Detail)
-		bridge.GET("/list", device.Bridge.List)
-		bridge.POST("/submit", device.Bridge.CreateOrUpdate)
-		bridge.POST("/remove", device.Bridge.Remove)
-		bridge.GET("/dropdown", device.Bridge.GetList)
-		bridge.POST("/import-excel", device.Bridge.ImportExcel)
-		bridge.GET("/export-excel", device.Bridge.ExportExcel)
-		bridge.GET("/export-template", device.Bridge.ExportTemplate)
-	}
-
-	//桥梁传感器 控制器
-	bridgeSensor := deviceMgr.Group("bridgesensor")
-	{
-		bridgeSensor.GET("/detail", device.BridgeSensor.Detail)
-		bridgeSensor.GET("/list", device.BridgeSensor.List)
-		bridgeSensor.POST("/submit", device.BridgeSensor.CreateOrUpdate)
-		bridgeSensor.POST("/remove", device.BridgeSensor.Remove)
-		bridgeSensor.GET("/dropdown", device.BridgeSensor.GetList)
-		bridgeSensor.POST("/enable-disable", device.BridgeSensor.Enable)
-		bridgeSensor.POST("/import-excel", device.BridgeSensor.ImportExcel)
-		bridgeSensor.GET("/export-excel", device.BridgeSensor.ExportExcel)
-		bridgeSensor.GET("/export-template", device.BridgeSensor.ExportTemplate)
-	}
-
-	//摄像头
-	camera := deviceMgr.Group("/camera")
-	{
-		camera.GET("/detail", device.Camera.Detail)
-		camera.GET("/list", device.Camera.List)
-		camera.POST("/submit", device.Camera.CreateOrUpdate)
-		camera.POST("/remove", device.Camera.Remove)
-		camera.POST("/import-excel", device.Camera.ImportExcel)
-		camera.GET("/export-excel", device.Camera.ExportExcel)
-		camera.GET("/export-template", device.Camera.ExportTemplate)
-		camera.POST("/enable-disable", device.Camera.Enable)
-		camera.GET("/getList", device.Camera.GetList)
-	}
-
-	//抓拍单元+卡口 控制器
-	captureUnit := deviceMgr.Group("captureunit")
-	{
-		captureUnit.GET("/detail", device.CaptureUint.Detail)
-		captureUnit.GET("/capture-list", device.CaptureUint.CaptureList)
-		captureUnit.POST("/capture-submit", device.CaptureUint.CaptureSubmit)
-		captureUnit.GET("/capture-pull-down-list", device.CaptureUint.CaptureGetList)
-		captureUnit.GET("/point-list", device.CaptureUint.PointList)
-		captureUnit.POST("/point-submit", device.CaptureUint.PointSubmit)
-		captureUnit.GET("/point-pull-down-list", device.CaptureUint.PointGetList)
-		captureUnit.POST("/remove", device.CaptureUint.Remove)
-	}
-
-	//垃圾桶台账 控制器
-	garbage := deviceMgr.Group("garbage")
-	{
-		garbage.GET("/detail", device.Garbage.Detail)
-		garbage.GET("/list", device.Garbage.List)
-		garbage.POST("/submit", device.Garbage.CreateOrUpdate)
-		garbage.POST("/remove", device.Garbage.Remove)
-		garbage.GET("/dropdown", device.Garbage.GetList)
-		garbage.POST("/import-excel", device.Garbage.ImportExcel)
-		garbage.GET("/export-excel", device.Garbage.ExportExcel)
-		garbage.GET("/export-template", device.Garbage.ExportTemplate)
-	}
-
-	//垃圾桶道路分组管理 控制器
-	garbageWayGroup := deviceMgr.Group("garbage-way-group")
-	{
-		garbageWayGroup.GET("/detail", device.GarbageWay.Detail)
-		garbageWayGroup.GET("/list", device.GarbageWay.List)
-		garbageWayGroup.POST("/submit", device.GarbageWay.CreateOrUpdate)
-		garbageWayGroup.POST("/remove", device.GarbageWay.Remove)
-		garbageWayGroup.GET("/getList", device.GarbageWay.GetList)
-	}
-
-	//信息屏基本信息 控制器
-	infoBoard := deviceMgr.Group("infoboard")
-	{
-		infoBoard.GET("/detail", device.InfoBoard.Detail)
-		infoBoard.GET("/list", device.InfoBoard.List)
-		infoBoard.POST("/submit", device.InfoBoard.CreateOrUpdate)
-		infoBoard.POST("/remove", device.InfoBoard.Remove)
-		infoBoard.POST("/import-excel", device.InfoBoard.ImportExcel)
-		infoBoard.GET("/export-excel", device.InfoBoard.ExportExcel)
-		infoBoard.GET("/export-template", device.InfoBoard.ExportTemplate)
-		infoBoard.POST("/system-operation", device.InfoBoard.EdgeCmd)
-		infoBoard.POST("/enable-disable", device.InfoBoard.Enable)
-		infoBoard.POST("/show-setting", device.InfoBoard.ShowSetting)
-	}
-
-	//IP广播基本信息 控制器
-	ipBroadCast := deviceMgr.Group("ipbroadcast")
-	{
-		ipBroadCast.GET("/detail", device.IpBroadcast.Detail)
-		ipBroadCast.GET("/list", device.IpBroadcast.List)
-		ipBroadCast.POST("/submit", device.IpBroadcast.CreateOrUpdate)
-		ipBroadCast.POST("/remove", device.IpBroadcast.Remove)
-		ipBroadCast.POST("/import-excel", device.IpBroadcast.ImportExcel)
-		ipBroadCast.GET("/export-excel", device.IpBroadcast.ExportExcel)
-		ipBroadCast.GET("/export-template", device.IpBroadcast.ExportTemplate)
-		ipBroadCast.POST("/setting-volume", device.IpBroadcast.SettingVolume)
-		ipBroadCast.POST("/setting-ipcast", device.IpBroadcast.SettingIpCast)
-	}
-
-	//一键报警服务表 控制器
-	Alarm := deviceMgr.Group("akeyalarmserve")
-	{
-		Alarm.GET("/detail", device.Alarm.Detail)
-		Alarm.GET("/list", device.Alarm.List)
-		Alarm.POST("/submit", device.Alarm.CreateOrUpdate)
-		Alarm.POST("/remove", device.Alarm.Remove)
-		Alarm.GET("/getList", device.Alarm.GetList)
-		Alarm.POST("/import-excel", device.Alarm.ImportExcel)
-		Alarm.GET("/export-excel", device.Alarm.ExportExcel)
-		Alarm.GET("/export-template", device.Alarm.ExportTemplate)
-	}
-
-	//一键报警终端表 控制器
-	AlarmTerminal := deviceMgr.Group("akeyalarmterminal")
-	{
-		AlarmTerminal.GET("/detail", device.AlarmTerminal.Detail)
-		AlarmTerminal.GET("/list", device.AlarmTerminal.List)
-		AlarmTerminal.POST("/submit", device.AlarmTerminal.CreateOrUpdate)
-		AlarmTerminal.POST("/remove", device.AlarmTerminal.Remove)
-		AlarmTerminal.POST("/import-excel", device.AlarmTerminal.ImportExcel)
-		AlarmTerminal.GET("/export-excel", device.AlarmTerminal.ExportExcel)
-		AlarmTerminal.GET("/export-template", device.AlarmTerminal.ExportTemplate)
-	}
-
-	//灯杆基本信息 控制器
-	lampPole := deviceMgr.Group("lamppole")
-	{
-		lampPole.GET("/detail", device.LampPole.Detail)
-		lampPole.GET("/getRelevanceDetail", device.LampPole.GetRelevanceDetail)
-		lampPole.GET("/list", device.LampPole.List)
-		lampPole.POST("/submit", device.LampPole.CreateOrUpdate)
-		lampPole.POST("/remove", device.LampPole.Remove)
-		lampPole.GET("/getList", device.LampPole.GetList)
-		lampPole.POST("/import-excel", device.LampPole.ImportExcel)
-		lampPole.GET("/export-excel", device.LampPole.ExportExcel)
-		lampPole.GET("/export-template", device.LampPole.ExportTemplate)
-	}
-
-	//灯杆分组
-	lampPoleGroup := deviceMgr.Group("/lamppolegroup")
-	{
-		lampPoleGroup.GET("/detail", device.LampPoleGroup.Detail)
-		lampPoleGroup.GET("/list", device.LampPoleGroup.List)
-		lampPoleGroup.POST("/submit", device.LampPoleGroup.CreateOrUpdate)
-		lampPoleGroup.POST("/remove", device.LampPoleGroup.Remove)
-		lampPoleGroup.GET("/getList", device.LampPoleGroup.GetList)
-		lampPoleGroup.GET("/filtration-list", device.LampPoleGroup.FiltrationList)
-		lampPoleGroup.GET("/getTree", device.LampPoleGroup.GetTree)
-	}
-
-	//灯控基本信息 控制器
-	lightControl := deviceMgr.Group("lightcontrol")
-	{
-		lightControl.GET("/detail", device.Light.Detail)
-		lightControl.GET("/list", device.Light.List)
-		lightControl.POST("/submit", device.Light.CreateOrUpdate)
-		lightControl.POST("/remove", device.Light.Remove)
-		lightControl.GET("/getLampPoleList", device.Light.GetList)
-		lightControl.POST("/import-excel", device.Light.ImportExcel)
-		lightControl.GET("/export-excel", device.Light.ExportExcel)
-		lightControl.GET("/export-template", device.Light.ExportTemplate)
-		lightControl.POST("/enable-disable", device.Light.Enable)
-		lightControl.POST("/off-one", device.Light.Switch) //todo 在strategy中
-	}
-
-	manholeCover := deviceMgr.Group("manholecover")
-	{
-		manholeCover.GET("/detail", device.ManholeCover.Detail)
-		manholeCover.GET("/list", device.ManholeCover.List)
-		manholeCover.POST("/submit", device.ManholeCover.CreateOrUpdate)
-		manholeCover.POST("/remove", device.ManholeCover.Remove)
-		manholeCover.POST("/setting", device.ManholeCover.Setting)
-		manholeCover.GET("/getList", device.ManholeCover.GetList)
-		manholeCover.POST("/import-excel", device.ManholeCover.ImportExcel)
-		manholeCover.GET("/export-excel", device.ManholeCover.ExportExcel)
-		manholeCover.GET("/export-template", device.ManholeCover.ExportExcel)
-		manholeCover.GET("/all-list", device.ManholeCover.AllList)
-	}
-
-	//灯随车走分组 控制器
-	onDemandGroup := deviceMgr.Group("on-demand-group")
-	{
-		onDemandGroup.GET("/detail", device.OnDemandGroup.Detail)
-		onDemandGroup.GET("/list", device.OnDemandGroup.List)
-		onDemandGroup.POST("/submit", device.OnDemandGroup.CreateOrUpdate)
-		onDemandGroup.POST("/remove", device.OnDemandGroup.Remove)
-		onDemandGroup.GET("/getList", device.OnDemandGroup.GetList)
-		onDemandGroup.GET("/group-number", device.OnDemandGroup.GroupNumber)
-	}
-
-	//灯随车走传感器 控制器
-	onDemandSensor := deviceMgr.Group("on-demand-sensor")
-	{
-		onDemandSensor.GET("/detail", device.OnDemandSensor.Detail)
-		onDemandSensor.GET("/list", device.OnDemandSensor.List)
-		onDemandSensor.POST("/submit", device.OnDemandSensor.CreateOrUpdate)
-		onDemandSensor.POST("/remove", device.OnDemandSensor.Remove)
-		onDemandSensor.POST("/import-excel", device.OnDemandSensor.ImportExcel)
-		onDemandSensor.GET("/export-excel", device.OnDemandSensor.ExportExcel)
-		onDemandSensor.GET("/export-template", device.OnDemandSensor.ExportTemplate)
-	}
-
-	//环境传感器 控制器
-	optoSensor := deviceMgr.Group("optosensor")
-	{
-		optoSensor.GET("/detail", device.OptoSensor.Detail)
-		optoSensor.GET("/list", device.OptoSensor.List)
-		optoSensor.POST("/submit", device.OptoSensor.CreateOrUpdate)
-		optoSensor.POST("/remove", device.OptoSensor.Remove)
-		optoSensor.GET("/getList", device.OptoSensor.GetList)
-		optoSensor.POST("/set-default", device.OptoSensor.SetDefault)
-		optoSensor.POST("/import-excel", device.OptoSensor.ImportExcel)
-		optoSensor.GET("/export-excel", device.OptoSensor.ExportExcel)
-		optoSensor.GET("/export-template", device.OptoSensor.ExportTemplate)
-	}
-
-	//配电箱基本信息 控制器
-	switchBox := deviceMgr.Group("switchbox")
-	{
-		switchBox.GET("/detail", device.SwitchBox.Detail)
-		switchBox.GET("/list", device.SwitchBox.List)
-		switchBox.POST("/submit", device.SwitchBox.CreateOrUpdate)
-		switchBox.POST("/remove", device.SwitchBox.Remove)
-		switchBox.GET("/getList", device.SwitchBox.GetList)
-		switchBox.POST("/import-excel", device.SwitchBox.ImportExcel)
-		switchBox.GET("/export-excel", device.SwitchBox.ExportExcel)
-		switchBox.GET("/export-template", device.SwitchBox.ExportTemplate)
-	}
-
-	//变压器基本信息 控制器
-	transformer := deviceMgr.Group("transformer")
-	{
-		transformer.GET("/detail", device.Transformer.Detail)
-		transformer.GET("/list", device.Transformer.List)
-		transformer.POST("/submit", device.Transformer.CreateOrUpdate)
-		transformer.POST("/remove", device.Transformer.Remove)
-		transformer.GET("/getList", device.Transformer.GetList)
-	}
-
-	//智慧网关基本信息 控制器
-	wisdomGateway := deviceMgr.Group("wisdomgateway")
-	{
-		wisdomGateway.GET("/detail", device.Gateway.Detail)
-		wisdomGateway.GET("/list", device.Gateway.List)
-		wisdomGateway.POST("/submit", device.Gateway.CreateOrUpdate)
-		wisdomGateway.POST("/remove", device.Gateway.Remove)
-		wisdomGateway.GET("/getList", device.Gateway.GetList)
-		wisdomGateway.GET("/getRelevanceDetail", device.Gateway.GetRelevanceDetail)
-		wisdomGateway.POST("/import-excel", device.Gateway.ImportExcel)
-		wisdomGateway.GET("/export-excel", device.Gateway.ExportExcel)
-		wisdomGateway.GET("/export-template", device.Gateway.ExportTemplate)
-	}
-
-	//zigBee网关 控制器
-	zigbee := deviceMgr.Group("zigbee")
-	{
-		zigbee.GET("/detail", device.Zigbee.Detail)
-		zigbee.GET("/list", device.Zigbee.List)
-		zigbee.POST("/submit", device.Zigbee.CreateOrUpdate)
-		zigbee.POST("/remove", device.Zigbee.Remove)
-		zigbee.GET("/getList", device.Zigbee.GetList)
-		zigbee.POST("/import-excel", device.Zigbee.ImportExcel)
-		zigbee.GET("/export-excel", device.Zigbee.ExportExcel)
-		zigbee.GET("/export-template", device.Zigbee.ExportTemplate)
-	}
-
-	// 设备控制相关
-	strategy := engine.Group("/api/longchi/strategy")
-
-	////智能照明(灯杆分组/灯控树) 控制器
-	//intelligentLighting := strategy.Group("IntelligentLighting")
-	//{
-	//	intelligentLighting.GET("/detail", device.IntelligentLighting.Detail)
-	//	intelligentLighting.GET("/list", device.IntelligentLighting.List)
-	//	intelligentLighting.POST("/relationList", device.IntelligentLighting.RelationList)
-	//	intelligentLighting.POST("/relation", device.IntelligentLighting.Relation)
-	//	intelligentLighting.POST("/remove", device.IntelligentLighting.Remove)
-	//	intelligentLighting.POST("/changHandSwitch", device.IntelligentLighting.ChangeHandSwitch)
-	//	intelligentLighting.POST("/get_status", device.IntelligentLighting.GetStatus)
-	//}
-
-	//照明策略 控制器
-	lightStrategy := strategy.Group("light")
-	{
-		lightStrategy.GET("/detail", device.LightStrategy.Detail)
-		lightStrategy.GET("/list", device.LightStrategy.List)
-		lightStrategy.POST("/submit", device.LightStrategy.CreateOrUpdate)
-		lightStrategy.POST("/remove", device.LightStrategy.Remove)
-	}
-
-	//照明策略略关联(灯杆分组/灯控树形态) 控制器
-	lightRelation := strategy.Group("lightrelation")
-	{
-		lightRelation.GET("/detail", device.IntelligentLighting.Detail)
-		lightRelation.GET("/list", device.IntelligentLighting.List)
-		lightRelation.POST("/remove", device.IntelligentLighting.Recovery)
-		lightRelation.POST("/relationList", device.IntelligentLighting.RelationList)
-		lightRelation.POST("/relation", device.IntelligentLighting.Relation)
-		lightRelation.POST("/changeHandSwitch", device.IntelligentLighting.ChangeHandSwitch)
-	}
-	//灯随车走照明控制 控制器
-	onDemandLightingControl := strategy.Group("onDemandLightingControl")
-	{
-		onDemandLightingControl.GET("/detail", device.OnDemandLightingControl.Detail)
-		onDemandLightingControl.GET("/list", device.OnDemandLightingControl.List)
-		onDemandLightingControl.POST("/relation", device.OnDemandLightingControl.Relation)
-		onDemandLightingControl.POST("/changHandSwitch", device.OnDemandLightingControl.ChangeHandSwitch)
-	}
-
-	//登录校验相关
-	auth := engine.Group("/api/blade-auth/oauth")
-	{
-		auth.POST("/token", system.Auth.Token)
-		auth.GET("/logout", system.Auth.Logout)
-		auth.GET("/captcha", system.Auth.Captcha)
-		auth.GET("/clear-cache", system.Auth.Clear)
-	}
-
-	login := engine.Group("/api/login")
-	{
-		login.GET("", system.Auth.Login)
-	}
-
 	//用户
-	user := engine.Group("/api/blade-user")
-	{
-		user.GET("/detail", system.User.GetDetail)
-		user.GET("/page", system.User.List)
-		user.POST("/submit", system.User.Submit)
-		user.POST("/update", system.User.Update)
-		user.POST("/remove", system.User.Remove)
-		user.POST("/reset-password", system.User.ResetPwd)
-		user.POST("/user-list", system.User.GetList)
-		user.POST("/grant", system.User.Grant)
-		//todo 添加/info 路由
-		user.GET("/info", system.User.Info)
-	}
-
-	//租户
-	tenant := engine.Group("/api/blade-system/tenant")
-	{
-		tenant.GET("/info", system.Tenant.GetInfo)
-		tenant.GET("/detail", system.Tenant.GetDetail)
-		tenant.GET("/page", system.Tenant.List)
-		tenant.POST("/submit", system.Tenant.Submit)
-		tenant.POST("/remove", system.Tenant.Remove)
-		tenant.GET("/select", system.Tenant.GetList)
-		tenant.GET("/list", system.Tenant.List)
-	}
-
-	//角色
-	role := engine.Group("/api/blade-system/role")
-	{
-		role.GET("/detail", system.Role.GetDetail)
-		role.GET("/list", system.Role.List)
-		role.GET("/tree", system.Role.Tree)
-		role.POST("/submit", system.Role.Submit)
-		role.POST("/remove", system.Role.Remove)
-		role.POST("/grant", system.Role.Grant)
-	}
-	//菜单
-	menu := engine.Group("/api/blade-system/menu")
-	{
-		menu.GET("/detail", system.Menu.GetDetail)
-		menu.GET("list", system.Menu.List)
-		menu.GET("lazy-list", system.Menu.LazyList)
-		menu.GET("menuList", system.Menu.MenuList)
-		menu.GET("lazyMenuList", system.Menu.LazyMenuList)
-		menu.POST("submit", system.Menu.Submit)
-		menu.POST("remove", system.Menu.Remove)
-		menu.GET("routes", system.Menu.Routes)
-		menu.GET("routesExt", system.Menu.RoutesExt)
-		menu.GET("buttons", system.Menu.Buttons)
-		menu.GET("tree", system.Menu.Tree)
-		menu.GET("grantTree", system.Menu.GrantTree)
-		menu.GET("role-tree-keys", system.Menu.RoleTreeKeys)
-		menu.GET("grantTopTree", system.Menu.GrantTopTree)
-		menu.GET("topTreeKeys", system.Menu.GrantTopTree)
-		menu.GET("top-menu", system.Menu.TopMenu)
-		menu.GET("authRoutes", system.Menu.Routes)
-	}
-	//字典
-	dict := engine.Group("/api/blade-system/dict")
-	{
-		dict.GET("/dictionary", system.Dict.Dictionary)
-	}
-
-	//工作台
-	workbench := engine.Group("/api/longchi/report/workbench/")
-	{
-		workbench.POST("countdevice", device.Workbench.CountDevice)
-		workbench.POST("countalarm", device.Workbench.CountAlarm)
-		workbench.POST("aqi", device.Workbench.Aqi)
-		workbench.POST("countjobtodo", device.Workbench.CountJobTodo)
-		workbench.POST("notification", device.Workbench.Notification)
-		workbench.GET("light-pandect", device.Workbench.LightRate)
-	}
-
-	//记录
-	recordGroup := engine.Group("/api/longchi/record")
+	sys := engine.Group("/user")
 	{
-		//灯控
-		lightRecord := recordGroup.Group("/lighting/lightingrecordhis")
-		{
-			lightRecord.GET("/list", record.LightRecord.List)
-			lightRecord.GET("/detail", record.LightRecord.Detail)
-		}
-
-		akeyalarmRecord := recordGroup.Group("/akeyalarm/keyalarmrecondhis")
-		{
-			akeyalarmRecord.GET("/list", record.AKeyAlarmRecord.List)
-			akeyalarmRecord.GET("/detail", record.AKeyAlarmRecord.Detail)
-			akeyalarmRecord.GET("/refresh", record.AKeyAlarmRecord.Refresh)
-			akeyalarmRecord.POST("/dispose", record.AKeyAlarmRecord.Dispose)
-		}
-	}
-
-	//安防
-	securityGroup := engine.Group("/api/longchi/security")
-	{
-		securityGroup.GET("/getCameraLiveList", security.Security.GetCameraLiveList)
-		securityGroup.GET("/operate", security.Security.Operate)
-		securityGroup.POST("/ptzhome", security.Security.Ptzhome)
-
-		securityMultiscreenGroup := securityGroup.Group("/multiscreen")
-		{
-			securityMultiscreenGroup.GET("list", security.Multiscreen.List)
-			securityMultiscreenGroup.GET("cameraList", security.Security.GetCameraLiveList)
-			securityMultiscreenGroup.POST("submit", security.Multiscreen.Submit)
-		}
-
-		securityRewindGroup := securityGroup.Group("/rewind")
-		{
-			securityRewindGroup.GET("getCameraLiveList", security.Security.GetCameraLiveList)
-			securityRewindGroup.POST("rewind-text", security.Rewind.RewindText)
-		}
-	}
-	//租户用户oss
-	personalOSS := engine.Group("/api/blade-resource/oss/endpoint")
-	{
-		personalOSS.POST("/put-file", system.User.PutFile)
-	}
-
-	// 媒体素材
-	multimediaGroup := engine.Group("/api/longchi/multimedia/library")
-	{
-		multimediaGroup.GET("/list", multimedia.Library.List)
-		multimediaGroup.GET("/detail", multimedia.Library.Detail)
-		multimediaGroup.POST("/remove", multimedia.Library.Remove)
-		multimediaGroup.GET("/getList", multimedia.Library.GetList)
-		multimediaGroup.POST("/putFile", multimedia.Library.UploadFile)
-		multimediaGroup.POST("/putMp3File", multimedia.Library.UploadFile)
-		multimediaGroup.POST("/submit", multimedia.Library.Submit)
-	}
-
-	//上传设备图
-	systemGroup := engine.Group("/api/longchi/system/public")
-	{
-		systemGroup.POST("/putFile", multimedia.Library.UploadFile)
+		sys.GET("/getpublicKey", user.User.GetPublicKey)
+		sys.POST("/login", user.User.Login)
 	}
 
-	// 媒体节目
-	programGroup := engine.Group("/api/longchi/multimedia/programlibraries")
+	//通知
+	notice := engine.Group("/notice")
 	{
-		programGroup.GET("/list", multimedia.Program.List)
-		programGroup.GET("/detail", multimedia.Program.Detail)
-		programGroup.POST("/remove", multimedia.Program.Remove)
-		programGroup.GET("/getList", multimedia.Program.GetList)
-		programGroup.POST("/submit", multimedia.Program.Submit)
-		programGroup.POST("/getLibraryList", multimedia.Program.GetLibraryList)
-		programGroup.POST("/relationDeviceList", multimedia.Program.RelationDeviceList)
-		//todo 前端需要和relationDeviceList合并，使用一个接口
-		programGroup.POST("/ip-broadcast-relation-list", multimedia.Program.RelationIpBroadcastList)
-		programGroup.POST("/audit", multimedia.Program.Audit)
+		notice.GET("/demo", user.User.GetUser)
 	}
 
-	//节目播放
-	publishLibraries := engine.Group("/api/longchi/multimedia/publishlibraries")
+	//文件
+	file := engine.Group("/file")
 	{
-		publishLibraries.GET("/list", multimedia.PublishLibraries.List)
-		publishLibraries.POST("/getLibraryList", multimedia.PublishLibraries.GetLibraryList)
-		publishLibraries.GET("/affiliate-equipment", multimedia.PublishLibraries.AffiliateEquipment)
-		publishLibraries.POST("/updateStatus", multimedia.PublishLibraries.UpdateStatus)
-		publishLibraries.POST("/remove", multimedia.PublishLibraries.Remove)
-	}
-
-	operationGroup := engine.Group("/api/longchi/operation")
-	environment := operationGroup.Group("/em/environmentMonitor")
-	{
-		environment.GET("/getNewList", operation.Environment.EnvironmentList)
-		environment.GET("/getNewMeteorologicalData", operation.Environment.GetData)
-		environment.GET("/query-environment", operation.Environment.GetHistoryData)
-		environment.GET("/getScopeList", operation.Environment.GetScopeList)
-	}
-	garbageGroup := operationGroup.Group("/garbage")
-	{
-		garbageGroup.GET("/query-way-realtime", operation.Garbage.GarbageList)
-		garbageGroup.GET("/count-list", operation.Garbage.CountList)
-	}
-	bridgeGroup := operationGroup.Group("/bridge")
-	{
-		bridgeGroup.GET("/data/environmental/environmental-list", operation.Bridge.EnvironmentList)
-		bridgeGroup.GET("/data/sensor/list", operation.Bridge.SensorList)
-		bridgeGroup.GET("/data/sensor/realtime-data", operation.Bridge.LiveData)
-		bridgeGroup.GET("/data/pandect/detail", operation.Bridge.Summary)
-		bridgeGroup.GET("/data/pandect/health-indicators", operation.Bridge.HealthIndicators)
-		bridgeGroup.GET("/data/pandect/list", operation.Bridge.SummaryList)
-		bridgeGroup.GET("/data/pandect/camera-list", operation.Bridge.CameraList)
-	}
-	manholeGroup := operationGroup.Group("/manhole")
-	{
-		manholeGroup.GET("/now", operation.Manhole.LiveData)
-		manholeGroup.GET("/history-list", operation.Manhole.HistoryList)
-	}
-	//运营统计-设备
-	operationDeviceGroup := operationGroup.Group("/device")
-	{
-		operationDeviceGroup.POST("count-device", operation.Device.CountDevice)
-		operationDeviceGroup.POST("list", operation.Device.MonthList)
-		operationDeviceGroup.POST("year-list", operation.Device.YearList)
-	}
-	//运营统计-灯控能耗统计
-	operationGroup.POST("/energy/list", operation.LightingRate.List)
-	//运营统计-告警统计
-	operationGroup.POST("/alarm/list", operation.Alarm.List)
-	//告警管理
-	warnGroup := engine.Group("/api/longchi/alarm")
-	{
-		//告警设置
-		noticeGroup := warnGroup.Group("notice")
-		{
-			noticeGroup.GET("/list", warn.NoticeSet.List)
-			noticeGroup.POST("/update", warn.NoticeSet.Update)
-			noticeGroup.POST("/remove", warn.NoticeSet.Remove)
-			noticeGroup.GET("/detail", warn.NoticeSet.Detail)
-			noticeGroup.GET("/getUserList", warn.NoticeSet.GetUserList)
-		}
-		//发送记录
-		sendrecordGroup := warnGroup.Group("sendrecord")
-		{
-			sendrecordGroup.GET("/list", warn.NoticeRecord.List)
-		}
-		//运维告警记录
-		alarmGroup := warnGroup.Group("alarm")
-		{
-			alarmGroup.GET("/list", warn.PlatformAlarm.List)
-			alarmGroup.GET("/detail", warn.PlatformAlarm.Detail)
-			alarmGroup.GET("/refresh", warn.PlatformAlarm.Refresh)
-			alarmGroup.POST("/changeHandleType", warn.PlatformAlarm.HandleAlert)
-		}
-		//业务告警记录
-		warnGroup.GET("/alarmrecords/list", warn.NoticeRecord.List)
-		// 业务 策略 告警
-		businesstacticsGroup := warnGroup.Group("businesstactics")
-		{
-			businesstacticsGroup.GET("/list", warn.BusinessTactics.List)
-			businesstacticsGroup.GET("/detail", warn.BusinessTactics.Detail)
-			businesstacticsGroup.POST("/submit", warn.BusinessTactics.SaveOrUpdate)
-			businesstacticsGroup.POST("/remove", warn.BusinessTactics.Remove)
-			businesstacticsGroup.POST("/enable-disable", warn.BusinessTactics.Enable)
-		}
-	}
-	//智慧交通
-	captureGroup := operationGroup.Group("/capture")
-	{
-		//车流汇总
-		captureGroup.GET("affiliation/count-list", operation.Capture.CountList)
-		captureGroup.POST("speed/getSuggestSpeed", operation.Capture.SuggestSpeed)
-		//归属地统计
-		captureGroup.GET("affiliation/list", operation.Capture.AreaList)
-		captureGroup.GET("affiliation/type-list", operation.Capture.AreaTypeList)
-		//车型统计
-		captureGroup.GET("model/list", operation.Capture.VehicleTypeEx)
-		captureGroup.GET("model/type-list", operation.Capture.VehicleTypeList)
-		//车速统计
-		captureGroup.GET("speed/list", operation.Capture.SpeedList)
-		captureGroup.GET("speed/over-speed-record", operation.Capture.OverSpeedRecord)
-		captureGroup.GET("speed/over-speed-record-sync", operation.Capture.OverSpeedRecordSync)
-		//时段统计
-		captureGroup.GET("periods/list", operation.Capture.PeriodsList)
-		//货车统计
-		captureGroup.GET("carrecord/count", operation.Capture.CarrecordCount)
-		//报表统计
-		captureGroup.GET("report/list", operation.Capture.ReportList)
-	}
-	logGroup := engine.Group("/api/ctwing/aep")
-	{
-		logGroup.POST("/callback", operation.AepCallback.Save)
-	}
-
-	//数据大屏
-	bigScreen := engine.Group("/api/longchi/largescreen")
-	{
-		bigScreen.GET("/mapclieck/device-num", device.BigScreen.DeviceNum)
-		bigScreen.GET("/overview/lamppole-status", device.BigScreen.LampPoleStatus)
-		bigScreen.GET("/overview/device-status", device.BigScreen.DevicesStatus)
-		bigScreen.GET("/overview/energy-consumption", device.BigScreen.Energy)
-		bigScreen.GET("/overview/lighting-rate", device.BigScreen.LightRate)
-		bigScreen.GET("/overview/alarm-information", device.BigScreen.AlarmInfo)
-		bigScreen.GET("/overview/alarm-device-count", device.BigScreen.AlarmStatistics)
-		bigScreen.GET("/overview/flow-information", device.BigScreen.FlowInfo)
-		bigScreen.GET("/overview/weather-now", device.BigScreen.Environment)
-		bigScreen.GET("/popup/play-programs-list", device.BigScreen.InfoBoard)
-		bigScreen.GET("/overview/play-programs", device.BigScreen.Program)
-		bigScreen.GET("/popup/bridge-sensor-pull-down-list", device.BigScreen.BridgeSensor)
-
-		bigScreen.GET("/setting/query-large-screen", device.BigScreen.QueryOverView)
-		bigScreen.POST("/setting/submit", device.BigScreen.SubmitOverView)
+		file.GET("/Auth", user.User.Login)
 	}
 }

util/cache/redis.go

@@ -2,10 +2,7 @@ package cache
 
 import (
 	"github.com/go-redis/redis"
-	"github.com/sirupsen/logrus"
 	"iot_manager_service/config"
-	"iot_manager_service/util/common"
-	"strconv"
 	"time"
 )
 
@@ -41,69 +38,12 @@ const (
 	TIME          = "time"
 )
 
-// GetDeviceState 获取设备状态 1在线 2离线
-func GetDeviceState(id string) (retTime time.Time, retState string) {
-	defer func() {
-		if err1 := recover(); err1 != nil {
-			logrus.Errorln("GetDeviceState err = ", err1)
-		}
-	}()
-	retTime = time.Time{}
-	retState = "2"
-	//redis中 1在线 0离线
-	//todo 需要统一
-	list, err := Redis.HMGet(DeviceStateKey+id, TLast, ONLINE).Result()
-	if err == nil && list[0] != nil || list[1] != nil {
-		t, err1 := common.MlParseTime(list[0].(string))
-		s, err0 := strconv.Atoi(list[1].(string))
-		if err0 == nil && err1 == nil {
-			if s == 1 {
-				retState = "1"
-			}
-			retTime = t
-		}
-	}
-	return
-}
-
-// GetSwitchState 查灯是否开关
-func GetSwitchState(id string) bool {
-	_, values := GetDeviceData(id)
-	value, ok := values[1]
-	if ok && value > 1 {
-		return true
-	}
-	return false
+// 将token存入到redis中
+func SetToken(uid string, uuid string) {
+	Redis.Set("login:"+uid, uuid, time.Hour*1)
 }
 
-// GetDeviceData 获取设备数据 时间 key-value
-func GetDeviceData(id string) (retTime time.Time, values map[int]float32) {
-	values = make(map[int]float32)
-	if mapData, err := Redis.HGetAll(DeviceDataKey + id).Result(); err == nil {
-		for k, v1 := range mapData {
-			if k == TIME {
-				if t, err := common.MlParseTime(v1); err == nil {
-					retTime = t
-				}
-			} else {
-				if sid, err := strconv.Atoi(k); err == nil {
-					if val, err := strconv.ParseFloat(v1, 32); err == nil {
-						values[sid] = float32(val)
-					}
-				}
-			}
-		}
-	}
-	return
-}
-
-// 取led信息屏
-func GetDeviceLedData(id string) (values map[string]interface{}) {
-	values = make(map[string]interface{})
-	if mapData, err := Redis.HGetAll(DeviceDataKey + id).Result(); err == nil {
-		for k, v1 := range mapData {
-			values[k] = (v1)
-		}
-	}
-	return
+// 从redis中取出token
+func GetToken(uid string) (string, error) {
+	return Redis.Get("login:" + uid).Result()
 }

util/rsa/rsa.go

@@ -0,0 +1,113 @@
+package rsa
+
+import (
+	"crypto/rand"
+	"crypto/rsa"
+	"crypto/x509"
+	"encoding/pem"
+	"io/ioutil"
+)
+
+// RSA公钥私钥产生
+func GeneratePrivAndPubKey() (prvkey, pubkey []byte) {
+	// 生成私钥文件
+	privateKey, err := rsa.GenerateKey(rand.Reader, 1024)
+	if err != nil {
+		panic(err)
+	}
+	derStream := x509.MarshalPKCS1PrivateKey(privateKey)
+	block := &pem.Block{
+		Type:  "RSA PRIVATE KEY",
+		Bytes: derStream,
+	}
+	prvkey = pem.EncodeToMemory(block)
+	//保存到文件
+	err = savePEMToFile(prvkey, "config/private.pem")
+	if err != nil {
+		panic(err)
+	}
+
+	publicKey := &privateKey.PublicKey
+	derPkix, err := x509.MarshalPKIXPublicKey(publicKey)
+	if err != nil {
+		panic(err)
+	}
+	block = &pem.Block{
+		Type:  "PUBLIC KEY",
+		Bytes: derPkix,
+	}
+	pubkey = pem.EncodeToMemory(block)
+	err = savePEMToFile(pubkey, "config/public.pem")
+	if err != nil {
+		panic(err)
+	}
+	return
+}
+
+// 保存文件
+func savePEMToFile(data []byte, filename string) error {
+	err := ioutil.WriteFile(filename, data, 0644)
+	if err != nil {
+		return err
+	}
+	//fmt.Println("Saved", filename)
+	return nil
+}
+
+// 加密
+func Encryption(data []byte) []byte {
+	publickKeyDecoded, err2 := GetPubKey()
+	if err2 != nil {
+		panic(err2)
+	}
+	encryptedData, err := rsa.EncryptPKCS1v15(rand.Reader, publickKeyDecoded.(*rsa.PublicKey), data)
+	if err != nil {
+		panic(err)
+	}
+	return encryptedData
+}
+
+// 解密
+func Decryption(encryptedData []byte) []byte {
+	privateKeyDecoded := GetPrivKey()
+	decryptedData, _ := rsa.DecryptPKCS1v15(rand.Reader, privateKeyDecoded, encryptedData)
+	return decryptedData
+}
+
+// 加载文件
+func loadPEMFromFile(filename string) ([]byte, error) {
+	data, err := ioutil.ReadFile(filename)
+	if err != nil {
+		return nil, err
+	}
+	return data, nil
+}
+
+// 读取私钥
+func GetPrivKey() *rsa.PrivateKey {
+	privateKeyBytes, err := loadPEMFromFile("config/private.pem")
+	if err != nil {
+		panic(err)
+	}
+	privateKeyBlock, _ := pem.Decode(privateKeyBytes)
+	privateKeyDecoded, err := x509.ParsePKCS1PrivateKey(privateKeyBlock.Bytes)
+	if err != nil {
+		panic(err)
+	}
+	return privateKeyDecoded
+}
+
+// 读取公钥
+func GetPubKey() (interface{}, error) {
+	publicKeyBytes, err := loadPEMFromFile("config/public.pem")
+	if err != nil {
+		panic(err)
+	}
+	publicKeyBlock, _ := pem.Decode(publicKeyBytes)
+	publicKeyDecoded, err := x509.ParsePKIXPublicKey(publicKeyBlock.Bytes)
+
+	if err != nil {
+		panic(err)
+	}
+	return publicKeyDecoded, nil
+}

util/token/token.go

@@ -0,0 +1,77 @@
+package token
+
+import (
+	"errors"
+	"github.com/dgrijalva/jwt-go"
+	"time"
+)
+
+var JwtClaims = new(jwtClaims)
+
+// JwtClaims 创建自己的Claims
+type jwtClaims struct {
+	*jwt.StandardClaims
+	//用户编号
+	ID       string
+	UserName string
+	UUID     string
+}
+
+var (
+	//盐
+	secret                 = []byte("6MTY2MDcxMjgzNiwi")               // 后续加密增加盐增加复杂度
+	TokenExpired     error = errors.New("Token is expired")            // token错误类型提炼
+	TokenNotValidYet error = errors.New("Token not active yet")        // token错误类型提炼
+	TokenMalformed   error = errors.New("That's not even a token")     // token错误类型提炼
+	TokenInvalid     error = errors.New("Couldn't handle this token:") // token错误类型提炼
+)
+
+// CreateJwtToken 生成一个jwttoken
+func (jwtClaims) CreateJwtToken(id string, userName string, uuid string) (string, error) {
+
+	// 定义过期时间
+	//expireToken := time.Now().Add(time.Minute * 1).Unix()
+
+	claims := jwtClaims{
+		&jwt.StandardClaims{
+			NotBefore: int64(time.Now().Unix() - 1000), // token信息生效时间
+			ExpiresAt: 0,                               // 过期时间永不过期
+			Issuer:    "lc_veterans",                   // 发布者
+		},
+		id,
+		userName,
+		uuid,
+	}
+	// 对自定义claims加密,jwt.SigningMethodHS256是加密算法得到第二部分
+	token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
+	// 给这个token盐加密 第三部分,得到一个完整的三段的加密
+	signedToken, err := token.SignedString(secret)
+	if err != nil {
+		return "", err
+	}
+	return signedToken, nil
+}
+
+// ParseJwtToken 解析token得到是自己创建的Claims
+func (jwtClaims) ParseJwtToken(jwtToken string) (*jwtClaims, error) {
+	var jwtclaim = &jwtClaims{}
+	_, err := jwt.ParseWithClaims(jwtToken, jwtclaim, func(*jwt.Token) (interface{}, error) {
+		//得到盐
+		return secret, nil
+	})
+	if err != nil {
+		if ve, ok := err.(*jwt.ValidationError); ok {
+			if ve.Errors&jwt.ValidationErrorMalformed != 0 {
+				return nil, TokenMalformed
+			} else if ve.Errors&jwt.ValidationErrorExpired != 0 {
+				// Token is expired
+				return nil, TokenExpired
+			} else if ve.Errors&jwt.ValidationErrorNotValidYet != 0 {
+				return nil, TokenNotValidYet
+			} else {
+				return nil, TokenInvalid
+			}
+		}
+	}
+	return jwtclaim, nil
+}