From 9f73e744453a81bb2f375f412a5537a955aebed7 Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Mon, 20 May 2024 10:43:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=86=85=E5=8C=85=E9=97=B4=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=AE=8C=E6=88=90=E7=82=B9=E4=BD=8D=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E8=B5=8B=E5=80=BC=E4=B8=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sch/tasks/slitter/auto/AutoCallAirShaftTask.java   |  8 ++++----
 .../src/main/resources/config/application-dev.yml      | 10 +++-------
 lms/nladmin-ui/.env.development                        |  4 ++--
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java
index cfc30eb96..c164df31d 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java
@@ -242,11 +242,11 @@ public class AutoCallAirShaftTask {
             } else {
                 // 右卷
                 if (SlitterConstant.SLITTER_TYPE_PAPER.equals(plan.getPaper_tube_or_FRP())) {
-                    empty.setTube_code1(plan.getPaper_tube_material());
-                    empty.setTube_name1(plan.getPaper_tube_model());
+                    empty.setTube_code2(plan.getPaper_tube_material());
+                    empty.setTube_name2(plan.getPaper_tube_model());
                 } else {
-                    empty.setTube_code1(plan.getFRP_material());
-                    empty.setTube_name1(plan.getFRP_model());
+                    empty.setTube_code2(plan.getFRP_material());
+                    empty.setTube_name2(plan.getFRP_model());
                 }
                 empty.setContainer_name2(plan.getContainer_name());
             }
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 04ecb9282..175efc335 100644
--- a/lms/nladmin-system/src/main/resources/config/application-dev.yml
+++ b/lms/nladmin-system/src/main/resources/config/application-dev.yml
@@ -1,5 +1,5 @@
 server:
-  port: 8010
+  port: 9999
 #配置数据源
 spring:
   datasource:
@@ -7,10 +7,9 @@ spring:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
 #      url: jdbc:log4jdbc:mysql://${DB_HOST:10.1.3.91}:${DB_PORT:3306}/${DB_NAME:lms_test2}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
-      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:lzhl_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
-        #      username: ${DB_USER:root}
+      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:lzhl_two_test}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
       username: ${DB_USER:root}
-      password: ${DB_PWD:root}
+      password: ${DB_PWD:12356}
       # 初始连接数
       initial-size: 5
       # 最小连接数
@@ -161,9 +160,6 @@ sa-token:
   jwt-secret-key: opsjajisdnnca0sdkksdfaaasdfwwq
   # token 前缀
   token-prefix: Bearer
-  cookie:
-    # 配置 Cookie 作用域:根据二级域名实现sso登入如lms.sso.com;acs.sso.com
-    domain:
 
 loki:
   url: http://localhost:3100/loki/api/v1
diff --git a/lms/nladmin-ui/.env.development b/lms/nladmin-ui/.env.development
index 383d102d2..a59553bed 100644
--- a/lms/nladmin-ui/.env.development
+++ b/lms/nladmin-ui/.env.development
@@ -1,8 +1,8 @@
 ENV = 'development'
 
 # 接口地址
-VUE_APP_BASE_API  = 'http://localhost:8011'
-VUE_APP_WS_API = 'ws://localhost:8011'
+VUE_APP_BASE_API  = 'http://localhost:9999'
+VUE_APP_WS_API = 'ws://localhost:9999'
 
 # 是否启用 babel-plugin-dynamic-import-node插件
 VUE_CLI_BABEL_TRANSPILE_MODULES = true