mmm-go / partnermg · 提交

转到一个项目

作者 tangxvhui
提交 164959b4ee88fc29b19f074ed3ec01119728e7b8 1 个父辈 29098f16

更新配置

内嵌 并排对比
正在显示 5 个修改的文件 包含 36 行增加 和 31 行删除
1 #!/bin/bash 1 #!/bin/bash
2 export PATH=/root/local/bin:$PATH 2 export PATH=/root/local/bin:$PATH
3 -kubectl -n mmm-suplus-test get pods | grep -q partner 3 +kubectl -n mmm-suplus-test get pods | grep -q mmm-partnermg
4 if [ "$?" == "1" ];then 4 if [ "$?" == "1" ];then
5 - kubectl create -f /tmp/test/partner/partner.yaml --record  
6 - kubectl -n mmm-suplus-test get svc | grep -q partner 5 + kubectl create -f /tmp/test/partnermg/partner.yaml --record
  6 + kubectl -n mmm-suplus-test get svc | grep -q mmm-partnermg
7 if [ "$?" == "0" ];then 7 if [ "$?" == "0" ];then
8 echo "partner service install success!" 8 echo "partner service install success!"
9 else 9 else
10 echo "partner service install fail!" 10 echo "partner service install fail!"
11 fi 11 fi
12 - kubectl -n mmm-suplus-test get pods | grep -q partner 12 + kubectl -n mmm-suplus-test get pods | grep -q mmm-partnermg
13 if [ "$?" == "0" ];then 13 if [ "$?" == "0" ];then
14 echo "partner deployment install success!" 14 echo "partner deployment install success!"
15 else 15 else
16 echo "partner deployment install fail!" 16 echo "partner deployment install fail!"
17 fi 17 fi
18 else 18 else
19 - kubectl delete -f /tmp/test/partner/partner.yaml  
20 - kubectl -n mmm-suplus-test get svc | grep -q partner 19 + kubectl delete -f /tmp/test/partnermg/partner.yaml
  20 + kubectl -n mmm-suplus-test get svc | grep -q mmm-partnermg
21 while [ "$?" == "0" ] 21 while [ "$?" == "0" ]
22 do 22 do
23 - kubectl -n mmm-suplus-test get svc | grep -q partner 23 + kubectl -n mmm-suplus-test get svc | grep -q pammm-partnermg
24 done 24 done
25 - kubectl -n mmm-suplus-test get pods | grep -q partner 25 + kubectl -n mmm-suplus-test get pods | grep -q mmm-partnermg
26 while [ "$?" == "0" ] 26 while [ "$?" == "0" ]
27 do 27 do
28 - kubectl -n mmm-suplus-test get pods | grep -q partner 28 + kubectl -n mmm-suplus-test get pods | grep -q mmm-partnermg
29 done 29 done
30 - kubectl create -f /tmp/test/partner/partner.yaml --record  
31 - kubectl -n mmm-suplus-test get svc | grep -q partner 30 + kubectl create -f /tmp/test/partnermg/partner.yaml --record
  31 + kubectl -n mmm-suplus-test get svc | grep -q mmm-partnermg
32 if [ "$?" == "0" ];then 32 if [ "$?" == "0" ];then
33 echo "partner service update success!" 33 echo "partner service update success!"
34 else 34 else
35 echo "partner service update fail!" 35 echo "partner service update fail!"
36 fi 36 fi
37 - kubectl -n mmm-suplus-test get pods | grep -q partner 37 + kubectl -n mmm-suplus-test get pods | grep -q mmm-partnermg
38 if [ "$?" == "0" ];then 38 if [ "$?" == "0" ];then
39 echo "partner deployment update success!" 39 echo "partner deployment update success!"
40 else 40 else
1 apiVersion: v1 1 apiVersion: v1
2 kind: Service 2 kind: Service
3 metadata: 3 metadata:
4 - name: partner 4 + name: mmm-partnermg
5 namespace: mmm-suplus-test 5 namespace: mmm-suplus-test
6 labels: 6 labels:
7 - k8s-app: partner 7 + k8s-app: mmm-partnermg
8 spec: 8 spec:
9 ports: 9 ports:
10 - name: "http" 10 - name: "http"
11 port: 80 11 port: 80
12 targetPort: 8082 12 targetPort: 8082
13 selector: 13 selector:
14 - k8s-app: partner 14 + k8s-app: mmm-partnermg
15 --- 15 ---
16 apiVersion: extensions/v1beta1 16 apiVersion: extensions/v1beta1
17 kind: Deployment 17 kind: Deployment
18 metadata: 18 metadata:
19 - name: partner 19 + name: mmm-partnermg
20 namespace: mmm-suplus-test 20 namespace: mmm-suplus-test
21 labels: 21 labels:
22 - k8s-app: partner 22 + k8s-app: mmm-partnermg
23 spec: 23 spec:
24 replicas: 1 24 replicas: 1
25 template: 25 template:
26 metadata: 26 metadata:
27 labels: 27 labels:
28 - k8s-app: partner 28 + k8s-app: mmm-partnermg
29 spec: 29 spec:
30 affinity: 30 affinity:
31 nodeAffinity: 31 nodeAffinity:
@@ -43,8 +43,8 @@ spec: @@ -43,8 +43,8 @@ spec:
43 - cn-hangzhou.i-bp1euf5u1ph9kbhtndhb 43 - cn-hangzhou.i-bp1euf5u1ph9kbhtndhb
44 - cn-hangzhou.i-bp1hyp5oips9cdwxxgxy 44 - cn-hangzhou.i-bp1hyp5oips9cdwxxgxy
45 containers: 45 containers:
46 - - name: partner  
47 - image: 192.168.0.243:5000/mmm/partner:test 46 + - name: mmm-partnermg
  47 + image: 192.168.0.243:5000/mmm/partnermg:test
