⬆️ Upgrading dependencies. 升级nacos 1.1.0

.gogs/ISSUE_TEMPLATE.md

@@ -1,11 +1,28 @@
+特别说明： 为了方便其他群友查阅和工程师定位问题
+- 以下格式请按要求填写，务必提供回显步骤，修改了什么参数等
+- 只有图或者只有文字描述，看图识字 | 阅读理解的直接禁止登录私服
+- 问题范围请局限PigX 现有功能范围内，扩展业务问题属于超纲直接关闭
+- PigX 使用的组件均为开源组件，去对应组件的issue列表翻翻 可能会有更好的发现
+
+附录: [提问的艺术](https://github.com/ryanhanwu/How-To-Ask-Questions-The-Smart-Way/blob/master/README-zh_CN.md)  
+
+> A级 蠢问题：救命啊！我的笔记本电脑不能正常显示了！
+
+> B级 聪明问题：X.org 6.8.1 的鼠标光标会变形，某牌显卡 MV1005 芯片组。
+
+> C级 更聪明问题：X.org 6.8.1 的鼠标光标，在某牌显卡 MV1005 芯片组环境下 - 会变形。 
+
+---
+
 ### 版本信息  
 
 - pigx版本: 
 - 操作系统:
 - 是否修改包名: 
+- 此描述属于上述哪个等级: 
 
 
-### 报错信息    （注意格式化）
+### 报错信息  （截图/日志）
 
 ```  
 
@@ -13,7 +30,10 @@
 
 ```
 
-### 问题描述（包括回显步骤、截图 （此项没有直接关闭、不予解决））
+### 问题描述（回显步骤）
+
+
+
 
 
 

pigx-register/pom.xml

@@ -30,12 +30,12 @@
 		<dependency>
 			<groupId>com.alibaba.nacos</groupId>
 			<artifactId>nacos-config</artifactId>
-			<version>1.0.0</version>
+			<version>1.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.alibaba.nacos</groupId>
 			<artifactId>nacos-naming</artifactId>
-			<version>1.0.0</version>
+			<version>1.1.0</version>
 		</dependency>
 		<!-- log -->
 		<dependency>

pigx-register/src/main/java/com/alibaba/nacos/console/config/ConfigConstants.java

@@ -1,5 +1,27 @@
+/*
+ *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the pig4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: lengleng (wangiegie@gmail.com)
+ */
+
 package com.alibaba.nacos.console.config;
 
+/**
+ * @author lengleng
+ * @date 2019-07-16
+ */
+
 /**
  * @author lengleng
  * @date 2019-04-19
@@ -22,4 +44,4 @@ public interface ConfigConstants {
 	 */
 	String TOMCAT_ACCESS_LOG = "server.tomcat.accesslog.enabled";
 
-}
+}

pigx-register/src/main/java/com/alibaba/nacos/console/config/WebSecurityConfig.java

@@ -44,64 +44,64 @@ import org.springframework.security.web.authentication.UsernamePasswordAuthentic
 @EnableGlobalMethodSecurity(prePostEnabled = true)
 public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 
-    public static final String AUTHORIZATION_HEADER = "Authorization";
+	public static final String AUTHORIZATION_HEADER = "Authorization";
 
-    public static final String AUTHORIZATION_TOKEN = "access_token";
+	public static final String AUTHORIZATION_TOKEN = "access_token";
 
-    public static final String SECURITY_IGNORE_URLS_SPILT_CHAR = ",";
+	public static final String SECURITY_IGNORE_URLS_SPILT_CHAR = ",";
 
-    @Autowired
-    private CustomUserDetailsServiceImpl userDetailsService;
+	@Autowired
+	private CustomUserDetailsServiceImpl userDetailsService;
 
-    @Autowired
-    private JwtAuthenticationEntryPoint unauthorizedHandler;
+	@Autowired
+	private JwtAuthenticationEntryPoint unauthorizedHandler;
 
-    @Autowired
-    private JwtTokenUtils tokenProvider;
+	@Autowired
+	private JwtTokenUtils tokenProvider;
 
-    @Autowired
-    private Environment env;
+	@Autowired
+	private Environment env;
 
-    @Bean(name = BeanIds.AUTHENTICATION_MANAGER)
-    @Override
-    public AuthenticationManager authenticationManagerBean() throws Exception {
-        return super.authenticationManagerBean();
-    }
+	@Bean(name = BeanIds.AUTHENTICATION_MANAGER)
+	@Override
+	public AuthenticationManager authenticationManagerBean() throws Exception {
+		return super.authenticationManagerBean();
+	}
 
-    @Override
-    protected void configure(AuthenticationManagerBuilder auth) throws Exception {
-        auth.userDetailsService(userDetailsService).passwordEncoder(passwordEncoder());
-    }
+	@Override
+	protected void configure(AuthenticationManagerBuilder auth) throws Exception {
+		auth.userDetailsService(userDetailsService).passwordEncoder(passwordEncoder());
+	}
 
-    @Override
-    public void configure(WebSecurity web) {
-        String ignoreURLs = env.getProperty("nacos.security.ignore.urls", "/**");
-        for (String ignoreURL : ignoreURLs.trim().split(SECURITY_IGNORE_URLS_SPILT_CHAR)) {
-            web.ignoring().antMatchers(ignoreURL.trim());
-        }
-    }
+	@Override
+	public void configure(WebSecurity web) {
+		String ignoreUrls = env.getProperty("nacos.security.ignore.urls", "/**");
+		for (String ignoreUrl : ignoreUrls.trim().split(SECURITY_IGNORE_URLS_SPILT_CHAR)) {
+			web.ignoring().antMatchers(ignoreUrl.trim());
+		}
+	}
 
