Merge remote-tracking branch 'origin/feat-publish-service' into feat-…

…feed-service # Conflicts: # constant/biz/response.go
Toktik-Team · Feb 10, 2023 · 950c5bc · 950c5bc
2 parents 5f35ade + cb4b704
commit 950c5bc
Show file tree

Hide file tree

Showing 15 changed files with 202 additions and 486 deletions.
diff --git a/constant/biz/publish.go b/constant/biz/publish.go
@@ -0,0 +1,10 @@
+package biz
+
+const (
+	InvalidContentType     = 400001
+	Unable2GenerateUUID    = 500001
+	Unable2CreateThumbnail = 500002
+	Unable2UploadVideo     = 500003
+	Unable2UploadCover     = 500004
+	Unable2CreateDBEntry   = 500005
+)
diff --git a/constant/biz/response.go b/constant/biz/response.go
@@ -7,7 +7,6 @@ const (
 var (
 	OkStatusMsg = "OK"
 
-	BadRequestStatusMsg = "Unable to finish request, please check your parameters. If you think this is a bug, please contact us."
-
-	InternalErrorMsg = "Internal error occurred, please contact us."
+	BadRequestStatusMsg          = "Unable to finish request, please check your parameters. If you think this is a bug, please contact us."
+	InternalServerErrorStatusMsg = "The server had an error while processing your request. Sorry about that!"
 )
diff --git a/constant/config/service.go b/constant/config/service.go
@@ -6,7 +6,7 @@ const WebServiceAddr = ":40126"
 const AuthServiceName = "toktik-auth-api"
 const AuthServiceAddr = ":40127"
 
-const PublishServiceName = "toktik-publish"
+const PublishServiceName = "toktik-publish-api"
 const PublishServiceAddr = ":40128"
 
 const FeedServiceName = "toktik-feed-api"

diff --git a/idl/publish.proto b/idl/publish.proto
@@ -3,14 +3,14 @@ package douyin.publish;
 option go_package = "douyin/publish";
 
 message CreateVideoRequest {
-  uint32 userId = 1;
-  bytes data = 2;
-  string title = 3;
+  uint32 userId = 1 [json_name = "user_id"]; // 用户id
+  bytes data = 2; // 视频数据
+  string title = 3; // 视频标题
 }
 
 message CreateVideoResponse {
-  uint32 status_code = 1; // 状态码，0-成功，其他值-失败
-  string status_msg = 2; // 返回状态描述
+  uint32 status_code = 1 [json_name = "status_code"]; // 状态码，0-成功，其他值-失败
+  string status_msg = 2 [json_name = "status_msg"]; // 返回状态描述
 }
 
 service PublishService {

diff --git a/manifests-dev/deployment-toktik-http-api.yaml b/manifests-dev/deployment-toktik-http-api.yaml
@@ -0,0 +1,48 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  annotations:
+    sidecar.jaegertracing.io/inject: 'true'
+  labels:
+    app: toktik-http-api
+  name: toktik-http-api
+  namespace: toktik-service-bundle
+spec:
+  selector:
+    matchLabels:
+      name: toktik-http-api
+  template:
+    metadata:
+      labels:
+        app: toktik-http-api
+        branch: dev
+        version: ${BUILD_NUMBER}-${CI_COMMIT_ID}
+        name: toktik-http-api
+        dream-app: toktik-http-api
+        dream-unit: toktik-http-api
+    spec:
+      imagePullSecrets:
+        - name: regcred
+      containers:
+        - image: ${IMAGE}
+          imagePullPolicy: IfNotPresent
+          name: toktik-http-api
+          command:
+            - bin/web
+          envFrom:
+            - configMapRef:
+                name: env-config
+            - configMapRef:
+                name: config
+          ports:
+            - name: http-40126
+              containerPort: 40126
+              protocol: TCP
+          resources:
+            limits:
+              cpu: 500m
+              memory: 256Mi
+            requests:
+              cpu: 100m
+              memory: 8Mi
+      terminationGracePeriodSeconds: 30
diff --git a/manifests-dev/deployment-toktik-publish-api.yaml b/manifests-dev/deployment-toktik-publish-api.yaml
@@ -0,0 +1,50 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  annotations:
+    sidecar.jaegertracing.io/inject: 'true'
+  labels:
+    app: toktik-publish-api
+  name: toktik-publish-api
+  namespace: toktik-service-bundle
+spec:
+  selector:
+    matchLabels:
+      name: toktik-publish-api
+  template:
+    metadata:
+      labels:
+        app: toktik-publish-api
+        branch: dev
+        version: ${BUILD_NUMBER}-${CI_COMMIT_ID}
+        name: toktik-publish-api
+        dream-app: toktik-publish-api
+        dream-unit: toktik-publish-api
+    spec:
+      imagePullSecrets:
+        - name: regcred
+      containers:
+        - image: ${IMAGE}
+          imagePullPolicy: IfNotPresent
+          name: toktik-publish-api
+          command:
+            - /bin/bash
+          args:
+            - bootstrap-publish.sh
+          envFrom:
+            - configMapRef:
+                name: env-config
+            - configMapRef:
+                name: config
+          ports:
+            - name: grpc-40128
+              containerPort: 40128
+              protocol: TCP
+          resources:
+            limits:
+              cpu: 500m
+              memory: 256Mi
+            requests:
+              cpu: 100m
+              memory: 8Mi
+      terminationGracePeriodSeconds: 30
diff --git a/manifests-dev/service-toktik-http-api.yaml b/manifests-dev/service-toktik-http-api.yaml
@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app: toktik-http-api
+  name: toktik-http-api
+  namespace: toktik-service-bundle
+spec:
+  ports:
+    - name: http
+      port: 40126
+      protocol: TCP
+      targetPort: 40126
+  selector:
+    name: toktik-http-api
+    branch: dev
+  type: ClusterIP
diff --git a/manifests-dev/service-toktik-publish-api.yaml b/manifests-dev/service-toktik-publish-api.yaml
@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app: toktik-publish-api
+  name: toktik-publish-api
+  namespace: toktik-service-bundle
+spec:
+  ports:
+    - name: grpc
+      port: 40128
+      protocol: TCP
+      targetPort: 40128
+  selector:
+    name: toktik-publish-api
+    branch: dev
+  type: ClusterIP
diff --git a/repo/gen.go b/repo/gen.go