From 3d30c0cd4bd77d009d72d2f7e74ae322f86a95f5 Mon Sep 17 00:00:00 2001
From: tuqiang <437016993@qq.com>
Date: Thu, 8 May 2025 15:45:55 +0800
Subject: [PATCH] =?UTF-8?q?add:=E6=96=B0=E5=A2=9E=E7=A9=BA=E8=BD=B4?=
 =?UTF-8?q?=E9=80=80=E5=9B=9E=E4=BA=8B=E5=8A=A1=E6=B3=A8=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sch/tasks/slitter/service/impl/SlitterServiceImpl.java    | 1 +
 .../src/main/resources/config/application-dev.yml             | 4 ++--
 lms/nladmin-system/src/main/resources/config/application.yml  | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
index 14bda7c01..308bdae3e 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
@@ -2382,6 +2382,7 @@ public class SlitterServiceImpl implements SlitterService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public JSONObject returnShaft(JSONObject param) {
         log.info("空轴退回 - {}", param);
         JSONObject res = new JSONObject();
diff --git a/lms/nladmin-system/src/main/resources/config/application-dev.yml b/lms/nladmin-system/src/main/resources/config/application-dev.yml
index 66a8bd00e..0b51b22ef 100644
--- a/lms/nladmin-system/src/main/resources/config/application-dev.yml
+++ b/lms/nladmin-system/src/main/resources/config/application-dev.yml
@@ -43,7 +43,7 @@ spring:
           reset-enable: false
         filters:
           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
         password: 123456
       slave:
@@ -84,7 +84,7 @@ spring:
           reset-enable: false
         filters:
           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
         password: 123456
     rules:
diff --git a/lms/nladmin-system/src/main/resources/config/application.yml b/lms/nladmin-system/src/main/resources/config/application.yml
index a9fc87884..a435e1108 100644
--- a/lms/nladmin-system/src/main/resources/config/application.yml
+++ b/lms/nladmin-system/src/main/resources/config/application.yml
@@ -6,7 +6,7 @@ spring:
   freemarker:
     check-template-location: false
   profiles:
-    active: prod
+    active: dev
   jackson:
     time-zone: GMT+8
   data: