From ab714fc38931e03f0e0991971d86932c1f3dbdfa Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Wed, 15 May 2024 10:16:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ZyCcjgServiceImpl.java | 9 +- .../service/IZyInfoStudentService.java | 2 + .../impl/ZyInfoStudentServiceImpl.java | 61 +++++----- .../zyJxdg/controller/ZyJxdgController.java | 110 ++++++++++++------ .../modules/kc/zyJxdg/entity/ZyJxdg.java | 2 + .../kc/zyJxdg/mapper/xml/ZyJxdgMapper.xml | 3 + .../kc/zyJxdg/service/IZyJxdgService.java | 1 + .../service/impl/ZyJxdgServiceImpl.java | 21 ++++ .../src/main/resources/application-test.yml | 97 ++++++++++----- 9 files changed, 216 insertions(+), 90 deletions(-) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCcjg/service/impl/ZyCcjgServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCcjg/service/impl/ZyCcjgServiceImpl.java index 2ea55a64..5a9e7312 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCcjg/service/impl/ZyCcjgServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCcjg/service/impl/ZyCcjgServiceImpl.java @@ -11,6 +11,7 @@ import org.jeecg.modules.kc.zyCcjg.service.IZyCcjgService; import org.jeecg.modules.kc.zyInfo.entity.ZyInfo; import org.jeecg.modules.kc.zyInfo.service.IZyInfoService; import org.jeecg.modules.kc.zyInfoStudent.entity.ZyInfoStudent; +import org.jeecg.modules.kc.zyInfoStudent.mapper.ZyInfoStudentMapper; import org.jeecg.modules.kc.zyInfoStudent.service.IZyInfoStudentService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -63,7 +64,7 @@ public class ZyCcjgServiceImpl extends ServiceImpl impleme private IZyInfoService zyInfoService; @Autowired - private IZyInfoStudentService zyInfoStudentService; + private ZyInfoStudentMapper zyInfoStudentService; @@ -138,7 +139,7 @@ public class ZyCcjgServiceImpl extends ServiceImpl impleme //----------计算通过率-------------- if(StringUtils.equals("2",object2.getString("filestateid"))){ String stuId = zyCcjg.getZyStuId(); - ZyInfoStudent zyInfoStudent = zyInfoStudentService.getById(stuId); + ZyInfoStudent zyInfoStudent = zyInfoStudentService.selectById(stuId); ZyInfo zyInfo = zyInfoService.getById(zyInfoStudent.getMainId()); Double tgl = 0.0; if(zyInfo.getAigctgl()>0){ @@ -231,7 +232,7 @@ public class ZyCcjgServiceImpl extends ServiceImpl impleme //----------计算通过率-------------- if(StringUtils.equals("2",object2.getString("filestateid"))) { String stuId = zyCcjg.getZyStuId(); - ZyInfoStudent zyInfoStudent = zyInfoStudentService.getById(stuId); + ZyInfoStudent zyInfoStudent = zyInfoStudentService.selectById(stuId); ZyInfo zyInfo = zyInfoService.getById(zyInfoStudent.getMainId()); Double tgl = 0.0; if (zyInfo.getWwtgl() > 0) { @@ -324,7 +325,7 @@ public class ZyCcjgServiceImpl extends ServiceImpl impleme //----------计算通过率-------------- if(StringUtils.equals("2",object2.getString("filestateid"))) { String stuId = zyCcjg.getZyStuId(); - ZyInfoStudent zyInfoStudent = zyInfoStudentService.getById(stuId); + ZyInfoStudent zyInfoStudent = zyInfoStudentService.selectById(stuId); ZyInfo zyInfo = zyInfoService.getById(zyInfoStudent.getMainId()); Double tgl = 0.0; if (zyInfo.getNwtgl() > 0) { diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/service/IZyInfoStudentService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/service/IZyInfoStudentService.java index 6954dc97..39daf099 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/service/IZyInfoStudentService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/service/IZyInfoStudentService.java @@ -14,4 +14,6 @@ public interface IZyInfoStudentService extends IService { public boolean save(ZyInfoStudent zyInfoStudent); void deleteMainId(String id); + + public boolean updateById(ZyInfoStudent zyInfoStudent); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/service/impl/ZyInfoStudentServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/service/impl/ZyInfoStudentServiceImpl.java index 0c333623..eb669f0f 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/service/impl/ZyInfoStudentServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/service/impl/ZyInfoStudentServiceImpl.java @@ -82,30 +82,6 @@ public class ZyInfoStudentServiceImpl extends ServiceImpl kcKechengbiaoQueryWrapper = new QueryWrapper<>(); -// kcKechengbiaoQueryWrapper.eq("xqxn",zyInfo.getXnxq()); -// kcKechengbiaoQueryWrapper.eq("rwbh",rwbh); -// kcKechengbiaoQueryWrapper.last("limit 1"); -// KcKechengbiao kcKechengbiao = kcKechengbiaoService.getOne(kcKechengbiaoQueryWrapper); -// String cateid = kcKechengbiao.getKcbh()+""+kcKechengbiao.getKcmc(); -// String catename = kcKechengbiao.getKcmc(); -// zyInfoStudent.setCateid(cateid); -// zyInfoStudent.setCatename(catename); -// //外网查重及提交检测 -// if(StringUtils.equals(zyInfo.getWwcc(),"1")){ -// wwccSave(zyInfoStudent); -// } -// //内网查重及提交检测 -// if(StringUtils.equals(zyInfo.getNwcc(),"1")){ -// nwccSave(zyInfoStudent); -// } -// //aigc查重及提交检测 -// if(StringUtils.equals(zyInfo.getAigccc(),"1")){ -// aigcSave(zyInfoStudent); -// } return true; } @@ -114,6 +90,37 @@ public class ZyInfoStudentServiceImpl extends ServiceImpl kcKechengbiaoQueryWrapper = new QueryWrapper<>(); + kcKechengbiaoQueryWrapper.eq("xqxn",zyInfo.getXnxq()); + kcKechengbiaoQueryWrapper.eq("rwbh",rwbh); + kcKechengbiaoQueryWrapper.last("limit 1"); + KcKechengbiao kcKechengbiao = kcKechengbiaoService.getOne(kcKechengbiaoQueryWrapper); + String cateid = kcKechengbiao.getKcbh()+""+kcKechengbiao.getKcmc(); + String catename = kcKechengbiao.getKcmc(); + zyInfoStudent.setCateid(cateid); + zyInfoStudent.setCatename(catename); + //外网查重及提交检测 + if(StringUtils.equals(zyInfo.getWwcc(),"1")){ + wwccSave(zyInfoStudent); + } + //内网查重及提交检测 + if(StringUtils.equals(zyInfo.getNwcc(),"1")){ + nwccSave(zyInfoStudent); + } + //aigc查重及提交检测 + if(StringUtils.equals(zyInfo.getAigccc(),"1")){ + aigcSave(zyInfoStudent); + } + return false; + } + //aigc提交 private void aigcSave(ZyInfoStudent zyInfoStudent) { String url = "https://vims.fanyu.com/tool/AIGCCheck/paperSubmit"; @@ -127,8 +134,10 @@ public class ZyInfoStudentServiceImpl extends ServiceImpl fileMap = new HashMap(); fileMap.put("file", fileName); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/controller/ZyJxdgController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/controller/ZyJxdgController.java index 2199e40f..cf6b3342 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/controller/ZyJxdgController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/controller/ZyJxdgController.java @@ -1,43 +1,39 @@ package org.jeecg.modules.kc.zyJxdg.controller; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.jeecg.common.api.vo.Result; -import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.kc.zyJxdg.entity.ZyJxdg; -import org.jeecg.modules.kc.zyJxdg.service.IZyJxdgService; - +import cn.hutool.core.io.FileUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; - -import org.jeecgframework.poi.excel.ExcelImportUtil; -import org.jeecgframework.poi.excel.def.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; -import org.jeecg.common.system.base.controller.JeecgController; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; -import org.springframework.web.servlet.ModelAndView; -import com.alibaba.fastjson.JSON; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.jeecg.common.aspect.annotation.AutoLog; +import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.jeecg.common.system.base.controller.JeecgController; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.system.vo.LoginUser; +import org.jeecg.common.util.DateUtils; +import org.jeecg.common.util.SpringContextHolder; +import org.jeecg.common.util.SpringContextUtils; +import org.jeecg.modules.kc.zyJxdg.entity.ZyJxdg; +import org.jeecg.modules.kc.zyJxdg.service.IZyJxdgService; +import org.jeecg.modules.tools.Global; +import org.jeecg.modules.tools.pdf.PDFUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; - /** +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.util.Arrays; +import java.util.Date; + +/** * @Description: 教学大纲 * @Author: jeecg-boot * @Date: 2024-05-11 @@ -50,8 +46,11 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; public class ZyJxdgController extends JeecgController { @Autowired private IZyJxdgService zyJxdgService; - - /** + + @Value("${jeecg.path.upload}") + private String upLoadPath; + + /** * 分页列表查询 * * @param zyJxdg @@ -67,7 +66,9 @@ public class ZyJxdgController extends JeecgController { @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyJxdg, req.getParameterMap()); + queryWrapper.eq("create_by",sysUser.getUsername()); Page page = new Page(pageNo, pageSize); IPage pageList = zyJxdgService.page(page, queryWrapper); return Result.OK(pageList); @@ -97,6 +98,27 @@ public class ZyJxdgController extends JeecgController { @ApiOperation(value="教学大纲-编辑", notes="教学大纲-编辑") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) public Result edit(@RequestBody ZyJxdg zyJxdg) { + + if(StringUtils.isNotEmpty(zyJxdg.getFilePath())){ + + String nameLast = zyJxdg.getFilePath().substring(zyJxdg.getFilePath().lastIndexOf(".")+1); + if(StringUtils.equals("pdf",nameLast)){ + zyJxdg.setPdfPath(zyJxdg.getFilePath()); + }else{ + Global global = SpringContextHolder.getBean(Global.class); + FileUtil.mkdir(global.getContractDickPath()); + String dd = DateUtils.formatDate(new Date(),"yyyyMMddHHmmss"); + String docPath = upLoadPath+ File.separator+ zyJxdg.getFilePath(); + String namePath = dd + ".pdf"; + String pdfPath = global.getContractDickPath() + namePath; + System.out.println("filPath:"+zyJxdg.getFilePath()); + System.out.println("docPath:"+docPath); + System.out.println("pdfPath:"+pdfPath); + PDFUtil.office2PDF(docPath,pdfPath); + zyJxdg.setPdfPath("contract/"+namePath); + } + + } zyJxdgService.updateById(zyJxdg); return Result.OK("编辑成功!"); } @@ -171,4 +193,26 @@ public class ZyJxdgController extends JeecgController { return super.importExcel(request, response, ZyJxdg.class); } + + @ApiOperation(value="获取课程介绍和教学大纲内容", notes="获取课程介绍和教学大纲内容") + @GetMapping(value = "/getKcjsJxdg") + public Result getKcjsJxdg(@RequestParam(name="rwbh",required=true) String rwbh) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("rwbh",rwbh); +// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); +// queryWrapper.eq("create_by",sysUser.getUsername()); + queryWrapper.last("limit 1"); + ZyJxdg zyJxdg = zyJxdgService.getOne(queryWrapper); + return Result.OK(zyJxdg); + } + + + @AutoLog(value = "教学大纲-引用") + @ApiOperation(value="教学大纲-引用", notes="教学大纲-引用") + @RequestMapping(value = "/editJxdgyy", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result editJxdgyy(@RequestBody ZyJxdg zyJxdg) { + zyJxdgService.editJxdgyy(zyJxdg); + return Result.OK("编辑成功!"); + } + } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/entity/ZyJxdg.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/entity/ZyJxdg.java index 228941a7..97dcfed2 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/entity/ZyJxdg.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/entity/ZyJxdg.java @@ -72,4 +72,6 @@ public class ZyJxdg implements Serializable { @Excel(name = "pdf附件", width = 15) @ApiModelProperty(value = "pdf附件") private java.lang.String pdfPath; + + private String kcjs; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/mapper/xml/ZyJxdgMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/mapper/xml/ZyJxdgMapper.xml index 1cdff829..2b182a6e 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/mapper/xml/ZyJxdgMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/mapper/xml/ZyJxdgMapper.xml @@ -2,4 +2,7 @@ + + + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/service/IZyJxdgService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/service/IZyJxdgService.java index a86a2b53..3c0c1145 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/service/IZyJxdgService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/service/IZyJxdgService.java @@ -11,4 +11,5 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IZyJxdgService extends IService { + void editJxdgyy(ZyJxdg zyJxdg); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/service/impl/ZyJxdgServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/service/impl/ZyJxdgServiceImpl.java index 9b570573..66dfc42b 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/service/impl/ZyJxdgServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/service/impl/ZyJxdgServiceImpl.java @@ -1,5 +1,9 @@ package org.jeecg.modules.kc.zyJxdg.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.SecurityUtils; +import org.jeecg.common.system.vo.LoginUser; import org.jeecg.modules.kc.zyJxdg.entity.ZyJxdg; import org.jeecg.modules.kc.zyJxdg.mapper.ZyJxdgMapper; import org.jeecg.modules.kc.zyJxdg.service.IZyJxdgService; @@ -16,4 +20,21 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class ZyJxdgServiceImpl extends ServiceImpl implements IZyJxdgService { + @Override + public void editJxdgyy(ZyJxdg zyJxdg) { + + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("rwbh",zyJxdg.getRwbh()); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + queryWrapper.eq("create_by",sysUser.getUsername()); + queryWrapper.last("limit 1"); + ZyJxdg zyJxdgNew = baseMapper.selectOne(queryWrapper); + zyJxdgNew.setFilePath(zyJxdg.getFilePath()); + zyJxdgNew.setSkjs(zyJxdg.getSkjs()); + if(StringUtils.isEmpty(zyJxdgNew.getId())){ + baseMapper.insert(zyJxdgNew); + }else{ + baseMapper.updateById(zyJxdgNew); + } + } } 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 8ab6da6e..9a401445 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 @@ -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: # 设置模板后缀名 @@ -111,7 +111,7 @@ spring: # 初始化大小，最小，最大 initial-size: 5 min-idle: 5 - maxActive: 20 + maxActive: 1000 # 配置获取连接等待超时的时间 maxWait: 60000 # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 @@ -131,20 +131,21 @@ 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:3306/course_information_center_jeecg_db?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai username: root - password: root + password: ABCabc@123 + # password: root driver-class-name: com.mysql.cj.jdbc.Driver # 多数据源配置 - #multi-datasource1: - #url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai - #username: root - #password: root - #driver-class-name: com.mysql.cj.jdbc.Driver + multi-oracle: + url: jdbc:oracle:thin:@202.198.129.24:1521:orcl + username: C##XSKC + password: mAPP2t2ABAfx7 + driver-class-name: oracle.jdbc.OracleDriver #redis 配置 redis: database: 0 - host: 192.168.1.199 + host: 127.0.0.1 port: 6379 password: '' #mybatis plus 设置 @@ -154,13 +155,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,19 +174,19 @@ 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: - pc: http://localhost:3100 + pc: http://210.47.17.166 app: http://localhost:8051 path: #文件上传根目录 设置 - upload: D://opt//upFiles + upload: /opt/jeecg-boot/upload #webapp文件路径 - webapp: D://opt//webapp + webapp: /opt/jeecg-boot/webapp shiro: - excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/** + excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/api/getUserInfo #阿里云oss存储和大鱼短信秘钥配置 oss: accessKey: ?? @@ -196,16 +197,16 @@ jeecg: # ElasticSearch 设置 elasticsearch: cluster-name: jeecg-ES - cluster-nodes: 81.70.47.128:9200 - check-enabled: false + cluster-nodes: 127.0.0.1:9200 + check-enabled: true # 在线预览文件服务器地址配置 - 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 @@ -216,7 +217,7 @@ jeecg: #安全模式(敏感接口校验、saas模式下不允许使用平台数据源) #safeMode: true #是否需要校验token - is_verify_token: false + is_verify_token: true #必须校验方法 verify_methods: remove,delete,save,add,update #xxl-job配置 @@ -236,13 +237,13 @@ jeecg: password: type: STANDALONE enabled: true +#cas单点登录 +cas: + prefixUrl: https://authserver.nenu.edu.cn/authserver #Mybatis输出sql日志 logging: level: org.jeecg.modules.system.mapper: info -#cas单点登录 -cas: - prefixUrl: http://cas.example.org:8443/cas #swagger knife4j: #开启增强配置 @@ -300,4 +301,46 @@ third-app: client-id: ?? # appSecret client-secret: ?? - agent-id: ?? \ No newline at end of file + agent-id: ?? +# libreOffice5 +libreOffice: + url: 127.0.0.1 + port: 8100 +# 媒体处理器 +ffmpeg: + # 根路径 + path: E:\BLXC\APPLICATION\ffmpg + # 执行命令的核心文件 + executableFile: ${ffmpeg.path}\ffmpeg.exe + # 压缩相关 + compress: + # 是否开启压缩【true:开启压缩 | false:关闭压缩 】 + enable: false + # 日志等级，【 quiet | panic | fatal | error | warning | info | verbose | debug | trace】默认值为info + loglevel: error + # 压缩比,正整数，数越大压缩比越高 + compressionRatio: 50 + # 是否覆盖输出文件【 y:覆盖 | n:不覆盖 】 + isOverwrite: y + # 是否删除源文件【 true:删除源文件 | false:不删除源文件 】 + isDeleteSourceFile: true + # 压缩文件扩展名范围 + extensionFilter: png,jpg,jpeg + # 视频截图相关 + videoScreenshot: + # 日志等级，【 quiet | panic | fatal | error | warning | info | verbose | debug | trace】默认值为info + loglevel: error + # 是否覆盖输出文件【 y:覆盖 | n:不覆盖 】 + isOverwrite: y + # 压缩 数越大，图越小 + compressionRatio: 2 + # 视频过滤器参数，，此处用意为截1张原尺寸当前时间的最新帧 + vf: '"select=not(mod(n\,15)),scale=-1:-1"' +# 维普检测接口 +weipu: + userId: 765996 + userKey: 330ed91f6c7e4600a454a6a5216723bf +wjx: + appid: 1321039 + appkey: 55328ebd11964fc8b40c10011bcb425d + url: https://www.wjx.cn/openapi/default.aspx \ No newline at end of file