Browse Source

Merge branch 'groupmealmanage' of http://10.2.1.24:10244/zhaoy/BPA.NewKitChen.Manage into groupmealmanage

groupmealmanage
zhaoy 9 months ago
parent
commit
d37271d23f
2 changed files with 5 additions and 7 deletions
  1. +1
    -3
      BPA.SAAS.Manage.Web.Entry/appsettings.json
  2. +4
    -4
      Jenkinsfile

+ 1
- 3
BPA.SAAS.Manage.Web.Entry/appsettings.json View File

@@ -36,7 +36,5 @@
"UserName": "emqx_u_block", "UserName": "emqx_u_block",
"Password": "emqx_p_admin8765490789" "Password": "emqx_p_admin8765490789"
}, },
"baseurl": "http://192.168.1.16:5002/",
"order_url": "http://order",
"wechat_url": "http://wechat"
"baseurl": "http://192.168.1.16:5002/"//团餐服务
} }

+ 4
- 4
Jenkinsfile View File

@@ -112,10 +112,10 @@ pipeline{
// input "确认要部署线上环境吗?" // input "确认要部署线上环境吗?"
// } // }
sh "sed -i 's/<BUILD_TAG>/${build_tag}/' k8s_saasbase.yaml"
sh "sed -i 's/<BRANCH_NAME>/${env.BRANCH_NAME}/' k8s_saasbase.yaml"
sh "sed -i 's/<NAMESPACES>/${params.environment}/' k8s_saasbase.yaml"
sh "kubectl apply -f k8s_saasbase.yaml --record"
// sh "sed -i 's/<BUILD_TAG>/${build_tag}/' k8s_saasbase.yaml"
// sh "sed -i 's/<BRANCH_NAME>/${env.BRANCH_NAME}/' k8s_saasbase.yaml"
// sh "sed -i 's/<NAMESPACES>/${params.environment}/' k8s_saasbase.yaml"
// sh "kubectl apply -f k8s_saasbase.yaml --record"






Loading…
Cancel
Save