资料访问权限优化

pom.xml

@@ -30,6 +30,10 @@
     </dependencyManagement>
 
     <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>

src/main/java/com/caimei365/commodity/service/impl/PageServiceImpl.java

@@ -1127,16 +1127,24 @@ public class PageServiceImpl implements PageService {
             permission = 0;
         }
         int finalPermission = permission;
-        imageArchiveList.forEach(imageArchive -> {
+        //商品分类:1医美，2生美
+        Integer productClassify = archive.getProductClassify();
+        for (int i = 0; i < imageArchiveList.size(); i++) {
+            ArchiveContentVo imageArchive = imageArchiveList.get(i);
             List<String> imageList = pageMapper.getArchiveImageList(imageArchive.getArchiveContentId());
             if (0 == finalPermission) {
                 imageArchive.setImageList(imageList);
+            } else if (2 == productClassify && i < 2) {
+                imageArchive.setImageList(imageList.subList(0,2));
             }
             imageArchive.setImageNum(imageList.size());
-        });
+        }
         videoArchiveList.forEach(videoArchive -> {
             ArchiveFilePo archiveFile = pageMapper.getArchiveFile(videoArchive.getArchiveContentId());
-            if (0 == finalPermission) {
+            if (0 == finalPermission && null != archiveFile) {
+                String fileUrl = generateFileUrl(archiveFile);
+                videoArchive.setFileUrl(fileUrl);
+            } else if (2 == productClassify && null != archiveFile) {
                 String fileUrl = generateFileUrl(archiveFile);
                 videoArchive.setFileUrl(fileUrl);
             }
@@ -1144,7 +1152,10 @@ public class PageServiceImpl implements PageService {
         fileArchiveList.forEach(fileArchive -> {
             ArchiveFilePo archiveFile = pageMapper.getArchiveFile(fileArchive.getArchiveContentId());
             fileArchive.setFileName(archiveFile.getFileName());
-            if (0 == finalPermission) {
+            if (0 == finalPermission && null != archiveFile) {
+                String fileUrl = generateFileUrl(archiveFile);
+                fileArchive.setFileUrl(fileUrl);
+            } else if (2 == productClassify && null != archiveFile) {
                 String fileUrl = generateFileUrl(archiveFile);
                 fileArchive.setFileUrl(fileUrl);
             }
@@ -1160,7 +1171,7 @@ public class PageServiceImpl implements PageService {
                 item.add(archive.getLabelIds());
             }
         }
-        List<String> keyWordList = pageMapper.keyWordList(item);
+        List<String> keyWordList = null != archive.getLabelIds() ? pageMapper.keyWordList(item) : new ArrayList<>();
         item.clear();
         for (String s : keyWordList) {
             item.add(s);
@@ -1184,6 +1195,7 @@ public class PageServiceImpl implements PageService {
         //商品分类:1医美，2生美
         Integer productClassify = archive.getProductClassify();
         // 根据用户Id查询用户身份
+
         Integer identity = priceMapper.getIdentityByUserId(userId);
         // 1生美机构，2医美机构
         Integer clubType = pageMapper.getClubTypeByUserId(userId);

src/main/resources/bootstrap.yml

@@ -9,7 +9,7 @@ spring:
     config:                             # Config客户端配置
       profile: @activatedProperties@    # 启用配置后缀名称
       label: master                     # 分支名称
-#      uri: http://192.168.2.100:18001
+      # uri: http://192.168.2.100:18001
       # uri: http://47.119.112.46:18001          # 配置中心地址
-      uri: http://120.79.162.1:18001          # 配置中心地址（正式环境）
+      uri: http://120.79.162.1:18001     # 配置中心地址（正式环境）
       name: commodity                   # 配置文件名称