Merge branch 'master' of http://111.203.232.171:8888/lee/chnmuseum-party into master

src/main/java/cn/wisenergy/chnmuseum/party/auth/filter/JwtFilter.java

@@ -52,10 +52,10 @@ public class JwtFilter extends BasicHttpAuthenticationFilter {
                 executeLogin(request, response);
             } catch (UnauthorizedException e) {
 //                response403(request,response);
-                return false;
+                return true;
             } catch (AuthenticationException ae) {
 //                response401(request, response);
-                return false;
+                return true;
             }
         }
         return true;

src/main/java/cn/wisenergy/chnmuseum/party/common/enums/AuditOperationEnum.java

@@ -8,8 +8,11 @@ public enum AuditOperationEnum {
     ADD(1, "新增"),
     EDIT(2, "修改"),
     REMOVE(3, "删除"),
-    DISABLE(4, "禁用/下架"),
-    ENABLE(5, "启用/上架");
+    DISABLE(4, "禁用"),
+    ENABLE(5, "启用"),
+    UPPER(6,"上架"),
+    LOWER(7,"下架")
+    ;
 
     // 错误编码
     private Integer code;

src/main/java/cn/wisenergy/chnmuseum/party/service/impl/AuditServiceImpl.java

@@ -293,11 +293,11 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
         AuditOperationEnum auditOperationEnum = AuditOperationEnum.valueOf(operation);
         switch (auditOperationEnum) {
 
-            case ENABLE:
+            case UPPER:
                 exhibitionBoard.setPublished(true);
                 exhibitionBoard.setDeleted(false);
                 break;
-            case DISABLE:
+            case LOWER:
                 exhibitionBoard.setPublished(false);
                 break;
             case REMOVE:

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ExhibitionBoardController.java

@@ -378,7 +378,7 @@ public class ExhibitionBoardController extends BaseController {
                 .content(this.exhibitionBoardService.getById(id).getName())
                 .refItemId(id)
                 .type(AuditTypeEnum.EXHIBITION_BOARD.name())
-                .operation(isPublish ? AuditOperationEnum.ENABLE.name() : AuditOperationEnum.DISABLE.name())
+                .operation(isPublish ? AuditOperationEnum.UPPER.name() : AuditOperationEnum.LOWER.name())
                 .status(AuditStatusEnum.TBC.name())
                 .deleted(false)
                 .level(AuditStatusEnum.TBC.name())