update

陈浩
2 parents c6f9d2d4 e2719efc
Showing 4 changed files with 65 additions and 42 deletions
src/main/java/com/cnlive/shenhe/controller/CommentsController.java
src/main/java/com/cnlive/shenhe/serviceImpl/CommentsServiceImpl.java
src/main/java/com/cnlive/shenhe/utils/AuditPass.java
src/main/resources/application.properties
@@ -74,15 +74,17 @@ public class CommentsController {
         List<ShyComments> list = commentPage.getList();
         if (!list.isEmpty()) {
             for (ShyComments comment : list) {
-                String auditor = "白名单";
-                String auditor_id = comment.getAuditor_id();
-                if (CommonUtils.isNotEmpty(auditor_id)) {
-                    ShyUsers user = new ShyUsers();
-                    user.setUser_id(auditor_id);
-                    user = usersService.select(user);
-                    if (CommonUtils.isNotNull(user)) auditor = user.getUsername() + user.getEmail();
+                if(comment.getState()!=CommonConst.AUDIT_INTT){
+                    String auditor = "白名单";
+                    String auditor_id = comment.getAuditor_id();
+                    if (CommonUtils.isNotEmpty(auditor_id)) {
+                        ShyUsers user = new ShyUsers();
+                        user.setUser_id(auditor_id);
+                        user = usersService.select(user);
+                        if (CommonUtils.isNotNull(user)) auditor = user.getUsername() + user.getEmail();
+                    }
+                    comment.setAuditor(auditor);
                 }
-                comment.setAuditor(auditor);
             }
         }
         model.addAttribute("commentPage", commentPage);
@@ -8,6 +8,7 @@ import com.cnlive.shenhe.mapper.ShyCommentsMapper;
 import com.cnlive.shenhe.mapper.ShySitesMapper;
 import com.cnlive.shenhe.mapper.ShyUsersMapper;
 import com.cnlive.shenhe.utils.AuditPass;
+import com.cnlive.shenhe.utils.CommonConst;
 import com.cnlive.shenhe.utils.CommonUtils;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -99,15 +100,17 @@ public class CommentsServiceImpl {
     public ShyComments getDetailsComment(Integer id) {
         ShyComments comment = shyCommentsMapper.selectByPrimaryKey(id);
-        String auditorName = "白名单";
-        String auditor_id = comment.getAuditor_id();
-        if (CommonUtils.isNotEmpty(auditor_id)) {
-            ShyUsers user = new ShyUsers();
-            user.setUser_id(auditor_id);
-            user = shyUsersMapper.selectOne(user);
-            auditorName = user.getUsername() + user.getEmail();
+        if (comment.getState() != CommonConst.AUDIT_INTT) {
+            String auditorName = "白名单";
+            String auditor_id = comment.getAuditor_id();
+            if (CommonUtils.isNotEmpty(auditor_id)) {
+                ShyUsers user = new ShyUsers();
+                user.setUser_id(auditor_id);
+                user = shyUsersMapper.selectOne(user);
+                auditorName = user.getUsername() + user.getEmail();
+            }
+            comment.setAuditor(auditorName);
         }
-        comment.setAuditor(auditorName);
         return comment;
     }
@@ -123,24 +126,31 @@ public class CommentsServiceImpl {
             json.put("msg", "");
             JSONObject result = new JSONObject();
             try {
-                result = Pass.commentPass(json,comment.getCallback());
+                result = Pass.commentPass(json, comment.getCallback());
             } catch (Exception e) {
                 logger.error("评论回调失败，activity_id:{}", comment.getActivity_id());
                 success = false;
                 break;
             }
-            Integer code = result.getInteger("errorCode");
-            if (code != 0) {
-                logger.error("评论回调错误，activity_id:{}，errorCode:{},errorMessage:{}", comment.getActivity_id(), code, result.getString("errorMessage"));
+            if (result == null) {
+                logger.error("评论回调错误，且无返回信息。activity_id:{}", comment.getActivity_id());
                 success = false;
                 break;
+            } else {
+                Integer code = result.getInteger("errorCode");
+                if (code != 0) {
+                    logger.error("评论回调错误，activity_id:{}，errorCode:{},errorMessage:{}", comment.getActivity_id(), code, result.getString("errorMessage"));
+                    success = false;
+                    break;
+                }
+                comment.setState(state);
+                comment.setAuditor_id(userId);
+                int i = shyCommentsMapper.updateByPrimaryKeySelective(comment);
+                if (i != 1) {
+                    success = false;
+                }
             }
-            comment.setState(state);
-            comment.setAuditor_id(userId);
-            int i = shyCommentsMapper.updateByPrimaryKeySelective(comment);
-            if (i != 1) {
-                success = false;
-            }
+
         }
         return success;
     }
@@ -6,6 +6,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
+import java.io.UnsupportedEncodingException;
+import java.security.NoSuchAlgorithmException;
 import java.util.HashMap;
 import java.util.Map;
@@ -18,36 +20,46 @@ import java.util.Map;
 public class AuditPass {
     private static Logger logger = LoggerFactory.getLogger(AuditPass.class);
     @Value("${platformKey}")
-    private  String platformKey;//点播platformKey
+    private String platformKey;//点播platformKey
     @Value("${platformValue}")
-    private  String platformValue;//点播platformValue
-    @Value("${token}")
-    private String token;
+    private String platformValue;//点播platformValue
+
     /**
      * 点播视频回调
+     *
      * @param video_id
      * @param state
      * @param attr_tags
      * @param msg
      * @return
      */
-    public  JSONObject auditPass(String video_id,int state,String attr_tags,String msg,String callBack){
-        logger.info("点播回调：video_id:{},state:{},attr_tags:{},msg:{}",video_id,state,attr_tags,msg);
+    public JSONObject auditPass(String video_id, int state, String attr_tags, String msg, String callBack) {
+        logger.info("点播回调：video_id:{},state:{},attr_tags:{},msg:{}", video_id, state, attr_tags, msg);
         JSONObject params = new JSONObject();
-        params.put("video_id",video_id);
-        params.put("state",state+"");
-        params.put("attr_tags",attr_tags);
-        params.put("msg",msg);
+        params.put("video_id", video_id);
+        params.put("state", state + "");
+        params.put("attr_tags", attr_tags);
+        params.put("msg", msg);
         HttpUtil httpUtil = HttpUtil.init();
-        httpUtil.setParam("param",params.toJSONString());
-        String URL =callBack+"?platform="+platformKey+"&token="+token;
+        httpUtil.setParam("param", params.toJSONString());
+        String token = "";
+        try {
+            String cb = callBack.replace("//", "");
+            cb = cb.substring(cb.indexOf("/"));
+            token = CommonUtils.md5(cb + platformKey + platformValue);
+        } catch (NoSuchAlgorithmException e) {
+            e.printStackTrace();
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        String URL = callBack + "?platform=" + platformKey + "&token=" + token;
         Map<String, String> post = httpUtil.post(URL);
-        return  JSONObject.parseObject(post.get("result"));
+        return JSONObject.parseObject(post.get("result"));
     }
-    public JSONObject commentPass(JSONObject json,String callBack){
+    public JSONObject commentPass(JSONObject json, String callBack) {
         Map<String, String> map = new HashMap<>();
-        map.put("param",json.toJSONString());
+        map.put("param", json.toJSONString());
         String result = HttpUtil.form(callBack, map);
         return JSONObject.parseObject(result);
     }
@@ -27,7 +27,6 @@ sync_users_app_key=314a9dd4-a9b7-4c12-bbbe-1150a36491ae
 url=http://mam.innerapi.cnlive.com/v1/inner/ShenHeInfo/shenheNotify
 platformKey =AUDIT
 platformValue=10011438
-token=2718c88930175686e40398994cead75c
 #ÆÀÂÛ»Øµ÷µØÖ·
 commenturl=http://comment.cnlive.com/services/commentForHd/auditCallBack
 \ No newline at end of file