Skip to content

Commit 7e5b7e3

Browse files
committed
bugfix: share api bug fix
1 parent d058764 commit 7e5b7e3

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

core/src/main/java/datart/core/mappers/ext/ShareMapperExt.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
public interface ShareMapperExt extends ShareMapper {
2929

3030
@Select({"<script>",
31-
"SELECT * FROM `share` where viz_id = #{vizId} ",
31+
"SELECT * FROM `share` where viz_id = #{vizId} ORDER BY create_time",
3232
"</script>"})
3333
List<Share> selectByViz(String vizId);
3434

server/src/main/java/datart/server/service/impl/ShareServiceImpl.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,10 @@ public ShareToken createShare(String shareUser, ShareCreateParam createParam) {
107107
Exceptions.tr(BaseException.class, "message.share.unsupported", createParam.getVizType().name());
108108
}
109109

110+
if (createParam.getAuthenticationMode().equals(ShareAuthenticationMode.CODE)) {
111+
createParam.setAuthenticationCode(SecurityUtils.randomPassword());
112+
}
113+
110114
Share share = new Share();
111115
BeanUtils.copyProperties(createParam, share);
112116
share.setCreateBy(shareUser);
@@ -136,13 +140,6 @@ public ShareToken createShare(String shareUser, ShareCreateParam createParam) {
136140
ShareToken shareToken = new ShareToken();
137141
BeanUtils.copyProperties(createParam, shareToken);
138142
shareToken.setId(share.getId());
139-
140-
if (createParam.getAuthenticationMode().equals(ShareAuthenticationMode.CODE)) {
141-
shareToken.setAuthenticationCode(SecurityUtils.randomPassword());
142-
}
143-
144-
shareToken.setAuthenticationMode(createParam.getAuthenticationMode());
145-
146143
return shareToken;
147144
}
148145

0 commit comments

Comments
 (0)