diff --git a/a.markdown b/a.markdown index fe5469c1..14dafe41 100644 --- a/a.markdown +++ b/a.markdown @@ -1,60 +1,50 @@ -

跨项目测试集合

+

mumu

-# my-test -[TOC] - - # %u516C%u5171%u5206%u7C7B [TOC] -## test_2%0A%3Ca%20id%3Dtest_2%3E%20%3C/a%3E +## 123213%0A%3Ca%20id%3D123213%3E%20%3C/a%3E [TOC] ### 基本信息 -**Path:** /api/test/2 +**Path:** /logIn -**Method:** POST +**Method:** GET **接口描述:** - +undefined ### 请求参数 -**Headers** -| 参数名称 | 参数值 | 是否必须 | 示例 | 备注 | -| ------------ | ------------ | ------------ | ------------ | ------------ | -| Content-Type | application/json | 是 | | | -**Body** - -```javascript -{ - "aa": 12 -} -``` -### 返回数据 - - - - - - - - -
名称类型是否必须默认值备注其他信息
aobject []必须

item 类型: object

├─ item1string非必须
├─ item2string非必须
bstring必须
- -# %u4EA4%u6613%u4E2D%u53F0 +## test%0A%3Ca%20id%3Dtest%3E%20%3C/a%3E [TOC] +### 基本信息 -# %u60F9%u6211 +**Path:** /api/col/list + +**Method:** GET + +**接口描述:** +undefined + +### 请求参数 + +## a%0A%3Ca%20id%3Da%3E%20%3C/a%3E [TOC] +### 基本信息 -# %u6258%u5C14%u65AF%u6CF0 -[TOC] +**Path:** /logOut +**Method:** GET + +**接口描述:** +undefined + +### 请求参数 diff --git a/client/Application.js b/client/Application.js index e69ee28d..1dea6dc2 100755 --- a/client/Application.js +++ b/client/Application.js @@ -110,7 +110,7 @@ export default class App extends Component {
- + {process.env.versionNotify && } {alertContent()} {this.props.loginState !== 1 ?
: null}
diff --git a/client/components/Notify/Notify.js b/client/components/Notify/Notify.js index 85e445b1..253da0c4 100644 --- a/client/components/Notify/Notify.js +++ b/client/components/Notify/Notify.js @@ -7,8 +7,7 @@ export default class Notify extends Component { super(props); this.state = { newVersion: process.env.version, - version: process.env.version, - versionNotify: process.env.versionNotify + version: process.env.version }; } @@ -23,7 +22,7 @@ export default class Notify extends Component { } render() { - const isShow = this.state.versionNotify && this.state.newVersion !== this.state.version; + const isShow = this.state.newVersion !== this.state.version; return (
{isShow && ( diff --git a/server/controllers/interface.js b/server/controllers/interface.js index 0df83662..cb8de14d 100755 --- a/server/controllers/interface.js +++ b/server/controllers/interface.js @@ -638,12 +638,12 @@ class interfaceController extends baseController { let annotatedCss = fs.readFileSync( path.resolve( yapi.WEBROOT, - 'node_modules/jsondiffpatch/public/formatters-styles/annotated.css' + 'node_modules/jsondiffpatch/dist/formatters-styles/annotated.css' ), 'utf8' ); let htmlCss = fs.readFileSync( - path.resolve(yapi.WEBROOT, 'node_modules/jsondiffpatch/public/formatters-styles/html.css'), + path.resolve(yapi.WEBROOT, 'node_modules/jsondiffpatch/dist/formatters-styles/html.css'), 'utf8' );