Fix: 编译问题修改

Makefile

@@ -1,14 +1,61 @@
-.PHONY: api
-# generate api
+service?=
+
+.PHONY: all api proto wire ent build docker pushi
+all: api wire proto ent build
+ @ echo "Code generate all done!"
+
+# 生成api
 api:
- find app -type d -depth 2 -print | xargs -L 1 bash -c 'cd "$$0" && pwd && $(MAKE) api'
+ @if [[ x${service} == x ]]; then \
+ find api -maxdepth 3 -mindepth 3 -type d -print | xargs -I {} bash -c 'cd {} && make api'; \
+ else \
+ find api -maxdepth 3 -mindepth 3 -type d -print | xargs -I {} bash -c 'if [[ {} == *${service}* ]]; then cd {} && make api; fi'; \
+ fi
 
-.PHONY: wire
-# generate wire
+# 生成wire
 wire:
- find app -type d -depth 2 -print | xargs -L 1 bash -c 'cd "$$0" && pwd && $(MAKE) wire'
+ @if [[ x${service} == x ]]; then \
+ find app -maxdepth 2 -mindepth 2 -type d -print | xargs -I {} bash -c 'cd {} && make wire'; \
+ else \
+ find app -maxdepth 2 -mindepth 2 -type d -print | xargs -I {} bash -c 'if [[ {} == *${service}* ]]; then cd {} && make wire; fi'; \
+ fi
 
-.PHONY: proto
-# generate proto
+# 生成config
 proto:
- find app -type d -depth 2 -print | xargs -L 1 bash -c 'cd "$$0" && pwd && $(MAKE) proto'
+ @if [[ x${service} == x ]]; then \
+ find app -maxdepth 2 -mindepth 2 -type d -print | xargs -I {} bash -c 'cd {} && make proto'; \
+ else \
+ find app -maxdepth 2 -mindepth 2 -type d -print | xargs -I {} bash -c 'if [[ {} == *${service}* ]]; then cd {} && make proto; fi'; \
+ fi
+
+# 生成ent数据库
+ent:
+ -@if [[ x${service} == x ]]; then \
+ find app -maxdepth 2 -mindepth 2 -type d -print | xargs -I {} bash -c 'cd {} && make ent'; \
+ else \
+ find app -maxdepth 2 -mindepth 2 -type d -print | xargs -I {} bash -c 'if [[ {} == *${service}* ]]; then cd {} && make ent; fi'; \
+ fi
+
+# 编译服务
+build:
+ @if [[ x${service} == x ]]; then \
+ find app -maxdepth 2 -mindepth 2 -type d -print | xargs -I {} bash -c 'cd {} && make build'; \
+ else \
+ find app -maxdepth 2 -mindepth 2 -type d -print | xargs -I {} bash -c 'if [[ {} == *${service}* ]]; then cd {} && make build; fi'; \
+ fi
+
+# 生成docker镜像
+docker:
+ @if [[ x${service} == x ]]; then \
+ find app -maxdepth 2 -mindepth 2 -type d -print | xargs -I {} bash -c 'cd {} && make docker'; \
+ else \
+ find app -maxdepth 2 -mindepth 2 -type d -print | xargs -I {} bash -c 'if [[ {} == *${service}* ]]; then cd {} && make docker; fi'; \
+ fi
+
+# 推送镜像
+pushi:
+ @if [[ x${service} == x ]]; then \
+ find app -maxdepth 2 -mindepth 2 -type d -print | xargs -I {} bash -c 'cd {} && make pushi'; \
+ else \
+ find app -maxdepth 2 -mindepth 2 -type d -print | xargs -I {} bash -c 'if [[ {} == *${service}* ]]; then cd {} && make pushi; fi'; \
+ fi

api/cart/service/v1/Makefile

@@ -0,0 +1 @@
+include ../../../../app_makefile

api/catalog/service/v1/Makefile

@@ -0,0 +1 @@
+include ../../../../app_makefile

api/courier/job/v1/Makefile

@@ -0,0 +1 @@
+include ../../../../app_makefile

api/order/service/v1/Makefile

@@ -0,0 +1 @@
+include ../../../../app_makefile

api/payment/service/v1/Makefile

