Explorar o código

refactor: 修改缓存的定义,即是否使用上一次的image。

fanyanpeng %!s(int64=2) %!d(string=hai) anos
pai
achega
6e640cc965
Modificáronse 2 ficheiros con 29 adicións e 16 borrados
  1. 4 3
      src/pages/app/[id]/environment/[environmentId].js
  2. 25 13
      src/services/environment.js

+ 4 - 3
src/pages/app/[id]/environment/[environmentId].js

@@ -263,6 +263,7 @@ export default class AppEnvironment extends PureComponent {
   invokeDeploy() {
     this.props.dispatch({
       type: 'environment/deploy',
+      useCache: true,
       payload: {
         id: this.state.currentEnvironment.id,
         callback: (response) => {
@@ -448,9 +449,9 @@ export default class AppEnvironment extends PureComponent {
                   <Button style={{marginLeft: 10}} type="primary" onClick={this.showEnvConfig.bind(this)}>环境配置</Button>
                   <Popconfirm title="确认要触发吗?有缓存部署更快,但是当你通过git修改依赖项文件时,请使用无缓存部署。" onConfirm={this.invokeDeploy.bind(this)} okText="确定" cancelText="取消">
                     <Button style={{marginLeft: 10}} type="primary">有缓存部署</Button>
-                    <Popconfirm title="确认要触发吗?(清除构建缓存)" onConfirm={this.invokeDeployNoCache.bind(this)} okText="确定" cancelText="取消">
-                      <Button  style={{marginLeft: 10}} type="danger">无缓存部署</Button>
-                    </Popconfirm>
+                  </Popconfirm>
+                  <Popconfirm title="确认要触发吗?重新构建" onConfirm={this.invokeDeployNoCache.bind(this)} okText="确定" cancelText="取消">
+                    <Button  style={{marginLeft: 10}} type="danger">重新构建</Button>
                   </Popconfirm>
 
                 </div>

+ 25 - 13
src/services/environment.js

@@ -2,7 +2,7 @@ import { request } from 'umi';
 
 export async function getAll(params) {
   return request(`/api/environment?appId=${params.appId}`, {
-    method: 'get'
+    method: 'get',
   });
 }
 
@@ -21,9 +21,12 @@ export async function update(params) {
 }
 
 export async function get(params) {
-  return request(`/api/environment/${params.id}?fetchAll=${params.fetchAll || ''}`, {
-    method: 'get',
-  });
+  return request(
+    `/api/environment/${params.id}?fetchAll=${params.fetchAll || ''}`,
+    {
+      method: 'get',
+    },
+  );
 }
 
 export async function deleteEnvironment(params) {
@@ -33,19 +36,28 @@ export async function deleteEnvironment(params) {
 }
 
 export async function restart(params) {
-  return request(`/api/environment/restart?id=${params.id}&podName=${params.podName}`, {
-    method: 'post',
-  });
+  return request(
+    `/api/environment/restart?id=${params.id}&podName=${params.podName}`,
+    {
+      method: 'post',
+    },
+  );
 }
 
 export async function deploy(params) {
-  return request(`/api/environment/deploy?id=${params.id}`, {
-    method: 'post',
-  });
+  return request(
+    `/api/environment/deploy?id=${params.id}&useCache=${params.useCache}`,
+    {
+      method: 'post',
+    },
+  );
 }
 
 export async function getLog(params) {
-  return request(`/api/environment/log?id=${params.id}&podName=${params.podName}`, {
-    method: 'get',
-  });
+  return request(
+    `/api/environment/log?id=${params.id}&podName=${params.podName}`,
+    {
+      method: 'get',
+    },
+  );
 }