-    @Override
-    protected void configure(HttpSecurity http) throws Exception {
-        http
-            .authorizeRequests()
-            .anyRequest().authenticated().and()
-            // custom token authorize exception handler
-            .exceptionHandling()
-            .authenticationEntryPoint(unauthorizedHandler).and()
-            // since we use jwt, session is not necessary
-            .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS).and()
-            // since we use jwt, csrf is not necessary
-            .csrf().disable();
-        http.addFilterBefore(new JwtAuthenticationTokenFilter(tokenProvider), UsernamePasswordAuthenticationFilter.class);
+	@Override
+	protected void configure(HttpSecurity http) throws Exception {
+		http
+				.authorizeRequests()
+				.anyRequest().authenticated().and()
+				// custom token authorize exception handler
+				.exceptionHandling()
+				.authenticationEntryPoint(unauthorizedHandler).and()
+				// since we use jwt, session is not necessary
+				.sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS).and()
+				// since we use jwt, csrf is not necessary
+				.csrf().disable();
+		http.addFilterBefore(new JwtAuthenticationTokenFilter(tokenProvider), UsernamePasswordAuthenticationFilter.class);
 
-        // disable cache
-        http.headers().cacheControl();
-    }
+		// disable cache
+		http.headers().cacheControl();
+	}
 
-    @Bean
-    public PasswordEncoder passwordEncoder() {
-        return new BCryptPasswordEncoder();
-    }
+	@Bean
+	public PasswordEncoder passwordEncoder() {
+		return new BCryptPasswordEncoder();
+	}
 
 }

pigx-register/src/main/java/com/alibaba/nacos/console/controller/AuthController.java

@@ -15,18 +15,20 @@
  */
 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.console.config.WebSecurityConfig;
 import com.alibaba.nacos.console.utils.JwtTokenUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
-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.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -39,44 +41,44 @@ import javax.servlet.http.HttpServletResponse;
 @RequestMapping("/v1/auth")
 public class AuthController {
 
-    @Autowired
-    private JwtTokenUtils jwtTokenUtils;
-    @Autowired
-    private AuthenticationManager authenticationManager;
+	@Autowired
+	private JwtTokenUtils jwtTokenUtils;
+	@Autowired
+	private AuthenticationManager authenticationManager;
 
-    /**
-     * Whether the Nacos is in broken states or not, and cannot recover except by being restarted
-     *
-     * @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.
-     */
+	/**
+	 * Whether the Nacos is in broken states or not, and cannot recover except by being restarted
+	 *
+	 * @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.
+	 */
 
-    @ResponseBody
-    @RequestMapping(value = "login", method = RequestMethod.POST)
-    public RestResult<String> login(HttpServletRequest request, HttpServletResponse response) throws Exception {
-        String username = request.getParameter("username");
-        String password = request.getParameter("password");
+	@ResponseBody
+	@RequestMapping(value = "login", method = RequestMethod.POST)
+	public RestResult<String> login(HttpServletRequest request, HttpServletResponse response) throws Exception {
+		String username = request.getParameter("username");
+		String password = request.getParameter("password");
 
-        // 通过用户名和密码创建一个 Authentication 认证对象，实现类为 UsernamePasswordAuthenticationToken
-        UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(username, password);
-        RestResult<String> rr = new RestResult<String>();
+		// 通过用户名和密码创建一个 Authentication 认证对象，实现类为 UsernamePasswordAuthenticationToken
+		UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(username, password);
+		RestResult<String> rr = new RestResult<String>();
 
-        try {
-            //通过 AuthenticationManager（默认实现为ProviderManager）的authenticate方法验证 Authentication 对象
-            Authentication authentication = authenticationManager.authenticate(authenticationToken);
-            //将 Authentication 绑定到 SecurityContext
-            SecurityContextHolder.getContext().setAuthentication(authentication);
-            //生成Token
-            String token = jwtTokenUtils.createToken(authentication);
-            //将Token写入到Http头部
-            response.addHeader(WebSecurityConfig.AUTHORIZATION_HEADER, "Bearer " + token);
-            rr.setCode(200);
-            rr.setData("Bearer " + token);
-            return rr;
-        } catch (BadCredentialsException authentication) {
-            rr.setCode(401);
-            rr.setMessage("Login failed");
-            return rr;
-        }
-    }
+		try {
+			//通过 AuthenticationManager（默认实现为ProviderManager）的authenticate方法验证 Authentication 对象
+			Authentication authentication = authenticationManager.authenticate(authenticationToken);
+			//将 Authentication 绑定到 SecurityContext
+			SecurityContextHolder.getContext().setAuthentication(authentication);
+			//生成Token
+			String token = jwtTokenUtils.createToken(authentication);
+			//将Token写入到Http头部
+			response.addHeader(WebSecurityConfig.AUTHORIZATION_HEADER, "Bearer " + token);
+			rr.setCode(200);
+			rr.setData("Bearer " + token);
+			return rr;
+		} catch (BadCredentialsException authentication) {
+			rr.setCode(401);
+			rr.setMessage("Login failed");
+			return rr;
+		}
+	}
 }

pigx-register/src/main/java/com/alibaba/nacos/console/controller/HealthController.java

@@ -35,74 +35,74 @@ import javax.servlet.http.HttpServletRequest;
 @RequestMapping("/v1/console/health")
 public class HealthController {
 
-    private static final Logger logger = LoggerFactory.getLogger(HealthController.class);
+	private static final Logger logger = LoggerFactory.getLogger(HealthController.class);
 
-    private final PersistService persistService;
-    private final OperatorController apiCommands;
+	private final PersistService persistService;
+	private final OperatorController apiCommands;
 
-    @Autowired
-    public HealthController(PersistService persistService, OperatorController apiCommands) {
-        this.persistService = persistService;
-        this.apiCommands = apiCommands;
-    }
+	@Autowired
+	public HealthController(PersistService persistService, OperatorController apiCommands) {
+		this.persistService = persistService;
+		this.apiCommands = apiCommands;
+	}
 
-    /**
-     * Whether the Nacos is in broken states or not, and cannot recover except by being restarted
-     *
-     * @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.
-     */
-    @ResponseBody
-    @RequestMapping(value = "liveness", method = RequestMethod.GET)
-    public ResponseEntity liveness() {
-        return ResponseEntity.ok().body("OK");
-    }
+	/**
+	 * Whether the Nacos is in broken states or not, and cannot recover except by being restarted
+	 *
+	 * @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.
+	 */
+	@ResponseBody
+	@RequestMapping(value = "liveness", method = RequestMethod.GET)
+	public ResponseEntity liveness() {
+		return ResponseEntity.ok().body("OK");
+	}
 
-    /**
-     * Ready to receive the request or not
-     *
-     * @return HTTP code equal to 200 indicates that Nacos is ready. HTTP code equal to 500 indicates that Nacos is not
-     * ready.
-     */
-    @ResponseBody
-    @RequestMapping(value = "readiness", method = RequestMethod.GET)
-    public ResponseEntity readiness(HttpServletRequest request) {
-        boolean isConfigReadiness = isConfigReadiness();
-        boolean isNamingReadiness = isNamingReadiness(request);
+	/**
+	 * Ready to receive the request or not
+	 *
+	 * @return HTTP code equal to 200 indicates that Nacos is ready. HTTP code equal to 500 indicates that Nacos is not
+	 * ready.
+	 */
+	@ResponseBody
+	@RequestMapping(value = "readiness", method = RequestMethod.GET)
+	public ResponseEntity readiness(HttpServletRequest request) {
+		boolean isConfigReadiness = isConfigReadiness();
+		boolean isNamingReadiness = isNamingReadiness(request);
 
-        if (isConfigReadiness && isNamingReadiness) {
-            return ResponseEntity.ok().body("OK");
-        }
+		if (isConfigReadiness && isNamingReadiness) {
+			return ResponseEntity.ok().body("OK");
+		}
 
-        if (!isConfigReadiness && !isNamingReadiness) {
-            return ResponseEntity.status(500).body("Config and Naming are not in readiness");
-        }
+		if (!isConfigReadiness && !isNamingReadiness) {
+			return ResponseEntity.status(500).body("Config and Naming are not in readiness");
+		}
 
-        if (!isConfigReadiness) {
-            return ResponseEntity.status(500).body("Config is not in readiness");
-        }
+		if (!isConfigReadiness) {
+			return ResponseEntity.status(500).body("Config is not in readiness");
+		}
 
-        return ResponseEntity.status(500).body("Naming is not in readiness");
-    }
+		return ResponseEntity.status(500).body("Naming is not in readiness");
+	}
 
-    private boolean isConfigReadiness() {
-        // check db
-        try {
-            persistService.configInfoCount("");
-            return true;
-        } catch (Exception e) {
-            logger.error("Config health check fail.", e);
-        }
-        return false;
-    }
+	private boolean isConfigReadiness() {
+		// check db
+		try {
+			persistService.configInfoCount("");
+			return true;
+		} catch (Exception e) {
+			logger.error("Config health check fail.", e);
+		}
+		return false;
+	}
 
-    private boolean isNamingReadiness(HttpServletRequest request) {
-        try {
-            apiCommands.metrics(request);
-            return true;
-        } catch (Exception e) {
-            logger.error("Naming health check fail.", e);
-        }
-        return false;
-    }
+	private boolean isNamingReadiness(HttpServletRequest request) {
+		try {
+			apiCommands.metrics(request);
+			return true;
+		} catch (Exception e) {
+			logger.error("Naming health check fail.", e);
+		}
+		return false;
+	}
 }

pigx-register/src/main/java/com/alibaba/nacos/console/controller/NamespaceController.java

