diff --git a/src/main/java/com/stonedt/intelligence/controller/ProjectController.java b/src/main/java/com/stonedt/intelligence/controller/ProjectController.java index 3e9a7e7..0ed8c2b 100644 --- a/src/main/java/com/stonedt/intelligence/controller/ProjectController.java +++ b/src/main/java/com/stonedt/intelligence/controller/ProjectController.java @@ -445,13 +445,12 @@ public class ProjectController { String message = ""; if(CommonJson.getIntValue("project_type") == 1){ - message = ProjectWordUtil.CommononprojectKeyWord(kafukaJson.getString("subject_word")); + message = ProjectWordUtil.CommononprojectKeyWord(kafukaJson.getString("subject_word")); }else { - - if(kafukaJson.getString("subject_word").indexOf("\\|")!=-1||kafukaJson.getString("subject_word").indexOf("+")!=-1) { + if(kafukaJson.getString("subject_word").indexOf("\\|")!=-1||kafukaJson.getString("subject_word").indexOf("+")!=-1) { message = ProjectWordUtil.CommononprojectKeyWord(kafukaJson.getString("subject_word")); }else { - kafukaJson.remove("project_type"); + kafukaJson.remove("project_type"); kafukaJson.remove("group_id"); kafukaJson.remove("project_name"); for (Map.Entry entry : kafukaJson.entrySet()) { @@ -473,18 +472,18 @@ public class ProjectController { } } } - } - try { - String kafukaResponse = MyHttpRequestUtil.doPostKafka("ikHotWords", message, kafuka_url); - RestTemplate template = new RestTemplate(); - MultiValueMap paramMap = new LinkedMultiValueMap(); - paramMap.add("text", message); - String result = template.postForObject(insert_new_words_url, paramMap, String.class); - System.out.println("result========================="+result); - } catch (Exception e) { - // TODO: handle exception - } - + } + try { + String kafukaResponse = MyHttpRequestUtil.doPostKafka("ikHotWords", message, kafuka_url); + RestTemplate template = new RestTemplate(); + MultiValueMap paramMap = new LinkedMultiValueMap(); + paramMap.add("text", message); + String result = template.postForObject(insert_new_words_url, paramMap, String.class); + System.out.println("result========================="+result); + } catch (Exception e) { + // TODO: handle exception + } + return response; } else { response.put("code", 500); response.put("msg", "方案新增失败"); diff --git a/src/main/java/com/stonedt/intelligence/controller/UserController.java b/src/main/java/com/stonedt/intelligence/controller/UserController.java index 5f2a917..b6072d5 100644 --- a/src/main/java/com/stonedt/intelligence/controller/UserController.java +++ b/src/main/java/com/stonedt/intelligence/controller/UserController.java @@ -86,7 +86,9 @@ public class UserController { @RequestParam("newPassword") String newPassword, HttpSession session) { User user = (User) session.getAttribute("User"); if (MD5Util.getMD5(oldPassword).equals(user.getPassword())) { - boolean updateUserPwdById = userService.updateUserPwdById(user.getUser_id(), MD5Util.getMD5(newPassword)); + //开源版本暂时不支持修改密码 + //boolean updateUserPwdById = userService.updateUserPwdById(user.getUser_id(), MD5Util.getMD5(newPassword)); + boolean updateUserPwdById = true; if (updateUserPwdById) { return ResultUtil.build(200, "密码修改成功!"); } else { diff --git a/src/main/resources/mapper/ProjectMapper.xml b/src/main/resources/mapper/ProjectMapper.xml index c9dc68f..2aedbaf 100644 --- a/src/main/resources/mapper/ProjectMapper.xml +++ b/src/main/resources/mapper/ProjectMapper.xml @@ -95,7 +95,7 @@