root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge:冲突处理

Browse Source
This commit is contained in:
zhangzq
2024-06-07 16:59:20 +08:00
parent c33ffe440b
commit 91e0ce0752
15 changed files with 64 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/src/main/java/org/nl/system/service/quartz/utils/QuartzManage.java
View File

@@ -22,7 +22,7 @@ import static org.quartz.TriggerBuilder.newTrigger;
public class QuartzManage {
private static final String JOB_NAME = "TASK_";
@Resource(name = "scheduler")
@Resource(name = "quartzScheduler")
private Scheduler scheduler;
public void addJob(SysQuartzJob quartzJob) {

1
lms/nladmin-system/src/main/java/org/nl/system/service/secutiry/impl/OnlineUserService.java
View File

@@ -39,6 +39,7 @@ import org.nl.system.service.user.ISysUserService;
import org.nl.system.service.user.dao.SysUser;
import org.nl.system.service.user.dto.OnlineUserDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.domain.Pageable;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.scheduling.annotation.Async;

11
lms/nladmin-system/src/main/java/org/nl/system/service/tools/dao/ToolLocalStorage.java
View File

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import java.io.Serializable;
@@ -16,6 +17,7 @@ import java.io.Serializable;
* @since 2022-12-20
*/
@Data
@NoArgsConstructor
@EqualsAndHashCode(callSuper = false)
@TableName("tool_local_storage")
public class ToolLocalStorage implements Serializable {
@@ -78,5 +80,14 @@ public class ToolLocalStorage implements Serializable {
*/
private String update_time;
public ToolLocalStorage(String realName, String name, String suffix, String path, String type, String size) {
this.real_name = realName;
this.name = name;
this.suffix = suffix;
this.path = path;
this.type = type;
this.size = size;
}
}