@@ -44,123 +44,123 @@ import java.util.UUID;
 @RequestMapping("/v1/console/namespaces")
 public class NamespaceController {
 
-    @Autowired
-    private transient PersistService persistService;
+	@Autowired
+	private transient PersistService persistService;
 
-    /**
-     * Get namespace list
-     *
-     * @param request  request
-     * @param response response
-     * @return namespace list
-     */
-    @ResponseBody
-    @RequestMapping(method = RequestMethod.GET)
-    public RestResult<List<Namespace>> getNamespaces(HttpServletRequest request, HttpServletResponse response) {
-        RestResult<List<Namespace>> rr = new RestResult<List<Namespace>>();
-        rr.setCode(200);
-        // TODO 获取用kp
-        List<TenantInfo> tenantInfos = persistService.findTenantByKp("1");
-        Namespace namespace0 = new Namespace("", "Public", 200, persistService.configInfoCount(""), 0);
-        List<Namespace> namespaces = new ArrayList<Namespace>();
-        namespaces.add(namespace0);
-        for (TenantInfo tenantInfo : tenantInfos) {
-            int configCount = persistService.configInfoCount(tenantInfo.getTenantId());
-            Namespace namespaceTmp = new Namespace(tenantInfo.getTenantId(), tenantInfo.getTenantName(), 200,
-                configCount, 2);
-            namespaces.add(namespaceTmp);
-        }
-        rr.setData(namespaces);
-        return rr;
-    }
+	/**
+	 * Get namespace list
+	 *
+	 * @param request  request
+	 * @param response response
+	 * @return namespace list
+	 */
+	@ResponseBody
+	@RequestMapping(method = RequestMethod.GET)
+	public RestResult<List<Namespace>> getNamespaces(HttpServletRequest request, HttpServletResponse response) {
+		RestResult<List<Namespace>> rr = new RestResult<List<Namespace>>();
+		rr.setCode(200);
+		// TODO 获取用kp
+		List<TenantInfo> tenantInfos = persistService.findTenantByKp("1");
+		Namespace namespace0 = new Namespace("", "public", 200, persistService.configInfoCount(""), 0);
+		List<Namespace> namespaces = new ArrayList<Namespace>();
+		namespaces.add(namespace0);
+		for (TenantInfo tenantInfo : tenantInfos) {
+			int configCount = persistService.configInfoCount(tenantInfo.getTenantId());
+			Namespace namespaceTmp = new Namespace(tenantInfo.getTenantId(), tenantInfo.getTenantName(), 200,
+					configCount, 2);
+			namespaces.add(namespaceTmp);
+		}
+		rr.setData(namespaces);
+		return rr;
+	}
 
-    /**
-     * get namespace all info by namespace id
-     *
-     * @param request     request
-     * @param response    response
-     * @param namespaceId namespaceId
-     * @return namespace all info
-     */
-    @ResponseBody
-    @RequestMapping(params = "show=all", method = RequestMethod.GET)
-    public NamespaceAllInfo getNamespace(HttpServletRequest request, HttpServletResponse response,
-                                         @RequestParam("namespaceId") String namespaceId) {
-        // TODO 获取用kp
-        if (StringUtils.isBlank(namespaceId)) {
-            NamespaceAllInfo namespaceTmp = new NamespaceAllInfo(namespaceId, "Public", 200, persistService.configInfoCount(""), 0,
-                "Public Namespace");
-            return namespaceTmp;
-        } else {
-            TenantInfo tenantInfo = persistService.findTenantByKp("1", namespaceId);
-            int configCount = persistService.configInfoCount(namespaceId);
-            NamespaceAllInfo namespaceTmp = new NamespaceAllInfo(namespaceId, tenantInfo.getTenantName(), 200,
-                configCount, 2, tenantInfo.getTenantDesc());
-            return namespaceTmp;
-        }
-    }
+	/**
+	 * get namespace all info by namespace id
+	 *
+	 * @param request     request
+	 * @param response    response
+	 * @param namespaceId namespaceId
+	 * @return namespace all info
+	 */
+	@ResponseBody
+	@RequestMapping(params = "show=all", method = RequestMethod.GET)
+	public NamespaceAllInfo getNamespace(HttpServletRequest request, HttpServletResponse response,
+										 @RequestParam("namespaceId") String namespaceId) {
+		// TODO 获取用kp
+		if (StringUtils.isBlank(namespaceId)) {
+			NamespaceAllInfo namespaceTmp = new NamespaceAllInfo(namespaceId, "Public", 200, persistService.configInfoCount(""), 0,
+					"Public Namespace");
+			return namespaceTmp;
+		} else {
+			TenantInfo tenantInfo = persistService.findTenantByKp("1", namespaceId);
+			int configCount = persistService.configInfoCount(namespaceId);
+			NamespaceAllInfo namespaceTmp = new NamespaceAllInfo(namespaceId, tenantInfo.getTenantName(), 200,
+					configCount, 2, tenantInfo.getTenantDesc());
+			return namespaceTmp;
+		}
+	}
 
-    /**
-     * create namespace
-     *
-     * @param request       request
-     * @param response      response
-     * @param namespaceName namespace Name
-     * @param namespaceDesc namespace Desc
-     * @return whether create ok
-     * @throws NacosException
-     */
-    @RequestMapping(method = RequestMethod.POST)
-    @ResponseBody
-    public Boolean createNamespace(HttpServletRequest request, HttpServletResponse response,
-                                   @RequestParam("namespaceName") String namespaceName,
-                                   @RequestParam(value = "namespaceDesc", required = false) String namespaceDesc)
-        throws NacosException {
-        // TODO 获取用kp
-        String namespaceId = UUID.randomUUID().toString();
-        persistService.insertTenantInfoAtomic("1", namespaceId, namespaceName, namespaceDesc, "nacos",
-            System.currentTimeMillis());
-        return true;
-    }
+	/**
+	 * create namespace
+	 *
+	 * @param request       request
+	 * @param response      response
+	 * @param namespaceName namespace Name
+	 * @param namespaceDesc namespace Desc
+	 * @return whether create ok
+	 * @throws NacosException
+	 */
+	@RequestMapping(method = RequestMethod.POST)
+	@ResponseBody
+	public Boolean createNamespace(HttpServletRequest request, HttpServletResponse response,
+								   @RequestParam("namespaceName") String namespaceName,
+								   @RequestParam(value = "namespaceDesc", required = false) String namespaceDesc)
+			throws NacosException {
+		// TODO 获取用kp
+		String namespaceId = UUID.randomUUID().toString();
+		persistService.insertTenantInfoAtomic("1", namespaceId, namespaceName, namespaceDesc, "nacos",
+				System.currentTimeMillis());
+		return true;
+	}
 
-    /**
-     * edit namespace
-     *
-     * @param request           request
-     * @param response          response
-     * @param namespace         namespace
-     * @param namespaceShowName namespace ShowName
-     * @param namespaceDesc     namespace Desc
-     * @return whether edit ok
-     * @throws NacosException NacosException
-     */
-    @RequestMapping(method = RequestMethod.PUT)
-    @ResponseBody
-    public Boolean editNamespace(HttpServletRequest request, HttpServletResponse response,
-                                 @RequestParam("namespace") String namespace,
-                                 @RequestParam("namespaceShowName") String namespaceShowName,
-                                 @RequestParam(value = "namespaceDesc", required = false) String namespaceDesc)
-        throws NacosException {
-        // TODO 获取用kp
-        persistService.updateTenantNameAtomic("1", namespace, namespaceShowName, namespaceDesc);
-        return true;
-    }
+	/**
+	 * edit namespace
+	 *
+	 * @param request           request
+	 * @param response          response
+	 * @param namespace         namespace
+	 * @param namespaceShowName namespace ShowName
+	 * @param namespaceDesc     namespace Desc
+	 * @return whether edit ok
+	 * @throws NacosException NacosException
+	 */
+	@RequestMapping(method = RequestMethod.PUT)
+	@ResponseBody
+	public Boolean editNamespace(HttpServletRequest request, HttpServletResponse response,
+								 @RequestParam("namespace") String namespace,
+								 @RequestParam("namespaceShowName") String namespaceShowName,
+								 @RequestParam(value = "namespaceDesc", required = false) String namespaceDesc)
+			throws NacosException {
+		// TODO 获取用kp
+		persistService.updateTenantNameAtomic("1", namespace, namespaceShowName, namespaceDesc);
+		return true;
+	}
 
-    /**
-     * del namespace by id
-     *
-     * @param request     request
-     * @param response    response
-     * @param namespaceId namespace Id
-     * @return whether del ok
-     * @throws NacosException NacosException
-     */
-    @RequestMapping(method = RequestMethod.DELETE)
-    @ResponseBody
-    public Boolean deleteConfig(HttpServletRequest request, HttpServletResponse response,
-                                @RequestParam("namespaceId") String namespaceId) throws NacosException {
-        persistService.removeTenantInfoAtomic("1", namespaceId);
-        return true;
-    }
+	/**
+	 * del namespace by id
+	 *
+	 * @param request     request
+	 * @param response    response
+	 * @param namespaceId namespace Id
+	 * @return whether del ok
+	 * @throws NacosException NacosException
+	 */
+	@RequestMapping(method = RequestMethod.DELETE)
+	@ResponseBody
+	public Boolean deleteConfig(HttpServletRequest request, HttpServletResponse response,
+								@RequestParam("namespaceId") String namespaceId) throws NacosException {
+		persistService.removeTenantInfoAtomic("1", namespaceId);
+		return true;
+	}
 
 }

