写回project deploy cloud和 grou

src/app/common/deploy/tencent/APIGroupCard.js

@@ -1,6 +1,6 @@
 import React, {Component} from 'react';
 import {Input, Collapse, Button, Radio, Icon, Tooltip} from 'antd';
-import {ADD_APIGROUP, UPDATE_APIGROUP} from "../../../../gql";
+import {ADD_APIGROUP, UPDATE_APIGROUP, UPDATE_PROJECT_GROUP} from "../../../../gql";
 import {request} from 'graphql-request'
 import {idGen} from "../../../../func";
 import {graphqlUrl} from "../../../../config";
@@ -139,7 +139,15 @@ class APIGroupCard extends Component {
                         this.setState({
                             showOK: true
                         });
-                        this.props.stepByStep(2);
+                        // 写回 project
+                        request(graphqlUrl, UPDATE_PROJECT_GROUP, {
+                            id: this.props.projectID,
+                            updatedAt: new Date().getTime(),
+                            apiGWGroup_id: id
+                        }).then(data => {
+                            if(data.update_project !== null)
+                                this.props.stepByStep(2);
+                        });
                     }
                     setTimeout(()=>{
                         this.setState({

src/app/common/deploy/tencent/DeployCard.js

@@ -1,7 +1,7 @@
 import React, {Component} from 'react';
 import {FormattedMessage} from 'react-intl';
 import {Input, Radio, Collapse, Button, Icon, Tooltip} from 'antd';
-import {ADD_DEPLOY, UPDATE_DEPLOY} from "../../../../gql";
+import {ADD_DEPLOY, UPDATE_DEPLOY, UPDATE_PROJECT_DEPLOY_AND_CLOUD} from "../../../../gql";
 import {request} from 'graphql-request'
 import {idGen} from "../../../../func";
 import {graphqlUrl} from "../../../../config";
@@ -160,7 +160,16 @@ class DeployCard extends Component {
                         this.setState({
                             showOK: true
                         });
-                        this.props.stepByStep(1);
+                        // 写回 project
+                        request(graphqlUrl, UPDATE_PROJECT_DEPLOY_AND_CLOUD, {
+                            id: this.props.projectID,
+                            updatedAt: new Date().getTime(),
+                            deploy_id: id,
+                            cloud_id: this.props.cloudID
+                        }).then(data => {
+                            if(data.update_project !== null)
+                                this.props.stepByStep(1);
+                        })
                     }
                     setTimeout(() => {
                         this.setState({

src/app/common/deploy/tencent/TencentConfig.js

@@ -78,7 +78,7 @@ class TencentConfig extends Component {
                     //     group: "group_1544504325443_46750115"
                     // }
                     params: {
-                        'cloud-name': 'tencent',
+                        'cloud-id': 'tencent_CloudID',
                         schema,
                         deploy,
                         api,
@@ -185,6 +185,7 @@ class TencentConfig extends Component {
                                                                     cloudID={cloudID}
                                                                     trialcase={this.props.trialcase}
                                                                     pass={this.pass}
+                                                                    projectID={projectID}
                                                                 />
                                                             </Card>
                                                     }
@@ -201,6 +202,7 @@ class TencentConfig extends Component {
                                                                     cloudID={cloudID}
                                                                     trialcase={this.props.trialcase}
                                                                     pass={this.pass}
+                                                                    projectID={projectID}
                                                                 />
                                                             </Card>
                                                     }
@@ -247,6 +249,7 @@ class TencentConfig extends Component {
                                                                     userID={this.props.userID}
                                                                     defalutName={defaultName}
                                                                     trialcase={this.props.trialcase}
+                                                                    projectID={projectID}
                                                                 />
                                                             </Card>
                                                     }
@@ -322,6 +325,7 @@ class TencentConfig extends Component {
                                                                             trialcase={this.props.trialcase}
                                                                             pass={this.pass}
                                                                             stepByStep={this.stepByStep}
+                                                                            projectID={projectID}
                                                                         />
                                                                     </Card>
                                                             }
@@ -345,6 +349,7 @@ class TencentConfig extends Component {
                                                                             trialcase={this.props.trialcase}
                                                                             pass={this.pass}
                                                                             stepByStep={this.stepByStep}
+                                                                            projectID={projectID}
                                                                         />
                                                                     </Card>
                                                             }
@@ -404,6 +409,7 @@ class TencentConfig extends Component {
                                                                             defalutName={defaultName}
                                                                             trialcase={this.props.trialcase}
                                                                             stepByStep={this.stepByStep}
+                                                                            projectID={projectID}
                                                                         />
                                                                     </Card>
                                                             }

src/config.js

@@ -1,17 +1,19 @@
 // 全局配置
-const faasEnvironment = 'development';
+const environment = 'development';
+
+// 全局差异化配置，无需配置请留空
+const faasEnvironment = '';
 const graphqlEnvironment = 'production';
 
 // 基础配置
 const localIP = 'http://localhost';
 const serverIP = 'http://123.206.193.98';
-
-const faasIp = faasEnvironment === 'development' ? localIP : serverIP;
-const graphqlIP = graphqlEnvironment === 'development' ? localIP : serverIP;
-
 const backendPort = '8999';
 const graphqlPort = '3000';
 
+// 无需配置
+const faasIp = (faasEnvironment || environment) === 'development' ? localIP : serverIP;
+const graphqlIP = (graphqlEnvironment || environment) === 'development' ? localIP : serverIP;
 const backend = faasIp + ':' + backendPort;
 
 // graphql 配置

src/gql.js

@@ -862,116 +862,57 @@ const GET_PROJECT = `
                 }
         `;
 
-const UPDATE_PROJECT = `
-            mutation updateproject($id: ID, $updatedAt: String, $database_id: ID, $apiGWGroup_id: ID, $createdAt: String, $projectName: String, $deploy_id: ID, $projectType: String, $cloud_id: ID, $user_id: ID, $wxConfig_id: ID, $schema_id: ID) {
-              update_project(id: $id updatedAt: $updatedAt database_id: $database_id apiGWGroup_id: $apiGWGroup_id createdAt: $createdAt projectName: $projectName deploy_id: $deploy_id projectType: $projectType cloud_id: $cloud_id user_id: $user_id wxConfig_id: $wxConfig_id schema_id: $schema_id) {
+const UPDATE_PROJECT_GROUP = `
+            mutation updateproject($id: ID, $updatedAt: String, $apiGWGroup_id: ID) {
+              update_project(id: $id updatedAt: $updatedAt apiGWGroup_id: $apiGWGroup_id) {
+                updatedAt
+                projectName
+                id
+                projectType
+              }
+            }
+        `;
+
+const UPDATE_PROJECT_DEPLOY = `
+            mutation updateproject($id: ID, $updatedAt: String, $deploy_id: ID) {
+              update_project(id: $id updatedAt: $updatedAt deploy_id: $deploy_id) {
+                updatedAt
+                projectName
+                id
+                projectType
+              }
+            }
+        `;
+
+const UPDATE_PROJECT_CLOUD = `
+            mutation updateproject($id: ID, $updatedAt: String, $cloud_id: ID) {
+              update_project(id: $id updatedAt: $updatedAt cloud_id: $cloud_id) {
+                updatedAt
+                projectName
+                id
+                projectType
+              }
+            }
+        `;
+
+const UPDATE_PROJECT_DATABASE = `
+            mutation updateproject($id: ID, $updatedAt: String, $database_id: ID) {
+              update_project(id: $id updatedAt: $updatedAt database_id: $database_id) {
+                updatedAt
+                projectName
+                id
+                projectType
+              }
+            }
+        `;
+
+const UPDATE_PROJECT_DEPLOY_AND_CLOUD = `
+            mutation updateproject($id: ID, $updatedAt: String, $deploy_id: ID, $cloud_id: ID) {
+              update_project(id: $id updatedAt: $updatedAt deploy_id: $deploy_id cloud_id: $cloud_id) {
                 updatedAt
-                database_id {
-                  dbPort
-                  updatedAt
-                  dbHost
-                  dbUsername
-                  dbPassword
-                  createdAt
-                  id
-            
-            
-                  dbName
-                }
-                apiGWGroup_id {
-                  environmentName
-                  userStatus
-                  defaultDomain
-                  updatedAt
-                  userDomain
-                  groupName
-                  createdAt
-                  frontType
-                  region
-                  serviceId
-                  status
-                  id
-            
-                }
-                createdAt
                 projectName
-                deploy_id {
-                  description
-                  updatedAt
-                  cosBucketName
-                  memorySize
-            
-                  createdAt
-                  subnetId
-                  cosObjectName
-                  region
-                  vpcId
-                  cosBucketRegion
-                  id
-            
-            
-                  serviceName
-                  timeout
-                  handler
-                  functionName
-                }
                 id
                 projectType
-                cloud_id {
-                  id
-            
-                  cloudName
-                  secretId
-                  secretKey
-                  appId
-                  createdAt
-                  updatedAt
-                }
-                user_id {
-                  email
-                  updatedAt
-                  password
-                  telephone
-                  nickname
-                  username
-                  createdAt
-                  openid
-                  id
-                  avatar
-                }
-                wxConfig_id {
-                  updatedAt
-                  mch_id
-                  appName
-                  notify_url
-                  appSecret
-                  createdAt
-                  appID
-                  token
-                  spbill_create_ip
-                  enter_url
-                  id
-                  pay_api_key
-            
-                  body
-                  welcome_words
-                  attach
-                }
-                schema_id {
-                  updatedAt
-                  schemaState
-                  authWrite
-                  authReadObjects
-                  createdAt
-                  authRead
-                  schemaName
-                  reference
-                  id
-                  schemaData
-                  authReadWrite
-            
-                  authWriteObjects
-                }
               }
             }
         `;
@@ -1012,5 +953,9 @@ export {
     UPDATE_WXCONFIG,
     DELETE_WXCONFIG,
     GET_PROJECT,
-    UPDATE_PROJECT
+    UPDATE_PROJECT_GROUP,
+    UPDATE_PROJECT_DEPLOY,
+    UPDATE_PROJECT_CLOUD,
+    UPDATE_PROJECT_DATABASE,
+    UPDATE_PROJECT_DEPLOY_AND_CLOUD
 }