Merge branch 'master' of g.civnet.cn:ReactWeb5/maintenance

src/pages/log/loginLog/index.js

@@ -77,7 +77,7 @@ const ServiceLog = () => {
   const getData = () => {
     post(`${PUBLISH_SERVICE}/LogCenter/GetLoginLog`, {
       PageIndex: 1,
-      PageSize: 200,
+      PageSize: 1000,
       DateFrom: startTime.format('YYYY-MM-DD HH:mm:ss'),
       DateTo: endTime.format('YYYY-MM-DD HH:mm:ss'),
       IP: '',

src/pages/log/omsLog/index.js

@@ -71,9 +71,9 @@ const ServiceLog = () => {
       key: 'CallTime',
     },
     {
-      title: '访问者IP',
-      dataIndex: 'IP',
-      key: 'IP',
+      title: 'IP',
+      dataIndex: 'DownstreamRequest',
+      key: 'DownstreamRequest',
     },
     {
       title: '返回状态',
@@ -153,7 +153,8 @@ const ServiceLog = () => {
   const getData = (url, set) => {
     post(`${PUBLISH_SERVICE}/LogCenter${url}`, {
       // 获取日志表数据时PageSize设置为200，其他接口默认值20
-      PageSize: url === '/GetOMSLog' ? 200 : 20,
+      PageIndex: 1,
+      PageSize: url === '/GetOMSLog' ? 1000 : 20,
       DateFrom: startTime.format('YYYY-MM-DD HH:mm:ss'),
       DateTo: endTime.format('YYYY-MM-DD HH:mm:ss'),
       IP: '',

src/pages/log/serviceLog/index.js

@@ -71,9 +71,9 @@ const ServiceLog = () => {
       key: 'CallTime',
     },
     {
-      title: '访问者IP',
-      dataIndex: 'IP',
-      key: 'IP',
+      title: 'IP',
+      dataIndex: 'DownstreamRequest',
+      key: 'DownstreamRequest',
     },
     {
       title: '返回状态',
@@ -153,7 +153,8 @@ const ServiceLog = () => {
   const getData = (url, set) => {
     post(`${PUBLISH_SERVICE}/LogCenter${url}`, {
       // 获取日志表数据时PageSize设置为200，其他接口默认值20
-      PageSize: url === '/GetOMSLog' ? 200 : 20,
+      PageIndex: 1,
+      PageSize: url === '/GetOMSLog' ? 1000 : 20,
       DateFrom: startTime.format('YYYY-MM-DD HH:mm:ss'),
       DateTo: endTime.format('YYYY-MM-DD HH:mm:ss'),
       IP: '',