moliparty/peko-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

maven-去掉阿里云logback

Browse Source
This commit is contained in:
yeungchihang
2023-03-13 11:17:18 +08:00
parent 60bef4d4d2
commit 53ef5be8c5
8 changed files with 14 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
accompany-base/accompany-core/src/main/resources/logback/aliyun-logback-comm.xml
View File

@@ -1,21 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Default logback configuration provided for import, equivalent to the programmatic
initialization performed by Boot
-->
<included>
<!-- To prevent data loss when the process exits, please remember to add this configuration -->
<shutdownHook class="ch.qos.logback.core.hook.DelayingShutdownHook"/>
<property name="aliyun_endpoint" value="cn-shenzhen.log.aliyuncs.com"/>
<property name="aliyun_ak" value="LTAIBUS6lzrO3Eh2"/>
<property name="aliyun_aks" value="pHPP60VsJbZcR2XISC5npUP6tO4MA0"/>
<!-- To prevent data loss when the process exits, please remember to add this configuration -->
<shutdownHook class="ch.qos.logback.core.hook.DelayingShutdownHook"/>
<!-- This listener will print the status in StatusManager to console-->
<!-- <statusListener class="ch.qos.logback.core.status.OnConsoleStatusListener"/>-->
</included>

91
accompany-base/accompany-core/src/main/resources/logback/aliyun-logback-dev.xml
View File

@@ -1,91 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Default logback configuration provided for import, equivalent to the programmatic
initialization performed by Boot
-->
<included>
<include resource="logback/aliyun-logback-comm.xml"/>
<appender name="aliyun-dev-info-log" class="com.aliyun.openservices.log.logback.LoghubAppender">
<!-- Required parameters -->
<!-- Configure account and network -->
<endpoint>${aliyun_endpoint}</endpoint>
<accessKeyId>${aliyun_ak}</accessKeyId>
<accessKeySecret>${aliyun_aks}</accessKeySecret>
<!-- Configure sls -->
<project>${aliyun_log_project_dev}</project>
<logStore>${aliyun_log_store_dev}</logStore>
<!-- Required parameters(end) -->
<!-- Optional parameters -->
<topic>info_log</topic>
<encoder>
<charset>UTF-8</charset>
<pattern>${LOG_PATTERN}</pattern>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>INFO</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
</appender>
<appender name="aliyun-dev-warn-log" class="com.aliyun.openservices.log.logback.LoghubAppender">
<!-- Required parameters -->
<!-- Configure account and network -->
<endpoint>${aliyun_endpoint}</endpoint>
<accessKeyId>${aliyun_ak}</accessKeyId>
<accessKeySecret>${aliyun_aks}</accessKeySecret>
<!-- Configure sls -->
<project>${aliyun_log_project_dev}</project>
<logStore>${aliyun_log_store_dev}</logStore>
<!-- Required parameters(end) -->
<!-- Optional parameters -->
<topic>warn_log</topic>
<encoder>
<charset>UTF-8</charset>
<pattern>${LOG_PATTERN}</pattern>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>WARN</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
</appender>
<appender name="aliyun-dev-error-log" class="com.aliyun.openservices.log.logback.LoghubAppender">
<!-- Required parameters -->
<!-- Configure account and network -->
<endpoint>${aliyun_endpoint}</endpoint>
<accessKeyId>${aliyun_ak}</accessKeyId>
<accessKeySecret>${aliyun_aks}</accessKeySecret>
<!-- Configure sls -->
<project>${aliyun_log_project_dev}</project>
<logStore>${aliyun_log_store_dev}</logStore>
<!-- Required parameters(end) -->
<topic>error_log</topic>
<encoder>
<charset>UTF-8</charset>
<pattern>${LOG_PATTERN}</pattern>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>ERROR</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
</appender>
</included>

91
accompany-base/accompany-core/src/main/resources/logback/aliyun-logback-prod.xml
View File

