lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[update] 合并代码

Browse Source
This commit is contained in:
lcj
2025-07-02 09:22:21 +08:00
parent 66912c4eb9
commit bb9d654d57
8 changed files with 48 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
drone/ruoyi-admin/src/main/resources/application-druid.yml
View File

@ -10,9 +10,9 @@ spring:
# username: drone
# password: JXL@zzx79
master:
url: jdbc:mysql://192.168.110.126:3306/drone?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: 123456
url: jdbc:mysql://192.168.110.2:13386/drone?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: drone
password: X2J5DSD25ykn8Hii
# 从库数据源
slave:
# 从数据源开关/默认关闭
@ -64,11 +64,11 @@ spring:
config:
multi-statement-allow: true
minio:
endpoint: "http://zmkg.cqet.top:9999"
access-key: "admin"
secret-key: "12345678"
role-arn: "arn:aws:s3:::drone-?/*"
role-session-name: "anysession"
region: "cn-chengdu"
duration-seconds: 3600
#minio:
# endpoint: "http://zmkg.cqet.top:9999"
# access-key: "admin"
# secret-key: "12345678"
# role-arn: "arn:aws:s3:::drone-?/*"
# role-session-name: "anysession"
# region: "cn-chengdu"
# duration-seconds: 3600

4
drone/ruoyi-admin/src/main/resources/application-prod.yml
View File

@ -6,9 +6,9 @@ spring:
druid:
# 主库数据源
master:
url: jdbc:mysql://192.168.110.199:3306/drone?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
url: jdbc:mysql://192.168.110.199:13386/drone?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: drone
password: WDDAELfaZaNZNYtP
password: X2J5DSD25ykn8Hii
# 从库数据源
slave:
# 从数据源开关/默认关闭

28
drone/ruoyi-admin/src/main/resources/application.yml
View File

