From d772a8c0b226e55dfc28fdfe6e41a2c491317ed8 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期二, 01 九月 2020 15:54:46 +0800
Subject: [PATCH] #

---
 src/main/resources/application.yml |   29 ++++++++++++++++-------------
 1 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 163893c..3c300fe 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,15 +1,18 @@
 server:
   port: 9090
   servlet:
-    context-path: /@pom.build.finalName@
+    context-path: /gdwcs
 
 spring:
   application:
-    name: @pom.build.finalName@
+    name: gdwcs
   datasource:
     # sql-server
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-    url: jdbc:sqlserver://127.0.0.1:1433;databasename=gdasrs
+    #url: jdbc:sqlserver://192.168.3.99:1433;databasename=gdasrs
+    #username: sa
+    #password: eisoft
+    url: jdbc:sqlserver://localhost:1433;databasename=gdasrs
     username: sa
     password: sa@123
   mvc:
@@ -26,7 +29,7 @@
 #    field-strategy: 0
 
 logging:
-  path: /stock/out/logs
+  path: /stock/out/wcs/logs
 
 super:
   pwd: xltys1995
@@ -39,7 +42,7 @@
   # 鍫嗗灈鏈�1
   crn[0]:
     id: 1
-    ip: 192.168.3.39
+    ip: 192.168.10.39
     port: 5015
     rack: 0
     slot: 0
@@ -62,7 +65,7 @@
     # 鍫嗗灈鏈�2
   crn[1]:
     id: 2
-    ip: 192.168.3.40
+    ip: 192.168.10.40
     port: 5016
     rack: 0
     slot: 0
@@ -85,7 +88,7 @@
   # 杈撻�佺嚎
   devp[0]:
     id: 1
-    ip: 192.168.3.65
+    ip: 192.168.10.65
     port: 6000
     rack: 0
     slot: 1
@@ -115,22 +118,22 @@
   # 鏉$爜鎵弿浠�
   barcode[0]:
     id: 1
-    ip: 192.168.2.150
+    ip: 192.168.10.150
     port: 51236
   # LED1
   led[0]:
     id: 1
-    ip: 192.168.1.1
-    port: 8888
+    ip: 192.168.10.61
+    port: 5005
   # LED2
   led[1]:
     id: 2
-    ip: 192.168.1.1
-    port: 8888
+    ip: 192.168.10.62
+    port: 5005
   # 纾呯О
   scale[0]:
     id: 1
-    ip: 192.168.1.1
+    ip: 192.168.10.152
     port: 8888
 
 

--
Gitblit v1.9.1