@@ -1,91 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Default logback configuration provided for import, equivalent to the programmatic
initialization performed by Boot
-->
<included>
<include resource="logback/aliyun-logback-comm.xml"/>
<appender name="aliyun-prod-info-log" class="com.aliyun.openservices.log.logback.LoghubAppender">
<!-- Required parameters -->
<!-- Configure account and network -->
<endpoint>${aliyun_endpoint}</endpoint>
<accessKeyId>${aliyun_ak}</accessKeyId>
<accessKeySecret>${aliyun_aks}</accessKeySecret>
<!-- Configure sls -->
<project>${aliyun_log_project_prod}</project>
<logStore>${aliyun_log_store_prod}</logStore>
<!-- Required parameters(end) -->
<!-- Optional parameters -->
<topic>info_log</topic>
<encoder>
<charset>UTF-8</charset>
<pattern>${LOG_PATTERN}</pattern>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>INFO</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
</appender>
<appender name="aliyun-prod-warn-log" class="com.aliyun.openservices.log.logback.LoghubAppender">
<!-- Required parameters -->
<!-- Configure account and network -->
<endpoint>${aliyun_endpoint}</endpoint>
<accessKeyId>${aliyun_ak}</accessKeyId>
<accessKeySecret>${aliyun_aks}</accessKeySecret>
<!-- Configure sls -->
<project>${aliyun_log_project_prod}</project>
<logStore>${aliyun_log_store_prod}</logStore>
<!-- Required parameters(end) -->
<!-- Optional parameters -->
<topic>warn_log</topic>
<encoder>
<charset>UTF-8</charset>
<pattern>${LOG_PATTERN}</pattern>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>WARN</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
</appender>
<appender name="aliyun-prod-error-log" class="com.aliyun.openservices.log.logback.LoghubAppender">
<!-- Required parameters -->
<!-- Configure account and network -->
<endpoint>${aliyun_endpoint}</endpoint>
<accessKeyId>${aliyun_ak}</accessKeyId>
<accessKeySecret>${aliyun_aks}</accessKeySecret>
<!-- Configure sls -->
<project>${aliyun_log_project_prod}</project>
<logStore>${aliyun_log_store_prod}</logStore>
<!-- Required parameters(end) -->
<topic>error_log</topic>
<encoder>
<charset>UTF-8</charset>
<pattern>${LOG_PATTERN}</pattern>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>ERROR</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
</appender>
</included>

8
accompany-business/accompany-business-web/src/main/resources/logback-spring.xml
View File

@@ -111,9 +111,9 @@
<!-- <property name="aliyun_log_store_dev" value="66-dev-bussiness"/>-->
<!-- <include resource="logback/aliyun-logback-dev.xml"/>-->
<property name="aliyun_log_project_prod" value="xy-yinyou-prod"/>
<!--<property name="aliyun_log_project_prod" value="xy-yinyou-prod"/>
<property name="aliyun_log_store_prod" value="yinyou-prod-business"/>
<include resource="logback/aliyun-logback-prod.xml"/>
<include resource="logback/aliyun-logback-prod.xml"/>-->
<!--生产环境:打印控制台和输出到文件-->
<springProfile name="prod">
@@ -122,9 +122,9 @@
<appender-ref ref="info_async_file"/>
<appender-ref ref="warn_async_file"/>
<appender-ref ref="error_async_file"/>
<appender-ref ref="aliyun-prod-info-log"/>
<!--<appender-ref ref="aliyun-prod-info-log"/>
<appender-ref ref="aliyun-prod-warn-log"/>
<appender-ref ref="aliyun-prod-error-log"/>
<appender-ref ref="aliyun-prod-error-log"/>-->
</root>
</springProfile>

8
accompany-oauth2/accompany-oauth2-web/src/main/resources/logback-spring.xml
View File

@@ -111,9 +111,9 @@
<!-- <property name="aliyun_log_store_dev" value="66-dev-ouath2"/>-->
<!-- <include resource="logback/aliyun-logback-dev.xml"/>-->
<property name="aliyun_log_project_prod" value="xy-yinyou-prod"/>
<!--<property name="aliyun_log_project_prod" value="xy-yinyou-prod"/>
<property name="aliyun_log_store_prod" value="yinyou-prod-ouath2"/>
<include resource="logback/aliyun-logback-prod.xml"/>
<include resource="logback/aliyun-logback-prod.xml"/>-->
<!--生产环境:打印控制台和输出到文件-->
@@ -123,9 +123,9 @@
<appender-ref ref="info_async_file"/>
<appender-ref ref="warn_async_file"/>
<appender-ref ref="error_async_file"/>
<appender-ref ref="aliyun-prod-info-log"/>
<!--<appender-ref ref="aliyun-prod-info-log"/>
<appender-ref ref="aliyun-prod-warn-log"/>
<appender-ref ref="aliyun-prod-error-log"/>
<appender-ref ref="aliyun-prod-error-log"/>-->
</root>
</springProfile>

