Add: 调整页脚对齐方式为左对齐& Mod: 编辑器预览图片最大高度和宽度设定& Add:404页面添加功能下线提示

yangrunkang · Jan 17, 2022 · c8dbfde · c8dbfde
1 parent ecbacd2
commit c8dbfde
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 186 deletions.
diff --git a/README.md b/README.md
@@ -59,5 +59,5 @@ export GOOGLE_TAG_ID=Google分析Id
 ## 应用内环境变量
 > 此为示例,请根据实际情况修改
 ```
-MYSQL_HOST=localhost;MYSQL_PORT=3306;MYSQL_USERNAME=root;MYSQL_PASSWORD=123456;MYSQL_DATABASE=open_base;REDIS_HOST=localhost;REDIS_PORT=6379;REDIS_PASSWORD=;ALLOW_UPLOAD_PIC_SUFFIX=jpg;ALLOW_UPLOAD_PIC_QUALITY=0.5;EMAIL_ON=0;EMAIL_SENDER_NICK_NAME=;EMAIL_SENDER_ACCOUNT=;EMAIL_ACCESS_KEY=;EMAIL_ACCESS_SECRET= ;WEBSITE=http://localhost:2020;AD_SWITCH=0;AD_SWITCH_RIGHT=0;ANALYZE_SWITCH=0;OSS_BUCKET_NAME=;OSS_FILE_HOST=;OSS_STATIC=http://localhost:2020;LUENCE_INDEX_DIC=;THYMELEAF_CACHE=false;LOG_PATH=/Users/yangrunkang/logs;UPUPOR_ENV=dev;GOOGLE_DATA_AD_CLIENT_ID=;GOOGLE_AD_RIGHT=;GOOGLE_AD_FEED=
+MYSQL_HOST=localhost;MYSQL_PORT=3306;MYSQL_USERNAME=root;MYSQL_PASSWORD=123456;MYSQL_DATABASE=open_base;REDIS_HOST=localhost;REDIS_PORT=6379;REDIS_PASSWORD=;ALLOW_UPLOAD_PIC_SUFFIX=jpg;ALLOW_UPLOAD_PIC_QUALITY=0.5;EMAIL_ON=0;EMAIL_SENDER_NICK_NAME=;EMAIL_SENDER_ACCOUNT=;EMAIL_ACCESS_KEY=;EMAIL_ACCESS_SECRET= ;WEBSITE=http://localhost:2020;AD_SWITCH=0;AD_SWITCH_RIGHT=0;ANALYZE_SWITCH=0;OSS_BUCKET_NAME=;OSS_FILE_HOST=;OSS_STATIC=http://localhost:2020;LUENCE_INDEX_DIC=;THYMELEAF_CACHE=false;LOG_PATH=/Users/yangrunkang/logs;UPUPOR_ENV=dev;GOOGLE_DATA_AD_CLIENT_ID=;GOOGLE_AD_RIGHT=;GOOGLE_AD_FEED=;GOOGLE_TAG_ID=
 ```
