diff --git a/research-admin/src/main/java/com/research/web/controller/client/task/TaskController.java b/research-admin/src/main/java/com/research/web/controller/client/task/TaskController.java index 42dc4ea5..ba247013 100644 --- a/research-admin/src/main/java/com/research/web/controller/client/task/TaskController.java +++ b/research-admin/src/main/java/com/research/web/controller/client/task/TaskController.java @@ -46,6 +46,12 @@ public class TaskController { return JsonResponse.ok(new PageInfo<>(taskService.queryList(query.getParam()))); } + @ApiOperation(value = "查询任务") + @RequestMapping(value = "/detail", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse detail(@ApiParam @Validated @RequestBody TaskDto.QueryDetail dto){ + return JsonResponse.ok(taskService.detail(dto.getId())); + } + @ApiOperation(value = "新增任务") @RequestMapping(value = "/add", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse add(@ApiParam @Validated @RequestBody TaskDto.AddTask dto) { diff --git a/research-admin/src/main/java/com/research/web/controller/system/SysLoginController.java b/research-admin/src/main/java/com/research/web/controller/system/SysLoginController.java index 911dc610..f4517c43 100644 --- a/research-admin/src/main/java/com/research/web/controller/system/SysLoginController.java +++ b/research-admin/src/main/java/com/research/web/controller/system/SysLoginController.java @@ -55,6 +55,22 @@ public class SysLoginController ajax.put(Constants.TOKEN, token); return ajax; } + /** + * 登录方法 + * + * @param loginBody 登录信息 + * @return 结果 + */ + @PostMapping("/loginSimple") + public AjaxResult loginSimple(@RequestBody LoginBody loginBody) + { + AjaxResult ajax = AjaxResult.success(); + // 生成令牌 + String token = loginService.loginSimple(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(), + loginBody.getUuid()); + ajax.put(Constants.TOKEN, token); + return ajax; + } /** diff --git a/research-admin/src/main/resources/application.yml b/research-admin/src/main/resources/application.yml index 8057376c..7d8f0df0 100644 --- a/research-admin/src/main/resources/application.yml +++ b/research-admin/src/main/resources/application.yml @@ -7,7 +7,7 @@ research: # 版权年份 copyrightYear: 2025 # 文件路径 示例( Windows配置D:/research/uploadPath,Linux配置 /home/research/uploadPath) - profile: /home/research/profile + profile: D:\Projects\research\server\profile # 获取ip地址开关 addressEnabled: false # 验证码类型 math 数字计算 char 字符验证 diff --git a/research-framework/src/main/java/com/research/framework/config/SecurityConfig.java b/research-framework/src/main/java/com/research/framework/config/SecurityConfig.java index 4476d48a..39d35c2a 100644 --- a/research-framework/src/main/java/com/research/framework/config/SecurityConfig.java +++ b/research-framework/src/main/java/com/research/framework/config/SecurityConfig.java @@ -112,7 +112,7 @@ public class SecurityConfig .authorizeHttpRequests((requests) -> { permitAllUrl.getUrls().forEach(url -> requests.antMatchers(url).permitAll()); // 对于登录login 注册register 验证码captchaImage 允许匿名访问 - requests.antMatchers("/login", "/register", "/captchaImage", "web/login", "web/loginSimple").permitAll() + requests.antMatchers("/login","/loginSimple", "/register", "/captchaImage", "web/login", "web/loginSimple").permitAll() // 静态资源,可匿名访问 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll() .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll() diff --git a/research-generator/src/main/resources/mbg.xml b/research-generator/src/main/resources/mbg.xml index a38b14b3..b66fb880 100644 --- a/research-generator/src/main/resources/mbg.xml +++ b/research-generator/src/main/resources/mbg.xml @@ -68,7 +68,7 @@ - + @@ -87,7 +87,7 @@ - +