check

LICENSE

@@ -18,4 +18,5 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.
+

build/makefile

@@ -1,4 +1,3 @@
-
 all:test compile docker push clean
 
 test:

doc/ApiDocSwagger.md

@@ -1,12 +1,9 @@
-
 ## swaggo
 
 https://github.com/swaggo/gin-swagger  
 
 https://github.com/swaggo/swag  
 
-
-
 ## go-swagger
 
 https://github.com/go-swagger/go-swagger
@@ -21,4 +18,3 @@ https://goswagger.io/use/spec.html
 
 https://medium.com/@pedram.esmaeeli/generate-swagger-specification-from-go-source-code-648615f7b9d9  
 
-

doc/DevOps.md

@@ -1,2 +1,2 @@
+# DevOps
 
-# DevOps

doc/GitOps.md

@@ -1,4 +1,2 @@
-
-
 # GitOps
 

doc/Protocolbuf.md

@@ -1,15 +1,11 @@
 # eApi
 
-
-
-
 ## Protocolbuf
 
-
 ### Protocol Compiler   
 
 Protocol 编译器 protoc
- 
+
 ```
 # 安装
 sudo apt install protobuf-compiler
@@ -63,7 +59,6 @@ ls $GOPATH/src/github.com/grpc/grpc-go
 >https://github.com/grpc/grpc-go  
 https://www.grpc.io/docs/tutorials/basic/go/   
 
-
 ### grpc-gateway
 
 ```
@@ -87,3 +82,4 @@ protoc --swagger_out=logtostderr=true:. *.proto
 
 >https://grpc-ecosystem.github.io/grpc-gateway/  
 https://github.com/grpc-ecosystem/grpc-gateway　　
+

doc/RESTful_API.md

@@ -1,4 +1,3 @@
-
 ## HTTP response status codes
 
 1xx - informational  
@@ -27,7 +26,6 @@
 202 表示删除请求被接受，但还没有被执行  
 204 表示删除请求被执行，但没有返回被删除的资源  
 
-
 ## HTTP request methods
 
 ### POST
@@ -67,7 +65,6 @@ https://developer.mozilla.org/zh-CN/docs/Web/HTTP/Status/204
 >https://developer.mozilla.org/zh-CN/docs/Web/HTTP/Status/200
 https://developer.mozilla.org/zh-CN/docs/Web/HTTP/Status/204
 
-
 总结:  
 post - 200 201  
 put - 204 201  
@@ -160,4 +157,5 @@ HTTP状态码400 Bad Request请求PUT失败，在响应正文中使用自然语
 ## api 风格
 - fluent style 风格 api  
     ruby on rails 风格的 rest 路由映射  
-    /people/{person_id}/grounps/{group_id}  
+    /people/{person_id}/grounps/{group_id}  
+

doc/开发规范.md

@@ -9,13 +9,11 @@ MD 规范 https://github.com/fuwensun/Markdown
 发布规划(2)  https://www.zhihu.com/question/21127832    
 API规范  https://www.cnblogs.com/moonz-wu/p/4211626.html    
 
-
 ## goms 项目
 工程 https://github.com/fuwensun/goms/projects/1  
 工单 https://github.com/fuwensun/goms/issues   
 PR   https://github.com/fuwensun/goms/pulls   
 
-
 ## 分支规范
 
 集成分支     
@@ -43,7 +41,7 @@ PR   https://github.com/fuwensun/goms/pulls
 集成分支     
 - develop   
   总集成分支      
-    
+
 功能分支        
 - feature/{$username}/{$issue_id}_{$description}    
   功能或者不紧急的bugfix分支    
@@ -65,7 +63,6 @@ Given a version number MAJOR.MINOR.PATCH, increment the:
 - PATCH version when you make backwards compatible bug fixes.
 - Additional labels for pre-release and build metadata are available as extensions to the MAJOR.MINOR.PATCH format.
 
-
 ## 发布规范
 
 主干开发，分支发布
@@ -78,4 +75,5 @@ Given a version number MAJOR.MINOR.PATCH, increment the:
 
 ## 错误处理
 
-- **错误信息的打印** - 一个正例 `go: module github.com/golang/mock: Get "https://goproxy.cn/github.com/golang/mock/@v/list": dial tcp 116.207.118.45:443: connect: connection refused`. 用分号(:)来分级.上层的一般不用使用否定词,特别是 error,多个 error 使得一个错误看起来像多个错误.错误源头的信息要用否定词,如 error,failed,refused 等.
+- **错误信息的打印** - 一个正例 `go: module github.com/golang/mock: Get "https://goproxy.cn/github.com/golang/mock/@v/list": dial tcp 116.207.118.45:443: connect: connection refused`. 用分号(:)来分级.上层的一般不用使用否定词,特别是 error,多个 error 使得一个错误看起来像多个错误.错误源头的信息要用否定词,如 error,failed,refused 等.
+

doc/设计原则.md