126
accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/RankWechatTask.java
View File

@@ -1,126 +0,0 @@
package com.accompany.scheduler.task;
import com.accompany.business.mybatismapper.activity.LuckySeaActMapper;
import com.accompany.business.service.activities.vo.LuckySeaRankListVo;
import com.accompany.business.service.push.EnterpriseWechatPushService;
import com.accompany.business.service.user.UsersService;
import com.accompany.common.config.WebSecurityConfig;
import com.accompany.common.constant.Constant;
import com.accompany.common.push.MarkdownMessage;
import com.accompany.common.redis.RedisKey;
import com.accompany.common.utils.DateTimeUtil;
import com.accompany.common.utils.EnvComponent;
import com.accompany.core.model.Users;
import com.accompany.core.service.common.JedisService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
@Component
public class RankWechatTask {
@Autowired
private WebSecurityConfig webSecurityConfig;
@Autowired
private EnvComponent envComponent;
@Autowired
private JedisService jedisService;
@Autowired
private UsersService usersService;
@Autowired
private EnterpriseWechatPushService enterpriseWechatPushService;
@Autowired
private LuckySeaActMapper luckySeaActMapper;
@Scheduled(cron = "0 1 0 * * ?")
public void sout(){
if (envComponent.getDevOrNativeEnv()){
return;
}
LocalDateTime yesterday = LocalDateTime.now().minusDays(1L);
String yesterdayStr = yesterday.format(DateTimeFormatter.ofPattern(DateTimeUtil.DEFAULT_DATE_PATTERN));
pushKryptonDay2Wechat(yesterdayStr);
pushVigourDay2Wechat(yesterdayStr);
pushLuckySeaAWechat(yesterdayStr);
pushLuckySeaBWechat(yesterdayStr);
}
private void pushKryptonDay2Wechat(String yesterDayStr){
String rankKey = RedisKey.krypton_rank.getKey(Constant.RankDatetype.day + ":" + yesterDayStr);
Set<Map<String, Object>> rankMap = jedisService.zrevrangeWithScore(rankKey, 0L, 0L);
if (CollectionUtils.isEmpty(rankMap)){
return;
}
for (Map<String, Object> first: rankMap){
Long uid = Long.parseLong(first.get("member").toString());
Long score = Math.round((Double) first.get("score"));
Users u = usersService.getUsersByUid(uid);
MarkdownMessage msg = new MarkdownMessage();
msg.add(MarkdownMessage.getHeaderText(3, String.format("%s 爱意榜榜一大佬", yesterDayStr)));
msg.add(MarkdownMessage.getReferenceText(String.format("平台ID [%d]", u.getErbanNo())));
msg.add(MarkdownMessage.getReferenceText(String.format("昵称 [%s]", u.getNick())));
msg.add(MarkdownMessage.getReferenceText(String.format("当日累计送礼钻石价值 [%d]", score)));
enterpriseWechatPushService.pushMessageByKey(webSecurityConfig.getActivityEnterpriseWechatPushKey(), msg);
}
}
private void pushVigourDay2Wechat(String yesterDayStr){
String rankKey = RedisKey.vigour_rank.getKey(Constant.RankDatetype.day + ":" + yesterDayStr);
Set<Map<String, Object>> rankMap = jedisService.zrevrangeWithScore(rankKey, 0L, 0L);
if (CollectionUtils.isEmpty(rankMap)){
return;
}
for (Map<String, Object> first: rankMap){
Long uid = Long.parseLong(first.get("member").toString());
Long score = Math.round((Double) first.get("score"));
Users u = usersService.getUsersByUid(uid);
MarkdownMessage msg = new MarkdownMessage();
msg.add(MarkdownMessage.getHeaderText(3, String.format("%s 魅力榜榜一大佬", yesterDayStr)));
msg.add(MarkdownMessage.getReferenceText(String.format("平台ID [%d]", u.getErbanNo())));
msg.add(MarkdownMessage.getReferenceText(String.format("昵称 [%s]", u.getNick())));
msg.add(MarkdownMessage.getReferenceText(String.format("当日累计收礼钻石价值 [%d]", score)));
enterpriseWechatPushService.pushMessageByKey(webSecurityConfig.getActivityEnterpriseWechatPushKey(), msg);
}
}
private void pushLuckySeaAWechat(String yesterDayStr){
Date yesterday = DateTimeUtil.convertStrToDate(yesterDayStr, DateTimeUtil.DEFAULT_DATE_PATTERN);
Date beginTimeOfDay = DateTimeUtil.getBeginTimeOfDay(yesterday);
Date endTimeOfDay = DateTimeUtil.getEndTimeOfDay(yesterday);
List<LuckySeaRankListVo> rankList = luckySeaActMapper.listDiamondRank(0, 1, beginTimeOfDay, endTimeOfDay);
for (LuckySeaRankListVo vo: rankList){
MarkdownMessage msg = new MarkdownMessage();
msg.add(MarkdownMessage.getHeaderText(3, String.format("%s 星级厨房奖励榜榜一大佬", yesterDayStr)));
msg.add(MarkdownMessage.getReferenceText(String.format("平台ID [%d]", vo.getErbanNo())));
msg.add(MarkdownMessage.getReferenceText(String.format("昵称 [%s]", vo.getNick())));
msg.add(MarkdownMessage.getReferenceText(String.format("当日累计中奖产出钻石 [%d]", vo.getNum().longValue())));
enterpriseWechatPushService.pushMessageByKey(webSecurityConfig.getActivityEnterpriseWechatPushKey(), msg);
}
}
private void pushLuckySeaBWechat(String yesterDayStr){
Date yesterday = DateTimeUtil.convertStrToDate(yesterDayStr, DateTimeUtil.DEFAULT_DATE_PATTERN);
Date beginTimeOfDay = DateTimeUtil.getBeginTimeOfDay(yesterday);
Date endTimeOfDay = DateTimeUtil.getEndTimeOfDay(yesterday);
List<LuckySeaRankListVo> rankList = luckySeaActMapper.listLuckyManRank(0, 1, beginTimeOfDay, endTimeOfDay);
for (LuckySeaRankListVo vo: rankList){
MarkdownMessage msg = new MarkdownMessage();
msg.add(MarkdownMessage.getHeaderText(3, String.format("%s 星级厨房欧皇榜榜一大佬", yesterDayStr)));
msg.add(MarkdownMessage.getReferenceText(String.format("平台ID [%d]", vo.getErbanNo())));
msg.add(MarkdownMessage.getReferenceText(String.format("昵称 [%s]", vo.getNick())));
msg.add(MarkdownMessage.getReferenceText(String.format("当日累计中奖次数 [%d]", vo.getNum().longValue())));
enterpriseWechatPushService.pushMessageByKey(webSecurityConfig.getActivityEnterpriseWechatPushKey(), msg);
}
}
}

