From 7600059f8037f804b19d0da008ba34d62c43296d Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 11 十二月 2025 17:27:57 +0800
Subject: [PATCH] Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms

---
 src/main/resources/application-dev.yml |   22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index ffa0b84..b93ce22 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,5 +1,5 @@
 server:
-  port: 8080
+  port: 8081
   servlet:
     context-path: /@pom.build.finalName@
 
@@ -11,8 +11,8 @@
   datasource:
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
     username: sa
-    password: Skyouc#23
-    url: jdbc:sqlserver://127.0.0.1:1433;databasename=jsxswms
+    password: sa@123
+    url: jdbc:sqlserver://192.168.4.15:1433;databasename=jsxsasrs
   mvc:
     static-path-pattern: /**
   redis:
@@ -30,7 +30,7 @@
   #  global-config:
   #    field-strategy: 0
   configuration:
-    #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     map-underscore-to-camel-case: true
     cache-enabled: true
     call-setters-on-nulls: true
@@ -47,7 +47,7 @@
 
 #License鐩稿叧閰嶇疆
 license:
-  subject: integrationasrs
+  subject: jsxsasrs
   publicAlias: publicCert
   storePass: public_zhongyang_123456789
   licensePath: license.lic
@@ -109,4 +109,14 @@
     acctID: "647e849ab6fa0f"
     username: "llw"
     password: "666666"
-    lcid: 2052
\ No newline at end of file
+    lcid: 2052
+
+#KOPEN灏忔澗骞冲彴
+kopen:
+
+
+#AGV璋冨害
+hlk:
+  url: http://127.0.0.1
+  port: 5173
+  prefix: hlk

--
Gitblit v1.9.1