Merge remote-tracking branch 'origin/master'

lxinet · May 15, 2020 · 3676f7b · 3676f7b
2 parents bda5035 + b1806d7
commit 3676f7b
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,7 @@
 # JEESNS
 
+## v2.0.0目前为beta版本，正在持续开发中，可能会存在比较多的问题，或者会有大的改动，请不要正式使用，如需正式使用，请使用v1.4.2版本[https://gitee.com/zchuanzhao/jeesns/releases/v1.4.2](https://gitee.com/zchuanzhao/jeesns/releases/v1.4.2)
+
 开发语言：JAVA
 
 数据库：MYSQL

diff --git a/jeesns-service/src/main/resources/mybatis/member/MemberFansMapper.xml b/jeesns-service/src/main/resources/mybatis/member/MemberFansMapper.xml
@@ -17,15 +17,15 @@
   <insert id="save" parameterType="MemberFans">
     insert into tbl_member_fans(create_time,follow_who,who_follow) values(now(),#{followWhoId},#{whoFollowId})
   </insert>
-  <select id="followsList" resultMap="MemberFansResult">
+  <select id="followsList" resultType="MemberFans">
     SELECT a.who_follow,a.follow_who as follow_who,b.id as 'followWhoMember.id',b.name as 'followWhoMember.name',
-     b.avatar as 'followWhoMember.avatar',b.fans as 'followWhoMember.fans',b.follows as 'followWhoMember.follows'
+     b.avatar as 'followWhoMember.avatar',b.fans as 'followWhoMember.fans',b.follows as 'followWhoMember.follows',b.introduce as 'followWhoMember.introduce'
       FROM tbl_member_fans as a LEFT JOIN tbl_member as b ON a.follow_who = b.id
      WHERE who_follow = #{whoFollowId}
   </select>
-  <select id="fansList" resultMap="MemberFansResult">
+  <select id="fansList" resultType="MemberFans">
     SELECT a.follow_who,a.who_follow as who_follow,b.id as 'whoFollowMember.id',b.name as 'whoFollowMember.name',
-    b.avatar as 'whoFollowMember.avatar',b.fans as 'whoFollowMember.fans',b.follows as 'whoFollowMember.follows'
+    b.avatar as 'whoFollowMember.avatar',b.fans as 'whoFollowMember.fans',b.follows as 'whoFollowMember.follows',b.introduce as 'whoFollowMember.introduce'
      FROM tbl_member_fans as a LEFT JOIN tbl_member as b ON a.who_follow = b.id
     WHERE follow_who = #{followWhoId}
   </select>

diff --git a/jeesns-web/src/main/resources/application.yml b/jeesns-web/src/main/resources/application.yml
@@ -52,7 +52,8 @@ spring:
     date-format: yyyy-MM-dd
     time-format: HH:mm:ss
     datetime-format: yyyy-MM-dd HH\:mm\:ss
-    number-format: \#.##
+    settings:
+      number_format: 0.##
   logging:
     level: com.ibatis:DEBUG
   http:

diff --git a/jeesns-web/src/main/resources/templates/front/common/memberInfo.ftl b/jeesns-web/src/main/resources/templates/front/common/memberInfo.ftl
@@ -9,10 +9,14 @@
                 <div class="info">
                     <div class="name">
                     ${member.name}
-                        <#if member.sex=='女'>
-                            <span class="sex"><i class="icon icon-venus"></i></span>
-                        <#elseif member.sex=='男'>
-                            <span class="sex"><i class="icon icon-mars"></i></span>
+                        <#if member.sex??>
+                            <#if member.sex=='女'>
+                                <span class="sex"><i class="icon icon-venus"></i></span>
+                            <#elseif member.sex=='男'>
+                                <span class="sex"><i class="icon icon-mars"></i></span>
+                            <#else>
+                                <span class="sex"><i class="icon icon-intersex"></i></span>
+                            </#if>
                         <#else>
                             <span class="sex"><i class="icon icon-intersex"></i></span>
                         </#if>

diff --git a/jeesns-web/src/main/resources/templates/front/picture/detail.ftl b/jeesns-web/src/main/resources/templates/front/picture/detail.ftl
@@ -56,7 +56,7 @@
                             <p>上传于${picture.createTime?string("yyyy年MM月dd HH:mm")}</p>
                         </div>
                     </div>
-                    <div class="description emoji-render-content">${picture.description}</div>
+                    <div class="description emoji-render-content">${picture.description!''}</div>
                     <div class="right">
                         <a class="text-primary picture-favor" data-id="${picture.id}">
                             <i class="icon icon-thumbs<#if picture.isFavor==0>-o</#if>-up"></i> ${picture.favorCount}

diff --git a/jeesns-web/src/main/resources/templates/manage/cms/comment/list.ftl b/jeesns-web/src/main/resources/templates/manage/cms/comment/list.ftl
@@ -72,13 +72,13 @@
                                 <tr>
                                     <td>${articleComment.id}</td>
                                     <td>
-                                        <a href="${base}/u/${articleComment.member.id}" target="_blank">
+                                        <a href="${basePath}/u/${articleComment.member.id}" target="_blank">
                                             ${articleComment.member.name}
                                         </a>
                                         </td>
                                     <td>${articleComment.content}</td>
                                     <td>
-                                        <a href="${base}/article/detail/${articleComment.article.id}" target="_blank">
+                                        <a href="${basePath}/article/detail/${articleComment.article.id}" target="_blank">
                                         《${articleComment.article.title}》
                                         </a>
                                     </td>

diff --git a/jeesns-web/src/main/resources/templates/manage/member/index.ftl b/jeesns-web/src/main/resources/templates/manage/member/index.ftl
@@ -78,7 +78,7 @@
                                     <td>${member.name}</td>
                                     <td>${member.email}</td>
                                     <td>${(member.isVip == 0)?string("否","是")}</td>
-                                    <td>${member.phone}</td>
+                                    <td>${member.phone!''}</td>
                                     <td>${member.loginCount}</td>
                                     <td>${member.createTime?string("yyyy-MM-dd HH:mm:ss")}</td>
                                     <td>

diff --git a/jeesns-web/src/main/resources/templates/manage/member/info.ftl b/jeesns-web/src/main/resources/templates/manage/member/info.ftl
@@ -63,7 +63,7 @@
                 <div class="form-group">
                     <label class="col-sm-3 control-label">手机号码</label>
                     <div class="col-sm-8">
-                        <input type="text" class="form-control" data-type="require" value="${member.phone}" disabled>
+                        <input type="text" class="form-control" data-type="require" value="${member.phone!''}" disabled>
                     </div>
                 </div>
             </div>

diff --git a/jeesns-web/src/main/resources/templates/manage/member/managerList.ftl b/jeesns-web/src/main/resources/templates/manage/member/managerList.ftl
@@ -77,7 +77,7 @@
                                     <td>${member.id}</td>
                                     <td>${member.name}</td>
                                     <td>${member.email}</td>
-                                    <td>${member.phone}</td>
+                                    <td>${member.phone!''}</td>
                                     <td>${member.loginCount}</td>
                                     <td>${member.createTime?string("yyyy-MM-dd HH:mm:ss")}</td>
                                     <td>

diff --git a/jeesns-web/src/main/resources/templates/manage/picture/list.ftl b/jeesns-web/src/main/resources/templates/manage/picture/list.ftl
@@ -48,7 +48,7 @@
                                 <#list model.data as picture>
                                     <li>
                                         <span class="mailbox-attachment-icon has-img">
-                                            <img src="${basePath}${picture.smallPath}" title="${picture.description}" style="max-width: 100%;height: 160px;">
+                                            <img src="${basePath}${picture.smallPath}" title="${picture.description!''}" style="max-width: 100%;height: 160px;">
                                         </span>
                                         <div class="mailbox-attachment-info">
                                             <a href="${basePath}/u/${picture.member.id}" target="_blank">${picture.member.name}</a>

diff --git a/jeesns-web/src/main/resources/templates/member/common/memberInfo.ftl b/jeesns-web/src/main/resources/templates/member/common/memberInfo.ftl
@@ -9,13 +9,18 @@
                 <div class="info">
                     <div class="name">
                     ${member.name}
-                        <#if member.sex=='女'>
-                            <span class="sex"><i class="icon icon-venus"></i></span>
-                        <#elseif member.sex=='男'>
-                            <span class="sex"><i class="icon icon-mars"></i></span>
-                        <#else>
-                            <span class="sex"><i class="icon icon-intersex"></i></span>
+                        <#if member.sex??>
+                            <#if member.sex=='女'>
+                                <span class="sex"><i class="icon icon-venus"></i></span>
+                            <#elseif member.sex=='男'>
+                                <span class="sex"><i class="icon icon-mars"></i></span>
+                            <#else>
+                                <span class="sex"><i class="icon icon-intersex"></i></span>
+                            </#if>
+                            <#else>
+                                <span class="sex"><i class="icon icon-intersex"></i></span>
                         </#if>
+
                         <span class="label label-danger" style="font-size: 12px;">${member.memberLevel.name}</span>
                         <a class="label label-primary edit" href="${basePath}/member/editInfo">
                             <i class="icon icon-edit"></i> 编辑