pigx-register/src/main/java/com/alibaba/nacos/console/controller/ServerStateController.java

@@ -25,6 +25,7 @@ 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 java.util.HashMap;
 import java.util.Map;
 
@@ -36,25 +37,24 @@ import java.util.Map;
 @RequestMapping("/v1/console/server")
 public class ServerStateController {
 
-    private static final Logger logger = LoggerFactory.getLogger(ServerStateController.class);
+	private static final Logger logger = LoggerFactory.getLogger(ServerStateController.class);
 
 
-    public static String VERSION ;
+	public static String VERSION;
 
 
-    @ResponseBody
-    @RequestMapping(value = "state", method = RequestMethod.GET)
-    public ResponseEntity serverState() {
-        Map<String,String> serverState = new HashMap<String, String>(3);
-        serverState.put("standalone_mode",SystemUtils.STANDALONE_MODE ?
-            SystemUtils.STANDALONE_MODE_ALONE : SystemUtils.STANDALONE_MODE_CLUSTER);
+	@ResponseBody
+	@RequestMapping(value = "state", method = RequestMethod.GET)
+	public ResponseEntity serverState() {
+		Map<String, String> serverState = new HashMap<String, String>(3);
+		serverState.put("standalone_mode", SystemUtils.STANDALONE_MODE ?
+				SystemUtils.STANDALONE_MODE_ALONE : SystemUtils.STANDALONE_MODE_CLUSTER);
 
-        serverState.put("function_mode", SystemUtils.FUNCTION_MODE);
-        serverState.put("version", VersionUtils.VERSION);
-
-        return ResponseEntity.ok().body(serverState);
-    }
+		serverState.put("function_mode", SystemUtils.FUNCTION_MODE);
+		serverState.put("version", VersionUtils.VERSION);
 
+		return ResponseEntity.ok().body(serverState);
+	}
 
 
 }

pigx-register/src/main/java/com/alibaba/nacos/console/filter/JwtAuthenticationTokenFilter.java

@@ -35,46 +35,46 @@ import java.io.IOException;
  */
 public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
 
-    private static final String TOKEN_PREFIX = "Bearer ";
+	private static final String TOKEN_PREFIX = "Bearer ";
 
-    private JwtTokenUtils tokenProvider;
+	private JwtTokenUtils tokenProvider;
 
-    public JwtAuthenticationTokenFilter(JwtTokenUtils tokenProvider) {
-        this.tokenProvider = tokenProvider;
-    }
+	public JwtAuthenticationTokenFilter(JwtTokenUtils tokenProvider) {
+		this.tokenProvider = tokenProvider;
+	}
 
-    @Override
-    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain) throws IOException, ServletException {
-        String jwt = resolveToken(request);
+	@Override
+	protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain) throws IOException, ServletException {
+		String jwt = resolveToken(request);
 
-        if (jwt != null && !"".equals(jwt.trim()) && SecurityContextHolder.getContext().getAuthentication() == null) {
-            if (this.tokenProvider.validateToken(jwt)) {
-                /**
-                 * get auth info
-                 */
-                Authentication authentication = this.tokenProvider.getAuthentication(jwt);
-                /**
-                 * save user info to securityContext
-                 */
-                SecurityContextHolder.getContext().setAuthentication(authentication);
-            }
-        }
+		if (jwt != null && !"".equals(jwt.trim()) && SecurityContextHolder.getContext().getAuthentication() == null) {
+			if (this.tokenProvider.validateToken(jwt)) {
+				/**
+				 * get auth info
+				 */
+				Authentication authentication = this.tokenProvider.getAuthentication(jwt);
+				/**
+				 * save user info to securityContext
+				 */
+				SecurityContextHolder.getContext().setAuthentication(authentication);
+			}
+		}
 
-        chain.doFilter(request, response);
-    }
+		chain.doFilter(request, response);
+	}
 
