From 8d8b48a8b7d6d597f8c9b7ce1c4f06e54c579714 Mon Sep 17 00:00:00 2001 From: ranjunhao Date: Tue, 22 Feb 2022 18:25:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../intelligence/controller/ProjectController.java | 31 +++++++------ .../intelligence/controller/UserController.java | 4 +- src/main/resources/mapper/ProjectMapper.xml | 2 +- .../static/assets/images/users/stonedtQRCode.jpg | Bin 0 -> 70504 bytes src/main/resources/static/dist/css/custom.css | 6 +-- src/main/resources/templates/common/header.html | 48 +++++++++++++++++++-- .../templates/projectCenter/createProject.html | 10 ++++- .../templates/projectCenter/projectlist.html | 2 +- .../templates/projectCenter/projectlistDetail.html | 38 ++++++++-------- .../resources/templates/setting/preference.html | 2 +- testStudy.jar | 0 11 files changed, 95 insertions(+), 48 deletions(-) create mode 100644 src/main/resources/static/assets/images/users/stonedtQRCode.jpg delete mode 100644 testStudy.jar 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 @@