Merge pull request #30 from weiwiegeng/main

 更新v2社区版docker compose

internal/cmd/server.go

@@ -66,7 +66,7 @@ func RunServer(ctx context.Context, stopSignal chan os.Signal) {
 			service.Middleware().MiddlewareCORS,
 			service.Middleware().I18n,
 		)
-
+		service.SysToken().GfToken().Middleware(group)
 		router.System(ctx, group)   //系统默认功能的路由
 		router.Iot(ctx, group)      //Iot功能的路由
 		router.Analysis(ctx, group) //分析统计功能的路由

internal/logic/middleware/middleware.go

@@ -74,25 +74,23 @@ func (s *sMiddleware) Ctx(r *ghttp.Request) {
 	ctx := r.GetCtx()
 	r.SetCtx(r.GetNeverDoneCtx())
 
-	if r.GetHeader("Authorization") != "" {
-		// 初始化登录用户信息
-		data, err := service.SysToken().ParseToken(r)
+	// 初始化登录用户信息
+	data, err := service.SysToken().ParseToken(r)
+	if err != nil {
+		// 执行下一步请求逻辑
+		r.Middleware.Next()
+	}
+	if data != nil {
+		contextModel := new(model.Context)
+		err = gconv.Struct(data.Data, &contextModel.User)
+		//请求方式
+		contextModel.User.RequestWay = consts.TokenAuth
 		if err != nil {
+			g.Log().Error(ctx, err)
 			// 执行下一步请求逻辑
 			r.Middleware.Next()
 		}
-		if data != nil {
-			contextModel := new(model.Context)
-			err = gconv.Struct(data.Data, &contextModel.User)
-			//请求方式
-			contextModel.User.RequestWay = consts.TokenAuth
-			if err != nil {
-				g.Log().Error(ctx, err)
-				// 执行下一步请求逻辑
-				r.Middleware.Next()
-			}
-			service.Context().Init(r, contextModel)
-		}
+		service.Context().Init(r, contextModel)
 	}
 
 	// 执行下一步请求逻辑

internal/logic/system/sys_token.go

@@ -37,16 +37,16 @@ var gftService = &gft{
 	lock:    &sync.Mutex{},
 }
 
-func (m *sSysToken) GenerateToken(ctx context.Context, key string, data interface{}) (keys string, err error) {
-	keys, err = GfToken().GenerateToken(ctx, key, data)
+func (s *sSysToken) GenerateToken(ctx context.Context, key string, data interface{}) (keys string, err error) {
+	keys, err = s.GfToken().GenerateToken(ctx, key, data)
 	return keys, err
 }
 
-func (m *sSysToken) ParseToken(r *ghttp.Request) (*gftoken.CustomClaims, error) {
-	return GfToken().ParseToken(r)
+func (s *sSysToken) ParseToken(r *ghttp.Request) (*gftoken.CustomClaims, error) {
+	return s.GfToken().ParseToken(r)
 }
 
-func GfToken() *gftoken.GfToken {
+func (s *sSysToken) GfToken() *gftoken.GfToken {
 	ctx := gctx.New()
 
 	//判断控制是否生效

manifest/config/config.example.yaml

@@ -69,6 +69,7 @@ gfToken:
   excludePaths: #排除不做登录验证的路由地址
     - "/api/v1/login"
     - "/api/v1/sysinfo"
+    - "/api/v1/captcha"
 
 # 数据库连接配置
 database:

manifest/docker-compose/iot-open/config/config.yaml

@@ -69,6 +69,7 @@ gfToken:
   excludePaths: #排除不做登录验证的路由地址
     - "/api/v1/login"
     - "/api/v1/sysinfo"
+    - "/api/v1/captcha"
 
 # 数据库连接配置
 database:

manifest/docker-compose/iot-open/iot-open.yaml

@@ -1,6 +1,6 @@
 services:
   sagoo-iot-open:
-    image: sagoo-iot-open:1.0.2
+    image: sagoo-iot-open:1.0.4
     restart: always
     container_name: sagoo-iot-open
     build: