Merge branch 'master' of http://gitlab.tangguo.ren/2300064869/safe-campus-bbs

safe-campus-admin/src/main/resources/application-dev.yml

@@ -96,8 +96,8 @@ spring:
 # 企业微信配置
 wx:
     cp:
-        pc-redirect-url: https://test.tangguo.ren/bbs/pc/wechatlogin
-        mobile-redirect-url: https://test.tangguo.ren/bbsh5/pages/login/login
+        pc-redirect-url: https://test.tangguo.ren/wechatlogin
+        mobile-redirect-url: https://test.tangguo.ren/h5/pages/login/login
         corp-id: ww63ca87d5f8647514
         app-configs:
             - name: '移动端应用配置'

safe-campus-admin/src/main/resources/application-test.yml

@@ -95,8 +95,8 @@ spring:
 # 企业微信配置
 wx:
     cp:
-        pc-redirect-url: https://test.tangguo.ren/bbs/pc/wechatlogin
-        mobile-redirect-url: https://test.tangguo.ren/bbsh5/pages/login/login
+        pc-redirect-url: https://test.tangguo.ren/wechatlogin
+        mobile-redirect-url: https://test.tangguo.ren/h5/pages/login/login
         corp-id: ww63ca87d5f8647514
         app-configs:
             - name: '移动端应用配置'

safe-campus-bbs-uniapp/config/index.config.js

@@ -13,7 +13,7 @@ const CONFIG = {
 	production: {
 		debug: false,
 		platformName: '社区',
-		requestUrl: '/bbs/prod-api',
+		requestUrl: '/prod-api',
 		videoLimitSize: 10,
 		secret: '775d4e98-49d8-86d7-48c9-c93b5f7c0c16',
 		appId: 'jfsq',

safe-campus-moment/src/main/resources/mapper/BbsMomentCommentMapper.xml

@@ -114,17 +114,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             c.user_name,
             c.content,
             c.parent_id,
-            c.reply_nick_name,
             c.is_featured,
             c.is_top,
+            c2.nick_name AS reply_nick_name,
+            c2.content AS reply_content,
             v.option_code AS vote_option_code,
             IF(c.user_name = #{userName}, 1, 0) AS is_self
         FROM
             bbs_moment_comment c
+        LEFT JOIN
+            bbs_moment_comment c2 ON c2.id = c.parent_id
         INNER JOIN
             bbs_moment m ON m.id = c.moment_id
         LEFT JOIN
-	    	(SELECT * FROM bbs_moment_vote WHERE user_name = #{userName}) v ON v.moment_id = m.id
+            bbs_moment_vote v ON v.moment_id = m.id AND v.user_name = c.user_name
         WHERE
             m.id = #{momentId}
         AND