fix:去掉nacos配置

application-tenant/tenant-admin/src/main/resources/bootstrap.yml

@@ -3,20 +3,14 @@ spring:
     name: tenant-admin
   profiles:
     active: @profile.name@
-  cloud:
-    nacos:
-      discovery:
-        server-addr: @discovery.server-addr@
-      config:
-        server-addr: @config.server-addr@
-        group: @config.group@
-        namespace: @config.namespace@
-        file-extension: yaml
-        # 共享配置文件，排序越高后，优先级越高。
-        shared-configs:
-        - data-id: application-${spring.profiles.active}.yaml
-          group: @config.group@
-          refresh: true
   main:
     allow-bean-definition-overriding: true
     allow-circular-references: true
+  autoconfigure:
+    exclude:
+      - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
+      - com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
+  config:
+    import:
+      - classpath:tenant-admin-dev.yml
+      - classpath:application-config.yml  # 引入共享配置

application-tenant/tenant-admin/src/main/resources/logback-spring.xml

@@ -16,6 +16,7 @@ debug：当此属性设置为true时，将打印出logback内部日志信息，
     <property name="LOG_PATTERN" value="[%-5level] [%d{yyyy-MM-dd HH:mm:ss}] [%thread] ==> [%tid] %msg%n" />
     <property name="LOG_PATTERN_EX" value="[%-5level] [%d{yyyy-MM-dd HH:mm:ss}] T:[%X{traceId}] S:[%X{sessionId}] U:[%X{userId}] [%thread] ==> [%tid] %msg%n" />
 
+    <!--
     <appender name="kafka_log" class="com.github.danielwegener.logback.kafka.KafkaAppender">
         <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
             <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
@@ -27,6 +28,7 @@ debug：当此属性设置为true时，将打印出logback内部日志信息，
         <deliveryStrategy class="com.github.danielwegener.logback.kafka.delivery.AsynchronousDeliveryStrategy" />
         <producerConfig>bootstrap.servers=@kafka.log-server-addr@</producerConfig>
     </appender>
+    -->
 
     <!-- ch.qos.logback.core.ConsoleAppender 表示控制台输出 -->
     <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
@@ -89,48 +91,48 @@ debug：当此属性设置为true时，将打印出logback内部日志信息，
     </logger>
     <logger name="apelet" additivity="false" level="info">
         <appender-ref ref="console" />
-        <appender-ref ref="kafka_log"/>
-        <appender-ref ref="file_log" />
-    </logger>
-    <!-- 这里将dao的日志级别设置为DEBUG，是为了SQL语句的输出 -->
+    <!--      <appender-ref ref="kafka_log"/> -->
+       <appender-ref ref="file_log" />
+   </logger>
+   <!-- 这里将dao的日志级别设置为DEBUG，是为了SQL语句的输出 -->
     <logger name="apelet.tenantadmin.tenant.dao" additivity="false" level="debug">
         <appender-ref ref="console" />
-        <appender-ref ref="kafka_log"/>
-        <appender-ref ref="file_log" />
-    </logger>
-    <logger name="apelet.tenantadmin.upms.dao" additivity="false" level="debug">
-        <appender-ref ref="console" />
-        <appender-ref ref="kafka_log"/>
-        <appender-ref ref="file_log" />
-    </logger>
-    <logger name="apelet.tenantadmin.app.dao" additivity="false" level="debug">
-        <appender-ref ref="console" />
-        <appender-ref ref="kafka_log"/>
-        <appender-ref ref="file_log" />
-    </logger>
-    <logger name="apelet.common.mobile.dao" additivity="false" level="debug">
-        <appender-ref ref="console" />
-        <appender-ref ref="kafka_log"/>
-        <appender-ref ref="file_log" />
-    </logger>
-    <logger name="apelet.common.online.dao" additivity="false" level="debug">
-        <appender-ref ref="console" />
-        <appender-ref ref="kafka_log"/>
-        <appender-ref ref="file_log" />
-    </logger>
-    <logger name="apelet.common.flow.dao" additivity="false" level="debug">
-        <appender-ref ref="console" />
-        <appender-ref ref="kafka_log"/>
-        <appender-ref ref="file_log" />
-    </logger>
-    <logger name="org.flowable" additivity="false" level="info">
-        <appender-ref ref="console" />
-        <appender-ref ref="kafka_log"/>
-        <appender-ref ref="file_log" />
-    </logger>
-    <logger name="apelet.common.report.dao" additivity="false" level="debug">
-        <appender-ref ref="console" />
-        <appender-ref ref="kafka_log"/>
+        <!--     <appender-ref ref="kafka_log"/>-->
+          <appender-ref ref="file_log" />
+      </logger>
+      <logger name="apelet.tenantadmin.upms.dao" additivity="false" level="debug">
+          <appender-ref ref="console" />
+          <!--    <appender-ref ref="kafka_log"/>-->
+           <appender-ref ref="file_log" />
+       </logger>
+       <logger name="apelet.tenantadmin.app.dao" additivity="false" level="debug">
+           <appender-ref ref="console" />
+           <!--    <appender-ref ref="kafka_log"/>-->
+            <appender-ref ref="file_log" />
+        </logger>
+        <logger name="apelet.common.mobile.dao" additivity="false" level="debug">
+            <appender-ref ref="console" />
+            <!--  <appender-ref ref="kafka_log"/>-->
+           <appender-ref ref="file_log" />
+       </logger>
+       <logger name="apelet.common.online.dao" additivity="false" level="debug">
+           <appender-ref ref="console" />
+           <!--   <appender-ref ref="kafka_log"/>-->
+           <appender-ref ref="file_log" />
+       </logger>
+       <logger name="apelet.common.flow.dao" additivity="false" level="debug">
+           <appender-ref ref="console" />
+           <!--   <appender-ref ref="kafka_log"/>-->
+           <appender-ref ref="file_log" />
+       </logger>
+       <logger name="org.flowable" additivity="false" level="info">
+           <appender-ref ref="console" />
+           <!--     <appender-ref ref="kafka_log"/>-->
+             <appender-ref ref="file_log" />
+         </logger>
+         <logger name="apelet.common.report.dao" additivity="false" level="debug">
+             <appender-ref ref="console" />
+            <!-- <appender-ref ref="kafka_log"/>-->
         <appender-ref ref="file_log" />
     </logger>
     <statusListener class="ch.qos.logback.core.status.OnConsoleStatusListener"/>