@ -69,13 +69,13 @@ spring:
# redis 配置
redis:
# 地址
host: 192.168.110.126
host: 192.168.110.2
# 端口，默认为6379
port: 6379
port: 9287
# 数据库索引
database: 2
database: 7
# 密码
password: 123456
password: syar23rdsaagdrsa
# 连接超时时间
timeout: 10s
lettuce:
@ -131,9 +131,9 @@ xss:
urlPatterns: /system/*,/monitor/*,/tool/*
mqtt:
broker: tcp://zmkg.cqet.top:9995
username: cory18600000000
password: cory18600000000
broker: tcp://192.168.110.2:1883
username: atiandon
password: atiandon
topics:
# 设备 > 云平台
- thing/product/+/osd # 设备定频上报的属性
@ -174,13 +174,15 @@ deploy:
# duration-seconds: 3600
minio:
endpoint: "http://192.168.110.126:9000"
access-key: "root"
secret-key: "root123456"
role-arn: "arn:aws:s3:::drone-?/*"
role-session-name: "anysession"
endpoint: "xny.yj-3d.com:9000"
accessKeyID: "minioadmin"
secretAccessKey: "CQyj20200808!"
bucketName: "cory-create"
roleARN: "arn:aws:s3:::cory-create/*"
roleSessionName: "anysession"
region: "cn-chengdu"
duration-seconds: 3600
useSSL: true
durationSeconds: 3600
ai:

10
xinnengyuan/ruoyi-admin/src/main/resources/application-dev.yml
View File

@ -272,12 +272,12 @@ weather:
# dxf转 geojson 执行文件名
dxf2GeoJson:
file-name: main.exe
#ys7:
# app-key: 3acf9f1a43dc4209841e0893003db0a2
# app-secret: 4bbf3e9394f55d3af6e3af27b2d3db36
ys7:
app-key: 081b0d6d5f7f4de8bc5c7fa350fb26ec
app-secret: caa37b9f60ef02deb57e563bc190e6db
app-key: 3acf9f1a43dc4209841e0893003db0a2
app-secret: 4bbf3e9394f55d3af6e3af27b2d3db36
#ys7:
# app-key: 081b0d6d5f7f4de8bc5c7fa350fb26ec
# app-secret: caa37b9f60ef02deb57e563bc190e6db
# 斯巴达算法
sparta:
url: http://119.3.204.120:8040

2
xinnengyuan/ruoyi-admin/src/main/resources/application.yml
View File

@ -296,7 +296,7 @@ websocket:
--- # warm-flow工作流配置
warm-flow:
# 是否开启工作流，默认true
enabled: false
enabled: true
# 是否开启设计器ui
ui: true
# 默认Authorization，如果有多个token，用逗号分隔

18
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubConstructionUserServiceImpl.java
View File

@ -1,6 +1,7 @@
package org.dromara.contractor.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.DesensitizedUtil;
import cn.hutool.core.util.IdcardUtil;
import cn.hutool.core.util.PhoneUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@ -19,23 +20,26 @@ import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.common.utils.IdCardEncryptorUtil;
import org.dromara.contractor.constant.SubConstructionUserConstant;
import org.dromara.contractor.domain.SubConstructionUser;
import org.dromara.contractor.domain.SubConstructionUserFile;
import org.dromara.contractor.domain.SubContractor;
import org.dromara.contractor.domain.dto.constructionuser.*;
import org.dromara.contractor.domain.enums.SubConstructionUserFileStatusEnum;
import org.dromara.contractor.domain.exportvo.BusConstructionUserExportVo;
import org.dromara.contractor.domain.vo.constructionuser.*;
import org.dromara.contractor.domain.vo.contractor.SubContractorVo;
import org.dromara.contractor.mapper.SubConstructionUserMapper;
import org.dromara.contractor.service.ISubConstructionUserFileService;
import org.dromara.contractor.service.ISubConstructionUserService;
import org.dromara.contractor.service.ISubContractorService;
import org.dromara.contractor.constant.SubConstructionUserConstant;
import org.dromara.project.domain.*;
import org.dromara.project.domain.BusAttendance;
import org.dromara.project.domain.BusProject;
import org.dromara.project.domain.BusProjectTeamMember;
import org.dromara.project.domain.BusWorkWage;
import org.dromara.project.domain.enums.BusAttendanceClockStatusEnum;
import org.dromara.project.domain.enums.BusAttendanceCommuterEnum;
import org.dromara.project.domain.enums.BusConstructionUserAttendanceStatusEnum;
import org.dromara.contractor.domain.enums.SubConstructionUserFileStatusEnum;
import org.dromara.contractor.domain.exportvo.BusConstructionUserExportVo;
import org.dromara.contractor.mapper.SubConstructionUserMapper;
import org.dromara.project.service.*;
import org.dromara.system.domain.vo.SysOssVo;
import org.dromara.system.service.ISysDictTypeService;
@ -660,7 +664,7 @@ public class SubConstructionUserServiceImpl extends ServiceImpl<SubConstructionU
}
// 解密身份证号码
String decrypt = idCardEncryptorUtil.decrypt(constructionUserVo.getSfzNumber());
String hide = IdcardUtil.hide(decrypt, 11, 17);
String hide = DesensitizedUtil.idCardNum(decrypt, 1, 2);
constructionUserVo.setSfzNumber(hide);
return constructionUserVo;
}
@ -812,7 +816,7 @@ public class SubConstructionUserServiceImpl extends ServiceImpl<SubConstructionU
}
// 解密身份证号码
String decrypt = idCardEncryptorUtil.decrypt(constructionUserVo.getSfzNumber());
String hide = IdcardUtil.hide(decrypt, 11, 17);
String hide = DesensitizedUtil.idCardNum(decrypt, 1, 2);
constructionUserVo.setSfzNumber(hide);
return constructionUserVo;
}).toList();

53
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/manager/changxiemanager/ChangxieController.java
View File

@ -1,53 +0,0 @@
package org.dromara.manager.changxiemanager;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.io.*;
import java.net.HttpURLConnection;
import java.net.URI;
import java.net.URL;
import java.util.Scanner;
/**
* @author lcj
* @date 2025/6/27 17:02
*/
@RestController
@RequestMapping("/changxie")
public class ChangxieController {
@PostMapping("/callback")
public void singleFileUploads(HttpServletRequest request, HttpServletResponse response) throws IOException {
PrintWriter writer = response.getWriter();
Scanner scanner = new Scanner(request.getInputStream(), "GBK").useDelimiter("\\A");
String body = scanner.hasNext() ? scanner.next() : "";
JSONObject jsonObj = JSONUtil.parseObj(body);
if ((long) jsonObj.get("status") == 2 || (long) jsonObj.get("status") == 6) {
String downloadUri = (String) jsonObj.get("url");
URI uri = URI.create(downloadUri);
URL url = uri.toURL();
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
InputStream stream = connection.getInputStream();
File savedFile = new File("file/resource/changxie");
try (FileOutputStream out = new FileOutputStream(savedFile)) {
int read;
final byte[] bytes = new byte[1024];
while ((read = stream.read(bytes)) != -1) {
out.write(bytes, 0, read);
}
out.flush();
}
connection.disconnect();
} else if ((long) jsonObj.get("status") == 3 || (long) jsonObj.get("status") == 7) {
writer.write("{\"error\":-1}");
}
writer.write("{\"error\":0}");
}
}

3
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/other/service/impl/OthYs7DeviceImgServiceImpl.java
View File

@ -321,6 +321,9 @@ public class OthYs7DeviceImgServiceImpl extends ServiceImpl<OthYs7DeviceImgMappe
private static String extractFilename(String url) {
int start = url.lastIndexOf("/") + 1;
int end = url.indexOf("?", start);
if (end == -1) {
return url.substring(start);
}
if (start > 0 && end > start) {
return url.substring(start, end);
}