48 imagePullPolicy: Always 48 imagePullPolicy: Always
49 ports: 49 ports:
50 - containerPort: 8082 50 - containerPort: 8082
@@ -64,14 +64,6 @@ spec: @@ -64,14 +64,6 @@ spec:
64 value: "15432" 64 value: "15432"
65 - name: LOG_LEVEL 65 - name: LOG_LEVEL
66 value: "debug" 66 value: "debug"
67 - - name: ERROR_BASE_CODE  
68 - value: "1"  
69 - - name: ERROR_BASE_CODE_MULTIPLE  
70 - value: "1000"  
71 - - name: ABILITY_SERVICE_HOST  
72 - value: "https://suplus-worth-app-gateway-test.fjmaimaimai.com"  
73 - - name: MMM_OPEN_API_SERVICE_HOST  
74 - value: "http://mmm-open-api-test.fjmaimaimai.com"  
75 volumes: 67 volumes:
76 - name: accesslogs 68 - name: accesslogs
77 - emptyDir: {}  
  69 + emptyDir: {}
@@ -51,8 +51,14 @@ func (command CreateOrderCommand) ValidateCommand() error { @@ -51,8 +51,14 @@ func (command CreateOrderCommand) ValidateCommand() error {
51 if len(command.OrderRegion) == 0 { 51 if len(command.OrderRegion) == 0 {
52 return lib.ThrowError(lib.ARG_ERROR, "订单区域必填") 52 return lib.ThrowError(lib.ARG_ERROR, "订单区域必填")
53 } 53 }
54 - if !(command.OrderType == domain.OrderReal || command.OrderType == domain.OrderIntention) { 54 + if !(command.OrderType == domain.OrderReal ||
  55 + command.OrderType == domain.OrderIntention) {
55 return lib.ThrowError(lib.ARG_ERROR, "订单类型错误") 56 return lib.ThrowError(lib.ARG_ERROR, "订单类型错误")
56 } 57 }
  58 + if !(command.OrderStatus == domain.OrderStatusDeliverSome ||
  59 + command.OrderStatus == domain.OrderStatusDeliverAll ||
  60 + command.OrderStatus == domain.OrderStatusReserve) {
  61 + return lib.ThrowError(lib.ARG_ERROR, "订单状态设置错误")
  62 + }
57 return nil 63 return nil
58 } 64 }
@@ -48,7 +48,8 @@ func (command UpdateOrderRealCommand) ValidateCommand() error { @@ -48,7 +48,8 @@ func (command UpdateOrderRealCommand) ValidateCommand() error {
48 if len(command.OrderRegion) == 0 { 48 if len(command.OrderRegion) == 0 {
49 return lib.ThrowError(lib.ARG_ERROR, "订单区域必填") 49 return lib.ThrowError(lib.ARG_ERROR, "订单区域必填")
50 } 50 }
51 - if !(command.OrderStatus == domain.OrderStatusDeliverSome || command.OrderStatus == domain.OrderStatusDeliverAll) { 51 + if !(command.OrderStatus == domain.OrderStatusDeliverSome ||
  52 + command.OrderStatus == domain.OrderStatusDeliverAll) {
52 return lib.ThrowError(lib.ARG_ERROR, "订单状态设置错误") 53 return lib.ThrowError(lib.ARG_ERROR, "订单状态设置错误")
53 } 54 }
54 return nil 55 return nil
@@ -4,6 +4,8 @@ import ( @@ -4,6 +4,8 @@ import (
4 "errors" 4 "errors"
5 "strconv" 5 "strconv"
6 6
  7 + "gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/lib"
  8 +
7 "github.com/astaxie/beego/logs" 9 "github.com/astaxie/beego/logs"
8 orderCmd "gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/application/order/command" 10 orderCmd "gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/application/order/command"
9 orderQuery "gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/application/order/query" 11 orderQuery "gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/application/order/query"
@@ -436,6 +438,10 @@ func (c *OrderController) UpdateOrderReal() { @@ -436,6 +438,10 @@ func (c *OrderController) UpdateOrderReal() {
436 //addOrderReal 添加实发订单 438 //addOrderReal 添加实发订单
437 func (c *OrderController) addOrderReal(param orderDetail) error { 439 func (c *OrderController) addOrderReal(param orderDetail) error {
438 orderSrv := orderService.NewOrderService(nil) 440 orderSrv := orderService.NewOrderService(nil)
  441 + if !(param.OrderStatue == domain.OrderStatusDeliverAll ||
  442 + param.OrderStatue == domain.OrderStatusDeliverSome) {
  443 + return lib.ThrowError(lib.ARG_ERROR, "订单状态错误")
  444 + }
439 Createcmd := orderCmd.CreateOrderCommand{ 445 Createcmd := orderCmd.CreateOrderCommand{
440 //订单区域 446 //订单区域
441 OrderRegion: param.OrderDist, 447 OrderRegion: param.OrderDist,