diff --git a/upupor-service/src/main/java/com/upupor/service/business/manage/business/CommentManage.java b/upupor-service/src/main/java/com/upupor/service/business/manage/business/CommentManage.java
diff --git a/upupor-service/src/main/java/com/upupor/service/common/CcConstant.java b/upupor-service/src/main/java/com/upupor/service/common/CcConstant.java
@@ -155,7 +155,6 @@ public final class CcConstant {
     public static final String USER_MANAGE_EDIT_USER_INFO = "user/manage/edit-user-info";
     public static final String USER_MANAGE_BG_STYLE_SETTINGS = "user/manage/bg-style-settings";
     public static final String USER_MANAGE_UPLOAD_PROFILE_PHOTO = "user/manage/upload-profile-photo";
-    public static final String USER_MANAGE_COMMENT = "user/manage/comment";
     public static final String USER_MANAGE_ATTENTION = "user/manage/attention";
     public static final String USER_MANAGE_FAN = "user/manage/fans";
     public static final String USER_MANAGE_INTEGRAL = "user/manage/integral";

diff --git a/upupor-web/src/main/java/com/upupor/web/page/MemberManageJumpController.java b/upupor-web/src/main/java/com/upupor/web/page/MemberManageJumpController.java
@@ -74,7 +74,6 @@ public class MemberManageJumpController {
     private final MessageManage messageManage;
     private final ProfilePhotoManage profilePhotoManage;
     private final RadioManage radioManage;
-    private final CommentManage commentManage;
     private final MemberManage memberManage;
 
     @ApiOperation("个人中心-内容管理")
@@ -179,28 +178,6 @@ public ModelAndView userManageCollect(Integer pageNum, Integer pageSize) {
         return modelAndView;
     }
 
-    @ApiOperation("个人中心-评论")
-    @GetMapping("/user/manage/comment")
-    public ModelAndView userManageComment(Integer pageNum, Integer pageSize) {
-        if (Objects.isNull(pageNum)) {
-            pageNum = Page.NUM;
-        }
-        if (Objects.isNull(pageSize)) {
-            pageSize = Page.SIZE;
-        }
-        ManageDto build = ManageDto.builder()
-                .pageSize(pageSize)
-                .pageNum(pageNum)
-                .userId(ServletUtils.getUserId())
-                .build();
-        ModelAndView modelAndView = new ModelAndView();
-        modelAndView.setViewName(USER_MANAGE_COMMENT);
-        modelAndView.addObject(commentManage.getData(build));
-        modelAndView.addObject(SeoKey.TITLE, "评论");
-        modelAndView.addObject(SeoKey.DESCRIPTION, "评论");
-        return modelAndView;
-    }
-
 
     @ApiOperation("个人中心-完善用户信息")
     @GetMapping("/user/manage/edit-user-info")

diff --git a/upupor-web/src/main/resources/static/css/common/img.css b/upupor-web/src/main/resources/static/css/common/img.css
@@ -49,3 +49,11 @@ article figure img{
     max-height: 100%;
     margin: 0 auto;
 }
+
+
+.cherry .cherry-previewer img {
+    width: auto;
+    height: auto;
+    max-width: 100%;
+    max-height: 100%;
+}
diff --git a/upupor-web/src/main/resources/templates/editor/editor.html b/upupor-web/src/main/resources/templates/editor/editor.html
@@ -30,6 +30,7 @@
       th:replace="index">
 <!--css-->
 <link th:fragment="css" type="text/css" rel="stylesheet" th:href="${ossStatic} + @{/css/editor/editor.css}"/>
+<link th:fragment="css" type="text/css" rel="stylesheet" th:href="${ossStatic} + @{/css/common/img.css}"/>
 <!--脚本-->
 <script async="async" th:fragment="js" type="text/javascript" th:src="${ossStatic} + @{/js/editor/editor.js}"></script>
 <link th:fragment="css" type="text/css" rel="stylesheet" th:href="'/plugins/cherry/cherry-markdown.min.css?v='+${staticSourceVersion}"/>

diff --git a/upupor-web/src/main/resources/templates/error/404.html b/upupor-web/src/main/resources/templates/error/404.html
@@ -44,7 +44,7 @@ <h1 class="text-danger">404提示</h1>
                     <div class="mb-2">
                         <div class="alert alert-danger alert-dismissible" th:switch="${ cvException != null }">
                             <div th:case="true" th:utext="${cvException}" class="text-wrap"></div>
-                            <div th:case="false" class="text-wrap">访问地址有误</div>
+                            <div th:case="false" class="text-wrap">访问地址有误或该功能已下线</div>
                             <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
                         </div>
                     </div>

diff --git a/upupor-web/src/main/resources/templates/layout/footer.html b/upupor-web/src/main/resources/templates/layout/footer.html
@@ -72,7 +72,7 @@
                     </div>
                 </div>
                 <div class="row">
-                    <div class="col w-100 text-black-50 text-center border-top small">
+                    <div class="col w-100 text-black-50 border-top small">
                         <span class="small text-black-50" th:if="${responseTime} != null and ${responseTime} > 0" th:text="'响应时间: ' + ${responseTime}+'ms'"></span> ·
                         <span class="small text-black-50">版本:[[${staticSourceVersion}]]</span> ·
                         <a class="cv-link text-black-50 small" href="http://www.beian.miit.gov.cn">备案号:&nbsp;皖ICP备17015935号-2</a> ·