8
accompany-scheduler/accompany-scheduler-web/src/main/resources/logback-spring.xml
View File

@@ -111,9 +111,9 @@
<!-- <property name="aliyun_log_store_dev" value="66-dev-schedule"/>-->
<!-- <include resource="logback/aliyun-logback-dev.xml"/>-->
<property name="aliyun_log_project_prod" value="xy-yinyou-prod"/>
<!--<property name="aliyun_log_project_prod" value="xy-yinyou-prod"/>
<property name="aliyun_log_store_prod" value="yinyou-prod-schedule"/>
<include resource="logback/aliyun-logback-prod.xml"/>
<include resource="logback/aliyun-logback-prod.xml"/>-->
<!--生产环境:打印控制台和输出到文件-->
@@ -123,9 +123,9 @@
<appender-ref ref="info_async_file"/>
<appender-ref ref="warn_async_file"/>
<appender-ref ref="error_async_file"/>
<appender-ref ref="aliyun-prod-info-log"/>
<!--<appender-ref ref="aliyun-prod-info-log"/>
<appender-ref ref="aliyun-prod-warn-log"/>
<appender-ref ref="aliyun-prod-error-log"/>
<appender-ref ref="aliyun-prod-error-log"/>-->
</root>
</springProfile>

4
pom.xml
View File

@@ -941,11 +941,11 @@
<artifactId>protobuf-java</artifactId>
<version>3.15.5</version>
</dependency>
<dependency>
<!--<dependency>
<groupId>com.aliyun.openservices</groupId>
<artifactId>aliyun-log-logback-appender</artifactId>
<version>0.1.19</version>
</dependency>
</dependency>-->
<dependency>
<groupId>tech.sud.mgp.auth</groupId>