版本升级，jar包冲突处理

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.example</groupId>
     <artifactId>sms-plugin</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.2</version>
 
     <name>插件服务</name>
     <description>DM hub集成插件服务</description>
@@ -68,29 +68,25 @@
         <dependency>
             <groupId>net.logstash.logback</groupId>
             <artifactId>logstash-logback-encoder</artifactId>
-            <version>3.6</version>
+            <version>5.1</version>
         </dependency>
 
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.7</version>
         </dependency>
         <!-- logback -->
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.1.2</version>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-access</artifactId>
-            <version>1.1.2</version>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-core</artifactId>
-            <version>1.1.2</version>
         </dependency>
         <dependency>
             <groupId>com.alibaba</groupId>

src/main/resources/application-k8sTest.yml

-# 测试k8s环境配置
-server:
-  tomcat:
-    max-threads: 50
-  port: ${dmhub-sms-port}
-spring:
-  datasource:
-    db1:
-      jdbc-url: ${dataSource1_url}
-      driverClassName: com.mysql.cj.jdbc.Driver
-      username: ${dataSource_username}
-      password: ${dataSource_password}
-      enabled: true
-    db2:
-      jdbc-url: ${dataSource2_url}
-      driverClassName: com.mysql.cj.jdbc.Driver
-      username: ${dataSource_username}
-      password: ${dataSource_password}
-      enabled: true
-    type: com.zaxxer.hikari.HikariDataSource
-    hikari:
-      minimumIdle: 5
-      maxLifetime: 1765000
-      maximumPoolSize: 20
-      connectionTimeout: 30000
-      idleTimeout: 600000
-      pool-name: dmhub-plug-pool
-
-  redis:
-    database: 0
-    host: ${redis_url}
-    port: ${redis_port}
-    timeout: 5000
-    password: ${redis_pwd}
-system:
-  config:
-    bgy:
-      appId: ${bgy-sms-appId} # 系统id
-      securityCode: ${bgy-sms-security}  # 鉴权码
-      url: ${bgy-sms-url}
-      areaId: ${bgy-sms-areaId}
-      api: SendSms
-    dmHub:
-      applicationId: ${plugin-dmhub-appId}
-      applicationKey: ${plugin-dmhub-appKey}
-      baseApiURL: ${plugin-dmhub-aip-url}
-      tokenUrl: ${system.config.dmHub.baseApiURL}/security/accesstoken
-      report: ${system.config.dmHub.baseApiURL}/v1/sms/report
-      appId: ${smsAppId}
-      appSecret: ${smsSecret}
-      shortUrl: ${shortUrl}
-
-logging:
-  level: ${logLevel}
-  level.com.bgy: ${logLevel} # 单独指定包下的日志级别
-  config: classpath:logback-spring.xml
-  file:
-    path: logs.log
\ No newline at end of file

src/main/resources/application.yml

@@ -8,8 +8,8 @@ info:
 
 spring:
   profiles:
-    active: test
-#    active: ${sms-active}
+#    active: test
+    active: ${sms-active}
 
 mybatis-plus:
   mapper-locations: classpath:mapper/*.xml

src/main/resources/logback-spring.xml

@@ -3,6 +3,7 @@
     <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
     ​
     <springProperty scope="context" name="env" source="spring.profiles"/>
+    <springProperty scope="context" name="level" source="logging.level"/>
 
     <property name="service" value="sms-plug"/>​
     <property name="logfile" value="${LOG_DIR:-/opt/log/stash}/${service}/${service}"/>​
@@ -31,7 +32,7 @@
         </rollingPolicy>
     </appender>
 
-    <root level="info">
+    <root level="${level}">
         <appender-ref ref="console"/>
         <appender-ref ref="logstash"/>
     </root>