diff --git a/pom.xml b/pom.xml index 843a0c5..4bbeb9b 100644 --- a/pom.xml +++ b/pom.xml @@ -67,7 +67,57 @@ org.springframework.boot spring-boot-starter-quartz + + + com.h2database + h2 + 1.4.199 + test + + + + com.baomidou + mybatis-plus-boot-starter + 3.4.2 + + + + + org.springframework.boot + spring-boot-starter-web + + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + 2.2.0 + + + + + org.xerial + sqlite-jdbc + 3.40.1.0 + + + org.springframework.boot + spring-boot-starter-jdbc + + + + + + mysql + mysql-connector-java + 5.1.47 + + + + + org.projectlombok + lombok + diff --git a/src/main/java/com/bonus/emergencyrap/constant/TextConstants.java b/src/main/java/com/bonus/emergencyrap/constant/TextConstants.java index 9fd3e99..e4c60a1 100644 --- a/src/main/java/com/bonus/emergencyrap/constant/TextConstants.java +++ b/src/main/java/com/bonus/emergencyrap/constant/TextConstants.java @@ -4,10 +4,14 @@ package com.bonus.emergencyrap.constant; * 文本文件名称 */ public class TextConstants { + + + public static final String PLATFORM = "platform"; + /** * 系统管理 */ - public static final String PLATFORM = "platform"; + public static final String DB_CONFIG = "dbconfig"; /** * 任务管理 */ diff --git a/src/main/java/com/bonus/emergencyrap/mapper/LoginMapper.java b/src/main/java/com/bonus/emergencyrap/mapper/LoginMapper.java new file mode 100644 index 0000000..7598c0e --- /dev/null +++ b/src/main/java/com/bonus/emergencyrap/mapper/LoginMapper.java @@ -0,0 +1,14 @@ +package com.bonus.emergencyrap.mapper; + +import com.bonus.emergencyrap.vo.LoginFormVo; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface LoginMapper { + /** + * 系统登录 + * @param loginFormVo + * @return + */ + LoginFormVo login(LoginFormVo loginFormVo); +} diff --git a/src/main/java/com/bonus/emergencyrap/service/loginServiceImpl.java b/src/main/java/com/bonus/emergencyrap/service/loginServiceImpl.java index bc68230..7e29623 100644 --- a/src/main/java/com/bonus/emergencyrap/service/loginServiceImpl.java +++ b/src/main/java/com/bonus/emergencyrap/service/loginServiceImpl.java @@ -1,12 +1,14 @@ package com.bonus.emergencyrap.service; import com.bonus.emergencyrap.constant.SecurityConstants; +import com.bonus.emergencyrap.mapper.LoginMapper; import com.bonus.emergencyrap.utils.JwtUtils; import com.bonus.emergencyrap.utils.ResourceLineReader; import com.bonus.emergencyrap.utils.StringUtils; import com.bonus.emergencyrap.vo.AjaxResult; import com.bonus.emergencyrap.vo.LoginFormVo; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.HashMap; @@ -17,6 +19,9 @@ import java.util.Map; @Service public class loginServiceImpl implements LoginService{ + @Autowired + private LoginMapper mapper; + @Override public AjaxResult login(LoginFormVo loginFormVo) { @@ -24,16 +29,17 @@ public class loginServiceImpl implements LoginService{ if (StringUtils.isEmpty(loginFormVo.getUsername()) || StringUtils.isEmpty(loginFormVo.getPassword())) { return AjaxResult.error("请输入账号密码!"); } - Map map = ResourceLineReader.getLineMaps("conf.properties","="); - if (loginFormVo.getUsername().equals(map.get("username")) && loginFormVo.getPassword().equals(map.get("password"))) { - Map claimsMap = new HashMap(16); - claimsMap.put(SecurityConstants.USER_KEY, 1); - claimsMap.put(SecurityConstants.DETAILS_USERNAME, map.get("username")); + LoginFormVo user= mapper.login(loginFormVo); + if(user!=null && StringUtils.isNotEmpty(user.getUserId())){ + Map claimsMap = new HashMap(3); + claimsMap.put(SecurityConstants.USER_KEY, user.getUserId()); + claimsMap.put(SecurityConstants.DETAILS_USERNAME,user.getUsername()); // 接口返回信息 String token = JwtUtils.createToken(claimsMap); return AjaxResult.success("登录成功", token); + }else{ + return AjaxResult.error("账号/密码错误!"); } - return AjaxResult.error("账号/密码错误!"); } catch (Exception e) { log.error(e.toString(),e); } diff --git a/src/main/java/com/bonus/emergencyrap/task/job/ScanJob.java b/src/main/java/com/bonus/emergencyrap/task/job/ScanJob.java index 3b8318f..121f9b1 100644 --- a/src/main/java/com/bonus/emergencyrap/task/job/ScanJob.java +++ b/src/main/java/com/bonus/emergencyrap/task/job/ScanJob.java @@ -50,7 +50,7 @@ public class ScanJob implements Job { service.deleteJob(vo); } else{ //添加或者修改定时任务 - service.addTask(vo); + service.addTask(vo,ActuatorJob.class); } } } diff --git a/src/main/java/com/bonus/emergencyrap/task/job/UpdateSuccessJob.java b/src/main/java/com/bonus/emergencyrap/task/job/UpdateSuccessJob.java index 50b98ea..bd48a99 100644 --- a/src/main/java/com/bonus/emergencyrap/task/job/UpdateSuccessJob.java +++ b/src/main/java/com/bonus/emergencyrap/task/job/UpdateSuccessJob.java @@ -44,7 +44,7 @@ public class UpdateSuccessJob implements Job { TaskVo vo= JSON.parseObject(json, TaskVo.class); vo.setIsSuccess("0"); vo.setFailNum(0); - appendToFile(filePtah,json,key,true); + appendToFile(filePtah,json,key,false); } diff --git a/src/main/java/com/bonus/emergencyrap/task/service/QuartzJobService.java b/src/main/java/com/bonus/emergencyrap/task/service/QuartzJobService.java index ac208ee..6882f82 100644 --- a/src/main/java/com/bonus/emergencyrap/task/service/QuartzJobService.java +++ b/src/main/java/com/bonus/emergencyrap/task/service/QuartzJobService.java @@ -59,9 +59,9 @@ public class QuartzJobService { // 使用cron表达式调度 - public void addTask(TaskVo vo) throws SchedulerException { + public void addTask(TaskVo vo,Class jobClass) throws SchedulerException { // 定义任务 - JobDetail jobDetail = JobBuilder.newJob(ActuatorJob.class) + JobDetail jobDetail = JobBuilder.newJob(jobClass) .withIdentity(vo.getTaskId(), defeatGroup) .withDescription("Cron定时任务") .storeDurably() @@ -92,12 +92,13 @@ public class QuartzJobService { vo.setTaskId("555555555555"); vo.setTime(taskIntervalSeconds); vo.setTaskName("定时任务扫描器"); - startSampleJobWithSimpleTrigger(vo); + // startSampleJobWithSimpleTrigger(vo); TaskVo vo2=new TaskVo(); vo2.setTaskId("9999999999999"); vo2.setTaskName("刷新任务的失败次数及成功率"); vo2.setCorn("0 0 1 * * ?"); - addTask(vo2); + vo2.setCorn("0/40 * * * * ?"); + // addTask(vo2,UpdateSuccessJob.class); } // 暂停任务 diff --git a/src/main/java/com/bonus/emergencyrap/vo/LoginFormVo.java b/src/main/java/com/bonus/emergencyrap/vo/LoginFormVo.java index 4bdd71f..4aad7a2 100644 --- a/src/main/java/com/bonus/emergencyrap/vo/LoginFormVo.java +++ b/src/main/java/com/bonus/emergencyrap/vo/LoginFormVo.java @@ -5,6 +5,8 @@ import lombok.Data; @Data public class LoginFormVo { + private String userId; + private String username; private String password; diff --git a/src/main/java/com/bonus/emergencyrap/vo/TaskVo.java b/src/main/java/com/bonus/emergencyrap/vo/TaskVo.java index 16f555a..41c4cc0 100644 --- a/src/main/java/com/bonus/emergencyrap/vo/TaskVo.java +++ b/src/main/java/com/bonus/emergencyrap/vo/TaskVo.java @@ -18,7 +18,9 @@ public class TaskVo { * 任务名称 */ private String taskName; - + /** + * 系统表id + */ private String systemId; /** @@ -115,7 +117,9 @@ public class TaskVo { * 失败次数 */ private int failNum; - + /** + * 时间秒 + */ private int time; diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index e1e6625..4a17489 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -47,12 +47,20 @@ spring: # 热部署开关 enabled: true + datasource: + url: jdbc:sqlite:D:\File\text\emergency_rpa.db + driver-class-name: org.sqlite.JDBC + jpa: + hibernate: + ddl-auto: update + show-sql: true + database-platform: org.hibernate.community.dialect.SQLiteDialect + file: path: windows: D:/File/text/ linux: /data/text/ - # token配置 token: # 令牌自定义标识 @@ -67,6 +75,11 @@ task: seconds: 60 +mybatis: + mapper-locations: classpath:mapper/*Mapper.xml + + + diff --git a/src/main/resources/db/emergency_rpa.db b/src/main/resources/db/emergency_rpa.db new file mode 100644 index 0000000..15a8046 Binary files /dev/null and b/src/main/resources/db/emergency_rpa.db differ diff --git a/src/main/resources/mapper/LoginMapper.xml b/src/main/resources/mapper/LoginMapper.xml new file mode 100644 index 0000000..7a3018f --- /dev/null +++ b/src/main/resources/mapper/LoginMapper.xml @@ -0,0 +1,10 @@ + + + + +