优化

platform-admin/src/main/resources/com/platform/dao/ComplainDao.xml

@@ -56,7 +56,7 @@
         on c.user_id=u.user_id
         left join tb_cf_user_info u1
         on c.complain_user_id=u1.user_id
-        left join post p
+        left join post_data p
         on c.post_id=p.id
 		where c.id = #{id}
 	</select>
@@ -132,7 +132,7 @@
         on c.user_id=u.user_id
         left join tb_cf_user_info u1
         on c.complain_user_id=u1.user_id
-        left join post p
+        left join post_data p
         on c.post_id=p.id
         WHERE 1=1
         <if test="status != null and status.trim() != ''">
@@ -258,4 +258,4 @@
         </foreach>
     </delete>
 
-</mapper>
\ No newline at end of file
+</mapper>

platform-admin/src/main/resources/dev/platform.properties

@@ -2,13 +2,13 @@
 #jdbc.username=root
 #jdbc.password=root
 
-#jdbc.url=jdbc:mysql://47.106.242.175:3306/chinafrica?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8
-#jdbc.username=root
-#jdbc.password=diaoyun666
+jdbc.url=jdbc:mysql://47.106.242.175:3306/chinafrica?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8
+jdbc.username=root
+jdbc.password=diaoyun666
 
-jdbc.url: jdbc:mysql://159.138.48.71:3306/chinafrica?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false
-jdbc.username: root
-jdbc.password: Diaoyunnuli.8
+#jdbc.url: jdbc:mysql://159.138.48.71:3306/chinafrica?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false
+#jdbc.username: root
+#jdbc.password: Diaoyunnuli.8
 
 jdbc.initialSize=5
 jdbc.maxActive=30

platform-admin/src/main/resources/prod/platform.properties

@@ -2,13 +2,13 @@
 #jdbc.username=root
 #jdbc.password=root
 
-#jdbc.url=jdbc:mysql://47.106.242.175:3306/chinafrica?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8
-#jdbc.username=root
-#jdbc.password=diaoyun666
+jdbc.url=jdbc:mysql://47.106.242.175:3306/chinafrica?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8
+jdbc.username=root
+jdbc.password=diaoyun666
 
-jdbc.url: jdbc:mysql://159.138.48.71:3306/chinafrica?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false
-jdbc.username: root
-jdbc.password: Diaoyunnuli.8
+#jdbc.url: jdbc:mysql://159.138.48.71:3306/chinafrica?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false
+#jdbc.username: root
+#jdbc.password: Diaoyunnuli.8
 
 jdbc.initialSize=5
 jdbc.maxActive=30 

platform-admin/src/main/webapp/js/sys/post.js

@@ -529,6 +529,7 @@ let vm = new Vue({
         //获取所有的标签
         $.get('../hashtag/queryAll', res => {
             let OBJ_res = JSON.parse(res);
+            console.log(res)
             OBJ_res.list.forEach((item) => {
                 console.log('labelName', item.name)
                 this.allTagList.push({

platform-admin/src/main/webapp/js/sys/tbcfstationitem.js

@@ -3,6 +3,7 @@ $(function () {
         url: '../tbcfstationitem/list',
         colModel: [
             {label: 'itemId', name: 'itemId', index: 'item_id', key: true, hidden: true},
+            {label: '序号', name: 'sort', index: 'sort', width: 40},
             {label: '商品图片', name: 'itemImg', index: 'item_img', width: 40, formatter: imageFormat},
             {label: '商品编号', name: 'itemCode', index: 'item_code', width: 60},
             {label: '商品名称', name: 'itemName', index: 'item_name', width: 120},