-    /**
-     * Get token from header
-     */
-    private String resolveToken(HttpServletRequest request) {
-        String bearerToken = request.getHeader(WebSecurityConfig.AUTHORIZATION_HEADER);
-        if (StringUtils.hasText(bearerToken) && bearerToken.startsWith(TOKEN_PREFIX)) {
-            return bearerToken.substring(7);
-        }
-        String jwt = request.getParameter(WebSecurityConfig.AUTHORIZATION_TOKEN);
-        if (StringUtils.hasText(jwt)) {
-            return jwt;
-        }
-        return null;
-    }
+	/**
+	 * Get token from header
+	 */
+	private String resolveToken(HttpServletRequest request) {
+		String bearerToken = request.getHeader(WebSecurityConfig.AUTHORIZATION_HEADER);
+		if (StringUtils.hasText(bearerToken) && bearerToken.startsWith(TOKEN_PREFIX)) {
+			return bearerToken.substring(7);
+		}
+		String jwt = request.getParameter(WebSecurityConfig.AUTHORIZATION_TOKEN);
+		if (StringUtils.hasText(jwt)) {
+			return jwt;
+		}
+		return null;
+	}
 }

pigx-register/src/main/java/com/alibaba/nacos/console/model/Namespace.java

@@ -22,72 +22,72 @@ package com.alibaba.nacos.console.model;
  */
 public class Namespace {
 
-    private String namespace;
+	private String namespace;
 
-    private String namespaceShowName;
+	private String namespaceShowName;
 
-    private int quota;
+	private int quota;
 
-    private int configCount;
-    /**
-     * 0 : Global configuration， 1 : Default private namespace ，2 : Custom namespace
-     */
-    private int type;
+	private int configCount;
+	/**
+	 * 0 : Global configuration， 1 : Default private namespace ，2 : Custom namespace
+	 */
+	private int type;
 
-    public String getNamespaceShowName() {
-        return namespaceShowName;
-    }
+	public Namespace() {
+	}
 
-    public void setNamespaceShowName(String namespaceShowName) {
-        this.namespaceShowName = namespaceShowName;
-    }
+	public Namespace(String namespace, String namespaceShowName) {
+		this.namespace = namespace;
+		this.namespaceShowName = namespaceShowName;
+	}
 
-    public String getNamespace() {
-        return namespace;
-    }
+	public Namespace(String namespace, String namespaceShowName, int quota, int configCount, int type) {
+		this.namespace = namespace;
+		this.namespaceShowName = namespaceShowName;
+		this.quota = quota;
+		this.configCount = configCount;
+		this.type = type;
+	}
 
-    public void setNamespace(String namespace) {
-        this.namespace = namespace;
-    }
+	public String getNamespaceShowName() {
+		return namespaceShowName;
+	}
 
-    public Namespace() {
-    }
+	public void setNamespaceShowName(String namespaceShowName) {
+		this.namespaceShowName = namespaceShowName;
+	}
 
-    public Namespace(String namespace, String namespaceShowName) {
-        this.namespace = namespace;
-        this.namespaceShowName = namespaceShowName;
-    }
+	public String getNamespace() {
+		return namespace;
+	}
 
-    public Namespace(String namespace, String namespaceShowName, int quota, int configCount, int type) {
-        this.namespace = namespace;
-        this.namespaceShowName = namespaceShowName;
-        this.quota = quota;
-        this.configCount = configCount;
-        this.type = type;
-    }
+	public void setNamespace(String namespace) {
+		this.namespace = namespace;
+	}
 
-    public int getQuota() {
-        return quota;
-    }
+	public int getQuota() {
+		return quota;
+	}
 
-    public void setQuota(int quota) {
-        this.quota = quota;
-    }
+	public void setQuota(int quota) {
+		this.quota = quota;
+	}
 
-    public int getConfigCount() {
-        return configCount;
-    }
+	public int getConfigCount() {
+		return configCount;
+	}
 
-    public void setConfigCount(int configCount) {
-        this.configCount = configCount;
-    }
+	public void setConfigCount(int configCount) {
+		this.configCount = configCount;
+	}
 
-    public int getType() {
-        return type;
-    }
+	public int getType() {
+		return type;
+	}
 
-    public void setType(int type) {
-        this.type = type;
-    }
+	public void setType(int type) {
+		this.type = type;
+	}
 
 }

pigx-register/src/main/java/com/alibaba/nacos/console/model/NamespaceAllInfo.java

@@ -22,25 +22,23 @@ package com.alibaba.nacos.console.model;
  */
 public class NamespaceAllInfo extends Namespace {
 
-    private String namespaceDesc;
+	private String namespaceDesc;
 
-    public String getNamespaceDesc() {
-        return namespaceDesc;
-    }
+	public NamespaceAllInfo() {
+	}
 
-    public void setNamespaceDesc(String namespaceDesc) {
-        this.namespaceDesc = namespaceDesc;
-    }
+	public NamespaceAllInfo(String namespace, String namespaceShowName, int quota, int configCount, int type,
+							String namespaceDesc) {
+		super(namespace, namespaceShowName, quota, configCount, type);
+		this.namespaceDesc = namespaceDesc;
+	}
 
-    public NamespaceAllInfo() {
-    }
+	public String getNamespaceDesc() {
+		return namespaceDesc;
+	}
 
-    ;
-
-    public NamespaceAllInfo(String namespace, String namespaceShowName, int quota, int configCount, int type,
-                            String namespaceDesc) {
-        super(namespace, namespaceShowName, quota, configCount, type);
-        this.namespaceDesc = namespaceDesc;
-    }
+	public void setNamespaceDesc(String namespaceDesc) {
+		this.namespaceDesc = namespaceDesc;
+	}
 
 }

pigx-register/src/main/java/com/alibaba/nacos/console/security/CustomAuthenticationProvider.java

