Merge remote-tracking branch 'upstream/dev' into dev

Dapp-Learning-DAO · Jan 22, 2024 · 80ad6b5 · 80ad6b5
2 parents 9e0d9a8 + 6ca9224
commit 80ad6b5
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 12 deletions.
diff --git a/deploy/docker-compose-backend-app.yaml b/deploy/docker-compose-backend-app.yaml
@@ -7,15 +7,24 @@ services:
     environment:
       # change the profile name and password according to your env.
       - spring_profiles_active=dev
+      # MySQL password
       - SPRING_DATASOURCE_PASSWORD=
+      # QCloud
       - BUCKET_NAME=
       - REGION_NAME=
       - SECRET_ID=
       - SECRET_KEY=
+      # GitHub and Twitter
       - GITHUB_CLIENT_ID=
       - GITHUB_CLIENT_SECRET=
+      - TWITTER_CLIENT_KEY=
+      - TWITTER_CLIENT_SECRET=
+      - TWITTER_CALLBACK_URL=
+      # GMAIL
       - MAIL_ADDRESS=
       - MAIL_PASSWORD=
+      # Chain ids
+      - CHAIN_IDS=
     ports:
       - '8080:8080'
     volumes:

diff --git a/src/main/java/com/dl/officialsite/config/ChainConfig.java b/src/main/java/com/dl/officialsite/config/ChainConfig.java
@@ -1,13 +1,13 @@
 package com.dl.officialsite.config;
 
 import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 @Component
-@ConfigurationProperties(prefix="chain")
 @Data
 public class ChainConfig {
 
+   @Value("#{'${CHAIN_IDS:11155111,10}'.split(',')}")
    private  String[] ids;
 }
diff --git a/src/main/java/com/dl/officialsite/redpacket/RedPacketService.java b/src/main/java/com/dl/officialsite/redpacket/RedPacketService.java
@@ -6,12 +6,6 @@
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
-import java.io.IOException;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
@@ -25,14 +19,20 @@
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
+import java.io.IOException;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
 /**
  * @ClassName TeamService
  * @Author jackchen
  * @Date 2023/10/21 17:23
  * @Description TODO
  **/
 @Service
-@Slf4j
+@Slf4j(topic = "RedPacket")
 @Configuration
 public class RedPacketService {
 

diff --git a/src/main/java/com/dl/officialsite/reward/RewardService.java b/src/main/java/com/dl/officialsite/reward/RewardService.java
@@ -8,8 +8,6 @@
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
-import java.io.IOException;
-import java.util.List;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
@@ -21,14 +19,17 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.io.IOException;
+import java.util.List;
+
 /**
  * @ClassName TeamService
  * @Author jackchen
  * @Date 2023/10/21 17:23
  * @Description TODO
  **/
 @Service
-@Slf4j
+@Slf4j(topic = "RedPacket")
 public class RewardService {
 
     @Autowired

diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
@@ -0,0 +1,3 @@
+jobs:
+  redpacket:
+    corn: "0/5 * * * * ?"
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
@@ -33,6 +33,27 @@
         </rollingPolicy>
     </appender>
 
+    <appender name="RedPacketAppender"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${LOGS}/red-packet-task.log</file>
+        <encoder
+                class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <Pattern>%d %p %C{1.} [%t] %m%n</Pattern>
+        </encoder>
+
+        <rollingPolicy
+                class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- rollover daily and when the file reaches 10 MegaBytes -->
+            <fileNamePattern>${LOGS}/archived/red-packet-task-%d{yyyy-MM-dd}.%i.log
+            </fileNamePattern>
+            <maxHistory>30</maxHistory>
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>10MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+    </appender>
+
     <!-- LOG everything at INFO level -->
     <root level="info">
         <appender-ref ref="RollingFile" />
@@ -45,4 +66,8 @@
         <appender-ref ref="Console" />
     </logger>
 
+    <logger name="RedPacket" level="info" additivity="false">
+        <appender-ref ref="RedPacketAppender" />
+    </logger>
+
 </configuration>