⬆️ Upgrading dependencies, spring cloud alibaba 2.1.0

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,19 +15,20 @@
  */
 package com.alibaba.nacos.console.controller;
 
-import com.alibaba.nacos.config.server.model.RestResult;
 import com.alibaba.nacos.console.config.WebSecurityConfig;
+import com.alibaba.nacos.config.server.model.RestResult;
+import com.alibaba.nacos.console.security.CustomUserDetailsServiceImpl;
 import com.alibaba.nacos.console.utils.JwtTokenUtils;
+
+import com.alibaba.nacos.console.utils.PasswordEncoderUtil;
 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.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.security.core.userdetails.UserDetails;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -41,44 +42,75 @@ 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;
+    @Autowired
+    private CustomUserDetailsServiceImpl userDetailsService;
 
-	/**
-	 * 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;
+        }
+    }
+
+    @ResponseBody
+    @RequestMapping(value = "password", method = RequestMethod.PUT)
+    public RestResult<String> updatePassword(HttpServletRequest request, HttpServletResponse response,
+                                             @RequestParam(value = "oldPassword", required = true) String oldPassword,
+                                             @RequestParam(value = "newPassword", required = true) String newPassword) throws Exception {
+
+        RestResult<String> rr = new RestResult<String>();
+        Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+        String username = ((UserDetails) principal).getUsername();
+        UserDetails userDetails = userDetailsService.loadUserByUsername(username);
+        String password = userDetails.getPassword();
+
+        // TODO: throw out more fine grained exceptions
+        try {
+            if (PasswordEncoderUtil.matches(oldPassword, password)) {
+                userDetailsService.updateUserPassword(username, PasswordEncoderUtil.encode(newPassword));
+                rr.setCode(200);
+                rr.setMessage("Update password success");
+            } else {
+                rr.setCode(401);
+                rr.setMessage("Old password is invalid");
+            }
+        } catch (Exception e) {
+            rr.setCode(500);
+            rr.setMessage("Update userpassword 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,7 +25,6 @@ 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;
 
@@ -37,24 +36,25 @@ 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);
+        serverState.put("function_mode", SystemUtils.FUNCTION_MODE);
+        serverState.put("version", VersionUtils.VERSION);
+
+        return ResponseEntity.ok().body(serverState);
+    }
 
-		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, bearerToken.length());
+        }
+        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 Namespace() {
-	}
+    public String getNamespaceShowName() {
+        return namespaceShowName;
+    }
 
-	public Namespace(String namespace, String namespaceShowName) {
-		this.namespace = namespace;
-		this.namespaceShowName = namespaceShowName;
-	}
+    public void setNamespaceShowName(String namespaceShowName) {
+        this.namespaceShowName = namespaceShowName;
+    }
 
-	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 String getNamespace() {
+        return namespace;
+    }
 
-	public String getNamespaceShowName() {
-		return namespaceShowName;
-	}
+    public void setNamespace(String namespace) {
+        this.namespace = namespace;
+    }
 
-	public void setNamespaceShowName(String namespaceShowName) {
-		this.namespaceShowName = namespaceShowName;
-	}
+    public Namespace() {
+    }
 
-	public String getNamespace() {
-		return namespace;
-	}
+    public Namespace(String namespace, String namespaceShowName) {
+        this.namespace = namespace;
+        this.namespaceShowName = namespaceShowName;
+    }
 
-	public void setNamespace(String namespace) {
-		this.namespace = 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 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,23 +22,23 @@ package com.alibaba.nacos.console.model;
  */
 public class NamespaceAllInfo extends Namespace {
 
-	private String namespaceDesc;
+    private String 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;
+    }
 
