新增参数
This commit is contained in:
parent
4dd470767a
commit
6d2a37365e
|
|
@ -72,9 +72,9 @@ public class AliyunPushApi {
|
|||
// String deviceIds = getUserDevices(String.valueOf(pushList.getUserId()));
|
||||
//查询所有
|
||||
LambdaQueryWrapper<TblAliyunDeviceInfo> allQuary = new QueryWrapper<TblAliyunDeviceInfo>().lambda().eq(TblAliyunDeviceInfo::getUserId, pushList.getUserId());
|
||||
if ("IOS".equals(pushList.getPhoneType().toUpperCase())) {
|
||||
if ("IOS".equalsIgnoreCase(pushList.getPhoneType())) {
|
||||
allQuary.eq(TblAliyunDeviceInfo::getPhoneType,"iOS");
|
||||
} else if("ANDROID".equals(pushList.getPhoneType().toUpperCase())) {
|
||||
} else if("ANDROID".equalsIgnoreCase(pushList.getPhoneType())) {
|
||||
allQuary.eq(TblAliyunDeviceInfo::getPhoneType,"ANDROID");
|
||||
}
|
||||
List<TblAliyunDeviceInfo> pushUserDevices = aliyunDeviceInfoService.list(allQuary);
|
||||
|
|
@ -83,6 +83,7 @@ public class AliyunPushApi {
|
|||
pushRequest.setAppKey(Long.parseLong(iosAppKey));
|
||||
} else {
|
||||
pushRequest.setAppKey(Long.parseLong(androidAppKey));
|
||||
pushRequest.setAndroidNotificationChannel("1");
|
||||
}
|
||||
//推送目标:
|
||||
//DEVICE:根据设备推送
|
||||
|
|
|
|||
|
|
@ -1,19 +1,19 @@
|
|||
log4j.rootLogger=DEBUG,Console,File
|
||||
#\u5B9A\u4E49\u65E5\u5FD7\u8F93\u51FA\u76EE\u7684\u5730\u4E3A\u63A7\u5236\u53F0
|
||||
log4j.appender.Console=org.apache.log4j.ConsoleAppender
|
||||
log4j.appender.Console.Target=System.out
|
||||
#\u53EF\u4EE5\u7075\u6D3B\u5730\u6307\u5B9A\u65E5\u5FD7\u8F93\u51FA\u683C\u5F0F\uFF0C\u4E0B\u9762\u4E00\u884C\u662F\u6307\u5B9A\u5177\u4F53\u7684\u683C\u5F0F
|
||||
log4j.appender.Console.layout = org.apache.log4j.PatternLayout
|
||||
log4j.rootLogger=DEBUG,Console,File
|
||||
#\u5B9A\u4E49\u65E5\u5FD7\u8F93\u51FA\u76EE\u7684\u5730\u4E3A\u63A7\u5236\u53F0
|
||||
log4j.appender.Console=org.apache.log4j.ConsoleAppender
|
||||
log4j.appender.Console.Target=System.out
|
||||
#\u53EF\u4EE5\u7075\u6D3B\u5730\u6307\u5B9A\u65E5\u5FD7\u8F93\u51FA\u683C\u5F0F\uFF0C\u4E0B\u9762\u4E00\u884C\u662F\u6307\u5B9A\u5177\u4F53\u7684\u683C\u5F0F
|
||||
log4j.appender.Console.layout = org.apache.log4j.PatternLayout
|
||||
log4j.appender.Console.layout.ConversionPattern=[ifishMQ][%c] - %m%n
|
||||
#\u6587\u4EF6\u5927\u5C0F\u5230\u8FBE\u6307\u5B9A\u5C3A\u5BF8\u7684\u65F6\u5019\u4EA7\u751F\u4E00\u4E2A\u65B0\u7684\u6587\u4EF6
|
||||
log4j.appender.File = org.apache.log4j.RollingFileAppender
|
||||
#\u6587\u4EF6\u5927\u5C0F\u5230\u8FBE\u6307\u5B9A\u5C3A\u5BF8\u7684\u65F6\u5019\u4EA7\u751F\u4E00\u4E2A\u65B0\u7684\u6587\u4EF6
|
||||
log4j.appender.File = org.apache.log4j.RollingFileAppender
|
||||
#\u6307\u5B9A\u8F93\u51FA\u76EE\u5F55
|
||||
log4j.appender.File.File = logs/ifishMQ.log
|
||||
log4j.appender.File.File = logs/ifishMQ.log
|
||||
#\u5B9A\u4E49\u6587\u4EF6\u6700\u5927\u5927\u5C0F
|
||||
log4j.appender.File.MaxFileSize = 100
|
||||
#\u8F93\u51FA\u6240\u4EE5\u65E5\u5FD7\uFF0C\u5982\u679C\u6362\u6210DEBUG\u8868\u793A\u8F93\u51FADEBUG\u4EE5\u4E0A\u7EA7\u522B\u65E5\u5FD7
|
||||
log4j.appender.File.Threshold = ALL
|
||||
log4j.appender.File.layout = org.apache.log4j.PatternLayout
|
||||
#\u8F93\u51FA\u6240\u4EE5\u65E5\u5FD7\uFF0C\u5982\u679C\u6362\u6210DEBUG\u8868\u793A\u8F93\u51FADEBUG\u4EE5\u4E0A\u7EA7\u522B\u65E5\u5FD7
|
||||
log4j.appender.File.Threshold = ALL
|
||||
log4j.appender.File.layout = org.apache.log4j.PatternLayout
|
||||
log4j.appender.File.layout.ConversionPattern =[ifishMQ][%p] [%d{yyyy-MM-dd HH\:mm\:ss}][%c]%m%n
|
||||
|
||||
log4j.logger.org.springframework=INFO
|
||||
|
|
|
|||
Loading…
Reference in New Issue