marge: 合并代码

2023-11-28 10:22:37 +08:00
parent 5050f4f113
commit 3df3b5b5f7
18 changed files with 234 additions and 46 deletions
--- a/restagent/etc/restconf.yaml
+++ b/restagent/etc/restconf.yaml
@@ -37,12 +37,15 @@ webServer:
 database:
  type: mysql
  user: root
-  password: "1000omc@kp!"
-  host: "192.168.2.219"
-  port: 33066
-  name: omc_db
+  # password: "1000omc@kp!"
+  # host: "192.168.2.219"
+  # port: 33066
+  # name: omc_db
  backup: d:/local.git/ems.agt/restagent/database
-
+  password: "root@1234"
+  host: "192.168.2.152"
+  port: 3306
+  name: "omc_db"
 # Redis 缓存数据，数据源声明全小写
 redis:
  dataSource: