Skip to content

Commit c8dbfde

Browse files
yangrunkangyangrunkang
authored andcommitted
Add: 调整页脚对齐方式为左对齐& Mod: 编辑器预览图片最大高度和宽度设定& Add:404页面添加功能下线提示
1 parent ecbacd2 commit c8dbfde

File tree

8 files changed

+12
-186
lines changed

8 files changed

+12
-186
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,5 +59,5 @@ export GOOGLE_TAG_ID=Google分析Id
5959
## 应用内环境变量
6060
> 此为示例,请根据实际情况修改
6161
```
62-
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=
62+
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=
6363
```

upupor-service/src/main/java/com/upupor/service/business/manage/business/CommentManage.java

Lines changed: 0 additions & 159 deletions
This file was deleted.

upupor-service/src/main/java/com/upupor/service/common/CcConstant.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,6 @@ public final class CcConstant {
155155
public static final String USER_MANAGE_EDIT_USER_INFO = "user/manage/edit-user-info";
156156
public static final String USER_MANAGE_BG_STYLE_SETTINGS = "user/manage/bg-style-settings";
157157
public static final String USER_MANAGE_UPLOAD_PROFILE_PHOTO = "user/manage/upload-profile-photo";
158-
public static final String USER_MANAGE_COMMENT = "user/manage/comment";
159158
public static final String USER_MANAGE_ATTENTION = "user/manage/attention";
160159
public static final String USER_MANAGE_FAN = "user/manage/fans";
161160
public static final String USER_MANAGE_INTEGRAL = "user/manage/integral";

upupor-web/src/main/java/com/upupor/web/page/MemberManageJumpController.java

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ public class MemberManageJumpController {
7474
private final MessageManage messageManage;
7575
private final ProfilePhotoManage profilePhotoManage;
7676
private final RadioManage radioManage;
77-
private final CommentManage commentManage;
7877
private final MemberManage memberManage;
7978

8079
@ApiOperation("个人中心-内容管理")
@@ -179,28 +178,6 @@ public ModelAndView userManageCollect(Integer pageNum, Integer pageSize) {
179178
return modelAndView;
180179
}
181180

182-
@ApiOperation("个人中心-评论")
183-
@GetMapping("/user/manage/comment")
184-
public ModelAndView userManageComment(Integer pageNum, Integer pageSize) {
185-
if (Objects.isNull(pageNum)) {
186-
pageNum = Page.NUM;
187-
}
188-
if (Objects.isNull(pageSize)) {
189-
pageSize = Page.SIZE;
190-
}
191-
ManageDto build = ManageDto.builder()
192-
.pageSize(pageSize)
193-
.pageNum(pageNum)
194-
.userId(ServletUtils.getUserId())
195-
.build();
196-
ModelAndView modelAndView = new ModelAndView();
197-
modelAndView.setViewName(USER_MANAGE_COMMENT);
198-
modelAndView.addObject(commentManage.getData(build));
199-
modelAndView.addObject(SeoKey.TITLE, "评论");
200-
modelAndView.addObject(SeoKey.DESCRIPTION, "评论");
201-
return modelAndView;
202-
}
203-
204181

205182
@ApiOperation("个人中心-完善用户信息")
206183
@GetMapping("/user/manage/edit-user-info")

upupor-web/src/main/resources/static/css/common/img.css

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,3 +49,11 @@ article figure img{
4949
max-height: 100%;
5050
margin: 0 auto;
5151
}
52+
53+
54+
.cherry .cherry-previewer img {
55+
width: auto;
56+
height: auto;
57+
max-width: 100%;
58+
max-height: 100%;
59+
}

upupor-web/src/main/resources/templates/editor/editor.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
th:replace="index">
3131
<!--css-->
3232
<link th:fragment="css" type="text/css" rel="stylesheet" th:href="${ossStatic} + @{/css/editor/editor.css}"/>
33+
<link th:fragment="css" type="text/css" rel="stylesheet" th:href="${ossStatic} + @{/css/common/img.css}"/>
3334
<!--脚本-->
3435
<script async="async" th:fragment="js" type="text/javascript" th:src="${ossStatic} + @{/js/editor/editor.js}"></script>
3536
<link th:fragment="css" type="text/css" rel="stylesheet" th:href="'/plugins/cherry/cherry-markdown.min.css?v='+${staticSourceVersion}"/>

upupor-web/src/main/resources/templates/error/404.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ <h1 class="text-danger">404提示</h1>
4444
<div class="mb-2">
4545
<div class="alert alert-danger alert-dismissible" th:switch="${ cvException != null }">
4646
<div th:case="true" th:utext="${cvException}" class="text-wrap"></div>
47-
<div th:case="false" class="text-wrap">访问地址有误</div>
47+
<div th:case="false" class="text-wrap">访问地址有误或该功能已下线</div>
4848
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
4949
</div>
5050
</div>

upupor-web/src/main/resources/templates/layout/footer.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
</div>
7373
</div>
7474
<div class="row">
75-
<div class="col w-100 text-black-50 text-center border-top small">
75+
<div class="col w-100 text-black-50 border-top small">
7676
<span class="small text-black-50" th:if="${responseTime} != null and ${responseTime} > 0" th:text="'响应时间: ' + ${responseTime}+'ms'"></span> ·
7777
<span class="small text-black-50">版本:[[${staticSourceVersion}]]</span> ·
7878
<a class="cv-link text-black-50 small" href="http://www.beian.miit.gov.cn">备案号:&nbsp;皖ICP备17015935号-2</a> ·

0 commit comments

Comments
 (0)