update docs

pangu-admin/pangu-admin-backend/pangu-admin-web/src/main/java/com/pulanit/pangu/admin/web/log/LogQueue.java

@@ -24,6 +24,11 @@ public class LogQueue {
     }
 
     public  boolean produce(LogIn logIn) {
+        // drop last message and re-deliver
+//        if (!blockingQueue.offer(logIn)) {
+//            blockingQueue.poll();
+//            blockingQueue.offer(logIn);
+//        }
         return blockingQueue.offer(logIn);
     }
 

pangu-examples/pangu-examples-config-remote-nacos/src/main/resources/application.properties

@@ -19,8 +19,10 @@ spring.profiles.active=${spring.profiles.active:dev}
 nacos.config.bootstrap.enable=true
 nacos.config.bootstrap.log-enable=true
 nacos.config.auto-refresh=true
-nacos.config.namespace=${nacos.namespace}
+nacos.config.namespace=${nacos.namespace:dev}
 nacos.config.server-addr=${nacos.server-addr:127.0.0.1:8848}
+nacos.config.username=${nacos.username:nacos}
+nacos.config.password=${nacos.password:nacos}
 # properties | yaml | json | ...
 nacos.config.type=properties
 nacos.config.data-id=${spring.application.name}
\ No newline at end of file

pangu-examples/pangu-examples-log-dynamic/src/main/resources/application.properties

@@ -19,10 +19,13 @@ spring.profiles.active=${spring.profiles.active:dev}
 nacos.config.bootstrap.enable=true
 nacos.config.bootstrap.log-enable=true
 nacos.config.auto-refresh=true
-#\u5BF9\u5E94Nacos\u914D\u7F6E\u4E2D\u5FC3\u7684\u547D\u540D\u7A7A\u95F4ID
-nacos.config.namespace=${nacos.namespace:pangu-dev}
+nacos.config.namespace=${nacos.namespace:dev}
 nacos.config.server-addr=${nacos.server-addr:127.0.0.1:8848}
 nacos.config.type=properties
 nacos.config.data-id=${spring.application.name}
+nacos.config.username=nacos
+nacos.config.password=Dax6188@nacos
 #nacos.config.type=yaml
-#nacos.config.data-id=${spring.application.name}.yaml
\ No newline at end of file
+#nacos.config.data-id=${spring.application.name}.yaml
+
+pangu.log-reload=true
\ No newline at end of file

pangu-spring-boot-starter/src/main/java/com/gitee/pulanos/pangu/framework/starter/PanGuApplicationBuilder.java

@@ -17,9 +17,7 @@
 
 package com.gitee.pulanos.pangu.framework.starter;
 
-import cn.hutool.aop.aspects.Aspect;
 import com.gitee.pulanos.pangu.framework.common.Constants;
-import com.yomahub.tlog.core.enhance.bytes.AspectLogEnhance;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.WebApplicationType;

pangu-spring-boot-starter/src/main/java/com/gitee/pulanos/pangu/framework/starter/autoconfigure/PanguAppProperties.java

@@ -34,4 +34,9 @@ public class PanguAppProperties {
      */
     private String appId = "";
 
+    /**
+     * 根据Nacos配置实现动态热刷新日志级别（缺省：true）
+     */
+    private boolean logReload = true;
+
 }

pangu-spring-boot-starter/src/main/java/com/gitee/pulanos/pangu/framework/starter/autoconfigure/PanguBaseAutoConfiguration.java

@@ -46,16 +46,16 @@ public class PanguBaseAutoConfiguration {
     @ConditionalOnMissingBean(ApplicationExitHook.class)
     public ApplicationExitHook createApplicationExitHook(){
         ApplicationExitHook applicationExitHook = new ApplicationExitHook();
-        log.info("{}{}{}", Constants.Msg.OK, "实例化并自动装配了Bean组件：", StrUtil.lowerFirst(ApplicationExitHook.class.getSimpleName()));
+        log.info("{}{}{}", Constants.Msg.OK, "loaded a bean：", StrUtil.lowerFirst(ApplicationExitHook.class.getSimpleName()));
         return applicationExitHook;
     }
 
     @Bean
-    @ConditionalOnProperty(prefix = "pangu", name = "config.data-id")
+    @ConditionalOnProperty(prefix = "pangu", name = "log-reload", havingValue = "true")
     @ConditionalOnClass(ConfigService.class)
     public DynamicLogSwitcher createDynamicLogSwitcher() {
         DynamicLogSwitcher dynamicLogSwitcher = new DynamicLogSwitcher();
-        log.info("{}{}{}", Constants.Msg.OK, "实例化并自动装配了Bean组件：", StrUtil.lowerFirst(DynamicLogSwitcher.class.getSimpleName()));
+        log.info("{}{}{}", Constants.Msg.OK, "loaded a bean：", StrUtil.lowerFirst(DynamicLogSwitcher.class.getSimpleName()));
         return dynamicLogSwitcher;
     }
 

pangu-website/docs/devops/日志相关.md

@@ -44,7 +44,9 @@ tlogTraceId: 10812814178142336
 > - pangu-examples-webapi-dubbo-service-based
 
 ## 日志级别热切换
-为了增强日志输出的可观测性，盘古基础模块实现了基于配置中心的日志级别热切换能力。只需要在配置中心修改或新增日志级别配置，则对应的日志输出级别即刻实时生效。
+
+为了增强日志输出的可观测性，盘古基础模块实现了基于配置中心的日志级别热切换能力。只需要在配置中心修改或新增日志级别配置，则对应的日志输出级别即刻实时生效。默认状态下此功能是关闭的。需要先在工程配置文件中使用此配置打开此功能：`pangu.log-reload=true`。
+
 ```jsx
 #配置中心配置日志
 logging.level.root=INFO
@@ -52,4 +54,5 @@ logging.level.com.gitee.pulanos.pangu=INFO
 ```
 
 ## 下一步
+
 继续阅读其它章节获取你想要的答案或通过我们的 [开发者社区](/community) 寻求更多帮助。