@@ -31,25 +31,25 @@ import org.springframework.stereotype.Component;
 @Component
 public class CustomAuthenticationProvider implements AuthenticationProvider {
 
-    @Autowired
-    private CustomUserDetailsServiceImpl userDetailsService;
+	@Autowired
+	private CustomUserDetailsServiceImpl userDetailsService;
 
-    @Override
-    public Authentication authenticate(Authentication authentication) throws AuthenticationException {
+	@Override
+	public Authentication authenticate(Authentication authentication) throws AuthenticationException {
 
-        String username = (String) authentication.getPrincipal();
-        String password = (String) authentication.getCredentials();
-        UserDetails userDetails = userDetailsService.loadUserByUsername(username);
+		String username = (String) authentication.getPrincipal();
+		String password = (String) authentication.getCredentials();
+		UserDetails userDetails = userDetailsService.loadUserByUsername(username);
 
-        if (!password.equals(userDetails.getPassword())) {
-            return new UsernamePasswordAuthenticationToken(username, null, null);
-        }
-        return null;
-    }
+		if (!password.equals(userDetails.getPassword())) {
+			return new UsernamePasswordAuthenticationToken(username, null, null);
+		}
+		return null;
+	}
 
-    @Override
-    public boolean supports(Class<?> aClass) {
-        return aClass.equals(UsernamePasswordAuthenticationToken.class);
-    }
+	@Override
+	public boolean supports(Class<?> aClass) {
+		return aClass.equals(UsernamePasswordAuthenticationToken.class);
+	}
 
 }

pigx-register/src/main/java/com/alibaba/nacos/console/security/CustomUserDetails.java

@@ -29,45 +29,45 @@ import java.util.Collection;
  */
 public class CustomUserDetails implements UserDetails {
 
-    private User user;
+	private User user;
 
-    public CustomUserDetails(User user) {
-        this.user = user;
-    }
+	public CustomUserDetails(User user) {
+		this.user = user;
+	}
 
-    @Override
-    public Collection<? extends GrantedAuthority> getAuthorities() {
-        // TODO: get authorities
-        return AuthorityUtils.commaSeparatedStringToAuthorityList("");
-    }
+	@Override
+	public Collection<? extends GrantedAuthority> getAuthorities() {
+		// TODO: get authorities
+		return AuthorityUtils.commaSeparatedStringToAuthorityList("");
+	}
 
-    @Override
-    public String getPassword() {
-        return user.getPassword();
-    }
+	@Override
+	public String getPassword() {
+		return user.getPassword();
+	}
 
-    @Override
-    public String getUsername() {
-        return user.getUsername();
-    }
+	@Override
+	public String getUsername() {
+		return user.getUsername();
+	}
 
-    @Override
-    public boolean isAccountNonExpired() {
-        return true;
-    }
+	@Override
+	public boolean isAccountNonExpired() {
+		return true;
+	}
 
-    @Override
-    public boolean isAccountNonLocked() {
-        return true;
-    }
+	@Override
+	public boolean isAccountNonLocked() {
+		return true;
+	}
 
-    @Override
-    public boolean isCredentialsNonExpired() {
-        return true;
-    }
+	@Override
+	public boolean isCredentialsNonExpired() {
+		return true;
+	}
 
-    @Override
-    public boolean isEnabled() {
-        return true;
-    }
+	@Override
+	public boolean isEnabled() {
+		return true;
+	}
 }

pigx-register/src/main/java/com/alibaba/nacos/console/security/CustomUserDetailsServiceImpl.java

@@ -32,15 +32,15 @@ import org.springframework.stereotype.Service;
 @Service
 public class CustomUserDetailsServiceImpl implements UserDetailsService {
 
-    @Autowired
-    private transient PersistService persistService;
+	@Autowired
+	private transient PersistService persistService;
 
-    @Override
-    public UserDetails loadUserByUsername(String userName) throws UsernameNotFoundException {
-        User user = persistService.findUserByUsername(userName);
-        if (user == null) {
-            throw new UsernameNotFoundException(userName);
-        }
-        return new CustomUserDetails(user);
-    }
+	@Override
+	public UserDetails loadUserByUsername(String userName) throws UsernameNotFoundException {
+		User user = persistService.findUserByUsername(userName);
+		if (user == null) {
+			throw new UsernameNotFoundException(userName);
+		}
+		return new CustomUserDetails(user);
+	}
 }

pigx-register/src/main/java/com/alibaba/nacos/console/security/JwtAuthenticationEntryPoint.java

@@ -34,13 +34,13 @@ import java.io.IOException;
 @Component
 public class JwtAuthenticationEntryPoint implements AuthenticationEntryPoint {
 
-    private static final Logger logger = LoggerFactory.getLogger(JwtAuthenticationEntryPoint.class);
+	private static final Logger logger = LoggerFactory.getLogger(JwtAuthenticationEntryPoint.class);
 
-    @Override
-    public void commence(HttpServletRequest httpServletRequest,
-                         HttpServletResponse httpServletResponse,
-                         AuthenticationException e) throws IOException, ServletException {
-        logger.error("Responding with unauthorized error. Message - {}", e.getMessage());
-        httpServletResponse.sendError(HttpServletResponse.SC_UNAUTHORIZED, "Unauthorized");
-    }
+	@Override
+	public void commence(HttpServletRequest httpServletRequest,
+						 HttpServletResponse httpServletResponse,
+						 AuthenticationException e) throws IOException, ServletException {
+		logger.error("Responding with unauthorized error. Message - {}", e.getMessage());
+		httpServletResponse.sendError(HttpServletResponse.SC_UNAUTHORIZED, "Unauthorized");
+	}
 }

pigx-register/src/main/java/com/alibaba/nacos/console/utils/JwtTokenUtils.java

