root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master_merge' into master_merge

Browse Source
This commit is contained in:
liyongde
2025-05-10 11:02:09 +08:00
parent b1a5ca5ab1 3d30c0cd4b
commit 94e0250dc6
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
View File

@@ -2382,6 +2382,7 @@ public class SlitterServiceImpl implements SlitterService {
} }
@Override @Override
@Transactional(rollbackFor = Exception.class)
public JSONObject returnShaft(JSONObject param) { public JSONObject returnShaft(JSONObject param) {
log.info("空轴退回 - {}", param); log.info("空轴退回 - {}", param);
JSONObject res = new JSONObject(); JSONObject res = new JSONObject();

4
lms/nladmin-system/src/main/resources/config/application-dev.yml
View File

@@ -43,7 +43,7 @@ spring:
reset-enable: false reset-enable: false
filters: filters:
DruidFilter,stat DruidFilter,stat
url: jdbc:mysql://localhost:3306/lms?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true url: jdbc:mysql://localhost:3306/lzhl_lms?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true
username: root username: root
password: 123456 password: 123456
slave: slave:
@@ -84,7 +84,7 @@ spring:
reset-enable: false reset-enable: false
filters: filters:
DruidFilter,stat DruidFilter,stat
url: jdbc:mysql://127.0.0.1:3306/lms?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true url: jdbc:mysql://127.0.0.1:3306/lzhl_lms?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true
username: root username: root
password: 123456 password: 123456
rules: rules:

2
lms/nladmin-system/src/main/resources/config/application.yml
View File

@@ -6,7 +6,7 @@ spring:
freemarker: freemarker:
check-template-location: false check-template-location: false
profiles: profiles:
active: prod active: dev
jackson: jackson:
time-zone: GMT+8 time-zone: GMT+8
data: data: