toolchaintechnologycenter/spdm-backend
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
zhuxinru
2026-02-06 18:53:56 +08:00
parent 796bae6d06 6b86936a63
commit 32e19f92e2
4 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
outbridge/src/main/resources/common-lyric.yml
View File

@@ -1,18 +1,31 @@
spring:
datasource:
# todo 生产地址
# 生产地址
second:
username: EP_DM
password: ENC(c04rt9Z6Ygz024EU9eWvig==)
jdbc-url: jdbc:mysql://10.122.48.11:13306/easy_project?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai
jdbc-url: jdbc:mysql://192.168.30.74:3306/easy_project?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai
driver-class-name: com.mysql.cj.jdbc.Driver
# todo 第三个数据源，生产ip不一样
# 第三个数据源，生产ip不一样
third:
username: EP_DM
password: ENC(c04rt9Z6Ygz024EU9eWvig==)
jdbc-url: jdbc:mysql://10.122.48.11:13306/ecn?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai
username: ECN_DM
password: ENC(YX2p8EZqmCAqqkj3wTRCsw==)
jdbc-url: jdbc:mysql://192.168.23.64:3306/ecn?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai
driver-class-name: com.mysql.cj.jdbc.Driver
## 测试环境
# second:
# username: EP_DM
# password: ENC(c04rt9Z6Ygz024EU9eWvig==)
# jdbc-url: jdbc:mysql://10.122.48.11:13306/easy_project?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai
# driver-class-name: com.mysql.cj.jdbc.Driver
##
# third:
# username: EP_DM
# password: ENC(c04rt9Z6Ygz024EU9eWvig==)
# jdbc-url: jdbc:mysql://10.122.48.11:13306/ecn?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai
# driver-class-name: com.mysql.cj.jdbc.Driver
# 测试开发环境
#appKey : 380ad3deb578424c9ca5178383f732c1
#appSecret : 805c316f35024b8b9566ca67b4991c42

3
project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java
View File

@@ -3985,7 +3985,7 @@ public class TaskServiceImpl implements ITaskService {
filePermissions.add(item2);
}
}
batchUpdatePermission(filePermissions);
// 新增拓展属性
List<SimulationTaskExtra> extraList = req.getExtras();
@@ -4065,6 +4065,7 @@ public class TaskServiceImpl implements ITaskService {
}
}
}
batchUpdatePermission(filePermissions);
}
return SdmResponse.success();
}

2
project/src/main/resources/mapper/SimulationProjectMapper.xml
View File

@@ -580,7 +580,7 @@
</if>
<if test="name != null and name != ''">
<bind name="searchKey" value="'%' + name+ '%'"/>
and nodeName #{searchKey}
and nodeName like #{searchKey}
</if>
order by createTime desc
</select>

2
project/src/main/resources/mapper/SimulationTaskMapper.xml
View File

@@ -206,7 +206,7 @@
</if>
<if test="req.taskName != null and req.taskName != ''">
<bind name="searchKey1" value="'%' + req.taskName + '%'"/>
and task_name like #{searchKey}
and task_name like #{searchKey1}
</if>
<if test="req.name != null and req.name != ''">
<bind name="searchKey2" value="'%' + req.name + '%'"/>