diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java index e45be89..5ae5385 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java @@ -84,29 +84,11 @@ } /** - * 获取微信手机号 + * 获取用户手机号 */ - @RequestMapping("/phone") + @RequestMapping("/getUserPhoneNumber") @ResponseBody - public Object authPhone(String encryptedData, String session_key, String iv) { - try { - //String decrypt = AESUtils.decrypt(encryptedData, session_key, iv, "UTF-8"); - //System.out.println(decrypt); - // String result = WXUserUtils.wxDecrypt(encryptedData, session_key, iv); - String result = ""; - JSONObject json = JSONObject.parseObject(result); - if (json.containsKey("phoneNumber")) { - String phone = json.getString("phoneNumber"); - if (StringUtils.isNoneBlank(phone)) { - return ResponseData.success(json); - } else { - return ResponseData.error(Status.FAILED_PHONE); - } - } else { - return ResponseData.error(Status.FAIL); - } - } catch (Exception e) { - return ResponseData.error(Status.FAIL); - } + public Object getUserPhoneNumber(@RequestBody ParamsDto dto,HttpServletRequest request) { + return userActionService.getUserPhoneNumber(dto,request); } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java index e45be89..5ae5385 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java @@ -84,29 +84,11 @@ } /** - * 获取微信手机号 + * 获取用户手机号 */ - @RequestMapping("/phone") + @RequestMapping("/getUserPhoneNumber") @ResponseBody - public Object authPhone(String encryptedData, String session_key, String iv) { - try { - //String decrypt = AESUtils.decrypt(encryptedData, session_key, iv, "UTF-8"); - //System.out.println(decrypt); - // String result = WXUserUtils.wxDecrypt(encryptedData, session_key, iv); - String result = ""; - JSONObject json = JSONObject.parseObject(result); - if (json.containsKey("phoneNumber")) { - String phone = json.getString("phoneNumber"); - if (StringUtils.isNoneBlank(phone)) { - return ResponseData.success(json); - } else { - return ResponseData.error(Status.FAILED_PHONE); - } - } else { - return ResponseData.error(Status.FAIL); - } - } catch (Exception e) { - return ResponseData.error(Status.FAIL); - } + public Object getUserPhoneNumber(@RequestBody ParamsDto dto,HttpServletRequest request) { + return userActionService.getUserPhoneNumber(dto,request); } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java index 1a5f7b1..78747cd 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java @@ -80,21 +80,21 @@ } @RequestMapping("/sendSubscribeMessage") - public Object sendSubscribeMessage() { + public Object sendSubscribeMessage(String toUser) { String token = userActionService.getToken(); System.out.println(token); - String param = testJson(); + String param = testJson(toUser); JSONObject result = WXUserUtils.sendSubscribeMessage(param,token); return result; } @RequestMapping("/testJson") - public String testJson() { + public String testJson(String toUser) { HashMap map = new HashMap<>(); - map.put("toUser","oqiuy5PMAVo-1IDcwBu5c0F3H0JE"); - map.put("templateId","CKObrc7Z2Qc19ckYb1YeYW5PCYjPoqHdyHZqpRAJLoM"); + map.put("touser",toUser); + map.put("template_id",MessageDict.APPLICANT_MESSAGE_TEMPLATE_ID); HashMap dataMap = new HashMap<>(); String [] arr = {"11","22","33","44","55"}; - String [] mbarr = MessageDict.ADMINISTRATOR_MESSAGE_TEMPLATE_DATA; + String [] mbarr = MessageDict.APPLICANT_MESSAGE_TEMPLATE_DATA; for (int i = 0; i< mbarr.length; i++) { HashMap valueMap = new HashMap<>(); valueMap.put("value",arr[i]); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java index e45be89..5ae5385 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java @@ -84,29 +84,11 @@ } /** - * 获取微信手机号 + * 获取用户手机号 */ - @RequestMapping("/phone") + @RequestMapping("/getUserPhoneNumber") @ResponseBody - public Object authPhone(String encryptedData, String session_key, String iv) { - try { - //String decrypt = AESUtils.decrypt(encryptedData, session_key, iv, "UTF-8"); - //System.out.println(decrypt); - // String result = WXUserUtils.wxDecrypt(encryptedData, session_key, iv); - String result = ""; - JSONObject json = JSONObject.parseObject(result); - if (json.containsKey("phoneNumber")) { - String phone = json.getString("phoneNumber"); - if (StringUtils.isNoneBlank(phone)) { - return ResponseData.success(json); - } else { - return ResponseData.error(Status.FAILED_PHONE); - } - } else { - return ResponseData.error(Status.FAIL); - } - } catch (Exception e) { - return ResponseData.error(Status.FAIL); - } + public Object getUserPhoneNumber(@RequestBody ParamsDto dto,HttpServletRequest request) { + return userActionService.getUserPhoneNumber(dto,request); } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java index 1a5f7b1..78747cd 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java @@ -80,21 +80,21 @@ } @RequestMapping("/sendSubscribeMessage") - public Object sendSubscribeMessage() { + public Object sendSubscribeMessage(String toUser) { String token = userActionService.getToken(); System.out.println(token); - String param = testJson(); + String param = testJson(toUser); JSONObject result = WXUserUtils.sendSubscribeMessage(param,token); return result; } @RequestMapping("/testJson") - public String testJson() { + public String testJson(String toUser) { HashMap map = new HashMap<>(); - map.put("toUser","oqiuy5PMAVo-1IDcwBu5c0F3H0JE"); - map.put("templateId","CKObrc7Z2Qc19ckYb1YeYW5PCYjPoqHdyHZqpRAJLoM"); + map.put("touser",toUser); + map.put("template_id",MessageDict.APPLICANT_MESSAGE_TEMPLATE_ID); HashMap dataMap = new HashMap<>(); String [] arr = {"11","22","33","44","55"}; - String [] mbarr = MessageDict.ADMINISTRATOR_MESSAGE_TEMPLATE_DATA; + String [] mbarr = MessageDict.APPLICANT_MESSAGE_TEMPLATE_DATA; for (int i = 0; i< mbarr.length; i++) { HashMap valueMap = new HashMap<>(); valueMap.put("value",arr[i]); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/MessageDict.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/MessageDict.java index f2c5f51..64d10a4 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/MessageDict.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/MessageDict.java @@ -6,8 +6,8 @@ String[] ADMINISTRATOR_MESSAGE_TEMPLATE_DATA = {"time1","thing2","thing3","thing4","thing5"}; - String APPLICANT_MESSAGE_TEMPLATE_ID = ""; + String APPLICANT_MESSAGE_TEMPLATE_ID = "34re6IUbmEjUvOFmFcwMZeM4hB_6F-BuKdoezTCx8JM"; - String[] APPLICANT_MESSAGE_TEMPLATE_DATA = {"time1","thing2","thing3","thing4","thing5"}; + String[] APPLICANT_MESSAGE_TEMPLATE_DATA = {"phrase1","thing2","thing3","thing4","thing5"}; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java index e45be89..5ae5385 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java @@ -84,29 +84,11 @@ } /** - * 获取微信手机号 + * 获取用户手机号 */ - @RequestMapping("/phone") + @RequestMapping("/getUserPhoneNumber") @ResponseBody - public Object authPhone(String encryptedData, String session_key, String iv) { - try { - //String decrypt = AESUtils.decrypt(encryptedData, session_key, iv, "UTF-8"); - //System.out.println(decrypt); - // String result = WXUserUtils.wxDecrypt(encryptedData, session_key, iv); - String result = ""; - JSONObject json = JSONObject.parseObject(result); - if (json.containsKey("phoneNumber")) { - String phone = json.getString("phoneNumber"); - if (StringUtils.isNoneBlank(phone)) { - return ResponseData.success(json); - } else { - return ResponseData.error(Status.FAILED_PHONE); - } - } else { - return ResponseData.error(Status.FAIL); - } - } catch (Exception e) { - return ResponseData.error(Status.FAIL); - } + public Object getUserPhoneNumber(@RequestBody ParamsDto dto,HttpServletRequest request) { + return userActionService.getUserPhoneNumber(dto,request); } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java index 1a5f7b1..78747cd 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java @@ -80,21 +80,21 @@ } @RequestMapping("/sendSubscribeMessage") - public Object sendSubscribeMessage() { + public Object sendSubscribeMessage(String toUser) { String token = userActionService.getToken(); System.out.println(token); - String param = testJson(); + String param = testJson(toUser); JSONObject result = WXUserUtils.sendSubscribeMessage(param,token); return result; } @RequestMapping("/testJson") - public String testJson() { + public String testJson(String toUser) { HashMap map = new HashMap<>(); - map.put("toUser","oqiuy5PMAVo-1IDcwBu5c0F3H0JE"); - map.put("templateId","CKObrc7Z2Qc19ckYb1YeYW5PCYjPoqHdyHZqpRAJLoM"); + map.put("touser",toUser); + map.put("template_id",MessageDict.APPLICANT_MESSAGE_TEMPLATE_ID); HashMap dataMap = new HashMap<>(); String [] arr = {"11","22","33","44","55"}; - String [] mbarr = MessageDict.ADMINISTRATOR_MESSAGE_TEMPLATE_DATA; + String [] mbarr = MessageDict.APPLICANT_MESSAGE_TEMPLATE_DATA; for (int i = 0; i< mbarr.length; i++) { HashMap valueMap = new HashMap<>(); valueMap.put("value",arr[i]); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/MessageDict.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/MessageDict.java index f2c5f51..64d10a4 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/MessageDict.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/MessageDict.java @@ -6,8 +6,8 @@ String[] ADMINISTRATOR_MESSAGE_TEMPLATE_DATA = {"time1","thing2","thing3","thing4","thing5"}; - String APPLICANT_MESSAGE_TEMPLATE_ID = ""; + String APPLICANT_MESSAGE_TEMPLATE_ID = "34re6IUbmEjUvOFmFcwMZeM4hB_6F-BuKdoezTCx8JM"; - String[] APPLICANT_MESSAGE_TEMPLATE_DATA = {"time1","thing2","thing3","thing4","thing5"}; + String[] APPLICANT_MESSAGE_TEMPLATE_DATA = {"phrase1","thing2","thing3","thing4","thing5"}; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/UserActionService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/UserActionService.java index eb8d9e9..52b3cbb 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/UserActionService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/UserActionService.java @@ -27,4 +27,6 @@ String getToken(); JSONObject getLoginStatus(HttpServletRequest request); + + Object getUserPhoneNumber(ParamsDto dto,HttpServletRequest request); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java index e45be89..5ae5385 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java @@ -84,29 +84,11 @@ } /** - * 获取微信手机号 + * 获取用户手机号 */ - @RequestMapping("/phone") + @RequestMapping("/getUserPhoneNumber") @ResponseBody - public Object authPhone(String encryptedData, String session_key, String iv) { - try { - //String decrypt = AESUtils.decrypt(encryptedData, session_key, iv, "UTF-8"); - //System.out.println(decrypt); - // String result = WXUserUtils.wxDecrypt(encryptedData, session_key, iv); - String result = ""; - JSONObject json = JSONObject.parseObject(result); - if (json.containsKey("phoneNumber")) { - String phone = json.getString("phoneNumber"); - if (StringUtils.isNoneBlank(phone)) { - return ResponseData.success(json); - } else { - return ResponseData.error(Status.FAILED_PHONE); - } - } else { - return ResponseData.error(Status.FAIL); - } - } catch (Exception e) { - return ResponseData.error(Status.FAIL); - } + public Object getUserPhoneNumber(@RequestBody ParamsDto dto,HttpServletRequest request) { + return userActionService.getUserPhoneNumber(dto,request); } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java index 1a5f7b1..78747cd 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java @@ -80,21 +80,21 @@ } @RequestMapping("/sendSubscribeMessage") - public Object sendSubscribeMessage() { + public Object sendSubscribeMessage(String toUser) { String token = userActionService.getToken(); System.out.println(token); - String param = testJson(); + String param = testJson(toUser); JSONObject result = WXUserUtils.sendSubscribeMessage(param,token); return result; } @RequestMapping("/testJson") - public String testJson() { + public String testJson(String toUser) { HashMap map = new HashMap<>(); - map.put("toUser","oqiuy5PMAVo-1IDcwBu5c0F3H0JE"); - map.put("templateId","CKObrc7Z2Qc19ckYb1YeYW5PCYjPoqHdyHZqpRAJLoM"); + map.put("touser",toUser); + map.put("template_id",MessageDict.APPLICANT_MESSAGE_TEMPLATE_ID); HashMap dataMap = new HashMap<>(); String [] arr = {"11","22","33","44","55"}; - String [] mbarr = MessageDict.ADMINISTRATOR_MESSAGE_TEMPLATE_DATA; + String [] mbarr = MessageDict.APPLICANT_MESSAGE_TEMPLATE_DATA; for (int i = 0; i< mbarr.length; i++) { HashMap valueMap = new HashMap<>(); valueMap.put("value",arr[i]); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/MessageDict.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/MessageDict.java index f2c5f51..64d10a4 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/MessageDict.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/MessageDict.java @@ -6,8 +6,8 @@ String[] ADMINISTRATOR_MESSAGE_TEMPLATE_DATA = {"time1","thing2","thing3","thing4","thing5"}; - String APPLICANT_MESSAGE_TEMPLATE_ID = ""; + String APPLICANT_MESSAGE_TEMPLATE_ID = "34re6IUbmEjUvOFmFcwMZeM4hB_6F-BuKdoezTCx8JM"; - String[] APPLICANT_MESSAGE_TEMPLATE_DATA = {"time1","thing2","thing3","thing4","thing5"}; + String[] APPLICANT_MESSAGE_TEMPLATE_DATA = {"phrase1","thing2","thing3","thing4","thing5"}; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/UserActionService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/UserActionService.java index eb8d9e9..52b3cbb 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/UserActionService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/UserActionService.java @@ -27,4 +27,6 @@ String getToken(); JSONObject getLoginStatus(HttpServletRequest request); + + Object getUserPhoneNumber(ParamsDto dto,HttpServletRequest request); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/UserActionServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/UserActionServiceImpl.java index 01d099c..84adce0 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/UserActionServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/UserActionServiceImpl.java @@ -67,8 +67,7 @@ return ResponseData.error(2401,Status.TOKEN_EXPIRES); } UserDto userDto = new UserDto(); - //String phone = WXUserUtils.getPhone(dto.getPhoneCode(),getToken()); - String phone = dto.getPhoneCode(); + String phone = WXUserUtils.getPhone(dto.getPhoneCode(),getToken()); if(phone.equals("GetFailed")){ return ResponseData.error(Status.PHONE_GET_FAILED); } @@ -94,8 +93,7 @@ public Object userRegister(UserDto userDto) { try { SimpleDateFormat sim = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - //String phone = WXUserUtils.getPhone(userDto.getPhone(),getToken()); - String phone = userDto.getPhone(); + String phone = WXUserUtils.getPhone(userDto.getPhone(),getToken()); if(phone.equals("GetFailed")){ return ResponseData.error(Status.PHONE_GET_FAILED); } @@ -181,6 +179,20 @@ } @Override + public Object getUserPhoneNumber(ParamsDto dto,HttpServletRequest request) { + JSONObject jsonObject = getLoginStatus(request); + if(null == jsonObject){ + return ResponseData.error(2401,Status.TOKEN_EXPIRES); + } + String phone = WXUserUtils.getPhone(dto.getPhoneCode(),getToken()); + if(phone.equals("GetFailed")){ + return ResponseData.error(Status.PHONE_GET_FAILED); + }else{ + return ResponseData.success(phone); + } + } + + @Override public Object getUserType() { try { List list = userActionDao.getList("");