From b0fb89ab3919990d3a3f4c3eefb2c3c3d7d49bc3 Mon Sep 17 00:00:00 2001 From: zhouwentao <1577701412@qq.com> Date: Fri, 8 Mar 2024 21:03:14 +0800 Subject: [PATCH] updates --- .../ArtRecommendMajorController.java | 104 +++++++++++------- .../mini/controller/MiniMajorController.java | 42 +++++++ .../controller/YxScoreSegmentController.java | 3 +- .../yx/service/impl/YxMajorServiceImpl.java | 1 + .../yx/service/impl/YxSchoolServiceImpl.java | 12 +- .../src/main/resources/application-test.yml | 56 ++++------ 6 files changed, 141 insertions(+), 77 deletions(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/controller/ArtRecommendMajorController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/controller/ArtRecommendMajorController.java index 10e1d40..755b87b 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/controller/ArtRecommendMajorController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/controller/ArtRecommendMajorController.java @@ -8,7 +8,9 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; +import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.AssertUtils; import org.jeecg.common.util.RedisUtil; import org.jeecg.modules.art.dto.ArtCalculateInvestmentDTO; @@ -16,12 +18,11 @@ import org.jeecg.modules.art.dto.ArtRecommendMajorBaseDTO; import org.jeecg.modules.art.dto.ArtTestCulturalDTO; import org.jeecg.modules.art.vo.QueryCalculateInvestmentVO; import org.jeecg.modules.art.vo.QueryRecommendMajorVO; -import org.jeecg.modules.yx.entity.YxHistoryMajorEnroll; -import org.jeecg.modules.yx.entity.YxHistoryScoreControlLine; -import org.jeecg.modules.yx.entity.YxSchoolMajor; +import org.jeecg.modules.yx.entity.*; import org.jeecg.modules.yx.service.IYxHistoryMajorEnrollService; import org.jeecg.modules.yx.service.IYxHistoryScoreControlLineService; import org.jeecg.modules.yx.service.IYxSchoolMajorService; +import org.jeecg.modules.yx.service.IYxUserScoreService; import org.jeecg.modules.yx.util.ScoreUtil; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,6 +45,8 @@ public class ArtRecommendMajorController { @Resource IYxSchoolMajorService yxSchoolMajorService; @Resource + IYxUserScoreService yxUserScoreService; + @Resource IYxHistoryMajorEnrollService yxHistoryMajorEnrollService; @Resource IYxHistoryScoreControlLineService yxHistoryScoreControlLineService; @@ -52,30 +55,30 @@ public class ArtRecommendMajorController { @ApiOperation(value = "获取可报专业总数") @GetMapping("/rulesEnrollrobabilityMenuList") - public Result rulesEnrollrobabilityMenuList(QueryRecommendMajorVO queryRecommendMajorVO){ - String key = "rulesEnrollrobabilityMenuList_professionalCategory_"+queryRecommendMajorVO.getProfessionalCategory(); + public Result rulesEnrollrobabilityMenuList(QueryRecommendMajorVO queryRecommendMajorVO) { + String key = "rulesEnrollrobabilityMenuList_professionalCategory_" + queryRecommendMajorVO.getProfessionalCategory(); String json = null; - List dataList =new ArrayList<>(); - Map data=null; + List dataList = new ArrayList<>(); + Map data = null; if (redisUtil.hasKey(key)) { - json = (String)redisUtil.get(key); - dataList = JSONArray.parseArray(json,Map.class); - }else{ + json = (String) redisUtil.get(key); + dataList = JSONArray.parseArray(json, Map.class); + } else { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.select(YxSchoolMajor::getRulesEnrollProbability); - lambdaQueryWrapper.eq(YxSchoolMajor::getMajorType,queryRecommendMajorVO.getProfessionalCategory()); + lambdaQueryWrapper.eq(YxSchoolMajor::getMajorType, queryRecommendMajorVO.getProfessionalCategory()); lambdaQueryWrapper.last("order by field(rules_enroll_probability,'','文过专排','专过文排')"); lambdaQueryWrapper.isNotNull(YxSchoolMajor::getRulesEnrollProbability); lambdaQueryWrapper.groupBy(YxSchoolMajor::getRulesEnrollProbability); List yxSchoolMajorList = yxSchoolMajorService.list(lambdaQueryWrapper); for (YxSchoolMajor yxSchoolMajor : yxSchoolMajorList) { data = new LinkedHashMap<>(); - data.put("label",yxSchoolMajor.getRulesEnrollProbability()); - data.put("value",yxSchoolMajor.getRulesEnrollProbability()); + data.put("label", yxSchoolMajor.getRulesEnrollProbability()); + data.put("value", yxSchoolMajor.getRulesEnrollProbability()); dataList.add(data); } json = JSONObject.toJSONString(dataList); - redisUtil.set(key,json,3600); + redisUtil.set(key, json, 3600); } return Result.OK(dataList); @@ -83,7 +86,7 @@ public class ArtRecommendMajorController { @ApiOperation(value = "获取可报专业总数") @GetMapping("/recommendMajorCount") - public Result recommendMajorCount(QueryRecommendMajorVO queryRecommendMajorVO){ + public Result recommendMajorCount(QueryRecommendMajorVO queryRecommendMajorVO) { return Result.OK(yxSchoolMajorService.recommendMajorCount(queryRecommendMajorVO)); } @@ -132,7 +135,7 @@ public class ArtRecommendMajorController { for (YxSchoolMajor yxSchoolMajor : yxSchoolMajorList) { *//*key = yxSchoolMajor.getMajorType()+"_"+yxSchoolMajor.getCategory()+"_"+yxSchoolMajor.getSchoolCode()+"_"+yxSchoolMajor.getMajorName()+"_"+yxSchoolMajor.getBatch(); yxHistoryMajorEnroll = maps1.get(key);*//* - *//*if (yxHistoryMajorEnroll!=null) { + *//*if (yxHistoryMajorEnroll!=null) { yxSchoolMajor.setRulesEnrollProbability(ScoreUtil.replaceLastZeroChar(yxHistoryMajorEnroll.getRulesEnrollProbability())); yxSchoolMajor.setProbabilityOperator(ScoreUtil.replaceLastZeroChar(yxHistoryMajorEnroll.getProbabilityOperator())); }*//* @@ -197,30 +200,55 @@ public class ArtRecommendMajorController { @ApiOperation(value = "文化分测算") @GetMapping(value = "/testCultural") public Result testCultural(QueryRecommendMajorVO queryRecommendMajorVO) { + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); //根据 院校代码，获取 院校的招生专业，计算各专业的录取分数 String schoolCode = queryRecommendMajorVO.getSchoolCode(); String year = queryRecommendMajorVO.getYear(); + AssertUtils.notNull(loginUser, "未获取到登录信息"); AssertUtils.notNull(year, "请选择年份"); + YxUserScore userScore = yxUserScoreService.getActiveCurrentUserScore(); + List artTestCulturalDtoList = new ArrayList<>(); + //查询条件构建对象 + LambdaQueryWrapper yxSchoolMajorLambdaQueryWrapper = new LambdaQueryWrapper<>(); + LambdaQueryWrapper yxHistoryMajorEnrollLambdaQueryWrapper = new LambdaQueryWrapper<>(); + LambdaQueryWrapper yxHistoryScoreControlLineLambdaQueryWrapper = new LambdaQueryWrapper<>(); + if (userScore != null) { + //根据当前用户的专业类别查询 + yxSchoolMajorLambdaQueryWrapper.eq(YxSchoolMajor::getMajorType, userScore.getProfessionalCategory()); +// yxSchoolMajorLambdaQueryWrapper.eq(YxSchoolMajor::getBatch,userScore.getBatch()); + yxHistoryScoreControlLineLambdaQueryWrapper.eq(YxHistoryScoreControlLine::getProfessionalCategory, userScore.getProfessionalCategory()); + } String a_ = "_"; - List yxSchoolMajorList = yxSchoolMajorService.list(new LambdaQueryWrapper().eq(YxSchoolMajor::getSchoolCode, schoolCode)); + yxSchoolMajorLambdaQueryWrapper.eq(YxSchoolMajor::getSchoolCode, schoolCode); + List yxSchoolMajorList = yxSchoolMajorService.list(yxSchoolMajorLambdaQueryWrapper); + if (CollectionUtils.isEmpty(yxSchoolMajorList)) { + return Result.OK(artTestCulturalDtoList); + } + yxSchoolMajorList = yxSchoolMajorList.stream().collect(Collectors.collectingAndThen( + Collectors.toCollection(() -> new TreeSet<>( + Comparator.comparing(p -> p.getRulesEnrollProbability()))), ArrayList::new)); + Set majorNameSet = yxSchoolMajorList.stream().map(YxSchoolMajor::getMajorName).collect(Collectors.toSet()); - //获取 历年分数信息 - List yxHistoryMajorEnrollList = yxHistoryMajorEnrollService.list(new LambdaQueryWrapper() - .orderByDesc(YxHistoryMajorEnroll::getYear) - .eq(YxHistoryMajorEnroll::getSchoolCode, schoolCode) - .in(YxHistoryMajorEnroll::getMajorName, majorNameSet)); - Map historyMajorEnrollMap = yxHistoryMajorEnrollList.stream().collect(Collectors.toMap(h -> h.getYear() + a_ + h.getCategory() + a_ + h.getMajorName() + a_ + h.getBatch(), h -> h)); + yxHistoryMajorEnrollLambdaQueryWrapper.orderByDesc(YxHistoryMajorEnroll::getYear); + yxHistoryMajorEnrollLambdaQueryWrapper.eq(YxHistoryMajorEnroll::getSchoolCode, schoolCode); + yxHistoryMajorEnrollLambdaQueryWrapper.in(YxHistoryMajorEnroll::getMajorName, majorNameSet); + //获取 历年分数信息 + List yxHistoryMajorEnrollList = yxHistoryMajorEnrollService.list(yxHistoryMajorEnrollLambdaQueryWrapper); + Map historyMajorEnrollMap = new LinkedHashMap<>(); + for (YxHistoryMajorEnroll h : yxHistoryMajorEnrollList) { + historyMajorEnrollMap.put(h.getYear() + a_ + h.getCategory() + a_ + h.getMajorName() + a_ + h.getBatch(), h); + } //获取 省控线 - List historyScoreControlLineList = yxHistoryScoreControlLineService.list(new LambdaQueryWrapper<>()); + List historyScoreControlLineList = yxHistoryScoreControlLineService.list(yxHistoryScoreControlLineLambdaQueryWrapper); Map yxHistoryScoreControlLineMap = new LinkedHashMap<>();//key:文科_美术学_提前批 String key = null; YxHistoryScoreControlLine yxHistoryScoreControlLine = null; if (CollectionUtils.isNotEmpty(historyScoreControlLineList)) { yxHistoryScoreControlLineMap = historyScoreControlLineList.stream().collect(Collectors.toMap(h -> h.getYear() + a_ + h.getCategory() + a_ + h.getProfessionalCategory() + a_ + h.getBatch(), h -> h)); } - List artTestCulturalDtoList = new ArrayList<>(); + ArtTestCulturalDTO artTestCulturalDto = null; for (YxSchoolMajor yxSchoolMajor : yxSchoolMajorList) { artTestCulturalDto = new ArtTestCulturalDTO(); @@ -243,19 +271,21 @@ public class ArtRecommendMajorController { artTestCulturalDto.setMajorNameAll(yxSchoolMajor.getMajorName() + "[" + yxSchoolMajor.getCategory() + "]" + "(" + yxSchoolMajor.getBatch() + ")"); - if (yxHistoryMajorEnroll != null) { - artTestCulturalDto.setScore(yxHistoryMajorEnroll.getAdmissionLine()); - //获取上一年的 省控分信息 - key = yxSchoolMajor.getCategory() + a_ + yxSchoolMajor.getMajorType() + a_ + (yxSchoolMajor.getBatch().equals("提前批") ? "本科A段" : yxSchoolMajor.getBatch()); - yxHistoryScoreControlLine = yxHistoryScoreControlLineMap.get(yxHistoryMajorEnroll.getYear() + a_ + key); - if (yxHistoryScoreControlLine != null) { - //文化分控线 - artTestCulturalDto.setCulturalScore(yxHistoryScoreControlLine.getCulturalScore()); - //专业分控线 - artTestCulturalDto.setSpecialScore(yxHistoryScoreControlLine.getSpecialScore()); - } - } + if (yxHistoryMajorEnroll == null) { + //没有历年信息，跳过 + continue; + } + artTestCulturalDto.setScore(yxHistoryMajorEnroll.getAdmissionLine()); + //获取上一年的 省控分信息 + key = yxSchoolMajor.getCategory() + a_ + yxSchoolMajor.getMajorType() + a_ + (yxSchoolMajor.getBatch().equals("提前批") ? "本科A段" : yxSchoolMajor.getBatch()); + yxHistoryScoreControlLine = yxHistoryScoreControlLineMap.get(yxHistoryMajorEnroll.getYear() + a_ + key); + if (yxHistoryScoreControlLine != null) { + //文化分控线 + artTestCulturalDto.setCulturalScore(yxHistoryScoreControlLine.getCulturalScore()); + //专业分控线 + artTestCulturalDto.setSpecialScore(yxHistoryScoreControlLine.getSpecialScore()); + } artTestCulturalDtoList.add(artTestCulturalDto); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniMajorController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniMajorController.java index 85de00c..6644b43 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniMajorController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniMajorController.java @@ -1,10 +1,15 @@ package org.jeecg.modules.mini.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.art.vo.QueryRecommendMajorVO; +import org.jeecg.modules.yx.entity.YxHistoryMajorEnroll; +import org.jeecg.modules.yx.entity.YxMajor; +import org.jeecg.modules.yx.entity.YxSchoolMajor; +import org.jeecg.modules.yx.service.IYxHistoryMajorEnrollService; import org.jeecg.modules.yx.service.IYxMajorService; import org.jeecg.modules.yx.service.IYxSchoolMajorService; import org.springframework.beans.factory.annotation.Autowired; @@ -12,6 +17,10 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + /** * @Description 小程序端-专业接口 * @Author ZhouWenTao @@ -26,6 +35,8 @@ public class MiniMajorController { private IYxMajorService yxMajorService; @Autowired private IYxSchoolMajorService yxSchoolMajorService; + @Autowired + private IYxHistoryMajorEnrollService yxHistoryMajorEnrollService; @ApiOperation(value = "获取院校当前其他推荐专业") @GetMapping(value = "/schoolOtherMajor") @@ -45,6 +56,37 @@ public class MiniMajorController { @ApiOperation(value = "小程序端查专业列表") @GetMapping("/miniMajorList") public Result miniMajorList(QueryRecommendMajorVO queryRecommendMajorVO){ + /*LambdaQueryWrapper yxHistoryMajorEnrollLambdaQueryWrapper = new LambdaQueryWrapper<>(); + yxHistoryMajorEnrollLambdaQueryWrapper.eq(YxHistoryMajorEnroll::getBatch,"本科B段"); + yxHistoryMajorEnrollLambdaQueryWrapper.likeRight(YxHistoryMajorEnroll::getMajorCode,"3"); + *//*LambdaQueryWrapper yxSchoolMajorLambdaQueryWrapper = new LambdaQueryWrapper<>(); + yxSchoolMajorLambdaQueryWrapper.eq(YxSchoolMajor::getBatch,"本科B段"); + yxSchoolMajorLambdaQueryWrapper.likeRight(YxSchoolMajor::getMajorCode,"35");*//* + LambdaQueryWrapper yxMajorLambdaQueryWrapper = new LambdaQueryWrapper<>(); + yxMajorLambdaQueryWrapper.eq(YxMajor::getEducationalLevel,"1"); + yxMajorLambdaQueryWrapper.notLikeRight(YxMajor::getMajorCode,"35"); + List majorList = yxMajorService.list(yxMajorLambdaQueryWrapper); + Map yxMajorMap = majorList.stream().collect(Collectors.toMap(m -> m.getMajorName(), m -> m)); + +// List list = yxSchoolMajorService.list(yxSchoolMajorLambdaQueryWrapper); + String majroName = null; + YxMajor yxMajor=null; + int i = 0; + List list = yxHistoryMajorEnrollService.list(yxHistoryMajorEnrollLambdaQueryWrapper); + for (YxHistoryMajorEnroll yxSchoolMajor : list) { + majroName = yxSchoolMajor.getMajorName(); + i = majroName.indexOf("（"); + if (i!=-1) { + majroName= majroName.substring(0,i); + } + yxMajor = yxMajorMap.get(majroName); + if (yxMajor!=null) { + yxSchoolMajor.setMajorCode(yxMajor.getMajorCode()); + } + + System.out.println(majroName+":"+yxSchoolMajor.getMajorCode()); + } + yxHistoryMajorEnrollService.updateBatchById(list);*/ return Result.OK(yxMajorService.miniMajorList(queryRecommendMajorVO)); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxScoreSegmentController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxScoreSegmentController.java index 7ca1910..2078af4 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxScoreSegmentController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxScoreSegmentController.java @@ -55,8 +55,7 @@ public class YxScoreSegmentController extends JeecgController> searchByScore(YxScoreSegment yxScoreSegment, HttpServletRequest req) { AssertUtils.notNull(yxScoreSegment.getProvince(), "请选择省份"); - - List yearList = Arrays.asList("2024", "2023", "2022", "2021"); + List yearList = Arrays.asList("2024"/*, "2023", "2022", "2021"*/); BigDecimal userScore = yxScoreSegment.getScore();//用户输入的分数 BigDecimal one = null; BigDecimal two = null; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxMajorServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxMajorServiceImpl.java index 57b41b6..76e42bd 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxMajorServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxMajorServiceImpl.java @@ -81,6 +81,7 @@ public class YxMajorServiceImpl extends ServiceImpl impl lambdaQueryWrapper.eq(StringUtils.isNotBlank(queryRecommendMajorVO.getEducationalLevel()),YxMajor::getEducationalLevel,queryRecommendMajorVO.getEducationalLevel()); lambdaQueryWrapper.isNotNull(YxMajor::getXkfl).isNotNull(YxMajor::getZyl); //lambdaQueryWrapper.notLike(YxMajor::getMajorName,"类");//不要***类的 +// lambdaQueryWrapper.eq(YxMajor::getMajorName,"音乐表演"); List yxMajorList = this.list(lambdaQueryWrapper); //没有数据，返回空集合 if (CollectionUtils.isEmpty(yxMajorList)) { diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolServiceImpl.java index b677efa..456811b 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolServiceImpl.java @@ -127,9 +127,9 @@ public class YxSchoolServiceImpl extends ServiceImpl i if ("双一流".equals(record.getSfsyl())) { tagsList.add("双一流"); } - if (StringUtils.isNotBlank(record.getSjyl())) { + /*if (StringUtils.isNotBlank(record.getSjyl())) { Collections.addAll(tagsList, record.getSjyl().split(",")); - } + }*/ if (StringUtils.isNotBlank(record.getGzsz())) { tagsList.add(record.getGzsz()); } @@ -183,18 +183,18 @@ public class YxSchoolServiceImpl extends ServiceImpl i if ("双一流".equals(yxSchool.getSfsyl())) { tagsList.add("双一流"); } - if (StringUtils.isNotBlank(yxSchool.getSjyl())) { + /*if (StringUtils.isNotBlank(yxSchool.getSjyl())) { Collections.addAll(tagsList, yxSchool.getSjyl().split(",")); - } + }*/ if (StringUtils.isNotBlank(yxSchool.getGzsz())) { tagsList.add(yxSchool.getGzsz()); } //世界一流 - String sjyl = yxSchool.getSjyl(); + /*String sjyl = yxSchool.getSjyl(); if (StringUtils.isNotBlank(sjyl) && !sjyl.equals("0")) { String[] split = sjyl.split(","); tagsList.addAll(Arrays.asList(split)); - } + }*/ miniSchoolDTO.setTagsList(tagsList); return miniSchoolDTO; } diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml b/jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml index 1415476..bb4c866 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml +++ b/jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml @@ -1,5 +1,5 @@ server: - port: 8080 + port: 8088 tomcat: max-swallow-size: -1 error: @@ -26,7 +26,7 @@ spring: max-request-size: 10MB mail: host: smtp.163.com - username: ?? + username: jeecgos@163.com password: ?? properties: mail: @@ -67,10 +67,10 @@ spring: jackson: date-format: yyyy-MM-dd HH:mm:ss time-zone: GMT+8 - aop: - proxy-target-class: true jpa: open-in-view: false + aop: + proxy-target-class: true #配置freemarker freemarker: # 设置模板后缀名 @@ -118,7 +118,7 @@ spring: timeBetweenEvictionRunsMillis: 60000 # 配置一个连接在池中最小生存的时间，单位是毫秒 minEvictableIdleTimeMillis: 300000 - validationQuery: SELECT 1 FROM DUAL + validationQuery: SELECT 1 testWhileIdle: true testOnBorrow: false testOnReturn: false @@ -131,9 +131,9 @@ spring: connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 datasource: master: - url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai + url: jdbc:mysql://127.0.0.1:50996/yitisheng-test5?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai username: root - password: root + password: Wang5322570 driver-class-name: com.mysql.cj.jdbc.Driver # 多数据源配置 #multi-datasource1: @@ -144,7 +144,7 @@ spring: #redis 配置 redis: database: 0 - host: 192.168.1.199 + host: 127.0.0.1 port: 6379 password: '' #mybatis plus 设置 @@ -154,13 +154,13 @@ mybatis-plus: # 关闭MP3.0自带的banner banner: false db-config: - #主键类型 + #主键类型 0:"数据库ID自增",1:"该类型为未设置主键类型", 2:"用户输入ID",3:"全局唯一ID (数字类型唯一ID)", 4:"全局唯一ID UUID",5:"字符串全局唯一ID (idWorker 的字符串表示)"; id-type: ASSIGN_ID # 默认数据库表下划线命名 table-underline: true configuration: # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用 - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 返回类型为Map,显示null对应的字段 call-setters-on-nulls: true #jeecg专用配置 @@ -173,7 +173,7 @@ jeecg: signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a # 签名拦截接口 signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys - # local\minio\alioss + #local、minio、alioss uploadType: local # 前端访问地址 domainUrl: @@ -181,9 +181,9 @@ jeecg: app: http://localhost:8051 path: #文件上传根目录 设置 - upload: D://opt//upFiles + upload: /opt/upFiles #webapp文件路径 - webapp: D://opt//webapp + webapp: /opt/webapp shiro: excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/** #阿里云oss存储和大鱼短信秘钥配置 @@ -192,33 +192,24 @@ jeecg: secretKey: ?? endpoint: oss-cn-beijing.aliyuncs.com bucketName: jeecgdev - staticDomain: https://static.jeecg.com - # ElasticSearch 设置 + # ElasticSearch 6设置 elasticsearch: cluster-name: jeecg-ES - cluster-nodes: 81.70.47.128:9200 + cluster-nodes: 127.0.0.1:9200 check-enabled: false # 在线预览文件服务器地址配置 - file-view-domain: http://127.0.0.1:8012 + file-view-domain: http://fileview.jeecg.com # minio文件上传 minio: minio_url: http://minio.jeecg.com minio_name: ?? minio_pass: ?? - bucketName: ?? + bucketName: otatest #大屏报表参数设置 jmreport: - mode: prod + mode: dev #数据字典是否进行saas数据隔离，自己看自己的字典 saas: false - #是否开启租户模式 Support By v1.5.5+ - openTenant: false - #安全模式(敏感接口校验、saas模式下不允许使用平台数据源) - #safeMode: true - #是否需要校验token - is_verify_token: false - #必须校验方法 - verify_methods: remove,delete,save,add,update #xxl-job配置 xxljob: enabled: false @@ -236,13 +227,14 @@ jeecg: password: type: STANDALONE enabled: true +#cas单点登录 +cas: + prefixUrl: http://cas.example.org:8443/cas #Mybatis输出sql日志 logging: level: org.jeecg.modules.system.mapper: info -#cas单点登录 -cas: - prefixUrl: http://cas.example.org:8443/cas + org.jeecg.modules.yx.mapper: debug #swagger knife4j: #开启增强配置 @@ -250,7 +242,7 @@ knife4j: #开启生产环境屏蔽 production: false basic: - enable: true + enable: false username: jeecg password: jeecg1314 #第三方登录 @@ -300,4 +292,4 @@ third-app: client-id: ?? # appSecret client-secret: ?? - agent-id: ?? \ No newline at end of file + agent-id: ??