@@ -1,4 +1,3 @@
-
 SOLID
 - SRP 单一职责原则 Single Responsibility Principle
 - OCP 开闭原则 Open Closed Principle
@@ -34,5 +33,3 @@ SOLID
 > 历史上存在“低层模块依赖高层模块/抽象依赖具体”，为了对此进行否定，提出“依赖倒置原则”，命名为“依赖倒置原则”。
 如果没有历史包袱，命名为“依赖抽象原则”似乎更能表达意思，且可以表述为：每层都依赖抽象，具体要依赖抽象。
 
-
-

eApi/README.md

@@ -1,7 +1,5 @@
 # eApi
 
-
-
 ### grpc-gateway
 
 ```
@@ -26,7 +24,6 @@ protoc --swagger_out=logtostderr=true:. *.proto
 >https://grpc-ecosystem.github.io/grpc-gateway/  
 https://github.com/grpc-ecosystem/grpc-gateway　　
 
-
 ### swagger  
 
 ```
@@ -104,4 +101,5 @@ curl -X GET localhost:8081/v1/users/123456
 curl -X PUT -d '{"name":"xxx","sex":0,"uid":123456}' localhost:8081/v1/users
 
 curl -X DELETE localhost:8081/v1/users/123456 
-```
+```
+

eApi/api/v1/api.go

@@ -3,3 +3,4 @@ package v1
 import empty "github.com/golang/protobuf/ptypes/empty"
 
 type Empty = empty.Empty
+

eApi/api/v1/api.swagger.json

@@ -237,3 +237,4 @@
     }
   }
 }
+

eApi/api/v1/api_server.sh

@@ -2,4 +2,5 @@
 
 swagger serve --host=0.0.0.0 --port=9000 --no-open api.swagger.json &
 
-hostname -I
+hostname -I
+

eApi/api/v1/pb/api.proto

@@ -63,3 +63,4 @@ message UserT{
 message UidT{
     sint64 uid = 1;
 }
+

eApi/api/v1/pb/pb.go

@@ -4,3 +4,4 @@
 package pb
 
 //生成的代码中 "google/api" 要用 "google.golang.org/genproto/googleapis/api/annotations" 替代
+

eApi/build/dockerfile

@@ -8,4 +8,5 @@ COPY ./build/eApi ./
 COPY ./configs ./configs
 RUN ["ls","-l","./eApi"]         
 RUN ["ls","-l","./configs/"]         
-CMD ["./eApi","-cfgpath=./configs"]
+CMD ["./eApi","-cfgpath=./configs"]
+

eApi/build/makefile

@@ -20,9 +20,3 @@ push:
 clean:
 	rm -f $(APP_NAME)
 
-
-
-
-
-
-

eApi/cmd/flag.go

@@ -19,3 +19,4 @@ func parseFlag() {
 	log.Info().Msgf("config path: %v", cfgpath)
 	model.CfgPath = cfgpath
 }
+

eApi/cmd/log.go

@@ -6,3 +6,4 @@ import (
 
 //
 var log = Lg
+

eApi/cmd/main.go

@@ -39,3 +39,4 @@ func main() {
 		}
 	}
 }
+

eApi/configs/app.yml

@@ -1,3 +1,4 @@
 #service:
 name: user
-version:  v0.0.0
+version:  v0.0.0
+

eApi/configs/grpc.yml

@@ -1,2 +1,3 @@
 #server
-addr: 0.0.0.0:50051
+addr: 0.0.0.0:50051
+

eApi/configs/http.yml

@@ -1,2 +1,3 @@
 #server
-addr: 0.0.0.0:8080
+addr: 0.0.0.0:8080
+

eApi/configs/mysql.yml

@@ -1,2 +1,3 @@
 # mysql
-dsn: "utest:pwtest@tcp(127.0.0.1:3306)/test_db?timeout=1s&readTimeout=1s&writeTimeout=1s&parseTime=true&loc=Local&charset=utf8mb4,utf8"
+dsn: "utest:pwtest@tcp(127.0.0.1:3306)/test_db?timeout=1s&readTimeout=1s&writeTimeout=1s&parseTime=true&loc=Local&charset=utf8mb4,utf8"
+

eApi/configs/redis.yml

@@ -1,3 +1,4 @@
 # redis
 pass: "pwtest"
-addr: "127.0.0.1:6379"
+addr: "127.0.0.1:6379"
+

eApi/internal/app/app.go

@@ -84,3 +84,4 @@ func InitApp(cfgpath string) (*App, func(), error) {
 		cleandao()
 	}, nil
 }
+

eApi/internal/dao/dao.go

@@ -175,3 +175,4 @@ func (d *dao) Ping(ctx context.Context) (err error) {
 	}
 	return d.db.PingContext(ctx)
 }
+

eApi/internal/dao/dao_test.go

@@ -70,3 +70,4 @@ func teardockerdown() {
 	fmt.Printf("Execute Shell: %s finished with output:\n%s\n", command, string(output))
 	cfgstub.Reset()
 }
+

eApi/internal/dao/export.go

@@ -3,3 +3,4 @@ package dao
 //导出文件
 //导出符号给外部测试使用,如：
 //type Daot = dao
+

eApi/internal/dao/mock/mock.go

@@ -1,2 +1,3 @@
 //go:generate mockgen  -package mock -destination ./dao.mock.go  github.com/fuwensun/goms/eApi/internal/dao Dao
 package mock
+

eApi/internal/dao/ping.go

@@ -51,3 +51,4 @@ func (d *dao) UpdatePing(c context.Context, p *Ping) error {
 	log.Debug().Int64("rows", num).Msg("db update user")
 	return nil
 }
+

eApi/internal/dao/testdata/configs/mysql.yml

@@ -1,2 +1,3 @@
 # mysql
 dsn: "utest:pwtest@tcp(127.0.0.1:3306)/test_db?timeout=1s&readTimeout=1s&writeTimeout=1s&parseTime=true&loc=Local&charset=utf8mb4,utf8"
+

eApi/internal/dao/testdata/teardocker/configs/mysql.yml

@@ -1,2 +1,3 @@
 # mysql
 dsn: "utest:pwtest@tcp(127.0.0.1:23306)/test_db?timeout=1s&readTimeout=1s&writeTimeout=1s&parseTime=true&loc=Local&charset=utf8mb4,utf8"
+

eApi/internal/dao/testdata/teardocker/down_docker.sh

@@ -9,3 +9,4 @@ echo $PWD
 #
 bash $PWD/down_mysql_docker.sh
 bash $PWD/down_redis_docker.sh
+

eApi/internal/dao/testdata/teardocker/up_docker.sh

@@ -17,3 +17,4 @@ docker ps | grep mysqltest
 docker ps | grep redistest
 
 echo -e "\n"
+

eApi/internal/dao/testdata/teardocker/up_mysql_docker.sh

@@ -15,3 +15,4 @@ docker run --name mysqltest \
 #ps docker
 docker logs mysqltest
 docker ps | grep mysqltest
+

eApi/internal/dao/testdata/teardocker/up_redis_docker.sh

@@ -11,3 +11,4 @@ docker run --name redistest -p 26379:6379 -d redistest
 
 #ps docker
 docker ps | grep redistest
+

eApi/internal/dao/user.go

@@ -225,3 +225,4 @@ func (d *dao) DeleteUser(c context.Context, uid int64) error {
 	}
 	return nil
 }
+

eApi/internal/dao/user_test.go

@@ -165,3 +165,4 @@ func TestUser(t *testing.T) {
 	// 清理
 	clean()
 }
+

eApi/internal/model/model.go

@@ -15,3 +15,4 @@ var ErrFailedCreateData = fmt.Errorf("data:%w", ErrFailedCreate)
 var ErrInternalError = errors.New("internal error")
 
 var CfgPath = ""
+

eApi/internal/model/ping.go

@@ -4,3 +4,4 @@ type Ping struct {
 	Type  string
 	Count int64
 }
+

eApi/internal/model/user.go

@@ -86,3 +86,4 @@ var ErrArgError = errors.New("arg error")
 var ErrUidError = fmt.Errorf("uid %w, ECODE-%d", ErrArgError, 10001)
 var ErrNameError = fmt.Errorf("name %w, ECODE-%d", ErrArgError, 10002)
 var ErrSexError = fmt.Errorf("sex %w, ECODE-%d", ErrArgError, 10003)
+

eApi/internal/model/user_test.go

@@ -351,3 +351,4 @@ func TestCheckName(t *testing.T) {
 		})
 	}
 }
+

eApi/internal/pkg/log/log.go

@@ -25,3 +25,4 @@ var Lga = lg.With().Str("layer", "dao").Logger()
 func init() {
 	zerolog.TimeFieldFormat = zerolog.TimeFormatUnix
 }
+

eApi/internal/server/grpc/gateway.go

@@ -29,3 +29,4 @@ func newGateway(s *Server) error {
 // 		glog.Fatal(err)
 // 	}
 // }
+

eApi/internal/server/grpc/ping.go

@@ -28,3 +28,4 @@ func (srv *Server) Ping(c context.Context, req *api.Request) (*api.Reply, error)
 	log.Debug().Msgf("ping msg: %v, count: %v", msg, p.Count)
 	return res, nil
 }
+

eApi/internal/server/grpc/ping_test.go

@@ -64,3 +64,4 @@ func TestPing(t *testing.T) {
 		So(err, ShouldEqual, ErrInternalError)
 	})
 }
+

eApi/internal/server/grpc/server.go

@@ -92,3 +92,4 @@ func (s *Server) Start() {
 func (srv *Server) Stop() {
 	// ???
 }
+

eApi/internal/server/grpc/user.go

@@ -126,3 +126,4 @@ func (srv *Server) DeleteUser(c context.Context, uid *api.UidT) (*api.Empty, err
 	log.Info().Int64("uid", uid.Uid).Msg("failed to delete user")
 	return empty, nil
 }
+