clunt
/
playlet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: clunt:fc82043cb544efbbbe3b84412090d331b417cf25
Branches Tags
clunt:master
..
compare: clunt:56d9fa35f73909efa5c371f73419ce83768e2cd1
Branches Tags
clunt:master

No commits in common. "fc82043cb544efbbbe3b84412090d331b417cf25" and "56d9fa35f73909efa5c371f73419ce83768e2cd1" have entirely different histories.
fc82043cb5 ... 56d9fa35f7

4 changed files with 5 additions and 9 deletions
Show Stats Expand all files Collapse all files

4
playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletPublicDetailController.java
View File

@ -2,7 +2,6 @@ package com.playlet.web.controller.system;
import java.util.List; import java.util.List;
import com.playlet.common.utils.StringUtils;
import com.playlet.system.domain.PlayletPublicAccount; import com.playlet.system.domain.PlayletPublicAccount;
import com.playlet.system.service.IPlayletItemService; import com.playlet.system.service.IPlayletItemService;
import com.playlet.system.service.IPlayletPublicAccountService; import com.playlet.system.service.IPlayletPublicAccountService;
@ -147,9 +146,6 @@ public class PlayletPublicDetailController extends BaseController
@ResponseBody @ResponseBody
public AjaxResult editSave(PlayletPublicDetail playletPublicDetail) public AjaxResult editSave(PlayletPublicDetail playletPublicDetail)
{ {
if("02".equals(playletPublicDetail.getType()) && StringUtils.isNotEmpty(playletPublicDetail.getPdfUrl())){
playletPublicDetail.setContent(playletPublicDetail.getPdfUrl());
}
return toAjax(playletPublicDetailService.updatePlayletPublicDetail(playletPublicDetail)); return toAjax(playletPublicDetailService.updatePlayletPublicDetail(playletPublicDetail));
} }

2
playlet-admin/src/main/resources/application.yml
View File

@ -172,7 +172,7 @@ aliyun:
access-key-secret: BbxcqZjvx6yupekOLUbKDMINhbOioa access-key-secret: BbxcqZjvx6yupekOLUbKDMINhbOioa
bucket-name: qiepian2024 bucket-name: qiepian2024
endpoint: http://oss-cn-shenzhen.aliyuncs.com endpoint: http://oss-cn-shenzhen.aliyuncs.com
url-prefix: https://qiepian2024.oss-cn-shenzhen.aliyuncs.com/ url-prefix: http://qiepian2024.oss-cn-shenzhen.aliyuncs.com/
#阿里云短信验证码配置 #阿里云短信验证码配置
sms: sms:

2
playlet-admin/src/main/resources/templates/system/playlet/account/edit.html
View File

@ -59,7 +59,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">原创篇数：</label> <label class="col-sm-3 control-label">原创片数：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="originalContentCount" th:field="*{originalContentCount}" class="form-control" type="text"> <input name="originalContentCount" th:field="*{originalContentCount}" class="form-control" type="text">
</div> </div>

6
playlet-system/src/main/java/com/playlet/system/domain/PlayletPublicAccount.java
View File

@ -65,9 +65,9 @@ public class PlayletPublicAccount extends BaseEntity
@ApiModelProperty(value = "地址") @ApiModelProperty(value = "地址")
private String address; private String address;
/** 原创篇数 */ /** 原创片数 */
@Excel(name = "原创篇数") @Excel(name = "原创片数")
@ApiModelProperty(value = "原创篇数") @ApiModelProperty(value = "原创片数")
private Long originalContentCount; private Long originalContentCount;
/** 关注人数 */ /** 关注人数 */