From 74f8cd07a39795656573d4e4bb2fe85a6dadbb8c Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 02 九月 2023 15:15:44 +0800
Subject: [PATCH] 从云端请求工艺参数,加入deviceId字段用于消息过滤

---
 conf/apsClient.json |   62 +++++++-----------------------
 1 files changed, 15 insertions(+), 47 deletions(-)

diff --git a/conf/apsClient.json b/conf/apsClient.json
index 0790e9b..ed4e16c 100644
--- a/conf/apsClient.json
+++ b/conf/apsClient.json
@@ -2,66 +2,34 @@
   "system": {
     "env": "develop",
     "port": 8003,
-    "UseMultipoint": false,
-    "UseRedis": false,
-    "LimitCountIP": 15000,
-    "LimitTimeIP": 3600,
-    "RouterPrefix": "api",
-    "SudoPassword": "basic2021"
+    "deviceId": "DeviceID1",
+    "netSetShellPath": "/data/network/",
+    "netUpShellName": "up.sh",
+    "netDownShellName": "down.sh"
   },
   "log": {
     "path": "./logs/apsClient.log",
     "encoder": "console"
   },
-  "mysql": {
-    "dsn": "root:c++java123@tcp(192.168.20.119:3306)/aps_client?charset=utf8&parseTime=True&loc=Local",
+  "sqlite": {
+    "dsn": "aps.db",
     "logMode": true,
     "maxIdleCon": 50,
     "maxOpenCon": 200,
     "connMaxLifeTimeSecond": 120,
     "connMaxIdleTimeSecond": 3600
   },
-  "redis": {
-    "host": "127.0.0.1",
-    "port": 6379,
-    "password": "123456",
-    "db": 0
+  "Services":{
+    "apsServer": "http://192.168.20.119:9081"
   },
-  "captcha": {
-    "keyLong": 6,
-    "imgWidth": 240,
-    "imgHeight": 80,
-    "openCaptcha": 0,
-    "openCaptchaTimeout": 3600
+  "nsqConf": {
+    "NodeId": "wangpengfei",
+    "nsqdAddr": "121.31.232.83:4150",
+    "nsqlookupdAddr":""
   },
-  "jwt": {
-    "SigningKey": "327a9457-899a-481e-8b30-58cc97e5b808",
-    "ExpiresTime": "7d",
-    "BufferTime": "1d",
-    "Issuer": "qmPlus"
-  },
-  "etcd": {
-    "endpoints": [
-      "172.20.11.127:2379"
-    ],
-    "dialTimeout": 5,
-    "keyPrefix": "/aps/apsServer/node/",
-    "tls": {
-      "certFile": "/etc/kubernetes/ssl/kube-etcd-172-20-11-127.pem",
-      "keyFile": "/etc/kubernetes/ssl/kube-etcd-172-20-11-127-key.pem",
-      "caFile": "/etc/kubernetes/ssl/kube-ca.pem"
-    }
-  },
-  "rancher": {
-    "url": "https://121.31.232.83:8443",
-    "token": "token-vvmqt:fbq7v8gwmn4bxm4j6p96jk5twmjcdzwzvnp6j787g76sq484b2b77k"
-  },
-  "k8s": {
-    "image": "harbor.smartai.com/apsserver/apsserver:v0.4",
-    "dbHost": "172.20.11.128",
-    "alHost": "172.20.11.128",
-    "host": "172.20.11.127",
-    "ip": "172.20.11.127"
+  "plc": {
+    "finishNumberTimeInterval": 100,
+    "totalNumberTimeInterval": 1000
   }
 }
 

--
Gitblit v1.8.0