diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml index 59b4f79..9b45c8b 100644 --- a/ruoyi-admin/src/main/resources/application-prod.yml +++ b/ruoyi-admin/src/main/resources/application-prod.yml @@ -20,15 +20,16 @@ spring: driverClassName: com.mysql.cj.jdbc.Driver # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) - url: jdbc:mysql://172.25.23.150:16338/mental_health_vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&allowMultiQueries=true + #url: jdbc:mysql://172.25.23.150:16338/mental_health_vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&allowMultiQueries=true + url: jdbc:mysql://127.0.0.1:3306/mental_health_vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&allowMultiQueries=true username: root - password: Mz!@#123 + password: Mz123456* # 从库数据源 slave: lazy: true type: ${spring.datasource.type} driverClassName: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://172.25.23.150:16338/mental_health_vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&allowMultiQueries=true + url: jdbc:mysql://127.0.0.1:3306/mental_health_vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&allowMultiQueries=true username: password: # oracle: @@ -69,13 +70,14 @@ spring: spring.data: redis: # 地址 - host: 172.25.23.150 + #host: 172.25.23.150 + host: 127.0.0.1 # 端口，默认为6379 - port: 16237 + port: 6379 # 数据库索引 database: 1 # 密码(如没有密码请注释掉) - # password: + password: Mz123456* # 连接超时时间 timeout: 10s # 是否开启sslkeys diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index c0020d9..413d785 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -22,7 +22,7 @@ captcha: # 开发环境配置 server: # 服务器的HTTP端口，默认为8080 - port: 8070 + port: 8080 servlet: # 应用的访问路径 context-path: / diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheNames.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheNames.java index 04a215d..c5da1c6 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheNames.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheNames.java @@ -64,12 +64,12 @@ public interface CacheNames { * 在线用户 */ String ONLINE_TOKEN = "online_tokens"; - String SYS_QUESTION_ANSWER = "scale:question_answer"; + String SYS_QUESTION_ANSWER = "scale:question_answer#30d"; String SYS_ANSWER = "scale:answer#30d"; - String SYS_SCALE_FACTOR = "scale:factor"; + String SYS_SCALE_FACTOR = "scale:factor#30d"; - String MAP_SCALE_QUESTION = "scale:map:question"; - String MAP_SCALE_ANSWER = "scale:map:answer"; + String MAP_SCALE_QUESTION = "scale:map:question#30d"; + String MAP_SCALE_ANSWER = "scale:map:answer#30d"; } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/EvaluationConclusionController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/EvaluationConclusionController.java index 219d73b..b4e55ef 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/EvaluationConclusionController.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/EvaluationConclusionController.java @@ -1,6 +1,7 @@ package org.dromara.scale.controller; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; @@ -36,7 +37,10 @@ public class EvaluationConclusionController extends BaseController { /** * 获取量测结果列表 */ - @SaCheckPermission("evaluation:conclusion:list") + @SaCheckPermission(value = { + "intervene:conclusion:list", + "archive:conclusion:list"}, + mode = SaMode.OR) @GetMapping("/list") public R> getList(SysEvaluationConclusionBo bo) { return R.ok(sysEvaluationConclusionService.queryList(bo)); diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/EvaluationRecordController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/EvaluationRecordController.java index cc66590..35bba44 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/EvaluationRecordController.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/EvaluationRecordController.java @@ -1,6 +1,7 @@ package org.dromara.scale.controller; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.IoUtil; import jakarta.servlet.http.HttpServletResponse; @@ -53,7 +54,10 @@ public class EvaluationRecordController extends BaseController { /** * 导出量测记录列表 */ - @SaCheckPermission("evaluation:record:export") + @SaCheckPermission(value = { + "intervene:record:export", + "archive:record:export"}, + mode = SaMode.OR) @Log(title = "个人量测记录", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(BaseQueryBo bo, HttpServletResponse response) throws Exception { diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysEvaluationRecordServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysEvaluationRecordServiceImpl.java index d7a9ca5..707fd2a 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysEvaluationRecordServiceImpl.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysEvaluationRecordServiceImpl.java @@ -226,8 +226,10 @@ public class SysEvaluationRecordServiceImpl implements ISysEvaluationRecordServi File path = null; if(mbtiFlag){ path = new File("/usr/local/mental/word/MBTITemplate.docx"); + //path = new File("C:\\mental_health\\word\\MBTITemplate.docx"); }else{ path = new File("/usr/local/mental/word/personalTemplate.docx"); + //path = new File("C:\\mental_health\\word\\personalTemplate.docx"); } File docx = FileUtil.createTempFile(".docx", true); String wordPath = docx.getPath(); diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScalePublishServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScalePublishServiceImpl.java index d413fa5..5b4fecc 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScalePublishServiceImpl.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScalePublishServiceImpl.java @@ -450,6 +450,7 @@ public class SysScalePublishServiceImpl implements ISysScalePublishService { } wordData.setWarnCharts(wordWarnList); File path = new File("/usr/local/mental/word/groupTemplate.docx"); + //File path = new File("C:\\mental_health\\word\\groupTemplate.docx"); File docx = FileUtil.createTempFile(".docx", true); String wordPath = docx.getPath(); try (FileInputStream fileInputStream = new FileInputStream(path)) { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/SysStudentImportListener.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/SysStudentImportListener.java index f31850d..08adbcf 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/SysStudentImportListener.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/SysStudentImportListener.java @@ -58,11 +58,11 @@ public class SysStudentImportListener extends AnalysisEventListener").append(successNum).append("、账号 ").append(user.getUserName()).append(" 导入成功"); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/SysTeacherImportListener.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/SysTeacherImportListener.java index a82dd26..266e3b6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/SysTeacherImportListener.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/SysTeacherImportListener.java @@ -53,11 +53,10 @@ public class SysTeacherImportListener extends AnalysisEventListener").append(successNum).append("、账号 ").append(user.getUserName()).append(" 导入成功"); diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index 3d03a31..bc07322 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -180,7 +180,8 @@ UPDATE sys_user - SET password = #{item.password} + SET password = #{item.password}, + update_time = CURRENT_TIMESTAMP WHERE user_id = #{item.userId}