yovinchen/xlcs
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

修改 Graylog 分布式日志框架

Browse Source
This commit is contained in:
yovinchen
2024-01-10 17:29:02 +08:00
parent c16485dbfb
commit 49543f214f
38 changed files with 67 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xlcs-parent/service/service-acl/src/main/resources/logback-spring.xml
View File

@@ -140,7 +140,7 @@
</logger>
<appender name="GELF" class="biz.paluch.logging.gelf.logback.GelfLogbackAppender">
<!--GrayLog服务地址-->
<host>udp:124.70.87.134</host>
<host>udp:10.211.55.50</host>
<!--GrayLog服务端口-->
<port>12201</port>
<version>1.1</version>

4
xlcs-parent/service/service-activity/src/main/resources/logback-spring.xml
View File

@@ -86,7 +86,7 @@
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<!--设置文件命名格式-->
<!-- <FileNamePattern>${LOG_HOME}/${APP_NAME}/error/${POD_NAME}-%d{yyyy-MM-dd}-%i.log</FileNamePattern>-->
<FileNamePattern>${LOG_HOME}/${APP_NAME}/info/${APP_NAME}-%d{yyyy-MM-dd}-%i.log</FileNamePattern>
<FileNamePattern>${LOG_HOME}/${APP_NAME}/error/${APP_NAME}-%d{yyyy-MM-dd}-%i.log</FileNamePattern>
<!--设置日志文件大小，超过就重新生成文件，默认10M-->
<maxFileSize>${LOG_FILE_MAX_SIZE}</maxFileSize>
<!--日志文件保留天数，默认30天-->
@@ -141,7 +141,7 @@
</logger>
<appender name="GELF" class="biz.paluch.logging.gelf.logback.GelfLogbackAppender">
<!--GrayLog服务地址-->
<host>udp:124.70.87.134</host>
<host>udp:10.211.55.50</host>
<!--GrayLog服务端口-->
<port>12201</port>
<version>1.1</version>

4
xlcs-parent/service/service-cart/src/main/resources/logback-spring.xml
View File

@@ -86,7 +86,7 @@
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<!--设置文件命名格式-->
<!-- <FileNamePattern>${LOG_HOME}/${APP_NAME}/error/${POD_NAME}-%d{yyyy-MM-dd}-%i.log</FileNamePattern>-->
<FileNamePattern>${LOG_HOME}/${APP_NAME}/info/${APP_NAME}-%d{yyyy-MM-dd}-%i.log</FileNamePattern>
<FileNamePattern>${LOG_HOME}/${APP_NAME}/error/${APP_NAME}-%d{yyyy-MM-dd}-%i.log</FileNamePattern>
<!--设置日志文件大小，超过就重新生成文件，默认10M-->
<maxFileSize>${LOG_FILE_MAX_SIZE}</maxFileSize>
<!--日志文件保留天数，默认30天-->
@@ -141,7 +141,7 @@
</logger>
<appender name="GELF" class="biz.paluch.logging.gelf.logback.GelfLogbackAppender">
<!--GrayLog服务地址-->
<host>udp:124.70.87.134</host>
<host>udp:10.211.55.50</host>
<!--GrayLog服务端口-->
<port>12201</port>
<version>1.1</version>

4
xlcs-parent/service/service-home/src/main/resources/logback-spring.xml
View File

@@ -86,7 +86,7 @@
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<!--设置文件命名格式-->
<!-- <FileNamePattern>${LOG_HOME}/${APP_NAME}/error/${POD_NAME}-%d{yyyy-MM-dd}-%i.log</FileNamePattern>-->
<FileNamePattern>${LOG_HOME}/${APP_NAME}/info/${APP_NAME}-%d{yyyy-MM-dd}-%i.log</FileNamePattern>
<FileNamePattern>${LOG_HOME}/${APP_NAME}/error/${APP_NAME}-%d{yyyy-MM-dd}-%i.log</FileNamePattern>
<!--设置日志文件大小，超过就重新生成文件，默认10M-->
<maxFileSize>${LOG_FILE_MAX_SIZE}</maxFileSize>
<!--日志文件保留天数，默认30天-->
@@ -141,7 +141,7 @@
</logger>
<appender name="GELF" class="biz.paluch.logging.gelf.logback.GelfLogbackAppender">
<!--GrayLog服务地址-->
<host>udp:124.70.87.134</host>
<host>udp:10.211.55.50</host>
<!--GrayLog服务端口-->
<port>12201</port>
<version>1.1</version>

