Merge remote-tracking branch 'origin/developer' into developer

pom.xml

@@ -139,6 +139,12 @@
             <version>1.11.2</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.3.2</version>
+        </dependency>
+
     </dependencies>
 
 

src/main/java/com/caimei/www/service/page/impl/SinglePageServiceImpl.java

@@ -6,14 +6,16 @@ import com.caimei.www.pojo.page.ImageLink;
 import com.caimei.www.pojo.page.PageContent;
 import com.caimei.www.service.page.SinglePageService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.ZeroCopyHttpOutputMessage;
 import org.springframework.http.server.reactive.ServerHttpResponse;
 import org.springframework.stereotype.Service;
+
+
 import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
 import reactor.core.publisher.Mono;
 
 import javax.annotation.Resource;
@@ -48,9 +50,12 @@ public class SinglePageServiceImpl implements SinglePageService {
             return null;
         }
         PageContent pageContent = singlePageDao.getFreePageById(id);
+        if (null == pageContent) {
+            return null;
+        }
         String mobileContent = singlePageDao.findMobileContent(id);
-        if (StringUtils.isEmpty(mobileContent)) {
-            if (!ObjectUtils.isEmpty(pageContent.getContent())) {
+        if (StringUtils.isBlank(mobileContent)) {
+            if (StringUtils.isNotBlank(pageContent.getContent())) {
                 pageContent.setMobileContent(pageContent.getContent());
             } else {
                 pageContent.setMobileContent("");

src/main/resources/static/js/activity/attestation.js

@@ -56,13 +56,13 @@ new Vue({
             {
                 logo: '/img/activity/attestation/shuishu.jpg',
                 name: '品辉机构认证',
-                entryRoute: '/4/ph',
+                entryRoute: '/4/ph/approve/club',
                 secondRoute: ''
             },
             {
                 logo: '/img/activity/attestation/3.jpg',
                 name: 'LDM机构认证',
-                entryRoute: '/10/ldm',
+                entryRoute: '/10/ldm/approve/club',
                 secondRoute: '',
                 redirect: ''
             },