token检测

controllers/analyst.go

@@ -5,8 +5,8 @@ import (
 	"eta/eta_mini_crm_ht/models"
 	"eta/eta_mini_crm_ht/models/request"
 	"eta/eta_mini_crm_ht/models/response"
-	"eta/eta_mini_crm_ht/services"
 	"eta/eta_mini_crm_ht/utils"
+	"eta/eta_mini_crm_ht/utils/oss"
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"os"
@@ -87,7 +87,7 @@ func (this *AnalystController) UploadImage() {
 		_ = os.Remove(fpath)
 		_ = os.Remove(thumbnailPath)
 	}()
-	ossClient := services.NewOssClient()
+	ossClient := oss.NewOssClient()
 	if ossClient == nil {
 		br.Msg = "头像上传失败"
 		br.ErrMsg = "初始化OSS服务失败"

controllers/audio.go

@@ -7,8 +7,9 @@ import (
 	"eta/eta_mini_crm_ht/models/request"
 	"eta/eta_mini_crm_ht/models/response"
 	"eta/eta_mini_crm_ht/services"
-	"eta/eta_mini_crm_ht/services/elastic"
 	"eta/eta_mini_crm_ht/utils"
+	"eta/eta_mini_crm_ht/utils/elastic"
+	"eta/eta_mini_crm_ht/utils/oss"
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"github.com/tcolgate/mp3"
@@ -104,7 +105,7 @@ func (this *AudioController) UploadAudio() {
 		err = os.Remove(fpath)
 		fmt.Sprintf("删除文件失败:%v", err)
 	}()
-	ossClient := services.NewOssClient()
+	ossClient := oss.NewOssClient()
 	if ossClient == nil {
 		br.Msg = "音频上传失败"
 		br.ErrMsg = "初始化OSS服务失败"

controllers/image.go

@@ -5,8 +5,8 @@ import (
 	"eta/eta_mini_crm_ht/models"
 	"eta/eta_mini_crm_ht/models/request"
 	"eta/eta_mini_crm_ht/models/response"
-	"eta/eta_mini_crm_ht/services"
 	"eta/eta_mini_crm_ht/utils"
+	"eta/eta_mini_crm_ht/utils/oss"
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"os"
@@ -79,7 +79,7 @@ func (this *ImageController) UploadImage() {
 		err = os.Remove(fpath)
 		fmt.Sprintf("删除文件失败:%v", err)
 	}()
-	ossClient := services.NewOssClient()
+	ossClient := oss.NewOssClient()
 	if ossClient == nil {
 		br.Msg = "图片上传失败"
 		br.ErrMsg = "初始化OSS服务失败"

controllers/image_back.go

@@ -5,9 +5,9 @@ import (
 	"eta/eta_mini_crm_ht/models"
 	"eta/eta_mini_crm_ht/models/request"
 	"eta/eta_mini_crm_ht/models/response"
-	"eta/eta_mini_crm_ht/services"
-	"eta/eta_mini_crm_ht/services/elastic"
 	"eta/eta_mini_crm_ht/utils"
+	"eta/eta_mini_crm_ht/utils/elastic"
+	"eta/eta_mini_crm_ht/utils/oss"
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
 
@@ -208,7 +208,7 @@ func (this *ImagePDFController) UploadPdf() {
 		_ = os.Remove(fpath)
 	}()
 
-	ossClient := services.NewOssClient()
+	ossClient := oss.NewOssClient()
 	if ossClient == nil {
 		br.Msg = "文件上传失败"
 		br.ErrMsg = "初始化OSS服务失败"
@@ -724,7 +724,7 @@ func (this *ImagePDFController) UploadImage() {
 		_ = os.Remove(fpath)
 	}()
 
-	ossClient := services.NewOssClient()
+	ossClient := oss.NewOssClient()
 	if ossClient == nil {
 		br.Msg = "图片上传失败"
 		br.ErrMsg = "初始化OSS服务失败"

controllers/product.go

@@ -8,6 +8,7 @@ import (
 	"eta/eta_mini_crm_ht/models/response"
 	"eta/eta_mini_crm_ht/services"
 	"eta/eta_mini_crm_ht/utils"
+	"eta/eta_mini_crm_ht/utils/oss"
 	"fmt"
 	"github.com/go-sql-driver/mysql"
 	"github.com/rdlucklib/rdluck_tools/paging"
@@ -757,7 +758,7 @@ func (this *ProductController) UploadFile() {
 		err = os.Remove(fpath)
 		fmt.Sprintf("删除文件失败:%v", err)
 	}()
-	ossClient := services.NewOssClient()
+	ossClient := oss.NewOssClient()
 	if ossClient == nil {
 		br.Msg = "图片上传失败"
 		br.ErrMsg = "初始化OSS服务失败"

controllers/video.go

@@ -8,8 +8,9 @@ import (
 	"eta/eta_mini_crm_ht/models/request"
 	"eta/eta_mini_crm_ht/models/response"
 	"eta/eta_mini_crm_ht/services"
-	"eta/eta_mini_crm_ht/services/elastic"
 	"eta/eta_mini_crm_ht/utils"
+	"eta/eta_mini_crm_ht/utils/elastic"
+	"eta/eta_mini_crm_ht/utils/oss"
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"io"
@@ -98,7 +99,7 @@ func (this *VideoController) UploadVideo() {
 		err = os.Remove(fpath)
 		fmt.Sprintf("删除文件失败:%v", err)
 	}()
-	ossClient := services.NewOssClient()
+	ossClient := oss.NewOssClient()
 	if ossClient == nil {
 		br.Msg = "视频上传失败"
 		br.ErrMsg = "初始化OSS服务失败"
@@ -535,7 +536,7 @@ func (this *VideoController) UploadFile() {
 		err = os.Remove(fpath)
 		fmt.Sprintf("删除文件失败:%v", err)
 	}()
-	ossClient := services.NewOssClient()
+	ossClient := oss.NewOssClient()
 	if ossClient == nil {
 		br.Msg = "图片上传失败"
 		br.ErrMsg = "初始化OSS服务失败"

services/analyst.go

@@ -3,6 +3,7 @@ package services
 import (
 	"eta/eta_mini_crm_ht/models"
 	"eta/eta_mini_crm_ht/utils"
+	"eta/eta_mini_crm_ht/utils/oss"
 	"fmt"
 	"os"
 	"sync"
@@ -21,7 +22,7 @@ func RepairImageData() {
 		fmt.Println("修复研究员头像数据失败")
 		return
 	}
-	ossClient := NewOssClient()
+	ossClient := oss.NewOssClient()
 	if ossClient == nil {
 		fmt.Println("初始化OSS服务失败")
 		return

services/sso_service.go

@@ -1,18 +1,18 @@
 package services
 
 import (
-	"eta/eta_mini_crm_ht/rpc/sso"
+	sso2 "eta/eta_mini_crm_ht/utils/rpc/sso"
 )
 
 const (
 	crmSource = "weapp"
 )
 
-func SSOLogin(code string) (resp sso.UserResp, err error) {
-	req := &sso.LoginRequest{
+func SSOLogin(code string) (resp sso2.UserResp, err error) {
+	req := &sso2.LoginRequest{
 		Code:   code,
 		Source: crmSource,
 	}
-	ssoService := sso.GetSSOService()
+	ssoService := sso2.GetSSOService()
 	return ssoService.SSOLogin(req)
 }

services/minio.go → utils/oss/minio.go

@@ -1,4 +1,4 @@
-package services
+package oss
 
 import (
 	"context"

services/oss.go → utils/oss/oss.go

@@ -1,4 +1,4 @@
-package services
+package oss
 
 import (
 	"encoding/json"

rpc/sso/sso_rpc.go → utils/rpc/sso/sso_rpc.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"encoding/base64"
 	"errors"
-	"eta/eta_mini_crm_ht/rpc"
 	"eta/eta_mini_crm_ht/utils"
+	"eta/eta_mini_crm_ht/utils/rpc"
 	"fmt"
 	"google.golang.org/grpc/metadata"
 	"sync"