@@ -38,10 +38,8 @@ import java.util.List;
 @Component
 public class JwtTokenUtils {
 
-	private final Logger log = LoggerFactory.getLogger(JwtTokenUtils.class);
-
 	private static final String AUTHORITIES_KEY = "auth";
-
+	private final Logger log = LoggerFactory.getLogger(JwtTokenUtils.class);
 	/**
 	 * secret key
 	 */
@@ -118,7 +116,7 @@ public class JwtTokenUtils {
 		try {
 			Jwts.parser().setSigningKey(secretKey).parseClaimsJws(token);
 			return true;
-		} catch (SecurityException e) {
+		} catch (SignatureException e) {
 			log.info("Invalid JWT signature.");
 			log.trace("Invalid JWT signature trace: {}", e);
 		} catch (MalformedJwtException e) {

pigx-register/src/main/java/com/alibaba/nacos/console/utils/PasswordEncoderUtil.java

@@ -24,7 +24,7 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
  */
 public class PasswordEncoderUtil {
 
-    public static void main(String[] args) {
-        System.out.println(new BCryptPasswordEncoder().encode("nacos"));
-    }
+	public static void main(String[] args) {
+		System.out.println(new BCryptPasswordEncoder().encode("nacos"));
+	}
 }

pigx-register/src/main/resources/bootstrap.yml

@@ -4,8 +4,10 @@ nacos:
     eventTaskInterval: 10
     labelTaskInterval: 300
     loadDataAtStart: false
+  security: # 删除此配置无需登录验证
+    ignore:
+      urls: /,/**/*.css,/**/*.js,/**/*.html,/**/*.map,/**/*.svg,/**/*.png,/**/*.ico,/console-fe/public/**,/v1/auth/login,/v1/console/health/**,/v1/cs/**,/v1/ns/**,/v1/cmdb/**,/actuator/**,/v1/console/server/**
 
-# 数据源相关配置
 db:
   num: 1
   user: root
@@ -21,4 +23,5 @@ spring:
 
 server:
   tomcat:
-    basedir: logs
+    basedir: logs
+

pigx-register/src/main/resources/static/console-fe/package.json

@@ -75,6 +75,7 @@
     "react-router-dom": "^4.3.1",
     "react-router-redux": "^4.0.8",
     "redux": "^4.0.1",
-    "redux-thunk": "^2.3.0"
+    "redux-thunk": "^2.3.0",
+    "yamljs": "^0.3.0"
   }
 }

pigx-register/src/main/resources/static/console-fe/public/img/TB118jPv_mWBKNjSZFBXXXxUFXa-2000-390.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2000 390.21"><defs><style>.cls-1{fill:#fff}.cls-2{fill:url(#未命名的渐变_7)}</style><linearGradient id="未命名的渐变_7" x1="816.73" y1="195.1" x2="1492.16" y2="195.1" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#4190ff"/><stop offset="1" stop-color="#1be1f6"/></linearGradient></defs><g id="图层_2" data-name="图层 2"><g id="图层_1-2" data-name="图层 1"><path class="cls-1" d="M1788 389.24h-175.45v-77.1H1788c7.13 0 17.72-1.53 26.06-5.83 8.08-4.17 16.35-10.47 16.35-32.72 0-21.89-8.25-28-16.31-32-7.22-3.59-17.1-5.59-27.1-5.59h-69.4c-5.4 0-33.74-.78-61.47-16.17-36.18-20.08-56.13-55.13-56.13-100.46 0-45.17 19.81-80.33 55.78-100.75a133.14 133.14 0 0 1 61.8-16.83h161.92v77.1h-161.76c-.77 0-13.5.64-24.5 7.14-7.5 4.44-16.12 11.39-16.12 33.34s8.58 28.58 16.05 32.83c9.44 5.37 20.87 6.65 24.48 6.69H1787c22.16 0 43.38 4.73 61.37 13.67 38.12 18.94 59.11 54.2 59.11 101 0 46.59-20.64 81.92-58.11 101.25-24.31 12.56-48.91 14.43-61.37 14.43zm-1498.84-3.85c-11.54 0-23.71-3.26-31.17-12.66L72.29 146.09l1 241.22H1l-1-347C0 23.94 9.41 11.27 24.9 5.87s33.65-1.38 43.85 11.47l184.74 228.57V2h72.29l1 346.76c0 16.4-9.41 29.08-24.9 34.48a38.48 38.48 0 0 1-12.72 2.15z"/><path class="cls-2" d="M937.33 390.21c-107.58 0-195.1-87.52-195.1-195.1S829.75 0 937.33 0a193.92 193.92 0 0 1 137.17 56.36l.16.15 52.64 52.64-54.52 54.52-52.56-52.56a118 118 0 1 0 .56 167.43l53.91-53.91 54.52 54.52-53.91 53.91a193.83 193.83 0 0 1-137.97 57.15z"/><path class="cls-2" d="M1379.86 390.21a194 194 0 0 1-137-56.17l-.38-.38-137.2-139.15L1241.9 57.14A193.83 193.83 0 0 1 1379.86 0C1487.44 0 1575 87.52 1575 195.1s-87.56 195.11-195.14 195.11zm-82.66-110.9a118 118 0 1 0-.76-167.67l-82.64 83.1z"/><path class="cls-1" d="M442.45 386.35L552.52 98.73a84.56 84.56 0 0 1 5.35-10.8 79.54 79.54 0 0 1 4.62 9.35l111.4 289.07h82.88L634.2 68.95A164.41 164.41 0 0 0 619 40.2C597.63 8.45 573.9 1.79 557.75 1.79c-29.44 0-49.78 21.48-61.67 39.5a172.83 172.83 0 0 0-15.37 29.34L359.64 386.35z"/><circle cx="1966.27" cy="356.47" r="33.73" fill="#1be1f6"/></g></g></svg>

pigx-register/src/main/resources/static/console-fe/public/index.html

@@ -19,7 +19,7 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<meta http-equiv="X-UA-Compatible" content="ie=edge">
 	<title>Nacos</title>
-	<link rel="shortcut icon" href="//www.aliyun.com/favicon.ico" type="image/x-icon" />
+	<link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon" />
   <link rel="stylesheet" type="text/css" href="css/bootstrap.css">
 	<link rel="stylesheet" type="text/css" href="css/console1412.css">
 	<!-- 第三方css开始 -->