diff --git a/pom.xml b/pom.xml index 3b3a713..179e8ec 100644 --- a/pom.xml +++ b/pom.xml @@ -26,6 +26,12 @@ org.postgresql postgresql + + + checker-qual + org.checkerframework + + @@ -64,12 +70,18 @@ com.alibaba easyexcel 3.1.1 + + + commons-compress + org.apache.commons + + - com.alibaba - fastjson - 1.2.79 + com.alibaba.fastjson2 + fastjson2 + 2.0.43 org.gunshi @@ -101,19 +113,24 @@ spring-boot-starter-quartz - - - - - - - - - - - - - + + + + + + + + + + + + + + + com.ruoyi + integration-ruoyi + 3.8.8 + diff --git a/src/main/java/com/gunshi/project/xyt/controller/ForecastProjectController.java b/src/main/java/com/gunshi/project/xyt/controller/ForecastProjectController.java index a6b8ccc..fad652c 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/ForecastProjectController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/ForecastProjectController.java @@ -1,6 +1,6 @@ package com.gunshi.project.xyt.controller; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.IdWorker; diff --git a/src/main/java/com/gunshi/project/xyt/controller/OsmoticWaterRController.java b/src/main/java/com/gunshi/project/xyt/controller/OsmoticWaterRController.java index be52e0e..ce537c8 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/OsmoticWaterRController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/OsmoticWaterRController.java @@ -1,6 +1,6 @@ package com.gunshi.project.xyt.controller; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; diff --git a/src/main/java/com/gunshi/project/xyt/timetask/DataTask.java b/src/main/java/com/gunshi/project/xyt/timetask/DataTask.java index 44e7b37..33887ba 100644 --- a/src/main/java/com/gunshi/project/xyt/timetask/DataTask.java +++ b/src/main/java/com/gunshi/project/xyt/timetask/DataTask.java @@ -11,6 +11,7 @@ import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; +import com.alibaba.fastjson2.JSONArray; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Profile; @@ -19,7 +20,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; @@ -206,7 +207,7 @@ public class DataTask { } List list = (List)map.get("data"); if(CollectionUtils.isNotEmpty(list)){ - List rlist = JSONObject.parseArray(JSONObject.toJSONString(list)).toJavaList(StPptnR.class); + List rlist = JSONArray.parseArray(JSONObject.toJSONString(list)).toJavaList(StPptnR.class); stPptnRService.saveBatch(rlist); } } @@ -368,7 +369,7 @@ public class DataTask { } List list = (List)map.get("data"); if(CollectionUtils.isNotEmpty(list)){ - List rlist = JSONObject.parseArray(JSONObject.toJSONString(list)).toJavaList(StRsvrR.class); + List rlist = JSONArray.parseArray(JSONObject.toJSONString(list)).toJavaList(StRsvrR.class); stRsvrRService.saveBatch(rlist); } } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 5c41aba..8bf20e6 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -2,4 +2,5 @@ spring: config: import: - config-common.yml - - config-dev.yml \ No newline at end of file + - config-dev.yml + - config-ruoyi.yml \ No newline at end of file diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index e0f3f9e..531f202 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -3,3 +3,4 @@ spring: import: - config-common.yml - config-prod.yml + - config-ruoyi.yml diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 5c41aba..8bf20e6 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -2,4 +2,5 @@ spring: config: import: - config-common.yml - - config-dev.yml \ No newline at end of file + - config-dev.yml + - config-ruoyi.yml \ No newline at end of file diff --git a/src/main/resources/config-ruoyi.yml b/src/main/resources/config-ruoyi.yml new file mode 100644 index 0000000..7e05ba7 --- /dev/null +++ b/src/main/resources/config-ruoyi.yml @@ -0,0 +1,54 @@ +# 项目相关配置 +ruoyi: + # 名称 + name: RuoYi + # 版本 + version: 3.8.8 + # 版权年份 + copyrightYear: 2024 + # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） + #profile: D:/ruoyi/uploadPath + # 获取ip地址开关 + addressEnabled: false + # 验证码类型 math 数字计算 char 字符验证 + captchaType: math + +user: + password: + # 密码最大错误次数 + maxRetryCount: 5 + # 密码锁定时间（默认10分钟） + lockTime: 10 + +token: + # 令牌自定义标识 + header: Authorization + # 令牌密钥 + secret: abcdefghijklmnopqrstuvwxyz + # 令牌有效期（默认30分钟） + expireTime: 30 + +# 防止XSS攻击 +xss: + # 过滤开关 + enabled: true + # 排除链接（多个用逗号分隔） + excludes: /system/notice + # 匹配链接 + urlPatterns: /system/*,/monitor/*,/tool/* + +#pagehelper: +# helperDialect: postgresql +# supportMethodsArguments: true +# params: count=countSql + +swagger: + # 是否开启swagger + enabled: true + # 请求前缀 + pathMapping: /dev-api + +spring: + messages: + # 国际化资源文件路径 + basename: i18n/messages \ No newline at end of file