Просмотр исходного кода

Merge branch 'master' of http://gogs.ioobot.com:6680/ioobot/online

kulley 7 лет назад
Родитель
Сommit
18e82a00a4

BIN
public/favicon.ico


+ 2 - 2
public/index.html

@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
+    <link rel="shortcut icon" href="%PUBLIC_URL%/ioo.ico">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no" />
     <meta name="theme-color" content="#000000">
     <link rel="manifest" href="%PUBLIC_URL%/manifest.json">
@@ -17,7 +17,7 @@
         document.writeln('<script src="https://as.alipayobjects.com/g/component/es6-promise/3.2.2/es6-promise.min.js"'+'>'+'<'+'/'+'script>');
       }
     </script>
-    <title>React DevelopVersion</title>
+    <title>Ioobot workbench</title>
   </head>
   <body>
 

BIN
public/ioo.ico


+ 1 - 1
src/app/App.jsx

@@ -55,7 +55,7 @@ class App extends Component {
                                         onClick={()=>{
                                             this.props.history.push({
                                                 pathname: `/common`
-                                            })}}>立即体验
+                                            })}}>立即使用
                                 </Button>
                                 <Button size='large'
                                         style={{marginLeft:'10px'}}

+ 4 - 5
src/app/basicVersion/caseShow/UserCustom.js

@@ -231,9 +231,9 @@ class UserCustom extends Component {
                 </div>
 
                 <div>
-                    <div className={'schema-name'}><FormattedMessage id='Name'/></div>
+                    <div className={'schema-name'}><FormattedMessage id='service name'/></div>
                     <div>
-                        <span className='item-title-cloud'><FormattedMessage id='name'/>:</span>
+                        <span className='item-title-cloud'><FormattedMessage id='service name'/>:</span>
                         <Input
                             style={{width: 250}}
                             value={customName}
@@ -250,7 +250,6 @@ class UserCustom extends Component {
                 <div style={{marginTop: 20}}>
                     <div className={'schema-name'}><FormattedMessage id='Cloud Setting'/></div>
                     <p><Link to="/common/communication">阿里云、华为云、亚马逊请联系我们</Link></p>
-                    <p style={{color: 'orange'}}>该项配置填写错误将导致部署失败,你也可以忽略此项配置!</p>
                     <br/>
                     <RadioGroup
                         onChange={(e) => {
@@ -466,12 +465,12 @@ class CloudQueryAndConfig extends Component {
                                 </Button>
                                 :
                                 <Button size="small" onClick={this.showModal}>
-                                    <FormattedMessage id='there is this cloud, click to check'/>
+                                    <FormattedMessage id='Using the default system configuration, you can click to modify.'/>
                                 </Button>
                         }
 
                         <Modal
-                            title="设置 cloud"
+                            title="云服务商秘钥设置"
                             visible={visible}
                             confirmLoading={confirmLoading}
                             footer={null}

+ 1 - 1
src/app/basicVersion/myDeploy/AliyunDeploy.js

@@ -115,7 +115,7 @@ class TencentDeploy extends Component {
                                                     </Col>
                                                     <Col span={15}>
                                                         <span
-                                                            className={'schema-table-content'}>{`http://${deploy.defaultDomain}/test/graphql`} </span>
+                                                            className={'schema-table-content'}>{`http://${deploy.defaultDomain}/test/`} </span>
                                                         <Icon type="copy" theme="twoTone" onClick={() => {
                                                             copy(url);
                                                             message.success('复制成功.');

+ 1 - 1
src/app/basicVersion/myDeploy/AmazonDeploy.js

@@ -115,7 +115,7 @@ class TencentDeploy extends Component {
                                                     </Col>
                                                     <Col span={15}>
                                                         <span
-                                                            className={'schema-table-content'}>{`http://${deploy.defaultDomain}/test/graphql`} </span>
+                                                            className={'schema-table-content'}>{`http://${deploy.defaultDomain}/test/`} </span>
                                                         <Icon type="copy" theme="twoTone" onClick={() => {
                                                             copy(url);
                                                             message.success('复制成功.');

+ 1 - 0
src/language/en_US.js

@@ -176,6 +176,7 @@ const en_US = {
     'amazon cloud': 'AWS',
     'no this cloud, click to save': 'no this cloud, click to save',
     'there is this cloud, click to check': 'there is this cloud, click to check',
+    'Using the default system configuration, you can click to modify.': 'Using the default system configuration, you can click to modify.',
     'back to case show': 'back to case show',
     'back to all case show': 'back to case store',
     'scan and use': 'scan and try',

+ 1 - 0
src/language/zh_CN.js

@@ -177,6 +177,7 @@ const zh_CN = {
     'amazon cloud': 'AWS',
     'no this cloud, click to save': '没有该服务商的 key,点我设置',
     'there is this cloud, click to check': '存在该服务商的 key,点我检查',
+    'Using the default system configuration, you can click to modify.': '默认使用系统配置,点击此处可修改',
     'back to case show': '返回该案例',
     'back to all case show': '返回案例商城',
     'scan and use': '案例商城,扫码体验',

+ 1 - 0
src/login/CloudConfig.js

@@ -160,6 +160,7 @@ class CloudConfig extends Component {
                                     <p>其他云请联系我们</p>
                                 </Panel>
                             </Collapse>
+                            <p style={{color: 'orange'}}>该项配置填写错误将导致部署失败,默认使用系统配置!</p>
                             {
                                 (cloudName === 'all' || cloudName === 'tencent')?
                                     <div style={{marginTop: 15}}>