@@ -0,0 +1 @@
+include ../../../../app_makefile

api/shipping/service/v1/Makefile

@@ -0,0 +1 @@
+include ../../../../app_makefile

api/shop/admin/v1/Makefile

@@ -0,0 +1 @@
+include ../../../../app_makefile

api/shop/interface/v1/Makefile

@@ -0,0 +1 @@
+include ../../../../app_makefile

api/user/service/v1/Makefile

@@ -0,0 +1 @@
+include ../../../../app_makefile

app_makefile

@@ -1,8 +1,9 @@
 GOPATH:=$(shell go env GOPATH)
 VERSION=$(shell git describe --tags --always)
-APP_RELATIVE_PATH=$(shell a=`basename $$PWD` && cd .. && b=`basename $$PWD` && echo $$b/$$a)
+#APP_RELATIVE_PATH=$(shell a=`basename $$PWD` && cd .. && b=`basename $$PWD` && echo $$b/$$a)
+APP_RELATIVE_PATH=$(shell a=`basename $$PWD` && cd .. && b=`basename $$PWD` && cd .. && c=`basename $$PWD` && echo $$c/$$b/$$a)
 INTERNAL_PROTO_FILES=$(shell find internal -name *.proto)
-API_PROTO_FILES=$(shell cd ../../../api/$(APP_RELATIVE_PATH) && find . -name *.proto)
+API_PROTO_FILES=$(shell cd ../../../../api/$(APP_RELATIVE_PATH) && ls *.proto)
 KRATOS_VERSION=$(shell go mod graph |grep go-kratos/kratos/v2 |head -n 1 |awk -F '@' '{print $$2}')
 KRATOS=$(GOPATH)/pkg/mod/github.com/go-kratos/kratos/v2@$(KRATOS_VERSION)
 APP_NAME=$(shell echo $(APP_RELATIVE_PATH) | sed -En "s/\//-/p")
@@ -20,37 +21,36 @@ init:
 .PHONY: grpc
 # generate grpc code
 grpc:
- cd ../../../api/$(APP_RELATIVE_PATH) && protoc --proto_path=. \
- --proto_path=../../../third_party \
+ cd ../../../../api/$(APP_RELATIVE_PATH) && protoc --proto_path=. \
+ --proto_path=../../../../third_party \
  --go_out=paths=source_relative:. \
  --go-grpc_out=paths=source_relative:. \
  $(API_PROTO_FILES)
 
 .PHONY: http
 # generate http code
 http:
- cd ../../../api/$(APP_RELATIVE_PATH) && protoc --proto_path=. \
- --proto_path=../../../third_party \
+ cd ../../../../api/$(APP_RELATIVE_PATH) && protoc --proto_path=. \
+ --proto_path=../../../../third_party \
  --go_out=paths=source_relative:. \
  --go-http_out=paths=source_relative:. \
  $(API_PROTO_FILES)
 
 .PHONY: errors
 # generate errors code
 errors:
- cd ../../../api/$(APP_RELATIVE_PATH) && protoc --proto_path=. \
- --proto_path=../../../third_party \
+ cd ../../../../api/$(APP_RELATIVE_PATH) && protoc --proto_path=. \
+ --proto_path=../../../../third_party \
  --go_out=paths=source_relative:. \
  --go-errors_out=paths=source_relative:. \
  $(API_PROTO_FILES)
 
 .PHONY: swagger
 # generate swagger
 swagger:
- cd ../../../api/$(APP_RELATIVE_PATH) && protoc --proto_path=. \
- --proto_path=../../../third_party \
+ cd ../../../../api/$(APP_RELATIVE_PATH) && protoc --proto_path=. \
+ --proto_path=../../../../third_party \
  --openapiv2_out . \
- --openapiv2_opt logtostderr=true \
  $(API_PROTO_FILES)
 
 .PHONY: proto

third_party/google/protobuf/any.proto

