bug修复

danbai225 · danbai225 · commit becbe6d7013e · 2020-03-20T21:56:45.000+08:00
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/src/main/java/com/danbai/ys/entity/User.java b/src/main/java/com/danbai/ys/entity/User.java
@@ -139,4 +139,16 @@ public String getHeadurl() {
     public void setHeadurl(String headurl) {
         this.headurl = headurl;
     }
+
+    @Override
+    public String toString() {
+        return "User{" +
+                "id=" + id +
+                ", username='" + username + '\'' +
+                ", userType=" + userType +
+                ", password='" + password + '\'' +
+                ", email='" + email + '\'' +
+                ", headurl='" + headurl + '\'' +
+                '}';
+    }
 }
diff --git a/src/main/java/com/danbai/ys/mapper/UserMapper.java b/src/main/java/com/danbai/ys/mapper/UserMapper.java
@@ -7,6 +7,6 @@
 import org.springframework.stereotype.Repository;
 
 @Repository
-@CacheNamespace(implementation = RedisCache.class)
+
 public interface UserMapper extends MyMapper<User> {
 }
diff --git a/src/main/java/com/danbai/ys/utils/EmailUtil.java b/src/main/java/com/danbai/ys/utils/EmailUtil.java
@@ -21,7 +21,7 @@ public class EmailUtil {
     private static final String PROTOCOL = "smtp";
     private static final int PORT = 465;
     private static final String FROM = "dbys@p00q.cn";
-    private static final String PWD = "";
+    private static final String PWD = "DBYSdbys225";
 
     private static JavaMailSenderImpl javaMailSender;
 
diff --git a/src/main/java/com/danbai/ys/utils/Md5.java b/src/main/java/com/danbai/ys/utils/Md5.java
@@ -0,0 +1,66 @@
+/**
+ * @author DanBai
+ * @create 2020-03-20 20:53
+ * @desc md5
+ **/
+package com.danbai.ys.utils;
+
+import java.math.BigInteger;
+import java.security.MessageDigest;
+
+public class Md5 {
+    /**
+     * 对字符串md5加密
+     *
+     * @param str 传入要加密的字符串
+     * @return MD5加密后的字符串(小写+字母)
+     */
+    public static String getMD5LowerCase(String str) {
+        try {
+            // 生成一个MD5加密计算摘要
+            MessageDigest md = MessageDigest.getInstance("MD5");
+            // 计算md5函数
+            md.update(str.getBytes());
+            // digest()最后确定返回md5 hash值，返回值为8为字符串。因为md5 hash值是16位的hex值，实际上就是8位的字符
+            // BigInteger函数则将8位的字符串转换成16位hex值，用字符串来表示；得到字符串形式的hash值
+            return new BigInteger(1, md.digest()).toString(16);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    /**
+     * 对字符串md5加密
+     *
+     * @param str 传入要加密的字符串
+     * @return MD5加密后的字符串(大写+数字)
+     */
+
+    public static String getMD5UpperCase(String s) {
+        char hexDigits[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+                'A', 'B', 'C', 'D', 'E', 'F' };
+        try {
+            byte[] btInput = s.getBytes();
+            // 获得MD5摘要算法的 MessageDigest 对象
+            MessageDigest mdInst = MessageDigest.getInstance("MD5");
+            // 使用指定的字节更新摘要
+            mdInst.update(btInput);
+            // 获得密文
+            byte[] md = mdInst.digest();
+            // 把密文转换成十六进制的字符串形式
+            int j = md.length;
+            char str[] = new char[j * 2];
+            int k = 0;
+            for (int i = 0; i < j; i++) {
+                byte byte0 = md[i];
+                str[k++] = hexDigits[byte0 >>> 4 & 0xf];
+                str[k++] = hexDigits[byte0 & 0xf];
+            }
+            return new String(str);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+}
diff --git a/src/main/java/com/danbai/ys/websocket/CinemaSocketManagement.java b/src/main/java/com/danbai/ys/websocket/CinemaSocketManagement.java
@@ -9,6 +9,7 @@
 import com.alibaba.fastjson.JSONObject;
 import com.danbai.ys.async.CinemaSocketAsync;
 import com.danbai.ys.entity.CinemaRoom;
+import com.danbai.ys.utils.Md5;
 import com.danbai.ys.utils.SpringUtil;
 
 import io.agora.media.RtcTokenBuilder;
@@ -48,7 +49,7 @@ public static void joinRoom(String socketId, int roomId, String pass) {
             RtcTokenBuilder token = new RtcTokenBuilder();
             int timestamp = (int)(System.currentTimeMillis() / 1000 + 3600);
             String result = token.buildTokenWithUid(RtcTokenBuilderSample.appId, RtcTokenBuilderSample.appCertificate,
-                    cinemaRoom.getName()+cinemaRoom.getId(), Integer.parseInt(socketId,16), RtcTokenBuilder.Role.Role_Publisher, timestamp);
+                    Md5.getMD5LowerCase(cinemaRoom.getName()+cinemaRoom.getId()), Integer.parseInt(socketId,16), RtcTokenBuilder.Role.Role_Publisher, timestamp);
             jsonObject.put("token",result);
             jsonObject.put("id",roomId);
             jsonObject.put("name",cinemaRoom.getName());
diff --git a/src/main/java/io/agora/sample/RtcTokenBuilderSample.java b/src/main/java/io/agora/sample/RtcTokenBuilderSample.java
@@ -5,7 +5,7 @@
 
 public class RtcTokenBuilderSample {
     public static String appId = "02e8df44f24e4da5b2e17ef1d8b755bd";
-    public static String appCertificate = "";
+    public static String appCertificate = "c128d51ba98148d5bba2a65f82c83d35";
     static String channelName = "7d72365eb983485397e3e3f9d460bdda";
     static String userAccount = "2082341273";
     static int uid = 2082341273;
diff --git a/src/main/resources/templates/include/include.html b/src/main/resources/templates/include/include.html
@@ -59,7 +59,7 @@
                     <li><a href="/type/zy?page=1">综艺</a></li>
                     <li><a href="/type/dm?page=1">动漫</a></li>
                     <li><a href="http://dbys.vip/type/tv">直播</a></li>
-                    <li><a href="http://dbys.vip/yiqikan">一起看(需先登录)</a></li>
+                    <li><a href="https://dbys.vip/yiqikan">一起看(需先登录)</a></li>
                 </ul>
                 <div class="pull-right">
                     <ul class="nav navbar-nav" th:if="${session.user}==null">
diff --git a/src/main/resources/templates/yiqikan/index.html b/src/main/resources/templates/yiqikan/index.html
@@ -107,31 +107,15 @@ <h3 id="fangjianInfo"></h3>
      </div>
     </div>
     <div class="tab-pane fade" id="yuyin">
-     <form id="form" class="row col l12 s12">
-      <div class="row container col l12 s12">
-       <div class="col" style="min-width: 433px; max-width: 443px">
-        <div class="card" style="margin-top: 0px; margin-bottom: 0px;">
-         <div class="row card-content" style="margin-bottom: 0px;">
-          <div class="row" style="margin: 0">
-           <div class="col s12">
-            <button class="btn btn-raised btn-primary waves-effect waves-light" id="join">加入</button>
-            <button class="btn btn-raised btn-primary waves-effect waves-light" id="leave">断开</button>
-           </div>
-          </div>
-         </div>
-        </div>
-       </div>
-       <div class="col s7">
+     <button class="btn btn-raised btn-primary waves-effect waves-light" id="join">加入</button>
+   <button class="btn btn-raised btn-primary waves-effect waves-light" id="leave">断开</button>
         <div class="video-grid" id="video">
          <div class="video-view">
           <div id="local_stream" class="video-placeholder"></div>
           <div id="local_video_info" class="video-profile hide"></div>
           <div id="video_autoplay_local" class="autoplay-fallback hide"></div>
          </div>
-        </div>
-       </div>
-      </div>
-     </form>
+
     </div>
    </div>
   </div>
@@ -145,7 +129,7 @@ <h3 id="fangjianInfo"></h3>
 <script src="https://cdn.jsdelivr.net/npm/p2p-dplayer@latest"></script>
 <script src="https://cdn.p00q.cn/ys/js/AgoraRTCSDK-3.0.1.js"></script>
 <script src="https://cdn.p00q.cn/ys/js/materialize.min.js"></script>
-
+<script src="https://cdn.bootcss.com/blueimp-md5/2.12.0/js/md5.min.js"></script>
 <script th:inline="javascript">
  /*<![CDATA[*/
  var username = /*[[${session.user.username}]]*/ null;
@@ -274,7 +258,7 @@ <h3 id="fangjianInfo"></h3>
  $("#ysSouBt").click(function () {
   gjc = $("#ysSouInput").val();
   $.ajax({
-   url: 'https://dbys.vip/api/v1/ys/search/' + gjc,
+   url: '../api/v1/ys/search/' + gjc,
    type: 'get',
    dataType: 'json',
    success: function (data) {
@@ -291,7 +275,7 @@ <h3 id="fangjianInfo"></h3>
   $('#yss').hide();
   $('#jis').show();
   $.ajax({
-   url: 'https://dbys.vip/api/v1/ys/' + id,
+   url: '../api/v1/ys/' + id,
    type: 'get',
    dataType: 'json',
    success: function (data) {
@@ -353,7 +337,7 @@ <h3 id="fangjianInfo"></h3>
    $("#fangjian").show();
    ws.send(toJsonStr({ type: "roomInfo" }));
    options.uid=data.uid;
-   options.channel=data.name+data.id;
+   options.channel=md5(data.name+data.id);
    options.token=data.token;
   } else {
    Notiflix.Notify.Failure('加入失败');
@@ -471,6 +455,7 @@ <h3 id="fangjianInfo"></h3>
  var roomTimerId = setInterval(function () {
   if ($("#shouye").is(":hidden")) {
    ws.send(toJsonStr({ type: "roomInfo" }));
+
   }
  }, 5000);
 
@@ -488,16 +473,6 @@ <h3 id="fangjianInfo"></h3>
   return true;
  }
 
- function serializeformData() {
-  var formData = $("#form").serializeArray();
-  var obj = {}
-  for (var item of formData) {
-   var key = item.name;
-   var val = item.value;
-   obj[key] = val;
-  }
-  return obj;
- }
 
  function addView (id, show) {
   if (!$("#" + id)[0]) {
@@ -528,50 +503,6 @@ <h3 id="fangjianInfo"></h3>
   }
  }
 
- function getDevices (next) {
-  AgoraRTC.getDevices(function (items) {
-   items.filter(function (item) {
-    return ['audioinput', 'videoinput'].indexOf(item.kind) !== -1
-   })
-           .map(function (item) {
-            return {
-             name: item.label,
-             value: item.deviceId,
-             kind: item.kind,
-            }
-           });
-   var videos = [];
-   var audios = [];
-   for (var i = 0; i < items.length; i++) {
-    var item = items[i];
-    if ('videoinput' == item.kind) {
-     var name = item.label;
-     var value = item.deviceId;
-     if (!name) {
-      name = "camera-" + videos.length;
-     }
-     videos.push({
-      name: name,
-      value: value,
-      kind: item.kind
-     });
-    }
-    if ('audioinput' == item.kind) {
-     var name = item.label;
-     var value = item.deviceId;
-     if (!name) {
-      name = "microphone-" + audios.length;
-     }
-     audios.push({
-      name: name,
-      value: value,
-      kind: item.kind
-     });
-    }
-   }
-   next({videos: videos, audios: audios});
-  });
- }
 
  var rtc = {
   client: null,
@@ -750,7 +681,42 @@ <h3 id="fangjianInfo"></h3>
 
   rtc.published = true
  }
+ function leave (rtc) {
+  if (!rtc.client) {
 
+   return;
+  }
+  if (!rtc.joined) {
+   return;
+  }
+  /**
+   * Leaves an AgoraRTC Channel
+   * This method enables a user to leave a channel.
+   **/
+  rtc.client.leave(function () {
+   // stop stream
+   rtc.localStream.stop();
+   // close stream
+   rtc.localStream.close();
+   while (rtc.remoteStreams.length > 0) {
+    var stream = rtc.remoteStreams.shift();
+    var id = stream.getId();
+    stream.stop();
+    removeView(id);
+   }
+   rtc.localStream = null;
+   rtc.remoteStreams = [];
+   rtc.client = null;
+   console.log("client leaves channel success");
+   rtc.published = false;
+   rtc.joined = false;
+   Toast.notice("leave success");
+  }, function (err) {
+   console.log("channel leave failed");
+   Toast.error("leave success");
+   console.error(err);
+  })
+ }
  $(function () {
 
   $("#join").on("click", function (e) {
@@ -759,11 +725,11 @@ <h3 id="fangjianInfo"></h3>
    joinyuyin(rtc, options);
   })
 
-  $("#publish").on("click", function (e) {
-   console.log("publish")
+  $("#leave").on("click", function (e) {
+   console.log("leave")
    e.preventDefault();
-   publish(rtc);
-  });
+    leave(rtc);
+ })
  })
 </script>
 <style>

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,6 @@`
`7`	`7`	`import org.springframework.stereotype.Repository;`
`8`	`8`
`9`	`9`	`@Repository`
`10`		`-@CacheNamespace(implementation = RedisCache.class)`
	`10`	`+`
`11`	`11`	`public interface UserMapper extends MyMapper<User> {`
`12`	`12`	`}`