10
xlcs-parent/service/service-order/src/main/java/com/yovinchen/xlcs/order/service/impl/OrderInfoServiceImpl.java
View File

@@ -90,7 +90,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
//获取用户id
Long userId = AuthContextHolder.getUserId();
//获取用户对应团长信息
//获取用户对应配送员信息
LeaderAddressVo leaderAddressVo = userFeignClient.getUserAddressByUserId(userId);
//获取购物车里面选中的商品
@@ -187,7 +187,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
if (CollectionUtils.isEmpty(cartInfoList)) {
throw new xlcsException(ResultCodeEnum.DATA_ERROR);
}
//查询用户提货点和团长信息
//查询用户提货点和配送员信息
Long userId = AuthContextHolder.getUserId();
LeaderAddressVo leaderAddressVo = userFeignClient.getUserAddressByUserId(userId);
if (leaderAddressVo == null) {
@@ -243,8 +243,8 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
orderInfo.setUserId(userId);//用户id
orderInfo.setOrderNo(orderParamVo.getOrderNo()); //订单号 唯一标识
orderInfo.setOrderStatus(OrderStatus.UNPAID); //订单状态，生成成功未支付
orderInfo.setLeaderId(orderParamVo.getLeaderId());//团长id
orderInfo.setLeaderName(leaderAddressVo.getLeaderName());//团长名称
orderInfo.setLeaderId(orderParamVo.getLeaderId());//配送员id
orderInfo.setLeaderName(leaderAddressVo.getLeaderName());//配送员名称
orderInfo.setLeaderPhone(leaderAddressVo.getLeaderPhone());
orderInfo.setTakeName(leaderAddressVo.getTakeName());
@@ -272,7 +272,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
orderInfo.setCouponAmount(couponAmount);
orderInfo.setTotalAmount(totalAmount);
//计算团长佣金
//计算配送员佣金
BigDecimal profitRate = new BigDecimal(0);//orderSetService.getProfitRate();
BigDecimal commissionAmount = orderInfo.getTotalAmount().multiply(profitRate);
orderInfo.setCommissionAmount(commissionAmount);

4
xlcs-parent/service/service-order/src/main/resources/logback-spring.xml
View File

@@ -86,7 +86,7 @@
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<!--设置文件命名格式-->
<!-- <FileNamePattern>${LOG_HOME}/${APP_NAME}/error/${POD_NAME}-%d{yyyy-MM-dd}-%i.log</FileNamePattern>-->
<FileNamePattern>${LOG_HOME}/${APP_NAME}/info/${APP_NAME}-%d{yyyy-MM-dd}-%i.log</FileNamePattern>
<FileNamePattern>${LOG_HOME}/${APP_NAME}/error/${APP_NAME}-%d{yyyy-MM-dd}-%i.log</FileNamePattern>
<!--设置日志文件大小，超过就重新生成文件，默认10M-->
<maxFileSize>${LOG_FILE_MAX_SIZE}</maxFileSize>
<!--日志文件保留天数，默认30天-->
@@ -141,7 +141,7 @@
</logger>
<appender name="GELF" class="biz.paluch.logging.gelf.logback.GelfLogbackAppender">
<!--GrayLog服务地址-->
<host>udp:124.70.87.134</host>
<host>udp:10.211.55.50</host>
<!--GrayLog服务端口-->
<port>12201</port>
<version>1.1</version>

4
xlcs-parent/service/service-payment/src/main/resources/logback-spring.xml
View File

@@ -86,7 +86,7 @@
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<!--设置文件命名格式-->
<!-- <FileNamePattern>${LOG_HOME}/${APP_NAME}/error/${POD_NAME}-%d{yyyy-MM-dd}-%i.log</FileNamePattern>-->
<FileNamePattern>${LOG_HOME}/${APP_NAME}/info/${APP_NAME}-%d{yyyy-MM-dd}-%i.log</FileNamePattern>
<FileNamePattern>${LOG_HOME}/${APP_NAME}/error/${APP_NAME}-%d{yyyy-MM-dd}-%i.log</FileNamePattern>
<!--设置日志文件大小，超过就重新生成文件，默认10M-->
<maxFileSize>${LOG_FILE_MAX_SIZE}</maxFileSize>
<!--日志文件保留天数，默认30天-->
@@ -141,7 +141,7 @@
</logger>
<appender name="GELF" class="biz.paluch.logging.gelf.logback.GelfLogbackAppender">
<!--GrayLog服务地址-->
<host>udp:124.70.87.134</host>
<host>udp:10.211.55.50</host>
<!--GrayLog服务端口-->
<port>12201</port>
<version>1.1</version>

4
xlcs-parent/service/service-product/src/main/resources/logback-spring.xml
View File

@@ -86,7 +86,7 @@
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<!--设置文件命名格式-->
<!-- <FileNamePattern>${LOG_HOME}/${APP_NAME}/error/${POD_NAME}-%d{yyyy-MM-dd}-%i.log</FileNamePattern>-->
<FileNamePattern>${LOG_HOME}/${APP_NAME}/info/${APP_NAME}-%d{yyyy-MM-dd}-%i.log</FileNamePattern>
<FileNamePattern>${LOG_HOME}/${APP_NAME}/error/${APP_NAME}-%d{yyyy-MM-dd}-%i.log</FileNamePattern>
<!--设置日志文件大小，超过就重新生成文件，默认10M-->
<maxFileSize>${LOG_FILE_MAX_SIZE}</maxFileSize>
<!--日志文件保留天数，默认30天-->
@@ -141,7 +141,7 @@
</logger>
<appender name="GELF" class="biz.paluch.logging.gelf.logback.GelfLogbackAppender">
<!--GrayLog服务地址-->
<host>udp:124.70.87.134</host>
<host>udp:10.211.55.50</host>
<!--GrayLog服务端口-->
<port>12201</port>
<version>1.1</version>

4
xlcs-parent/service/service-search/src/main/resources/logback-spring.xml
View File

@@ -86,7 +86,7 @@
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<!--设置文件命名格式-->
<!-- <FileNamePattern>${LOG_HOME}/${APP_NAME}/error/${POD_NAME}-%d{yyyy-MM-dd}-%i.log</FileNamePattern>-->
<FileNamePattern>${LOG_HOME}/${APP_NAME}/info/${APP_NAME}-%d{yyyy-MM-dd}-%i.log</FileNamePattern>
<FileNamePattern>${LOG_HOME}/${APP_NAME}/error/${APP_NAME}-%d{yyyy-MM-dd}-%i.log</FileNamePattern>
<!--设置日志文件大小，超过就重新生成文件，默认10M-->
<maxFileSize>${LOG_FILE_MAX_SIZE}</maxFileSize>
<!--日志文件保留天数，默认30天-->
@@ -141,7 +141,7 @@
</logger>
<appender name="GELF" class="biz.paluch.logging.gelf.logback.GelfLogbackAppender">
<!--GrayLog服务地址-->
<host>udp:124.70.87.134</host>
<host>udp:10.211.55.50</host>
<!--GrayLog服务端口-->
<port>12201</port>
<version>1.1</version>

4
xlcs-parent/service/service-sys/src/main/resources/logback-spring.xml
View File

@@ -86,7 +86,7 @@
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<!--设置文件命名格式-->
<!-- <FileNamePattern>${LOG_HOME}/${APP_NAME}/error/${POD_NAME}-%d{yyyy-MM-dd}-%i.log</FileNamePattern>-->
<FileNamePattern>${LOG_HOME}/${APP_NAME}/info/${APP_NAME}-%d{yyyy-MM-dd}-%i.log</FileNamePattern>
<FileNamePattern>${LOG_HOME}/${APP_NAME}/error/${APP_NAME}-%d{yyyy-MM-dd}-%i.log</FileNamePattern>
<!--设置日志文件大小，超过就重新生成文件，默认10M-->
<maxFileSize>${LOG_FILE_MAX_SIZE}</maxFileSize>
<!--日志文件保留天数，默认30天-->
@@ -141,7 +141,7 @@
</logger>
<appender name="GELF" class="biz.paluch.logging.gelf.logback.GelfLogbackAppender">
<!--GrayLog服务地址-->
<host>udp:124.70.87.134</host>
<host>udp:10.211.55.50</host>
<!--GrayLog服务端口-->
<port>12201</port>
<version>1.1</version>

2
xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/api/LeaderAddressController.java
View File

@@ -18,7 +18,7 @@ import javax.annotation.Resource;
* @author yovinchen
* @Create 2023/9/25 12:23
*/
@Api(tags = "团长接口")
@Api(tags = "配送员接口")
@RestController
@RequestMapping("api/user/leader")
public class LeaderAddressController {

4
xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/service/LoginWxService.java
View File

@@ -77,9 +77,9 @@ public class LoginWxService {
userService.save(user);
}
//5 根据userId查询提货点和团长信息
//5 根据userId查询提货点和配送员信息
////提货点 user表 user_delivery表
////团长 leader表
////配送员 leader表
LeaderAddressVo leaderAddressVo = userService.getLeaderAddressByUserId(user.getId());
//6 使用JWT工具根据userId和userName生成token字符串

2
xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/service/UserService.java
View File

@@ -22,7 +22,7 @@ public interface UserService extends IService<User> {
User getUserByOpenId(String openid);
/**
* 根据userId查询提货点和团长信息
* 根据userId查询提货点和配送员信息
*
* @param id
* @return

6
xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/service/impl/UserServiceImpl.java
View File

@@ -38,16 +38,16 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
return user;
}
//5 根据userId查询提货点和团长信息
//5 根据userId查询提货点和配送员信息
@Override
public LeaderAddressVo getLeaderAddressByUserId(Long userId) {
//根据userId查询用户默认的团长id
//根据userId查询用户默认的配送员id
UserDelivery userDelivery = userDeliveryMapper.selectOne(new LambdaQueryWrapper<UserDelivery>().eq(UserDelivery::getUserId, userId)
.eq(UserDelivery::getIsDefault, 1));
if (userDelivery == null) {
return null;
}
//拿着上面查询团长id查询leader表查询团长其他信息
//拿着上面查询配送员id查询leader表查询配送员其他信息
Leader leader = leaderMapper.selectById(userDelivery.getLeaderId());
//封装数据到LeaderAddressVo
LeaderAddressVo leaderAddressVo = new LeaderAddressVo();

5
xlcs-parent/service/service-user/src/main/resources/logback-spring.xml
View File

@@ -85,7 +85,8 @@
<appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<!--设置文件命名格式-->
<FileNamePattern>${LOG_HOME}/${APP_NAME}/info/${APP_NAME}-%d{yyyy-MM-dd}-%i.log</FileNamePattern>
<!-- <FileNamePattern>${LOG_HOME}/${APP_NAME}/error/${POD_NAME}-%d{yyyy-MM-dd}-%i.log</FileNamePattern>-->
<FileNamePattern>${LOG_HOME}/${APP_NAME}/error/${APP_NAME}-%d{yyyy-MM-dd}-%i.log</FileNamePattern>
<!--设置日志文件大小，超过就重新生成文件，默认10M-->
<maxFileSize>${LOG_FILE_MAX_SIZE}</maxFileSize>
<!--日志文件保留天数，默认30天-->
@@ -140,7 +141,7 @@
</logger>
<appender name="GELF" class="biz.paluch.logging.gelf.logback.GelfLogbackAppender">
<!--GrayLog服务地址-->
<host>udp:124.70.87.134</host>
<host>udp:10.211.55.50</host>
<!--GrayLog服务端口-->
<port>12201</port>
<version>1.1</version>