diff --git a/src/main/java/com/zhiyun/zhiyun03/academic/controller/AcademicController.java b/src/main/java/com/zhiyun/zhiyun03/academic/controller/AcademicController.java index 8f1e713..3501c4f 100644 --- a/src/main/java/com/zhiyun/zhiyun03/academic/controller/AcademicController.java +++ b/src/main/java/com/zhiyun/zhiyun03/academic/controller/AcademicController.java @@ -8,6 +8,7 @@ import com.zhiyun.zhiyun03.application.entity.Directory; import com.zhiyun.zhiyun03.course.vo.CourseVo; import com.zhiyun.zhiyun03.course.vo.PageVO; import com.zhiyun.zhiyun03.game.vo.GameVo; +import com.zhiyun.zhiyun03.utils.annotation.NoLoginCheck; import com.zhiyun.zhiyun03.utils.common.JsonResult; import com.zhiyun.zhiyun03.utils.common.ResultCode; import com.zhiyun.zhiyun03.utils.oss.AliyunOssUtil; @@ -36,6 +37,7 @@ public class AcademicController { @RequestMapping("/queryAcademic") @ApiOperation("查询学术信息") + @NoLoginCheck public JsonResult> queryCourse(@ApiParam @RequestParam(value = "page",required = false,defaultValue = "1")Integer page, @ApiParam @RequestParam(value = "limit",required = false,defaultValue = "5")Integer limit ){ @@ -48,6 +50,7 @@ public class AcademicController { @PostMapping ("/queryAcademicClient") @ApiOperation("客户端应用中心模块查询") + @NoLoginCheck public JsonResult queryApp(){ List lsit = academicService.queryAcademicClient(); @@ -57,6 +60,7 @@ public class AcademicController { @GetMapping ("/queryDir") @ApiOperation("查询目录") + @NoLoginCheck public JsonResult queryDir(){ List list = academicService.queryDir(); return JsonResult.success(list); @@ -64,6 +68,7 @@ public class AcademicController { @PostMapping("/addAcademic") @ApiOperation("新增学术信息") + public JsonResult addAcademic(AcademicVo academicVo){ academicVo.setAcademicImg(this.path); int result = academicService.addAcademic(academicVo); @@ -75,6 +80,7 @@ public class AcademicController { @RequestMapping("/selectByIdAcademic") @ApiOperation("根据id查询学术信息") + @NoLoginCheck public JsonResult selectByIdAcademic(Integer id){ if (id!=null){ AcademicVo academicVo = academicService.selectByIdAcademic(id); @@ -85,6 +91,7 @@ public class AcademicController { @PostMapping("/updateAcademic") @ApiOperation("更新学术信息") + public JsonResult updateAcademic(AcademicVo academicVo){ academicVo.setAcademicImg(this.path); int result = academicService.updateAcademic(academicVo); @@ -96,6 +103,7 @@ public class AcademicController { @RequestMapping("/deleteAcademic") @ApiOperation("删除学术信息") + public JsonResult deleteAcademic(Integer id){ int result = academicService.deleteAcademic(id); if(result>0){ @@ -107,6 +115,7 @@ public class AcademicController { @ApiOperation("文件/图片上传") @PostMapping("/upload") + public JsonResult upload(@RequestParam("file") @RequestPart MultipartFile file) { String upload = null; try { @@ -132,6 +141,7 @@ public class AcademicController { @RequestMapping("/addDirectory") @ApiOperation("新增目录") + public JsonResult addDirectory( Directory directory){ int result = academicService.addDirectory(directory); if(result>0){ @@ -143,6 +153,7 @@ public class AcademicController { @ApiOperation("目录删除") + @GetMapping("/delDownloadDirectory") public JsonResult delAcademicDirectory(String dirName){ academicService.delCourseDirectory(dirName); @@ -151,6 +162,7 @@ public class AcademicController { @PostMapping ("/updateDir") @ApiOperation("更新目录") + public JsonResult updateDir(Directory directory){ academicService.updateDir(directory); return JsonResult.success(ResultCode.SUCCESS); diff --git a/src/main/java/com/zhiyun/zhiyun03/application/controller/ApplicationController.java b/src/main/java/com/zhiyun/zhiyun03/application/controller/ApplicationController.java index 025908c..9c6c87b 100644 --- a/src/main/java/com/zhiyun/zhiyun03/application/controller/ApplicationController.java +++ b/src/main/java/com/zhiyun/zhiyun03/application/controller/ApplicationController.java @@ -7,6 +7,7 @@ import com.zhiyun.zhiyun03.application.vo.ApplicationVo; import com.zhiyun.zhiyun03.application.vo.ClientApplicationVo; import com.zhiyun.zhiyun03.course.entity.Course; import com.zhiyun.zhiyun03.course.vo.PageVO; +import com.zhiyun.zhiyun03.utils.annotation.NoLoginCheck; import com.zhiyun.zhiyun03.utils.common.JsonResult; import com.zhiyun.zhiyun03.utils.common.ResultCode; import io.swagger.annotations.Api; @@ -27,6 +28,7 @@ public class ApplicationController { @GetMapping ("/queryApplication") @ApiOperation("查询应用") + @NoLoginCheck public JsonResult> queryApplication(@ApiParam @RequestParam(value = "page",required = false,defaultValue = "1")Integer page, @ApiParam @RequestParam(value = "limit",required = false,defaultValue = "5")Integer limit ){ @@ -37,6 +39,7 @@ public class ApplicationController { @GetMapping ("/queryAppCourseDirectory") @ApiOperation("查询目录") + @NoLoginCheck public JsonResult queryAppCourseDirectory(){ List list = applicationService.queryDirectory(); return JsonResult.success(list); @@ -44,6 +47,7 @@ public class ApplicationController { @PostMapping ("/queryApp") @ApiOperation("客户端应用中心模块查询") + @NoLoginCheck public JsonResult queryApp(){ List lsit = applicationService.queryApp(); @@ -63,6 +67,7 @@ public class ApplicationController { @RequestMapping("/selectByIdApplication") @ApiOperation("根据id查询应用") + @NoLoginCheck public JsonResult selectByIdApplication(Integer id){ if(id!=null){ ApplicationVo applicationVo = applicationService.selectByIdApplication(id); @@ -103,6 +108,7 @@ public class ApplicationController { @PostMapping("/dirSequence") @ApiOperation("目录排序") + @NoLoginCheck public JsonResult dirSequence(String dirName){ applicationService.dirSequence(dirName); return JsonResult.success(ResultCode.SUCCESS); @@ -110,6 +116,7 @@ public class ApplicationController { @GetMapping ("/queryDir") @ApiOperation("查询目录") + @NoLoginCheck public JsonResult queryDir(){ List list = applicationService.queryDir(); return JsonResult.success(list); diff --git a/src/main/java/com/zhiyun/zhiyun03/application/service/impl/ApplicationServiceImpl.java b/src/main/java/com/zhiyun/zhiyun03/application/service/impl/ApplicationServiceImpl.java index c1a5ec4..afe39ef 100644 --- a/src/main/java/com/zhiyun/zhiyun03/application/service/impl/ApplicationServiceImpl.java +++ b/src/main/java/com/zhiyun/zhiyun03/application/service/impl/ApplicationServiceImpl.java @@ -73,6 +73,7 @@ public class ApplicationServiceImpl extends ServiceImpl> queryCourse(@ApiParam @RequestParam(value = "page",required = false,defaultValue = "1")Integer page, @ApiParam @RequestParam(value = "limit",required = false,defaultValue = "10")Integer limit ){ @@ -55,6 +57,7 @@ public class CourseController { @PostMapping ("/queryApp") @ApiOperation("客户端课程中心模块查询") + @NoLoginCheck public JsonResult queryApp(){ List lsit = courseService.queryCourseClient(); @@ -67,6 +70,7 @@ public class CourseController { */ @ApiOperation("根据ID查询课程") @GetMapping("/queryCourseById") + @NoLoginCheck public JsonResult queryCourseById(Integer id){ CourseVo courseVo =courseService.queryCourseById(id); @@ -122,6 +126,7 @@ public class CourseController { @ApiOperation("查询目录") @GetMapping("/queryCourseDirectory") + @NoLoginCheck public JsonResult queryCourseDirectory(){ List directory = courseService.queryCourseDirectory(); @@ -131,6 +136,7 @@ public class CourseController { @PostMapping("/dirSequence") @ApiOperation("目录排序") + @NoLoginCheck public JsonResult dirSequence(Course course){ courseService.dirSequence(course); diff --git a/src/main/java/com/zhiyun/zhiyun03/download/controller/DownloadController.java b/src/main/java/com/zhiyun/zhiyun03/download/controller/DownloadController.java index 44aa988..28973fa 100644 --- a/src/main/java/com/zhiyun/zhiyun03/download/controller/DownloadController.java +++ b/src/main/java/com/zhiyun/zhiyun03/download/controller/DownloadController.java @@ -6,6 +6,7 @@ import com.zhiyun.zhiyun03.course.vo.PageVO; import com.zhiyun.zhiyun03.download.service.DownloadService; import com.zhiyun.zhiyun03.download.vo.ClientDownloadVo; import com.zhiyun.zhiyun03.download.vo.DownloadVo; +import com.zhiyun.zhiyun03.utils.annotation.NoLoginCheck; import com.zhiyun.zhiyun03.utils.common.JsonResult; import com.zhiyun.zhiyun03.utils.common.ResultCode; import com.zhiyun.zhiyun03.utils.oss.AliyunOssUtil; @@ -33,6 +34,7 @@ public class DownloadController { @ApiOperation("查询下载中心") @GetMapping("/queryDownload") + @NoLoginCheck public JsonResult> queryDownload(@ApiParam @RequestParam(value = "page",required = false,defaultValue = "1")Integer page, @ApiParam @RequestParam(value = "limit",required = false,defaultValue = "5")Integer limit ){ @@ -43,6 +45,7 @@ public class DownloadController { @PostMapping ("/queryDow") @ApiOperation("客户端下载中心模块查询") + @NoLoginCheck public JsonResult queryApp(){ List lsit = downloadService.queryDown(); @@ -69,6 +72,7 @@ public class DownloadController { @ApiOperation("根据Id查询") @PostMapping("/queryById") + @NoLoginCheck public JsonResult queryById(Integer id){ DownloadVo downloadAddVo =downloadService.queryById(id); return JsonResult.success(downloadAddVo); @@ -128,6 +132,7 @@ public class DownloadController { @ApiOperation("查询目录") @GetMapping("/queryDownloadDirectory") + @NoLoginCheck public JsonResult queryDownloadDirectory(){ List directory = downloadService.queryDownloadDirectory(); diff --git a/src/main/java/com/zhiyun/zhiyun03/game/controller/GameController.java b/src/main/java/com/zhiyun/zhiyun03/game/controller/GameController.java index 00557b3..ece79be 100644 --- a/src/main/java/com/zhiyun/zhiyun03/game/controller/GameController.java +++ b/src/main/java/com/zhiyun/zhiyun03/game/controller/GameController.java @@ -8,6 +8,7 @@ import com.zhiyun.zhiyun03.game.entity.Game; import com.zhiyun.zhiyun03.game.service.GameService; import com.zhiyun.zhiyun03.game.vo.ClientGameVo; import com.zhiyun.zhiyun03.game.vo.GameVo; +import com.zhiyun.zhiyun03.utils.annotation.NoLoginCheck; import com.zhiyun.zhiyun03.utils.common.JsonResult; import com.zhiyun.zhiyun03.utils.common.ResultCode; import com.zhiyun.zhiyun03.utils.oss.AliyunOssUtil; @@ -37,6 +38,7 @@ public class GameController { @RequestMapping("/queryGame") @ApiOperation("查询大赛信息") + @NoLoginCheck public JsonResult> queryGame(@ApiParam @RequestParam(value = "page",required = false,defaultValue = "1")Integer page, @ApiParam @RequestParam(value = "limit",required = false,defaultValue = "5")Integer limit ){ @@ -47,6 +49,7 @@ public class GameController { @PostMapping ("/queryGameGame") + @NoLoginCheck @ApiOperation("客户端大赛中心模块查询") public JsonResult queryApp(){ @@ -69,6 +72,7 @@ public class GameController { @RequestMapping("/selectByIdGame") @ApiOperation("根据id查询大赛信息") + @NoLoginCheck public JsonResult selectByIdGame(Integer id){ if (id!=null){ GameVo gameVo = gameService.selectByIdGame(id); @@ -126,6 +130,7 @@ public class GameController { } @GetMapping ("/queryDir") @ApiOperation("查询目录") + @NoLoginCheck public JsonResult queryDir(){ List list = gameService.queryDir(); return JsonResult.success(list); diff --git a/src/main/java/com/zhiyun/zhiyun03/invite/controller/InviteController.java b/src/main/java/com/zhiyun/zhiyun03/invite/controller/InviteController.java index 52c0e2b..961a342 100644 --- a/src/main/java/com/zhiyun/zhiyun03/invite/controller/InviteController.java +++ b/src/main/java/com/zhiyun/zhiyun03/invite/controller/InviteController.java @@ -9,6 +9,7 @@ import com.zhiyun.zhiyun03.invite.service.InviteService; import com.zhiyun.zhiyun03.invite.vo.ClientInviteVo; import com.zhiyun.zhiyun03.invite.vo.InviteVo; import com.zhiyun.zhiyun03.serve.vo.ServeVo; +import com.zhiyun.zhiyun03.utils.annotation.NoLoginCheck; import com.zhiyun.zhiyun03.utils.common.JsonResult; import com.zhiyun.zhiyun03.utils.common.ResultCode; import io.swagger.annotations.Api; @@ -28,6 +29,7 @@ public class InviteController { @ApiOperation("查询就业") @GetMapping("/queryInvite") + @NoLoginCheck public JsonResult> queryServe(@ApiParam @RequestParam(value = "page",required = false,defaultValue = "1")Integer page, @ApiParam @RequestParam(value = "limit",required = false,defaultValue = "5")Integer limit ){ @@ -38,6 +40,7 @@ public class InviteController { @ApiOperation("根据ID查询就业") @GetMapping("/queryInviteById") + @NoLoginCheck public JsonResult queryCourseById(Integer id){ InviteVo inviteVo =inviteService.queryInviteById(id); @@ -48,6 +51,7 @@ public class InviteController { @PostMapping ("/queryApp") @ApiOperation("客户端就业中心模块查询") + @NoLoginCheck public JsonResult queryApp(){ List lsit = inviteService.queryInviteClient(); @@ -93,6 +97,7 @@ public class InviteController { @ApiOperation("查询目录") @GetMapping("/queryInviteDirectory") + @NoLoginCheck public JsonResult querycDirectory(){ List directory = inviteService.queryInviteDirectory(); diff --git a/src/main/java/com/zhiyun/zhiyun03/knowledge/controller/KnowledgeController.java b/src/main/java/com/zhiyun/zhiyun03/knowledge/controller/KnowledgeController.java index fa53aed..b0d277a 100644 --- a/src/main/java/com/zhiyun/zhiyun03/knowledge/controller/KnowledgeController.java +++ b/src/main/java/com/zhiyun/zhiyun03/knowledge/controller/KnowledgeController.java @@ -8,6 +8,7 @@ import com.zhiyun.zhiyun03.knowledge.service.KnowledgeService; import com.zhiyun.zhiyun03.knowledge.vo.ClientKnowledgeVo; import com.zhiyun.zhiyun03.knowledge.vo.KnowledgeVo; import com.zhiyun.zhiyun03.textual.vo.TextualVo; +import com.zhiyun.zhiyun03.utils.annotation.NoLoginCheck; import com.zhiyun.zhiyun03.utils.common.JsonResult; import com.zhiyun.zhiyun03.utils.common.ResultCode; import com.zhiyun.zhiyun03.utils.oss.AliyunOssUtil; @@ -36,6 +37,7 @@ public class KnowledgeController { private String path = ""; @RequestMapping("/queryKnowledge") @ApiOperation("查询考证信息") + @NoLoginCheck public JsonResult> queryKnowledge(@ApiParam @RequestParam(value = "page",required = false,defaultValue = "1")Integer page, @ApiParam @RequestParam(value = "limit",required = false,defaultValue = "5")Integer limit ){ @@ -47,6 +49,7 @@ public class KnowledgeController { @PostMapping ("/queryApp") @ApiOperation("客户端知识中心模块查询") + @NoLoginCheck public JsonResult queryApp(){ List lsit = knowledgeService.queryKnowledgeClient(); @@ -137,6 +140,7 @@ public class KnowledgeController { } @GetMapping ("/queryDir") @ApiOperation("查询目录") + @NoLoginCheck public JsonResult queryDir(){ List list = knowledgeService.queryDir(); return JsonResult.success(list); diff --git a/src/main/java/com/zhiyun/zhiyun03/login/util/JwtUtils.java b/src/main/java/com/zhiyun/zhiyun03/login/util/JwtUtils.java index 6316d24..0460bfe 100644 --- a/src/main/java/com/zhiyun/zhiyun03/login/util/JwtUtils.java +++ b/src/main/java/com/zhiyun/zhiyun03/login/util/JwtUtils.java @@ -1,10 +1,13 @@ package com.zhiyun.zhiyun03.login.util; +import com.zhiyun.zhiyun03.utils.common.ResultCode; +import com.zhiyun.zhiyun03.utils.exception.TokenException; import io.jsonwebtoken.Claims; import io.jsonwebtoken.JwtBuilder; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; +import com.zhiyun.zhiyun03.utils.exception.ServiceException; import java.util.Date; import java.util.Map; @@ -40,7 +43,7 @@ public class JwtUtils { //构造jwt JwtBuilder builder = Jwts.builder()//.setHeaderParam("type","jwt") // 设置头 .setClaims(claims) // 设置载荷 - .setExpiration(new Date(System.currentTimeMillis() + 1800000)) // 设置过期时间 + .setExpiration(new Date(System.currentTimeMillis() + 172800000)) // 设置过期时间 .signWith(signatureAlgorithm, SECRET_ZHIYUN); // 使用指定算法设置签名 //生成jwt return builder.compact(); @@ -52,14 +55,14 @@ public class JwtUtils { * @param jsonWebToken * @return */ - public static Claims parseJWT(String jsonWebToken) { + public static Claims parseJWT(String jsonWebToken) throws ServiceException { try { Claims claims = Jwts.parser() .setSigningKey(SECRET_ZHIYUN) .parseClaimsJws(jsonWebToken).getBody(); return claims; } catch (Exception ex) { - throw new RuntimeException("Token已过期"); + throw new TokenException("1","Token已过期"); } } } diff --git a/src/main/java/com/zhiyun/zhiyun03/serve/controller/ServeController.java b/src/main/java/com/zhiyun/zhiyun03/serve/controller/ServeController.java index 7f413de..e6fe42f 100644 --- a/src/main/java/com/zhiyun/zhiyun03/serve/controller/ServeController.java +++ b/src/main/java/com/zhiyun/zhiyun03/serve/controller/ServeController.java @@ -9,6 +9,7 @@ import com.zhiyun.zhiyun03.download.vo.DownloadVo; import com.zhiyun.zhiyun03.serve.service.ServeService; import com.zhiyun.zhiyun03.serve.vo.ClientServeVo; import com.zhiyun.zhiyun03.serve.vo.ServeVo; +import com.zhiyun.zhiyun03.utils.annotation.NoLoginCheck; import com.zhiyun.zhiyun03.utils.common.JsonResult; import com.zhiyun.zhiyun03.utils.common.ResultCode; import com.zhiyun.zhiyun03.utils.oss.AliyunOssUtil; @@ -39,6 +40,7 @@ public class ServeController { @ApiOperation("查询服务中心") @GetMapping("/queryServe") + @NoLoginCheck public JsonResult> queryServe(@ApiParam @RequestParam(value = "page",required = false,defaultValue = "1")Integer page, @ApiParam @RequestParam(value = "limit",required = false,defaultValue = "5")Integer limit ){ @@ -49,6 +51,7 @@ public class ServeController { @PostMapping ("/queryServeClient") @ApiOperation("客户端服务中心模块查询") + @NoLoginCheck public JsonResult queryApp(){ List lsit = serveService.queryServeClient(); @@ -103,6 +106,7 @@ public class ServeController { @ApiOperation("根据Id查询") @PostMapping("/queryServe") + @NoLoginCheck public JsonResult queryServe(Integer id){ ServeVo serveVo =serveService.queryById(id); return JsonResult.success(serveVo); @@ -131,6 +135,7 @@ public class ServeController { @ApiOperation("查询目录") @GetMapping("/queryServiceDirectory") + @NoLoginCheck public JsonResult queryServiceDirectory(){ List directory = serveService.queryServiceDirectory(); diff --git a/src/main/java/com/zhiyun/zhiyun03/textual/controller/TextualController.java b/src/main/java/com/zhiyun/zhiyun03/textual/controller/TextualController.java index b585cfb..ae5af4c 100644 --- a/src/main/java/com/zhiyun/zhiyun03/textual/controller/TextualController.java +++ b/src/main/java/com/zhiyun/zhiyun03/textual/controller/TextualController.java @@ -8,6 +8,7 @@ import com.zhiyun.zhiyun03.knowledge.vo.KnowledgeVo; import com.zhiyun.zhiyun03.textual.service.TextualService; import com.zhiyun.zhiyun03.textual.vo.ClientTextualVo; import com.zhiyun.zhiyun03.textual.vo.TextualVo; +import com.zhiyun.zhiyun03.utils.annotation.NoLoginCheck; import com.zhiyun.zhiyun03.utils.common.JsonResult; import com.zhiyun.zhiyun03.utils.common.ResultCode; import io.swagger.annotations.ApiOperation; @@ -25,6 +26,7 @@ public class TextualController { @RequestMapping("/queryTextual") @ApiOperation("查询考证信息") + @NoLoginCheck public JsonResult> queryTextual(@ApiParam @RequestParam(value = "page",required = false,defaultValue = "1")Integer page, @ApiParam @RequestParam(value = "limit",required = false,defaultValue = "5")Integer limit ){ @@ -35,6 +37,7 @@ public class TextualController { @PostMapping ("/queryTextualClient") @ApiOperation("客户端考证中心模块查询") + @NoLoginCheck public JsonResult queryApp(){ List lsit = textualService.queryTextualClient(); @@ -83,6 +86,7 @@ public class TextualController { } @GetMapping ("/queryDir") @ApiOperation("查询目录") + @NoLoginCheck public JsonResult queryDir(){ List list = textualService.queryDir(); return JsonResult.success(list); diff --git a/src/main/java/com/zhiyun/zhiyun03/user/controller/ApplicationLoginController.java b/src/main/java/com/zhiyun/zhiyun03/user/controller/ApplicationLoginController.java index e09622b..4325a2f 100644 --- a/src/main/java/com/zhiyun/zhiyun03/user/controller/ApplicationLoginController.java +++ b/src/main/java/com/zhiyun/zhiyun03/user/controller/ApplicationLoginController.java @@ -16,6 +16,7 @@ import com.zhiyun.zhiyun03.user.entity.SchoolAndOtherInfos; import com.zhiyun.zhiyun03.user.entity.UniversitiesCcolleges; import com.zhiyun.zhiyun03.utils.common.JsonResult; import com.zhiyun.zhiyun03.utils.common.ResultCode; +import com.zhiyun.zhiyun03.utils.exception.ServiceException; import io.jsonwebtoken.Claims; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -27,6 +28,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; +import javax.sql.rowset.serial.SerialException; import java.security.MessageDigest; import java.sql.*; @@ -113,15 +115,34 @@ public class ApplicationLoginController { CoreUser user = objectMapperEncry.readValue(userInfoJsonEncry, CoreUser.class); + if ("供应链金融实训系统".equals(applicationName)){ + applicationName = "天择供应链金融实训系统V1.0"; + } + + if ("外汇模拟交易系统".equals(applicationName)){ + applicationName = "天择外汇模拟交易实训系统"; + } + if ("区块链实验教学系统".equals(applicationName)){ + applicationName = "区块链平台"; + } + if ("数字经济综合实训平台".equals(applicationName)){ + applicationName = "数字经济实训平台"; + } + + + //验证使用权,是否到期 UniversitiesCcolleges map = universitiesCollegesGetByOrgId(user.getOrgId()); if (map==null) { - return JsonResult.error(ResultCode.Fail,"登录失败,此院校不存在"); + return JsonResult.error(ResultCode.ERROR,"生成跳转链接失败!"); } String realUrl = queryMyApplicationByConditionQuery(applicationName,user); + + + return JsonResult.success(realUrl); @@ -167,7 +188,7 @@ public class ApplicationLoginController { ps.close(); closeConn(conn); } catch (SQLException e) { - throw new RuntimeException(e); + throw new ServiceException("202","查询不到该用户"); } } return null; @@ -418,10 +439,10 @@ public class ApplicationLoginController { ps.close(); closeConn(conn); } catch (SQLException e) { - throw new RuntimeException(e); + throw new ServiceException("202","查询不到该用户"); } } - throw new RuntimeException("查询不到该用户"); + throw new ServiceException("202","查询不到该用户"); } @@ -464,14 +485,19 @@ public class ApplicationLoginController { } + if (applicationLink == null) + { + throw new ServiceException("202","查询不到该用户"); + } + }catch (Exception e) { - e.printStackTrace(); + throw new ServiceException("202","查询不到该用户"); } finally { try { ps.close(); closeConn(conn); } catch (SQLException e) { - throw new RuntimeException(e); + throw new ServiceException("202","查询不到该用户"); } } diff --git a/src/main/java/com/zhiyun/zhiyun03/user/controller/UserController.java b/src/main/java/com/zhiyun/zhiyun03/user/controller/UserController.java index 9c2d784..f561f56 100644 --- a/src/main/java/com/zhiyun/zhiyun03/user/controller/UserController.java +++ b/src/main/java/com/zhiyun/zhiyun03/user/controller/UserController.java @@ -25,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; + import javax.annotation.Resource; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; @@ -224,25 +225,23 @@ public class UserController { String sql = "SELECT * from resources_application as a inner join (select type_id from universities_colleges_jurisdiction_experimental_system where org_id='" + orgId + "' and type=1) as b on a.resources_application_id=b.type_id"; ps = conn.prepareStatement(sql); ResultSet resultSet = ps.executeQuery(); - + int j = 31; while (resultSet.next()) { QueryWrapper qwa = new QueryWrapper<>(); qwa.lambda().eq(Application::getAppName, resultSet.getString(2)); Application application = applicationMapper.selectOne(qwa); ApplicationIconVo applicationIconVo = new ApplicationIconVo(); + if (application == null) { String name = resultSet.getString(2); String url = resultSet.getString(3); - for (int i = 31; i <= 36; i++) { - applicationIconVo.setClientIcon(String.valueOf(i)); - applicationIconVo.setAppIcon(String.valueOf(i)); - } + + applicationIconVo.setClientIcon(String.valueOf(j)); + applicationIconVo.setAppIcon("https://zhiyun03.oss-cn-beijing.aliyuncs.com/images/"+String.valueOf(j)+".png"); applicationIconVo.setAppName(name); applicationIconVo.setAppUrl(url); - list.add(applicationIconVo); - - + j++; } else { String appIcon = application.getAppIcon(); int i = appIcon.lastIndexOf("/"); @@ -254,6 +253,7 @@ public class UserController { applicationIconVo.setClientIcon(substring1); list.add(applicationIconVo); } + } } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/zhiyun/zhiyun03/utils/config/MyWebMvcConfig.java b/src/main/java/com/zhiyun/zhiyun03/utils/config/MyWebMvcConfig.java index 4b8ae08..0208c2b 100644 --- a/src/main/java/com/zhiyun/zhiyun03/utils/config/MyWebMvcConfig.java +++ b/src/main/java/com/zhiyun/zhiyun03/utils/config/MyWebMvcConfig.java @@ -32,6 +32,9 @@ public class MyWebMvcConfig extends WebMvcConfigurationSupport { String[] excludePathPatterns = {"/login.html", "/images/","/layui/**/","/user/login","/favicon.ico","/iconfont.*", "/confont.*" }; +// // 配置要排除的路径,将Swagger的路径添加到排除列表中 +// String[] excludePathPatterns = {"/login.html", "/images/", "/layui/**/", "/user/login", "/favicon.ico", "/iconfont.*", +// "/confont.*", "/swagger-ui.html", "/v2/api-docs"}; // 注册拦截器 registry.addInterceptor(new LoginIntercetor()).addPathPatterns(addPathPatterns).excludePathPatterns(excludePathPatterns); super.addInterceptors(registry); diff --git a/src/main/java/com/zhiyun/zhiyun03/utils/exception/GlobalExceptionHandler.java b/src/main/java/com/zhiyun/zhiyun03/utils/exception/GlobalExceptionHandler.java index f9d2784..df9ed7e 100644 --- a/src/main/java/com/zhiyun/zhiyun03/utils/exception/GlobalExceptionHandler.java +++ b/src/main/java/com/zhiyun/zhiyun03/utils/exception/GlobalExceptionHandler.java @@ -19,7 +19,16 @@ public class GlobalExceptionHandler { public JsonResult serviceExceptionHandler(ServiceException e) { log.error("异常信息", e); - return JsonResult.error(ResultCode.Fail, e.getMsg()); + return JsonResult.error(ResultCode.PARAM_ERROR, e.getMsg()); + + } + + @ExceptionHandler(TokenException.class) + public JsonResult serviceExceptionHandler(TokenException e) { + log.error("异常信息", e); + + return JsonResult.error(ResultCode.ERROR, e.getMsg()); + } diff --git a/src/main/java/com/zhiyun/zhiyun03/utils/exception/TokenException.java b/src/main/java/com/zhiyun/zhiyun03/utils/exception/TokenException.java new file mode 100644 index 0000000..12171ae --- /dev/null +++ b/src/main/java/com/zhiyun/zhiyun03/utils/exception/TokenException.java @@ -0,0 +1,33 @@ +package com.zhiyun.zhiyun03.utils.exception; + +public class TokenException extends RuntimeException { + + private String code; + private String msg; + + public TokenException() { + } + + public TokenException(String code, String msg) { + super(msg); + this.code = code; + this.msg = msg; + + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getMsg() { + return msg; + } + + public void setMsg(String msg) { + this.msg = msg; + } +}