pixwsber7
/
dsl3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #56 from linhaojun857/dev

Browse Source 
merge dev
master
linhaojun857 4 years ago committed by GitHub
parent caff59e334 bd9f5e9ae8
commit aabaca5ae1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 49 additions and 39 deletions
Show Stats Download Patch File Download Diff File

4
aurora-springboot/src/main/java/com/aurora/controller/BizExceptionController.java
Unescape View File

@ -9,9 +9,6 @@ import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
/**
* 用于处理过滤其中的异常（目前用不到）
*/
@Api(tags = "异常处理模块")
@RestController
public class BizExceptionController {
@ -27,4 +24,5 @@ public class BizExceptionController {
throw new Exception();
}
}
}

3
aurora-springboot/src/main/java/com/aurora/controller/PhotoAlbumController.java
Unescape View File

@ -23,9 +23,6 @@ import java.util.List;
import static com.aurora.constant.OptTypeConstant.*;
/**
* @author 花未眠
*/
@Api(tags = "相册模块")
@RestController
public class PhotoAlbumController {

4
aurora-springboot/src/main/java/com/aurora/controller/PhotoController.java
Unescape View File

@ -20,10 +20,6 @@ import java.util.List;
import static com.aurora.constant.OptTypeConstant.*;
/**
* @author 花未眠
*/
@Api(tags = "照片模块")
@RestController
public class PhotoController {

4
aurora-springboot/src/main/java/com/aurora/service/impl/TalkServiceImpl.java
Unescape View File

@ -73,7 +73,9 @@ public class TalkServiceImpl extends ServiceImpl<TalkMapper, Talk> implements Ta
talkDTO.setImgs(CommonUtil.castList(JSON.parseObject(talkDTO.getImages(), List.class), String.class));
}
CommentCountDTO commentCountDTO = commentMapper.listCommentCountByTypeAndTopicId(CommentTypeEnum.TALK.getType(), talkId);
talkDTO.setCommentCount(commentCountDTO.getCommentCount());
if (Objects.nonNull(commentCountDTO)) {
talkDTO.setCommentCount(commentCountDTO.getCommentCount());
}
return talkDTO;
}

2
aurora-springboot/src/main/resources/mapper/ArticleMapper.xml
Unescape View File

@ -506,4 +506,4 @@
GROUP BY date
ORDER BY date DESC
</select>
</mapper>
</mapper>

2
aurora-springboot/src/main/resources/mapper/CategoryMapper.xml
Unescape View File

@ -32,4 +32,4 @@
c.id
LIMIT #{current},#{size}
</select>
</mapper>
</mapper>

2
aurora-springboot/src/main/resources/mapper/CommentMapper.xml
Unescape View File

@ -145,4 +145,4 @@
AND topic_id = #{topicId}
GROUP BY topic_id
</select>
</mapper>
</mapper>

3
aurora-springboot/src/main/resources/mapper/JobLogMapper.xml
Unescape View File

@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aurora.mapper.JobLogMapper">
<select id="listJobLogGroups" resultType="java.lang.String">
select DISTINCT job_group
from t_job_log
</select>
</mapper>
</mapper>

2
aurora-springboot/src/main/resources/mapper/JobMapper.xml
Unescape View File

@ -37,4 +37,4 @@
select DISTINCT job_group
from t_job
</select>
</mapper>
</mapper>

2
aurora-springboot/src/main/resources/mapper/MenuMapper.xml
Unescape View File

@ -15,4 +15,4 @@
JOIN `t_menu` m ON rm.menu_id = m.id
WHERE user_id = #{userInfoId}
</select>
</mapper>
</mapper>

4
aurora-springboot/src/main/resources/mapper/PhotoAlbumMapper.xml
Unescape View File

@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aurora.mapper.PhotoAlbumMapper">
<select id="listPhotoAlbumsAdmin" resultType="com.aurora.model.dto.PhotoAlbumAdminDTO">
SELECT
pa.id,
@ -44,4 +42,4 @@
GROUP BY
pa.id
</select>
</mapper>
</mapper>

4
aurora-springboot/src/main/resources/mapper/RoleMapper.xml
Unescape View File

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aurora.mapper.RoleMapper">
<resultMap id="roleMap" type="com.aurora.model.dto.RoleDTO">
<id property="id" column="id"/>
<result property="roleName" column="role_name"/>
@ -73,5 +72,4 @@
LEFT JOIN t_role_menu rm on r.id = rm.role_id
ORDER BY r.id
</select>
</mapper>
</mapper>

2
aurora-springboot/src/main/resources/mapper/TagMapper.xml
Unescape View File

@ -56,4 +56,4 @@
t.id
LIMIT #{current},#{size}
</select>
</mapper>
</mapper>

4
aurora-springboot/src/main/resources/mapper/TalkMapper.xml
Unescape View File

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aurora.mapper.TalkMapper">
<select id="listTalks" resultType="com.aurora.model.dto.TalkDTO">
SELECT t.id,
nickname,
@ -65,5 +64,4 @@
JOIN t_user_info ui ON t.user_id = ui.id
WHERE t.id = #{talkId}
</select>
</mapper>
</mapper>

4
aurora-springboot/src/main/resources/mapper/UniqueViewMapper.xml
Unescape View File

@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aurora.mapper.UniqueViewMapper">
<select id="listUniqueViews" resultType="com.aurora.model.dto.UniqueViewDTO">
SELECT DATE_FORMAT(create_time, "%Y-%m-%d") as `day`,
views_count
@ -11,4 +9,4 @@
AND create_time &lt;= #{endTime}
ORDER BY create_time
</select>
</mapper>
</mapper>

