zianxin/pigx
1
0 Fork 0
mirror of http://git.pig4cloud.com/pig/pigx.git synced 2026-11-13 22:09:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

⬆️ Upgrading dependencies. nacos 1.1.4

Browse Source
This commit is contained in:
冷冷 committed 2019-11-01 12:34:23 +08:00
1 parent d9e7a740cf
commit d77d3be2cd
15 files changed
+88 -111
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pigx-register/pom.xml
+2 -2
View File
@@ -30,12 +30,12 @@
<dependency> <dependency>
<groupId>com.pig4cloud.nacos</groupId> <groupId>com.pig4cloud.nacos</groupId>
<artifactId>nacos-config</artifactId> <artifactId>nacos-config</artifactId>
<version>3.4.0</version> <version>1.1.4</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.pig4cloud.nacos</groupId> <groupId>com.pig4cloud.nacos</groupId>
<artifactId>nacos-naming</artifactId> <artifactId>nacos-naming</artifactId>
<version>3.4.0</version> <version>1.1.4</version>
</dependency> </dependency>
<!-- log --> <!-- log -->
<dependency> <dependency>
pigx-register/src/main/java/com/alibaba/nacos/console/config/ConfigConstants.java
+1 -2
View File
@@ -19,7 +19,7 @@ package com.alibaba.nacos.console.config;
/** /**
* @author lengleng * @author lengleng
* @date 2019-04-19 * @date 2019-10-31
* <p> * <p>
* 覆盖nacos 默认配置 * 覆盖nacos 默认配置
*/ */
@@ -38,5 +38,4 @@ public interface ConfigConstants {
* tomcat 日志配置 * tomcat 日志配置
*/ */
String TOMCAT_ACCESS_LOG = "server.tomcat.accesslog.enabled"; String TOMCAT_ACCESS_LOG = "server.tomcat.accesslog.enabled";
} }
pigx-register/src/main/java/com/alibaba/nacos/console/config/WebSecurityConfig.java
+3 -3
View File
@@ -75,9 +75,9 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
@Override @Override
public void configure(WebSecurity web) { public void configure(WebSecurity web) {
String ignoreUrls = env.getProperty("nacos.security.ignore.urls", "/**"); String ignoreURLs = env.getProperty("nacos.security.ignore.urls", "/**");
for (String url : ignoreUrls.trim().split(SECURITY_IGNORE_URLS_SPILT_CHAR)) { for (String ignoreURL : ignoreURLs.trim().split(SECURITY_IGNORE_URLS_SPILT_CHAR)) {
web.ignoring().antMatchers(url.trim()); web.ignoring().antMatchers(ignoreURL.trim());
} }
} }
pigx-register/src/main/java/com/alibaba/nacos/console/controller/AuthController.java
+6 -13
View File
@@ -15,11 +15,10 @@
*/ */
package com.alibaba.nacos.console.controller; package com.alibaba.nacos.console.controller;
import com.alibaba.nacos.console.config.WebSecurityConfig;
import com.alibaba.nacos.config.server.model.RestResult; import com.alibaba.nacos.config.server.model.RestResult;
import com.alibaba.nacos.console.config.WebSecurityConfig;
import com.alibaba.nacos.console.security.CustomUserDetailsServiceImpl; import com.alibaba.nacos.console.security.CustomUserDetailsServiceImpl;
import com.alibaba.nacos.console.utils.JwtTokenUtils; import com.alibaba.nacos.console.utils.JwtTokenUtils;
import com.alibaba.nacos.console.utils.PasswordEncoderUtil; import com.alibaba.nacos.console.utils.PasswordEncoderUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.AuthenticationManager;
@@ -30,7 +29,6 @@ import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
/** /**
@@ -56,11 +54,8 @@ public class AuthController {
* Nacos is in broken states. * Nacos is in broken states.
*/ */
@ResponseBody @PostMapping("login")
@RequestMapping(value = "login", method = RequestMethod.POST) public RestResult<String> login(@RequestParam String username, @RequestParam String password, HttpServletResponse response) {
public RestResult<String> login(HttpServletRequest request, HttpServletResponse response) throws Exception {
String username = request.getParameter("username");
String password = request.getParameter("password");
// 通过用户名和密码创建一个 Authentication 认证对象，实现类为 UsernamePasswordAuthenticationToken // 通过用户名和密码创建一个 Authentication 认证对象，实现类为 UsernamePasswordAuthenticationToken
UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(username, password); UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(username, password);
@@ -85,11 +80,9 @@ public class AuthController {
} }
} }
@ResponseBody @PutMapping("password")
@RequestMapping(value = "password", method = RequestMethod.PUT) public RestResult<String> updatePassword(@RequestParam(value = "oldPassword") String oldPassword,
public RestResult<String> updatePassword(HttpServletRequest request, HttpServletResponse response, @RequestParam(value = "newPassword") String newPassword) {
@RequestParam(value = "oldPassword", required = true) String oldPassword,
@RequestParam(value = "newPassword", required = true) String newPassword) throws Exception {
RestResult<String> rr = new RestResult<String>(); RestResult<String> rr = new RestResult<String>();
Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal(); Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal();
pigx-register/src/main/java/com/alibaba/nacos/console/controller/HealthController.java
+3 -6
View File
@@ -21,9 +21,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@@ -52,8 +51,7 @@ public class HealthController {
* @return HTTP code equal to 200 indicates that Nacos is in right states. HTTP code equal to 500 indicates that * @return HTTP code equal to 200 indicates that Nacos is in right states. HTTP code equal to 500 indicates that
* Nacos is in broken states. * Nacos is in broken states.
*/ */
@ResponseBody @GetMapping("liveness")
@RequestMapping(value = "liveness", method = RequestMethod.GET)
public ResponseEntity liveness() { public ResponseEntity liveness() {
return ResponseEntity.ok().body("OK"); return ResponseEntity.ok().body("OK");
} }
@@ -64,8 +62,7 @@ public class HealthController {
* @return HTTP code equal to 200 indicates that Nacos is ready. HTTP code equal to 500 indicates that Nacos is not * @return HTTP code equal to 200 indicates that Nacos is ready. HTTP code equal to 500 indicates that Nacos is not
* ready. * ready.
*/ */
@ResponseBody @GetMapping("readiness")
@RequestMapping(value = "readiness", method = RequestMethod.GET)
public ResponseEntity readiness(HttpServletRequest request) { public ResponseEntity readiness(HttpServletRequest request) {
boolean isConfigReadiness = isConfigReadiness(); boolean isConfigReadiness = isConfigReadiness();
boolean isNamingReadiness = isNamingReadiness(request); boolean isNamingReadiness = isNamingReadiness(request);
pigx-register/src/main/java/com/alibaba/nacos/console/controller/NamespaceController.java
+16 -36
View File
@@ -15,19 +15,14 @@
*/ */
package com.alibaba.nacos.console.controller; package com.alibaba.nacos.console.controller;
import com.alibaba.nacos.config.server.exception.NacosException;
import com.alibaba.nacos.config.server.model.RestResult; import com.alibaba.nacos.config.server.model.RestResult;
import com.alibaba.nacos.config.server.model.TenantInfo; import com.alibaba.nacos.config.server.model.TenantInfo;
import com.alibaba.nacos.config.server.service.PersistService; import com.alibaba.nacos.config.server.service.PersistService;
import com.alibaba.nacos.config.server.utils.StringUtils;
import com.alibaba.nacos.console.model.Namespace; import com.alibaba.nacos.console.model.Namespace;
import com.alibaba.nacos.console.model.NamespaceAllInfo; import com.alibaba.nacos.console.model.NamespaceAllInfo;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@@ -40,12 +35,12 @@ import java.util.UUID;
* *
* @author Nacos * @author Nacos
*/ */
@Controller @RestController
@RequestMapping("/v1/console/namespaces") @RequestMapping("/v1/console/namespaces")
public class NamespaceController { public class NamespaceController {
@Autowired @Autowired
private transient PersistService persistService; private PersistService persistService;
/** /**
* Get namespace list * Get namespace list
@@ -54,8 +49,7 @@ public class NamespaceController {
* @param response response * @param response response
* @return namespace list * @return namespace list
*/ */
@ResponseBody @GetMapping
@RequestMapping(method = RequestMethod.GET)
public RestResult<List<Namespace>> getNamespaces(HttpServletRequest request, HttpServletResponse response) { public RestResult<List<Namespace>> getNamespaces(HttpServletRequest request, HttpServletResponse response) {
RestResult<List<Namespace>> rr = new RestResult<List<Namespace>>(); RestResult<List<Namespace>> rr = new RestResult<List<Namespace>>();
rr.setCode(200); rr.setCode(200);
@@ -82,21 +76,18 @@ public class NamespaceController {
* @param namespaceId namespaceId * @param namespaceId namespaceId
* @return namespace all info * @return namespace all info
*/ */
@ResponseBody @GetMapping(params = "show=all")
@RequestMapping(params = "show=all", method = RequestMethod.GET)
public NamespaceAllInfo getNamespace(HttpServletRequest request, HttpServletResponse response, public NamespaceAllInfo getNamespace(HttpServletRequest request, HttpServletResponse response,
@RequestParam("namespaceId") String namespaceId) { @RequestParam("namespaceId") String namespaceId) {
// TODO 获取用kp // TODO 获取用kp
if (StringUtils.isBlank(namespaceId)) { if (StringUtils.isBlank(namespaceId)) {
NamespaceAllInfo namespaceTmp = new NamespaceAllInfo(namespaceId, "Public", 200, persistService.configInfoCount(""), 0, return new NamespaceAllInfo(namespaceId, "Public", 200,
"Public Namespace"); persistService.configInfoCount(""), 0, "Public Namespace");
return namespaceTmp;
} else { } else {
TenantInfo tenantInfo = persistService.findTenantByKp("1", namespaceId); TenantInfo tenantInfo = persistService.findTenantByKp("1", namespaceId);
int configCount = persistService.configInfoCount(namespaceId); int configCount = persistService.configInfoCount(namespaceId);
NamespaceAllInfo namespaceTmp = new NamespaceAllInfo(namespaceId, tenantInfo.getTenantName(), 200, return new NamespaceAllInfo(namespaceId, tenantInfo.getTenantName(), 200,
configCount, 2, tenantInfo.getTenantDesc()); configCount, 2, tenantInfo.getTenantDesc());
return namespaceTmp;
} }
} }
@@ -108,14 +99,11 @@ public class NamespaceController {
* @param namespaceName namespace Name * @param namespaceName namespace Name
* @param namespaceDesc namespace Desc * @param namespaceDesc namespace Desc
* @return whether create ok * @return whether create ok
* @throws NacosException
*/ */
@RequestMapping(method = RequestMethod.POST) @PostMapping
@ResponseBody
public Boolean createNamespace(HttpServletRequest request, HttpServletResponse response, public Boolean createNamespace(HttpServletRequest request, HttpServletResponse response,
@RequestParam("namespaceName") String namespaceName, @RequestParam("namespaceName") String namespaceName,
@RequestParam(value = "namespaceDesc", required = false) String namespaceDesc) @RequestParam(value = "namespaceDesc", required = false) String namespaceDesc) {
throws NacosException {
// TODO 获取用kp // TODO 获取用kp
String namespaceId = UUID.randomUUID().toString(); String namespaceId = UUID.randomUUID().toString();
persistService.insertTenantInfoAtomic("1", namespaceId, namespaceName, namespaceDesc, "nacos", persistService.insertTenantInfoAtomic("1", namespaceId, namespaceName, namespaceDesc, "nacos",
@@ -126,21 +114,15 @@ public class NamespaceController {
/** /**
* edit namespace * edit namespace
* *
* @param request request
* @param response response
* @param namespace namespace * @param namespace namespace
* @param namespaceShowName namespace ShowName * @param namespaceShowName namespace ShowName
* @param namespaceDesc namespace Desc * @param namespaceDesc namespace Desc
* @return whether edit ok * @return whether edit ok
* @throws NacosException NacosException
*/ */
@RequestMapping(method = RequestMethod.PUT) @PutMapping
@ResponseBody public Boolean editNamespace(@RequestParam("namespace") String namespace,
public Boolean editNamespace(HttpServletRequest request, HttpServletResponse response,
@RequestParam("namespace") String namespace,
@RequestParam("namespaceShowName") String namespaceShowName, @RequestParam("namespaceShowName") String namespaceShowName,
@RequestParam(value = "namespaceDesc", required = false) String namespaceDesc) @RequestParam(value = "namespaceDesc", required = false) String namespaceDesc) {
throws NacosException {
// TODO 获取用kp // TODO 获取用kp
persistService.updateTenantNameAtomic("1", namespace, namespaceShowName, namespaceDesc); persistService.updateTenantNameAtomic("1", namespace, namespaceShowName, namespaceDesc);
return true; return true;
@@ -153,12 +135,10 @@ public class NamespaceController {
* @param response response * @param response response
* @param namespaceId namespace Id * @param namespaceId namespace Id
* @return whether del ok * @return whether del ok
* @throws NacosException NacosException
*/ */
@RequestMapping(method = RequestMethod.DELETE) @DeleteMapping
@ResponseBody
public Boolean deleteConfig(HttpServletRequest request, HttpServletResponse response, public Boolean deleteConfig(HttpServletRequest request, HttpServletResponse response,
@RequestParam("namespaceId") String namespaceId) throws NacosException { @RequestParam("namespaceId") String namespaceId) {
persistService.removeTenantInfoAtomic("1", namespaceId); persistService.removeTenantInfoAtomic("1", namespaceId);
return true; return true;
} }
pigx-register/src/main/java/com/alibaba/nacos/console/controller/ServerStateController.java
+4 -15
View File
@@ -18,13 +18,11 @@ package com.alibaba.nacos.console.controller;
import com.alibaba.nacos.common.util.VersionUtils; import com.alibaba.nacos.common.util.VersionUtils;
import com.alibaba.nacos.core.utils.SystemUtils; import com.alibaba.nacos.core.utils.SystemUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@@ -36,16 +34,9 @@ import java.util.Map;
@RequestMapping("/v1/console/server") @RequestMapping("/v1/console/server")
public class ServerStateController { public class ServerStateController {
private static final Logger logger = LoggerFactory.getLogger(ServerStateController.class); @GetMapping("state")
public static String VERSION ;
@ResponseBody
@RequestMapping(value = "state", method = RequestMethod.GET)
public ResponseEntity serverState() { public ResponseEntity serverState() {
Map<String,String> serverState = new HashMap<String, String>(3); Map<String,String> serverState = new HashMap<>(3);
serverState.put("standalone_mode",SystemUtils.STANDALONE_MODE ? serverState.put("standalone_mode",SystemUtils.STANDALONE_MODE ?
SystemUtils.STANDALONE_MODE_ALONE : SystemUtils.STANDALONE_MODE_CLUSTER); SystemUtils.STANDALONE_MODE_ALONE : SystemUtils.STANDALONE_MODE_CLUSTER);
@@ -55,6 +46,4 @@ public class ServerStateController {
return ResponseEntity.ok().body(serverState); return ResponseEntity.ok().body(serverState);
} }
} }
pigx-register/src/main/java/com/alibaba/nacos/console/filter/JwtAuthenticationTokenFilter.java
+1 -1
View File
@@ -69,7 +69,7 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
private String resolveToken(HttpServletRequest request) { private String resolveToken(HttpServletRequest request) {
String bearerToken = request.getHeader(WebSecurityConfig.AUTHORIZATION_HEADER); String bearerToken = request.getHeader(WebSecurityConfig.AUTHORIZATION_HEADER);
if (StringUtils.hasText(bearerToken) && bearerToken.startsWith(TOKEN_PREFIX)) { if (StringUtils.hasText(bearerToken) && bearerToken.startsWith(TOKEN_PREFIX)) {
return bearerToken.substring(7); return bearerToken.substring(7, bearerToken.length());
} }
String jwt = request.getParameter(WebSecurityConfig.AUTHORIZATION_TOKEN); String jwt = request.getParameter(WebSecurityConfig.AUTHORIZATION_TOKEN);
if (StringUtils.hasText(jwt)) { if (StringUtils.hasText(jwt)) {
pigx-register/src/main/resources/static/console-fe/src/locales/en-US.js
+2
View File
@@ -97,9 +97,11 @@ const I18N_CONF = {
pubNoData: 'No results found.', pubNoData: 'No results found.',
columnServiceName: 'Service Name', columnServiceName: 'Service Name',
groupName: 'Group Name', groupName: 'Group Name',
groupNamePlaceholder: 'Enter Group Name',
columnClusterCount: 'Cluster Count', columnClusterCount: 'Cluster Count',
columnIpCount: 'Instance Count', columnIpCount: 'Instance Count',
columnHealthyInstanceCount: 'Healthy Instance Count', columnHealthyInstanceCount: 'Healthy Instance Count',
columnTriggerFlag: 'Trigger Protection Threshold',
operation: 'Operation', operation: 'Operation',
detail: 'Details', detail: 'Details',
sampleCode: 'Code Example', sampleCode: 'Code Example',
pigx-register/src/main/resources/static/console-fe/src/locales/zh-CN.js
+3 -1
View File
@@ -96,10 +96,12 @@ const I18N_CONF = {
query: '查询', query: '查询',
pubNoData: '没有数据', pubNoData: '没有数据',
columnServiceName: '服务名', columnServiceName: '服务名',
groupName: '分组', groupName: '分组名称',
groupNamePlaceholder: '请输入分组名称',
columnClusterCount: '集群数目', columnClusterCount: '集群数目',
columnIpCount: '实例数', columnIpCount: '实例数',
columnHealthyInstanceCount: '健康实例数', columnHealthyInstanceCount: '健康实例数',
columnTriggerFlag: '触发保护阈值',
operation: '操作', operation: '操作',
detail: '详情', detail: '详情',
sampleCode: '示例代码', sampleCode: '示例代码',
pigx-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigurationManagement/ConfigurationManagement.js
+17 -20
View File
@@ -100,6 +100,10 @@ class ConfigurationManagement extends React.Component {
contentList: [], contentList: [],
isAdvancedQuery: false, isAdvancedQuery: false,
isCheckAll: false, isCheckAll: false,
rowSelection: {
onChange: this.configDataTableOnChange.bind(this),
selectedRowKeys: [],
},
}; };
const obj = { const obj = {
dataId: this.dataId || '', dataId: this.dataId || '',
@@ -250,6 +254,10 @@ class ConfigurationManagement extends React.Component {
}); });
} }
this.getData(); this.getData();
configsTableSelected.clear();
const { rowSelection } = this.state;
rowSelection.selectedRowKeys = [];
this.setState({ rowSelection });
} }
getData(pageNo = 1, clearSelect = true) { getData(pageNo = 1, clearSelect = true) {
@@ -1070,22 +1078,14 @@ class ConfigurationManagement extends React.Component {
}); });
} }
configsTableOnSelect(selected, record, records) { configDataTableOnChange(ids, records) {
if (selected) { const { rowSelection } = this.state;
configsTableSelected.set(record.id, record); rowSelection.selectedRowKeys = ids;
} else { this.setState({ rowSelection });
configsTableSelected.delete(record.id); configsTableSelected.clear();
} ids.forEach((id, i) => {
} configsTableSelected.set(id, id);
});
configsTableOnSelectAll(selected, records) {
if (selected) {
records.forEach((record, i) => {
configsTableSelected.set(record.id, record);
});
} else {
configsTableSelected.clear();
}
} }
render() { render() {
@@ -1285,10 +1285,7 @@ class ConfigurationManagement extends React.Component {
fixedHeader fixedHeader
maxBodyHeight={400} maxBodyHeight={400}
ref={'dataTable'} ref={'dataTable'}
rowSelection={{ rowSelection={this.state.rowSelection}
onSelect: this.configsTableOnSelect,
onSelectAll: this.configsTableOnSelectAll,
}}
> >
<Table.Column title={'Data Id'} dataIndex={'dataId'} /> <Table.Column title={'Data Id'} dataIndex={'dataId'} />
<Table.Column title={'Group'} dataIndex={'group'} /> <Table.Column title={'Group'} dataIndex={'group'} />
pigx-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/NewConfig/NewConfig.js
+1 -1
View File
@@ -414,7 +414,7 @@ class NewConfig extends React.Component {
label: 'YAML', label: 'YAML',
}, },
{ {
value: 'text/html', value: 'html',
label: 'HTML', label: 'HTML',
}, },
{ {
pigx-register/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceList/ServiceList.js
+24 -6
View File
@@ -56,8 +56,11 @@ class ServiceList extends React.Component {
total: 0, total: 0,
pageSize: 10, pageSize: 10,
currentPage: 1, currentPage: 1,
keyword: '',
dataSource: [], dataSource: [],
search: {
serviceName: '',
groupName: '',
},
hasIpCount: !(localStorage.getItem('hasIpCount') === 'false'), hasIpCount: !(localStorage.getItem('hasIpCount') === 'false'),
}; };
this.field = new Field(this); this.field = new Field(this);
@@ -78,13 +81,14 @@ class ServiceList extends React.Component {
} }
queryServiceList() { queryServiceList() {
const { currentPage, pageSize, keyword, withInstances = false, hasIpCount } = this.state; const { currentPage, pageSize, search, withInstances = false, hasIpCount } = this.state;
const parameter = [ const parameter = [
`hasIpCount=${hasIpCount}`, `hasIpCount=${hasIpCount}`,
`withInstances=${withInstances}`, `withInstances=${withInstances}`,
`pageNo=${currentPage}`, `pageNo=${currentPage}`,
`pageSize=${pageSize}`, `pageSize=${pageSize}`,
`keyword=${keyword}`, `serviceNameParam=${search.serviceName}`,
`groupNameParam=${search.groupName}`,
]; ];
request({ request({
url: `v1/ns/catalog/services?${parameter.join('&')}`, url: `v1/ns/catalog/services?${parameter.join('&')}`,
@@ -164,6 +168,8 @@ class ServiceList extends React.Component {
serviceList, serviceList,
serviceName, serviceName,
serviceNamePlaceholder, serviceNamePlaceholder,
groupName,
groupNamePlaceholder,
hiddenEmptyService, hiddenEmptyService,
query, query,
create, create,
@@ -172,7 +178,7 @@ class ServiceList extends React.Component {
sampleCode, sampleCode,
deleteAction, deleteAction,
} = locale; } = locale;
const { keyword, nowNamespaceName, nowNamespaceId, hasIpCount } = this.state; const { search, nowNamespaceName, nowNamespaceId, hasIpCount } = this.state;
const { init, getValue } = this.field; const { init, getValue } = this.field;
this.init = init; this.init = init;
this.getValue = getValue; this.getValue = getValue;
@@ -214,8 +220,19 @@ class ServiceList extends React.Component {
<Input <Input
placeholder={serviceNamePlaceholder} placeholder={serviceNamePlaceholder}
style={{ width: 200 }} style={{ width: 200 }}
value={keyword} value={search.serviceName}
onChange={keyword => this.setState({ keyword })} onChange={serviceName => this.setState({ search: { ...search, serviceName } })}
onPressEnter={() =>
this.setState({ currentPage: 1 }, () => this.queryServiceList())
}
/>
</FormItem>
<FormItem label={groupName}>
<Input
placeholder={groupNamePlaceholder}
style={{ width: 200 }}
value={search.groupName}
onChange={groupName => this.setState({ search: { ...search, groupName } })}
onPressEnter={() => onPressEnter={() =>
this.setState({ currentPage: 1 }, () => this.queryServiceList()) this.setState({ currentPage: 1 }, () => this.queryServiceList())
} }
@@ -264,6 +281,7 @@ class ServiceList extends React.Component {
title={locale.columnHealthyInstanceCount} title={locale.columnHealthyInstanceCount}
dataIndex="healthyInstanceCount" dataIndex="healthyInstanceCount"
/> />
<Column title={locale.columnTriggerFlag} dataIndex="triggerFlag" />
<Column <Column
title={operation} title={operation}
align="center" align="center"
pigx-register/src/main/resources/static/console-fe/src/utils/request.js
+2 -2
View File
@@ -18,8 +18,8 @@ const request = () => {
}, },
error => { error => {
if (error.response) { if (error.response) {
const { status } = error.response; const { data, status } = error.response;
Message.error(`HTTP ERROR: ${status}`); Message.error(data && typeof data === 'string' ? data : `HTTP ERROR: ${status}`);
} else { } else {
Message.error(API_GENERAL_ERROR_MESSAGE); Message.error(API_GENERAL_ERROR_MESSAGE);
} }
pigx-register/src/main/resources/static/js/main.js
+3 -3
View File
@@ -9,7 +9,7 @@
Licensed under the MIT License (MIT), see Licensed under the MIT License (MIT), see
http://jedwatson.github.io/classnames http://jedwatson.github.io/classnames
*/ */
!function(){"use strict";var i={}.hasOwnProperty;function s(){for(var e=[],t=0;t<arguments.length;t++){var n=arguments[t];if(n){var a=typeof n;if("string"==a||"number"==a)e.push(n);else if(Array.isArray(n)&&n.length){var o=s.apply(null,n);o&&e.push(o)}else if("object"==a)for(var r in n)i.call(n,r)&&n[r]&&e.push(r)}}return e.join(" ")}e.exports?(s.default=s,e.exports=s):void 0===(a=function(){return s}.apply(t,[]))||(e.exports=a)}()},function(e,t,n){"use strict";t.__esModule=!0,t.default=function(e,t){var n={};for(var a in e)0<=t.indexOf(a)||Object.prototype.hasOwnProperty.call(e,a)&&(n[a]=e[a]);return n}},function(e,t,n){"use strict";function a(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}n.d(t,"a",function(){return a})},function(e,t,n){"use strict";function a(e,t){for(var n=0;n<t.length;n++){var a=t[n];a.enumerable=a.enumerable||!1,a.configurable=!0,"value"in a&&(a.writable=!0),Object.defineProperty(e,a.key,a)}}function o(e,t,n){return t&&a(e.prototype,t),n&&a(e,n),e}n.d(t,"a",function(){return o})},function(e,t,n){"use strict";n.d(t,"a",function(){return r});var a=n(86),o=n(22);function r(e,t){return!t||"object"!==Object(a.a)(t)&&"function"!=typeof t?Object(o.a)(e):t}},function(e,t,n){"use strict";function a(e){return(a=Object.setPrototypeOf?Object.getPrototypeOf:function(e){return e.__proto__||Object.getPrototypeOf(e)})(e)}n.d(t,"a",function(){return a})},function(e,t,n){"use strict";function a(e,t){return(a=Object.setPrototypeOf||function(e,t){return e.__proto__=t,e})(e,t)}function o(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function");e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),t&&a(e,t)}n.d(t,"a",function(){return o})},function(e,t,n){"use strict";t.__esModule=!0;var c=r(n(5)),d=r(n(13)),a=r(n(9)),p=r(n(499)),o=r(n(500));function r(e){return e&&e.__esModule?e:{default:e}}p.default.Group=o.default,t.default=a.default.config(p.default,{transform:function(e,t){if("shape"in e){t("shape","text | warning | ghost","Button");var n=e,a=n.shape,o=n.type,r=(0,d.default)(n,["shape","type"]),i=o;("light"===o||"dark"===o||"secondary"===o&&"warning"===a)&&(i="normal");var s=void 0;"ghost"===a&&(s={primary:"dark",secondary:"dark",normal:"light",dark:"dark",light:"light"}[o||p.default.defaultProps.type]);var l="text"===a,u="warning"===a;e=(0,c.default)({type:i,ghost:s,text:l,warning:u},r)}return e}}),e.exports=t.default},function(e,t,n){"use strict";t.__esModule=!0;var x=m(n(5)),E=m(n(13)),a=m(n(9)),o=m(n(526)),r=m(n(531)),i=m(n(534)),s=m(n(535)),l=m(n(536)),u=m(n(537)),c=m(n(539)),d=m(n(542)),p=m(n(545)),f=m(n(335)),h=m(n(336));function m(e){return e&&e.__esModule?e:{default:e}}var g=[i.default,c.default,s.default,l.default,r.default,u.default,d.default,p.default].reduce(function(e,t){return e=t(e)},o.default);g.Base=o.default,g.fixed=i.default,g.lock=c.default,g.selection=s.default,g.expanded=l.default,g.tree=r.default,g.virtual=u.default,g.list=d.default,g.sticky=p.default,g.GroupHeader=f.default,g.GroupFooter=h.default,t.default=a.default.config(g,{componentName:"Table",transform:function(e,t){if("expandedRowKeys"in e){t("expandedRowKeys","openRowKeys","Table");var n=e,a=n.expandedRowKeys,o=(0,E.default)(n,["expandedRowKeys"]);e=(0,x.default)({openRowKeys:a},o)}if("onExpandedChange"in e){t("onExpandedChange","onRowOpen","Table");var r=e,i=r.onExpandedChange,s=(0,E.default)(r,["onExpandedChange"]);e=(0,x.default)({onRowOpen:i},s)}if("isLoading"in e){t("isLoading","loading","Table");var l=e,u=l.isLoading,c=(0,E.default)(l,["isLoading"]);e=(0,x.default)({loading:u},c)}if("indentSize"in e){t("indentSize","indent","Table");var d=e,p=d.indentSize,f=(0,E.default)(d,["indentSize"]);e=(0,x.default)({indent:p},f)}if("optimization"in e){t("optimization","pure","Table");var h=e,m=h.optimization,g=(0,E.default)(h,["optimization"]);e=(0,x.default)({pure:m},g)}if("getRowClassName"in e){t("getRowClassName","getRowProps","Table");var y=e,_=y.getRowClassName,v=y.getRowProps,b=(0,E.default)(y,["getRowClassName","getRowProps"]);if(_){e=(0,x.default)({getRowProps:function(){return(0,x.default)({className:_.apply(void 0,arguments)},v?v.apply(void 0,arguments):{})}},b)}else e=(0,x.default)({getRowProps:v},b)}if("getRowProps"in e){t("getRowProps","rowProps","Table in 1.15.0");var M=e,w=M.getRowProps,k=(0,E.default)(M,["getRowProps"]);e=(0,x.default)({rowProps:w},k)}if("getCellProps"in e){t("getCellProps","cellProps","Table in 1.15.0");var S=e,T=S.getCellProps,C=(0,E.default)(S,["getCellProps"]);e=(0,x.default)({cellProps:T},C)}return e}}),e.exports=t.default},function(e,t,n){"use strict";t.__esModule=!0;var l=c(n(5)),u=c(n(13)),a=c(n(9)),o=n(11),r=c(n(337)),i=c(n(338)),s=n(550);function c(e){return e&&e.__esModule?e:{default:e}}function d(i,s){if("closable"in i){s("closable","closeable","Dialog");var e=i,t=e.closable,n=(0,u.default)(e,["closable"]);i=(0,l.default)({closeable:t},n)}return["taLine truncated !function(){"use strict";var i={}.hasOwnProperty;function s(){for(var e=[],t=0;t<arguments.length;t++){var n=arguments[t];if(n){var a=typeof n;if("string"==a||"number"==a)e.push(n);else if(Array.isArray(n)&&n.length){var o=s.apply(null,n);o&&e.push(o)}else if("object"==a)for(var r in n)i.call(n,r)&&n[r]&&e.push(r)}}return e.join(" ")}e.exports?(s.default=s,e.exports=s):void 0===(a=function(){return s}.apply(t,[]))||(e.exports=a)}()},function(e,t,n){"use strict";t.__esModule=!0,t.default=function(e,t){var n={};for(var a in e)0<=t.indexOf(a)||Object.prototype.hasOwnProperty.call(e,a)&&(n[a]=e[a]);return n}},function(e,t,n){"use strict";function a(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}n.d(t,"a",function(){return a})},function(e,t,n){"use strict";function a(e,t){for(var n=0;n<t.length;n++){var a=t[n];a.enumerable=a.enumerable||!1,a.configurable=!0,"value"in a&&(a.writable=!0),Object.defineProperty(e,a.key,a)}}function o(e,t,n){return t&&a(e.prototype,t),n&&a(e,n),e}n.d(t,"a",function(){return o})},function(e,t,n){"use strict";n.d(t,"a",function(){return r});var a=n(86),o=n(22);function r(e,t){return!t||"object"!==Object(a.a)(t)&&"function"!=typeof t?Object(o.a)(e):t}},function(e,t,n){"use strict";function a(e){return(a=Object.setPrototypeOf?Object.getPrototypeOf:function(e){return e.__proto__||Object.getPrototypeOf(e)})(e)}n.d(t,"a",function(){return a})},function(e,t,n){"use strict";function a(e,t){return(a=Object.setPrototypeOf||function(e,t){return e.__proto__=t,e})(e,t)}function o(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function");e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),t&&a(e,t)}n.d(t,"a",function(){return o})},function(e,t,n){"use strict";t.__esModule=!0;var c=r(n(5)),d=r(n(13)),a=r(n(9)),p=r(n(499)),o=r(n(500));function r(e){return e&&e.__esModule?e:{default:e}}p.default.Group=o.default,t.default=a.default.config(p.default,{transform:function(e,t){if("shape"in e){t("shape","text | warning | ghost","Button");var n=e,a=n.shape,o=n.type,r=(0,d.default)(n,["shape","type"]),i=o;("light"===o||"dark"===o||"secondary"===o&&"warning"===a)&&(i="normal");var s=void 0;"ghost"===a&&(s={primary:"dark",secondary:"dark",normal:"light",dark:"dark",light:"light"}[o||p.default.defaultProps.type]);var l="text"===a,u="warning"===a;e=(0,c.default)({type:i,ghost:s,text:l,warning:u},r)}return e}}),e.exports=t.default},function(e,t,n){"use strict";t.__esModule=!0;var x=m(n(5)),E=m(n(13)),a=m(n(9)),o=m(n(526)),r=m(n(531)),i=m(n(534)),s=m(n(535)),l=m(n(536)),u=m(n(537)),c=m(n(539)),d=m(n(542)),p=m(n(545)),f=m(n(335)),h=m(n(336));function m(e){return e&&e.__esModule?e:{default:e}}var g=[i.default,c.default,s.default,l.default,r.default,u.default,d.default,p.default].reduce(function(e,t){return e=t(e)},o.default);g.Base=o.default,g.fixed=i.default,g.lock=c.default,g.selection=s.default,g.expanded=l.default,g.tree=r.default,g.virtual=u.default,g.list=d.default,g.sticky=p.default,g.GroupHeader=f.default,g.GroupFooter=h.default,t.default=a.default.config(g,{componentName:"Table",transform:function(e,t){if("expandedRowKeys"in e){t("expandedRowKeys","openRowKeys","Table");var n=e,a=n.expandedRowKeys,o=(0,E.default)(n,["expandedRowKeys"]);e=(0,x.default)({openRowKeys:a},o)}if("onExpandedChange"in e){t("onExpandedChange","onRowOpen","Table");var r=e,i=r.onExpandedChange,s=(0,E.default)(r,["onExpandedChange"]);e=(0,x.default)({onRowOpen:i},s)}if("isLoading"in e){t("isLoading","loading","Table");var l=e,u=l.isLoading,c=(0,E.default)(l,["isLoading"]);e=(0,x.default)({loading:u},c)}if("indentSize"in e){t("indentSize","indent","Table");var d=e,p=d.indentSize,f=(0,E.default)(d,["indentSize"]);e=(0,x.default)({indent:p},f)}if("optimization"in e){t("optimization","pure","Table");var h=e,m=h.optimization,g=(0,E.default)(h,["optimization"]);e=(0,x.default)({pure:m},g)}if("getRowClassName"in e){t("getRowClassName","getRowProps","Table");var y=e,_=y.getRowClassName,v=y.getRowProps,b=(0,E.default)(y,["getRowClassName","getRowProps"]);if(_){e=(0,x.default)({getRowProps:function(){return(0,x.default)({className:_.apply(void 0,arguments)},v?v.apply(void 0,arguments):{})}},b)}else e=(0,x.default)({getRowProps:v},b)}if("getRowProps"in e){t("getRowProps","rowProps","Table in 1.15.0");var M=e,w=M.getRowProps,k=(0,E.default)(M,["getRowProps"]);e=(0,x.default)({rowProps:w},k)}if("getCellProps"in e){t("getCellProps","cellProps","Table in 1.15.0");var S=e,T=S.getCellProps,C=(0,E.default)(S,["getCellProps"]);e=(0,x.default)({cellProps:T},C)}return e}}),e.exports=t.default},function(e,t,n){"use strict";t.__esModule=!0;var l=c(n(5)),u=c(n(13)),a=c(n(9)),o=n(11),r=c(n(337)),i=c(n(338)),s=n(550);function c(e){return e&&e.__esModule?e:{default:e}}function d(i,s){if("closable"in i){s("closable","closeable","Dialog");var e=i,t=e.closable,n=(0,u.default)(e,["closable"]);i=(0,l.default)({closeable:t},n)}return["taLine truncated
/*! /*!
* jQuery JavaScript Library v3.4.1 * jQuery JavaScript Library v3.4.1
* https://jquery.com/ * https://jquery.com/
@@ -47,12 +47,12 @@
* *
* Date: 2019-04-08 * Date: 2019-04-08
*/ */
function(n){function d(e,t,n){var a="0x"+t-65536;return a!=a||n?t:a<0?String.fromCharCode(65536+a):String.fromCharCode(a>>10|55296,1023&a|56320)}function o(){w()}var e,f,b,r,i,h,p,m,M,l,u,w,k,s,S,g,c,y,_,T="sizzle"+1*new Date,v=n.document,C=0,a=0,x=le(),E=le(),L=le(),D=le(),N=function(e,t){return e===t&&(u=!0),0},O={}.hasOwnProperty,t=[],Y=t.pop,P=t.push,j=t.push,I=t.slice,A=function(e,t){for(var n=0,a=e.length;n<a;n++)if(e[n]===t)return n;return-1},R="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",H="[\\x20\\t\\r\\n\\f]",F="(?:\\\\.|[\\w-]|[^\0-\\xa0])+",z="\\["+H+"*("+F+")(?:"+H+"*([*^$|!~]?=)"+H+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+F+"))|)"+H+"*\\]",W=":("+F+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+z+")*)|.*)\\)|)",B=new RegExp(H+"+","g"),V=new RegExp("^"+H+"+|((?:^|[^\\\\])(?:\\\\.)*)"+H+"+$","g"),U=new RegExp("^"+H+"*,"+H+"*"),K=new RegExp("^"+H+"*([>+~]|"+H+")"+H+"*"),q=new RegExp(H+"|>"),G=new RegExp(W),J=new RegExp("^"+F+"$"),$={ID:new RegExp("^#("+F+")"),CLASS:new RegExp("^\\.("+F+")"),TAG:new RegExp("^("+F+"|[*])"),ATTR:new RegExp("^"+z),PSEUDO:new RegExp("^"+W),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+H+"*(even|odd|(([+-]|)(\\d*)n|)"+H+"*(?:([+-]|)"+H+"*(\\d+)|))"+H+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+H+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+H+"*((?:-\\d)?\\d*)"+H+"*\\)|)(?=[^-]|$)","i")},Q=/HTML$/i,X=/^(?:input|select|textarea|button)$/i,Z=/^h\d$/i,ee=/^[^{]+\{\s*\[native \w/,te=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ne=/[+~]/,ae=new RegExp("\\\\([\\da-f]{1,6}"+H+"?|("+H+")|.)","ig"),oe=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,re=function(e,t){return t?"\0"===e?"�":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},ie=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{j.apply(t=I.call(v.childNodes),v.childNodes),t[v.childNodes.length].nodeType}catch(e){j={apply:t.length?function(e,t){P.apply(e,I.call(t))}:function(e,t){for(var n=e.length,a=0;e[n++]=t[a++];);e.length=n-1}}}function se(t,e,n,a){var o,r,i,s,l,u,c,d=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!a&&((e?e.ownerDocument||e:v)!==k&&w(e),e=e||k,S)){if(11!==p&&(l=te.exec(t)))if(o=l[1]){if(9===p){if(!(i=e.getElementById(o)))return n;if(i.id===o)return n.push(i),n}else if(d&&(i=d.getElementById(o))&&_(e,i)&&i.id===o)return n.push(i),n}else{if(l[2])return j.apply(n,e.getElementsByTagName(t)),n;if((o=l[3])&&f.getElementsByClassName&&e.getElementsByClassName)return j.apply(n,e.getElementsByClassName(o)),n}if(f.qsa&&!D[t+" "]&&(!g||!g.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,d=e,1===p&&q.test(t)){for((s=e.getAttribute("id"))?s=s.replace(oe,re):e.setAttribute("id",s=T),r=(u=h(t)).length;r--;)u[r]="#"+s+" "+ve(u[r]);c=u.join(","),d=ne.test(t)&&ye(e.parentNode)||e}try{return j.apply(n,d.querySelectorAll(c)),n}catch(e){D(t,!0)}finally{s===T&&e.removeAttribute("id")}}}return m(t.replace(V,"$1"),e,n,a)}function le(){var a=[];return function e(t,n){return a.push(t+" ")>b.cacheLength&&delete e[a.shift()],e[t+" "]=n}}function ue(e){return e[T]=!0,e}function ce(e){var t=k.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function de(e,t){for(var n=e.split("|"),a=n.length;a--;)b.attrHandle[n[a]]=t}function pe(e,t){var n=t&&e,a=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(a)return a;if(n)for(;n=n.nextSibling;)if(n===t)return-1;return e?1:-1}function fe(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function me(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ie(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ge(i){return ue(function(r){return r=+r,ue(function(e,t){for(var n,a=i([],e.length,r),o=a.length;o--;)e[n=a[o]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&void 0!==e.getElementsByTagName&&e}for(e in f=se.support={},i=se.isXML=function(e){var t=e.namespaceURI,n=(e.ownerDocument||e).documentElement;return!Q.test(t||n&&n.nodeName||"HTML")},w=se.setDocument=function(e){var t,n,a=e?e.ownerDocument||e:v;return a!==k&&9===a.nodeType&&a.documentElement&&(s=(k=a).documentElement,S=!i(k),v!==k&&(n=k.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",o,!1):n.attachEvent&&n.attachEvent("onunload",o)),f.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),f.getElementsByTagName=ce(function(e){return e.appendChild(k.createComment("")),!e.getElLine truncated function(n){function d(e,t,n){var a="0x"+t-65536;return a!=a||n?t:a<0?String.fromCharCode(65536+a):String.fromCharCode(a>>10|55296,1023&a|56320)}function o(){w()}var e,f,b,r,i,h,p,m,M,l,u,w,k,s,S,g,c,y,_,T="sizzle"+1*new Date,v=n.document,C=0,a=0,x=le(),E=le(),L=le(),D=le(),N=function(e,t){return e===t&&(u=!0),0},O={}.hasOwnProperty,t=[],Y=t.pop,P=t.push,j=t.push,I=t.slice,A=function(e,t){for(var n=0,a=e.length;n<a;n++)if(e[n]===t)return n;return-1},R="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",H="[\\x20\\t\\r\\n\\f]",F="(?:\\\\.|[\\w-]|[^\0-\\xa0])+",z="\\["+H+"*("+F+")(?:"+H+"*([*^$|!~]?=)"+H+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+F+"))|)"+H+"*\\]",W=":("+F+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+z+")*)|.*)\\)|)",B=new RegExp(H+"+","g"),V=new RegExp("^"+H+"+|((?:^|[^\\\\])(?:\\\\.)*)"+H+"+$","g"),U=new RegExp("^"+H+"*,"+H+"*"),K=new RegExp("^"+H+"*([>+~]|"+H+")"+H+"*"),q=new RegExp(H+"|>"),G=new RegExp(W),J=new RegExp("^"+F+"$"),$={ID:new RegExp("^#("+F+")"),CLASS:new RegExp("^\\.("+F+")"),TAG:new RegExp("^("+F+"|[*])"),ATTR:new RegExp("^"+z),PSEUDO:new RegExp("^"+W),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+H+"*(even|odd|(([+-]|)(\\d*)n|)"+H+"*(?:([+-]|)"+H+"*(\\d+)|))"+H+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+H+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+H+"*((?:-\\d)?\\d*)"+H+"*\\)|)(?=[^-]|$)","i")},Q=/HTML$/i,X=/^(?:input|select|textarea|button)$/i,Z=/^h\d$/i,ee=/^[^{]+\{\s*\[native \w/,te=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ne=/[+~]/,ae=new RegExp("\\\\([\\da-f]{1,6}"+H+"?|("+H+")|.)","ig"),oe=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,re=function(e,t){return t?"\0"===e?"�":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},ie=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{j.apply(t=I.call(v.childNodes),v.childNodes),t[v.childNodes.length].nodeType}catch(e){j={apply:t.length?function(e,t){P.apply(e,I.call(t))}:function(e,t){for(var n=e.length,a=0;e[n++]=t[a++];);e.length=n-1}}}function se(t,e,n,a){var o,r,i,s,l,u,c,d=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!a&&((e?e.ownerDocument||e:v)!==k&&w(e),e=e||k,S)){if(11!==p&&(l=te.exec(t)))if(o=l[1]){if(9===p){if(!(i=e.getElementById(o)))return n;if(i.id===o)return n.push(i),n}else if(d&&(i=d.getElementById(o))&&_(e,i)&&i.id===o)return n.push(i),n}else{if(l[2])return j.apply(n,e.getElementsByTagName(t)),n;if((o=l[3])&&f.getElementsByClassName&&e.getElementsByClassName)return j.apply(n,e.getElementsByClassName(o)),n}if(f.qsa&&!D[t+" "]&&(!g||!g.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,d=e,1===p&&q.test(t)){for((s=e.getAttribute("id"))?s=s.replace(oe,re):e.setAttribute("id",s=T),r=(u=h(t)).length;r--;)u[r]="#"+s+" "+ve(u[r]);c=u.join(","),d=ne.test(t)&&ye(e.parentNode)||e}try{return j.apply(n,d.querySelectorAll(c)),n}catch(e){D(t,!0)}finally{s===T&&e.removeAttribute("id")}}}return m(t.replace(V,"$1"),e,n,a)}function le(){var a=[];return function e(t,n){return a.push(t+" ")>b.cacheLength&&delete e[a.shift()],e[t+" "]=n}}function ue(e){return e[T]=!0,e}function ce(e){var t=k.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function de(e,t){for(var n=e.split("|"),a=n.length;a--;)b.attrHandle[n[a]]=t}function pe(e,t){var n=t&&e,a=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(a)return a;if(n)for(;n=n.nextSibling;)if(n===t)return-1;return e?1:-1}function fe(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function me(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ie(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ge(i){return ue(function(r){return r=+r,ue(function(e,t){for(var n,a=i([],e.length,r),o=a.length;o--;)e[n=a[o]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&void 0!==e.getElementsByTagName&&e}for(e in f=se.support={},i=se.isXML=function(e){var t=e.namespaceURI,n=(e.ownerDocument||e).documentElement;return!Q.test(t||n&&n.nodeName||"HTML")},w=se.setDocument=function(e){var t,n,a=e?e.ownerDocument||e:v;return a!==k&&9===a.nodeType&&a.documentElement&&(s=(k=a).documentElement,S=!i(k),v!==k&&(n=k.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",o,!1):n.attachEvent&&n.attachEvent("onunload",o)),f.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),f.getElementsByTagName=ce(function(e){return e.appendChild(k.createComment("")),!e.getElLine truncated
/* /*
object-assign object-assign
(c) Sindre Sorhus (c) Sindre Sorhus
@license MIT @license MIT
*/var l=Object.getOwnPropertySymbols,u=Object.prototype.hasOwnProperty,c=Object.prototype.propertyIsEnumerable;e.exports=function(){try{if(!Object.assign)return!1;var e=new String("abc");if(e[5]="de","5"===Object.getOwnPropertyNames(e)[0])return!1;for(var t={},n=0;n<10;n++)t["_"+String.fromCharCode(n)]=n;if("0123456789"!==Object.getOwnPropertyNames(t).map(function(e){return t[e]}).join(""))return!1;var a={};return"abcdefghijklmnopqrst".split("").forEach(function(e){a[e]=e}),"abcdefghijklmnopqrst"===Object.keys(Object.assign({},a)).join("")}catch(e){return!1}}()?Object.assign:function(e,t){for(var n,a,o=function(e){if(null==e)throw new TypeError("Object.assign cannot be called with null or undefined");return Object(e)}(e),r=1;r<arguments.length;r++){for(var i in n=Object(arguments[r]))u.call(n,i)&&(o[i]=n[i]);if(l){a=l(n);for(var s=0;s<a.length;s++)c.call(n,a[s])&&(o[a[s]]=n[a[s]])}}return o}},function(e,t,n){"use strict";t.__esModule=!0;var b=a(n(5));t.default=function(e,t,n){var a=e.prefix,o=e.locale,r=e.pure,i=e.rtl,s=e.errorBoundary,l=t.nextPrefix,u=t.nextLocale,c=t.nextPure,d=t.nextWarning,p=t.nextRtl,f=t.nextErrorBoundary,h=a||l,m=void 0;u&&(m=u[n])&&(m.momentLocale=u.momentLocale);var g=void 0;o?g=w.obj.deepMerge({},M.default[n],m,o):m&&(g=w.obj.deepMerge({},M.default[n],m));var y="boolean"==typeof r?r:c,_="boolean"==typeof i?i:p,v=(0,b.default)({},k(f),k(s));"open"in v||(v.open=!1);return{prefix:h,locale:g,pure:y,rtl:_,warning:d,errorBoundary:v}};var M=a(n(35)),w=n(11);function a(e){return e&&e.__esModule?e:{default:e}}var k=function(e){return null==e?{}:"boolean"==typeof e?{open:e}:(0,b.default)({open:!0},e)};e.exports=t.default},function(e,t,n){"use strict";t.__esModule=!0,t.matches=t.hasDOM=void 0;var a,o=n(47),r=(a=o)&&a.__esModule?a:{default:a};t.hasClass=u,t.addClass=c,t.removeClass=d,t.toggleClass=function(e,t){if(!l||!e)return!1;{if(e.classList)return e.classList.toggle(t);var n=u(e,t);return n?d(e,t,!0):c(e,t,!0),!n}},t.getStyle=function(e,t){if(!l||!e)return null;var n=function(e){return e&&1===e.nodeType?window.getComputedStyle(e,null):{}}(e);return 1!==arguments.length?(t=h[t]?"cssFloat"in e.style?"cssFloat":"styleFloat":t,function(e,t,n){if(t=t.toLowerCase(),"auto"===n){if("height"===t)return e.offsetHeight||0;if("width"===t)return e.offsetWidth||0}t in f||(f[t]=p.test(t));return f[t]?parseFloat(n)||0:n}(e,t,n.getPropertyValue((0,i.hyphenate)(t))||e.style[(0,i.camelcase)(t)])):n},t.setStyle=m,t.scrollbar=function(){var e=document.createElement("div");m(e,{position:"absolute",width:"100px",height:"100px",overflow:"scroll",top:"-9999px"}),document.body.appendChild(e);var t=e.offsetWidth-e.clientWidth,n=e.offsetHeight-e.clientHeight;return document.body.removeChild(e),{width:t,height:n}},t.getOffset=function(e){var t=e.getBoundingClientRect(),n=e.ownerDocument.defaultView;return{top:t.top+n.pageYOffset,left:t.left+n.pageXOffset}};var i=n(167),s=n(79);var l=t.hasDOM="undefined"!=typeof window&&!!window.document&&!!document.createElement;function u(e,t){return!(!l||!e)&&(e.classList?e.classList.contains(t):-1<e.className.indexOf(t))}function c(e,t,n){l&&e&&(e.classList?e.classList.add(t):!0!==n&&u(e,t)||(e.className+=" "+t))}function d(e,t,n){l&&e&&(e.classList?e.classList.remove(t):!0!==n&&!u(e,t)||(e.className=e.className.replace(t,"").replace(/\s+/g," ").trim()))}t.matches=function(){var n=null;if(l){var e=document.body||document.head;n=e.matches?"matches":e.webkitMatchesSelector?"webkitMatchesSelector":e.msMatchesSelector?"msMatchesSelector":e.mozMatchesSelector?"mozMatchesSelector":null}return function(e,t){return!(!l||!e)&&(!!n&&e[n](t))}}();var p=/margin|padding|width|height|max|min|offset|size/i,f={left:1,top:1,right:1,bottom:1};var h={cssFloat:1,styleFloat:1,float:1};function m(n,e,t){if(!l||!n)return!1;"object"===(void 0===e?"undefined":(0,r.default)(e))&&2===arguments.length?(0,s.each)(e,function(e,t){return m(n,t,e)}):(e=h[e]?"cssFloat"in n.style?"cssFloat":"styleFloat":e,"number"==typeof t&&p.test(e)&&(t+="px"),n.style[(0,i.camelcase)(e)]=t)}},function(e,t,n){"use strict";t.__esModule=!0,t.camelcase=function(e){return/-/.test(e)?e.toLowerCase().replace(/-([a-z])/g,function(e,t){return t.toUpperCase()}):e||""},t.hyphenate=function(e){var t=(0,o.typeOf)(e);return"String"===t?e.replace(/([A-Z])/g,function(e){return"-"+e.toLowerCase()}):((0,a.warning)("[ hyphenate(str: string): string ] Expected arguments[0] to be a string but get a "+t+".It will return an empty string without any processing."),"")},t.template=function(e){var n=1<arguments.length&&void 0!==arguments[1]?arguments[1]:{},t=(0,o.typeOf)(e);return"String"===t?e.replace(/\{[a-z]*\}/g,function(e){var t=e.substring(1,e.length-1);return n[t]||""}):((0,a.warning)("[ template(tpl: string, object: object): string ] Expected arguments[0] to be a string but get a "+t+".It will return an empty string without any processing."),"")};var a=n(168),o=n(79)},function(e,t,n){"use strict";t.__esModule=!0,t.deprecated=function(e,t,n){if(!(Line truncated */var l=Object.getOwnPropertySymbols,u=Object.prototype.hasOwnProperty,c=Object.prototype.propertyIsEnumerable;e.exports=function(){try{if(!Object.assign)return!1;var e=new String("abc");if(e[5]="de","5"===Object.getOwnPropertyNames(e)[0])return!1;for(var t={},n=0;n<10;n++)t["_"+String.fromCharCode(n)]=n;if("0123456789"!==Object.getOwnPropertyNames(t).map(function(e){return t[e]}).join(""))return!1;var a={};return"abcdefghijklmnopqrst".split("").forEach(function(e){a[e]=e}),"abcdefghijklmnopqrst"===Object.keys(Object.assign({},a)).join("")}catch(e){return!1}}()?Object.assign:function(e,t){for(var n,a,o=function(e){if(null==e)throw new TypeError("Object.assign cannot be called with null or undefined");return Object(e)}(e),r=1;r<arguments.length;r++){for(var i in n=Object(arguments[r]))u.call(n,i)&&(o[i]=n[i]);if(l){a=l(n);for(var s=0;s<a.length;s++)c.call(n,a[s])&&(o[a[s]]=n[a[s]])}}return o}},function(e,t,n){"use strict";t.__esModule=!0;var b=a(n(5));t.default=function(e,t,n){var a=e.prefix,o=e.locale,r=e.pure,i=e.rtl,s=e.errorBoundary,l=t.nextPrefix,u=t.nextLocale,c=t.nextPure,d=t.nextWarning,p=t.nextRtl,f=t.nextErrorBoundary,h=a||l,m=void 0;u&&(m=u[n])&&(m.momentLocale=u.momentLocale);var g=void 0;o?g=w.obj.deepMerge({},M.default[n],m,o):m&&(g=w.obj.deepMerge({},M.default[n],m));var y="boolean"==typeof r?r:c,_="boolean"==typeof i?i:p,v=(0,b.default)({},k(f),k(s));"open"in v||(v.open=!1);return{prefix:h,locale:g,pure:y,rtl:_,warning:d,errorBoundary:v}};var M=a(n(35)),w=n(11);function a(e){return e&&e.__esModule?e:{default:e}}var k=function(e){return null==e?{}:"boolean"==typeof e?{open:e}:(0,b.default)({open:!0},e)};e.exports=t.default},function(e,t,n){"use strict";t.__esModule=!0,t.matches=t.hasDOM=void 0;var a,o=n(47),r=(a=o)&&a.__esModule?a:{default:a};t.hasClass=u,t.addClass=c,t.removeClass=d,t.toggleClass=function(e,t){if(!l||!e)return!1;{if(e.classList)return e.classList.toggle(t);var n=u(e,t);return n?d(e,t,!0):c(e,t,!0),!n}},t.getStyle=function(e,t){if(!l||!e)return null;var n=function(e){return e&&1===e.nodeType?window.getComputedStyle(e,null):{}}(e);return 1!==arguments.length?(t=h[t]?"cssFloat"in e.style?"cssFloat":"styleFloat":t,function(e,t,n){if(t=t.toLowerCase(),"auto"===n){if("height"===t)return e.offsetHeight||0;if("width"===t)return e.offsetWidth||0}t in f||(f[t]=p.test(t));return f[t]?parseFloat(n)||0:n}(e,t,n.getPropertyValue((0,i.hyphenate)(t))||e.style[(0,i.camelcase)(t)])):n},t.setStyle=m,t.scrollbar=function(){var e=document.createElement("div");m(e,{position:"absolute",width:"100px",height:"100px",overflow:"scroll",top:"-9999px"}),document.body.appendChild(e);var t=e.offsetWidth-e.clientWidth,n=e.offsetHeight-e.clientHeight;return document.body.removeChild(e),{width:t,height:n}},t.getOffset=function(e){var t=e.getBoundingClientRect(),n=e.ownerDocument.defaultView;return{top:t.top+n.pageYOffset,left:t.left+n.pageXOffset}};var i=n(167),s=n(79);var l=t.hasDOM="undefined"!=typeof window&&!!window.document&&!!document.createElement;function u(e,t){return!(!l||!e)&&(e.classList?e.classList.contains(t):-1<e.className.indexOf(t))}function c(e,t,n){l&&e&&(e.classList?e.classList.add(t):!0!==n&&u(e,t)||(e.className+=" "+t))}function d(e,t,n){l&&e&&(e.classList?e.classList.remove(t):!0!==n&&!u(e,t)||(e.className=e.className.replace(t,"").replace(/\s+/g," ").trim()))}t.matches=function(){var n=null;if(l){var e=document.body||document.head;n=e.matches?"matches":e.webkitMatchesSelector?"webkitMatchesSelector":e.msMatchesSelector?"msMatchesSelector":e.mozMatchesSelector?"mozMatchesSelector":null}return function(e,t){return!(!l||!e)&&(!!n&&e[n](t))}}();var p=/margin|padding|width|height|max|min|offset|size/i,f={left:1,top:1,right:1,bottom:1};var h={cssFloat:1,styleFloat:1,float:1};function m(n,e,t){if(!l||!n)return!1;"object"===(void 0===e?"undefined":(0,r.default)(e))&&2===arguments.length?(0,s.each)(e,function(e,t){return m(n,t,e)}):(e=h[e]?"cssFloat"in n.style?"cssFloat":"styleFloat":e,"number"==typeof t&&p.test(e)&&(t+="px"),n.style[(0,i.camelcase)(e)]=t)}},function(e,t,n){"use strict";t.__esModule=!0,t.camelcase=function(e){return/-/.test(e)?e.toLowerCase().replace(/-([a-z])/g,function(e,t){return t.toUpperCase()}):e||""},t.hyphenate=function(e){var t=(0,o.typeOf)(e);return"String"===t?e.replace(/([A-Z])/g,function(e){return"-"+e.toLowerCase()}):((0,a.warning)("[ hyphenate(str: string): string ] Expected arguments[0] to be a string but get a "+t+".It will return an empty string without any processing."),"")},t.template=function(e){var n=1<arguments.length&&void 0!==arguments[1]?arguments[1]:{},t=(0,o.typeOf)(e);return"String"===t?e.replace(/\{[a-z]*\}/g,function(e){var t=e.substring(1,e.length-1);return n[t]||""}):((0,a.warning)("[ template(tpl: string, object: object): string ] Expected arguments[0] to be a string but get a "+t+".It will return an empty string without any processing."),"")};var a=n(168),o=n(79)},function(e,t,n){"use strict";t.__esModule=!0,t.deprecated=function(e,t,n){if(!(Line truncated
/** @license React v16.8.6 /** @license React v16.8.6
* react.production.min.js * react.production.min.js
* *