@@ -0,0 +1,161 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2008 Google Inc. All rights reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+// * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+// * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+syntax = "proto3";
+
+package google.protobuf;
+
+option go_package = "google.golang.org/protobuf/types/known/anypb";
+option java_package = "com.google.protobuf";
+option java_outer_classname = "AnyProto";
+option java_multiple_files = true;
+option objc_class_prefix = "GPB";
+option csharp_namespace = "Google.Protobuf.WellKnownTypes";
+
+// `Any` contains an arbitrary serialized protocol buffer message along with a
+// URL that describes the type of the serialized message.
+//
+// Protobuf library provides support to pack/unpack Any values in the form
+// of utility functions or additional generated methods of the Any type.
+//
+// Example 1: Pack and unpack a message in C++.
+//
+// Foo foo = ...;
+// Any any;
+// any.PackFrom(foo);
+// ...
+// if (any.UnpackTo(&foo)) {
+// ...
+// }
+//
+// Example 2: Pack and unpack a message in Java.
+//
+// Foo foo = ...;
+// Any any = Any.pack(foo);
+// ...
+// if (any.is(Foo.class)) {
+// foo = any.unpack(Foo.class);
+// }
+// // or ...
+// if (any.isSameTypeAs(Foo.getDefaultInstance())) {
+// foo = any.unpack(Foo.getDefaultInstance());
+// }
+//
+// Example 3: Pack and unpack a message in Python.
+//
+// foo = Foo(...)
+// any = Any()
+// any.Pack(foo)
+// ...
+// if any.Is(Foo.DESCRIPTOR):
+// any.Unpack(foo)
+// ...
+//
+// Example 4: Pack and unpack a message in Go
+//
+// foo := &pb.Foo{...}
+// any, err := anypb.New(foo)
+// if err != nil {
+// ...
+// }
+// ...
+// foo := &pb.Foo{}
+// if err := any.UnmarshalTo(foo); err != nil {
+// ...
+// }
+//
+// The pack methods provided by protobuf library will by default use
+// 'type.googleapis.com/full.type.name' as the type URL and the unpack
+// methods only use the fully qualified type name after the last '/'
+// in the type URL, for example "foo.bar.com/x/y.z" will yield type
+// name "y.z".
+//
+// JSON
+//
+// The JSON representation of an `Any` value uses the regular
+// representation of the deserialized, embedded message, with an
+// additional field `@type` which contains the type URL. Example:
+//
+// package google.profile;
+// message Person {
+// string first_name = 1;
+// string last_name = 2;
+// }
+//
+// {
+// "@type": "type.googleapis.com/google.profile.Person",
+// "firstName": <string>,
+// "lastName": <string>
+// }
+//
+// If the embedded message type is well-known and has a custom JSON
+// representation, that representation will be embedded adding a field
+// `value` which holds the custom JSON in addition to the `@type`
+// field. Example (for message [google.protobuf.Duration][]):
+//
+// {
+// "@type": "type.googleapis.com/google.protobuf.Duration",
+// "value": "1.212s"
+// }
+//
+message Any {
+ // A URL/resource name that uniquely identifies the type of the serialized
+ // protocol buffer message. This string must contain at least
+ // one "/" character. The last segment of the URL's path must represent
+ // the fully qualified name of the type (as in
+ // `path/google.protobuf.Duration`). The name should be in a canonical form
+ // (e.g., leading "." is not accepted).
+ //
+ // In practice, teams usually precompile into the binary all types that they
+ // expect it to use in the context of Any. However, for URLs which use the
+ // scheme `http`, `https`, or no scheme, one can optionally set up a type
+ // server that maps type URLs to message definitions as follows:
+ //
+ // * If no scheme is provided, `https` is assumed.
+ // * An HTTP GET on the URL must yield a [google.protobuf.Type][]
+ // value in binary format, or produce an error.
+ // * Applications are allowed to cache lookup results based on the
+ // URL, or have them precompiled into a binary to avoid any
+ // lookup. Therefore, binary compatibility needs to be preserved
+ // on changes to types. (Use versioned type names to manage
+ // breaking changes.)
+ //
+ // Note: this functionality is not currently available in the official
+ // protobuf release, and it is not used for type URLs beginning with
+ // type.googleapis.com.
+ //
+ // Schemes other than `http`, `https` (or the empty scheme) might be
+ // used with implementation specific semantics.
+ //
+ string type_url = 1;
+
+ // Must be a valid serialized protocol buffer of the above specified type.
+ bytes value = 2;
+}