From 3b40c258a05a516069eccc5bbf41a7e4a00feb46 Mon Sep 17 00:00:00 2001 From: zer0Black Date: Thu, 22 Dec 2022 10:14:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=94=9F=E6=88=90=E7=BB=93?= =?UTF-8?q?=E6=9E=84=E6=A2=B3=E7=90=86=20druid=E5=AF=86=E7=A0=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/SysUserController.java | 4 +- .../src/main/resources/application-dev.yml | 4 +- .../src/main/resources/application-prod.yml | 4 +- .../src/main/resources/application-test.yml | 4 +- .../src/main/resources/logback-spring.xml | 108 ++++++++++++++---- .../jero-boot-starter-cloud/nacos/jero.yaml | 4 +- .../src/main/resources/logback-spring.xml | 108 ++++++++++++++---- 7 files changed, 184 insertions(+), 52 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java index 9eedbb3b..47c90f0b 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java @@ -479,8 +479,8 @@ public class SysUserController { for (int i = 0; i < listSysUsers.size(); i++) { SysUser sysUserExcel = listSysUsers.get(i); if (StringUtils.isBlank(sysUserExcel.getPassword())) { - // 密码默认为 “123456” - sysUserExcel.setPassword("123456"); + // 密码默认为 “hzwlsoft.com” + sysUserExcel.setPassword("hzwlsoft.com"); } // 密码加密加盐 String salt = oConvertUtils.randomGen(8); diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml index 3bdb9f59..2dd81fad 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml +++ b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml @@ -100,8 +100,8 @@ spring: druid: stat-view-servlet: enabled: true - loginUsername: admin - loginPassword: 123456 + loginUsername: druid + loginPassword: druid allow: web-stat-filter: enabled: true diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/application-prod.yml b/jero-boot/jero-boot-single-startup/src/main/resources/application-prod.yml index dfbe6e24..af1ad5d7 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/application-prod.yml +++ b/jero-boot/jero-boot-single-startup/src/main/resources/application-prod.yml @@ -100,8 +100,8 @@ spring: druid: stat-view-servlet: enabled: true - loginUsername: admin - loginPassword: 123456 + loginUsername: druid + loginPassword: druid allow: web-stat-filter: enabled: true diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/application-test.yml b/jero-boot/jero-boot-single-startup/src/main/resources/application-test.yml index dfbe6e24..af1ad5d7 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/application-test.yml +++ b/jero-boot/jero-boot-single-startup/src/main/resources/application-test.yml @@ -100,8 +100,8 @@ spring: druid: stat-view-servlet: enabled: true - loginUsername: admin - loginPassword: 123456 + loginUsername: druid + loginPassword: druid allow: web-stat-filter: enabled: true diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/logback-spring.xml b/jero-boot/jero-boot-single-startup/src/main/resources/logback-spring.xml index 7fc0fa90..bbbf177f 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/logback-spring.xml +++ b/jero-boot/jero-boot-single-startup/src/main/resources/logback-spring.xml @@ -2,55 +2,72 @@ + + + + + + - + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %highlight(%-5level) %cyan(%logger{50}:%L) - %msg%n + UTF-8 - + - ${LOG_HOME}/jeroboot-%d{yyyy-MM-dd}.%i.log + ${LOG_HOME}/${PROJECT_NAME}/${LOG_HOME_SYSTEM}/${PROJECT_NAME}-%d{yyyy-MM-dd}.%i.log 30 - 10MB + 100MB %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}:%L - %msg%n + UTF-8 - - - - + + + + ERROR + ACCEPT + DENY - - - %p%d%msg%M%F{32}%L - + + + ${LOG_HOME}/${PROJECT_NAME}/${LOG_HOME_SYSTEM}/${PROJECT_NAME}-error.%d{yyyy-MM-dd}.%i.log + + 30 + + 100MB + + + + + [%d{yyyy-MM-dd HH:mm:ss.SSS}] [%thread] [%-5level] %logger{50} - %msg%n + UTF-8 - ${LOG_HOME}/error-log.html - + - + - ${LOG_HOME}/jeroboot-%d{yyyy-MM-dd}.%i.html + /${PROJECT_NAME}/${LOG_HOME_SYSTEM}/${PROJECT_NAME}-%d{yyyy-MM-dd}.%i.html 30 - 10MB + 100MB @@ -60,6 +77,53 @@ + + + + + INFO + ACCEPT + DENY + + + + ${LOG_HOME}/${PROJECT_NAME}/${LOG_HOME_DRUID}/${PROJECT_NAME}.druid_info.%d{yyyy-MM-dd}.%i.log + + 15 + + 100MB + + + + + [%d{yyyy-MM-dd HH:mm:ss.SSS}] [%thread] [%-5level] %logger{50} - %msg%n + UTF-8 + + + + + + + WARN + + + + + ${LOG_HOME}/${PROJECT_NAME}/${LOG_HOME_DRUID}/${PROJECT_NAME}.druid_warn.%d{yyyy-MM-dd}.%i.log + + 30 + + 100MB + + + + + + [%d{yyyy-MM-dd HH:mm:ss.SSS}] [%thread] [%-5level] %logger{50} - %msg%n + UTF-8 + + + @@ -69,9 +133,11 @@ - - - + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-starter/jero-boot-starter-cloud/nacos/jero.yaml b/jero-boot/jero-boot-starter/jero-boot-starter-cloud/nacos/jero.yaml index adb42faa..2312d068 100644 --- a/jero-boot/jero-boot-starter/jero-boot-starter-cloud/nacos/jero.yaml +++ b/jero-boot/jero-boot-starter/jero-boot-starter-cloud/nacos/jero.yaml @@ -104,8 +104,8 @@ spring: druid: stat-view-servlet: enabled: true - loginUsername: admin - loginPassword: 123456 + loginUsername: druid + loginPassword: druid allow: web-stat-filter: enabled: true diff --git a/jero-boot/jero-cloud-module/jero-cloud-system-start/src/main/resources/logback-spring.xml b/jero-boot/jero-cloud-module/jero-cloud-system-start/src/main/resources/logback-spring.xml index acad24b3..bbbf177f 100644 --- a/jero-boot/jero-cloud-module/jero-cloud-system-start/src/main/resources/logback-spring.xml +++ b/jero-boot/jero-cloud-module/jero-cloud-system-start/src/main/resources/logback-spring.xml @@ -2,55 +2,72 @@ + + + + + + - + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %highlight(%-5level) %cyan(%logger{50}:%L) - %msg%n + UTF-8 - + - ${LOG_HOME}/jeecgboot-%d{yyyy-MM-dd}.%i.log + ${LOG_HOME}/${PROJECT_NAME}/${LOG_HOME_SYSTEM}/${PROJECT_NAME}-%d{yyyy-MM-dd}.%i.log 30 - 10MB + 100MB %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}:%L - %msg%n + UTF-8 - - - - + + + + ERROR + ACCEPT + DENY - - - %p%d%msg%M%F{32}%L - + + + ${LOG_HOME}/${PROJECT_NAME}/${LOG_HOME_SYSTEM}/${PROJECT_NAME}-error.%d{yyyy-MM-dd}.%i.log + + 30 + + 100MB + + + + + [%d{yyyy-MM-dd HH:mm:ss.SSS}] [%thread] [%-5level] %logger{50} - %msg%n + UTF-8 - ${LOG_HOME}/error-log.html - + - + - ${LOG_HOME}/jeecgboot-%d{yyyy-MM-dd}.%i.html + /${PROJECT_NAME}/${LOG_HOME_SYSTEM}/${PROJECT_NAME}-%d{yyyy-MM-dd}.%i.html 30 - 10MB + 100MB @@ -60,6 +77,53 @@ + + + + + INFO + ACCEPT + DENY + + + + ${LOG_HOME}/${PROJECT_NAME}/${LOG_HOME_DRUID}/${PROJECT_NAME}.druid_info.%d{yyyy-MM-dd}.%i.log + + 15 + + 100MB + + + + + [%d{yyyy-MM-dd HH:mm:ss.SSS}] [%thread] [%-5level] %logger{50} - %msg%n + UTF-8 + + + + + + + WARN + + + + + ${LOG_HOME}/${PROJECT_NAME}/${LOG_HOME_DRUID}/${PROJECT_NAME}.druid_warn.%d{yyyy-MM-dd}.%i.log + + 30 + + 100MB + + + + + + [%d{yyyy-MM-dd HH:mm:ss.SSS}] [%thread] [%-5level] %logger{50} - %msg%n + UTF-8 + + + @@ -69,9 +133,11 @@ - - - + + + + + \ No newline at end of file