From a966de9e4a8ac805e8eab2a4fada49fb48ec14d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=B4=AA=E9=BE=99?= <599179587@qq.com>
Date: Thu, 13 Jul 2017 18:04:13 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=B4=E6=92=AD=E9=97=B4=E5=8A=9F=E8=83=BD?=
=?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
=?UTF-8?q?=E4=B8=80=E4=B8=AA=E8=8E=B7=E5=8F=96=E8=AF=84=E8=AE=BA=E5=88=97?=
=?UTF-8?q?=E8=A1=A8=EF=BC=8C=E5=8F=91=E9=80=81=E6=89=8B=E6=9C=BA=E7=9F=AD?=
=?UTF-8?q?=E4=BF=A1=E5=8A=9F=E8=83=BD=E5=AE=8C=E6=88=90=EF=BC=8C=E6=89=8B?=
=?UTF-8?q?=E6=9C=BA=E6=B3=A8=E5=86=8C=E5=8A=9F=E8=83=BD=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pom.xml | 7 +
src/main/java/com/ifish/API/Mail.java | 2 +-
src/main/java/com/ifish/API/SendMobile.java | 68 +++++++
.../java/com/ifish/controller/LiveRoom.java | 15 ++
src/main/java/com/ifish/controller/Login.java | 22 +++
.../java/com/ifish/enums/SendTypeEnum.java | 42 ++++
.../java/com/ifish/enums/SmsSignEnum.java | 43 +++++
.../java/com/ifish/enums/SmsTemplateEnum.java | 45 +++++
.../java/com/ifish/helper/LiveRoomHelper.java | 34 +++-
.../com/ifish/helper/LiveRoomHelperI.java | 8 +
.../java/com/ifish/helper/RedisKeyHelper.java | 33 ++++
.../com/ifish/helper/RedisKeyHelperI.java | 24 +++
.../java/com/ifish/helper/UserHelper.java | 182 ++++++++++++++++++
.../java/com/ifish/helper/UserHelperI.java | 25 +++
.../ifish/mapper/Tbl_Live_Room_Mapper.java | 17 +-
src/main/java/com/ifish/util/RedisKey.java | 14 ++
...o-sdk-java-auto_1444640346387-20151013.jar | Bin 0 -> 543502 bytes
17 files changed, 578 insertions(+), 3 deletions(-)
create mode 100644 src/main/java/com/ifish/API/SendMobile.java
create mode 100644 src/main/java/com/ifish/enums/SendTypeEnum.java
create mode 100644 src/main/java/com/ifish/enums/SmsSignEnum.java
create mode 100644 src/main/java/com/ifish/enums/SmsTemplateEnum.java
create mode 100644 src/main/webapp/WEB-INF/lib/taobao-sdk-java-auto_1444640346387-20151013.jar
diff --git a/pom.xml b/pom.xml
index 68dc3a4..35fb1e0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,6 +22,13 @@
system
${basedir}/src/main/webapp/WEB-INF/lib/fastdfs-client-java-1.25.jar
+
+ com
+ taobao-sdk
+ 1.0
+ system
+ ${basedir}/src/main/webapp/WEB-INF/lib/taobao-sdk-java-auto_1444640346387-20151013.jar
+
cn.jpush.api
jpush-client
diff --git a/src/main/java/com/ifish/API/Mail.java b/src/main/java/com/ifish/API/Mail.java
index c3c3f6b..37aafd0 100644
--- a/src/main/java/com/ifish/API/Mail.java
+++ b/src/main/java/com/ifish/API/Mail.java
@@ -69,7 +69,7 @@ public class Mail {
* 创建MIME邮件对象
*
* @return
- */
+ */
public boolean createMimeMessage() {
try {
session = Session.getDefaultInstance(props, null); //获得邮件会话对象
diff --git a/src/main/java/com/ifish/API/SendMobile.java b/src/main/java/com/ifish/API/SendMobile.java
new file mode 100644
index 0000000..cc28081
--- /dev/null
+++ b/src/main/java/com/ifish/API/SendMobile.java
@@ -0,0 +1,68 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.ifish.API;
+
+import com.taobao.api.ApiException;
+import com.taobao.api.DefaultTaobaoClient;
+import com.taobao.api.TaobaoClient;
+import com.taobao.api.request.AlibabaAliqinFcSmsNumSendRequest;
+import com.taobao.api.response.AlibabaAliqinFcSmsNumSendResponse;
+import org.springframework.stereotype.Component;
+
+/**
+ *
+ * @author Administrator
+ */
+@Component
+public class SendMobile {
+
+ //公共回传参数
+ private String extend = "";
+ //短信类型
+ private String sms_type = "normal";
+ //签名模板,在阿里大鱼"管理中心-短信签名管理中"中的可用签名
+ //private String sms_free_sign_name="注册验证";
+ //短信模板变量
+ private String sms_param = "爱鱼奇";
+ //短信模板ID,在阿里大鱼"管理中心-短信签名管理中"中的可用模板
+ //private String sms_template_code;
+ //URL
+ private String url = "http://gw.api.taobao.com/router/rest";
+ //在开发平台-应用管理-概览-App Key
+ private String appkey = "23252927";
+ //在开发平台-应用管理-概览-App Secret
+ private String secret = "c904889cc31bf6ba04707d7e1039ed1e";
+
+ /*当API的访问级别为‘公开’时，SessionKey不需要填写；
+ 当API的访问级别为‘须用户登录’时，SessionKey必须填写；
+ 当API的访问级别为‘隐私数据须用户登录’时，SessionKey可填可不填；
+ 如何获取SessionKey，请搜索‘用户授权介绍’或点击上面的‘Session获取工具*/
+ //private String sessionKey;
+ /**
+ * 发送短信
+ *
+ * @param rec_num 手机号
+ * @param code 验证码
+ * @return
+ */
+ public boolean sendSmsNum(String rec_num, String code, String sign_name, String template_code) {
+ TaobaoClient client = new DefaultTaobaoClient(url, appkey, secret);
+ AlibabaAliqinFcSmsNumSendRequest req = new AlibabaAliqinFcSmsNumSendRequest();
+ req.setExtend(extend);
+ req.setSmsType(sms_type);
+ req.setSmsFreeSignName(sign_name);
+ req.setSmsParam("{\"code\":\"" + code + "\",\"product\":" + sms_param + "}");
+ req.setRecNum(rec_num);
+ req.setSmsTemplateCode(template_code);
+ try {
+ AlibabaAliqinFcSmsNumSendResponse rsp = client.execute(req);
+ return rsp.getResult().getSuccess();
+ } catch (ApiException e) {
+ e.getStackTrace();
+ }
+ return false;
+ }
+}
diff --git a/src/main/java/com/ifish/controller/LiveRoom.java b/src/main/java/com/ifish/controller/LiveRoom.java
index 7165013..877afd3 100644
--- a/src/main/java/com/ifish/controller/LiveRoom.java
+++ b/src/main/java/com/ifish/controller/LiveRoom.java
@@ -74,6 +74,21 @@ public class LiveRoom {
return IfishUtil.returnJson(ResultEnum.fail101.getKey(), "");
}
+ /**
+ * 根据直播间ID获取直播间评论列表
+ *
+ * @param roomId
+ * @return
+ */
+ @RequestMapping(value = "/liveRoom/v3/getleaveMessage.do", method = RequestMethod.GET)
+ public Object getleaveMessage(Integer roomId, Integer firstResult, Integer pageSize) {
+ try {
+ return liveRoomHelperI.getLeaveMessage(firstResult, pageSize, roomId);
+ } catch (Exception e) {
+ }
+ return IfishUtil.returnJson(ResultEnum.fail101.getKey(), "");
+ }
+
/**
* 获取直播间信息
*
diff --git a/src/main/java/com/ifish/controller/Login.java b/src/main/java/com/ifish/controller/Login.java
index 37ad256..7a820b4 100644
--- a/src/main/java/com/ifish/controller/Login.java
+++ b/src/main/java/com/ifish/controller/Login.java
@@ -6,11 +6,14 @@
package com.ifish.controller;
import com.ifish.bean.Tbl_User;
+import com.ifish.enums.ResultEnum;
import com.ifish.helper.UserHelperI;
+import com.ifish.util.IfishUtil;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
/**
*
@@ -33,6 +36,25 @@ public class Login {
return userHelperI.login(user);
}
+ @RequestMapping("/getSecurityCode.do")
+ public Object getSecurityCode(String sendType, String phoneNumber) {
+ try {
+ return userHelperI.getSecurityCode(sendType, phoneNumber);
+ } catch (Exception e) {
+ }
+ return IfishUtil.returnJson(ResultEnum.fail101.getKey(), "");
+ }
+
+ @RequestMapping(value = "/registerByMobile", method = RequestMethod.GET)
+ public Object registerByMobile(Tbl_User user) {
+ return userHelperI.registerByMobile(user);
+ }
+
+ @RequestMapping(value = "/registerByEmail", method = RequestMethod.GET)
+ public Object registerByEmail(Tbl_User user) {
+ return userHelperI.registerByEmail(user);
+ }
+
/**
* 游客注册
*
diff --git a/src/main/java/com/ifish/enums/SendTypeEnum.java b/src/main/java/com/ifish/enums/SendTypeEnum.java
new file mode 100644
index 0000000..a8d3b8f
--- /dev/null
+++ b/src/main/java/com/ifish/enums/SendTypeEnum.java
@@ -0,0 +1,42 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.ifish.enums;
+
+/**
+ * 获取验证码操作类型
+ *
+ * @author ggw
+ *
+ */
+public enum SendTypeEnum {
+ register("1", "注册操作"),
+ findpwd("2", "找回密码操作");
+
+ private SendTypeEnum(String key, String value) {
+ this.key = key;
+ this.value = value;
+ }
+
+ private String key;
+ private String value;
+
+ public String getKey() {
+ return key;
+ }
+
+ public void setKey(String key) {
+ this.key = key;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+}
diff --git a/src/main/java/com/ifish/enums/SmsSignEnum.java b/src/main/java/com/ifish/enums/SmsSignEnum.java
new file mode 100644
index 0000000..01018ca
--- /dev/null
+++ b/src/main/java/com/ifish/enums/SmsSignEnum.java
@@ -0,0 +1,43 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.ifish.enums;
+
+/**
+ *
+ * @author Administrator
+ */
+public enum SmsSignEnum {
+ sign1("sign1", "活动验证"),
+ sign2("sign2", "变更验证"),
+ sign3("sign3", "登录验证"),
+ sign4("sign4", "注册验证"),
+ sign5("sign5", "身份验证");
+
+ private SmsSignEnum(String key, String value) {
+ this.key = key;
+ this.value = value;
+ }
+
+ private String key;
+ private String value;
+
+ public String getKey() {
+ return key;
+ }
+
+ public void setKey(String key) {
+ this.key = key;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+}
diff --git a/src/main/java/com/ifish/enums/SmsTemplateEnum.java b/src/main/java/com/ifish/enums/SmsTemplateEnum.java
new file mode 100644
index 0000000..2006e37
--- /dev/null
+++ b/src/main/java/com/ifish/enums/SmsTemplateEnum.java
@@ -0,0 +1,45 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.ifish.enums;
+
+/**
+ *
+ * @author Administrator
+ */
+public enum SmsTemplateEnum {
+ SMS_720021("SMS_720021", "身份验证验证码"),
+ SMS_720020("SMS_720020", "登陆确认验证码"),
+ SMS_720019("SMS_720019", "登陆异常验证码"),
+ SMS_720018("SMS_720018", "用户注册验证码"),
+ SMS_720017("SMS_720017", "活动确认验证码"),
+ SMS_720016("SMS_720016", "修改密码验证码"),
+ SMS_720015("SMS_720015", "信息变更验证码");
+
+ private SmsTemplateEnum(String key, String value) {
+ this.key = key;
+ this.value = value;
+ }
+
+ private String key;
+ private String value;
+
+ public String getKey() {
+ return key;
+ }
+
+ public void setKey(String key) {
+ this.key = key;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+}
diff --git a/src/main/java/com/ifish/helper/LiveRoomHelper.java b/src/main/java/com/ifish/helper/LiveRoomHelper.java
index 684ebe5..5f6d23e 100644
--- a/src/main/java/com/ifish/helper/LiveRoomHelper.java
+++ b/src/main/java/com/ifish/helper/LiveRoomHelper.java
@@ -288,6 +288,38 @@ public class LiveRoomHelper implements LiveRoomHelperI {
}
}
+ /**
+ * 根据直播间ID获取直播间评论列表
+ *
+ * @param roomId
+ * @return
+ */
+ @Override
+ public Object getLeaveMessage(Integer firstResult, Integer pageSize, Integer roomId) {
+ try {
+ if (firstResult == null) {
+ firstResult = 0;
+ }
+ if (pageSize == null) {
+ pageSize = 10;
+ }
+ List