-	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;
+    }
 
 }

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,19 @@ 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);
+    }
+
+    public void updateUserPassword(String username, String password) throws Exception {
+        persistService.updateUserPassword(username, password);
+    }
 }

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,100 +38,102 @@ import java.util.List;
 @Component
 public class JwtTokenUtils {
 
-	private static final String AUTHORITIES_KEY = "auth";
-	private final Logger log = LoggerFactory.getLogger(JwtTokenUtils.class);
-	/**
-	 * secret key
-	 */
-	private String secretKey;
+    private final Logger log = LoggerFactory.getLogger(JwtTokenUtils.class);
 
-	/**
-	 * Token validity time(ms)
-	 */
-	private long tokenValidityInMilliseconds;
+    private static final String AUTHORITIES_KEY = "auth";
 
-	@PostConstruct
-	public void init() {
-		this.secretKey = "SecretKey012345678901234567890123456789012345678901234567890123456789";
-		this.tokenValidityInMilliseconds = 1000 * 60 * 30L;
-	}
+    /**
+     * secret key
+     */
+    private String secretKey;
 
-	/**
-	 * Create token
-	 *
-	 * @param authentication auth info
-	 * @return token
-	 */
-	public String createToken(Authentication authentication) {
-		/**
-		 * Current time
-		 */
-		long now = (new Date()).getTime();
-		/**
-		 * Validity date
-		 */
-		Date validity;
-		validity = new Date(now + this.tokenValidityInMilliseconds);
+    /**
+     * Token validity time(ms)
+     */
+    private long tokenValidityInMilliseconds;
 
-		/**
-		 * create token
-		 */
-		return Jwts.builder()
-				.setSubject(authentication.getName())
-				.claim(AUTHORITIES_KEY, "")
-				.setExpiration(validity)
-				.signWith(SignatureAlgorithm.HS256, secretKey)
-				.compact();
-	}
+    @PostConstruct
+    public void init() {
+        this.secretKey = "SecretKey012345678901234567890123456789012345678901234567890123456789";
+        this.tokenValidityInMilliseconds = 1000 * 60 * 30L;
+    }
 
-	/**
-	 * Get auth Info
-	 *
-	 * @param token token
-	 * @return auth info
-	 */
-	public Authentication getAuthentication(String token) {
-		/**
-		 *  parse the payload of token
-		 */
-		Claims claims = Jwts.parser()
-				.setSigningKey(secretKey)
-				.parseClaimsJws(token)
-				.getBody();
+    /**
+     * Create token
+     *
+     * @param authentication auth info
+     * @return token
+     */
+    public String createToken(Authentication authentication) {
+        /**
+         * Current time
+         */
+        long now = (new Date()).getTime();
+        /**
+         * Validity date
+         */
+        Date validity;
+        validity = new Date(now + this.tokenValidityInMilliseconds);
 
-		List<GrantedAuthority> authorities = AuthorityUtils.commaSeparatedStringToAuthorityList((String) claims.get(AUTHORITIES_KEY));
+        /**
+         * create token
+         */
+        return Jwts.builder()
+            .setSubject(authentication.getName())
+            .claim(AUTHORITIES_KEY, "")
+            .setExpiration(validity)
+            .signWith(SignatureAlgorithm.HS256, secretKey)
+            .compact();
+    }
+
+    /**
+     * Get auth Info
+     *
+     * @param token token
+     * @return auth info
+     */
+    public Authentication getAuthentication(String token) {
+        /**
+         *  parse the payload of token
+         */
+        Claims claims = Jwts.parser()
+            .setSigningKey(secretKey)
+            .parseClaimsJws(token)
+            .getBody();
+
+        List<GrantedAuthority> authorities = AuthorityUtils.commaSeparatedStringToAuthorityList((String) claims.get(AUTHORITIES_KEY));
 
 
-		User principal = new User(claims.getSubject(), "", authorities);
-		return new UsernamePasswordAuthenticationToken(principal, "", authorities);
-	}
+        User principal = new User(claims.getSubject(), "", authorities);
+        return new UsernamePasswordAuthenticationToken(principal, "", authorities);
+    }
 
-	/**
-	 * validate token
-	 *
-	 * @param token token
-	 * @return whether valid
-	 */
-	public boolean validateToken(String token) {
-		try {
-			Jwts.parser().setSigningKey(secretKey).parseClaimsJws(token);
-			return true;
-		} catch (SignatureException e) {
-			log.info("Invalid JWT signature.");
-			log.trace("Invalid JWT signature trace: {}", e);
-		} catch (MalformedJwtException e) {
-			log.info("Invalid JWT token.");
-			log.trace("Invalid JWT token trace: {}", e);
-		} catch (ExpiredJwtException e) {
-			log.info("Expired JWT token.");
-			log.trace("Expired JWT token trace: {}", e);
-		} catch (UnsupportedJwtException e) {
-			log.info("Unsupported JWT token.");
-			log.trace("Unsupported JWT token trace: {}", e);
-		} catch (IllegalArgumentException e) {
-			log.info("JWT token compact of handler are invalid.");
-			log.trace("JWT token compact of handler are invalid trace: {}", e);
-		}
-		return false;
-	}
+    /**
+     * validate token
+     *
+     * @param token token
+     * @return whether valid
+     */
+    public boolean validateToken(String token) {
+        try {
+            Jwts.parser().setSigningKey(secretKey).parseClaimsJws(token);
+            return true;
+        } catch (SignatureException e) {
+            log.info("Invalid JWT signature.");
+            log.trace("Invalid JWT signature trace: {}", e);
+        } catch (MalformedJwtException e) {
+            log.info("Invalid JWT token.");
+            log.trace("Invalid JWT token trace: {}", e);
+        } catch (ExpiredJwtException e) {
+            log.info("Expired JWT token.");
+            log.trace("Expired JWT token trace: {}", e);
+        } catch (UnsupportedJwtException e) {
+            log.info("Unsupported JWT token.");
+            log.trace("Unsupported JWT token trace: {}", e);
+        } catch (IllegalArgumentException e) {
+            log.info("JWT token compact of handler are invalid.");
+            log.trace("JWT token compact of handler are invalid trace: {}", e);
+        }
+        return false;
+    }
 }

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

@@ -24,7 +24,15 @@ 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"));
+    }
+
+    public static Boolean matches(String raw, String encoded) {
+        return new BCryptPasswordEncoder().matches(raw, encoded);
+    }
+
+    public static String encode(String raw) {
+        return new BCryptPasswordEncoder().encode(raw);
+    }
 }