pudongliang пре 5 месеци
родитељ
комит
b61bc2ca06

+ 2 - 2
src/main/java/com/moka/gdtauto/task/TokenRefreshTask.java

@@ -29,8 +29,8 @@ public class TokenRefreshTask {
      * 刷新即将过期的访问令牌
      * 每10分钟执行一次,刷新30分钟内即将过期的token
      */
-    @Scheduled(cron = "0 */10 * * * ?")
-    @SchedulerLock(name = "refreshExpiringTokens", lockAtMostFor = "9m", lockAtLeastFor = "1m")
+    // @Scheduled(cron = "0 */10 * * * ?")
+    // @SchedulerLock(name = "refreshExpiringTokens", lockAtMostFor = "9m", lockAtLeastFor = "1m")
     public void refreshExpiringTokens() {
         log.info("开始执行Token刷新定时任务");
         

+ 8 - 0
src/main/resources/application-local.yml

@@ -2,6 +2,14 @@ spring:
   # 数据源配置
   datasource:
     dynamic:
+      p6spy: true
+      hikari:
+        connection-timeout: 30000
+        max-lifetime: 1800000
+        max-pool-size: 15
+        min-idle: 5
+        connection-test-query: select 1
+        pool-name: HyperionHikariCP
       primary: master
       strict: false
       datasource:

+ 3 - 17
src/main/resources/application-pro.yml

@@ -7,30 +7,16 @@ spring:
       datasource:
         master:
           driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-          url: jdbc:p6spy:mysql://172.18.71.27:3306/moka-gdt-auto?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false&allowPublicKeyRetrieval=true
+          url: jdbc:p6spy:mysql://rm-uf65d6xsxrp743w3a.mysql.rds.aliyuncs.com:3306/gdt_auto?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false&allowPublicKeyRetrieval=true
           username: root
           password: Moka666!@#$Moka
-      # Druid连接池配置
-      druid:
-        initial-size: 5
-        min-idle: 5
-        max-active: 20
-        max-wait: 60000
-        time-between-eviction-runs-millis: 60000
-        min-evictable-idle-time-millis: 300000
-        validation-query: SELECT 1
-        test-while-idle: true
-        test-on-borrow: false
-        test-on-return: false
-        pool-prepared-statements: true
-        max-pool-prepared-statement-per-connection-size: 20
   
   # Redis配置
   data:
     redis:
-      host: 172.18.71.26
+      host: r-uf66cwnm82korw2nia.redis.rds.aliyuncs.com
       port: 6379
-      password: Jch9shshl
+      password: Moka_Free_Novel_Redis66MFn
       database: 14
       lettuce:
         pool:

+ 43 - 0
src/main/resources/application-test.yml

@@ -0,0 +1,43 @@
+spring:
+  # 数据源配置
+  datasource:
+    dynamic:
+      p6spy: true
+      hikari:
+        connection-timeout: 30000
+        max-lifetime: 1800000
+        max-pool-size: 15
+        min-idle: 5
+        connection-test-query: select 1
+        pool-name: HyperionHikariCP
+      primary: master
+      strict: false
+      datasource:
+        master:
+          driver-class-name: com.p6spy.engine.spy.P6SpyDriver
+          url: jdbc:p6spy:mysql://rm-uf65d6xsxrp743w3aio.mysql.rds.aliyuncs.com:3306/gdt_auto?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false&allowPublicKeyRetrieval=true
+          username: gdt_auto
+          password: QA_GDT_AUTO%$PDL
+  
+  # Redis配置
+  data:
+    redis:
+      host: 172.18.71.26
+      port: 6379
+      password: Jch9shshl
+      database: 14
+      lettuce:
+        pool:
+          max-active: 8
+          max-idle: 8
+          min-idle: 0
+          max-wait: -1ms
+      timeout: 3000ms
+
+# 腾讯广告API配置
+tencent:
+  ads:
+    access-token: 
+    refresh-token: 
+    app-id: 
+    secret: 

+ 5 - 3
src/main/resources/application.yml

@@ -39,6 +39,8 @@ server:
 
 # Plumelog配置
 plumelog:
-  queue-name: gdt-auto
-  app-name: ${spring.application.name}
-  env: dev
+  env: ${spring.profiles.active}
+  redis:
+    host: r-uf6odtyjx4otfkczwhpd.redis.rds.aliyuncs.com
+    port: 52525
+    auth: NTZY_LOg666%$_redis

+ 18 - 8
src/main/resources/logback-spring.xml

@@ -3,6 +3,13 @@
     <property name="LOG_HOME" value="./logs" />
     <property name="APP_NAME" value="gdt-auto" />
 
+    <springProperty scope="context" name="springAppName" source="spring.application.name"/>
+    <springProperty scope="context" name="plumelog.env" source="plumelog.env"/>
+    <springProperty scope="context" name="plumelog.redis.host" source="plumelog.redis.host"/>
+    <springProperty scope="context" name="plumelog.redis.port" source="plumelog.redis.port"/>
+    <springProperty scope="context" name="plumelog.redis.auth" source="plumelog.redis.auth"/>
+
+
     <!-- 控制台输出 -->
     <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
@@ -49,25 +56,28 @@
     </appender>
 
     <!-- Plumelog Appender -->
-    <appender name="plumelog" class="com.plumelog.logback.appender.PlumeLogBackAppender">
-        <appName>${APP_NAME}</appName>
+   <appender name="plumelog" class="com.plumelog.logback.appender.RedisAppender">
+        <appName>${springAppName}</appName>
+        <redisHost>${plumelog.redis.host}</redisHost>
+        <redisPort>${plumelog.redis.port}</redisPort>
+        <redisAuth>${plumelog.redis.auth}</redisAuth>
+        <redisDb>0</redisDb>
+        <env>${plumelog.env}</env>
     </appender>
-
+    
     <!-- SQL日志 -->
     <logger name="com.moka.gdtauto.mapper" level="DEBUG"/>
     <logger name="p6spy" level="INFO"/>
     <!-- MyBatis日志 -->
-    <logger name="org.apache.ibatis" level="DEBUG"/>
-    <logger name="com.baomidou.mybatisplus" level="DEBUG"/>
+    <logger name="org.apache.ibatis" level="INFO"/>
+    <logger name="com.baomidou.mybatisplus" level="INFO"/>
     <!-- 数据库连接池日志 -->
-    <logger name="com.zaxxer.hikari" level="DEBUG"/>
+    <logger name="com.zaxxer.hikari" level="INFO"/>
 
     <!-- 本地开发环境 -->
     <springProfile name="local">
         <root level="INFO">
             <appender-ref ref="CONSOLE"/>
-            <appender-ref ref="FILE"/>
-            <appender-ref ref="ERROR_FILE"/>
         </root>
     </springProfile>