2
aurora-springboot/src/main/resources/mapper/UserAuthMapper.xml
Unescape View File

@ -77,4 +77,4 @@
</if>
</where>
</select>
</mapper>
</mapper>

20
aurora-vue/aurora-admin/src/store/index.js
Unescape View File

@ -9,7 +9,13 @@ export default new Vuex.Store({
collapse: false,
tabList: [{ name: '首页', path: '/' }],
userInfo: null,
userMenus: []
userMenus: [],
pageState: {
articleList: 1,
category: 1,
tag: 1,
comment: 1
}
},
mutations: {
saveTab(state, tab) {
@ -46,6 +52,18 @@ export default new Vuex.Store({
state.userInfo.nickname = user.nickname
state.userInfo.intro = user.intro
state.userInfo.webSite = user.webSite
},
updateArticleListPageState(state, current) {
state.pageState.articleList = current
},
updateCategoryPageState(state, current) {
state.pageState.category = current
},
updateTagPageState(state, current) {
state.pageState.tag = current
},
updateCommentPageState(state, current) {
state.pageState.comment = current
}
},
actions: {},

10
aurora-vue/aurora-admin/src/views/article/ArticleList.vue
Unescape View File

@ -5,7 +5,7 @@
<span>状态</span>
<span @click="changeStatus('all')" :class="isActive('all')">全部</span>
<span @click="changeStatus('public')" :class="isActive('public')"> 公开 </span>
<span @click="changeStatus('secret')" :class="isActive('secret')"> 私密 </span>
<span @click="changeStatus('private')" :class="isActive('private')"> 私密 </span>
<span @click="changeStatus('draft')" :class="isActive('draft')"> 草稿箱 </span>
<span @click="changeStatus('delete')" :class="isActive('delete')"> 回收站 </span>
</div>
@ -227,6 +227,7 @@
<script>
export default {
created() {
this.current = this.$store.state.pageState.articleList
this.listArticles()
this.listCategories()
this.listTags()
@ -357,8 +358,8 @@ export default {
},
downloadFile(url) {
const iframe = document.createElement('iframe')
iframe.style.display = 'none' // 防止影响页面
iframe.style.height = 0 // 防止影响页面
iframe.style.display = 'none'
iframe.style.height = 0
iframe.src = url
document.body.appendChild(iframe)
setTimeout(() => {
@ -385,6 +386,7 @@ export default {
},
currentChange(current) {
this.current = current
this.$store.commit('updateArticleListPageState', current)
this.listArticles()
},
changeStatus(status) {
@ -397,7 +399,7 @@ export default {
this.isDelete = 0
this.status = 1
break
case 'secret':
case 'private':
this.isDelete = 0
this.status = 2
break

2
aurora-vue/aurora-admin/src/views/category/Category.vue
Unescape View File

@ -84,6 +84,7 @@
<script>
export default {
created() {
this.current = this.$store.state.pageState.category
this.listCategories()
},
data: function () {
@ -120,6 +121,7 @@ export default {
},
currentChange(current) {
this.current = current
this.$store.commit('updateCategoryPageState', current)
this.listCategories()
},
deleteCategory(id) {

2
aurora-vue/aurora-admin/src/views/comment/Comment.vue
Unescape View File

@ -130,6 +130,7 @@
<script>
export default {
created() {
this.current = this.$store.state.pageState.comment
this.listComments()
},
data: function () {
@ -181,6 +182,7 @@ export default {
},
currentChange(current) {
this.current = current
this.$store.commit('updateCommentPageState', current)
this.listComments()
},
changeReview(review) {

2
aurora-vue/aurora-admin/src/views/tag/Tag.vue
Unescape View File

@ -85,6 +85,7 @@
<script>
export default {
created() {
this.current = this.$store.state.pageState.tag
this.listTags()
},
data: function () {
@ -121,6 +122,7 @@ export default {
},
currentChange(current) {
this.current = current
this.$store.commit('updateTagPageState', current)
this.listTags()
},
deleteTag(id) {

2
aurora.sql
Unescape View File

@ -77,7 +77,7 @@ CREATE TABLE `t_comment` (
`comment_content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '评论内容',
`reply_user_id` int NULL DEFAULT NULL COMMENT '回复用户id',
`parent_id` int NULL DEFAULT NULL COMMENT '父评论id',
`type` tinyint NOT NULL COMMENT '评论类型 1.文章 2.留言 3.友链 4.关于我',
`type` tinyint NOT NULL COMMENT '评论类型 1.文章 2.留言 3.关于我 4.友链 5.说说',
`is_delete` tinyint NOT NULL DEFAULT 0 COMMENT '是否删除 0否 1是',
`is_review` tinyint(1) NOT NULL DEFAULT 1 COMMENT '是否审核',
`create_time` datetime NOT NULL COMMENT '评论时间',

2
项目部署文档.md
Unescape View File

@ -312,7 +312,7 @@ docker run --name aurora-springboot-0.0.1.jar -d -p 8080:8080 aurora-springboot
```typescript
captcha: {
TENCENT_CAPTCHA: '你自己的天御验证码'//用我的也行，但是防止我的使用量过多，导致无法验证，推荐使用自己的，毕竟我也没有充钱
TENCENT_CAPTCHA: '你自己的天御验证码'
},
qqLogin: {
QQ_APP_ID: '你自己的APP_ID',

Write Preview
Loading…
Cancel
Save