日志优化

maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/MaxKeyApplication.java

@@ -38,13 +38,13 @@ import jakarta.servlet.ServletException;
 @EnableDiscoveryClient
 @MapperScan("org.dromara.maxkey.persistence.mapper,")
 public class MaxKeyApplication extends SpringBootServletInitializer {
-    private static final Logger _logger = LoggerFactory.getLogger(MaxKeyApplication.class);
+    private static final Logger logger = LoggerFactory.getLogger(MaxKeyApplication.class);
 
     /**
      * @param args start parameter 
      */
     public static void main(String[] args) {
-        _logger.info("Start MaxKey Application ...");
+        logger.info("Start MaxKey Application ...");
         
         VFS.addImplClass(SpringBootVFS.class);
         ConfigurableApplicationContext applicationContext = 
@@ -53,12 +53,12 @@ public class MaxKeyApplication extends SpringBootServletInitializer {
         try {
             initWebContext.init(null);
         } catch (ServletException e) {
-            _logger.error("ServletException", e);
+            logger.error("ServletException", e);
         }
-        _logger.info("MaxKey at {}" , new DateTime());
-        _logger.info("MaxKey Server Port {}"
+        logger.info("MaxKey at {}" , new DateTime());
+        logger.info("MaxKey Server Port {}"
         		,applicationContext.getBean(ApplicationConfig.class).getPort());
-        _logger.info("MaxKey started.");
+        logger.info("MaxKey started.");
     }
 
     protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {

maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyConfig.java

@@ -74,7 +74,7 @@ import org.springframework.security.crypto.password.PasswordEncoder;
         "org.maxkey.authz.token.endpoint"
 })
 public class MaxKeyConfig  implements InitializingBean {
-    private static final  Logger _logger = LoggerFactory.getLogger(MaxKeyConfig.class);
+    private static final  Logger logger = LoggerFactory.getLogger(MaxKeyConfig.class);
     
 
     @Bean
@@ -91,7 +91,7 @@ public class MaxKeyConfig  implements InitializingBean {
                 int period) {
         
         OtpKeyUriFormat otpKeyUriFormat=new OtpKeyUriFormat(type,issuer,domain,digits,period);
-        _logger.debug("OTP KeyUri Format " + otpKeyUriFormat);
+        logger.debug("OTP KeyUri Format {}" , otpKeyUriFormat);
         return otpKeyUriFormat;
     }
     
@@ -107,7 +107,7 @@ public class MaxKeyConfig  implements InitializingBean {
                 MailOtpAuthnService otpAuthnService,
                 LdapContextService ldapContextService) {
     	LdapAuthenticationRealmService ldapRealmService = new LdapAuthenticationRealmService(ldapContextService);
-        JdbcAuthenticationRealm authenticationRealm = new JdbcAuthenticationRealm(
+        return new JdbcAuthenticationRealm(
         		passwordEncoder,
         		passwordPolicyValidator,
         		loginService,
@@ -116,8 +116,6 @@ public class MaxKeyConfig  implements InitializingBean {
         		jdbcTemplate,
         		ldapRealmService
         	);
-        
-        return authenticationRealm;
     }
     
 	@Bean
@@ -127,7 +125,7 @@ public class MaxKeyConfig  implements InitializingBean {
                 @Value("${maxkey.otp.policy.period:30}")
                 int period) {
 	    TimeBasedOtpAuthn tfaOtpAuthn = new TimeBasedOtpAuthn(digits , period);
-	    _logger.debug("TimeBasedOtpAuthn inited.");
+	    logger.debug("TimeBasedOtpAuthn inited.");
         return tfaOtpAuthn;
     }
     
@@ -141,7 +139,7 @@ public class MaxKeyConfig  implements InitializingBean {
                 @Value("${maxkey.server.persistence}") int persistence,
                 RedisConnectionFactory redisConnFactory) {    
         AbstractOtpAuthn tfaOtpAuthn  = new TimeBasedOtpAuthn(digits , period);
-        _logger.debug("TimeBasedOtpAuthn inited.");
+        logger.debug("TimeBasedOtpAuthn inited.");
 
         if (persistence == ConstsPersistence.REDIS) {
             RedisOtpTokenStore redisOptTokenStore = new RedisOtpTokenStore(redisConnFactory);
@@ -171,16 +169,16 @@ public class MaxKeyConfig  implements InitializingBean {
                 messageTemplate = bufferedReader.lines().collect(Collectors.joining("\n"));
                 bufferedReader.close();
             } catch (IOException e) {
-                 _logger.error("mailOtpAuthn IOException ",e);
+                 logger.error("mailOtpAuthn IOException ",e);
             }
         }
-        _logger.trace("messageTemplate \n" +messageTemplate);
+        logger.trace("messageTemplate \n {}"  ,messageTemplate);
         MailOtpAuthn mailOtpAuthn = new MailOtpAuthn();
         mailOtpAuthn.setSubject(messageSubject);
         mailOtpAuthn.setMessageTemplate(messageTemplate);
         mailOtpAuthn.setEmailConfig(emailConfig);
         mailOtpAuthn.setInterval(messageValidity);
-        _logger.debug("MailOtpAuthn inited.");
+        logger.debug("MailOtpAuthn inited.");
         return mailOtpAuthn;
     }
     
@@ -204,11 +202,11 @@ public class MaxKeyConfig  implements InitializingBean {
         kerberosProxy.setUserdomain(userDomain);
         kerberosProxy.setRedirectUri(redirectUri);
         
-        List<KerberosProxy> kerberosProxysList = new ArrayList<KerberosProxy>();
+        List<KerberosProxy> kerberosProxysList = new ArrayList<>();
         kerberosProxysList.add(kerberosProxy);
         kerberosService.setKerberosProxys(kerberosProxysList);
         
-        _logger.debug("RemoteKerberosService inited.");
+        logger.debug("RemoteKerberosService inited.");
         return kerberosService;
     }
     

maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyMvcConfig.java

@@ -44,7 +44,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 @EnableWebMvc
 @AutoConfiguration
 public class MaxKeyMvcConfig implements WebMvcConfigurer {
-    private static final  Logger _logger = LoggerFactory.getLogger(MaxKeyMvcConfig.class);
+    private static final  Logger logger = LoggerFactory.getLogger(MaxKeyMvcConfig.class);
    
     @Value("${maxkey.login.basic.enable:false}")
     private boolean basicEnable;
@@ -75,27 +75,27 @@ public class MaxKeyMvcConfig implements WebMvcConfigurer {
     
     @Override
     public void addResourceHandlers(ResourceHandlerRegistry registry) {
-    	_logger.debug("add Resource Handlers");
-        _logger.debug("add statics");
+    	logger.debug("add Resource Handlers");
+        logger.debug("add statics");
         registry.addResourceHandler("/static/**")
                 .addResourceLocations("classpath:/static/");
         
-        _logger.debug("add templates");
+        logger.debug("add templates");
         registry.addResourceHandler("/templates/**")
                 .addResourceLocations("classpath:/templates/");
         
-        _logger.debug("add swagger");
+        logger.debug("add swagger");
         registry.addResourceHandler("swagger-ui.html")
                 .addResourceLocations("classpath:/META-INF/resources/");
         
-        _logger.debug("add knife4j");
+        logger.debug("add knife4j");
         registry.addResourceHandler("doc.html")
         		.addResourceLocations("classpath:/META-INF/resources/");
         
         registry.addResourceHandler("/webjars/**")
         		.addResourceLocations("classpath:/META-INF/resources/webjars/");
         
-        _logger.debug("add Resource Handler finished .");
+        logger.debug("add Resource Handler finished .");
     }
 
     @Override
@@ -103,7 +103,7 @@ public class MaxKeyMvcConfig implements WebMvcConfigurer {
         //addPathPatterns 用于添加拦截规则 ， 先把所有路径都加入拦截， 再一个个排除
         //excludePathPatterns 表示改路径不用拦截
         
-        _logger.debug("add Http Kerberos Entry Point");
+        logger.debug("add Http Kerberos Entry Point");
         registry.addInterceptor(new HttpKerberosEntryPoint(
     			authenticationProvider,kerberosService,applicationConfig,true))
     		.addPathPatterns("/login");
@@ -112,13 +112,13 @@ public class MaxKeyMvcConfig implements WebMvcConfigurer {
         if(httpHeaderEnable) {
             registry.addInterceptor(new HttpHeaderEntryPoint(httpHeaderName,httpHeaderEnable))
                     .addPathPatterns("/*");
-            _logger.debug("add Http Header Entry Point");
+            logger.debug("add Http Header Entry Point");
         }
         
         if(basicEnable) {
             registry.addInterceptor(new BasicEntryPoint(basicEnable))
                     .addPathPatterns("/*");
-            _logger.debug("add Basic Entry Point");
+            logger.debug("add Basic Entry Point");
         }
         
         //for frontend
@@ -139,7 +139,7 @@ public class MaxKeyMvcConfig implements WebMvcConfigurer {
                 .addPathPatterns("/authz/refused")
                 ;
         
-        _logger.debug("add Permission Interceptor");
+        logger.debug("add Permission Interceptor");
 
         //for Single Sign On
         registry.addInterceptor(singleSignOnInterceptor)
@@ -186,7 +186,7 @@ public class MaxKeyMvcConfig implements WebMvcConfigurer {
                 .excludePathPatterns("/onlineticket/ticketValidate")
                 .excludePathPatterns("/onlineticket/ticketValidate/*")
         ;
-        _logger.debug("add Single SignOn Interceptor");
+        logger.debug("add Single SignOn Interceptor");
         
         registry.addInterceptor(historySignOnAppInterceptor)
                 .addPathPatterns("/authz/basic/*")
@@ -207,7 +207,7 @@ public class MaxKeyMvcConfig implements WebMvcConfigurer {
                 //OAuth
                 .addPathPatterns("/authz/oauth/v20/approval_confirm")
         ;
-        _logger.debug("add history SignOn App Interceptor");
+        logger.debug("add history SignOn App Interceptor");
         
 
     }

maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/access/contorller/LoginSessionController.java

@@ -51,7 +51,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 @Controller
 @RequestMapping(value = { "/access/session" })
 public class LoginSessionController {
-    static final Logger _logger = LoggerFactory.getLogger(LoginSessionController.class);
+    static final Logger logger = LoggerFactory.getLogger(LoginSessionController.class);
 
     @Autowired
     HistoryLoginService historyLoginService;
@@ -70,7 +70,7 @@ public class LoginSessionController {
     public ResponseEntity<?> fetch(
     			@ModelAttribute("historyLogin") HistoryLogin historyLogin,
     			@CurrentUser UserInfo currentUser) {
-        _logger.debug("history/session/fetch {}" , historyLogin);
+        logger.debug("history/session/fetch {}" , historyLogin);
         historyLogin.setUserId(currentUser.getId());
         historyLogin.setInstId(currentUser.getInstId());
         return new Message<JpaPageResults<HistoryLogin>>(
@@ -81,11 +81,11 @@ public class LoginSessionController {
     @ResponseBody
     @RequestMapping(value="/terminate")  
     public ResponseEntity<?> terminate(@RequestParam("ids") String ids,@CurrentUser UserInfo currentUser) {
-        _logger.debug(ids);
+        logger.debug(ids);
         boolean isTerminated = false;
         try {
             for(String sessionId : StringUtils.string2List(ids, ",")) {
-                _logger.trace("terminate session Id {} ",sessionId);
+                logger.trace("terminate session Id {} ",sessionId);
                 if(currentUser.getSessionId().contains(sessionId)) {
                     continue;//skip current session
                 }
@@ -97,7 +97,7 @@ public class LoginSessionController {
             }
             isTerminated = true;
         }catch(Exception e) {
-            _logger.debug("terminate Exception .",e);
+            logger.debug("terminate Exception .",e);
         }
         
         if(isTerminated) {

maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/AppListController.java

@@ -50,7 +50,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
  */
 @Controller
 public class AppListController {
-    static final Logger _logger = LoggerFactory.getLogger(AppListController.class);
+    static final Logger logger = LoggerFactory.getLogger(AppListController.class);
     
     @Autowired
     private UserInfoService userInfoService;

maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/ChangePasswodController.java

@@ -44,7 +44,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 @Controller
 @RequestMapping(value={"/config"})
 public class ChangePasswodController {
-	final static Logger _logger = LoggerFactory.getLogger(ChangePasswodController.class);
+	static final Logger logger = LoggerFactory.getLogger(ChangePasswodController.class);
 
 	@Autowired
 	private UserInfoService userInfoService;
@@ -84,7 +84,7 @@ public class ChangePasswodController {
 			return new Message<ChangePassword>().buildResponse();
 		}else {
 			String message = (String) WebContext.getAttribute(PasswordPolicyValidator.PASSWORD_POLICY_VALIDATE_RESULT);
-			_logger.info("-message:",message);
+			logger.info("-message:",message);
 			return new Message<ChangePassword>(Message.ERROR,message).buildResponse();
 		}
 	}

maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/ForgotPasswordContorller.java

@@ -46,7 +46,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 @Controller
 @RequestMapping(value = { "/forgotpassword" })
 public class ForgotPasswordContorller {
-    private static Logger _logger = LoggerFactory.getLogger(ForgotPasswordContorller.class);
+    private static Logger logger = LoggerFactory.getLogger(ForgotPasswordContorller.class);
 
     Pattern emailRegex = Pattern.compile(
             "^\\s*\\w+(?:\\.{0,1}[\\w-]+)*@[a-zA-Z0-9]+(?:[-.][a-zA-Z0-9]+)*\\.[a-zA-Z]+\\s*$");
@@ -102,8 +102,8 @@ public class ForgotPasswordContorller {
 			@RequestParam String state,
 			@RequestParam String captcha,
 			@RequestParam String otpCaptcha) {
-		_logger.debug("forgotpassword  /forgotpassword/validateCaptcha.");
-		_logger.debug(" userId {}: " ,userId);
+		logger.debug("forgotpassword  /forgotpassword/validateCaptcha.");
+		logger.debug(" userId {}: " ,userId);
 		UserInfo userInfo = userInfoService.get(userId);
 		if(userInfo != null) {
 			AbstractOtpAuthn smsOtpAuthn = smsOtpAuthnService.getByInstId(userInfo.getInstId());
@@ -122,15 +122,15 @@ public class ForgotPasswordContorller {
     			@RequestParam String mobile,
     			@RequestParam String state,
     			@RequestParam String captcha) {
-        _logger.debug("forgotpassword  /forgotpassword/produceOtp.");
-        _logger.debug(" Mobile {}: " ,mobile);
+        logger.debug("forgotpassword  /forgotpassword/produceOtp.");
+        logger.debug(" Mobile {}: " ,mobile);
         if (!authTokenService.validateCaptcha(state,captcha)) {    
-        	_logger.debug("login captcha valid error.");
+        	logger.debug("login captcha valid error.");
         	return new Message<ChangePassword>(Message.FAIL).buildResponse();
         }
         
     	ChangePassword change = null;
-    	_logger.debug("Mobile Regex matches {}",mobileRegex.matcher(mobile).matches());
+    	logger.debug("Mobile Regex matches {}",mobileRegex.matcher(mobile).matches());
     	if(StringUtils.isNotBlank(mobile) && mobileRegex.matcher(mobile).matches()) {
     		UserInfo userInfo = userInfoService.findByEmailMobile(mobile);
     		if(userInfo != null) {
@@ -151,9 +151,9 @@ public class ForgotPasswordContorller {
     			@RequestParam String email,
     			@RequestParam String state,
     			@RequestParam String captcha) {
-        _logger.debug("/forgotpassword/produceEmailOtp Email {} : " , email);
+        logger.debug("/forgotpassword/produceEmailOtp Email {} : " , email);
         if (!authTokenService.validateCaptcha(state,captcha)) {
-        	_logger.debug("captcha valid error.");
+        	logger.debug("captcha valid error.");
         	return new Message<ChangePassword>(Message.FAIL).buildResponse();
         }
         
@@ -177,7 +177,7 @@ public class ForgotPasswordContorller {
     					@RequestParam String forgotType,
                         @RequestParam String otpCaptcha,
                         @RequestParam String state) {
-        _logger.debug("forgotPassword  /forgotpassword/setpassword.");
+        logger.debug("forgotPassword  /forgotpassword/setpassword.");
         if (StringUtils.isNotBlank(changePassword.getPassword() )
         		&& changePassword.getPassword().equals(changePassword.getConfirmPassword())) {
             UserInfo loadedUserInfo = userInfoService.get(changePassword.getUserId());

maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/IndexEndpoint.java

@@ -31,11 +31,11 @@ import org.springframework.web.servlet.ModelAndView;
  */
 @Controller
 public class IndexEndpoint {
-	private static Logger _logger = LoggerFactory.getLogger(IndexEndpoint.class);
+	private static Logger logger = LoggerFactory.getLogger(IndexEndpoint.class);
 
 	@RequestMapping(value={"/"})
 	public ModelAndView index() {
-		_logger.debug("IndexEndpoint /.");
+		logger.debug("IndexEndpoint /.");
 		return  new ModelAndView("index")
 				.addObject("appVersion", WebContext.properties.getProperty("application.formatted-version"));
 		

maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/LoginEntryPoint.java

@@ -64,7 +64,7 @@ import jakarta.servlet.http.HttpServletResponse;
 @Controller
 @RequestMapping(value = "/login")
 public class LoginEntryPoint {
-	private static Logger _logger = LoggerFactory.getLogger(LoginEntryPoint.class);
+	private static Logger logger = LoggerFactory.getLogger(LoginEntryPoint.class);
 	
 	Pattern mobileRegex = Pattern.compile("^(13[4,5,6,7,8,9]|15[0,8,9,1,7]|188|187)\\\\d{8}$");
 	
@@ -108,7 +108,7 @@ public class LoginEntryPoint {
 	@RequestMapping(value={"/get"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> get(
 				@RequestParam(value = "remember_me", required = false) String rememberMeJwt) {
-		_logger.debug("/get.");
+		logger.debug("/get.");
 		//Remember Me
 		if(StringUtils.isNotBlank(rememberMeJwt)
 				&& authTokenService.validateJwtToken(rememberMeJwt)) {
@@ -129,7 +129,7 @@ public class LoginEntryPoint {
 			}
 		}
 		//for normal login
-		HashMap<String , Object> model = new HashMap<String , Object>();
+		HashMap<String , Object> model = new HashMap<>();
 		model.put("isRemeberMe", applicationConfig.getLoginConfig().isRemeberMe());
 		model.put("isKerberos", applicationConfig.getLoginConfig().isKerberos());
 		if(applicationConfig.getLoginConfig().isMfa()) {
@@ -219,7 +219,7 @@ public class LoginEntryPoint {
  		Message<AuthJwt> authJwtMessage = new Message<AuthJwt>(Message.FAIL);
  		if(authTokenService.validateJwtToken(credential.getState())){
  			String authType =  credential.getAuthType();
- 			 _logger.debug("Login AuthN Type  " + authType);
+ 			 logger.debug("Login AuthN Type  {}" , authType);
  	        if (StringUtils.isNotBlank(authType)){
 		 		Authentication  authentication = authenticationProvider.authenticate(credential);	 				
 		 		if(authentication != null) {
@@ -238,10 +238,10 @@ public class LoginEntryPoint {
 	 				String errorMsg = WebContext.getAttribute(WebConstants.LOGIN_ERROR_SESSION_MESSAGE) == null ? 
 							  "" : WebContext.getAttribute(WebConstants.LOGIN_ERROR_SESSION_MESSAGE).toString();
 	 				authJwtMessage.setMessage(errorMsg);
-	 				_logger.debug("login fail , message {}",errorMsg);
+	 				logger.debug("login fail , message {}",errorMsg);
 		 		}
  	        }else {
- 	        	_logger.error("Login AuthN type must eq normal , tfa or mobile . ");
+ 	        	logger.error("Login AuthN type must eq normal , tfa or mobile . ");
  	        }
  		}
  		return authJwtMessage.buildResponse();

maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/LogoutEndpoint.java

@@ -51,7 +51,7 @@ import jakarta.servlet.http.HttpServletRequest;
 @Tag(name = "1-3-单点注销接口文档模块")
 @Controller
 public class LogoutEndpoint {
-	private static Logger _logger = LoggerFactory.getLogger(LogoutEndpoint.class);
+	private static Logger logger = LoggerFactory.getLogger(LogoutEndpoint.class);
 
 	@Autowired 
     ApplicationConfig applicationConfig;
@@ -71,13 +71,13 @@ public class LogoutEndpoint {
 		String sessionId = currentUser.getSessionId();
  		Session session = sessionManager.get(sessionId);
  		if(session != null) {
- 			_logger.debug("/logout frontend clean Session id {}",session.getId());
+ 			logger.debug("/logout frontend clean Session id {}",session.getId());
 	 		Set<Entry<String, Apps>> entrySet = session.getAuthorizedApps().entrySet();
 	 
 	        Iterator<Entry<String, Apps>> iterator = entrySet.iterator();
 	        while (iterator.hasNext()) {
 	            Entry<String, Apps> mapEntry = iterator.next();
-	            _logger.debug("App Id : "+ mapEntry.getKey()+ " , " +mapEntry.getValue());
+	            logger.debug("App Id : {} , {} " ,  mapEntry.getKey() ,mapEntry.getValue());
 	            if( mapEntry.getValue().getLogoutType() == LogoutType.BACK_CHANNEL){
 	                SingleLogout singleLogout;
 	                if(mapEntry.getValue().getProtocol().equalsIgnoreCase(ConstsProtocols.CAS)) {
@@ -104,7 +104,7 @@ public class LogoutEndpoint {
  				@RequestParam(value = "redirect_uri",required = false) String redirect_uri
  				){
 		//invalidate http session
-		_logger.debug("/force/logout http Session id {}",request.getSession().getId());
+		logger.debug("/force/logout http Session id {}",request.getSession().getId());
 		request.getSession().invalidate();
 		StringBuffer logoutUrl = new StringBuffer("");
 		logoutUrl.append(applicationConfig.getFrontendUri()).append("/#/passport/logout");

maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/OneTimePasswordController.java

@@ -51,7 +51,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 @Controller
 @RequestMapping(value  =  { "/config" })
 public class OneTimePasswordController {
-    static final  Logger _logger  =  LoggerFactory.getLogger(OneTimePasswordController.class);
+    static final  Logger logger  =  LoggerFactory.getLogger(OneTimePasswordController.class);
 
     @Autowired
     private UserInfoService userInfoService;

maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/ProfileController.java

@@ -37,7 +37,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 @Controller
 @RequestMapping(value = { "/config/profile" })
 public class ProfileController {
-    static final Logger _logger = LoggerFactory.getLogger(ProfileController.class);
+    static final Logger logger = LoggerFactory.getLogger(ProfileController.class);
 
     @Autowired
     private UserInfoService userInfoService;
@@ -65,7 +65,7 @@ public class ProfileController {
 				@RequestBody  UserInfo userInfo,
 				@CurrentUser UserInfo currentUser,
                 BindingResult result) {
-        _logger.debug(userInfo.toString());
+        logger.debug(userInfo.toString());
 
 //		if(userInfo.getExtraAttributeValue()!=null){
 //			String []extraAttributeLabel=userInfo.getExtraAttributeName().split(",");

maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/RegisterController.java

@@ -50,7 +50,7 @@ import jakarta.servlet.ServletException;
 @Controller
 @RequestMapping(value={"/signup"})
 public class RegisterController {
-	private static Logger _logger = LoggerFactory.getLogger(RegisterController.class);
+	private static Logger logger = LoggerFactory.getLogger(RegisterController.class);
 	
 	Pattern mobileRegex = Pattern.compile("^[1][3,4,5,7,8][0-9]{9}$");
 	
@@ -73,9 +73,9 @@ public class RegisterController {
 	@RequestMapping(value = { "/produceOtp" }, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> produceOtp(
 	    			@RequestParam String mobile) {
-        _logger.debug("/signup/produceOtp Mobile {}: " ,mobile);
+        logger.debug("/signup/produceOtp Mobile {}: " ,mobile);
  
-    	_logger.debug("Mobile Regex matches {}",mobileRegex.matcher(mobile).matches());
+    	logger.debug("Mobile Regex matches {}",mobileRegex.matcher(mobile).matches());
     	if(StringUtils.isNotBlank(mobile) && mobileRegex.matcher(mobile).matches()) {
     		UserInfo userInfo = new UserInfo();
     		userInfo.setUsername(mobile);

maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/SafeController.java

@@ -40,7 +40,7 @@ import jakarta.servlet.http.HttpServletResponse;
 @Controller
 @RequestMapping(value={"/safe"})
 public class SafeController {
-	final static Logger _logger = LoggerFactory.getLogger(SafeController.class);
+	static final Logger logger = LoggerFactory.getLogger(SafeController.class);
 	
 	@Autowired
 	private UserInfoService userInfoService;

maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/SocialSignOnListController.java

@@ -39,7 +39,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 @Controller
 @RequestMapping(value={"/config/socialsignon"})
 public class SocialSignOnListController {
-	final static Logger _logger = LoggerFactory.getLogger(SocialSignOnListController.class);
+	static final Logger logger = LoggerFactory.getLogger(SocialSignOnListController.class);
 	
 	@Autowired
 	protected SocialsAssociatesService socialsAssociatesService;
@@ -57,7 +57,7 @@ public class SocialSignOnListController {
 	@ResponseBody
 	@RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> delete(@RequestParam("ids") String ids,@CurrentUser UserInfo currentUser) {
-		_logger.debug("-delete  ids : {} " , ids);
+		logger.debug("-delete  ids : {} " , ids);
 		if (socialsAssociatesService.deleteBatch(ids)) {
 			 return new Message<Apps>(Message.SUCCESS).buildResponse();
 		} else {

maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginAppsHistoryController.java

@@ -48,7 +48,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 @Controller
 @RequestMapping(value={"/historys"})
 public class LoginAppsHistoryController {
-final static Logger _logger = LoggerFactory.getLogger(LoginAppsHistoryController.class);
+	static final Logger logger = LoggerFactory.getLogger(LoginAppsHistoryController.class);
 	
 	@Autowired
   	protected HistoryLoginAppsService historyLoginAppsService;
@@ -62,7 +62,7 @@ final static Logger _logger = LoggerFactory.getLogger(LoginAppsHistoryController
 	public ResponseEntity<?> fetch(
 				@ModelAttribute("historyLoginApp") HistoryLoginApps historyLoginApp,
 				@CurrentUser UserInfo currentUser){
-		_logger.debug("historys/loginAppsHistory/fetch/  {}",historyLoginApp);
+		logger.debug("historys/loginAppsHistory/fetch/  {}",historyLoginApp);
 		historyLoginApp.setId(null);
 		historyLoginApp.setUserId(currentUser.getId());
 		historyLoginApp.setInstId(currentUser.getInstId());

maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginHistoryController.java

@@ -48,7 +48,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 @Controller
 @RequestMapping(value={"/historys"})
 public class LoginHistoryController {
-final static Logger _logger = LoggerFactory.getLogger(LoginHistoryController.class);
+	static final  Logger logger = LoggerFactory.getLogger(LoginHistoryController.class);
 	
 	@Autowired
 	HistoryLoginService loginHistoryService;
@@ -63,7 +63,7 @@ final static Logger _logger = LoggerFactory.getLogger(LoginHistoryController.cla
 				@ModelAttribute("historyLogin") HistoryLogin historyLogin,
 				@CurrentUser UserInfo currentUser
 			){
-		_logger.debug("historys/loginHistory/fetch/ {}",historyLogin);
+		logger.debug("historys/loginHistory/fetch/ {}",historyLogin);
 		historyLogin.setInstId(currentUser.getInstId());
 		historyLogin.setUserId(currentUser.getId());
 		return new Message<JpaPageResults<HistoryLogin>>(

maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/interceptor/HistorySignOnAppInterceptor.java

@@ -38,7 +38,7 @@ import jakarta.servlet.http.HttpServletResponse;
 
 @Component
 public class HistorySignOnAppInterceptor  implements AsyncHandlerInterceptor  {
-    private static final Logger _logger = LoggerFactory.getLogger(HistorySignOnAppInterceptor.class);
+    private static final Logger logger = LoggerFactory.getLogger(HistorySignOnAppInterceptor.class);
 
     @Autowired
     HistoryLoginAppsService historyLoginAppsService;
@@ -52,10 +52,11 @@ public class HistorySignOnAppInterceptor  implements AsyncHandlerInterceptor  {
      *          javax.servlet.http.HttpServletRequest, 
      *          javax.servlet.http.HttpServletResponse, java.lang.Object)
      */
+    @Override
     public void postHandle(HttpServletRequest request,
             HttpServletResponse response,
             Object handler,ModelAndView modelAndView) throws Exception {
-        _logger.debug("postHandle");
+        logger.debug("postHandle");
        
         final Apps app = (Apps)WebContext.getAttribute(WebConstants.AUTHORIZE_SIGN_ON_APP);
         
@@ -63,7 +64,7 @@ public class HistorySignOnAppInterceptor  implements AsyncHandlerInterceptor  {
         if(principal != null && app !=null) {
         	final UserInfo userInfo = principal.getUserInfo();
         	String sessionId = principal.getSession().getId();
-        	 _logger.debug("sessionId : " + sessionId + " ,appId : " + app.getId());
+        	 logger.debug("sessionId : {} , appId {}" , sessionId , app.getId());
              HistoryLoginApps historyLoginApps = new HistoryLoginApps();
              historyLoginApps.setAppId(app.getId());
              historyLoginApps.setSessionId(sessionId);

maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/interceptor/SingleSignOnInterceptor.java

@@ -43,7 +43,7 @@ import jakarta.servlet.http.HttpServletResponse;
 
 @Component
 public class SingleSignOnInterceptor  implements AsyncHandlerInterceptor {
-    private static final Logger _logger = LoggerFactory.getLogger(SingleSignOnInterceptor.class);
+    private static final Logger logger = LoggerFactory.getLogger(SingleSignOnInterceptor.class);
     
     @Autowired
     ApplicationConfig applicationConfig;
@@ -64,7 +64,7 @@ public class SingleSignOnInterceptor  implements AsyncHandlerInterceptor {
     public boolean preHandle(HttpServletRequest request, 
             HttpServletResponse response, Object handler)
             throws Exception {
-    	_logger.trace("Single Sign On Interceptor");
+    	logger.trace("Single Sign On Interceptor");
        
     	AuthorizationUtils.authenticateWithCookie(
     				request,authTokenService,sessionManager);
@@ -73,7 +73,7 @@ public class SingleSignOnInterceptor  implements AsyncHandlerInterceptor {
         	String loginUrl = applicationConfig.getFrontendUri() + "/#/passport/login?redirect_uri=%s";
         	String redirect_uri = UrlUtils.buildFullRequestUrl(request);
         	String base64RequestUrl = Base64Utils.base64UrlEncode(redirect_uri.getBytes());
-        	_logger.debug("No Authentication ... Redirect to /passport/login , redirect_uri {} , base64 {}",
+        	logger.debug("No Authentication ... Redirect to /passport/login , redirect_uri {} , base64 {}",
         					redirect_uri ,base64RequestUrl);
         	response.sendRedirect(String.format(loginUrl,base64RequestUrl));
         	return false;
@@ -81,7 +81,7 @@ public class SingleSignOnInterceptor  implements AsyncHandlerInterceptor {
         
         //判断应用访问权限
         if(AuthorizationUtils.isAuthenticated()){
-	        _logger.debug("preHandle {}",request.getRequestURI());
+	        logger.debug("preHandle {}",request.getRequestURI());
 	        Apps app = (Apps)WebContext.getAttribute(WebConstants.AUTHORIZE_SIGN_ON_APP);
 	        if(app == null) {
 	        	
@@ -93,14 +93,13 @@ public class SingleSignOnInterceptor  implements AsyncHandlerInterceptor {
 	        			||requestURI.contains("/authz/api/")
 	        			||requestURI.contains("/authz/formbased/")
 	        			||requestURI.contains("/authz/tokenbased/")
-	        			||requestURI.contains("/authz/api/")
 	        			||requestURI.contains("/authz/saml20/consumer/")
 	        			||requestURI.contains("/authz/saml20/idpinit/")
 	        			||requestURI.contains("/authz/cas/")
 	        	) {//for id end of URL
 	        		String [] requestURIs = requestURI.split("/");
 	        		String appId = requestURIs[requestURIs.length -1];
-	        		_logger.debug("appId {}",appId);
+	        		logger.debug("appId {}",appId);
 		        	app = appsService.get(appId,true);
 	        	}else if(requestURI.contains("/authz/oauth/v20/authorize")) {//oauth
 		        	app = appsService.get(
@@ -109,18 +108,18 @@ public class SingleSignOnInterceptor  implements AsyncHandlerInterceptor {
 	        }
 	        
 	        if(app == null) {
-	        	_logger.debug("preHandle app is not exist . ");
+	        	logger.debug("preHandle app is not exist . ");
 	        	return true;
 	        }
 	        
 	        SignPrincipal principal = AuthorizationUtils.getPrincipal();
 	        if(principal != null && app !=null) {
 	            if(principal.getGrantedAuthorityApps().contains(new SimpleGrantedAuthority(app.getId()))) {
-	                _logger.trace("preHandle have authority access {}" , app);
+	                logger.trace("preHandle have authority access {}" , app);
 	                return true;
 	            }
 	        }
-	        _logger.debug("preHandle not have authority access " + app);
+	        logger.debug("preHandle not have authority access {}" , app);
 	        response.sendRedirect(request.getContextPath()+"/authz/refused");
 	        return false;
     	}

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/MaxKeyMgtApplication.java

@@ -59,10 +59,10 @@ import jakarta.servlet.ServletException;
 @SpringBootApplication
 @EnableDiscoveryClient
 public class MaxKeyMgtApplication extends SpringBootServletInitializer {
-	private static final Logger _logger = LoggerFactory.getLogger(MaxKeyMgtApplication.class);
+	private static final Logger logger = LoggerFactory.getLogger(MaxKeyMgtApplication.class);
 
 	public static void main(String[] args) {
-	    _logger.info("Start MaxKeyMgt Application ...");
+	    logger.info("Start MaxKeyMgt Application ...");
 
 		ConfigurableApplicationContext  applicationContext = 
 							SpringApplication.run(MaxKeyMgtApplication.class, args);
@@ -71,12 +71,12 @@ public class MaxKeyMgtApplication extends SpringBootServletInitializer {
 		try {
 			initWebContext.init(null);
 		} catch (ServletException e) {
-			_logger.error("Exception ",e);
+			logger.error("Exception ",e);
 		}
-		_logger.info("MaxKeyMgt at {}" , new DateTime());
-		_logger.info("MaxKeyMgt Server Port {}"
+		logger.info("MaxKeyMgt at {}" , new DateTime());
+		logger.info("MaxKeyMgt Server Port {}"
 				,applicationContext.getBean(ApplicationConfig.class).getPort());
-		_logger.info("MaxKeyMgt started.");
+		logger.info("MaxKeyMgt started.");
 		
 	}
 

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyMgtConfig.java

@@ -34,7 +34,7 @@ import org.springframework.security.crypto.password.PasswordEncoder;
 
 @AutoConfiguration
 public class MaxKeyMgtConfig  implements InitializingBean {
-    private static final  Logger _logger = LoggerFactory.getLogger(MaxKeyMgtConfig.class);
+    private static final  Logger logger = LoggerFactory.getLogger(MaxKeyMgtConfig.class);
     
 	//authenticationRealm for MaxKeyMgtApplication
 	@Bean
@@ -54,14 +54,14 @@ public class MaxKeyMgtConfig  implements InitializingBean {
         		userInfoService,
         		jdbcTemplate);
         
-        _logger.debug("JdbcAuthenticationRealm inited.");
+        logger.debug("JdbcAuthenticationRealm inited.");
         return authenticationRealm;
     }
 
 	@Bean
     public AbstractOtpAuthn timeBasedOtpAuthn() {
 		AbstractOtpAuthn tfaOtpAuthn = new TimeBasedOtpAuthn();
-	    _logger.debug("TimeBasedOtpAuthn inited.");
+	    logger.debug("TimeBasedOtpAuthn inited.");
         return tfaOtpAuthn;
     }
 

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyMgtListenerConfig.java

@@ -39,7 +39,7 @@ import org.springframework.jdbc.core.JdbcTemplate;
 
 @AutoConfiguration
 public class MaxKeyMgtListenerConfig  implements InitializingBean {
-    private static final  Logger _logger = LoggerFactory.getLogger(MaxKeyMgtListenerConfig.class);
+    private static final  Logger logger = LoggerFactory.getLogger(MaxKeyMgtListenerConfig.class);
  
     @Bean
     public String  sessionListenerAdapter(
@@ -52,7 +52,7 @@ public class MaxKeyMgtListenerConfig  implements InitializingBean {
     			"0 0/10 * * * ?",//10 minutes
     			SessionListenerAdapter.class.getSimpleName()
     		);
-        _logger.debug("Session ListenerAdapter inited .");
+        logger.debug("Session ListenerAdapter inited .");
     	return "sessionListenerAdapter";
     }
     
@@ -70,7 +70,7 @@ public class MaxKeyMgtListenerConfig  implements InitializingBean {
     			cronSchedule,
     			DynamicRolesListenerAdapter.class.getSimpleName()
     		);
-        _logger.debug("DynamicRoles ListenerAdapter inited .");
+        logger.debug("DynamicRoles ListenerAdapter inited .");
         return "dynamicRolesListenerAdapter";
     }
     
@@ -84,9 +84,9 @@ public class MaxKeyMgtListenerConfig  implements InitializingBean {
 	    	ProvisioningRunner runner = new ProvisioningRunner(connectorsService,jdbcTemplate);
 	    	ProvisioningRunnerThread runnerThread = new ProvisioningRunnerThread(runner);
 	    	runnerThread.start();
-	        _logger.debug("provisioning Runner Thread .");
+	        logger.debug("provisioning Runner Thread .");
         }else {
-        	_logger.debug("not need init provisioning Runner Thread .");
+        	logger.debug("not need init provisioning Runner Thread .");
         }
         return "provisioningRunnerThread";
     }

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyMgtMvcConfig.java

@@ -37,7 +37,7 @@ import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 @EnableWebMvc
 @AutoConfiguration
 public class MaxKeyMgtMvcConfig implements WebMvcConfigurer {
-    private static final  Logger _logger = LoggerFactory.getLogger(MaxKeyMgtMvcConfig.class);
+    private static final  Logger logger = LoggerFactory.getLogger(MaxKeyMgtMvcConfig.class);
     
     @Autowired
   	ApplicationConfig applicationConfig;
@@ -50,33 +50,33 @@ public class MaxKeyMgtMvcConfig implements WebMvcConfigurer {
     
     @Override
     public void addResourceHandlers(ResourceHandlerRegistry registry) {
-    	_logger.debug("add Resource Handlers");
+    	logger.debug("add Resource Handlers");
     	 
-        _logger.debug("add statics");
+        logger.debug("add statics");
         registry.addResourceHandler("/static/**")
                 .addResourceLocations("classpath:/static/");
-        _logger.debug("add templates");
+        logger.debug("add templates");
         registry.addResourceHandler("/templates/**")
                 .addResourceLocations("classpath:/templates/");
         
-        _logger.debug("add swagger");
+        logger.debug("add swagger");
         registry.addResourceHandler("swagger-ui.html")
                 .addResourceLocations("classpath:/META-INF/resources/");
         registry.addResourceHandler("/webjars/**")
                 .addResourceLocations("classpath:/META-INF/resources/webjars/");
         
-        _logger.debug("add knife4j");
+        logger.debug("add knife4j");
         registry.addResourceHandler("doc.html").addResourceLocations("classpath:/META-INF/resources/");
         registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
 
-        _logger.debug("add Resource Handler finished .");
+        logger.debug("add Resource Handler finished .");
     }
 
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         //addPathPatterns 用于添加拦截规则 ， 先把所有路径都加入拦截， 再一个个排除
         //excludePathPatterns 表示改路径不用拦截
-        _logger.debug("add Interceptors");
+        logger.debug("add Interceptors");
 
         permissionInterceptor.setMgmt(true);
         
@@ -110,7 +110,7 @@ public class MaxKeyMgtMvcConfig implements WebMvcConfigurer {
                 .addPathPatterns("/logout/**")
                 ;
         
-        _logger.debug("add Permission Adapter");
+        logger.debug("add Permission Adapter");
         
     }
     

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/autoconfigure/Oauth20ClientAutoConfiguration.java

@@ -44,14 +44,14 @@ import org.springframework.security.crypto.password.PasswordEncoder;
  */
 @AutoConfiguration
 public class Oauth20ClientAutoConfiguration  implements InitializingBean {
-    private static final  Logger _logger = LoggerFactory.getLogger(Oauth20ClientAutoConfiguration.class);
+    private static final  Logger logger = LoggerFactory.getLogger(Oauth20ClientAutoConfiguration.class);
     
     @Bean
     public JdbcClientDetailsService oauth20JdbcClientDetailsService(
                 DataSource dataSource,PasswordEncoder passwordReciprocal) {
 	    JdbcClientDetailsService clientDetailsService = new JdbcClientDetailsService(dataSource);
 	    //clientDetailsService.setPasswordEncoder(passwordReciprocal);
-	    _logger.debug("JdbcClientDetailsService inited.");
+	    logger.debug("JdbcClientDetailsService inited.");
         return clientDetailsService;
     }
 	
@@ -68,10 +68,10 @@ public class Oauth20ClientAutoConfiguration  implements InitializingBean {
         TokenStore tokenStore = null;
         if (persistence == 2) {
             tokenStore = new RedisTokenStore(jedisConnectionFactory);
-            _logger.debug("RedisTokenStore");
+            logger.debug("RedisTokenStore");
         }else {
             tokenStore = new InMemoryTokenStore();
-            _logger.debug("InMemoryTokenStore"); 
+            logger.debug("InMemoryTokenStore"); 
         }
         
         return tokenStore;
@@ -109,7 +109,7 @@ public class Oauth20ClientAutoConfiguration  implements InitializingBean {
         daoAuthenticationProvider.setPasswordEncoder(passwordReciprocal);
         daoAuthenticationProvider.setUserDetailsService(cientDetailsUserDetailsService);
         ProviderManager authenticationManager = new ProviderManager(daoAuthenticationProvider);
-        _logger.debug("OAuth 2 Client Authentication Manager init.");
+        logger.debug("OAuth 2 Client Authentication Manager init.");
         return authenticationManager;
     }
   

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/listener/DynamicRolesListenerAdapter.java

@@ -26,7 +26,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class DynamicRolesListenerAdapter extends ListenerAdapter  implements Job , Serializable {
-	final static Logger _logger = LoggerFactory.getLogger(DynamicRolesListenerAdapter.class);
+	static final  Logger logger = LoggerFactory.getLogger(DynamicRolesListenerAdapter.class);
     
     private static final long serialVersionUID = 8831626240807856084L;
 
@@ -38,18 +38,18 @@ public class DynamicRolesListenerAdapter extends ListenerAdapter  implements Job
         
         init(context);
         
-        _logger.debug("running ... " );
+        logger.debug("running ... " );
         jobStatus = JOBSTATUS.RUNNING;
         try {
             if(rolesService != null) {
             	rolesService.refreshAllDynamicRoles();
             	Thread.sleep(10 * 1000);//10 minutes
             }
-            _logger.debug("finished  " );
+            logger.debug("finished  " );
             jobStatus = JOBSTATUS.FINISHED;
         }catch(Exception e) {
             jobStatus = JOBSTATUS.ERROR;
-            _logger.error("Exception " ,e);
+            logger.error("Exception " ,e);
         }
     }
 

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/listener/ListenerAdapter.java

@@ -29,7 +29,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class ListenerAdapter {
-	private static final  Logger _logger = LoggerFactory.getLogger(ListenerAdapter.class);
+	private static final  Logger logger = LoggerFactory.getLogger(ListenerAdapter.class);
 	
 	JobExecutionContext context;
 	
@@ -59,7 +59,7 @@ public class ListenerAdapter {
 			String cronSchedule,
 			String identity
 		) throws SchedulerException {
-		_logger.debug("Cron {}  , Job schedule {}  ", cronSchedule , identity );
+		logger.debug("Cron {}  , Job schedule {}  ", cronSchedule , identity );
 		
 		JobDetail jobDetail = 
 				JobBuilder.newJob(jobClass) 

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/listener/SessionListenerAdapter.java

@@ -29,7 +29,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class SessionListenerAdapter extends ListenerAdapter   implements Job , Serializable {
-	final static Logger _logger = LoggerFactory.getLogger(SessionListenerAdapter.class);
+	static final Logger logger = LoggerFactory.getLogger(SessionListenerAdapter.class);
 	
 	private static final long serialVersionUID = 4782358765969474833L;
 	
@@ -40,7 +40,7 @@ public class SessionListenerAdapter extends ListenerAdapter   implements Job , S
 		 if(jobStatus == JOBSTATUS.RUNNING) {return;}
 		 init(context);
 		 	
-		 _logger.debug("running ... " );
+		 logger.debug("running ... " );
         jobStatus = JOBSTATUS.RUNNING;
         try {
             if(sessionManager != null) { 
@@ -48,7 +48,7 @@ public class SessionListenerAdapter extends ListenerAdapter   implements Job , S
             	for (HistoryLogin login : sessionManager.querySessions()) {
             		Session session = sessionManager.get(login.getSessionId());
             		if(session == null) {
-            			_logger.debug("user {} session {}  Login at {} and TimeOut at {} ." ,
+            			logger.debug("user {} session {}  Login at {} and TimeOut at {} ." ,
             					login.getUsername(), 
             					login.getId(),
             					login.getLoginTime(),
@@ -59,7 +59,7 @@ public class SessionListenerAdapter extends ListenerAdapter   implements Job , S
             					login.getUserId(), 
             					login.getUsername());
             		}else {
-            			_logger.debug("user {} session {} Login at {} , Last Access at {} will Expired at {}." ,
+            			logger.debug("user {} session {} Login at {} , Last Access at {} will Expired at {}." ,
             					login.getUsername(), 
             					login.getId(),
             					session.getStartTimestamp(),
@@ -69,13 +69,13 @@ public class SessionListenerAdapter extends ListenerAdapter   implements Job , S
             			sessionCount ++ ;
             		}
             	}
-            	_logger.debug("current session count {} ." ,sessionCount);
+            	logger.debug("current session count {} ." ,sessionCount);
             }
-            _logger.debug("finished  " );
+            logger.debug("finished  " );
             jobStatus = JOBSTATUS.FINISHED;
         }catch(Exception e) {
             jobStatus = JOBSTATUS.ERROR;
-            _logger.error("Exception " ,e);
+            logger.error("Exception " ,e);
         }
 		
 	}

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/contorller/RolePermissionsController.java

@@ -40,7 +40,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 @Controller
 @RequestMapping(value={"/access/permissions"})
 public class RolePermissionsController {
-	final static Logger _logger = LoggerFactory.getLogger(RolePermissionsController.class);
+	static final Logger logger = LoggerFactory.getLogger(RolePermissionsController.class);
 	
 	@Autowired
 	RolePermissionssService rolePermissionssService;
@@ -112,7 +112,7 @@ public class RolePermissionsController {
 	@ResponseBody
 	@RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> delete(@RequestParam("ids") String ids,@CurrentUser UserInfo currentUser) {
-		_logger.debug("-delete ids : {}" , ids);
+		logger.debug("-delete ids : {}" , ids);
 		if (rolePermissionssService.deleteBatch(ids)) {
 			 return new Message<RolePermissions>(Message.SUCCESS).buildResponse();
 		} else {

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/contorller/SessionController.java

@@ -52,7 +52,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 @Controller
 @RequestMapping(value = { "/access/session" })
 public class SessionController {
-    static final Logger _logger = LoggerFactory.getLogger(SessionController.class);
+    static final Logger logger = LoggerFactory.getLogger(SessionController.class);
 
     @Autowired
     HistoryLoginService historyLoginService;
@@ -74,7 +74,7 @@ public class SessionController {
     public ResponseEntity<?> fetch(
     			@ModelAttribute("historyLogin") HistoryLogin historyLogin,
     			@CurrentUser UserInfo currentUser) {
-        _logger.debug("history/session/fetch {}" , historyLogin);
+        logger.debug("history/session/fetch {}" , historyLogin);
         historyLogin.setInstId(currentUser.getInstId());
         return new Message<JpaPageResults<HistoryLogin>>(
         			historyLoginService.queryOnlineSession(historyLogin)
@@ -86,11 +86,11 @@ public class SessionController {
     @ResponseBody
     @RequestMapping(value="/terminate")  
     public ResponseEntity<?> terminate(@RequestParam("ids") String ids,@CurrentUser UserInfo currentUser) {
-        _logger.debug(ids);
+        logger.debug(ids);
         boolean isTerminated = false;
         try {
             for(String sessionId : StringUtils.string2List(ids, ",")) {
-                _logger.trace("terminate session Id {} ",sessionId);
+                logger.trace("terminate session Id {} ",sessionId);
                 if(currentUser.getSessionId().contains(sessionId)) {
                     continue;//skip current session
                 }
@@ -98,7 +98,7 @@ public class SessionController {
             }
             isTerminated = true;
         }catch(Exception e) {
-            _logger.debug("terminate Exception .",e);
+            logger.debug("terminate Exception .",e);
         }
         
         if(isTerminated) {

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/ApplicationsController.java

@@ -50,7 +50,7 @@ import com.nimbusds.jose.jwk.gen.RSAKeyGenerator;
 @Controller
 @RequestMapping(value={"/apps"})
 public class ApplicationsController extends BaseAppContorller {
-	final static Logger _logger = LoggerFactory.getLogger(ApplicationsController.class);
+	static final Logger logger = LoggerFactory.getLogger(ApplicationsController.class);
 	
 	@RequestMapping(value = { "/init" }, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> init() {
@@ -72,14 +72,14 @@ public class ApplicationsController extends BaseAppContorller {
 			app.setSecret(null);
 			app.setSharedPassword(null);
 		}
-		_logger.debug("List "+appsList);
+		logger.debug("List {}" , appsList);
 		return new Message<JpaPageResults<Apps>>(appsList).buildResponse();
 	}
 
 	@ResponseBody
 	@RequestMapping(value={"/query"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> query(@ModelAttribute Apps apps,@CurrentUser UserInfo currentUser) {
-		_logger.debug("-query  :" + apps);
+		logger.debug("-query  : {}" , apps);
 		if (appsService.query(apps)!=null) {
 			 return new Message<Apps>(Message.SUCCESS).buildResponse();
 		} else {
@@ -98,7 +98,7 @@ public class ApplicationsController extends BaseAppContorller {
 	@ResponseBody
 	@RequestMapping(value={"/add"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> insert(@RequestBody Apps apps,@CurrentUser UserInfo currentUser) {
-		_logger.debug("-Add  :" + apps);
+		logger.debug("-Add  : {}" , apps);
 		transform(apps);
 		apps.setInstId(currentUser.getInstId());
 		if (appsService.insert(apps)) {
@@ -111,7 +111,7 @@ public class ApplicationsController extends BaseAppContorller {
 	@ResponseBody
 	@RequestMapping(value={"/update"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> update(@RequestBody  Apps apps,@CurrentUser UserInfo currentUser) {
-		_logger.debug("-update  :" + apps);
+		logger.debug("-update  : {}" , apps);
 		transform(apps);
 		apps.setInstId(currentUser.getInstId());
 		if (appsService.update(apps)) {
@@ -124,7 +124,7 @@ public class ApplicationsController extends BaseAppContorller {
 	@ResponseBody
 	@RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> delete(@RequestParam("ids") String ids,@CurrentUser UserInfo currentUser) {
-		_logger.debug("-delete  ids : {} " , ids);
+		logger.debug("-delete  ids : {} " , ids);
 		if (appsService.deleteBatch(ids)) {
 			 return new Message<Apps>(Message.SUCCESS).buildResponse();
 		} else {
@@ -135,7 +135,7 @@ public class ApplicationsController extends BaseAppContorller {
 	@ResponseBody
 	@RequestMapping(value = { "/updateExtendAttr" })
 	public ResponseEntity<?> updateExtendAttr(@RequestBody Apps app) {
-		_logger.debug("-updateExtendAttr  id : {} , ExtendAttr : {}" , app.getId(),app.getExtendAttr());
+		logger.debug("-updateExtendAttr  id : {} , ExtendAttr : {}" , app.getId(),app.getExtendAttr());
 		if (appsService.updateExtendAttr(app)) {
 			return new Message<Apps>(Message.SUCCESS).buildResponse();
 		} else {

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/BaseAppContorller.java

@@ -35,7 +35,7 @@ import org.springframework.beans.factory.annotation.Autowired;
  *
  */
 public class BaseAppContorller {
-	final static Logger _logger = LoggerFactory.getLogger(BaseAppContorller.class);
+	static final Logger logger = LoggerFactory.getLogger(BaseAppContorller.class);
 	
 	@Autowired
 	protected AppsService appsService;

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/CasDetailsController.java

@@ -40,7 +40,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 @Controller
 @RequestMapping(value={"/apps/cas"})
 public class CasDetailsController  extends BaseAppContorller {
-	final static Logger _logger = LoggerFactory.getLogger(CasDetailsController.class);
+	static final  Logger logger = LoggerFactory.getLogger(CasDetailsController.class);
 	
 	@Autowired
 	AppsCasDetailsService casDetailsService;
@@ -65,7 +65,7 @@ public class CasDetailsController  extends BaseAppContorller {
 	@ResponseBody
 	@RequestMapping(value={"/add"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> insert(@RequestBody AppsCasDetails casDetails,@CurrentUser UserInfo currentUser) {
-		_logger.debug("-Add  :" + casDetails);
+		logger.debug("-Add  : {}" , casDetails);
 		transform(casDetails);
 		casDetails.setInstId(currentUser.getInstId());
 		if (casDetailsService.insert(casDetails)&&appsService.insertApp(casDetails)) {
@@ -78,7 +78,7 @@ public class CasDetailsController  extends BaseAppContorller {
 	@ResponseBody
 	@RequestMapping(value={"/update"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> update(@RequestBody AppsCasDetails casDetails,@CurrentUser UserInfo currentUser) {
-		_logger.debug("-update  :" + casDetails);
+		logger.debug("-update  : {}" , casDetails);
 		transform(casDetails);
 		casDetails.setInstId(currentUser.getInstId());
 		if (casDetailsService.update(casDetails)&&appsService.updateApp(casDetails)) {
@@ -91,7 +91,7 @@ public class CasDetailsController  extends BaseAppContorller {
 	@ResponseBody
 	@RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> delete(@RequestParam("ids") String ids,@CurrentUser UserInfo currentUser) {
-		_logger.debug("-delete  ids : {} " , ids);
+		logger.debug("-delete  ids : {} " , ids);
 		if (casDetailsService.deleteBatch(ids)&&appsService.deleteBatch(ids)) {
 			 return new Message<AppsCasDetails>(Message.SUCCESS).buildResponse();
 		} else {

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/ExtendApiDetailsController.java

@@ -40,7 +40,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 @Controller
 @RequestMapping(value={"/apps/extendapi"})
 public class ExtendApiDetailsController  extends BaseAppContorller {
-	final static Logger _logger = LoggerFactory.getLogger(ExtendApiDetailsController.class);
+	static final Logger logger = LoggerFactory.getLogger(ExtendApiDetailsController.class);
 
 	@RequestMapping(value = { "/init" }, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> init() {
@@ -66,7 +66,7 @@ public class ExtendApiDetailsController  extends BaseAppContorller {
 	public ResponseEntity<?> add(
 			@RequestBody AppsExtendApiDetails extendApiDetails,
 			@CurrentUser UserInfo currentUser) {
-		_logger.debug("-Add  :" + extendApiDetails);
+		logger.debug("-Add  :" + extendApiDetails);
 		
 		transform(extendApiDetails);
 		extendApiDetails.setInstId(currentUser.getInstId());
@@ -82,7 +82,7 @@ public class ExtendApiDetailsController  extends BaseAppContorller {
 	public ResponseEntity<?> update(
 			@RequestBody AppsExtendApiDetails extendApiDetails,
 			@CurrentUser UserInfo currentUser) {
-		_logger.debug("-update  :" + extendApiDetails);
+		logger.debug("-update  :" + extendApiDetails);
 		transform(extendApiDetails);
 		extendApiDetails.setInstId(currentUser.getInstId());
 		if (appsService.updateApp(extendApiDetails)) {
@@ -97,7 +97,7 @@ public class ExtendApiDetailsController  extends BaseAppContorller {
 	public ResponseEntity<?> delete(
 			@RequestParam("ids") String ids,
 			@CurrentUser UserInfo currentUser) {
-		_logger.debug("-delete  ids : {} " , ids);
+		logger.debug("-delete  ids : {} " , ids);
 		if (appsService.deleteBatch(ids)) {
 			 return new Message<AppsExtendApiDetails>(Message.SUCCESS).buildResponse();
 		} else {

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/FormBasedDetailsController.java

@@ -40,7 +40,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 @Controller
 @RequestMapping(value={"/apps/formbased"})
 public class FormBasedDetailsController  extends BaseAppContorller {
-	final static Logger _logger = LoggerFactory.getLogger(FormBasedDetailsController.class);
+	static final  Logger logger = LoggerFactory.getLogger(FormBasedDetailsController.class);
 	
 	@Autowired
 	AppsFormBasedDetailsService formBasedDetailsService;
@@ -68,7 +68,7 @@ public class FormBasedDetailsController  extends BaseAppContorller {
 	public ResponseEntity<?> add(
 			@RequestBody AppsFormBasedDetails formBasedDetails,
 			@CurrentUser UserInfo currentUser) {
-		_logger.debug("-Add  :" + formBasedDetails);
+		logger.debug("-Add  : {}" , formBasedDetails);
 		
 		transform(formBasedDetails);
 		formBasedDetails.setInstId(currentUser.getInstId());
@@ -85,7 +85,7 @@ public class FormBasedDetailsController  extends BaseAppContorller {
 	public ResponseEntity<?> update(
 			@RequestBody AppsFormBasedDetails formBasedDetails,
 			@CurrentUser UserInfo currentUser) {
-		_logger.debug("-update  :" + formBasedDetails);
+		logger.debug("-update  : {}" , formBasedDetails);
 		transform(formBasedDetails);
 		formBasedDetails.setInstId(currentUser.getInstId());
 		if (formBasedDetailsService.update(formBasedDetails)
@@ -101,7 +101,7 @@ public class FormBasedDetailsController  extends BaseAppContorller {
 	public ResponseEntity<?> delete(
 			@RequestParam("ids") String ids,
 			@CurrentUser UserInfo currentUser) {
-		_logger.debug("-delete  ids : {} " , ids);
+		logger.debug("-delete  ids : {} " , ids);
 		if (formBasedDetailsService.deleteBatch(ids)
 				&& appsService.deleteBatch(ids)) {
 			 return new Message<AppsFormBasedDetails>(Message.SUCCESS).buildResponse();

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/JwtDetailsController.java

@@ -40,7 +40,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 @Controller
 @RequestMapping(value={"/apps/jwt"})
 public class JwtDetailsController  extends BaseAppContorller {
-	final static Logger _logger = LoggerFactory.getLogger(JwtDetailsController.class);
+	static final  Logger logger = LoggerFactory.getLogger(JwtDetailsController.class);
 	
 	@Autowired
 	AppsJwtDetailsService jwtDetailsService;
@@ -66,7 +66,7 @@ public class JwtDetailsController  extends BaseAppContorller {
 	@ResponseBody
 	@RequestMapping(value={"/add"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> insert(@RequestBody AppsJwtDetails jwtDetails,@CurrentUser UserInfo currentUser) {
-		_logger.debug("-Add  :" + jwtDetails);
+		logger.debug("-Add  : {}" , jwtDetails);
 		
 		transform(jwtDetails);
 		
@@ -81,7 +81,7 @@ public class JwtDetailsController  extends BaseAppContorller {
 	@ResponseBody
 	@RequestMapping(value={"/update"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> update(@RequestBody AppsJwtDetails jwtDetails,@CurrentUser UserInfo currentUser) {
-		_logger.debug("-update  :" + jwtDetails);
+		logger.debug("-update  : {}" , jwtDetails);
 		transform(jwtDetails);
 		jwtDetails.setInstId(currentUser.getInstId());
 		if (jwtDetailsService.update(jwtDetails)&&appsService.updateApp(jwtDetails)) {
@@ -94,7 +94,7 @@ public class JwtDetailsController  extends BaseAppContorller {
 	@ResponseBody
 	@RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> delete(@RequestParam("ids") String ids,@CurrentUser UserInfo currentUser) {
-		_logger.debug("-delete  ids : {} " , ids);
+		logger.debug("-delete  ids : {} " , ids);
 		if (jwtDetailsService.deleteBatch(ids)&&appsService.deleteBatch(ids)) {
 			 return new Message<AppsJwtDetails>(Message.SUCCESS).buildResponse();
 		} else {

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/OAuth20DetailsController.java

@@ -44,7 +44,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 @Controller
 @RequestMapping(value={"/apps/oauth20"})
 public class OAuth20DetailsController  extends BaseAppContorller {
-	final static Logger _logger = LoggerFactory.getLogger(OAuth20DetailsController.class);
+	static final  Logger logger = LoggerFactory.getLogger(OAuth20DetailsController.class);
 	
 	@Autowired
 	JdbcClientDetailsService oauth20JdbcClientDetailsService;
@@ -68,7 +68,7 @@ public class OAuth20DetailsController  extends BaseAppContorller {
 		AppsOAuth20Details oauth20Details=new AppsOAuth20Details(application,baseClientDetails);
 		oauth20Details.setSecret(application.getSecret());
 		oauth20Details.setClientSecret(application.getSecret());
-		_logger.debug("forwardUpdate "+oauth20Details);
+		logger.debug("forwardUpdate {}" , oauth20Details);
 		oauth20Details.transIconBase64();
 		return new Message<AppsOAuth20Details>(oauth20Details).buildResponse();
 	}
@@ -78,7 +78,7 @@ public class OAuth20DetailsController  extends BaseAppContorller {
 	public ResponseEntity<?> add(
 			@RequestBody  AppsOAuth20Details oauth20Details,
 			@CurrentUser UserInfo currentUser) {
-		_logger.debug("-Add  :" + oauth20Details);
+		logger.debug("-Add  : {}", oauth20Details);
 		
 		if(oauth20Details.getProtocol().equalsIgnoreCase(ConstsProtocols.OAUTH21)) {
 		    oauth20Details.setPkce(OAuth2Constants.PKCE_TYPE.PKCE_TYPE_YES);
@@ -101,9 +101,9 @@ public class OAuth20DetailsController  extends BaseAppContorller {
 	public ResponseEntity<?> update(
 			@RequestBody  AppsOAuth20Details oauth20Details,
 			@CurrentUser UserInfo currentUser) {
-		_logger.debug("-update  :" + oauth20Details);
-		_logger.debug("-update  application :" + oauth20Details);
-		_logger.debug("-update  oauth20Details use oauth20JdbcClientDetails" );
+		logger.debug("-update  : {}" , oauth20Details);
+		logger.debug("-update  application {}" , oauth20Details);
+		logger.debug("-update  oauth20Details use oauth20JdbcClientDetails" );
 		if(oauth20Details.getProtocol().equalsIgnoreCase(ConstsProtocols.OAUTH21)) {
             oauth20Details.setPkce(OAuth2Constants.PKCE_TYPE.PKCE_TYPE_YES);
         }
@@ -126,7 +126,7 @@ public class OAuth20DetailsController  extends BaseAppContorller {
 	public ResponseEntity<?> delete(
 			@RequestParam("ids") String ids,
 			@CurrentUser UserInfo currentUser) {
-		_logger.debug("-delete  ids : {} " , ids);
+		logger.debug("-delete  ids : {} " , ids);
 		for (String id : StringUtils.split(ids, ",")){
 			oauth20JdbcClientDetailsService.removeClientDetails(id);
 		}

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/SAML20DetailsController.java

@@ -46,7 +46,6 @@ import org.opensaml.saml2.metadata.SPSSODescriptor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
@@ -60,7 +59,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 @Controller
 @RequestMapping(value={"/apps/saml20"})
 public class SAML20DetailsController   extends BaseAppContorller {
-	final static Logger _logger = LoggerFactory.getLogger(SAML20DetailsController.class);
+	static final  Logger logger = LoggerFactory.getLogger(SAML20DetailsController.class);
 	
 	@Autowired
 	private KeyStoreLoader keyStoreLoader;
@@ -94,7 +93,7 @@ public class SAML20DetailsController   extends BaseAppContorller {
 	public ResponseEntity<?> add(
 			@RequestBody AppsSAML20Details saml20Details,
 			@CurrentUser UserInfo currentUser) {
-		_logger.debug("-Add  :" + saml20Details);
+		logger.debug("-Add  : {}" , saml20Details);
 		
 		try {
 			transform(saml20Details);
@@ -115,7 +114,7 @@ public class SAML20DetailsController   extends BaseAppContorller {
 	public ResponseEntity<?> update(
 			@RequestBody AppsSAML20Details saml20Details,
 			@CurrentUser UserInfo currentUser) {
-		_logger.debug("-update  :" + saml20Details);
+		logger.debug("-update  : {}" , saml20Details);
 		try {
 			transform(saml20Details);
 		} catch (Exception e) {
@@ -135,7 +134,7 @@ public class SAML20DetailsController   extends BaseAppContorller {
 	public ResponseEntity<?> delete(
 			@RequestParam("ids") String ids,
 			@CurrentUser UserInfo currentUser) {
-		_logger.debug("-delete  ids : {} " , ids);
+		logger.debug("-delete  ids : {} " , ids);
 		if (saml20DetailsService.deleteBatch(ids)&&appsService.deleteBatch(ids)) {
 			 return new Message<AppsSAML20Details>(Message.SUCCESS).buildResponse();
 		} else {
@@ -160,7 +159,7 @@ public class SAML20DetailsController   extends BaseAppContorller {
 								X509CertUtils.loadCertFromInputStream(bArrayInputStream));
 					}
 				} catch (IOException e) {
-					_logger.error("read certificate file error .", e);
+					logger.error("read certificate file error .", e);
 				}
 			}else if(samlDetails.getFileType().equals("metadata_file")){//metadata file
 				if(bArrayInputStream != null) {
@@ -206,7 +205,7 @@ public class SAML20DetailsController   extends BaseAppContorller {
         try {
             entityDescriptor = MetadataDescriptorUtil.getInstance().getEntityDescriptor(inputStream);
         } catch (IOException e) {
-            _logger.error("metadata  file resolve error .", e);
+            logger.error("metadata  file resolve error .", e);
             throw new Exception("metadata  file resolve error", e);
         }
         SPSSODescriptor sPSSODescriptor = entityDescriptor.getSPSSODescriptor(SAMLConstants.SAML20P_NS);
@@ -226,7 +225,7 @@ public class SAML20DetailsController   extends BaseAppContorller {
             samlDetails.setAudience(entityDescriptor.getEntityID());
         }
 
-        _logger.info("SPSSODescriptor EntityID "+ entityDescriptor.getEntityID());
+        logger.info("SPSSODescriptor EntityID {}", entityDescriptor.getEntityID());
         return samlDetails;
 	}
 	

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/TokenBasedDetailsController.java

@@ -41,7 +41,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 @Controller
 @RequestMapping(value={"/apps/tokenbased"})
 public class TokenBasedDetailsController  extends BaseAppContorller {
-	final static Logger _logger = LoggerFactory.getLogger(TokenBasedDetailsController.class);
+	static final  Logger logger = LoggerFactory.getLogger(TokenBasedDetailsController.class);
 	
 	@Autowired
 	AppsTokenBasedDetailsService tokenBasedDetailsService;
@@ -72,7 +72,7 @@ public class TokenBasedDetailsController  extends BaseAppContorller {
 	public ResponseEntity<?> add(
 			@RequestBody AppsTokenBasedDetails tokenBasedDetails,
 			@CurrentUser UserInfo currentUser) {
-		_logger.debug("-Add  :" + tokenBasedDetails);
+		logger.debug("-Add  : {}" , tokenBasedDetails);
 		
 		transform(tokenBasedDetails);
 		
@@ -91,7 +91,7 @@ public class TokenBasedDetailsController  extends BaseAppContorller {
 	public ResponseEntity<?> update(
 			@RequestBody AppsTokenBasedDetails tokenBasedDetails,
 			@CurrentUser UserInfo currentUser) {
-		_logger.debug("-update  :" + tokenBasedDetails);
+		logger.debug("-update  : {}" , tokenBasedDetails);
 		transform(tokenBasedDetails);
 		tokenBasedDetails.setAlgorithmKey(tokenBasedDetails.getSecret());
 		tokenBasedDetails.setInstId(currentUser.getInstId());
@@ -108,7 +108,7 @@ public class TokenBasedDetailsController  extends BaseAppContorller {
 	public ResponseEntity<?> delete(
 			@RequestParam("ids") String ids,
 			@CurrentUser UserInfo currentUser) {
-		_logger.debug("-delete  ids : {} " , ids);
+		logger.debug("-delete  ids : {} " , ids);
 		if (tokenBasedDetailsService.deleteBatch(ids)&&appsService.deleteBatch(ids)) {
 			 return new Message<AppsJwtDetails>(Message.SUCCESS).buildResponse();
 		} else {

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/AccountsStrategyController.java

@@ -40,7 +40,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 @Controller
 @RequestMapping(value={"/config/accountsstrategy"})
 public class AccountsStrategyController {
-	final static Logger _logger = LoggerFactory.getLogger(AccountsStrategyController.class);
+	static final  Logger logger = LoggerFactory.getLogger(AccountsStrategyController.class);
 	
 	@Autowired
 	AccountsStrategyService accountsStrategyService;
@@ -56,7 +56,7 @@ public class AccountsStrategyController {
 		for (AccountsStrategy strategy : accountsStrategyList.getRows()){
 			strategy.transIconBase64();
 		}
-		_logger.debug("Accounts Strategy "+accountsStrategyList);
+		logger.debug("Accounts Strategy {}" , accountsStrategyList);
 		return new Message<JpaPageResults<AccountsStrategy>>(
 				accountsStrategyList).buildResponse();
 	}
@@ -64,7 +64,7 @@ public class AccountsStrategyController {
 	@ResponseBody
 	@RequestMapping(value={"/query"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> query(@ModelAttribute AccountsStrategy accountsStrategy,@CurrentUser UserInfo currentUser) {
-		_logger.debug("-query  :" + accountsStrategy);
+		logger.debug("-query  : {}" , accountsStrategy);
 		if (accountsStrategyService.query(accountsStrategy)!=null) {
 			 return new Message<AccountsStrategy>(Message.SUCCESS).buildResponse();
 		} else {
@@ -81,7 +81,7 @@ public class AccountsStrategyController {
 	@ResponseBody
 	@RequestMapping(value={"/add"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> insert(@RequestBody AccountsStrategy accountsStrategy,@CurrentUser UserInfo currentUser) {
-		_logger.debug("-Add  :" + accountsStrategy);
+		logger.debug("-Add  : {}" , accountsStrategy);
 		
 		if (accountsStrategyService.insert(accountsStrategy)) {
 			accountsService.refreshByStrategy(accountsStrategy);
@@ -94,7 +94,7 @@ public class AccountsStrategyController {
 	@ResponseBody
 	@RequestMapping(value={"/update"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> update(@RequestBody  AccountsStrategy accountsStrategy,@CurrentUser UserInfo currentUser) {
-		_logger.debug("-update  :" + accountsStrategy);
+		logger.debug("-update  : {}" , accountsStrategy);
 		if (accountsStrategyService.update(accountsStrategy)) {
 			accountsService.refreshByStrategy(accountsStrategy);
 		    return new Message<AccountsStrategy>(Message.SUCCESS).buildResponse();
@@ -106,7 +106,7 @@ public class AccountsStrategyController {
 	@ResponseBody
 	@RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> delete(@RequestParam("ids") String ids,@CurrentUser UserInfo currentUser) {
-		_logger.debug("-delete  ids : {} " , ids);
+		logger.debug("-delete  ids : {} " , ids);
 		if (accountsStrategyService.deleteBatch(ids)) {
 			 return new Message<AccountsStrategy>(Message.SUCCESS).buildResponse();
 		} else {

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/AdaptersController.java

@@ -40,7 +40,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 @Controller
 @RequestMapping(value={"/config/adapters"})
 public class AdaptersController {
-	final static Logger _logger = LoggerFactory.getLogger(AdaptersController.class);
+	static final  Logger logger = LoggerFactory.getLogger(AdaptersController.class);
 	
 	@Autowired
 	AppsAdaptersService appsAdaptersService;	
@@ -48,7 +48,7 @@ public class AdaptersController {
 	@RequestMapping(value = { "/fetch" }, produces = {MediaType.APPLICATION_JSON_VALUE})
 	@ResponseBody
 	public ResponseEntity<?> fetch(@ModelAttribute AppsAdapters appsAdapter) {
-		_logger.debug(""+appsAdapter);
+		logger.debug("fetch {}",appsAdapter);
 		return new Message<JpaPageResults<AppsAdapters>>(
 				appsAdaptersService.fetchPageResults(appsAdapter)).buildResponse();
 	}
@@ -56,7 +56,7 @@ public class AdaptersController {
 	@ResponseBody
 	@RequestMapping(value={"/query"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> query(@ModelAttribute AppsAdapters appsAdapter,@CurrentUser UserInfo currentUser) {
-		_logger.debug("-query  :" + appsAdapter);
+		logger.debug("-query  : {}" , appsAdapter);
 		if (appsAdaptersService.query(appsAdapter)!=null) {
 			 return new Message<AppsAdapters>(Message.SUCCESS).buildResponse();
 		} else {
@@ -73,7 +73,7 @@ public class AdaptersController {
 	@ResponseBody
 	@RequestMapping(value={"/add"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> insert(@RequestBody  AppsAdapters appsAdapter,@CurrentUser UserInfo currentUser) {
-		_logger.debug("-Add  :" + appsAdapter);
+		logger.debug("-Add  : {}" , appsAdapter);
 		
 		if (appsAdaptersService.insert(appsAdapter)) {
 			return new Message<AppsAdapters>(Message.SUCCESS).buildResponse();
@@ -85,7 +85,7 @@ public class AdaptersController {
 	@ResponseBody
 	@RequestMapping(value={"/update"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> update(@RequestBody  AppsAdapters appsAdapter,@CurrentUser UserInfo currentUser) {
-		_logger.debug("-update  :" + appsAdapter);
+		logger.debug("-update  : {}" , appsAdapter);
 		if (appsAdaptersService.update(appsAdapter)) {
 		    return new Message<AppsAdapters>(Message.SUCCESS).buildResponse();
 		} else {
@@ -96,7 +96,7 @@ public class AdaptersController {
 	@ResponseBody
 	@RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> delete(@RequestParam("ids") String ids,@CurrentUser UserInfo currentUser) {
-		_logger.debug("-delete  ids : {} " , ids);
+		logger.debug("-delete  ids : {} " , ids);
 		if (appsAdaptersService.deleteBatch(ids)) {
 			 return new Message<AppsAdapters>(Message.SUCCESS).buildResponse();
 		} else {

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/ConnectorsController.java

@@ -40,7 +40,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 @Controller
 @RequestMapping(value={"/config/connectors"})
 public class ConnectorsController {
-	final static Logger _logger = LoggerFactory.getLogger(ConnectorsController.class);
+	static final  Logger logger = LoggerFactory.getLogger(ConnectorsController.class);
 	
 	@Autowired
 	ConnectorsService connectorsService;
@@ -48,7 +48,7 @@ public class ConnectorsController {
 	@RequestMapping(value = { "/fetch" }, produces = {MediaType.APPLICATION_JSON_VALUE})
 	@ResponseBody
 	public ResponseEntity<?> fetch(Connectors connector,@CurrentUser UserInfo currentUser) {
-		_logger.debug(""+connector);
+		logger.debug("fetch {}" , connector);
 		connector.setInstId(currentUser.getInstId());
 		return new Message<JpaPageResults<Connectors>>(
 				connectorsService.fetchPageResults(connector)).buildResponse();
@@ -66,7 +66,7 @@ public class ConnectorsController {
 	@ResponseBody
 	@RequestMapping(value={"/add"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> insert(@RequestBody  Connectors connector,@CurrentUser UserInfo currentUser) {
-		_logger.debug("-Add  :" + connector);
+		logger.debug("-Add  : {}" , connector);
 		connector.setInstId(currentUser.getInstId());
 		if(StringUtils.isNotBlank(connector.getCredentials())) {
 			connector.setCredentials(PasswordReciprocal.getInstance().encode(connector.getCredentials()));
@@ -81,7 +81,7 @@ public class ConnectorsController {
 	@ResponseBody
 	@RequestMapping(value={"/update"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> update(@RequestBody  Connectors connector,@CurrentUser UserInfo currentUser) {
-		_logger.debug("-update  :" + connector);
+		logger.debug("-update  : {}" , connector);
 		connector.setInstId(currentUser.getInstId());
 		connector.setCredentials(PasswordReciprocal.getInstance().encode(connector.getCredentials()));
 		if (connectorsService.update(connector)) {
@@ -94,7 +94,7 @@ public class ConnectorsController {
 	@ResponseBody
 	@RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> delete(@RequestParam("ids") String ids,@CurrentUser UserInfo currentUser) {
-		_logger.debug("-delete  ids : {} " , ids);
+		logger.debug("-delete  ids : {} " , ids);
 		if (connectorsService.deleteBatch(ids)) {
 			 return new Message<Connectors>(Message.SUCCESS).buildResponse();
 		} else {

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/EmailSendersController.java

@@ -37,7 +37,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 @Controller
 @RequestMapping(value={"/config/emailsenders"})
 public class EmailSendersController {
-	final static Logger _logger = LoggerFactory.getLogger(EmailSendersController.class);
+	static final  Logger logger = LoggerFactory.getLogger(EmailSendersController.class);
 	
 	@Autowired
 	private EmailSendersService emailSendersService;
@@ -58,7 +58,7 @@ public class EmailSendersController {
 	@RequestMapping(value={"/update"})
 	@ResponseBody
 	public ResponseEntity<?> update( @RequestBody  EmailSenders emailSenders,@CurrentUser UserInfo currentUser,BindingResult result) {
-		_logger.debug("update emailSenders : "+emailSenders);
+		logger.debug("update emailSenders : {}" , emailSenders);
 		emailSenders.setInstId(currentUser.getInstId());
 		emailSenders.setCredentials(PasswordReciprocal.getInstance().encode(emailSenders.getCredentials()));
 		if(StringUtils.isBlank(emailSenders.getId())) {

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/InstitutionsController.java

@@ -35,7 +35,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 @Controller
 @RequestMapping(value={"/config/institutions"})
 public class InstitutionsController {
-		final static Logger _logger = LoggerFactory.getLogger(InstitutionsController.class);
+		static final  Logger logger = LoggerFactory.getLogger(InstitutionsController.class);
 		
 		@Autowired
 		private InstitutionsService institutionsService;
@@ -51,7 +51,7 @@ public class InstitutionsController {
 				@RequestBody  Institutions institutions,
 				@CurrentUser UserInfo currentUser,
 				BindingResult result) {
-			_logger.debug("updateRole institutions : "+institutions);
+			logger.debug("updateRole institutions : {}" , institutions);
 			if(institutionsService.update(institutions)) {
 				return new Message<Institutions>(Message.SUCCESS).buildResponse();
 			} else {

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/LdapContextController.java

@@ -40,7 +40,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 @Controller
 @RequestMapping(value={"/config/ldapcontext"})
 public class LdapContextController {
-	final static Logger _logger = LoggerFactory.getLogger(LdapContextController.class);
+	static final  Logger logger = LoggerFactory.getLogger(LdapContextController.class);
 	
 	@Autowired
 	private LdapContextService ldapContextService;
@@ -57,7 +57,7 @@ public class LdapContextController {
 	@RequestMapping(value={"/update"})
 	@ResponseBody
 	public ResponseEntity<?> update( @RequestBody LdapContext ldapContext,@CurrentUser UserInfo currentUser,BindingResult result) {
-		_logger.debug("update ldapContext : "+ldapContext);
+		logger.debug("update ldapContext : {}" ,ldapContext);
 		ldapContext.setCredentials(PasswordReciprocal.getInstance().encode(ldapContext.getCredentials()));
 		ldapContext.setInstId(currentUser.getInstId());
 		boolean updateResult = false;

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/LocalizationController.java

@@ -41,7 +41,7 @@ import org.springframework.web.servlet.ModelAndView;
 public class LocalizationController {
 
 
-		final static Logger _logger = LoggerFactory.getLogger(LocalizationController.class);
+		static final  Logger logger = LoggerFactory.getLogger(LocalizationController.class);
 		
 		@Autowired
 		private LocalizationRepository localizationRepository;
@@ -67,7 +67,7 @@ public class LocalizationController {
 		@RequestMapping(value={"/update"})
 		@ResponseBody
 		public ResponseEntity<?> update(@ModelAttribute("localization") Localization localization,@CurrentUser UserInfo currentUser,BindingResult result) {
-			_logger.debug("update  localization : "+localization);
+			logger.debug("update  localization : {}" ,localization);
 			localization.setInstId(currentUser.getInstId());
 			if(StringUtils.isBlank(localization.getId())){
 				localization.setId(localization.generateId());

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/PasswordPolicyController.java

@@ -39,7 +39,7 @@ import jakarta.validation.Valid;
 @Controller
 @RequestMapping(value={"/config/passwordpolicy"})
 public class PasswordPolicyController {
-	final static Logger _logger = LoggerFactory.getLogger(PasswordPolicyController.class);
+	static final  Logger logger = LoggerFactory.getLogger(PasswordPolicyController.class);
 		
 	@Autowired
 	private PasswordPolicyService passwordPolicyService;
@@ -52,7 +52,7 @@ public class PasswordPolicyController {
 
 	@RequestMapping(value={"/update"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> update(@Valid @RequestBody PasswordPolicy passwordPolicy,@CurrentUser UserInfo currentUser,BindingResult result) {
-		_logger.debug("updateRole passwordPolicy : "+passwordPolicy);
+		logger.debug("updateRole passwordPolicy : {}" ,passwordPolicy);
 		//Message message = this.validate(result, passwordPolicy);
 		
 		if(passwordPolicyService.update(passwordPolicy)) {

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/SmsProviderController.java

@@ -38,7 +38,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 @Controller
 @RequestMapping(value={"/config/smsprovider"})
 public class SmsProviderController {
-	final static Logger _logger = LoggerFactory.getLogger(SmsProviderController.class);
+	static final  Logger logger = LoggerFactory.getLogger(SmsProviderController.class);
 	
 	@Autowired
 	private SmsProviderService smsProviderService;
@@ -55,7 +55,7 @@ public class SmsProviderController {
 	@RequestMapping(value={"/update"})
 	@ResponseBody
 	public ResponseEntity<?> update( @RequestBody SmsProvider smsProvider,@CurrentUser UserInfo currentUser,BindingResult result) {
-		_logger.debug("update smsProvider : "+smsProvider);
+		logger.debug("update smsProvider : {}" ,smsProvider);
 		smsProvider.setAppSecret(PasswordReciprocal.getInstance().encode(smsProvider.getAppSecret()));
 		smsProvider.setInstId(currentUser.getInstId());
 		boolean updateResult = false;

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/SocialsProviderController.java

@@ -41,7 +41,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 @Controller
 @RequestMapping(value={"/config/socialsprovider"})
 public class SocialsProviderController {
-	final static Logger _logger = LoggerFactory.getLogger(SocialsProviderController.class);
+	static final  Logger logger = LoggerFactory.getLogger(SocialsProviderController.class);
 	
 	@Autowired
 	SocialsProviderService socialsProviderService;
@@ -49,7 +49,7 @@ public class SocialsProviderController {
 	@RequestMapping(value = { "/fetch" }, produces = {MediaType.APPLICATION_JSON_VALUE})
 	@ResponseBody
 	public ResponseEntity<?> fetch(@ModelAttribute SocialsProvider socialsProvider,@CurrentUser UserInfo currentUser) {
-		_logger.debug(""+socialsProvider);
+		logger.debug("fetch {}" ,socialsProvider);
 		socialsProvider.setInstId(currentUser.getInstId());
 		return new Message<JpaPageResults<SocialsProvider>>(
 				socialsProviderService.fetchPageResults(socialsProvider)).buildResponse();
@@ -58,7 +58,7 @@ public class SocialsProviderController {
 	@ResponseBody
 	@RequestMapping(value={"/query"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> query(@ModelAttribute SocialsProvider socialsProvider,@CurrentUser UserInfo currentUser) {
-		_logger.debug("-query  :" + socialsProvider);
+		logger.debug("-query  : {}" , socialsProvider);
 		socialsProvider.setInstId(currentUser.getInstId());
 		if (socialsProviderService.query(socialsProvider)!=null) {
 			 return new Message<SocialsProvider>(Message.SUCCESS).buildResponse();
@@ -77,7 +77,7 @@ public class SocialsProviderController {
 	@ResponseBody
 	@RequestMapping(value={"/add"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> insert(@RequestBody  SocialsProvider socialsProvider,@CurrentUser UserInfo currentUser) {
-		_logger.debug("-Add  :" + socialsProvider);
+		logger.debug("-Add  : {}" , socialsProvider);
 		socialsProvider.setInstId(currentUser.getInstId());
 		socialsProvider.setClientSecret(PasswordReciprocal.getInstance().encode(socialsProvider.getClientSecret()));
 		if (socialsProviderService.insert(socialsProvider)) {
@@ -90,7 +90,7 @@ public class SocialsProviderController {
 	@ResponseBody
 	@RequestMapping(value={"/update"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> update(@RequestBody  SocialsProvider socialsProvider,@CurrentUser UserInfo currentUser) {
-		_logger.debug("-update  :" + socialsProvider);
+		logger.debug("-update  : {}" , socialsProvider);
 		socialsProvider.setInstId(currentUser.getInstId());
 		socialsProvider.setClientSecret(PasswordReciprocal.getInstance().encode(socialsProvider.getClientSecret()));
 		if (socialsProviderService.update(socialsProvider)) {
@@ -104,7 +104,7 @@ public class SocialsProviderController {
 	@ResponseBody
 	@RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> delete(@RequestParam("ids") String ids,@CurrentUser UserInfo currentUser) {
-		_logger.debug("-delete  ids : {} " , ids);
+		logger.debug("-delete  ids : {} " , ids);
 		if (socialsProviderService.deleteBatch(ids)) {
 			 return new Message<SocialsProvider>(Message.SUCCESS).buildResponse();
 		} else {

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/SynchronizersController.java

@@ -44,7 +44,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 @Controller
 @RequestMapping(value={"/config/synchronizers"})
 public class SynchronizersController {
-	final static Logger _logger = LoggerFactory.getLogger(SynchronizersController.class);
+	static final Logger logger = LoggerFactory.getLogger(SynchronizersController.class);
 	
 	@Autowired
 	SynchronizersService synchronizersService;
@@ -52,7 +52,7 @@ public class SynchronizersController {
 	@RequestMapping(value = { "/fetch" }, produces = {MediaType.APPLICATION_JSON_VALUE})
 	@ResponseBody
 	public ResponseEntity<?> fetch(Synchronizers synchronizers,@CurrentUser UserInfo currentUser) {
-		_logger.debug(""+synchronizers);
+		logger.debug("fetch {}" , synchronizers);
 		synchronizers.setInstId(currentUser.getInstId());
 		return new Message<JpaPageResults<Synchronizers>>(
 				synchronizersService.fetchPageResults(synchronizers)).buildResponse();
@@ -68,7 +68,7 @@ public class SynchronizersController {
 	@ResponseBody
 	@RequestMapping(value={"/update"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> update(@RequestBody  Synchronizers synchronizers,@CurrentUser UserInfo currentUser) {
-		_logger.debug("-update  :" + synchronizers);
+		logger.debug("-update  : {}" , synchronizers);
 		synchronizers.setInstId(currentUser.getInstId());
 		synchronizers.setCredentials(PasswordReciprocal.getInstance().encode(synchronizers.getCredentials()));
 		if (synchronizersService.update(synchronizers)) {
@@ -81,24 +81,24 @@ public class SynchronizersController {
 	@ResponseBody
 	@RequestMapping(value={"/synchr"})  
 	public ResponseEntity<?> synchr(@RequestParam("id") String id) {
-		_logger.debug("-sync ids :" + id);
+		logger.debug("-sync ids : {}" , id);
 		
 		List<String> ids = StringUtils.string2List(id, ",");
 		try {
 			for(String sysId : ids) {
 				Synchronizers  synchronizer  = synchronizersService.get(sysId);
 				synchronizer.setCredentials(PasswordReciprocal.getInstance().decoder(synchronizer.getCredentials()));
-				_logger.debug("synchronizer " + synchronizer);
+				logger.debug("synchronizer {}" , synchronizer);
 				ISynchronizerService synchronizerService = WebContext.getBean(synchronizer.getService(),ISynchronizerService.class);
 				if(synchronizerService != null) {
 					synchronizerService.setSynchronizer(synchronizer);
 					synchronizerService.sync();
 				}else {
-					_logger.info("synchronizer {} not exist .",synchronizer.getService());
+					logger.info("synchronizer {} not exist .",synchronizer.getService());
 				}
 			}
 		}catch(Exception e) {
-			_logger.error("synchronizer Exception " , e);
+			logger.error("synchronizer Exception " , e);
 			return new Message<Synchronizers>(Message.FAIL).buildResponse();
 			
 		}

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/AccountsController.java

@@ -69,7 +69,7 @@ public class AccountsController {
 	@RequestMapping(value = { "/fetch" }, produces = {MediaType.APPLICATION_JSON_VALUE})
 	@ResponseBody
 	public ResponseEntity<?> fetch(@ModelAttribute Accounts accounts,@CurrentUser UserInfo currentUser) {
-		_logger.debug(""+accounts);
+		_logger.debug("fetch {}" , accounts);
 		accounts.setInstId(currentUser.getInstId());
 		return new Message<JpaPageResults<Accounts>>(
 				accountsService.fetchPageResults(accounts)).buildResponse();
@@ -78,7 +78,7 @@ public class AccountsController {
 	@ResponseBody
 	@RequestMapping(value={"/query"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> query(@ModelAttribute Accounts account,@CurrentUser UserInfo currentUser) {
-		_logger.debug("-query  :" + account);
+		_logger.debug("-query  : {}" , account);
 		account.setInstId(currentUser.getInstId());
 		if (accountsService.query(account)!=null) {
 			 return new Message<Accounts>(Message.SUCCESS).buildResponse();
@@ -97,7 +97,7 @@ public class AccountsController {
 	@ResponseBody
 	@RequestMapping(value={"/add"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> insert(@RequestBody  Accounts account,@CurrentUser UserInfo currentUser) {
-		_logger.debug("-Add  :" + account);
+		_logger.debug("-Add  : {}" , account);
 		account.setInstId(currentUser.getInstId());
 		account.setRelatedPassword(PasswordReciprocal.getInstance().encode(account.getRelatedPassword()));
 		if (accountsService.insert(account)) {
@@ -116,7 +116,7 @@ public class AccountsController {
 	@ResponseBody
 	@RequestMapping(value={"/update"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> update(@RequestBody  Accounts account,@CurrentUser UserInfo currentUser) {
-		_logger.debug("-update  :" + account);
+		_logger.debug("-update  : {}" , account);
 		account.setInstId(currentUser.getInstId());
 		account.setRelatedPassword(PasswordReciprocal.getInstance().encode(account.getRelatedPassword()));
 		if (accountsService.update(account)) {
@@ -136,7 +136,7 @@ public class AccountsController {
 	@RequestMapping(value = { "/updateStatus" }, produces = {MediaType.APPLICATION_JSON_VALUE})
 	@ResponseBody
 	public ResponseEntity<?> updateStatus(@ModelAttribute Accounts accounts,@CurrentUser UserInfo currentUser) {
-		_logger.debug(""+accounts);
+		_logger.debug("accounts : {}" , accounts);
 		Accounts loadAccount = accountsService.get(accounts.getId());
 		accounts.setInstId(currentUser.getInstId());
 		accounts.setAppId(loadAccount.getAppId());

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/DashboardController.java

@@ -38,13 +38,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 @Controller
 public class DashboardController {
 	
-	private static Logger _logger = LoggerFactory.getLogger(DashboardController.class);
+	private static Logger logger = LoggerFactory.getLogger(DashboardController.class);
 	@Autowired
 	ReportService reportService;
 
 	@RequestMapping(value={"/dashboard"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> dashboard(@CurrentUser UserInfo currentUser) {
-		_logger.debug("IndexController /dashboard.");
+		logger.debug("dashboard . ");
 		HashMap<String,Object> reportParameter = new HashMap<String,Object>();
 		reportParameter.put("instId", currentUser.getInstId());
 		

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/IndexEndpoint.java

@@ -31,11 +31,11 @@ import org.springframework.web.servlet.ModelAndView;
  */
 @Controller
 public class IndexEndpoint {
-	private static Logger _logger = LoggerFactory.getLogger(IndexEndpoint.class);
+	private static Logger logger = LoggerFactory.getLogger(IndexEndpoint.class);
 
 	@RequestMapping(value={"/"})
 	public ModelAndView index() {
-		_logger.debug("IndexEndpoint /.");
+		logger.debug("IndexEndpoint /.");
 		return  new ModelAndView("index")
 				.addObject("appVersion", WebContext.properties.getProperty("application.formatted-version"));
 		

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/LoginEntryPoint.java

@@ -46,7 +46,7 @@ import org.springframework.http.MediaType;
 @Controller
 @RequestMapping(value = "/login")
 public class LoginEntryPoint {
-	private static Logger _logger = LoggerFactory.getLogger(LoginEntryPoint.class);
+	private static Logger logger = LoggerFactory.getLogger(LoginEntryPoint.class);
 	
 	@Autowired
 	AuthTokenService authTokenService;
@@ -63,7 +63,7 @@ public class LoginEntryPoint {
 	 */
  	@RequestMapping(value={"/get"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> get() {
-		_logger.debug("/login.");
+		logger.debug("/login.");
 		
 		HashMap<String , Object> model = new HashMap<String , Object>();
 		model.put("isRemeberMe", applicationConfig.getLoginConfig().isRemeberMe());
@@ -90,7 +90,7 @@ public class LoginEntryPoint {
  				String errorMsg = WebContext.getAttribute(WebConstants.LOGIN_ERROR_SESSION_MESSAGE) == null ? 
 						  "" : WebContext.getAttribute(WebConstants.LOGIN_ERROR_SESSION_MESSAGE).toString();
 				authJwtMessage.setMessage(Message.FAIL,errorMsg);
-				_logger.debug("login fail , message {}",errorMsg);
+				logger.debug("login fail , message {}",errorMsg);
 	 		}
  		}
  		return authJwtMessage.buildResponse();

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/LogoutEndpoint.java

@@ -33,7 +33,7 @@ import jakarta.servlet.http.HttpServletRequest;
 
 @Controller
 public class LogoutEndpoint {
-	private static Logger _logger = LoggerFactory.getLogger(LogoutEndpoint.class);
+	private static Logger logger = LoggerFactory.getLogger(LogoutEndpoint.class);
 	
 	@Autowired
     protected SessionManager sessionManager;
@@ -45,7 +45,7 @@ public class LogoutEndpoint {
  				currentUser.getId(),
  				currentUser.getUsername());
  		//invalidate http session
-		_logger.debug("/logout invalidate http Session id {}",request.getSession().getId());
+		logger.debug("/logout invalidate http Session id {}",request.getSession().getId());
  		request.getSession().invalidate();
  		return new Message<String>().buildResponse();
  	}

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/ConnectorHistoryController.java

@@ -49,7 +49,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 @Controller
 @RequestMapping(value={"/historys"})
 public class ConnectorHistoryController {
-final static Logger _logger = LoggerFactory.getLogger(ConnectorHistoryController.class);
+	static final  Logger logger = LoggerFactory.getLogger(ConnectorHistoryController.class);
 
 	@Autowired
 	HistoryConnectorService historyConnectorService;
@@ -63,7 +63,7 @@ final static Logger _logger = LoggerFactory.getLogger(ConnectorHistoryController
     public ResponseEntity<?> fetch(
     		@ModelAttribute("historyConnector") HistoryConnector historyConnector,
 			@CurrentUser UserInfo currentUser){
-        _logger.debug("historys/historyConnector/fetch/ {}",historyConnector);
+    	logger.debug("historys/historyConnector/fetch/ {}",historyConnector);
         historyConnector.setInstId(currentUser.getInstId());
         return new Message<JpaPageResults<HistoryConnector>>(
         			historyConnectorService.fetchPageResults(historyConnector)

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginAppsHistoryController.java

@@ -48,7 +48,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 @Controller
 @RequestMapping(value={"/historys"})
 public class LoginAppsHistoryController {
-final static Logger _logger = LoggerFactory.getLogger(LoginAppsHistoryController.class);
+	static final Logger logger = LoggerFactory.getLogger(LoginAppsHistoryController.class);
 	
 	@Autowired
   	protected HistoryLoginAppsService historyLoginAppsService;
@@ -62,7 +62,7 @@ final static Logger _logger = LoggerFactory.getLogger(LoginAppsHistoryController
 	public ResponseEntity<?> fetch(
 				@ModelAttribute("historyLoginApp") HistoryLoginApps historyLoginApp,
 				@CurrentUser UserInfo currentUser){
-		_logger.debug("historys/loginAppsHistory/fetch/  {}",historyLoginApp);
+		logger.debug("historys/loginAppsHistory/fetch/  {}",historyLoginApp);
 		historyLoginApp.setId(null);
 		historyLoginApp.setInstId(currentUser.getInstId());
 		return new Message<JpaPageResults<HistoryLoginApps>>(

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginHistoryController.java

@@ -48,7 +48,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 @Controller
 @RequestMapping(value={"/historys"})
 public class LoginHistoryController {
-final static Logger _logger = LoggerFactory.getLogger(LoginHistoryController.class);
+	static final Logger logger = LoggerFactory.getLogger(LoginHistoryController.class);
 	
 	@Autowired
 	HistoryLoginService loginHistoryService;
@@ -63,7 +63,7 @@ final static Logger _logger = LoggerFactory.getLogger(LoginHistoryController.cla
 				@ModelAttribute("historyLogin") HistoryLogin historyLogin,
 				@CurrentUser UserInfo currentUser
 			){
-		_logger.debug("historys/loginHistory/fetch/ {}",historyLogin);
+		logger.debug("historys/loginHistory/fetch/ {}",historyLogin);
 		historyLogin.setInstId(currentUser.getInstId());
 		return new Message<JpaPageResults<HistoryLogin>>(
 					loginHistoryService.fetchPageResults(historyLogin)

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/SynchronizerHistoryController.java

@@ -48,7 +48,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 @Controller
 @RequestMapping(value={"/historys"})
 public class SynchronizerHistoryController {
-final static Logger _logger = LoggerFactory.getLogger(SynchronizerHistoryController.class);
+	static final Logger logger = LoggerFactory.getLogger(SynchronizerHistoryController.class);
 
 	@Autowired
 	HistorySynchronizerService historySynchronizerService;
@@ -62,7 +62,7 @@ final static Logger _logger = LoggerFactory.getLogger(SynchronizerHistoryControl
     public ResponseEntity<?> fetch(
     			@ModelAttribute("historySynchronizer") HistorySynchronizer historySynchronizer,
     			@CurrentUser UserInfo currentUser){
-        _logger.debug("historys/synchronizerHistory/fetch/ {}",historySynchronizer);
+    	logger.debug("historys/synchronizerHistory/fetch/ {}",historySynchronizer);
         historySynchronizer.setInstId(currentUser.getInstId());
         return new Message<JpaPageResults<HistorySynchronizer>>(
         		historySynchronizerService.fetchPageResults(historySynchronizer)

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/SystemLogsController.java

@@ -48,7 +48,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 @Controller
 @RequestMapping(value={"/historys"})
 public class SystemLogsController {
-final static Logger _logger = LoggerFactory.getLogger(SystemLogsController.class);
+	static final Logger logger = LoggerFactory.getLogger(SystemLogsController.class);
 
 	@Autowired
 	HistorySystemLogsService historySystemLogsService;
@@ -62,7 +62,7 @@ final static Logger _logger = LoggerFactory.getLogger(SystemLogsController.class
 	@ResponseBody
 	public ResponseEntity<?> fetch(@ModelAttribute("historyLog") HistorySystemLogs historyLog,
 			@CurrentUser UserInfo currentUser){
-		_logger.debug("historys/historyLog/fetch {} ",historyLog);
+		logger.debug("historys/historyLog/fetch {} ",historyLog);
 		historyLog.setInstId(currentUser.getInstId());
 		return new Message<JpaPageResults<HistorySystemLogs>>(
 				 	historySystemLogsService.fetchPageResults(historyLog)

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/OrganizationsController.java → maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/OrganizationsController.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.dromara.maxkey.web.contorller;
+package org.dromara.maxkey.web.idm.contorller;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -61,7 +61,7 @@ import com.google.common.collect.Lists;
 @Controller
 @RequestMapping({"/orgs"})
 public class OrganizationsController {
-  static final Logger _logger = LoggerFactory.getLogger(OrganizationsController.class);
+  static final Logger logger = LoggerFactory.getLogger(OrganizationsController.class);
 
 	@Autowired
 	OrganizationsService organizationsService;
@@ -72,7 +72,7 @@ public class OrganizationsController {
 	@RequestMapping(value = { "/fetch" }, produces = {MediaType.APPLICATION_JSON_VALUE})
 	@ResponseBody
 	public ResponseEntity<?> fetch(@ModelAttribute Organizations org,@CurrentUser UserInfo currentUser) {
-		_logger.debug("fetch {}" , org);
+		logger.debug("fetch {}" , org);
 		org.setInstId(currentUser.getInstId());
 		return new Message<JpaPageResults<Organizations>>(
 				organizationsService.fetchPageResults(org)).buildResponse();
@@ -81,7 +81,7 @@ public class OrganizationsController {
 	@ResponseBody
 	@RequestMapping(value={"/query"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> query(@ModelAttribute Organizations org,@CurrentUser UserInfo currentUser) {
-		_logger.debug("-query  {}" , org);
+		logger.debug("-query  {}" , org);
 		org.setInstId(currentUser.getInstId());
 		List<Organizations>  orgList = organizationsService.query(org);
 		if (orgList != null) {
@@ -100,7 +100,7 @@ public class OrganizationsController {
 	@ResponseBody
 	@RequestMapping(value={"/add"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> insert(@RequestBody Organizations org,@CurrentUser UserInfo currentUser) {
-		_logger.debug("-Add  :" + org);
+		logger.debug("-Add  : {}" , org);
 		org.setInstId(currentUser.getInstId());
 		if (organizationsService.insert(org)) {
 			systemLog.insert(
@@ -118,7 +118,7 @@ public class OrganizationsController {
 	@ResponseBody
 	@RequestMapping(value={"/update"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> update(@RequestBody  Organizations org,@CurrentUser UserInfo currentUser) {
-		_logger.debug("-update  :" + org);
+		logger.debug("-update  :{}" , org);
 		org.setInstId(currentUser.getInstId());
 		if (organizationsService.update(org)) {
 			systemLog.insert(
@@ -136,7 +136,7 @@ public class OrganizationsController {
 	@ResponseBody
 	@RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> delete(@RequestParam("ids") String ids,@CurrentUser UserInfo currentUser) {
-		_logger.debug("-delete  ids : {} " , ids);
+		logger.debug("-delete  ids : {} " , ids);
 		if (organizationsService.deleteBatch(ids)) {
 			systemLog.insert(
 					ConstsEntryType.ORGANIZATION, 
@@ -154,7 +154,7 @@ public class OrganizationsController {
 	@ResponseBody
 	@RequestMapping(value={"/tree"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> tree(@ModelAttribute Organizations organization,@CurrentUser UserInfo currentUser) {
-		_logger.debug("-tree  {}" , organization);
+		logger.debug("-tree  {}" , organization);
 		List<Organizations>  orgList = organizationsService.query(
 				Query.builder().eq("instid", currentUser.getInstId()));
 		if (orgList != null) {

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/contorller/RoleMemberController.java → maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/RoleMemberController.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.dromara.maxkey.web.access.contorller;
+package org.dromara.maxkey.web.idm.contorller;
 
 import org.dromara.maxkey.authn.annotation.CurrentUser;
 import org.dromara.maxkey.entity.Message;
@@ -45,7 +45,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 @Controller
 @RequestMapping(value={"/access/rolemembers"})
 public class RoleMemberController {
-	final static Logger _logger = LoggerFactory.getLogger(RoleMemberController.class);
+	final static Logger logger = LoggerFactory.getLogger(RoleMemberController.class);
 	
 	@Autowired
 	RoleMemberService roleMemberService;
@@ -64,7 +64,7 @@ public class RoleMemberController {
 	public ResponseEntity<?> fetch(
 			@ModelAttribute RoleMember roleMember,
 			@CurrentUser UserInfo currentUser) {
-		_logger.debug("fetch "+roleMember);
+		logger.debug("fetch {}" , roleMember);
 		roleMember.setInstId(currentUser.getInstId());
 		return new Message<JpaPageResults<RoleMember>>(
 				roleMemberService.fetchPageResults(roleMember)).buildResponse();
@@ -73,7 +73,7 @@ public class RoleMemberController {
 	@RequestMapping(value = { "/memberInRole" })
 	@ResponseBody
 	public ResponseEntity<?> memberInRole(@ModelAttribute RoleMember roleMember,@CurrentUser UserInfo currentUser) {
-		_logger.debug("roleMember : "+roleMember);
+		logger.debug("roleMember : {}" , roleMember);
 		roleMember.setInstId(currentUser.getInstId());
 		return new Message<JpaPageResults<RoleMember>>(
 				roleMemberService.fetchPageResults("memberInRole",roleMember)).buildResponse();
@@ -185,7 +185,7 @@ public class RoleMemberController {
 	@ResponseBody
 	@RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> delete(@RequestParam("ids") String ids,@CurrentUser UserInfo currentUser) {
-		_logger.debug("-delete ids : {}" , ids);
+		logger.debug("-delete ids : {}" , ids);
 		if (roleMemberService.deleteBatch(ids)) {
 			 return new Message<RoleMember>(Message.SUCCESS).buildResponse();
 		} else {

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/contorller/RolesController.java → maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/RolesController.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.dromara.maxkey.web.access.contorller;
+package org.dromara.maxkey.web.idm.contorller;
 
 import org.dromara.maxkey.authn.annotation.CurrentUser;
 import org.dromara.maxkey.constants.ConstsEntryType;
@@ -45,7 +45,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 @Controller
 @RequestMapping(value={"/access/roles"})
 public class RolesController {
-	final static Logger _logger = LoggerFactory.getLogger(RolesController.class);
+	final static Logger logger = LoggerFactory.getLogger(RolesController.class);
 	
 	@Autowired
 	RolesService rolesService;
@@ -58,7 +58,7 @@ public class RolesController {
 	public ResponseEntity<?> fetch(
 			@ModelAttribute Roles role,
 			@CurrentUser UserInfo currentUser) {
-		_logger.debug(""+role);
+		logger.debug("role {}" , role);
 		role.setInstId(currentUser.getInstId());
 		return new Message<JpaPageResults<Roles>>(
 				rolesService.fetchPageResults(role)).buildResponse();
@@ -67,7 +67,7 @@ public class RolesController {
 	@ResponseBody
 	@RequestMapping(value={"/query"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> query(@ModelAttribute Roles role,@CurrentUser UserInfo currentUser) {
-		_logger.debug("-query  :" + role);
+		logger.debug("-query  : {}" , role);
 		role.setInstId(currentUser.getInstId());
 		if (rolesService.query(role)!=null) {
 			 return new Message<Roles>(Message.SUCCESS).buildResponse();
@@ -86,7 +86,7 @@ public class RolesController {
 	@ResponseBody
 	@RequestMapping(value={"/add"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> insert(@RequestBody Roles role,@CurrentUser UserInfo currentUser) {
-		_logger.debug("-Add  :" + role);
+		logger.debug("-Add  : {}" , role);
 		role.setInstId(currentUser.getInstId());
 		role.setId(role.generateId());
 		if(StringUtils.isBlank(role.getRoleCode())) {
@@ -109,7 +109,7 @@ public class RolesController {
 	@ResponseBody
 	@RequestMapping(value={"/update"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> update(@RequestBody Roles role,@CurrentUser UserInfo currentUser) {
-		_logger.debug("-update  group :" + role);
+		logger.debug("-update  group : {}" , role);
 		if(role.getId().equalsIgnoreCase("ROLE_ALL_USER")) {
 			role.setDefaultAllUser();
 		}
@@ -131,7 +131,7 @@ public class RolesController {
 	@ResponseBody
 	@RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> delete(@RequestParam("ids") String ids,@CurrentUser UserInfo currentUser) {
-		_logger.debug("-delete ids : {}" , ids);
+		logger.debug("-delete ids : {}" , ids);
 		ids = ids.replaceAll("ROLE_ALL_USER", "-1").replaceAll("ROLE_ADMINISTRATORS", "-1");
 		if (rolesService.deleteBatch(ids)) {
 			systemLog.insert(

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/UserAdjointController.java → maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/UserAdjointController.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.dromara.maxkey.web.contorller;
+package org.dromara.maxkey.web.idm.contorller;
 
 import org.dromara.maxkey.authn.annotation.CurrentUser;
 import org.dromara.maxkey.entity.Message;
@@ -38,7 +38,7 @@ import org.springframework.web.servlet.ModelAndView;
 @Controller
 @RequestMapping(value={"/useradjoint"})
 public class UserAdjointController {
-	final static Logger _logger = LoggerFactory.getLogger(UserAdjointController.class);
+	final static Logger logger = LoggerFactory.getLogger(UserAdjointController.class);
 	
 	@Autowired
 	UserInfoAdjointService userInfoAdjointService;
@@ -57,7 +57,7 @@ public class UserAdjointController {
 	public JpaPageResults<UserInfoAdjoint> queryDataGrid(
 			@ModelAttribute("userInfoAdjoint") UserInfoAdjoint userInfoAdjoint,
 			@CurrentUser UserInfo currentUser){
-		_logger.debug(""+userInfoAdjoint);
+		logger.debug("userInfoAdjoint {}" , userInfoAdjoint);
 		userInfoAdjoint.setInstId(currentUser.getInstId());
 		return userInfoAdjointService.fetchPageResults(userInfoAdjoint);
 	}
@@ -83,7 +83,7 @@ public class UserAdjointController {
 	public ResponseEntity<?> insert(
 			@ModelAttribute("userInfoAdjoint") UserInfoAdjoint userInfoAdjoint,
 			@CurrentUser UserInfo currentUser) {
-		_logger.debug("-Add  :" + userInfoAdjoint);
+		logger.debug("-Add  : {}" , userInfoAdjoint);
 		userInfoAdjoint.setInstId(currentUser.getInstId());
 		if (userInfoAdjointService.insert(userInfoAdjoint)) {
 			return new Message<UserInfoAdjoint>(Message.SUCCESS).buildResponse();
@@ -104,7 +104,7 @@ public class UserAdjointController {
 	public ResponseEntity<?> query(
 			@ModelAttribute("userInfoAdjoint") UserInfoAdjoint userInfoAdjoint,
 			@CurrentUser UserInfo currentUser) {
-		_logger.debug("-query  :" + userInfoAdjoint);
+		logger.debug("-query  : {} " , userInfoAdjoint);
 		userInfoAdjoint.setInstId(currentUser.getInstId());
 		if (userInfoAdjointService.query(userInfoAdjoint)!=null) {
 			return new Message<UserInfoAdjoint>(Message.SUCCESS).buildResponse();
@@ -125,7 +125,7 @@ public class UserAdjointController {
 	public ResponseEntity<?> update(
 			@ModelAttribute("userInfoAdjoint") UserInfoAdjoint userInfoAdjoint,
 			@CurrentUser UserInfo currentUser) {
-		_logger.debug("-update  userInfoAdjoint :" + userInfoAdjoint);
+		logger.debug("-update  userInfoAdjoint : {}" , userInfoAdjoint);
 		userInfoAdjoint.setInstId(currentUser.getInstId());
 		if (userInfoAdjointService.update(userInfoAdjoint)) {
 			return new Message<UserInfoAdjoint>(Message.SUCCESS).buildResponse();
@@ -140,7 +140,7 @@ public class UserAdjointController {
 	@ResponseBody
 	@RequestMapping(value={"/delete"})
 	public ResponseEntity<?> delete(@ModelAttribute("userInfoAdjoint") UserInfoAdjoint userInfoAdjoint) {
-		_logger.debug("-delete  group :" + userInfoAdjoint);
+		logger.debug("-delete  group : {}" , userInfoAdjoint);
 		
 		if (userInfoAdjointService.deleteBatch(userInfoAdjoint.getId())) {
 			return new Message<UserInfoAdjoint>(Message.SUCCESS).buildResponse();

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/UserInfoController.java → maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/UserInfoController.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.dromara.maxkey.web.contorller;
+package org.dromara.maxkey.web.idm.contorller;
 
 import java.beans.PropertyEditorSupport;
 import java.io.IOException;
@@ -75,7 +75,7 @@ import com.google.common.collect.Lists;
 @Controller
 @RequestMapping(value = { "/users" })
 public class UserInfoController {
-	final static Logger _logger = LoggerFactory.getLogger(UserInfoController.class);
+	final static Logger logger = LoggerFactory.getLogger(UserInfoController.class);
 	
 	@Autowired
 	private UserInfoService userInfoService;
@@ -89,7 +89,7 @@ public class UserInfoController {
 	@RequestMapping(value = { "/fetch" }, produces = {MediaType.APPLICATION_JSON_VALUE})
 	@ResponseBody
 	public ResponseEntity<?> fetch(@ModelAttribute UserInfo userInfo,@CurrentUser UserInfo currentUser) {
-		_logger.debug(""+userInfo);
+		logger.debug(""+userInfo);
 		userInfo.setInstId(currentUser.getInstId());
 		return new Message<JpaPageResults<UserInfo>>(
 				userInfoService.fetchPageResults(userInfo)).buildResponse();
@@ -98,7 +98,7 @@ public class UserInfoController {
 	@ResponseBody
 	@RequestMapping(value={"/query"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> query(@ModelAttribute UserInfo userInfo,@CurrentUser UserInfo currentUser) {
-		_logger.debug("-query  :" + userInfo);
+		logger.debug("-query  :" + userInfo);
 		if (userInfoService.query(userInfo)!=null) {
 			 return new Message<UserInfo>(Message.SUCCESS).buildResponse();
 		} else {
@@ -123,7 +123,7 @@ public class UserInfoController {
 	@ResponseBody
 	@RequestMapping(value={"/add"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> insert(@RequestBody UserInfo userInfo,@CurrentUser UserInfo currentUser) {
-		_logger.debug("-Add  :" + userInfo);
+		logger.debug("-Add  :" + userInfo);
 		userInfo.setId(WebContext.genId());
 		userInfo.setInstId(currentUser.getInstId());
 		if(StringUtils.isNotBlank(userInfo.getPictureId())) {
@@ -146,13 +146,13 @@ public class UserInfoController {
 	@ResponseBody
 	@RequestMapping(value={"/update"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> update(@RequestBody  UserInfo userInfo,@CurrentUser UserInfo currentUser) {
-		_logger.debug("-update  :" + userInfo);
-		_logger.info(userInfo.getExtraAttributeName());
-		_logger.info(userInfo.getExtraAttributeValue());
+		logger.debug("-update  :" + userInfo);
+		logger.info(userInfo.getExtraAttributeName());
+		logger.info(userInfo.getExtraAttributeValue());
 		//userInfo.setNameZHShortSpell(StringUtils.hanYu2Pinyin(userInfo.getDisplayName(), true));
 		//userInfo.setNameZHSpell(StringUtils.hanYu2Pinyin(userInfo.getDisplayName(), false));
 		convertExtraAttribute(userInfo) ;
-		_logger.info(userInfo.getExtraAttribute());
+		logger.info(userInfo.getExtraAttribute());
 		userInfo.setInstId(currentUser.getInstId());
 		if(StringUtils.isNotBlank(userInfo.getPictureId())) {
 			userInfo.setPicture(fileUploadService.get(userInfo.getPictureId()).getUploaded());
@@ -174,7 +174,7 @@ public class UserInfoController {
 	@ResponseBody
 	@RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> delete(@RequestParam("ids") String ids,@CurrentUser UserInfo currentUser) {
-		_logger.debug("-delete  ids : {} " , ids);
+		logger.debug("-delete  ids : {} " , ids);
 		
 		if (userInfoService.deleteBatch(ids)) {
 			systemLog.insert(
@@ -219,7 +219,7 @@ public class UserInfoController {
 	public ResponseEntity<?> changePassword(
 			@RequestBody ChangePassword changePassword,
 			@CurrentUser UserInfo currentUser) {
-		_logger.debug("UserId {}",changePassword.getUserId());
+		logger.debug("UserId {}",changePassword.getUserId());
 		changePassword.setPasswordSetType(ConstsPasswordSetType.PASSWORD_NORMAL);
 		if(userInfoService.changePassword(changePassword,true)) {
 			systemLog.insert(
@@ -237,7 +237,7 @@ public class UserInfoController {
 	@RequestMapping(value = { "/updateStatus" }, produces = {MediaType.APPLICATION_JSON_VALUE})
 	@ResponseBody
 	public ResponseEntity<?> updateStatus(@ModelAttribute UserInfo userInfo,@CurrentUser UserInfo currentUser) {
-		_logger.debug(""+userInfo);
+		logger.debug(""+userInfo);
 		UserInfo loadUserInfo = userInfoService.get(userInfo.getId());
 		userInfo.setInstId(currentUser.getInstId());
 		userInfo.setUsername(loadUserInfo.getUsername());
@@ -276,7 +276,7 @@ public class UserInfoController {
                         	UserInfo userInfo = buildUserFromSheetRow(row,currentUser);
                             userInfoList.add(userInfo);
                             recordCount ++;
-                            _logger.debug("record {} user {} account {}",recordCount,userInfo.getDisplayName(),userInfo.getUsername());
+                            logger.debug("record {} user {} account {}",recordCount,userInfo.getDisplayName(),userInfo.getUsername());
                         }
                     }
                 }

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/contorller/ResourcesController.java

@@ -49,7 +49,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 @Controller
 @RequestMapping(value={"/permissions/resources"})
 public class ResourcesController {
-	final static Logger _logger = LoggerFactory.getLogger(ResourcesController.class);
+	final static Logger logger = LoggerFactory.getLogger(ResourcesController.class);
 	
 	@Autowired
 	ResourcesService resourcesService;
@@ -60,7 +60,7 @@ public class ResourcesController {
 	@RequestMapping(value = { "/fetch" }, produces = {MediaType.APPLICATION_JSON_VALUE})
 	@ResponseBody
 	public ResponseEntity<?> fetch(@ModelAttribute Resources resource,@CurrentUser UserInfo currentUser) {
-		_logger.debug("fetch {}" , resource);
+		logger.debug("fetch {}" , resource);
 		resource.setInstId(currentUser.getInstId());
 		return new Message<JpaPageResults<Resources>>(
 				resourcesService.fetchPageResults(resource)).buildResponse();
@@ -69,7 +69,7 @@ public class ResourcesController {
 	@ResponseBody
 	@RequestMapping(value={"/query"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> query(@ModelAttribute Resources resource,@CurrentUser UserInfo currentUser) {
-		_logger.debug("-query  {}" , resource);
+		logger.debug("-query  {}" , resource);
 		resource.setInstId(currentUser.getInstId());
 		List<Resources>  resourceList = resourcesService.query(resource);
 		if (resourceList != null) {
@@ -88,7 +88,7 @@ public class ResourcesController {
 	@ResponseBody
 	@RequestMapping(value={"/add"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> insert(@RequestBody Resources resource,@CurrentUser UserInfo currentUser) {
-		_logger.debug("-Add  :" + resource);
+		logger.debug("-Add  :" + resource);
 		resource.setInstId(currentUser.getInstId());
 		if (resourcesService.insert(resource)) {
 			systemLog.insert(
@@ -106,7 +106,7 @@ public class ResourcesController {
 	@ResponseBody
 	@RequestMapping(value={"/update"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> update(@RequestBody  Resources resource,@CurrentUser UserInfo currentUser) {
-		_logger.debug("-update  :" + resource);
+		logger.debug("-update  :" + resource);
 		resource.setInstId(currentUser.getInstId());
 		if (resourcesService.update(resource)) {
 			systemLog.insert(
@@ -124,7 +124,7 @@ public class ResourcesController {
 	@ResponseBody
 	@RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> delete(@RequestParam("ids") String ids,@CurrentUser UserInfo currentUser) {
-		_logger.debug("-delete  ids : {} " , ids);
+		logger.debug("-delete  ids : {} " , ids);
 		if (resourcesService.deleteBatch(ids)) {
 			systemLog.insert(
 					ConstsEntryType.RESOURCE, 
@@ -142,7 +142,7 @@ public class ResourcesController {
 	@ResponseBody
 	@RequestMapping(value={"/tree"}, produces = {MediaType.APPLICATION_JSON_VALUE})
 	public ResponseEntity<?> tree(@ModelAttribute Resources resource,@CurrentUser UserInfo currentUser) {
-		_logger.debug("-tree  {}" , resource);
+		logger.debug("-tree  {}" , resource);
 		List<Resources>  resourceList = resourcesService.query(Query.builder().eq("instid", currentUser.getInstId()));
 		if (resourceList != null) {
 			TreeAttributes treeAttributes = new TreeAttributes();

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/contorller/RolePrivilegesController.java

@@ -41,7 +41,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 @Controller
 @RequestMapping(value={"/permissions/privileges"})
 public class RolePrivilegesController {
-	final static Logger _logger = LoggerFactory.getLogger(RolePrivilegesController.class);
+	static final Logger logger = LoggerFactory.getLogger(RolePrivilegesController.class);
 	
 	@Autowired
 	RolePrivilegesService rolePrivilegesService;
@@ -54,7 +54,7 @@ public class RolePrivilegesController {
 	public  ResponseEntity<?> update(
 			@RequestBody RolePrivileges rolePrivileges,
 			@CurrentUser UserInfo currentUser) {
-		_logger.debug("-update  : " + rolePrivileges);
+		logger.debug("-update  : {}" , rolePrivileges);
 		//have
 		RolePrivileges queryRolePrivileges = 
 				new RolePrivileges(
@@ -95,12 +95,12 @@ public class RolePrivilegesController {
            }
         }
 		if (!deleteRolePrivilegesList.isEmpty()) {
-			_logger.debug("-remove  : " + deleteRolePrivilegesList);
+			logger.debug("-remove  : {}" , deleteRolePrivilegesList);
 			rolePrivilegesService.deleteRolePrivileges(deleteRolePrivilegesList);
 		}
 		
 		if (!newRolePrivilegesList.isEmpty() && rolePrivilegesService.insertRolePrivileges(newRolePrivilegesList)) {
-			_logger.debug("-insert  : " + newRolePrivilegesList);
+			logger.debug("-insert  : {}" , newRolePrivilegesList);
 			return new Message<RolePrivileges>(Message.SUCCESS).buildResponse();
 			
 		} else {
@@ -114,7 +114,7 @@ public class RolePrivilegesController {
     public  ResponseEntity<?> get(
     		@ModelAttribute RolePrivileges rolePrivileges,
     		@CurrentUser UserInfo currentUser) {
-        _logger.debug("-get  :" + rolePrivileges);
+        logger.debug("-get  : {}"  , rolePrivileges);
         //have
         RolePrivileges queryRolePrivilege = 
         		new RolePrivileges(

maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/MaxKeyOpenApiApplication.java

@@ -55,10 +55,10 @@ import jakarta.servlet.ServletException;
 @SpringBootApplication
 @EnableDiscoveryClient
 public class MaxKeyOpenApiApplication extends SpringBootServletInitializer {
-	private static final Logger _logger = LoggerFactory.getLogger(MaxKeyOpenApiApplication.class);
+	private static final Logger logger = LoggerFactory.getLogger(MaxKeyOpenApiApplication.class);
 
 	public static void main(String[] args) {
-	    _logger.info("Start MaxKey OpenApi Application ...");
+	    logger.info("Start MaxKey OpenApi Application ...");
 
 		ConfigurableApplicationContext  applicationContext = 
 							SpringApplication.run(MaxKeyOpenApiApplication.class, args);
@@ -67,12 +67,12 @@ public class MaxKeyOpenApiApplication extends SpringBootServletInitializer {
 		try {
 			initWebContext.init(null);
 		} catch (ServletException e) {
-			_logger.error("Exception ",e);
+			logger.error("Exception ",e);
 		}
-		_logger.info("MaxKey OpenApi at {}" , new DateTime());
-		_logger.info("MaxKey OpenApi Server Port {}"
+		logger.info("MaxKey OpenApi at {}" , new DateTime());
+		logger.info("MaxKey OpenApi Server Port {}"
 				,applicationContext.getBean(ApplicationConfig.class).getPort());
-		_logger.info("MaxKey OpenApi started.");
+		logger.info("MaxKey OpenApi started.");
 		
 	}
 

maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyOpenApiConfig.java

@@ -34,7 +34,7 @@ import org.springframework.security.crypto.password.PasswordEncoder;
 
 @AutoConfiguration
 public class MaxKeyOpenApiConfig  implements InitializingBean {
-    private static final  Logger _logger = LoggerFactory.getLogger(MaxKeyOpenApiConfig.class);
+    private static final  Logger logger = LoggerFactory.getLogger(MaxKeyOpenApiConfig.class);
     
 	//authenticationRealm for MaxKeyMgtApplication
 	@Bean
@@ -54,14 +54,14 @@ public class MaxKeyOpenApiConfig  implements InitializingBean {
         		userInfoService,
         		jdbcTemplate);
         
-        _logger.debug("JdbcAuthenticationRealm inited.");
+        logger.debug("JdbcAuthenticationRealm inited.");
         return authenticationRealm;
     }
 
 	@Bean
     public AbstractOtpAuthn timeBasedOtpAuthn() {
 		AbstractOtpAuthn tfaOtpAuthn = new TimeBasedOtpAuthn();
-	    _logger.debug("TimeBasedOtpAuthn inited.");
+	    logger.debug("TimeBasedOtpAuthn inited.");
         return tfaOtpAuthn;
     }
 

maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/autoconfigure/MaxKeyOpenApiMvcConfig.java

@@ -38,7 +38,7 @@ import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 @EnableWebMvc
 @AutoConfiguration
 public class MaxKeyOpenApiMvcConfig implements WebMvcConfigurer {
-    private static final  Logger _logger = LoggerFactory.getLogger(MaxKeyOpenApiMvcConfig.class);
+    private static final  Logger logger = LoggerFactory.getLogger(MaxKeyOpenApiMvcConfig.class);
     
     @Autowired
   	ApplicationConfig applicationConfig;
@@ -54,33 +54,33 @@ public class MaxKeyOpenApiMvcConfig implements WebMvcConfigurer {
     
     @Override
     public void addResourceHandlers(ResourceHandlerRegistry registry) {
-    	_logger.debug("add Resource Handlers");
+    	logger.debug("add Resource Handlers");
     	 
-        _logger.debug("add statics");
+        logger.debug("add statics");
         registry.addResourceHandler("/static/**")
                 .addResourceLocations("classpath:/static/");
-        _logger.debug("add templates");
+        logger.debug("add templates");
         registry.addResourceHandler("/templates/**")
                 .addResourceLocations("classpath:/templates/");
         
-        _logger.debug("add swagger");
+        logger.debug("add swagger");
         registry.addResourceHandler("swagger-ui.html")
                 .addResourceLocations("classpath:/META-INF/resources/");
         registry.addResourceHandler("/webjars/**")
                 .addResourceLocations("classpath:/META-INF/resources/webjars/");
         
-        _logger.debug("add knife4j");
+        logger.debug("add knife4j");
         registry.addResourceHandler("doc.html").addResourceLocations("classpath:/META-INF/resources/");
         registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
 
-        _logger.debug("add Resource Handler finished .");
+        logger.debug("add Resource Handler finished .");
     }
 
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         //addPathPatterns 用于添加拦截规则 ， 先把所有路径都加入拦截， 再一个个排除
         //excludePathPatterns 表示改路径不用拦截
-        _logger.debug("add Interceptors");
+        logger.debug("add Interceptors");
 
         permissionInterceptor.setMgmt(true);
         
@@ -114,7 +114,7 @@ public class MaxKeyOpenApiMvcConfig implements WebMvcConfigurer {
                 .addPathPatterns("/logout/**")
                 ;
         
-        _logger.debug("add Permission Adapter");
+        logger.debug("add Permission Adapter");
 
         /*
          * api
@@ -127,7 +127,7 @@ public class MaxKeyOpenApiMvcConfig implements WebMvcConfigurer {
                 .addPathPatterns("/api/idm/scim/**")
                 ;
 		
-        _logger.debug("add Rest Api Permission Adapter");
+        logger.debug("add Rest Api Permission Adapter");
         
     }
     

maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/autoconfigure/Oauth20ClientAutoConfiguration.java

@@ -44,14 +44,14 @@ import org.springframework.security.crypto.password.PasswordEncoder;
  */
 @AutoConfiguration
 public class Oauth20ClientAutoConfiguration  implements InitializingBean {
-    private static final  Logger _logger = LoggerFactory.getLogger(Oauth20ClientAutoConfiguration.class);
+    private static final  Logger logger = LoggerFactory.getLogger(Oauth20ClientAutoConfiguration.class);
     
     @Bean
     public JdbcClientDetailsService oauth20JdbcClientDetailsService(
                 DataSource dataSource,PasswordEncoder passwordReciprocal) {
 	    JdbcClientDetailsService clientDetailsService = new JdbcClientDetailsService(dataSource);
 	    //clientDetailsService.setPasswordEncoder(passwordReciprocal);
-	    _logger.debug("JdbcClientDetailsService inited.");
+	    logger.debug("JdbcClientDetailsService inited.");
         return clientDetailsService;
     }
 	
@@ -68,10 +68,10 @@ public class Oauth20ClientAutoConfiguration  implements InitializingBean {
         TokenStore tokenStore = null;
         if (persistence == 2) {
             tokenStore = new RedisTokenStore(jedisConnectionFactory);
-            _logger.debug("RedisTokenStore");
+            logger.debug("RedisTokenStore");
         }else {
             tokenStore = new InMemoryTokenStore();
-            _logger.debug("InMemoryTokenStore"); 
+            logger.debug("InMemoryTokenStore"); 
         }
         
         return tokenStore;
@@ -109,7 +109,7 @@ public class Oauth20ClientAutoConfiguration  implements InitializingBean {
         daoAuthenticationProvider.setPasswordEncoder(passwordReciprocal);
         daoAuthenticationProvider.setUserDetailsService(cientDetailsUserDetailsService);
         ProviderManager authenticationManager = new ProviderManager(daoAuthenticationProvider);
-        _logger.debug("OAuth 2 Client Authentication Manager init.");
+        logger.debug("OAuth 2 Client Authentication Manager init.");
         return authenticationManager;
     }
   

maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/web/interceptor/Oauth20ApiPermissionAdapter.java

@@ -40,7 +40,7 @@ import jakarta.servlet.http.HttpServletResponse;
  */
 @Component
 public class Oauth20ApiPermissionAdapter  implements AsyncHandlerInterceptor  {
-	private static final Logger _logger = LoggerFactory.getLogger(Oauth20ApiPermissionAdapter.class);
+	private static final Logger logger = LoggerFactory.getLogger(Oauth20ApiPermissionAdapter.class);
 	
 	@Autowired
     protected PasswordReciprocal passwordReciprocal;
@@ -57,21 +57,21 @@ public class Oauth20ApiPermissionAdapter  implements AsyncHandlerInterceptor  {
 	 */
 	@Override
 	public boolean preHandle(HttpServletRequest request,HttpServletResponse response, Object handler) throws Exception {
-		 _logger.trace("OAuth20 API Permission Adapter pre handle");
+		 logger.trace("OAuth20 API Permission Adapter pre handle");
 		 String accessToken =  RequestTokenUtils.resolveAccessToken(request);
-		 _logger.trace("access_token {} " , accessToken);
+		 logger.trace("access_token {} " , accessToken);
 		 try {
 			 OAuth2Authentication authentication = oauth20TokenServices.loadAuthentication(accessToken);
 			//判断应用的accessToken信息
 			if(authentication != null ){
-			    _logger.trace("authentication "+ authentication);
+			    logger.trace("authentication {}" , authentication);
 			    return true;
 			}
 		 }catch(Exception e) {
-			 _logger.error("load Authentication Exception ! ",e);
+			 logger.error("load Authentication Exception ! ",e);
 		 }
 		
-		_logger.trace("No Authentication ... forward to /login");
+		logger.trace("No Authentication ... forward to /login");
         RequestDispatcher dispatcher = request.getRequestDispatcher("/login");
         dispatcher.forward(request, response);
         

maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/web/interceptor/RestApiPermissionAdapter.java

@@ -45,7 +45,7 @@ import jakarta.servlet.http.HttpServletResponse;
  */
 @Component
 public class RestApiPermissionAdapter  implements AsyncHandlerInterceptor  {
-	private static final Logger _logger = LoggerFactory.getLogger(RestApiPermissionAdapter.class);
+	private static final Logger logger = LoggerFactory.getLogger(RestApiPermissionAdapter.class);
 
 	@Autowired
 	DefaultTokenServices oauth20TokenServices;
@@ -62,7 +62,7 @@ public class RestApiPermissionAdapter  implements AsyncHandlerInterceptor  {
 	 */
 	@Override
 	public boolean preHandle(HttpServletRequest request,HttpServletResponse response, Object handler) throws Exception {
-		_logger.trace("Rest API Permission Adapter pre handle");
+		logger.trace("Rest API Permission Adapter pre handle");
 		 AuthorizationHeader headerCredential = AuthorizationHeaderUtils.resolve(request);
 		 
 		//判断应用的AppId和Secret
@@ -79,12 +79,12 @@ public class RestApiPermissionAdapter  implements AsyncHandlerInterceptor  {
 			    	authenticationToken= (UsernamePasswordAuthenticationToken)oauth20ClientAuthenticationManager.authenticate(authRequest);
 			    }
 			}else {
-				_logger.trace("Authentication bearer {}" , headerCredential.getCredential());
+				logger.trace("Authentication bearer {}" , headerCredential.getCredential());
 				OAuth2Authentication oauth2Authentication = 
 						oauth20TokenServices.loadAuthentication(headerCredential.getCredential());
 				
 				if(oauth2Authentication != null) {
-					_logger.trace("Authentication token {}" , oauth2Authentication.getPrincipal().toString());
+					logger.trace("Authentication token {}" , oauth2Authentication.getPrincipal().toString());
 					authenticationToken= new UsernamePasswordAuthenticationToken(
 			    			new User(
 			    					oauth2Authentication.getPrincipal().toString(), 
@@ -94,7 +94,7 @@ public class RestApiPermissionAdapter  implements AsyncHandlerInterceptor  {
 	                        oauth2Authentication.getAuthorities()
 	                );
 				}else {
-					_logger.trace("Authentication token is null ");
+					logger.trace("Authentication token is null ");
 				}
 			}
 			
@@ -104,7 +104,7 @@ public class RestApiPermissionAdapter  implements AsyncHandlerInterceptor  {
 			}
 		}
 		
-		_logger.trace("No Authentication ... forward to /login");
+		logger.trace("No Authentication ... forward to /login");
         RequestDispatcher dispatcher = request.getRequestDispatcher("/login");
         dispatcher.forward(request, response);