王文博 5 жил өмнө
parent
commit
704f229838

+ 0 - 1
.umirc.js

@@ -1,4 +1,3 @@
-
 // ref: https://umijs.org/config/
 export default {
   treeShaking: true,

+ 1 - 1
package.json

@@ -31,7 +31,7 @@
     "lint-staged": "^9.3.0",
     "react-test-renderer": "^16.9.0",
     "umi": "^2.9.6",
-    "umi-plugin-react": "1.9.5"
+    "umi-plugin-react": "^1.15.2"
   },
   "engines": {
     "node": ">=8.12.0"

+ 2 - 1
src/apis/base.js

@@ -15,7 +15,8 @@ export const request = axios.create({
   baseURL: `${getPrefix()}/api`,
   timeout: 5000,
   withCredentials: true,
-  headers: { 'content-type': 'application/json' }
+  headers: {
+    'content-type': 'application/json'}
 })
 
 request.interceptors.request.use(

+ 5 - 1
src/conf/config.js

@@ -7,7 +7,11 @@ let us = 'http://back-apit.weipaitang.com';
 let sTaskJobLog = "http://10.3.7.11:16686"; // 定时任务日志跳转
 
 if (document.domain === 'localhost') {
-  // dc = 'http://localhost:8082'
+
+  // dc = 'http://localhost:8000/api'
+  // dc = 'http://backend.wpt.local:8087'
+  dc = 'http://back-apit.weipaitang.com';
+} else if (document.domain === 'back-admint.wpt.la') {
   dc = 'http://back-apit.weipaitang.com';
   us = 'http://back-apit.weipaitang.com';
   tc = 'http://back-apit.weipaitang.com';

+ 10 - 0
src/pages/dc/subscribe/components/Job/index.js

@@ -48,6 +48,7 @@ class JobModal extends React.PureComponent {
               <span style = {{ width:131}}>* 订阅类型</span>
               <span style = {{ width:120}}>* 缓存类型-天</span>
               <span style = {{ width:122}}>* 缓存类型-小时</span>
+              <span style = {{ width:122}}>* 缓存过期天数</span>
               <span style = {{ width:120}}>* 操作</span>
             </div>
             <div>
@@ -84,6 +85,10 @@ class JobModal extends React.PureComponent {
                   fieldsJson[index].cacheHour = e.target.checked
                   this.onParamsChange('fieldsJson', fieldsJson)
                 }} style={{ width: 120, marginRight: 10 }}>按小时缓存</Checkbox>
+                <Input value={f.expireDay} onChange={(e) => {
+                  fieldsJson[index].expireDay = e.target.value
+                  this.onParamsChange('fieldsJson', fieldsJson)
+                }} style={{ width: 100, marginRight: 10 }}/>
                 <Popconfirm title="确定要保存吗?" onConfirm={()=>this.clickSaveJob(index)}><Button type="primary" size="small" style={{ marginRight: 5 }} >保存</Button></Popconfirm>
                 <Popconfirm title="确定要删除吗?" onConfirm={()=>this.clickDeleteJob(index)}><Button type="danger" size="small">删除</Button></Popconfirm>
               </div>)}
@@ -119,6 +124,7 @@ class JobModal extends React.PureComponent {
               <span style = {{ width:195}}>* 查询名</span>
               <span style = {{ width:195}}>* 唯一标识</span>
               <span style = {{ width:195}}>* 定制规则名</span>
+              <span style = {{ width:195}}>* 缓存天数</span>
               <span style = {{ width:195}}>* 操作</span>
             </div>
             <div>
@@ -140,6 +146,10 @@ class JobModal extends React.PureComponent {
                   customJson[index].customRule = e.target.value
                   this.onParamsChange('customJson', customJson)
                 }} style={{ width: 188, marginRight: 10 }}/>
+                <Input value={f.expireDay} onChange={(e) => {
+                  customJson[index].expireDay = e.target.value
+                  this.onParamsChange('customJson', customJson)
+                }} style={{ width: 188, marginRight: 10 }}/>
                 <Popconfirm title="确定保存吗?"
           onConfirm={() => this.clickSaveCustomJob(index)}><Button type="primary" size="small" style={{ marginRight: 5 }}>保存</Button>
                 </Popconfirm>

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 412 - 133
yarn.lock


Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно