zhaoyun
/
zc3in1
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

官网优化

Browse Source
master
ymnets 5 months ago
parent fb008b8f99
commit 785f396d5d
10 changed files with 102 additions and 88 deletions
Show Stats Download Patch File Download Diff File

88
JAVA_MYSQL_WEBSITE/.idea/workspace.xml
Unescape View File

@ -4,47 +4,17 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="ef55dc1b-11d9-4203-81db-14a06469a368" name="更改" comment="更改表名字">
<change afterPath="$PROJECT_DIR$/../JAVA_MYSQL_HCJXJY/jxjy-education.iml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/dataSources.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/jarRepositories.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/gp-business/src/main/java/com/hc/gpbusiness/dto/WebCourseDto.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/gp-business/src/main/java/com/hc/gpbusiness/dto/WebNewsDto.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/gp-business/src/main/java/com/hc/gpbusiness/mapper/WebCourseTypeMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/gp-business/src/main/java/com/hc/gpbusiness/mapper/WebNewsAttachmentMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/gp-business/src/main/java/com/hc/gpbusiness/mapper/WebNewsTypeMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/gp-business/src/main/java/com/hc/gpbusiness/model/WebCourseType.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/gp-business/src/main/java/com/hc/gpbusiness/model/WebNewsAttachment.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/gp-business/src/main/java/com/hc/gpbusiness/model/WebNewsType.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/gp-business/src/main/java/com/hc/gpbusiness/service/WebCourseTypeService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/gp-business/src/main/java/com/hc/gpbusiness/service/WebNewsAttachmentService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/gp-business/src/main/java/com/hc/gpbusiness/service/WebNewsTypeService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/gp-business/src/main/java/com/hc/gpbusiness/service/impl/WebCourseTypeServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/gp-business/src/main/java/com/hc/gpbusiness/service/impl/WebNewsAttachmentServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/gp-business/src/main/java/com/hc/gpbusiness/service/impl/WebNewsTypeServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/gp-business/src/main/resources/mapper/WebCourseTypeMapper.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/gp-business/src/main/resources/mapper/WebNewsAttachmentMapper.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/gp-business/src/main/resources/mapper/WebNewsTypeMapper.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/gp-web/src/main/java/com/hc/gpweb/controller/back/BackBannerController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/gp-web/src/main/java/com/hc/gpweb/controller/back/BackCourseTypeController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/gp-web/src/main/java/com/hc/gpweb/controller/back/BackNewsAttachmentController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/gp-web/src/main/java/com/hc/gpweb/controller/back/BackNewsTypeController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/gp-web/src/main/java/com/hc/gpweb/controller/front/FrontNewsAttachmentController.java" afterDir="false" />
<list default="true" id="ef55dc1b-11d9-4203-81db-14a06469a368" name="更改" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/gp-business/src/main/java/com/hc/gpbusiness/model/WebCourse.java" beforeDir="false" afterPath="$PROJECT_DIR$/gp-business/src/main/java/com/hc/gpbusiness/model/WebCourse.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/gp-business/src/main/java/com/hc/gpbusiness/dto/WebNewsDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/gp-business/src/main/java/com/hc/gpbusiness/dto/WebNewsDto.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/gp-business/src/main/java/com/hc/gpbusiness/model/WebBanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/gp-business/src/main/java/com/hc/gpbusiness/model/WebBanner.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/gp-business/src/main/java/com/hc/gpbusiness/model/WebNews.java" beforeDir="false" afterPath="$PROJECT_DIR$/gp-business/src/main/java/com/hc/gpbusiness/model/WebNews.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/gp-business/src/main/java/com/hc/gpbusiness/service/WebCourseService.java" beforeDir="false" afterPath="$PROJECT_DIR$/gp-business/src/main/java/com/hc/gpbusiness/service/WebCourseService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/gp-business/src/main/java/com/hc/gpbusiness/service/WebNewsService.java" beforeDir="false" afterPath="$PROJECT_DIR$/gp-business/src/main/java/com/hc/gpbusiness/service/WebNewsService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/gp-business/src/main/java/com/hc/gpbusiness/service/impl/WebCourseServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/gp-business/src/main/java/com/hc/gpbusiness/service/impl/WebCourseServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/gp-business/src/main/java/com/hc/gpbusiness/service/impl/WebNewsServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/gp-business/src/main/java/com/hc/gpbusiness/service/impl/WebNewsServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/gp-business/src/main/resources/mapper/WebBannerMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/gp-business/src/main/resources/mapper/WebBannerMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/gp-business/src/main/resources/mapper/WebCourseMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/gp-business/src/main/resources/mapper/WebCourseMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/gp-business/src/main/resources/mapper/WebNewsMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/gp-business/src/main/resources/mapper/WebNewsMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/gp-web/src/main/java/com/hc/gpweb/controller/back/BackCourseController.java" beforeDir="false" afterPath="$PROJECT_DIR$/gp-web/src/main/java/com/hc/gpweb/controller/back/BackCourseController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/gp-web/src/main/java/com/hc/gpweb/controller/back/BackNewsController.java" beforeDir="false" afterPath="$PROJECT_DIR$/gp-web/src/main/java/com/hc/gpweb/controller/back/BackNewsController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/gp-web/src/main/java/com/hc/gpweb/controller/front/FrontCourseController.java" beforeDir="false" afterPath="$PROJECT_DIR$/gp-web/src/main/java/com/hc/gpweb/controller/front/FrontCourseController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/gp-web/src/main/java/com/hc/gpweb/aspect/BackUserAspect.java" beforeDir="false" afterPath="$PROJECT_DIR$/gp-web/src/main/java/com/hc/gpweb/aspect/BackUserAspect.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -72,26 +42,26 @@
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent"><![CDATA[{
"keyToString": {
"RequestMappingsPanelOrder0": "0",
"RequestMappingsPanelOrder1": "1",
"RequestMappingsPanelWidth0": "75",
"RequestMappingsPanelWidth1": "75",
"RunOnceActivity.OpenProjectViewOnStart": "true",
"RunOnceActivity.ShowReadmeOnStart": "true",
"SHARE_PROJECT_CONFIGURATION_FILES": "true",
"WebServerToolWindowFactoryState": "false",
"last_opened_file_path": "F:/02.FNSProject/JAVA_MYSQL_交通局电召",
"settings.editor.selected.configurable": "web.server",
"spring.configuration.checksum": "420f802bde281311b05da23e05cddeda"
<component name="PropertiesComponent">{
&quot;keyToString&quot;: {
&quot;RequestMappingsPanelOrder0&quot;: &quot;0&quot;,
&quot;RequestMappingsPanelOrder1&quot;: &quot;1&quot;,
&quot;RequestMappingsPanelWidth0&quot;: &quot;75&quot;,
&quot;RequestMappingsPanelWidth1&quot;: &quot;75&quot;,
&quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
&quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
&quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
&quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
&quot;last_opened_file_path&quot;: &quot;F:/02.FNSProject/JAVA_MYSQL_HCJXJY&quot;,
&quot;settings.editor.selected.configurable&quot;: &quot;web.server&quot;,
&quot;spring.configuration.checksum&quot;: &quot;420f802bde281311b05da23e05cddeda&quot;
},
"keyToStringList": {
"DatabaseDriversLRU": [
"mysql"
&quot;keyToStringList&quot;: {
&quot;DatabaseDriversLRU&quot;: [
&quot;mysql&quot;
]
}
}]]></component>
}</component>
<component name="ReactorSettings">
<option name="notificationShown" value="true" />
</component>
@ -130,7 +100,10 @@
<workItem from="1730521606474" duration="564000" />
<workItem from="1730622782400" duration="3318000" />
<workItem from="1730637523268" duration="2746000" />
<workItem from="1730686222084" duration="9161000" />
<workItem from="1730686222084" duration="14019000" />
<workItem from="1730707640328" duration="6890000" />
<workItem from="1730768520960" duration="2315000" />
<workItem from="1730775057656" duration="169000" />
</task>
<task id="LOCAL-00001" summary="更改表名字">
<created>1730470371982</created>
@ -139,7 +112,14 @@
<option name="project" value="LOCAL" />
<updated>1730470371982</updated>
</task>
<option name="localTasksCounter" value="2" />
<task id="LOCAL-00002" summary="更改表名字">
<created>1730697159202</created>
<option name="number" value="00002" />
<option name="presentableId" value="LOCAL-00002" />
<option name="project" value="LOCAL" />
<updated>1730697159202</updated>
</task>
<option name="localTasksCounter" value="3" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">

2
JAVA_MYSQL_WEBSITE/gp-business/src/main/java/com/hc/gpbusiness/dto/WebNewsDto.java
Unescape View File

@ -54,6 +54,8 @@ public class WebNewsDto{
*/
private Integer typeId;
private Integer flag;
/**
* 创建时间
*/

3
JAVA_MYSQL_WEBSITE/gp-business/src/main/java/com/hc/gpbusiness/model/WebBanner.java
Unescape View File

@ -41,6 +41,9 @@ public class WebBanner implements Serializable {
@ApiModelProperty(value = "地址", required = true)
private String bannerUrl;
@ApiModelProperty(value = "图片地址", required = true)
private String bannerPic;
/**
* 索引
*/

6
JAVA_MYSQL_WEBSITE/gp-business/src/main/java/com/hc/gpbusiness/model/WebNews.java
Unescape View File

@ -3,6 +3,7 @@ package com.hc.gpbusiness.model;
import io.swagger.annotations.ApiModelProperty;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
@ -17,8 +18,8 @@ import java.io.Serializable;
* @author java
* @since 2020-07-29 17:28:24
*/
@Builder
@Data
@NoArgsConstructor
public class WebNews implements Serializable {
private static final long serialVersionUID = 485489852911503744L;
@ -68,6 +69,9 @@ public class WebNews implements Serializable {
@ApiModelProperty(value = "分类", required = true)
private Integer typeId;
@ApiModelProperty(value = "置顶", required = true)
private Integer flag;
/**
* 创建时间
*/

8
JAVA_MYSQL_WEBSITE/gp-business/src/main/java/com/hc/gpbusiness/service/impl/WebCourseServiceImpl.java
Unescape View File

@ -5,7 +5,6 @@ import com.hc.gpbusiness.dto.WebCourseDto;
import com.hc.gpbusiness.mapper.WebCourseMapper;
import com.hc.gpbusiness.mapper.WebCourseTypeMapper;
import com.hc.gpbusiness.model.WebCourse;
import com.hc.gpbusiness.model.WebCourse;
import com.hc.gpbusiness.model.WebCourseType;
import com.hc.gpbusiness.service.WebCourseService;
import org.springframework.beans.BeanUtils;
@ -97,10 +96,9 @@ public class WebCourseServiceImpl implements WebCourseService {
*/
@Override
public PageInfo queryAllByLimit(int page, int size, Integer moduleId) {
PageHelper.startPage(page, size);
List<WebCourse> news = this.courseMapper.queryByModuleId(moduleId);
List<WebCourseDto> resultList = copyList(news);
return new PageInfo(resultList);
PageInfo info = PageHelper.startPage(page, size).setOrderBy("create_time desc").doSelectPageInfo(() -> this.courseMapper.queryByModuleId(moduleId));
info.setList(copyList(info.getList()));
return info;
}
public List<WebCourseDto> copyList(List<WebCourse> records) {

24
JAVA_MYSQL_WEBSITE/gp-business/src/main/java/com/hc/gpbusiness/service/impl/WebNewsServiceImpl.java
Unescape View File

@ -97,12 +97,28 @@ public class WebNewsServiceImpl implements WebNewsService {
* @param moduleId 板块id
* @return 对象列表
*/
// @Override
// public PageInfo queryAllByLimit(int page, int size, Integer moduleId) {
// PageHelper.startPage(page, size);
// List<WebNews> news = this.newsMapper.queryNewsByModuleId(moduleId);
// List<WebNewsDto> resultList = copyList(news);
// return new PageInfo(resultList);
// }
//
// public PageInfo queryAllByLimit1(int page, int size, Integer moduleId) {
//
// List<WebNews> news = this.newsMapper.queryNewsByModuleId(moduleId);
// List<WebNewsDto> resultList = copyList(news);
// PageHelper.startPage(page, size).doSelectPage(resultList);
// PageInfo info = new PageInfo(resultList);
// return info;
// }
@Override
public PageInfo queryAllByLimit(int page, int size, Integer moduleId) {
PageHelper.startPage(page, size);
List<WebNews> news = this.newsMapper.queryNewsByModuleId(moduleId);
List<WebNewsDto> resultList = copyList(news);
return new PageInfo(resultList);
PageInfo info = PageHelper.startPage(page, size).setOrderBy("flag desc,create_time desc").doSelectPageInfo(() -> this.newsMapper.queryNewsByModuleId(moduleId));
info.setList(copyList(info.getList()));
return info;
}
public List<WebNewsDto> copyList(List<WebNews> records) {

2
JAVA_MYSQL_WEBSITE/gp-business/src/main/resources/mapper/WebBannerMapper.xml
Unescape View File

@ -5,6 +5,7 @@
<resultMap type="com.hc.gpbusiness.model.WebBanner" id="WebBannerMap">
<result property="bannerId" column="banner_id" jdbcType="INTEGER"/>
<result property="bannerUrl" column="banner_url" jdbcType="VARCHAR"/>
<result property="bannerPic" column="banner_pic" jdbcType="VARCHAR"/>
<result property="bannerIndex" column="banner_index" jdbcType="INTEGER"/>
<result property="createTime" column="create_time" jdbcType="BIGINT"/>
<result property="updateTime" column="update_time" jdbcType="BIGINT"/>
@ -13,6 +14,7 @@
<sql id="Base_Column_List">
banner_id,
banner_url,
banner_pic,
banner_index,
create_time,
update_time

2
JAVA_MYSQL_WEBSITE/gp-business/src/main/resources/mapper/WebCourseMapper.xml
Unescape View File

@ -42,7 +42,7 @@
SELECT
<include refid="Base_Column_List"/>
FROM web_course
WHERE module_id = #{moduleId}
WHERE module_id = #{moduleId} order by create_time desc
</select>
</mapper>

17
JAVA_MYSQL_WEBSITE/gp-business/src/main/resources/mapper/WebNewsMapper.xml
Unescape View File

@ -2,13 +2,14 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hc.gpbusiness.mapper.WebNewsMapper">
<resultMap type="com.hc.gpbusiness.model.WebNews" id="NewsMap">
<resultMap type="com.hc.gpbusiness.model.WebNews" id="WebNewsMap">
<result property="newsId" column="news_id" jdbcType="INTEGER"/>
<result property="newsTitle" column="news_title" jdbcType="VARCHAR"/>
<result property="newsLogo" column="news_logo" jdbcType="VARCHAR"/>
<result property="newsContent" column="news_content" jdbcType="VARCHAR"/>
<result property="moduleId" column="module_id" jdbcType="INTEGER"/>
<result property="typeId" column="type_id" jdbcType="INTEGER"/>
<result property="flag" column="flag" jdbcType="INTEGER"/>
<result property="createTime" column="create_time" jdbcType="BIGINT"/>
<result property="updateTime" column="update_time" jdbcType="BIGINT"/>
</resultMap>
@ -20,15 +21,23 @@
news_content,
module_id,
type_id,
flag,
create_time,
update_time
</sql>
<select id="queryNewsByModuleId" resultMap="NewsMap">
<select id="queryNewsByModuleId" resultMap="WebNewsMap">
SELECT
<include refid="Base_Column_List"/>
news_id,
news_title,
news_logo,
module_id,
type_id,
flag,
create_time,
update_time
FROM web_news
WHERE module_id = #{moduleId}
WHERE module_id = #{moduleId} order by create_time desc
</select>
</mapper>

38
JAVA_MYSQL_WEBSITE/gp-web/src/main/java/com/hc/gpweb/aspect/BackUserAspect.java
Unescape View File

@ -46,25 +46,25 @@ public class BackUserAspect {
(ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
HttpServletRequest request = Objects.requireNonNull(attributes).getRequest();
// //从请求头中获取token
// String token = request.getHeader("token");
//
// if (!Objects.isNull(token)) {
//
// //身份识别
//
// //获取redis中的token 查看token是否过期
// if (Verification.verificationString((String) redisUtil.get(token))) {
// log.info("back 请求-token正常");
// } else {
// log.info("back 请求-redis中的token已过期，请重新登录");
// throw new UserAuthorizeException();
// }
//
// } else {
// log.info("Back request-token is null");
// throw new UserAuthorizeException();
// }
//从请求头中获取token
String token = request.getHeader("token");
if (!Objects.isNull(token)) {
//身份识别
//获取redis中的token 查看token是否过期
if (Verification.verificationString((String) redisUtil.get(token))) {
log.info("back 请求-token正常");
} else {
log.info("back 请求-redis中的token已过期，请重新登录");
throw new UserAuthorizeException();
}
} else {
log.info("Back request-token is null");
throw new UserAuthorizeException();
}
}
}

Write Preview
Loading…
Cancel
Save