mmm-go / ability · 提交

转到一个项目

作者 yangfu
提交 54a5e7b4f51c5e65bf7c9de8bec20cd6af1f3266 1 个父辈 859935d5

fix import

内嵌 并排对比
正在显示 11 个修改的文件 包含 34 行增加 和 21 行删除
@@ -2,7 +2,6 @@ package controllers @@ -2,7 +2,6 @@ package controllers
2 2
3 import ( 3 import (
4 "fmt" 4 "fmt"
5 - "github.com/prometheus/client_golang/prometheus"  
6 "strconv" 5 "strconv"
7 "strings" 6 "strings"
8 "crypto/sha256" 7 "crypto/sha256"
@@ -10,13 +9,14 @@ import ( @@ -10,13 +9,14 @@ import (
10 9
11 "gitlab.fjmaimaimai.com/mmm-go/ability/protocol" 10 "gitlab.fjmaimaimai.com/mmm-go/ability/protocol"
12 s_auth "gitlab.fjmaimaimai.com/mmm-go/ability/services/auth" 11 s_auth "gitlab.fjmaimaimai.com/mmm-go/ability/services/auth"
  12 +
13 "gitlab.fjmaimaimai.com/mmm-go/gocomm/common" 13 "gitlab.fjmaimaimai.com/mmm-go/gocomm/common"
14 "gitlab.fjmaimaimai.com/mmm-go/gocomm/pkg/log" 14 "gitlab.fjmaimaimai.com/mmm-go/gocomm/pkg/log"
15 "gitlab.fjmaimaimai.com/mmm-go/gocomm/pkg/mybeego" 15 "gitlab.fjmaimaimai.com/mmm-go/gocomm/pkg/mybeego"
16 -  
17 "github.com/astaxie/beego" 16 "github.com/astaxie/beego"
18 "github.com/astaxie/beego/context" 17 "github.com/astaxie/beego/context"
19 "github.com/astaxie/beego/validation" 18 "github.com/astaxie/beego/validation"
  19 + "github.com/prometheus/client_golang/prometheus"
20 ) 20 )
21 21
22 var( 22 var(
@@ -2,11 +2,12 @@ package controllers @@ -2,11 +2,12 @@ package controllers
2 2
3 import ( 3 import (
4 "fmt" 4 "fmt"
5 - "gitlab.fjmaimaimai.com/mmm-go/gocomm/common"  
6 - "gitlab.fjmaimaimai.com/mmm-go/gocomm/pkg/mybeego"  
7 "log" 5 "log"
8 "reflect" 6 "reflect"
9 "testing" 7 "testing"
  8 +
  9 + "gitlab.fjmaimaimai.com/mmm-go/gocomm/pkg/mybeego"
  10 + "gitlab.fjmaimaimai.com/mmm-go/gocomm/common"
10 ) 11 )
11 12
12 func Test_GenMessage(t *testing.T){ 13 func Test_GenMessage(t *testing.T){
@@ -2,9 +2,11 @@ package v1 @@ -2,9 +2,11 @@ package v1
2 2
3 import ( 3 import (
4 "encoding/json" 4 "encoding/json"
  5 +
5 "gitlab.fjmaimaimai.com/mmm-go/ability/controllers" 6 "gitlab.fjmaimaimai.com/mmm-go/ability/controllers"
6 "gitlab.fjmaimaimai.com/mmm-go/ability/protocol" 7 "gitlab.fjmaimaimai.com/mmm-go/ability/protocol"
7 s_auth "gitlab.fjmaimaimai.com/mmm-go/ability/services/auth" 8 s_auth "gitlab.fjmaimaimai.com/mmm-go/ability/services/auth"
  9 +
8 "gitlab.fjmaimaimai.com/mmm-go/gocomm/pkg/log" 10 "gitlab.fjmaimaimai.com/mmm-go/gocomm/pkg/log"
9 "gitlab.fjmaimaimai.com/mmm-go/gocomm/pkg/mybeego" 11 "gitlab.fjmaimaimai.com/mmm-go/gocomm/pkg/mybeego"
10 ) 12 )
@@ -4,6 +4,7 @@ import ( @@ -4,6 +4,7 @@ import (
4 "gitlab.fjmaimaimai.com/mmm-go/ability/controllers" 4 "gitlab.fjmaimaimai.com/mmm-go/ability/controllers"
5 "gitlab.fjmaimaimai.com/mmm-go/ability/protocol" 5 "gitlab.fjmaimaimai.com/mmm-go/ability/protocol"
6 "gitlab.fjmaimaimai.com/mmm-go/ability/services/upload" 6 "gitlab.fjmaimaimai.com/mmm-go/ability/services/upload"
  7 +
7 "gitlab.fjmaimaimai.com/mmm-go/gocomm/pkg/log" 8 "gitlab.fjmaimaimai.com/mmm-go/gocomm/pkg/log"
8 "gitlab.fjmaimaimai.com/mmm-go/gocomm/pkg/mybeego" 9 "gitlab.fjmaimaimai.com/mmm-go/gocomm/pkg/mybeego"
9 ) 10 )
@@ -2,13 +2,14 @@ package v1 @@ -2,13 +2,14 @@ package v1
2 2
3 import ( 3 import (
4 "encoding/json" 4 "encoding/json"
  5 +
5 "gitlab.fjmaimaimai.com/mmm-go/ability/controllers" 6 "gitlab.fjmaimaimai.com/mmm-go/ability/controllers"
6 "gitlab.fjmaimaimai.com/mmm-go/ability/protocol" 7 "gitlab.fjmaimaimai.com/mmm-go/ability/protocol"
  8 + "gitlab.fjmaimaimai.com/mmm-go/ability/services/version"
7 9
8 "gitlab.fjmaimaimai.com/mmm-go/gocomm/pkg/mybeego" 10 "gitlab.fjmaimaimai.com/mmm-go/gocomm/pkg/mybeego"
9 "gitlab.fjmaimaimai.com/mmm-go/gocomm/pkg/log" 11 "gitlab.fjmaimaimai.com/mmm-go/gocomm/pkg/log"
10 12
11 - "gitlab.fjmaimaimai.com/mmm-go/ability/services/version"  
12 ) 13 )
13 14
14 type VersionController struct { 15 type VersionController struct {
@@ -2,20 +2,22 @@ package auth @@ -2,20 +2,22 @@ package auth
2 2
3 import ( 3 import (
4 "bytes" 4 "bytes"
  5 + "encoding/json"
5 "fmt" 6 "fmt"
6 - "github.com/astaxie/beego" 7 + "html/template"
  8 + "strings"
  9 + "time"
  10 +
7 "gitlab.fjmaimaimai.com/mmm-go/ability/internal/repository" 11 "gitlab.fjmaimaimai.com/mmm-go/ability/internal/repository"
8 "gitlab.fjmaimaimai.com/mmm-go/ability/models" 12 "gitlab.fjmaimaimai.com/mmm-go/ability/models"
9 "gitlab.fjmaimaimai.com/mmm-go/ability/protocol" 13 "gitlab.fjmaimaimai.com/mmm-go/ability/protocol"
  14 + s_sms "gitlab.fjmaimaimai.com/mmm-go/ability/services/sms"
  15 +
10 "gitlab.fjmaimaimai.com/mmm-go/gocomm/common" 16 "gitlab.fjmaimaimai.com/mmm-go/gocomm/common"
11 "gitlab.fjmaimaimai.com/mmm-go/gocomm/pkg/log" 17 "gitlab.fjmaimaimai.com/mmm-go/gocomm/pkg/log"
12 "gitlab.fjmaimaimai.com/mmm-go/gocomm/pkg/redis" 18 "gitlab.fjmaimaimai.com/mmm-go/gocomm/pkg/redis"
13 - s_sms "gitlab.fjmaimaimai.com/mmm-go/ability/services/sms"  
14 comm_time "gitlab.fjmaimaimai.com/mmm-go/gocomm/time" 19 comm_time "gitlab.fjmaimaimai.com/mmm-go/gocomm/time"
15 - "html/template"  
16 - "strings"  
17 - "encoding/json"  
18 - "time" 20 + "github.com/astaxie/beego"
19 ) 21 )
20 22
21 type IAuthService interface { 23 type IAuthService interface {
1 package auth 1 package auth
2 2
3 import ( 3 import (
  4 + "testing"
  5 +
4 "gitlab.fjmaimaimai.com/mmm-go/ability/protocol" 6 "gitlab.fjmaimaimai.com/mmm-go/ability/protocol"
5 "gitlab.fjmaimaimai.com/mmm-go/ability/tests" 7 "gitlab.fjmaimaimai.com/mmm-go/ability/tests"
6 - "testing"  
7 ) 8 )
8 9
9 func init(){ 10 func init(){
1 package sms 1 package sms
2 2
3 import ( 3 import (
  4 + "gitlab.fjmaimaimai.com/mmm-go/ability/protocol"
  5 +
4 "github.com/astaxie/beego" 6 "github.com/astaxie/beego"
5 "github.com/astaxie/beego/httplib" 7 "github.com/astaxie/beego/httplib"
6 - "gitlab.fjmaimaimai.com/mmm-go/ability/protocol"  
7 "gitlab.fjmaimaimai.com/mmm-go/gocomm/common" 8 "gitlab.fjmaimaimai.com/mmm-go/gocomm/common"
8 "gitlab.fjmaimaimai.com/mmm-go/gocomm/pkg/log" 9 "gitlab.fjmaimaimai.com/mmm-go/gocomm/pkg/log"
9 ) 10 )
@@ -2,17 +2,19 @@ package upload @@ -2,17 +2,19 @@ package upload
2 2
3 import ( 3 import (
4 "fmt" 4 "fmt"
5 - "github.com/astaxie/beego"  
6 - "gitlab.fjmaimaimai.com/mmm-go/ability/protocol"  
7 - "gitlab.fjmaimaimai.com/mmm-go/gocomm/common"  
8 - "gitlab.fjmaimaimai.com/mmm-go/gocomm/pkg/log"  
9 - comm_time "gitlab.fjmaimaimai.com/mmm-go/gocomm/time"  
10 "io" 5 "io"
11 "mime/multipart" 6 "mime/multipart"
12 "os" 7 "os"
13 "path" 8 "path"
14 "path/filepath" 9 "path/filepath"
15 "time" 10 "time"
  11 +
  12 + "gitlab.fjmaimaimai.com/mmm-go/ability/protocol"
  13 +
  14 + "github.com/astaxie/beego"
  15 + "gitlab.fjmaimaimai.com/mmm-go/gocomm/common"
  16 + "gitlab.fjmaimaimai.com/mmm-go/gocomm/pkg/log"
  17 + comm_time "gitlab.fjmaimaimai.com/mmm-go/gocomm/time"
16 ) 18 )
17 19
18 //上传图片 20 //上传图片
1 package upload 1 package upload
2 2
3 import ( 3 import (
  4 + "testing"
  5 + "mime/multipart"
4 "bytes" 6 "bytes"
  7 +
5 "gitlab.fjmaimaimai.com/mmm-go/ability/protocol" 8 "gitlab.fjmaimaimai.com/mmm-go/ability/protocol"
6 "gitlab.fjmaimaimai.com/mmm-go/ability/tests" 9 "gitlab.fjmaimaimai.com/mmm-go/ability/tests"
7 - "mime/multipart"  
8 - "testing"  
9 ) 10 )
10 11
11 func init(){ 12 func init(){
1 package version 1 package version
2 2
3 import ( 3 import (
  4 + "strconv"
  5 +
4 "gitlab.fjmaimaimai.com/mmm-go/ability/models" 6 "gitlab.fjmaimaimai.com/mmm-go/ability/models"
5 "gitlab.fjmaimaimai.com/mmm-go/ability/protocol" 7 "gitlab.fjmaimaimai.com/mmm-go/ability/protocol"
6 - "strconv"  
7 ) 8 )
8 9
9 func GetLatestVersionInfo(request *protocol.GetLatestVersionInfoRequest)(rsp *protocol.GetLatestVersionInfoResponse,err error){ 10 func GetLatestVersionInfo(request *protocol.GetLatestVersionInfoRequest)(rsp *protocol.GetLatestVersionInfoResponse,err error){