diff --git a/pigx-app-server/pigx-app-server-biz/src/main/resources/application.yml b/pigx-app-server/pigx-app-server-biz/src/main/resources/application.yml
index f7abeb654..ffa924dd5 100644
--- a/pigx-app-server/pigx-app-server-biz/src/main/resources/application.yml
+++ b/pigx-app-server/pigx-app-server-biz/src/main/resources/application.yml
@@ -6,6 +6,8 @@ spring:
     name: @artifactId@
   cloud:
     nacos:
+      username: @nacos.username@
+      password: @nacos.password@
       discovery:
         server-addr: ${NACOS_HOST:pigx-register}:${NACOS_PORT:8848}
       config:
diff --git a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/support/base/OAuth2ResourceOwnerBaseAuthenticationProvider.java b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/support/base/OAuth2ResourceOwnerBaseAuthenticationProvider.java
index efdca4e91..c71fb65ef 100644
--- a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/support/base/OAuth2ResourceOwnerBaseAuthenticationProvider.java
+++ b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/support/base/OAuth2ResourceOwnerBaseAuthenticationProvider.java
@@ -6,6 +6,7 @@ import com.pig4cloud.pigx.common.core.constant.CommonConstants;
 import com.pig4cloud.pigx.common.security.service.PigRedisOAuth2AuthorizationService;
 import com.pig4cloud.pigx.common.security.util.OAuth2ErrorCodesExpand;
 import com.pig4cloud.pigx.common.security.util.ScopeException;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
@@ -39,6 +40,7 @@ import java.util.function.Supplier;
  *
  * 处理自定义授权
  */
+@Slf4j
 public abstract class OAuth2ResourceOwnerBaseAuthenticationProvider<T extends OAuth2ResourceOwnerBaseAuthenticationToken>
 		implements AuthenticationProvider {
 
@@ -296,7 +298,10 @@ public abstract class OAuth2ResourceOwnerBaseAuthenticationProvider<T extends OA
 			return new OAuth2AuthenticationException(new OAuth2Error(OAuth2ErrorCodes.INVALID_SCOPE,
 					this.messages.getMessage("AbstractAccessDecisionManager.accessDenied", "invalid_scope"), ""));
 		}
-		return new OAuth2AuthenticationException(OAuth2ErrorCodesExpand.UN_KNOW_LOGIN_ERROR);
+
+		log.error(authenticationException.getLocalizedMessage());
+		return new OAuth2AuthenticationException(new OAuth2Error(OAuth2ErrorCodes.SERVER_ERROR),
+				authenticationException.getLocalizedMessage(), authenticationException);
 	}
 
 	private OAuth2ClientAuthenticationToken getAuthenticatedClientElseThrowInvalidClient(
diff --git a/pigx-auth/src/main/resources/application.yml b/pigx-auth/src/main/resources/application.yml
index eeaf5b5fd..d0a0e4929 100644
--- a/pigx-auth/src/main/resources/application.yml
+++ b/pigx-auth/src/main/resources/application.yml
@@ -1,17 +1,13 @@
 server:
   port: 3000
 
-
-security:
-  api:
-    encrypt:
-      aesKey: 'pigxpigxpigxpigx'
-
 spring:
   application:
     name: @artifactId@
   cloud:
     nacos:
+      username: @nacos.username@
+      password: @nacos.password@
       discovery:
         server-addr: ${NACOS_HOST:pigx-register}:${NACOS_PORT:8848}
       config:
diff --git a/pigx-gateway/src/main/resources/application.yml b/pigx-gateway/src/main/resources/application.yml
index f918e7dd6..f9667b146 100644
--- a/pigx-gateway/src/main/resources/application.yml
+++ b/pigx-gateway/src/main/resources/application.yml
@@ -6,6 +6,8 @@ spring:
     name: @artifactId@
   cloud:
     nacos:
+      username: @nacos.username@
+      password: @nacos.password@
       discovery:
         server-addr: ${NACOS_HOST:pigx-register}:${NACOS_PORT:8848}
       config:
diff --git a/pigx-register/src/main/java/com/alibaba/nacos/PigxNacosApplication.java b/pigx-register/src/main/java/com/alibaba/nacos/PigxNacosApplication.java
index 1ae2597c3..5d301bd93 100755
--- a/pigx-register/src/main/java/com/alibaba/nacos/PigxNacosApplication.java
+++ b/pigx-register/src/main/java/com/alibaba/nacos/PigxNacosApplication.java
@@ -43,7 +43,7 @@ public class PigxNacosApplication {
 	 */
 	private static boolean initEnv() {
 		System.setProperty(ConfigConstants.STANDALONE_MODE, "true");
-		System.setProperty(ConfigConstants.AUTH_ENABLED, "false");
+		System.setProperty(ConfigConstants.AUTH_ENABLED, "true");
 		System.setProperty(ConfigConstants.LOG_BASEDIR, "logs");
 		System.setProperty(ConfigConstants.LOG_ENABLED, "true");
 		return true;
diff --git a/pigx-register/src/main/java/com/alibaba/nacos/config/ConsoleConfig.java b/pigx-register/src/main/java/com/alibaba/nacos/config/ConsoleConfig.java
index 7a3ec617d..b5dbe6e89 100644
--- a/pigx-register/src/main/java/com/alibaba/nacos/config/ConsoleConfig.java
+++ b/pigx-register/src/main/java/com/alibaba/nacos/config/ConsoleConfig.java
@@ -16,6 +16,7 @@
 
 package com.alibaba.nacos.config;
 
+import com.alibaba.nacos.console.filter.XssFilter;
 import com.alibaba.nacos.core.code.ControllerMethodsCache;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
@@ -39,7 +40,7 @@ import java.time.ZoneId;
  */
 @Component
 @EnableScheduling
-@PropertySource("/application.properties")
+@PropertySource("/application.yml")
 public class ConsoleConfig {
 
 	@Autowired
@@ -64,11 +65,17 @@ public class ConsoleConfig {
 		config.addAllowedHeader("*");
 		config.setMaxAge(18000L);
 		config.addAllowedMethod("*");
+		config.addAllowedOriginPattern("*");
 		UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
 		source.registerCorsConfiguration("/**", config);
 		return new CorsFilter(source);
 	}
 
+	@Bean
+	public XssFilter xssFilter() {
+		return new XssFilter();
+	}
+
 	@Bean
 	public Jackson2ObjectMapperBuilderCustomizer jacksonObjectMapperCustomization() {
 		return jacksonObjectMapperBuilder -> jacksonObjectMapperBuilder.timeZone(ZoneId.systemDefault().toString());
diff --git a/pigx-register/src/main/resources/application.yml b/pigx-register/src/main/resources/application.yml
index 4ea15de2f..d62e442d6 100644
--- a/pigx-register/src/main/resources/application.yml
+++ b/pigx-register/src/main/resources/application.yml
@@ -1,8 +1,9 @@
 server:
-  port: 8848
+  port: 18848
   tomcat:
     basedir: logs
-
+  error:
+    include-message: always
 db:
   num: 1
   user: ${MYSQL_USER:root}
@@ -13,25 +14,29 @@ db:
 nacos:
   core:
     auth:
+      server:
+        identity:
+          key: serverIdentity
+          value: security
       system.type: nacos
       plugin.nacos.token.secret.key: SecretKey012345678901234567890123456789012345678901234567890123456789
   security:
     ignore:
-      urls: /,/error,/**/*.css,/**/*.js,/**/*.html,/**/*.map,/**/*.svg,/**/*.png,/**/*.ico,/console-fe/public/**,/v1/auth/**,/v1/console/health/**,/actuator/**,/v1/console/server/**
+      urls: /actuator/**,/,/error,/**/*.css,/**/*.js,/**/*.html,/**/*.map,/**/*.svg,/**/*.png,/**/*.ico,/console-fe/public/**,/v1/auth/**,/v1/console/health/**,/actuator/**,/v1/console/server/**
 
 spring:
   datasource:
     platform: mysql  #这个过期属性不能修改，nacos 代码对此有硬编码
   security:
     enabled: true
-  boot:  # 接入 spring boot admin
+  boot: # 接入 spring boot admin
     admin:
       client:
         url: http://pigx-monitor:5001
         username: pig
         password: pig
         instance:
-          prefer-ip: true
+          service-host-type: ip
   application:
     name: @project.artifactId@
 
diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysOauthClientDetailsServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysOauthClientDetailsServiceImpl.java
index 704935925..07d76fb99 100644
--- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysOauthClientDetailsServiceImpl.java
+++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysOauthClientDetailsServiceImpl.java
@@ -77,6 +77,7 @@ public class SysOauthClientDetailsServiceImpl extends ServiceImpl<SysOauthClient
 	 * @return
 	 */
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	@CacheEvict(value = CacheConstants.CLIENT_DETAILS_KEY, key = "#clientDetailsDTO.clientId")
 	public Boolean updateClientById(SysOauthClientDetailsDTO clientDetailsDTO) {
 		this.insertOrUpdate(clientDetailsDTO);
@@ -151,6 +152,7 @@ public class SysOauthClientDetailsServiceImpl extends ServiceImpl<SysOauthClient
 	}
 
 	@Override
+	@Transactional
 	@CacheEvict(value = CacheConstants.CLIENT_DETAILS_KEY, allEntries = true)
 	public R syncClientCache() {
 		// 更新Redis
diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysTenantServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysTenantServiceImpl.java
index e812f0e90..8d4c3fc18 100755
--- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysTenantServiceImpl.java
+++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysTenantServiceImpl.java
@@ -189,7 +189,7 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
 				roleMenu.setMenuId(menu.getMenuId());
 				return roleMenu;
 			}).collect(Collectors.toList());
-			roleMenuList.forEach(ele -> roleMenuMapper.insert(ele));
+			roleMenuList.forEach(roleMenuMapper::insert);
 			// 插入系统字典
 			dictService.saveBatch(dictList.stream().peek(d -> d.setId(null)).collect(Collectors.toList()));
 			// 处理字典项最新关联的字典ID
diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/application.yml b/pigx-upms/pigx-upms-biz/src/main/resources/application.yml
index 959c5409f..ab5f384f5 100644
--- a/pigx-upms/pigx-upms-biz/src/main/resources/application.yml
+++ b/pigx-upms/pigx-upms-biz/src/main/resources/application.yml
@@ -6,6 +6,8 @@ spring:
     name: @artifactId@
   cloud:
     nacos:
+      username: @nacos.username@
+      password: @nacos.password@
       discovery:
         server-addr: ${NACOS_HOST:pigx-register}:${NACOS_PORT:8848}
       config:
diff --git a/pigx-visual/pigx-codegen/src/main/resources/application.yml b/pigx-visual/pigx-codegen/src/main/resources/application.yml
index 67d2202f2..ce79a8f62 100644
--- a/pigx-visual/pigx-codegen/src/main/resources/application.yml
+++ b/pigx-visual/pigx-codegen/src/main/resources/application.yml
@@ -6,6 +6,8 @@ spring:
     name: @artifactId@
   cloud:
     nacos:
+      username: @nacos.username@
+      password: @nacos.password@
       discovery:
         server-addr: ${NACOS_HOST:pigx-register}:${NACOS_PORT:8848}
       config:
diff --git a/pigx-visual/pigx-daemon-elastic-job/src/main/resources/application.yml b/pigx-visual/pigx-daemon-elastic-job/src/main/resources/application.yml
index 513b466f0..ee17eda36 100644
--- a/pigx-visual/pigx-daemon-elastic-job/src/main/resources/application.yml
+++ b/pigx-visual/pigx-daemon-elastic-job/src/main/resources/application.yml
@@ -6,6 +6,8 @@ spring:
     name: @artifactId@
   cloud:
     nacos:
+      username: @nacos.username@
+      password: @nacos.password@
       discovery:
         server-addr: ${NACOS_HOST:pigx-register}:${NACOS_PORT:8848}
       config:
@@ -13,4 +15,4 @@ spring:
   config:
     import:
       - optional:nacos:application-@profiles.active@.yml
-      - optional:nacos:${spring.application.name}-@profiles.active@.yml
\ No newline at end of file
+      - optional:nacos:${spring.application.name}-@profiles.active@.yml
diff --git a/pigx-visual/pigx-daemon-quartz/src/main/resources/application.yml b/pigx-visual/pigx-daemon-quartz/src/main/resources/application.yml
index 14ab80f36..b9a5fa5cb 100644
--- a/pigx-visual/pigx-daemon-quartz/src/main/resources/application.yml
+++ b/pigx-visual/pigx-daemon-quartz/src/main/resources/application.yml
@@ -9,6 +9,8 @@ spring:
     name: @artifactId@
   cloud:
     nacos:
+      username: @nacos.username@
+      password: @nacos.password@
       discovery:
         server-addr: ${NACOS_HOST:pigx-register}:${NACOS_PORT:8848}
       config:
diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/application.yml b/pigx-visual/pigx-jimu-platform/src/main/resources/application.yml
index 10a58c711..51965388e 100644
--- a/pigx-visual/pigx-jimu-platform/src/main/resources/application.yml
+++ b/pigx-visual/pigx-jimu-platform/src/main/resources/application.yml
@@ -6,6 +6,8 @@ spring:
     name: @artifactId@
   cloud:
     nacos:
+      username: @nacos.username@
+      password: @nacos.password@
       discovery:
         server-addr: ${NACOS_HOST:pigx-register}:${NACOS_PORT:8848}
         service: @artifactId@
diff --git a/pigx-visual/pigx-monitor/src/main/java/com/pig4cloud/pigx/monitor/service/impl/MonitorStatService.java b/pigx-visual/pigx-monitor/src/main/java/com/pig4cloud/pigx/monitor/service/impl/MonitorStatService.java
index 6b975ef9c..fbcba00b2 100755
--- a/pigx-visual/pigx-monitor/src/main/java/com/pig4cloud/pigx/monitor/service/impl/MonitorStatService.java
+++ b/pigx-visual/pigx-monitor/src/main/java/com/pig4cloud/pigx/monitor/service/impl/MonitorStatService.java
@@ -71,12 +71,8 @@ public class MonitorStatService implements DruidStatServiceMBean {
 			List<ServiceInstance> instances = discoveryClient.getInstances(service);
 			for (ServiceInstance instance : instances) {
 				String host = instance.getHost();
-				String instanceId = instance.getInstanceId();
-				if (instanceId == null) {
-					instanceId = instance.getMetadata().get("nacos.instanceId").replaceAll("#", "-").replaceAll("@@",
-							"-");
-				}
 				int port = instance.getPort();
+				String instanceId = String.format("%s_%s", host, port);
 				String serviceId = instance.getServiceId();
 				// 根据前端参数采集指定的服务
 				if (monitorProperties.getApplications().contains(serviceId)) {
@@ -109,13 +105,9 @@ public class MonitorStatService implements DruidStatServiceMBean {
 			List<ServiceInstance> instances = discoveryClient.getInstances(service);
 			for (ServiceInstance instance : instances) {
 				String host = instance.getHost();
-				String instanceId = instance.getInstanceId();
-				if (instanceId == null) {
-					instanceId = instance.getMetadata().get("nacos.instanceId").replaceAll("#", "-").replaceAll("@@",
-							"-");
-				}
 				int port = instance.getPort();
 				String serviceId = instance.getServiceId();
+				String instanceId = String.format("%s_%s", host, port);
 				// 根据前端参数采集指定的服务
 				if (serviceId.equals(requestServiceName)) {
 					ServiceNode serviceNode = new ServiceNode();
@@ -492,4 +484,4 @@ public class MonitorStatService implements DruidStatServiceMBean {
 		return array.subList(fromIndex, toIndex);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/pigx-visual/pigx-monitor/src/main/resources/application.yml b/pigx-visual/pigx-monitor/src/main/resources/application.yml
index 1f678a709..f188b6370 100644
--- a/pigx-visual/pigx-monitor/src/main/resources/application.yml
+++ b/pigx-visual/pigx-monitor/src/main/resources/application.yml
@@ -6,6 +6,8 @@ spring:
     name: @artifactId@
   cloud:
     nacos:
+      username: @nacos.username@
+      password: @nacos.password@
       discovery:
         server-addr: ${NACOS_HOST:pigx-register}:${NACOS_PORT:8848}
       config:
diff --git a/pigx-visual/pigx-mp-platform/src/main/resources/application.yml b/pigx-visual/pigx-mp-platform/src/main/resources/application.yml
index b60c628fc..15e7a9d50 100644
--- a/pigx-visual/pigx-mp-platform/src/main/resources/application.yml
+++ b/pigx-visual/pigx-mp-platform/src/main/resources/application.yml
@@ -6,6 +6,8 @@ spring:
     name: @artifactId@
   cloud:
     nacos:
+      username: @nacos.username@
+      password: @nacos.password@
       discovery:
         server-addr: ${NACOS_HOST:pigx-register}:${NACOS_PORT:8848}
       config:
diff --git a/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/entity/LeaveBill.java b/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/entity/LeaveBill.java
index 2c87d6373..74db815fa 100755
--- a/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/entity/LeaveBill.java
+++ b/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/entity/LeaveBill.java
@@ -91,7 +91,7 @@ public class LeaveBill extends Model<LeaveBill> {
 	/**
 	 * 租户ID
 	 */
-	private Integer tenantId;
+	private Long tenantId;
 
 	/**
 	 * 主键值
diff --git a/pigx-visual/pigx-oa-platform/src/main/resources/application.yml b/pigx-visual/pigx-oa-platform/src/main/resources/application.yml
index b78e4df42..ef069930c 100644
--- a/pigx-visual/pigx-oa-platform/src/main/resources/application.yml
+++ b/pigx-visual/pigx-oa-platform/src/main/resources/application.yml
@@ -6,6 +6,8 @@ spring:
     name: @artifactId@
   cloud:
     nacos:
+      username: @nacos.username@
+      password: @nacos.password@
       discovery:
         server-addr: ${NACOS_HOST:pigx-register}:${NACOS_PORT:8848}
       config:
diff --git a/pigx-visual/pigx-pay-platform/src/main/resources/application.yml b/pigx-visual/pigx-pay-platform/src/main/resources/application.yml
index 868829ec6..407e01ac1 100644
--- a/pigx-visual/pigx-pay-platform/src/main/resources/application.yml
+++ b/pigx-visual/pigx-pay-platform/src/main/resources/application.yml
@@ -6,6 +6,8 @@ spring:
     name: @artifactId@
   cloud:
     nacos:
+      username: @nacos.username@
+      password: @nacos.password@
       discovery:
         server-addr: ${NACOS_HOST:pigx-register}:${NACOS_PORT:8848}
       config:
diff --git a/pigx-visual/pigx-report-platform/src/main/resources/application.yml b/pigx-visual/pigx-report-platform/src/main/resources/application.yml
index 092ca6bfc..d1406ac40 100644
--- a/pigx-visual/pigx-report-platform/src/main/resources/application.yml
+++ b/pigx-visual/pigx-report-platform/src/main/resources/application.yml
@@ -6,6 +6,8 @@ spring:
     name: @artifactId@
   cloud:
     nacos:
+      username: @nacos.username@
+      password: @nacos.password@
       discovery:
         server-addr: ${NACOS_HOST:pigx-register}:${NACOS_PORT:8848}
       config:
diff --git a/pigx-visual/pigx-sentinel-dashboard/src/main/resources/application.yml b/pigx-visual/pigx-sentinel-dashboard/src/main/resources/application.yml
index 1e6e6edf2..30d0a8c8d 100755
--- a/pigx-visual/pigx-sentinel-dashboard/src/main/resources/application.yml
+++ b/pigx-visual/pigx-sentinel-dashboard/src/main/resources/application.yml
@@ -8,6 +8,8 @@ spring:
     name: @artifactId@
   cloud:
     nacos:
+      username: @nacos.username@
+      password: @nacos.password@
       discovery:
         server-addr: ${NACOS_HOST:pigx-register}:${NACOS_PORT:8848}
 
@@ -38,4 +40,4 @@ auth:
 
 sentinel:
   dashboard:
-    version: @project.version@
\ No newline at end of file
+    version: @project.version@
diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/application.yml b/pigx-visual/pigx-xxl-job-admin/src/main/resources/application.yml
index e60dd1eb1..6819422d0 100644
--- a/pigx-visual/pigx-xxl-job-admin/src/main/resources/application.yml
+++ b/pigx-visual/pigx-xxl-job-admin/src/main/resources/application.yml
@@ -9,6 +9,8 @@ spring:
     name: @artifactId@
   cloud:
     nacos:
+      username: @nacos.username@
+      password: @nacos.password@
       discovery:
         server-addr: ${NACOS_HOST:pigx-register}:${NACOS_PORT:8848}
         metadata:
diff --git a/pom.xml b/pom.xml
index fe2a52960..2f04797a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,7 +121,7 @@
         <module>pigx-common</module>
         <module>pigx-visual</module>
         <module>pigx-app-server</module>
-  </modules>
+    </modules>
 
     <dependencyManagement>
         <dependencies>
@@ -292,6 +292,8 @@
             <properties>
                 <!-- 环境标识，需要与配置文件的名称相对应 -->
                 <profiles.active>dev</profiles.active>
+                <nacos.username>nacos</nacos.username>
+                <nacos.password>nacos</nacos.password>
             </properties>
             <activation>
                 <!-- 默认环境 -->