From 5382e13c626537122bfeaa3ab038f0f63be9db3e Mon Sep 17 00:00:00 2001
From: yangyong <523258729@qq.com>
Date: Fri, 17 Mar 2023 19:29:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=B9=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
backend/.idea/.gitignore | 8 +
backend/.idea/backend.iml | 9 +
backend/.idea/modules.xml | 8 +
backend/.idea/vcs.xml | 6 +
backend/customer/api/customer/customer.pb.go | 247 +++++++++++++++---
backend/customer/api/customer/customer.proto | 18 ++
.../customer/api/customer/customer_grpc.pb.go | 37 +++
.../customer/api/customer/customer_http.pb.go | 39 +++
.../customer/api/valuation/valuation.pb.go | 246 +++++++++++++++++
.../customer/api/valuation/valuation.proto | 20 ++
.../api/valuation/valuation_grpc.pb.go | 109 ++++++++
backend/customer/cmd/customer/wire_gen.go | 3 +-
backend/customer/go.mod | 4 +
backend/customer/go.sum | 3 +
backend/customer/internal/biz/biz.go | 2 +-
backend/customer/internal/biz/cusomer.go | 43 +++
backend/customer/internal/service/customer.go | 24 +-
backend/customer/openapi.yaml | 145 +---------
.../valuation/api/valuation/valuation.proto | 1 +
backend/valuation/cmd/valuation/wire_gen.go | 3 +-
backend/valuation/configs/config.yaml | 2 +-
backend/valuation/go.mod | 7 +-
backend/valuation/go.sum | 12 +
.../biz/{valuationBiz.go => valuation.go} | 49 +++-
backend/valuation/internal/data/data.go | 62 ++++-
backend/valuation/internal/data/valuation.go | 20 ++
.../valuation/internal/service/valuation.go | 12 +-
data/redis/dump.rdb | Bin 92 -> 128 bytes
docker-compose.yaml | 6 +-
volumes/mysql/data/#ib_16384_0.dblwr | Bin 196608 -> 196608 bytes
volumes/mysql/data/#innodb_temp/temp_1.ibt | Bin 81920 -> 81920 bytes
volumes/mysql/data/#innodb_temp/temp_10.ibt | Bin 81920 -> 81920 bytes
volumes/mysql/data/#innodb_temp/temp_2.ibt | Bin 81920 -> 81920 bytes
volumes/mysql/data/#innodb_temp/temp_3.ibt | Bin 81920 -> 81920 bytes
volumes/mysql/data/#innodb_temp/temp_4.ibt | Bin 81920 -> 81920 bytes
volumes/mysql/data/#innodb_temp/temp_5.ibt | Bin 81920 -> 81920 bytes
volumes/mysql/data/#innodb_temp/temp_6.ibt | Bin 81920 -> 81920 bytes
volumes/mysql/data/#innodb_temp/temp_7.ibt | Bin 81920 -> 81920 bytes
volumes/mysql/data/#innodb_temp/temp_8.ibt | Bin 81920 -> 81920 bytes
volumes/mysql/data/#innodb_temp/temp_9.ibt | Bin 81920 -> 81920 bytes
volumes/mysql/data/auto.cnf | 2 +-
volumes/mysql/data/binlog.000001 | Bin 3117158 -> 3117394 bytes
volumes/mysql/data/binlog.000002 | Bin 1413 -> 179 bytes
volumes/mysql/data/binlog.000003 | Bin 1252 -> 3120 bytes
volumes/mysql/data/binlog.000004 | Bin 1116 -> 0 bytes
volumes/mysql/data/binlog.000005 | Bin 7868 -> 0 bytes
volumes/mysql/data/binlog.000006 | Bin 1557 -> 0 bytes
volumes/mysql/data/binlog.000007 | Bin 179 -> 0 bytes
volumes/mysql/data/binlog.000008 | Bin 156 -> 0 bytes
volumes/mysql/data/binlog.index | 5 -
volumes/mysql/data/ca-key.pem | Bin 1680 -> 1680 bytes
volumes/mysql/data/ca.pem | Bin 1112 -> 1112 bytes
volumes/mysql/data/client-cert.pem | Bin 1112 -> 1112 bytes
volumes/mysql/data/client-key.pem | Bin 1676 -> 1680 bytes
volumes/mysql/data/ib_buffer_pool | 99 ++++---
volumes/mysql/data/ib_logfile0 | Bin 50331648 -> 50331648 bytes
volumes/mysql/data/ibdata1 | Bin 12582912 -> 12582912 bytes
volumes/mysql/data/ibtmp1 | Bin 12582912 -> 12582912 bytes
.../mysql/data/laomadj_customer/customers.ibd | Bin 212992 -> 212992 bytes
.../data/laomadj_valuation/price_rules.ibd | Bin 0 -> 131072 bytes
volumes/mysql/data/mysql.ibd | Bin 31457280 -> 31457280 bytes
volumes/mysql/data/mysql/general_log_213.sdi | 2 +-
volumes/mysql/data/mysql/slow_log_214.sdi | 2 +-
.../data/performance_schema/accounts_145.sdi | 2 +-
.../binary_log_trans_189.sdi | 2 +-
.../performance_schema/cond_instances_82.sdi | 2 +-
.../data_lock_waits_161.sdi | 2 +-
.../performance_schema/data_locks_160.sdi | 2 +-
.../data/performance_schema/error_log_83.sdi | 2 +-
.../events_errors_su_139.sdi | 2 +-
.../events_errors_su_140.sdi | 2 +-
.../events_errors_su_141.sdi | 2 +-
.../events_errors_su_142.sdi | 2 +-
.../events_errors_su_143.sdi | 2 +-
.../events_stages_cu_111.sdi | 2 +-
.../events_stages_hi_112.sdi | 2 +-
.../events_stages_hi_113.sdi | 2 +-
.../events_stages_su_114.sdi | 2 +-
.../events_stages_su_115.sdi | 2 +-
.../events_stages_su_116.sdi | 2 +-
.../events_stages_su_117.sdi | 2 +-
.../events_stages_su_118.sdi | 2 +-
.../events_statement_119.sdi | 2 +-
.../events_statement_120.sdi | 2 +-
.../events_statement_121.sdi | 2 +-
.../events_statement_122.sdi | 2 +-
.../events_statement_123.sdi | 2 +-
.../events_statement_124.sdi | 2 +-
.../events_statement_125.sdi | 2 +-
.../events_statement_126.sdi | 2 +-
.../events_statement_127.sdi | 2 +-
.../events_statement_128.sdi | 2 +-
.../events_statement_129.sdi | 2 +-
.../events_statement_130.sdi | 2 +-
.../events_transacti_131.sdi | 2 +-
.../events_transacti_132.sdi | 2 +-
.../events_transacti_133.sdi | 2 +-
.../events_transacti_134.sdi | 2 +-
.../events_transacti_135.sdi | 2 +-
.../events_transacti_136.sdi | 2 +-
.../events_transacti_137.sdi | 2 +-
.../events_transacti_138.sdi | 2 +-
.../events_waits_cur_84.sdi | 2 +-
.../events_waits_his_85.sdi | 2 +-
.../events_waits_his_86.sdi | 2 +-
.../events_waits_sum_87.sdi | 2 +-
.../events_waits_sum_88.sdi | 2 +-
.../events_waits_sum_89.sdi | 2 +-
.../events_waits_sum_90.sdi | 2 +-
.../events_waits_sum_91.sdi | 2 +-
.../events_waits_sum_92.sdi | 2 +-
.../performance_schema/file_instances_93.sdi | 2 +-
.../file_summary_by__94.sdi | 2 +-
.../file_summary_by__95.sdi | 2 +-
.../performance_schema/global_status_181.sdi | 2 +-
.../global_variables_184.sdi | 2 +-
.../data/performance_schema/host_cache_96.sdi | 2 +-
.../data/performance_schema/hosts_146.sdi | 2 +-
.../keyring_componen_191.sdi | 2 +-
.../performance_schema/keyring_keys_152.sdi | 2 +-
.../performance_schema/log_status_174.sdi | 2 +-
.../memory_summary_b_154.sdi | 2 +-
.../memory_summary_b_155.sdi | 2 +-
.../memory_summary_b_156.sdi | 2 +-
.../memory_summary_b_157.sdi | 2 +-
.../memory_summary_g_153.sdi | 2 +-
.../performance_schema/metadata_locks_159.sdi | 2 +-
.../performance_schema/mutex_instances_97.sdi | 2 +-
.../objects_summary__98.sdi | 2 +-
.../performance_time_99.sdi | 2 +-
.../persisted_variab_187.sdi | 2 +-
.../prepared_stateme_175.sdi | 2 +-
.../performance_schema/processlist_100.sdi | 2 +-
.../replication_appl_165.sdi | 2 +-
.../replication_appl_166.sdi | 2 +-
.../replication_appl_167.sdi | 2 +-
.../replication_appl_168.sdi | 2 +-
.../replication_appl_170.sdi | 2 +-
.../replication_appl_171.sdi | 2 +-
.../replication_asyn_172.sdi | 2 +-
.../replication_asyn_173.sdi | 2 +-
.../replication_conn_162.sdi | 2 +-
.../replication_conn_164.sdi | 2 +-
.../replication_grou_163.sdi | 2 +-
.../replication_grou_169.sdi | 2 +-
.../rwlock_instances_101.sdi | 2 +-
.../session_account__151.sdi | 2 +-
.../session_connect__150.sdi | 2 +-
.../performance_schema/session_status_182.sdi | 2 +-
.../session_variable_185.sdi | 2 +-
.../performance_schema/setup_actors_102.sdi | 2 +-
.../setup_consumers_103.sdi | 2 +-
.../setup_instrument_104.sdi | 2 +-
.../performance_schema/setup_objects_105.sdi | 2 +-
.../performance_schema/setup_threads_106.sdi | 2 +-
.../socket_instances_147.sdi | 2 +-
.../socket_summary_b_148.sdi | 2 +-
.../socket_summary_b_149.sdi | 2 +-
.../status_by_accoun_177.sdi | 2 +-
.../performance_schema/status_by_host_178.sdi | 2 +-
.../status_by_thread_179.sdi | 2 +-
.../performance_schema/status_by_user_180.sdi | 2 +-
.../performance_schema/table_handles_158.sdi | 2 +-
.../table_io_waits_s_107.sdi | 2 +-
.../table_io_waits_s_108.sdi | 2 +-
.../table_lock_waits_109.sdi | 2 +-
.../data/performance_schema/threads_110.sdi | 2 +-
.../tls_channel_stat_190.sdi | 2 +-
.../user_defined_fun_188.sdi | 2 +-
.../user_variables_b_176.sdi | 2 +-
.../data/performance_schema/users_144.sdi | 2 +-
.../variables_by_thr_183.sdi | 2 +-
.../performance_schema/variables_info_186.sdi | 2 +-
volumes/mysql/data/private_key.pem | Bin 1680 -> 1680 bytes
volumes/mysql/data/public_key.pem | Bin 452 -> 452 bytes
volumes/mysql/data/server-cert.pem | Bin 1112 -> 1112 bytes
volumes/mysql/data/server-key.pem | Bin 1676 -> 1676 bytes
volumes/mysql/data/sys/sys_config.ibd | Bin 114688 -> 114688 bytes
volumes/mysql/data/undo_001 | Bin 16777216 -> 16777216 bytes
volumes/mysql/data/undo_002 | Bin 16777216 -> 16777216 bytes
volumes/mysql/init.sql | 2 +
181 files changed, 1135 insertions(+), 342 deletions(-)
create mode 100644 backend/.idea/.gitignore
create mode 100644 backend/.idea/backend.iml
create mode 100644 backend/.idea/modules.xml
create mode 100644 backend/.idea/vcs.xml
create mode 100644 backend/customer/api/valuation/valuation.pb.go
create mode 100644 backend/customer/api/valuation/valuation.proto
create mode 100644 backend/customer/api/valuation/valuation_grpc.pb.go
rename backend/valuation/internal/biz/{valuationBiz.go => valuation.go} (50%)
create mode 100644 backend/valuation/internal/data/valuation.go
delete mode 100644 volumes/mysql/data/binlog.000004
delete mode 100644 volumes/mysql/data/binlog.000005
delete mode 100644 volumes/mysql/data/binlog.000006
delete mode 100644 volumes/mysql/data/binlog.000007
delete mode 100644 volumes/mysql/data/binlog.000008
create mode 100644 volumes/mysql/data/laomadj_valuation/price_rules.ibd
create mode 100644 volumes/mysql/init.sql
diff --git a/backend/.idea/.gitignore b/backend/.idea/.gitignore
new file mode 100644
index 0000000..13566b8
--- /dev/null
+++ b/backend/.idea/.gitignore
@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/backend/.idea/backend.iml b/backend/.idea/backend.iml
new file mode 100644
index 0000000..5e764c4
--- /dev/null
+++ b/backend/.idea/backend.iml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/backend/.idea/modules.xml b/backend/.idea/modules.xml
new file mode 100644
index 0000000..e066844
--- /dev/null
+++ b/backend/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/backend/.idea/vcs.xml b/backend/.idea/vcs.xml
new file mode 100644
index 0000000..6c0b863
--- /dev/null
+++ b/backend/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/backend/customer/api/customer/customer.pb.go b/backend/customer/api/customer/customer.pb.go
index a0a6e78..c3db7bf 100644
--- a/backend/customer/api/customer/customer.pb.go
+++ b/backend/customer/api/customer/customer.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.29.0
+// protoc-gen-go v1.30.0
// protoc v3.14.0
// source: api/customer/customer.proto
@@ -374,6 +374,140 @@ func (x *LoginResp) GetTokenLife() int32 {
return 0
}
+type EstimatePriceReq struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Origin string `protobuf:"bytes,1,opt,name=origin,proto3" json:"origin,omitempty"`
+ Destination string `protobuf:"bytes,2,opt,name=destination,proto3" json:"destination,omitempty"`
+}
+
+func (x *EstimatePriceReq) Reset() {
+ *x = EstimatePriceReq{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_api_customer_customer_proto_msgTypes[6]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *EstimatePriceReq) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*EstimatePriceReq) ProtoMessage() {}
+
+func (x *EstimatePriceReq) ProtoReflect() protoreflect.Message {
+ mi := &file_api_customer_customer_proto_msgTypes[6]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
+}
+
+// Deprecated: Use EstimatePriceReq.ProtoReflect.Descriptor instead.
+func (*EstimatePriceReq) Descriptor() ([]byte, []int) {
+ return file_api_customer_customer_proto_rawDescGZIP(), []int{6}
+}
+
+func (x *EstimatePriceReq) GetOrigin() string {
+ if x != nil {
+ return x.Origin
+ }
+ return ""
+}
+
+func (x *EstimatePriceReq) GetDestination() string {
+ if x != nil {
+ return x.Destination
+ }
+ return ""
+}
+
+type EstimatePriceResp struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Code int64 `protobuf:"varint,1,opt,name=code,proto3" json:"code,omitempty"`
+ Message string `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"`
+ Origin string `protobuf:"bytes,3,opt,name=origin,proto3" json:"origin,omitempty"`
+ Destination string `protobuf:"bytes,4,opt,name=destination,proto3" json:"destination,omitempty"`
+ Price int64 `protobuf:"varint,5,opt,name=price,proto3" json:"price,omitempty"`
+}
+
+func (x *EstimatePriceResp) Reset() {
+ *x = EstimatePriceResp{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_api_customer_customer_proto_msgTypes[7]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *EstimatePriceResp) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*EstimatePriceResp) ProtoMessage() {}
+
+func (x *EstimatePriceResp) ProtoReflect() protoreflect.Message {
+ mi := &file_api_customer_customer_proto_msgTypes[7]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
+}
+
+// Deprecated: Use EstimatePriceResp.ProtoReflect.Descriptor instead.
+func (*EstimatePriceResp) Descriptor() ([]byte, []int) {
+ return file_api_customer_customer_proto_rawDescGZIP(), []int{7}
+}
+
+func (x *EstimatePriceResp) GetCode() int64 {
+ if x != nil {
+ return x.Code
+ }
+ return 0
+}
+
+func (x *EstimatePriceResp) GetMessage() string {
+ if x != nil {
+ return x.Message
+ }
+ return ""
+}
+
+func (x *EstimatePriceResp) GetOrigin() string {
+ if x != nil {
+ return x.Origin
+ }
+ return ""
+}
+
+func (x *EstimatePriceResp) GetDestination() string {
+ if x != nil {
+ return x.Destination
+ }
+ return ""
+}
+
+func (x *EstimatePriceResp) GetPrice() int64 {
+ if x != nil {
+ return x.Price
+ }
+ return 0
+}
+
var File_api_customer_customer_proto protoreflect.FileDescriptor
var file_api_customer_customer_proto_rawDesc = []byte{
@@ -415,29 +549,52 @@ var file_api_customer_customer_proto_rawDesc = []byte{
0x01, 0x28, 0x03, 0x52, 0x0d, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65,
0x41, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x5f, 0x6c, 0x69, 0x66, 0x65,
0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x4c, 0x69, 0x66,
- 0x65, 0x32, 0xb8, 0x02, 0x0a, 0x08, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x12, 0x7f,
- 0x0a, 0x0d, 0x47, 0x65, 0x74, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x43, 0x6f, 0x64, 0x65, 0x12,
- 0x1e, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x2e, 0x47,
- 0x65, 0x74, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x65, 0x71, 0x1a,
- 0x1f, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x2e, 0x47,
- 0x65, 0x74, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x65, 0x73, 0x70,
- 0x22, 0x2d, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x27, 0x12, 0x25, 0x2f, 0x63, 0x75, 0x73, 0x74, 0x6f,
- 0x6d, 0x65, 0x72, 0x2f, 0x67, 0x65, 0x74, 0x2d, 0x76, 0x65, 0x72, 0x69, 0x66, 0x79, 0x2d, 0x63,
- 0x6f, 0x64, 0x65, 0x2f, 0x7b, 0x74, 0x65, 0x6c, 0x65, 0x70, 0x68, 0x6f, 0x6e, 0x65, 0x7d, 0x12,
- 0x54, 0x0a, 0x05, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x12, 0x16, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63,
- 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x2e, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x71,
- 0x1a, 0x17, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x2e,
- 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x22, 0x1a, 0x82, 0xd3, 0xe4, 0x93, 0x02,
- 0x14, 0x3a, 0x01, 0x2a, 0x22, 0x0f, 0x2f, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x2f,
- 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x12, 0x55, 0x0a, 0x06, 0x4c, 0x6f, 0x67, 0x6f, 0x75, 0x74, 0x12,
- 0x17, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x2e, 0x4c,
- 0x6f, 0x67, 0x6f, 0x75, 0x74, 0x52, 0x65, 0x71, 0x1a, 0x18, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63,
- 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x2e, 0x4c, 0x6f, 0x67, 0x6f, 0x75, 0x74, 0x52, 0x65,
- 0x73, 0x70, 0x22, 0x18, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x12, 0x12, 0x10, 0x2f, 0x63, 0x75, 0x73,
- 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x2f, 0x6c, 0x6f, 0x67, 0x6f, 0x75, 0x74, 0x42, 0x20, 0x5a, 0x1e,
- 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x75, 0x73,
- 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x3b, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x62, 0x06,
- 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x65, 0x22, 0x4c, 0x0a, 0x10, 0x45, 0x73, 0x74, 0x69, 0x6d, 0x61, 0x74, 0x65, 0x50, 0x72, 0x69,
+ 0x63, 0x65, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x18,
+ 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x12, 0x20, 0x0a,
+ 0x0b, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01,
+ 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22,
+ 0x91, 0x01, 0x0a, 0x11, 0x45, 0x73, 0x74, 0x69, 0x6d, 0x61, 0x74, 0x65, 0x50, 0x72, 0x69, 0x63,
+ 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20,
+ 0x01, 0x28, 0x03, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73,
+ 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73,
+ 0x61, 0x67, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x18, 0x03, 0x20,
+ 0x01, 0x28, 0x09, 0x52, 0x06, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x12, 0x20, 0x0a, 0x0b, 0x64,
+ 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09,
+ 0x52, 0x0b, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x14, 0x0a,
+ 0x05, 0x70, 0x72, 0x69, 0x63, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x70, 0x72,
+ 0x69, 0x63, 0x65, 0x32, 0xc4, 0x03, 0x0a, 0x08, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72,
+ 0x12, 0x7f, 0x0a, 0x0d, 0x47, 0x65, 0x74, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x43, 0x6f, 0x64,
+ 0x65, 0x12, 0x1e, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72,
+ 0x2e, 0x47, 0x65, 0x74, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x65,
+ 0x71, 0x1a, 0x1f, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72,
+ 0x2e, 0x47, 0x65, 0x74, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x65,
+ 0x73, 0x70, 0x22, 0x2d, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x27, 0x12, 0x25, 0x2f, 0x63, 0x75, 0x73,
+ 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x2f, 0x67, 0x65, 0x74, 0x2d, 0x76, 0x65, 0x72, 0x69, 0x66, 0x79,
+ 0x2d, 0x63, 0x6f, 0x64, 0x65, 0x2f, 0x7b, 0x74, 0x65, 0x6c, 0x65, 0x70, 0x68, 0x6f, 0x6e, 0x65,
+ 0x7d, 0x12, 0x54, 0x0a, 0x05, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x12, 0x16, 0x2e, 0x61, 0x70, 0x69,
+ 0x2e, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x2e, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52,
+ 0x65, 0x71, 0x1a, 0x17, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65,
+ 0x72, 0x2e, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x22, 0x1a, 0x82, 0xd3, 0xe4,
+ 0x93, 0x02, 0x14, 0x3a, 0x01, 0x2a, 0x22, 0x0f, 0x2f, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65,
+ 0x72, 0x2f, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x12, 0x55, 0x0a, 0x06, 0x4c, 0x6f, 0x67, 0x6f, 0x75,
+ 0x74, 0x12, 0x17, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72,
+ 0x2e, 0x4c, 0x6f, 0x67, 0x6f, 0x75, 0x74, 0x52, 0x65, 0x71, 0x1a, 0x18, 0x2e, 0x61, 0x70, 0x69,
+ 0x2e, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x2e, 0x4c, 0x6f, 0x67, 0x6f, 0x75, 0x74,
+ 0x52, 0x65, 0x73, 0x70, 0x22, 0x18, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x12, 0x12, 0x10, 0x2f, 0x63,
+ 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x2f, 0x6c, 0x6f, 0x67, 0x6f, 0x75, 0x74, 0x12, 0x89,
+ 0x01, 0x0a, 0x0d, 0x45, 0x73, 0x74, 0x69, 0x6d, 0x61, 0x74, 0x65, 0x50, 0x72, 0x69, 0x63, 0x65,
+ 0x12, 0x1e, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x2e,
+ 0x45, 0x73, 0x74, 0x69, 0x6d, 0x61, 0x74, 0x65, 0x50, 0x72, 0x69, 0x63, 0x65, 0x52, 0x65, 0x71,
+ 0x1a, 0x1f, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x2e,
+ 0x45, 0x73, 0x74, 0x69, 0x6d, 0x61, 0x74, 0x65, 0x50, 0x72, 0x69, 0x63, 0x65, 0x52, 0x65, 0x73,
+ 0x70, 0x22, 0x37, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x31, 0x12, 0x2f, 0x2f, 0x63, 0x75, 0x73, 0x74,
+ 0x6f, 0x6d, 0x65, 0x72, 0x2f, 0x65, 0x73, 0x74, 0x69, 0x6d, 0x61, 0x74, 0x65, 0x2d, 0x70, 0x72,
+ 0x69, 0x63, 0x65, 0x2f, 0x7b, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x7d, 0x2f, 0x7b, 0x64, 0x65,
+ 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x7d, 0x42, 0x20, 0x5a, 0x1e, 0x63, 0x75,
+ 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x75, 0x73, 0x74, 0x6f,
+ 0x6d, 0x65, 0x72, 0x3b, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72,
+ 0x6f, 0x74, 0x6f, 0x33,
}
var (
@@ -452,7 +609,7 @@ func file_api_customer_customer_proto_rawDescGZIP() []byte {
return file_api_customer_customer_proto_rawDescData
}
-var file_api_customer_customer_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
+var file_api_customer_customer_proto_msgTypes = make([]protoimpl.MessageInfo, 8)
var file_api_customer_customer_proto_goTypes = []interface{}{
(*LogoutReq)(nil), // 0: api.customer.LogoutReq
(*LogoutResp)(nil), // 1: api.customer.LogoutResp
@@ -460,16 +617,20 @@ var file_api_customer_customer_proto_goTypes = []interface{}{
(*GetVerifyCodeResp)(nil), // 3: api.customer.GetVerifyCodeResp
(*LoginReq)(nil), // 4: api.customer.LoginReq
(*LoginResp)(nil), // 5: api.customer.LoginResp
+ (*EstimatePriceReq)(nil), // 6: api.customer.EstimatePriceReq
+ (*EstimatePriceResp)(nil), // 7: api.customer.EstimatePriceResp
}
var file_api_customer_customer_proto_depIdxs = []int32{
2, // 0: api.customer.Customer.GetVerifyCode:input_type -> api.customer.GetVerifyCodeReq
4, // 1: api.customer.Customer.Login:input_type -> api.customer.LoginReq
0, // 2: api.customer.Customer.Logout:input_type -> api.customer.LogoutReq
- 3, // 3: api.customer.Customer.GetVerifyCode:output_type -> api.customer.GetVerifyCodeResp
- 5, // 4: api.customer.Customer.Login:output_type -> api.customer.LoginResp
- 1, // 5: api.customer.Customer.Logout:output_type -> api.customer.LogoutResp
- 3, // [3:6] is the sub-list for method output_type
- 0, // [0:3] is the sub-list for method input_type
+ 6, // 3: api.customer.Customer.EstimatePrice:input_type -> api.customer.EstimatePriceReq
+ 3, // 4: api.customer.Customer.GetVerifyCode:output_type -> api.customer.GetVerifyCodeResp
+ 5, // 5: api.customer.Customer.Login:output_type -> api.customer.LoginResp
+ 1, // 6: api.customer.Customer.Logout:output_type -> api.customer.LogoutResp
+ 7, // 7: api.customer.Customer.EstimatePrice:output_type -> api.customer.EstimatePriceResp
+ 4, // [4:8] is the sub-list for method output_type
+ 0, // [0:4] is the sub-list for method input_type
0, // [0:0] is the sub-list for extension type_name
0, // [0:0] is the sub-list for extension extendee
0, // [0:0] is the sub-list for field type_name
@@ -553,6 +714,30 @@ func file_api_customer_customer_proto_init() {
return nil
}
}
+ file_api_customer_customer_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*EstimatePriceReq); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_api_customer_customer_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*EstimatePriceResp); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
}
type x struct{}
out := protoimpl.TypeBuilder{
@@ -560,7 +745,7 @@ func file_api_customer_customer_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_api_customer_customer_proto_rawDesc,
NumEnums: 0,
- NumMessages: 6,
+ NumMessages: 8,
NumExtensions: 0,
NumServices: 1,
},
diff --git a/backend/customer/api/customer/customer.proto b/backend/customer/api/customer/customer.proto
index 3b2cf3c..a7688ac 100644
--- a/backend/customer/api/customer/customer.proto
+++ b/backend/customer/api/customer/customer.proto
@@ -23,6 +23,11 @@ service Customer {
get: "/customer/logout",
};
}
+ rpc EstimatePrice (EstimatePriceReq) returns (EstimatePriceResp) {
+ option (google.api.http) = {
+ get: "/customer/estimate-price/{origin}/{destination}",
+ };
+ }
}
message LogoutReq {
@@ -57,3 +62,16 @@ message LoginResp {
int64 token_create_at = 4;
int32 token_life = 5;
}
+
+message EstimatePriceReq {
+ string origin = 1;
+ string destination = 2;
+};
+
+message EstimatePriceResp {
+ int64 code = 1;
+ string message = 2;
+ string origin = 3;
+ string destination = 4;
+ int64 price = 5;
+};
diff --git a/backend/customer/api/customer/customer_grpc.pb.go b/backend/customer/api/customer/customer_grpc.pb.go
index 5ae5307..1139c18 100644
--- a/backend/customer/api/customer/customer_grpc.pb.go
+++ b/backend/customer/api/customer/customer_grpc.pb.go
@@ -22,6 +22,7 @@ const (
Customer_GetVerifyCode_FullMethodName = "/api.customer.Customer/GetVerifyCode"
Customer_Login_FullMethodName = "/api.customer.Customer/Login"
Customer_Logout_FullMethodName = "/api.customer.Customer/Logout"
+ Customer_EstimatePrice_FullMethodName = "/api.customer.Customer/EstimatePrice"
)
// CustomerClient is the client API for Customer service.
@@ -31,6 +32,7 @@ type CustomerClient interface {
GetVerifyCode(ctx context.Context, in *GetVerifyCodeReq, opts ...grpc.CallOption) (*GetVerifyCodeResp, error)
Login(ctx context.Context, in *LoginReq, opts ...grpc.CallOption) (*LoginResp, error)
Logout(ctx context.Context, in *LogoutReq, opts ...grpc.CallOption) (*LogoutResp, error)
+ EstimatePrice(ctx context.Context, in *EstimatePriceReq, opts ...grpc.CallOption) (*EstimatePriceResp, error)
}
type customerClient struct {
@@ -68,6 +70,15 @@ func (c *customerClient) Logout(ctx context.Context, in *LogoutReq, opts ...grpc
return out, nil
}
+func (c *customerClient) EstimatePrice(ctx context.Context, in *EstimatePriceReq, opts ...grpc.CallOption) (*EstimatePriceResp, error) {
+ out := new(EstimatePriceResp)
+ err := c.cc.Invoke(ctx, Customer_EstimatePrice_FullMethodName, in, out, opts...)
+ if err != nil {
+ return nil, err
+ }
+ return out, nil
+}
+
// CustomerServer is the server API for Customer service.
// All implementations must embed UnimplementedCustomerServer
// for forward compatibility
@@ -75,6 +86,7 @@ type CustomerServer interface {
GetVerifyCode(context.Context, *GetVerifyCodeReq) (*GetVerifyCodeResp, error)
Login(context.Context, *LoginReq) (*LoginResp, error)
Logout(context.Context, *LogoutReq) (*LogoutResp, error)
+ EstimatePrice(context.Context, *EstimatePriceReq) (*EstimatePriceResp, error)
mustEmbedUnimplementedCustomerServer()
}
@@ -91,6 +103,9 @@ func (UnimplementedCustomerServer) Login(context.Context, *LoginReq) (*LoginResp
func (UnimplementedCustomerServer) Logout(context.Context, *LogoutReq) (*LogoutResp, error) {
return nil, status.Errorf(codes.Unimplemented, "method Logout not implemented")
}
+func (UnimplementedCustomerServer) EstimatePrice(context.Context, *EstimatePriceReq) (*EstimatePriceResp, error) {
+ return nil, status.Errorf(codes.Unimplemented, "method EstimatePrice not implemented")
+}
func (UnimplementedCustomerServer) mustEmbedUnimplementedCustomerServer() {}
// UnsafeCustomerServer may be embedded to opt out of forward compatibility for this service.
@@ -158,6 +173,24 @@ func _Customer_Logout_Handler(srv interface{}, ctx context.Context, dec func(int
return interceptor(ctx, in, info, handler)
}
+func _Customer_EstimatePrice_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+ in := new(EstimatePriceReq)
+ if err := dec(in); err != nil {
+ return nil, err
+ }
+ if interceptor == nil {
+ return srv.(CustomerServer).EstimatePrice(ctx, in)
+ }
+ info := &grpc.UnaryServerInfo{
+ Server: srv,
+ FullMethod: Customer_EstimatePrice_FullMethodName,
+ }
+ handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+ return srv.(CustomerServer).EstimatePrice(ctx, req.(*EstimatePriceReq))
+ }
+ return interceptor(ctx, in, info, handler)
+}
+
// Customer_ServiceDesc is the grpc.ServiceDesc for Customer service.
// It's only intended for direct use with grpc.RegisterService,
// and not to be introspected or modified (even as a copy)
@@ -177,6 +210,10 @@ var Customer_ServiceDesc = grpc.ServiceDesc{
MethodName: "Logout",
Handler: _Customer_Logout_Handler,
},
+ {
+ MethodName: "EstimatePrice",
+ Handler: _Customer_EstimatePrice_Handler,
+ },
},
Streams: []grpc.StreamDesc{},
Metadata: "api/customer/customer.proto",
diff --git a/backend/customer/api/customer/customer_http.pb.go b/backend/customer/api/customer/customer_http.pb.go
index bce69c6..d0e0b34 100644
--- a/backend/customer/api/customer/customer_http.pb.go
+++ b/backend/customer/api/customer/customer_http.pb.go
@@ -19,11 +19,13 @@ var _ = binding.EncodeURL
const _ = http.SupportPackageIsVersion1
+const OperationCustomerEstimatePrice = "/api.customer.Customer/EstimatePrice"
const OperationCustomerGetVerifyCode = "/api.customer.Customer/GetVerifyCode"
const OperationCustomerLogin = "/api.customer.Customer/Login"
const OperationCustomerLogout = "/api.customer.Customer/Logout"
type CustomerHTTPServer interface {
+ EstimatePrice(context.Context, *EstimatePriceReq) (*EstimatePriceResp, error)
GetVerifyCode(context.Context, *GetVerifyCodeReq) (*GetVerifyCodeResp, error)
Login(context.Context, *LoginReq) (*LoginResp, error)
Logout(context.Context, *LogoutReq) (*LogoutResp, error)
@@ -34,6 +36,7 @@ func RegisterCustomerHTTPServer(s *http.Server, srv CustomerHTTPServer) {
r.GET("/customer/get-verify-code/{telephone}", _Customer_GetVerifyCode0_HTTP_Handler(srv))
r.POST("/customer/login", _Customer_Login0_HTTP_Handler(srv))
r.GET("/customer/logout", _Customer_Logout0_HTTP_Handler(srv))
+ r.GET("/customer/estimate-price/{origin}/{destination}", _Customer_EstimatePrice0_HTTP_Handler(srv))
}
func _Customer_GetVerifyCode0_HTTP_Handler(srv CustomerHTTPServer) func(ctx http.Context) error {
@@ -96,7 +99,30 @@ func _Customer_Logout0_HTTP_Handler(srv CustomerHTTPServer) func(ctx http.Contex
}
}
+func _Customer_EstimatePrice0_HTTP_Handler(srv CustomerHTTPServer) func(ctx http.Context) error {
+ return func(ctx http.Context) error {
+ var in EstimatePriceReq
+ if err := ctx.BindQuery(&in); err != nil {
+ return err
+ }
+ if err := ctx.BindVars(&in); err != nil {
+ return err
+ }
+ http.SetOperation(ctx, OperationCustomerEstimatePrice)
+ h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
+ return srv.EstimatePrice(ctx, req.(*EstimatePriceReq))
+ })
+ out, err := h(ctx, &in)
+ if err != nil {
+ return err
+ }
+ reply := out.(*EstimatePriceResp)
+ return ctx.Result(200, reply)
+ }
+}
+
type CustomerHTTPClient interface {
+ EstimatePrice(ctx context.Context, req *EstimatePriceReq, opts ...http.CallOption) (rsp *EstimatePriceResp, err error)
GetVerifyCode(ctx context.Context, req *GetVerifyCodeReq, opts ...http.CallOption) (rsp *GetVerifyCodeResp, err error)
Login(ctx context.Context, req *LoginReq, opts ...http.CallOption) (rsp *LoginResp, err error)
Logout(ctx context.Context, req *LogoutReq, opts ...http.CallOption) (rsp *LogoutResp, err error)
@@ -110,6 +136,19 @@ func NewCustomerHTTPClient(client *http.Client) CustomerHTTPClient {
return &CustomerHTTPClientImpl{client}
}
+func (c *CustomerHTTPClientImpl) EstimatePrice(ctx context.Context, in *EstimatePriceReq, opts ...http.CallOption) (*EstimatePriceResp, error) {
+ var out EstimatePriceResp
+ pattern := "/customer/estimate-price/{origin}/{destination}"
+ path := binding.EncodeURL(pattern, in, true)
+ opts = append(opts, http.Operation(OperationCustomerEstimatePrice))
+ opts = append(opts, http.PathTemplate(pattern))
+ err := c.cc.Invoke(ctx, "GET", path, nil, &out, opts...)
+ if err != nil {
+ return nil, err
+ }
+ return &out, err
+}
+
func (c *CustomerHTTPClientImpl) GetVerifyCode(ctx context.Context, in *GetVerifyCodeReq, opts ...http.CallOption) (*GetVerifyCodeResp, error) {
var out GetVerifyCodeResp
pattern := "/customer/get-verify-code/{telephone}"
diff --git a/backend/customer/api/valuation/valuation.pb.go b/backend/customer/api/valuation/valuation.pb.go
new file mode 100644
index 0000000..97350d2
--- /dev/null
+++ b/backend/customer/api/valuation/valuation.pb.go
@@ -0,0 +1,246 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// protoc-gen-go v1.30.0
+// protoc v3.14.0
+// source: api/valuation/valuation.proto
+
+package valuation
+
+import (
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+ reflect "reflect"
+ sync "sync"
+)
+
+const (
+ // Verify that this generated code is sufficiently up-to-date.
+ _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+ // Verify that runtime/protoimpl is sufficiently up-to-date.
+ _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
+
+type GetEstimatePriceReq struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Origin string `protobuf:"bytes,1,opt,name=origin,proto3" json:"origin,omitempty"`
+ Destination string `protobuf:"bytes,2,opt,name=destination,proto3" json:"destination,omitempty"`
+}
+
+func (x *GetEstimatePriceReq) Reset() {
+ *x = GetEstimatePriceReq{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_api_valuation_valuation_proto_msgTypes[0]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *GetEstimatePriceReq) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GetEstimatePriceReq) ProtoMessage() {}
+
+func (x *GetEstimatePriceReq) ProtoReflect() protoreflect.Message {
+ mi := &file_api_valuation_valuation_proto_msgTypes[0]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
+}
+
+// Deprecated: Use GetEstimatePriceReq.ProtoReflect.Descriptor instead.
+func (*GetEstimatePriceReq) Descriptor() ([]byte, []int) {
+ return file_api_valuation_valuation_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *GetEstimatePriceReq) GetOrigin() string {
+ if x != nil {
+ return x.Origin
+ }
+ return ""
+}
+
+func (x *GetEstimatePriceReq) GetDestination() string {
+ if x != nil {
+ return x.Destination
+ }
+ return ""
+}
+
+type GetEstimatePriceReply struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Origin string `protobuf:"bytes,1,opt,name=origin,proto3" json:"origin,omitempty"`
+ Destination string `protobuf:"bytes,2,opt,name=destination,proto3" json:"destination,omitempty"`
+ Price int64 `protobuf:"varint,3,opt,name=price,proto3" json:"price,omitempty"`
+}
+
+func (x *GetEstimatePriceReply) Reset() {
+ *x = GetEstimatePriceReply{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_api_valuation_valuation_proto_msgTypes[1]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *GetEstimatePriceReply) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GetEstimatePriceReply) ProtoMessage() {}
+
+func (x *GetEstimatePriceReply) ProtoReflect() protoreflect.Message {
+ mi := &file_api_valuation_valuation_proto_msgTypes[1]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
+}
+
+// Deprecated: Use GetEstimatePriceReply.ProtoReflect.Descriptor instead.
+func (*GetEstimatePriceReply) Descriptor() ([]byte, []int) {
+ return file_api_valuation_valuation_proto_rawDescGZIP(), []int{1}
+}
+
+func (x *GetEstimatePriceReply) GetOrigin() string {
+ if x != nil {
+ return x.Origin
+ }
+ return ""
+}
+
+func (x *GetEstimatePriceReply) GetDestination() string {
+ if x != nil {
+ return x.Destination
+ }
+ return ""
+}
+
+func (x *GetEstimatePriceReply) GetPrice() int64 {
+ if x != nil {
+ return x.Price
+ }
+ return 0
+}
+
+var File_api_valuation_valuation_proto protoreflect.FileDescriptor
+
+var file_api_valuation_valuation_proto_rawDesc = []byte{
+ 0x0a, 0x1d, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x61, 0x6c, 0x75, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f,
+ 0x76, 0x61, 0x6c, 0x75, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12,
+ 0x0d, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x61, 0x6c, 0x75, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x4f,
+ 0x0a, 0x13, 0x47, 0x65, 0x74, 0x45, 0x73, 0x74, 0x69, 0x6d, 0x61, 0x74, 0x65, 0x50, 0x72, 0x69,
+ 0x63, 0x65, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x18,
+ 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x12, 0x20, 0x0a,
+ 0x0b, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01,
+ 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22,
+ 0x67, 0x0a, 0x15, 0x47, 0x65, 0x74, 0x45, 0x73, 0x74, 0x69, 0x6d, 0x61, 0x74, 0x65, 0x50, 0x72,
+ 0x69, 0x63, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x6f, 0x72, 0x69, 0x67,
+ 0x69, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e,
+ 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18,
+ 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69,
+ 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x72, 0x69, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28,
+ 0x03, 0x52, 0x05, 0x70, 0x72, 0x69, 0x63, 0x65, 0x32, 0x69, 0x0a, 0x09, 0x56, 0x61, 0x6c, 0x75,
+ 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x5c, 0x0a, 0x10, 0x47, 0x65, 0x74, 0x45, 0x73, 0x74, 0x69,
+ 0x6d, 0x61, 0x74, 0x65, 0x50, 0x72, 0x69, 0x63, 0x65, 0x12, 0x22, 0x2e, 0x61, 0x70, 0x69, 0x2e,
+ 0x76, 0x61, 0x6c, 0x75, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x47, 0x65, 0x74, 0x45, 0x73, 0x74,
+ 0x69, 0x6d, 0x61, 0x74, 0x65, 0x50, 0x72, 0x69, 0x63, 0x65, 0x52, 0x65, 0x71, 0x1a, 0x24, 0x2e,
+ 0x61, 0x70, 0x69, 0x2e, 0x76, 0x61, 0x6c, 0x75, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x47, 0x65,
+ 0x74, 0x45, 0x73, 0x74, 0x69, 0x6d, 0x61, 0x74, 0x65, 0x50, 0x72, 0x69, 0x63, 0x65, 0x52, 0x65,
+ 0x70, 0x6c, 0x79, 0x42, 0x22, 0x5a, 0x20, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x2f,
+ 0x61, 0x70, 0x69, 0x2f, 0x76, 0x61, 0x6c, 0x75, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x3b, 0x76, 0x61,
+ 0x6c, 0x75, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+ file_api_valuation_valuation_proto_rawDescOnce sync.Once
+ file_api_valuation_valuation_proto_rawDescData = file_api_valuation_valuation_proto_rawDesc
+)
+
+func file_api_valuation_valuation_proto_rawDescGZIP() []byte {
+ file_api_valuation_valuation_proto_rawDescOnce.Do(func() {
+ file_api_valuation_valuation_proto_rawDescData = protoimpl.X.CompressGZIP(file_api_valuation_valuation_proto_rawDescData)
+ })
+ return file_api_valuation_valuation_proto_rawDescData
+}
+
+var file_api_valuation_valuation_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
+var file_api_valuation_valuation_proto_goTypes = []interface{}{
+ (*GetEstimatePriceReq)(nil), // 0: api.valuation.GetEstimatePriceReq
+ (*GetEstimatePriceReply)(nil), // 1: api.valuation.GetEstimatePriceReply
+}
+var file_api_valuation_valuation_proto_depIdxs = []int32{
+ 0, // 0: api.valuation.Valuation.GetEstimatePrice:input_type -> api.valuation.GetEstimatePriceReq
+ 1, // 1: api.valuation.Valuation.GetEstimatePrice:output_type -> api.valuation.GetEstimatePriceReply
+ 1, // [1:2] is the sub-list for method output_type
+ 0, // [0:1] is the sub-list for method input_type
+ 0, // [0:0] is the sub-list for extension type_name
+ 0, // [0:0] is the sub-list for extension extendee
+ 0, // [0:0] is the sub-list for field type_name
+}
+
+func init() { file_api_valuation_valuation_proto_init() }
+func file_api_valuation_valuation_proto_init() {
+ if File_api_valuation_valuation_proto != nil {
+ return
+ }
+ if !protoimpl.UnsafeEnabled {
+ file_api_valuation_valuation_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*GetEstimatePriceReq); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_api_valuation_valuation_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*GetEstimatePriceReply); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ }
+ type x struct{}
+ out := protoimpl.TypeBuilder{
+ File: protoimpl.DescBuilder{
+ GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+ RawDescriptor: file_api_valuation_valuation_proto_rawDesc,
+ NumEnums: 0,
+ NumMessages: 2,
+ NumExtensions: 0,
+ NumServices: 1,
+ },
+ GoTypes: file_api_valuation_valuation_proto_goTypes,
+ DependencyIndexes: file_api_valuation_valuation_proto_depIdxs,
+ MessageInfos: file_api_valuation_valuation_proto_msgTypes,
+ }.Build()
+ File_api_valuation_valuation_proto = out.File
+ file_api_valuation_valuation_proto_rawDesc = nil
+ file_api_valuation_valuation_proto_goTypes = nil
+ file_api_valuation_valuation_proto_depIdxs = nil
+}
diff --git a/backend/customer/api/valuation/valuation.proto b/backend/customer/api/valuation/valuation.proto
new file mode 100644
index 0000000..3395e60
--- /dev/null
+++ b/backend/customer/api/valuation/valuation.proto
@@ -0,0 +1,20 @@
+syntax = "proto3";
+
+package api.valuation;
+
+option go_package = "customer/api/valuation;valuation";
+
+service Valuation {
+ rpc GetEstimatePrice (GetEstimatePriceReq) returns (GetEstimatePriceReply);
+}
+
+message GetEstimatePriceReq {
+ string origin = 1;
+ string destination = 2;
+}
+
+message GetEstimatePriceReply {
+ string origin = 1;
+ string destination = 2;
+ int64 price = 3;
+}
\ No newline at end of file
diff --git a/backend/customer/api/valuation/valuation_grpc.pb.go b/backend/customer/api/valuation/valuation_grpc.pb.go
new file mode 100644
index 0000000..4f1b2e6
--- /dev/null
+++ b/backend/customer/api/valuation/valuation_grpc.pb.go
@@ -0,0 +1,109 @@
+// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
+// versions:
+// - protoc-gen-go-grpc v1.3.0
+// - protoc v3.14.0
+// source: api/valuation/valuation.proto
+
+package valuation
+
+import (
+ context "context"
+ grpc "google.golang.org/grpc"
+ codes "google.golang.org/grpc/codes"
+ status "google.golang.org/grpc/status"
+)
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+// Requires gRPC-Go v1.32.0 or later.
+const _ = grpc.SupportPackageIsVersion7
+
+const (
+ Valuation_GetEstimatePrice_FullMethodName = "/api.valuation.Valuation/GetEstimatePrice"
+)
+
+// ValuationClient is the client API for Valuation service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
+type ValuationClient interface {
+ GetEstimatePrice(ctx context.Context, in *GetEstimatePriceReq, opts ...grpc.CallOption) (*GetEstimatePriceReply, error)
+}
+
+type valuationClient struct {
+ cc grpc.ClientConnInterface
+}
+
+func NewValuationClient(cc grpc.ClientConnInterface) ValuationClient {
+ return &valuationClient{cc}
+}
+
+func (c *valuationClient) GetEstimatePrice(ctx context.Context, in *GetEstimatePriceReq, opts ...grpc.CallOption) (*GetEstimatePriceReply, error) {
+ out := new(GetEstimatePriceReply)
+ err := c.cc.Invoke(ctx, Valuation_GetEstimatePrice_FullMethodName, in, out, opts...)
+ if err != nil {
+ return nil, err
+ }
+ return out, nil
+}
+
+// ValuationServer is the server API for Valuation service.
+// All implementations must embed UnimplementedValuationServer
+// for forward compatibility
+type ValuationServer interface {
+ GetEstimatePrice(context.Context, *GetEstimatePriceReq) (*GetEstimatePriceReply, error)
+ mustEmbedUnimplementedValuationServer()
+}
+
+// UnimplementedValuationServer must be embedded to have forward compatible implementations.
+type UnimplementedValuationServer struct {
+}
+
+func (UnimplementedValuationServer) GetEstimatePrice(context.Context, *GetEstimatePriceReq) (*GetEstimatePriceReply, error) {
+ return nil, status.Errorf(codes.Unimplemented, "method GetEstimatePrice not implemented")
+}
+func (UnimplementedValuationServer) mustEmbedUnimplementedValuationServer() {}
+
+// UnsafeValuationServer may be embedded to opt out of forward compatibility for this service.
+// Use of this interface is not recommended, as added methods to ValuationServer will
+// result in compilation errors.
+type UnsafeValuationServer interface {
+ mustEmbedUnimplementedValuationServer()
+}
+
+func RegisterValuationServer(s grpc.ServiceRegistrar, srv ValuationServer) {
+ s.RegisterService(&Valuation_ServiceDesc, srv)
+}
+
+func _Valuation_GetEstimatePrice_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+ in := new(GetEstimatePriceReq)
+ if err := dec(in); err != nil {
+ return nil, err
+ }
+ if interceptor == nil {
+ return srv.(ValuationServer).GetEstimatePrice(ctx, in)
+ }
+ info := &grpc.UnaryServerInfo{
+ Server: srv,
+ FullMethod: Valuation_GetEstimatePrice_FullMethodName,
+ }
+ handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+ return srv.(ValuationServer).GetEstimatePrice(ctx, req.(*GetEstimatePriceReq))
+ }
+ return interceptor(ctx, in, info, handler)
+}
+
+// Valuation_ServiceDesc is the grpc.ServiceDesc for Valuation service.
+// It's only intended for direct use with grpc.RegisterService,
+// and not to be introspected or modified (even as a copy)
+var Valuation_ServiceDesc = grpc.ServiceDesc{
+ ServiceName: "api.valuation.Valuation",
+ HandlerType: (*ValuationServer)(nil),
+ Methods: []grpc.MethodDesc{
+ {
+ MethodName: "GetEstimatePrice",
+ Handler: _Valuation_GetEstimatePrice_Handler,
+ },
+ },
+ Streams: []grpc.StreamDesc{},
+ Metadata: "api/valuation/valuation.proto",
+}
diff --git a/backend/customer/cmd/customer/wire_gen.go b/backend/customer/cmd/customer/wire_gen.go
index b7f0f6c..9e98872 100644
--- a/backend/customer/cmd/customer/wire_gen.go
+++ b/backend/customer/cmd/customer/wire_gen.go
@@ -33,7 +33,8 @@ func wireApp(confServer *conf.Server, confData *conf.Data, logger log.Logger) (*
greeterService := service.NewGreeterService(greeterUsecase)
grpcServer := server.NewGRPCServer(confServer, greeterService, logger)
customerData := data.NewCusomerData(dataData)
- customerService := service.NewCustomerService(customerData)
+ customerBiz := biz.NewCustomerBiz()
+ customerService := service.NewCustomerService(customerData, customerBiz)
httpServer := server.NewHTTPServer(confServer, customerService, greeterService, logger)
app := newApp(logger, grpcServer, httpServer)
return app, func() {
diff --git a/backend/customer/go.mod b/backend/customer/go.mod
index b1dd972..9d9c340 100644
--- a/backend/customer/go.mod
+++ b/backend/customer/go.mod
@@ -29,6 +29,7 @@ require (
github.com/go-playground/form/v4 v4.2.0 // indirect
github.com/go-sql-driver/mysql v1.7.0 // indirect
github.com/golang/protobuf v1.5.2 // indirect
+ github.com/google/subcommands v1.0.1 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/gorilla/mux v1.8.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.1 // indirect
@@ -44,11 +45,14 @@ require (
github.com/mattn/go-isatty v0.0.12 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/mapstructure v1.4.1 // indirect
+ github.com/pmezard/go-difflib v1.0.0 // indirect
go.opentelemetry.io/otel v1.7.0 // indirect
go.opentelemetry.io/otel/trace v1.7.0 // indirect
+ golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
golang.org/x/net v0.7.0 // indirect
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
golang.org/x/sys v0.5.0 // indirect
golang.org/x/text v0.7.0 // indirect
+ golang.org/x/tools v0.1.12 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
diff --git a/backend/customer/go.sum b/backend/customer/go.sum
index 4e12dc7..0133094 100644
--- a/backend/customer/go.sum
+++ b/backend/customer/go.sum
@@ -111,6 +111,7 @@ github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/subcommands v1.0.1 h1:/eqq+otEXm5vhfBrbREPCSVQbvofip6kIz+mX5TUH7k=
github.com/google/subcommands v1.0.1/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk=
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
@@ -279,6 +280,7 @@ golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -362,6 +364,7 @@ golang.org/x/tools v0.0.0-20190422233926-fe54fb35175b/go.mod h1:LCzVGOaR6xXOjkQ3
golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/backend/customer/internal/biz/biz.go b/backend/customer/internal/biz/biz.go
index d0a973b..751d2bf 100644
--- a/backend/customer/internal/biz/biz.go
+++ b/backend/customer/internal/biz/biz.go
@@ -3,4 +3,4 @@ package biz
import "github.com/google/wire"
// ProviderSet is biz providers.
-var ProviderSet = wire.NewSet(NewGreeterUsecase)
+var ProviderSet = wire.NewSet(NewGreeterUsecase, NewCustomerBiz)
diff --git a/backend/customer/internal/biz/cusomer.go b/backend/customer/internal/biz/cusomer.go
index be5d019..7cd6f9c 100644
--- a/backend/customer/internal/biz/cusomer.go
+++ b/backend/customer/internal/biz/cusomer.go
@@ -1,7 +1,12 @@
package biz
import (
+ "context"
+ "customer/api/valuation"
"database/sql"
+ "github.com/go-kratos/kratos/contrib/registry/consul/v2"
+ "github.com/go-kratos/kratos/v2/transport/grpc"
+ "github.com/hashicorp/consul/api"
"gorm.io/gorm"
)
@@ -26,3 +31,41 @@ type CustomerToken struct {
Token string `gorm:"type:varchar(4095);" json:"token"`
TokenCreatedAt sql.NullTime `gorm:"" json:"token_created_at"`
}
+
+type CustomerBiz struct {
+}
+
+func NewCustomerBiz() *CustomerBiz {
+ return &CustomerBiz{}
+}
+
+func (cb *CustomerBiz) GetEstimatePrice(origin, destination string) (int64, error) {
+ consulConfig := api.DefaultConfig()
+ consulConfig.Address = "localhost:8500"
+ consulClient, err := api.NewClient(consulConfig)
+ dis := consul.New(consulClient)
+ if err != nil {
+ return 0, err
+ }
+ endpoint := "discovery:///Valuation"
+ conn, err := grpc.DialInsecure(
+ context.Background(),
+ grpc.WithEndpoint(endpoint),
+ grpc.WithDiscovery(dis),
+ )
+ if err != nil {
+ return 0, nil
+ }
+ defer func() {
+ _ = conn.Close()
+ }()
+ client := valuation.NewValuationClient(conn)
+ reply, err := client.GetEstimatePrice(context.Background(), &valuation.GetEstimatePriceReq{
+ Origin: origin,
+ Destination: destination,
+ })
+ if err != nil {
+ return 0, err
+ }
+ return reply.Price, nil
+}
diff --git a/backend/customer/internal/service/customer.go b/backend/customer/internal/service/customer.go
index 7f605be..7c4fcb1 100644
--- a/backend/customer/internal/service/customer.go
+++ b/backend/customer/internal/service/customer.go
@@ -20,14 +20,13 @@ import (
type CustomerService struct {
pb.UnimplementedCustomerServer
CD *data.CustomerData
- /**
- todo verifyClient *client.verifyClient
- */
+ cb *biz.CustomerBiz
}
-func NewCustomerService(cd *data.CustomerData) *CustomerService {
+func NewCustomerService(cd *data.CustomerData, cb *biz.CustomerBiz) *CustomerService {
return &CustomerService{
CD: cd,
+ cb: cb,
}
}
@@ -147,3 +146,20 @@ func (s *CustomerService) Logout(ctx context.Context, req *pb.LogoutReq) (*pb.Lo
Message: "logout success",
}, nil
}
+
+func (s *CustomerService) EstimatePrice(ctx context.Context, req *pb.EstimatePriceReq) (*pb.EstimatePriceResp, error) {
+ price, err := s.cb.GetEstimatePrice(req.Origin, req.Destination)
+ if err != nil {
+ return &pb.EstimatePriceResp{
+ Code: 1,
+ Message: err.Error(),
+ }, nil
+ }
+ return &pb.EstimatePriceResp{
+ Code: 0,
+ Message: "SUCCESS",
+ Origin: req.Origin,
+ Destination: req.Destination,
+ Price: price,
+ }, nil
+}
diff --git a/backend/customer/openapi.yaml b/backend/customer/openapi.yaml
index 60af6ca..f8f3735 100644
--- a/backend/customer/openapi.yaml
+++ b/backend/customer/openapi.yaml
@@ -3,147 +3,8 @@
openapi: 3.0.3
info:
- title: Customer API
+ title: ""
version: 0.0.1
-paths:
- /customer/get-verify-code/{telephone}:
- get:
- tags:
- - Customer
- operationId: Customer_GetVerifyCode
- parameters:
- - name: telephone
- in: path
- required: true
- schema:
- type: string
- responses:
- "200":
- description: OK
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/GetVerifyCodeResp'
- default:
- description: Default error response
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/Status'
- /customer/login:
- post:
- tags:
- - Customer
- operationId: Customer_Login
- requestBody:
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/LoginReq'
- required: true
- responses:
- "200":
- description: OK
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/LoginResp'
- default:
- description: Default error response
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/Status'
- /customer/logout:
- get:
- tags:
- - Customer
- operationId: Customer_Logout
- responses:
- "200":
- description: OK
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/LogoutResp'
- default:
- description: Default error response
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/Status'
+paths: {}
components:
- schemas:
- GetVerifyCodeResp:
- type: object
- properties:
- code:
- type: integer
- format: int64
- message:
- type: string
- verifyCode:
- type: string
- verifyCodeTime:
- type: integer
- format: int64
- verifyCodeLife:
- type: integer
- format: int32
- GoogleProtobufAny:
- type: object
- properties:
- '@type':
- type: string
- description: The type of the serialized message.
- additionalProperties: true
- description: Contains an arbitrary serialized message along with a @type that describes the type of the serialized message.
- LoginReq:
- type: object
- properties:
- telephone:
- type: string
- verifyCode:
- type: string
- LoginResp:
- type: object
- properties:
- code:
- type: integer
- format: int64
- message:
- type: string
- token:
- type: string
- tokenCreateAt:
- type: integer
- format: int64
- tokenLife:
- type: integer
- format: int32
- LogoutResp:
- type: object
- properties:
- code:
- type: integer
- format: int64
- message:
- type: string
- Status:
- type: object
- properties:
- code:
- type: integer
- description: The status code, which should be an enum value of [google.rpc.Code][google.rpc.Code].
- format: int32
- message:
- type: string
- description: A developer-facing error message, which should be in English. Any user-facing error message should be localized and sent in the [google.rpc.Status.details][google.rpc.Status.details] field, or localized by the client.
- details:
- type: array
- items:
- $ref: '#/components/schemas/GoogleProtobufAny'
- description: A list of messages that carry the error details. There is a common set of message types for APIs to use.
- description: 'The `Status` type defines a logical error model that is suitable for different programming environments, including REST APIs and RPC APIs. It is used by [gRPC](https://github.com/grpc). Each `Status` message contains three pieces of data: error code, error message, and error details. You can find out more about this error model and how to work with it in the [API Design Guide](https://cloud.google.com/apis/design/errors).'
-tags:
- - name: Customer
+ schemas: {}
diff --git a/backend/valuation/api/valuation/valuation.proto b/backend/valuation/api/valuation/valuation.proto
index 86f0197..65b7af4 100644
--- a/backend/valuation/api/valuation/valuation.proto
+++ b/backend/valuation/api/valuation/valuation.proto
@@ -12,6 +12,7 @@ message GetEstimatePriceReq {
string origin = 1;
string destination = 2;
}
+
message GetEstimatePriceReply {
string origin = 1;
string destination = 2;
diff --git a/backend/valuation/cmd/valuation/wire_gen.go b/backend/valuation/cmd/valuation/wire_gen.go
index 2e54022..517204b 100644
--- a/backend/valuation/cmd/valuation/wire_gen.go
+++ b/backend/valuation/cmd/valuation/wire_gen.go
@@ -31,7 +31,8 @@ func wireApp(confServer *conf.Server, confData *conf.Data, logger log.Logger) (*
greeterRepo := data.NewGreeterRepo(dataData, logger)
greeterUsecase := biz.NewGreeterUsecase(greeterRepo, logger)
greeterService := service.NewGreeterService(greeterUsecase)
- valuationBiz := biz.NewValuationBiz()
+ priceRuleInterface := data.NewPriceRuleInterface(dataData)
+ valuationBiz := biz.NewValuationBiz(priceRuleInterface)
valuationService := service.NewValuationService(valuationBiz)
grpcServer := server.NewGRPCServer(confServer, greeterService, valuationService, logger)
httpServer := server.NewHTTPServer(confServer, greeterService, logger)
diff --git a/backend/valuation/configs/config.yaml b/backend/valuation/configs/config.yaml
index 2351da7..c791976 100644
--- a/backend/valuation/configs/config.yaml
+++ b/backend/valuation/configs/config.yaml
@@ -8,7 +8,7 @@ server:
data:
database:
driver: mysql
- source: root:root@tcp(127.0.0.1:3306)/test
+ source: root:mashibing@tcp(127.0.0.1:3306)/laomadj_valuation?charset=utf8mb4&parseTime=True&loc=Local
redis:
addr: 127.0.0.1:6379
read_timeout: 0.2s
diff --git a/backend/valuation/go.mod b/backend/valuation/go.mod
index 6869a8e..5971a6e 100644
--- a/backend/valuation/go.mod
+++ b/backend/valuation/go.mod
@@ -7,10 +7,13 @@ require (
github.com/go-kratos/kratos/v2 v2.6.1
github.com/google/uuid v1.3.0
github.com/google/wire v0.5.0
+ github.com/hashicorp/consul/api v1.19.1
go.uber.org/automaxprocs v1.5.1
google.golang.org/genproto v0.0.0-20220524023933-508584e28198
google.golang.org/grpc v1.46.2
google.golang.org/protobuf v1.28.0
+ gorm.io/driver/mysql v1.4.7
+ gorm.io/gorm v1.24.6
)
require (
@@ -21,10 +24,10 @@ require (
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-playground/form/v4 v4.2.0 // indirect
+ github.com/go-sql-driver/mysql v1.7.0 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/subcommands v1.0.1 // indirect
github.com/gorilla/mux v1.8.0 // indirect
- github.com/hashicorp/consul/api v1.19.1 // indirect
github.com/hashicorp/go-cleanhttp v0.5.1 // indirect
github.com/hashicorp/go-hclog v0.14.1 // indirect
github.com/hashicorp/go-immutable-radix v1.3.0 // indirect
@@ -32,6 +35,8 @@ require (
github.com/hashicorp/golang-lru v0.5.4 // indirect
github.com/hashicorp/serf v0.10.1 // indirect
github.com/imdario/mergo v0.3.12 // indirect
+ github.com/jinzhu/inflection v1.0.0 // indirect
+ github.com/jinzhu/now v1.1.5 // indirect
github.com/mattn/go-colorable v0.1.6 // indirect
github.com/mattn/go-isatty v0.0.12 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
diff --git a/backend/valuation/go.sum b/backend/valuation/go.sum
index 90f2023..80fd955 100644
--- a/backend/valuation/go.sum
+++ b/backend/valuation/go.sum
@@ -69,6 +69,8 @@ github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBY
github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
github.com/go-playground/form/v4 v4.2.0 h1:N1wh+Goz61e6w66vo8vJkQt+uwZSoLz50kZPJWR8eic=
github.com/go-playground/form/v4 v4.2.0/go.mod h1:q1a2BY+AQUUzhl6xA/6hBetay6dEIhMHjgvJiGo6K7U=
+github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc=
+github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
github.com/golang-jwt/jwt/v4 v4.4.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
@@ -158,6 +160,11 @@ github.com/hashicorp/serf v0.10.1 h1:Z1H2J60yRKvfDYAOZLd2MU0ND4AH/WDz7xYHDWQsIPY
github.com/hashicorp/serf v0.10.1/go.mod h1:yL2t6BqATOLGc5HF7qbFkTfXoPIY0WZdWHfEvMqbG+4=
github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU=
github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
+github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
+github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
+github.com/jinzhu/now v1.1.4/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
+github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
+github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
@@ -403,5 +410,10 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.0 h1:hjy8E9ON/egN1tAYqKb61G10WtihqetD4sz2H+8nIeA=
gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gorm.io/driver/mysql v1.4.7 h1:rY46lkCspzGHn7+IYsNpSfEv9tA+SU4SkkB+GFX125Y=
+gorm.io/driver/mysql v1.4.7/go.mod h1:SxzItlnT1cb6e1e4ZRpgJN2VYtcqJgqnHxWr4wsP8oc=
+gorm.io/gorm v1.23.8/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk=
+gorm.io/gorm v1.24.6 h1:wy98aq9oFEetsc4CAbKD2SoBCdMzsbSIvSUUFJuHi5s=
+gorm.io/gorm v1.24.6/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
diff --git a/backend/valuation/internal/biz/valuationBiz.go b/backend/valuation/internal/biz/valuation.go
similarity index 50%
rename from backend/valuation/internal/biz/valuationBiz.go
rename to backend/valuation/internal/biz/valuation.go
index 294bbc2..9e705b9 100644
--- a/backend/valuation/internal/biz/valuationBiz.go
+++ b/backend/valuation/internal/biz/valuation.go
@@ -5,14 +5,37 @@ import (
"github.com/go-kratos/kratos/contrib/registry/consul/v2"
"github.com/go-kratos/kratos/v2/transport/grpc"
"github.com/hashicorp/consul/api"
+ "gorm.io/gorm"
+ "strconv"
"valuation/api/mapService"
)
+type PriceRuleInterface interface {
+ GetRule(cityid uint, curr int) (*PriceRule, error)
+}
+
+type PriceRule struct {
+ gorm.Model
+ PriceRuleWork
+}
+
+type PriceRuleWork struct {
+ CityID uint
+ StartFee int64
+ DistanceFee int64
+ DurationFee int64
+ StartAt int
+ EndAt int
+}
+
type ValuationBiz struct {
+ pri PriceRuleInterface
}
-func NewValuationBiz() *ValuationBiz {
- return &ValuationBiz{}
+func NewValuationBiz(pri PriceRuleInterface) *ValuationBiz {
+ return &ValuationBiz{
+ pri: pri,
+ }
}
func (*ValuationBiz) GetDrivingInfo(ctx context.Context, origin, destination string) (distance string, duration string, err error) {
@@ -46,3 +69,25 @@ func (*ValuationBiz) GetDrivingInfo(ctx context.Context, origin, destination str
distance, duration = reply.Distance, reply.Duration
return
}
+
+func (vb *ValuationBiz) GetPrice(ctx context.Context, distance, duration string, cityId uint, curr int) (int64, error) {
+ rule, err := vb.pri.GetRule(cityId, curr)
+ if err != nil {
+ return 0, err
+ }
+ distancInt64, err := strconv.ParseInt(distance, 10, 64)
+ if err != nil {
+ return 0, err
+ }
+ durationInt64, err := strconv.ParseInt(duration, 10, 64)
+ if err != nil {
+ return 0, err
+ }
+ distancInt64 /= 1000
+ durationInt64 /= 60
+ var startDistance int64 = 5
+ total := rule.StartFee +
+ rule.DistanceFee*(distancInt64-startDistance) +
+ rule.DurationFee*durationInt64
+ return total, nil
+}
diff --git a/backend/valuation/internal/data/data.go b/backend/valuation/internal/data/data.go
index 0d587c7..b3f0fe8 100644
--- a/backend/valuation/internal/data/data.go
+++ b/backend/valuation/internal/data/data.go
@@ -1,6 +1,10 @@
package data
import (
+ "gorm.io/driver/mysql"
+ "gorm.io/gorm"
+ "gorm.io/gorm/clause"
+ "valuation/internal/biz"
"valuation/internal/conf"
"github.com/go-kratos/kratos/v2/log"
@@ -8,17 +12,69 @@ import (
)
// ProviderSet is data providers.
-var ProviderSet = wire.NewSet(NewData, NewGreeterRepo)
+var ProviderSet = wire.NewSet(NewData, NewGreeterRepo, NewPriceRuleInterface)
// Data .
type Data struct {
- // TODO wrapped database client
+ Mdb *gorm.DB
}
// NewData .
func NewData(c *conf.Data, logger log.Logger) (*Data, func(), error) {
+ data := &Data{}
+ //初始化mysql
+ dsn := c.Database.Source
+ db, err := gorm.Open(mysql.Open(dsn), &gorm.Config{})
+ if err != nil {
+ data.Mdb = nil
+ log.Fatal(err)
+ }
+ data.Mdb = db
+ //migrateTable(db)
cleanup := func() {
log.NewHelper(logger).Info("closing the data resources")
}
- return &Data{}, cleanup, nil
+ return data, cleanup, nil
+}
+
+func migrateTable(db *gorm.DB) {
+ if err := db.AutoMigrate(&biz.PriceRule{}); err != nil {
+ log.Info("price_rule table migrate error, err:", err)
+ }
+ rules := []biz.PriceRule{
+ {
+ Model: gorm.Model{ID: 1},
+ PriceRuleWork: biz.PriceRuleWork{
+ CityID: 1,
+ StartFee: 300,
+ DistanceFee: 35,
+ DurationFee: 10,
+ StartAt: 7,
+ EndAt: 23,
+ },
+ },
+ {
+ Model: gorm.Model{ID: 2},
+ PriceRuleWork: biz.PriceRuleWork{
+ CityID: 1,
+ StartFee: 350,
+ DistanceFee: 35,
+ DurationFee: 10,
+ StartAt: 23,
+ EndAt: 24,
+ },
+ },
+ {
+ Model: gorm.Model{ID: 3},
+ PriceRuleWork: biz.PriceRuleWork{
+ CityID: 1,
+ StartFee: 400,
+ DistanceFee: 35,
+ DurationFee: 10,
+ StartAt: 0,
+ EndAt: 7,
+ },
+ },
+ }
+ db.Clauses(clause.OnConflict{UpdateAll: true}).Create(rules)
}
diff --git a/backend/valuation/internal/data/valuation.go b/backend/valuation/internal/data/valuation.go
new file mode 100644
index 0000000..ea2b83f
--- /dev/null
+++ b/backend/valuation/internal/data/valuation.go
@@ -0,0 +1,20 @@
+package data
+
+import "valuation/internal/biz"
+
+type PriceRuleData struct {
+ data *Data
+}
+
+func NewPriceRuleInterface(data *Data) biz.PriceRuleInterface {
+ return &PriceRuleData{data: data}
+}
+
+func (prd *PriceRuleData) GetRule(cityid uint, curr int) (*biz.PriceRule, error) {
+ pr := &biz.PriceRule{}
+ result := prd.data.Mdb.Where("city_id=? AND start_at <= ? AND end_at > ?", cityid, curr, curr).First(pr)
+ if result.Error != nil {
+ return nil, result.Error
+ }
+ return pr, nil
+}
diff --git a/backend/valuation/internal/service/valuation.go b/backend/valuation/internal/service/valuation.go
index 15d0a62..88f0875 100644
--- a/backend/valuation/internal/service/valuation.go
+++ b/backend/valuation/internal/service/valuation.go
@@ -2,7 +2,6 @@ package service
import (
"context"
- "fmt"
"github.com/go-kratos/kratos/v2/errors"
"valuation/internal/biz"
@@ -25,6 +24,13 @@ func (s *ValuationService) GetEstimatePrice(ctx context.Context, req *pb.GetEsti
if err != nil {
return nil, errors.New(200, "MAP ERROR", "get driving info error")
}
- fmt.Println(distance, duration)
- return &pb.GetEstimatePriceReply{}, nil
+ price, err := s.vb.GetPrice(ctx, distance, duration, 1, 9)
+ if err != nil {
+ return nil, errors.New(200, "PRICE ERROR", "cal price error")
+ }
+ return &pb.GetEstimatePriceReply{
+ Origin: req.Origin,
+ Destination: req.Destination,
+ Price: price,
+ }, nil
}
diff --git a/data/redis/dump.rdb b/data/redis/dump.rdb
index b6cc01820ba738faf6ae4e9167dcc0114e843d4f..27b88fb8e3f0a50b83bead192ec2a580eb426ee3 100644
GIT binary patch
delta 86
zcmV-c0IC06fB}#&P=-zvWcmnob7f>LZDno3Fs=*$`V3)jW-V}XWnpb%Y-PXz{sH>|
s0sJecQ}2cW0000FLsmmNF*q|dH8D3cI5slE7cLC||9g6Z2ABFoZc3mYLI3~&
delta 50
zcmZo*jG17d!}(JvlIx)GQ?(>0Y5L<)gGj1FS{+%7@)Lz8bM_
z#!XEY0un-;Mj_K|F@7u%BpQwTOORzIOZJz>Y>EGwxHyc#WU3>%Nf`WgqQA+Q
z5(fdgRn4oUgfS}izbN(%^br%W5Rw>(pX!DuMu?Soh%u8Re|nbE-BxA*IG-NmiESJ;
z=?E#3f8yvK1>MQc^Z;B+8aSN8;c*MV<|WW+2t_j~w2?Q`=!fCn@Hrfuj^s
z93xM1)W}mvGQf@UQ4X8c%nryABwup4i05ETPdd|Yar9A+mP2e*+iy2Vn*oi>U+~yR
zv9ol-sH9O!`*sCrD08JzNwK)|hVI+uzKDqws
z_b_YTOmx|{jp!IB`s#g%eh6659yJ%Hp#kVPSB(M~g4InC`PbCD#}W1XZ%ZrNN9Cy1ngoUrCA?trvd
zKFvS^E9yt7f#8^Vf#F!xS2xW2oqrh@)0D0{n0Y@)Dv#Qje$FO;gK3>`NgMrGW8&k9
zi3=&*7PtBB!tXbsx`hy@8Q@o83vO^~cL<|?D&hGloe1^FNI;n(RG&8o&p-{b98gDG
zY%awS?)w1stK1c6KQ^@WWXf`qk5k@}W`9FajHuzaCnl~OqSEt(ybj4BS;_4)5dILg
zn(z^f>P*CZPqrA}`TSzligld&)eq~2sR-W>->0lwgcKNE{VtA*yKwE+R6Z@Hwy7iZ
zFx@jXNN=%U<;6BiXO9%&3JMWjmsWCMfgV?=hWKK>lg{KZS}^_9Bztbs?|cQTaIUNc
z7hu5A8#5nKk_xr3Pl+
z2d{YfPztxex6A!yWdMTput+gXNEfc3-KubUg)98Ejh`V#bNc}9io%(uaH=TWw(Tfhc+NcV^*dcqwReWFKbO$rsqMIj;dH#x#Cp-Sk9
z2Lmoo%~KE*58J&ML2kYL*?FN
zZ9?eljYfctwcYAAHm9IMH2r0VUHO%Fic{;CZ^nDZdQ!F4B>}>An5}e|eKLSh5
zTMJ1Z)T(A6i&97(c8ZL5pMLtUtqRE@DQNc1>9H{WQ!s2++0y8LCO4~6%F|zGv7HU|M_K-jPW@W&-rIu2VlyCgw6Dg)NwG=74N8tYJ
zuVpA1~oLJB1oUdnFZ$7?c>)Gn4Ub0@#^0bi$E7;akJ>pq|^?J5Cyh;p&_0qAP3TiKHAWt+
zkeo#Ii0?62ub1?SUN0+NFAM9X;E!wlTJ6&D?>qdE
zcJ`KbBA2nn&i}X5yLjH)8~ES53GW-P0-zaQZwBoZ0Pq&3OzkW=*`$CJkOERb3P=Gd
zAO)m=6p#W^Knh5KrCC7#?SS^WIkHIsDIf);fE17dQa}nw0VyB_q<|EV0#ZNnmQQnfP|0Q5^R+ux1}n5-$s@TT~;a`7l$
zy3}@d*z`j<@U;X?f%(6tYYNg);>Xf&wlpqHLHujFx!QfPIbQfU-f^2LgZ^HwNy`x1
zlH+NTF^zd-K8^WWI9HFd1k;$Wr8ExPceMwKDKK9KE5tTuyo?jeSPspXu^cf4muwl!
z5h|0cmobmbm%$3LEj3;y70X!foG)X2#C+|NEn|Iz$~g5hmP7MputIE0kC#cuGPZ~3
z%h;Z?99gnuY|l}dRK1M#&iOJ}A+{;;G76TlKRaK>{CFM}0g
zTUNYG7M5|Gm@k8mpy!rsnWR)Iqv&Pq&(4>@3bIK7DIf);fE17dQa}nw0VyB_q<|EV
z0#ZN&+(Z6#(#BQq-;_^3P=GdAO)m=6p#W^Knh3!DIf);z|t(B|8_uoF(uig
zfE17dQa}nw0VyB_q<|EV0#ZN=>qpw139l?=>!C4tK=f&($vRCS`bGj{R4S
zmjj?(;`=6R>|aM?mv|MvqyTQQe*kx6^N7+|C?d-ox)|SK+38B--MQuE+OHy3SwHZM3(h?Xk;P%lTXA|6;ehUb`-K
z&7VDHjTcs)S^YhoP
z-?0eRufHzD|Ik~zr-`4Bc>knDuzs7iHf>8>-~aS}eErFbVEy*k;{Uewr!0c?I~K5h
z=OS2t;_IvYwO_xkMX>(l1@uo{1nW;(!1~h`!TOyGSbzE=Sifrl>(5vO>rY+4`jthn
z{wgg7v!>(7$jItUrGN>n~me>n~Wq`YnrK{e=ryf6>Wb
zKdt_+`}%#yR`l}8T)XzM^_81S=pN|T&CC0}AOHPHsdk%_wZ+$8x`6e2PS)DBk4x*8
zw^Bd~NC7Dz1*Cu!kOERb3P=GdAO)m=6p#W^Knh3!DIf);fE17dQa}nw0VyB_q<|EV
z0#ZN_n2Q%!NvGu;&d=SVX>%?%J`$i
zrC@%=Qm#T8<2#6(z+$niR3V-5w~3pzmgiN-W;{Tg1D0=F{-8n*DC0GwyA5@``
zv5(jV)?2L4s!+suBk>2p`k?h~6^a?}Ax;JBv$jkXN*G^HJOI|WZ9WxB8Q({o0k%xr
zMio4ar-|2q&1c)ALK)-Ni8H~r(RRHG<%!&oLVP~h_So)Ip@MNOaTeIFw@s^1$#^aC
zX0Y97dtHSp#yf~}!8UDAQK6dgA>uQ^_PV`Rg&M|3h}~dMv9DEO8RN%^&jov}eTNFQ
zj9(_s2m4z4ArKJj{Re8llB71|j4i9O)B-SJBm+8LimdurB;_Zar$QIwXNbQ8N&ckER9MdVE#mJ&(s@ZYtI(au
z%?k0OkaStn11j_|ZYF*Vl5S3VMuioOHxNG#Ne?8wr9v;`-Na8o(lg153Vn>PBmN#F
zy_MXo!YPa=iN6oYO7aF3Rx*By_y>^OoV;6wRg7OF{vjl9NWM;mQxn;jO#CDy?@pdn
z;WWm}h@XPw>yn>R;dI7ph^HZWGWj(XRx{pC{4^v#m6EK&8pc->{|J&_OIfDETE=%1
z{}_KXr>s$79plG{e*!7XQnssb2IH5ABapHtraDLeNO%*mX?j-&g
zIB#?QLWOe~pG*94aDLPIdlk-Oe1P~9;QWQlt-=7~!^BsC^Y^Y!70zdTKk?Pza=Xq|
z;RB416CVOsr|W;ML
zp9a_cuBZwZG2TUdEx3-SW~gv6<8k6~a79y_R2XD@FY$GdnvuF*g)NMqB)%R}n^JeF
zu$A$v#5X|d`qXh1wk2|V67h|Yx-0cw6^0ns5QiXjJoQNxwliK${255SH}zE&b}$|y
zz6nyFOiNN>C*!M#4@2s!X*DVgGro)XW=Km)Tdl$+j2|Vw1=4ELhE%we@r%Ttg|yXa
zSE(?P$Q?lZIY=8yyGw;#j7y0tA?>QPM^)I(xR>}eNV_ZTMHTiizJRz2(jH9*74|Z|
zf_NRIy_jCALXh#T#MO`v>Afn9GJcr29@0zGFHm70movVJ
zxDL|iGCEZF5aVOS8z3VuW3vkX#5h8n1{ob0`&GDt@teeXkg+-ACKW!M$o_QV7RcD2
zaZH7eFm5Dng^ZgrA}V~8@ma)ekZ~*nzx=PflKBXE2V_JP{PBO~$Cw-606HNfs`$`9
z&fItcFa(OC1kgXhe438G9TcAuM8AspEcp&l0!j$|>O}8yk?#a0sD#lEG53-WgA!6A
z=+`jsC%*)guo6Z8B=ZsSOF@ZbD(IhLK2AOYN;K1l{%PiuXt-w8Rs
zoFMw$%xB3z4>^IH5c-isU*RJE0^|g9!sz!f_mbZQIiZ{g`WKn^liv+F;hZS?mza-`
zAAy`mu7dt$=Huk|Ku$E*hyE4jljL87TqQSvelPQB@-IQIFE@xj$$Xal%a9w$4WZwc
z=)ErTuRv}vH;jIixtIK2$PML2(7(#OpL`N>!?{uPuQ4AXzYlUFc?x=%`8fGe$c^Ut
z(2p^nB>yVpDR}|(`>ZgG>p4uwi#
z0R0)}e)3r;^c4otpJhHk{vS{nC=8+hl=&F>2`CH}hS7hQYxXPD2BN1-rMq@X{?e2)ArD2x{Q(0`HWRyXwfZ{}m<{{=cem`{-Z4vIoW5%ga(pCW$`io!)v^cR@V#2x<+$f8KG
zg8m}&IdT&eMT>ptFD1IoO>Tx_r8t28GIKw<1&V#eLG)Lc50G1-I8Yoy|5xT?k{Wr{K$djNrQlg;0%6yJI8H%GNKJ?cT-R>q&
zffA)8fc`pjKe-c1d?i8jS>^-eE+`3!b=y}Yi$Wx#qToFZgGoK-MLPexfLCHl)Dg)?+
z%>CpUQ0c1-q8BkAAkT!#KxGKMnE4oa7E}f+!{{Z6Wfa}R
ze1<$9DkD`2dKvRM@&c%gR{7A&6Ft>UUIbN2RRFz$xu3iQs(e*J^h)Lf-}4REN+Tn2(XSLUph@jNZt6g1iH&L)8)V
zCgxM*ey9#tN70*^&yaUPb)-f?_c5O%?}qAVjSsyg(bL`JJy4_61khWV`^o#D##a+W
zZ(}|{jsq5fnh<(B^D**^pe9%oM(Uu?1@DYH|Kee_B9%l=yV0T~~|qZ~C(W;-`tNP`k4h=il@v1;n$&
z8=>}^TAY8=pA*E{Y)lQ>q4u6yoPX1w5)d0xgKMGoi8`Er)1MI#8&iW0sC}gl=il@v
z1jNSF;2BV7sl)j<{rLc~F*Rs|y7D@lf77215F1m2Nl>@44(H$WX9L8>)L=T)U0jFr
zZ~Bt~VqsADU^CQxyAJ2yGGfmZh>fX1
zAJjcxkMnN|V`FOYLa6&gJUiO4%83S
zZ-gY`K7=4Nb64W144&w6qG
zEuZlKJ=UC1|F+jhqj~XaR%2>#C3rKvIR942_BN&lUEuY3asI7{u`xCHLGW($;{01N
zV`FMC6})@AIR93{*q9m|0Ppo)oPR4#WScQHm;v7Vyg2{nVeF$jwg$Y@4LJW+#&{!f
zCU{?O!1=dw#(Rj*hlZ2}oPVoed_8d%G}JcW{97gC`-nF~!`cR%f2(3VO`Ho2I~s8Q
zt(vhhHFzd89BRP%x0*z@8&iXBXgJb<^KZ)-8&iYlLc`;YIR945*q9p3hlZCMasI82
zu`xBc8XC=wIR949*q9nDfX1>$oPYB&Hl_y4q4AVPoPTRzY)lP$q4A@}tsloNol;4E&Z*7c?sX-4k`I~V5t(~zkHFyd%o!5l(Zyk({slhU6x~vK3
z-#Qr^Q-l4`baNBVzxfjx$MNDn<2FIl15G&p*2UOQ{2gd|rdgrUy!h8Qj^oAm{w_4V
z)r|9R-E41TYVc8LR+@4Ct%tEOHTW1bH#g(_+X}|U)ZpXLyrCKA-+CDvQ-e=H^X_Jx
zf9qpxObvbyny+id`L|ONIa#5Ve;=ABn{obaCF5q|A3*a{KAeAB#drhp525)rAI`s>
z%6K>NllU<5;r!cajISep3Vh3aIRAD!W8?ocnFik)AI`t6W^7CiJ`KL@KAeAB!`PS_
z{1N!B_Tl{7+C)w`L_ULV`}i%(DKa|oPRr;u`xAR0WH61#rd~QjE$+m4?xTB
zTXFvF9LC1f;FZwoZpHbx&5Vty!H+>}XDiOXoy*vm8vHo4p4*D^Z|5;KrUpL&tp{3h
z{%wGtB7`M2{EdH#Q(Uk$DIx8nZ*_yA*LYVZ)W9&f|>w+}KlrUtKp)@U2f
zzp0FksliV|TSgnszg@uCm>T>Pv^BNi{M&_$jj6#;L)-c`oPWEBu`xAxEwt@w!}+(1
z8As`BY#iFg+i?DEFp*O;h_8dTd)sjSZ42Wj;_IR9$#$H7+sb%7@eR=SYCF!qZDYKP
z_(o_?YRCDvA;#mxA!x5@$N9JIjE$+m&p`X?cAS6P!PuA@yb0Qe+HwAECu3u3@G!Jr
z)sFLT!-_Pr8q9;vH~oz?nn!F*4Yq(k
z-G3I1<`ElHgRS6i^pDVJ9d{O#bM?sB1D#XLa11N^gHUi7P(2g!Frm#eEE{SfmI
z`7m^OyGGEjVIC&G1iJdW#?e2?JVJgcbd7XPqJN5clzarb#=EA`Kb`2A3i&SRn(UfI
zzm~a=d^dDWFL$AjGY^pOfv(x*Ui9mj2g&!sa@X>H^y`_2$b+!lyL<%w2IgV%QCQx;
zd>s8o<`MFJuzY0sBzlN>lzcxdA74I={+UG2QpgX$^2z11=r=LwEBaTAqkoBcg!~As7+Eoi{$=J-@_S&#_=;)tuOxb|LjFZqF}Y$E{a)ri@-M-P
z>0TH5B=Z3Imtn+Kyu|0?q^`6TrA_l~1~jd_Ip
zKIk3kokR~akCGpS-tpdP^ka#hr;vXYdMA5l(eG#OBmWxoPWQRcA7CCJ4@2*4pBMc>
z=0Wmf(C6ywM}LTUi2Q!&^Y)FPf1P=l`~m3e?;A&-VjdxX5c)>?CegpaJWBo$^o{pT
zqd%PJZiW2o&^M|5%Kk6iwDbP8^Zd`x$zK4Hclv;6p#W^
zKnh3!DIf);fE17dQa}nw0VyB_q<|EV0#ZN4lGJT};Nyl$o^*u`M~CMtdPY^T>P}^R-L(^_R`pQW}TjQSE^;
z|N6^jtwL;b#>;3gaBMj=U&eC86l4!T{pL&K(t@x5sy}Fw^)luWdSMT=E4
zS?`=LV|~PY?UF5HeT2$5^)eRY0BElhV}EwOjQwrvBTKf79bf-iFO#m9u^BJFXVxmjHvLa{0Ayhq
z$BFqe_y~G#$(Bh8`$o&RsAYw%>q6Zqe|3GW-P0-zaQZ#Esn
z)4A~&ref{XN!g@;6p#W^Knh3!DIf);fE17dQa}nwfu&hM|LuVGVoI_}0VyB_q<|EV
z0#ZNFn-{Qt`^j3n_HpCuPyGBCug9R7ew+DQ
zCcYo<@6fJ0SzCPl#v@K!2d(-qTz}HZTD!hhZI#-qUFh52u>Rylu>Qo?_xNl3r!0c?
zI~LI2xd_&8oGJA;Jbqk@VExGp=%2a>)}OL~^`|X@^*a}^{`5t#e%AulpRowmpSpnc
zD~n+LX$x3?<|0^s`U2LUwFuUqv4HhwFM{PC{tUrGdtUq@F>n~UY>vu0;{e_EQ{rL-6|4Dt7MSb0-f(5MKvIzPYE@1sd
zi(vhp1+2dWe}7SSvhIVvZWFFS-?Vl7mB0TfJy~nl*Q%}CR2pCY`~JR7yN$k&ei{G$
zo9E=OpH?q#rGONW0#ZNr=5PP=e(hP`#q;07~QjXXmB@zNwMMH9_WkT
zD0V`6d~c_F>t26*Gs$TiHvRGL85Vrigk{hZzftUbYTDhub1!{t``V3vyl;;7p_}2<
z_`b1onQ7mFOZN=>M@i1yu+HCbw&(1jk*#}ndCoqtZ{M)K`fNKM!fzZRb~-T~Vr*n^
z|L|^K{1{1F_xf7eTmERqJ?PPrVSpyzrCxW#dGS=?){_q
zc}Ps@vSN$1&=tRV?A%&9($v0#L!AVjTZZ?0HXR(=HoR{qUS~?uLTrSNxW`Uvr5$Gm
z_iY^>CfU5nvvSj^>(*&|rE8z}0V93vR8rb&?!YC(`{FyfPTzcL!xoyAAH`*#j)867%E
zWHj@8))JVUTJycIJbt6tS!lHX!2aQV9WC^z%RFb@CVbCx&dxzCf+n6F;s?!*J=`{XHeWhA
zIJ`UlNXysm@+a}rt8cLrZ)oqS9a~yjee^JKuUVzN=h-y8YwyVL_TiyziC?X;RorN-
zB6b1{9cO08=+Mxm@sE&ilFnVeHF`t=)OZb}cmFr1d!oc9@F6~iI-#t7l&pu0g)HnD&D@S(?(WfL;dk{|<
zkD{`~LyR5Rznyk3+kDPy+;#Kr;jMeNY2Pv}u|2{*ex=fr`n`{+|yvH8?Z_{BcI
zr`c)4`~3ssYrHaX&nf(N*+E~#mD;ztz5PJa8x64}N0px4-tQs8IKfD!hY|79MFlT%VYfU`BSnNxIzV){n
zUkaCx4v&oJyQg7AJOKURihbIs!2~{deDsOz&>lU$j)Vt+HN#=Dnv#rff3e3I?K>6Q
zcZ5C%etqx$(-Zek!=;-tV1>41++sg4X#bhm(&>YD(b89r4sMArT-(`g>>T?}NITEP
zcBXLMwDWwl*uC}`_d0g(<2$FjapkS_dF#>E-J1B&x8~rNylEMnrY~9#Py70}4DTKs
zy_{%O>^;xkeM1Mf?eT2gIXJp+Xg{I}%YmucD5q*W&@l#f4DH#se;a+(s%uW)u<4xB
z{GK&Kdq#KAcVX?b<~P3oU6i;#e$u;)^ea@=WEM21+*Wd+BT?N
z&@v|Qr^qFHchOJJ!Oib;AWNxsptZ0;I{Q9LNj+KQ0h>
delta 40
jcmZo@U~On%ogm7*W0}lGiKq5p`k=Y}#tRxqIFK0tPJ|H*
diff --git a/volumes/mysql/data/#innodb_temp/temp_10.ibt b/volumes/mysql/data/#innodb_temp/temp_10.ibt
index ea64fb3f0c1ee85fdb904aac0e3a405aa618e5f9..acfe8bae44d05bd237f094e4f5a41e5adbe256d4 100644
GIT binary patch
delta 40
jcmZo@U~On%ogm7*#nyhK#8Z1PebC%~;{^>Q9LNj+KQ0h>
delta 40
jcmZo@U~On%ogm7*W0}lGiKq5p`k=Y}#tRxqIFK0tPJ|H*
diff --git a/volumes/mysql/data/#innodb_temp/temp_2.ibt b/volumes/mysql/data/#innodb_temp/temp_2.ibt
index ae53e5ae5a3176aeed7e594a0f91983457ee35b6..724981c62fc6e3557b243be6e477fe927e5805bc 100644
GIT binary patch
delta 40
jcmZo@U~On%ogm7*#nyhK#8Z1PebC%~;{^>Q9LNj+KQ0h>
delta 40
jcmZo@U~On%ogm7*W0}lGiKq5p`k=Y}#tRxqIFK0tPJ|H*
diff --git a/volumes/mysql/data/#innodb_temp/temp_3.ibt b/volumes/mysql/data/#innodb_temp/temp_3.ibt
index 62c2bc0701c67e1be286e2c87df2887d9ded08e8..01cc673b862dac5d6502987f3ffe19f712a521f2 100644
GIT binary patch
delta 40
jcmZo@U~On%ogm7*#nyhK#8Z1PebC%~;{^>Q9LNj+KQ0h>
delta 40
jcmZo@U~On%ogm7*W0}lGiKq5p`k=Y}#tRxqIFK0tPJ|H*
diff --git a/volumes/mysql/data/#innodb_temp/temp_4.ibt b/volumes/mysql/data/#innodb_temp/temp_4.ibt
index a1c450d7ed823b6c46e8ed46291e38a06775a0f0..5200c4934b448c4e46334549233c57833d26efc1 100644
GIT binary patch
delta 40
jcmZo@U~On%ogm7*#nyhK#8Z1PebC%~;{^>Q9LNj+KQ0h>
delta 40
jcmZo@U~On%ogm7*W0}lGiKq5p`k=Y}#tRxqIFK0tPJ|H*
diff --git a/volumes/mysql/data/#innodb_temp/temp_5.ibt b/volumes/mysql/data/#innodb_temp/temp_5.ibt
index 53316b0a9689b4dca99a33b6ef180c05709ac550..50aa157d7c530c5371ad7c1156d7fc4b4f058ac2 100644
GIT binary patch
delta 40
jcmZo@U~On%ogm7*#nyhK#8Z1PebC%~;{^>Q9LNj+KQ0h>
delta 40
jcmZo@U~On%ogm7*W0}lGiKq5p`k=Y}#tRxqIFK0tPJ|H*
diff --git a/volumes/mysql/data/#innodb_temp/temp_6.ibt b/volumes/mysql/data/#innodb_temp/temp_6.ibt
index e473e9ad8659f7c849a7068f0a556b6b478b4594..70875be7afd002633354bd86ca9b73acc4117c0a 100644
GIT binary patch
delta 40
jcmZo@U~On%ogm7*#nyhK#8Z1PebC%~;{^>Q9LNj+KQ0h>
delta 40
jcmZo@U~On%ogm7*W0}lGiKq5p`k=Y}#tRxqIFK0tPJ|H*
diff --git a/volumes/mysql/data/#innodb_temp/temp_7.ibt b/volumes/mysql/data/#innodb_temp/temp_7.ibt
index 27edd192e78a757b3b52c64c9df8a978241d2aa6..800306805349ff0b1051a87fe2c1b7c09ca69ab9 100644
GIT binary patch
delta 40
jcmZo@U~On%ogm7*#nyhK#8Z1PebC%~;{^>Q9LNj+KQ0h>
delta 40
jcmZo@U~On%ogm7*W0}lGiKq5p`k=Y}#tRxqIFK0tPJ|H*
diff --git a/volumes/mysql/data/#innodb_temp/temp_8.ibt b/volumes/mysql/data/#innodb_temp/temp_8.ibt
index b49f80fd9602906e473b0f7798a9fbc641462319..984ee8f287e495a2a0e4f33875d3cbbcccbede95 100644
GIT binary patch
delta 40
jcmZo@U~On%ogm7*#nyhK#8Z1PebC%~;{^>Q9LNj+KQ0h>
delta 40
jcmZo@U~On%ogm7*W0}lGiKq5p`k=Y}#tRxqIFK0tPJ|H*
diff --git a/volumes/mysql/data/#innodb_temp/temp_9.ibt b/volumes/mysql/data/#innodb_temp/temp_9.ibt
index db0ad55b9a8830d665349fb7dbb638172f3055d3..71ff8b5532e36c87dbd2d0b3542e277bb7aa7f1c 100644
GIT binary patch
delta 40
jcmZo@U~On%ogm7*#nyhK#8Z1PebC%~;{^>Q9LNj+KQ0h>
delta 40
jcmZo@U~On%ogm7*W0}lGiKq5p`k=Y}#tRxqIFK0tPJ|H*
diff --git a/volumes/mysql/data/auto.cnf b/volumes/mysql/data/auto.cnf
index c6755d7..9735883 100644
--- a/volumes/mysql/data/auto.cnf
+++ b/volumes/mysql/data/auto.cnf
@@ -1,2 +1,2 @@
[auto]
-server-uuid=225758bb-c26c-11ed-956d-0242ac140002
+server-uuid=f4a10ff5-c46e-11ed-bfdb-0242ac120004
diff --git a/volumes/mysql/data/binlog.000001 b/volumes/mysql/data/binlog.000001
index bbc8fd9d2634627078e38beb43bd622f5300ae31..6501987ad93007d3e06e880b8440127c10de77fb 100644
GIT binary patch
delta 215050
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