配置文件冲突

core/src/config.json

@@ -2,7 +2,7 @@
     "webServerPort": "501",
     "redisServers": "enterprise=192.168.3.128:1712,service=192.168.3.128:1712,other=192.168.3.128:1712,sso=192.168.3.128:1712,credit=192.168.3.128:1712,session=192.168.3.128:1712",
     "useRedis": false,
-    "mongodbServers": "192.168.3.128:27080",	
+    "mongodbServers": "192.168.3.128:27080",
     "elasticsearch": "http://192.168.3.128:9800",
     "jyescsearch": "http://192.168.3.128:9800",
     "elasticPoolSize": 30,
@@ -38,10 +38,6 @@
     "ocr_uid": "120.25.216.197",
     "ocr_servicekey": "c1608f6b-b507-46d4-98de-12e98f613715",
     "ocr_servicecode": "91f6a58d-e418-4e58-8ec2-61b583c55ba2",
-	"entMongodbServers": "192.168.3.18:27080",
-	"entMongodbPoolSize": 5,
-    "entMongodbName": "qfw",
-	"entMongodbAlias":"B",
 	"followEnterprise":10,
 	"serviceApp":100,
 	"atrrTitle": {
@@ -77,13 +73,14 @@
       "rpcPushServer":"127.0.0.1:8082",
       "rpcSericeMethod":"Service.PushVersionMsg"
     },
-	"mysql":{
-		"dbName":   "jianyu",
-		"address":  "192.168.3.11:3366",
-		"userName": "root",
-		"passWord": "Topnet123"
-	},
+  "mysql":{
+    "dbName":   "jianyu",
+    "address":  "192.168.3.14:3306",
+    "userName": "admin",
+    "passWord": "123456"
+  },
 	"pushSubscribeRpc":"127.0.0.1:1122",
 	"jyRpc":"127.0.0.1:8084",
-	"invoice_interface_address": "http://192.168.3.14:7080/Invoice/Add"
+  "invoice_interface_address": "http://192.168.3.14:7080/Invoice/Add",
+  "spdbGetUrl": "http://127.0.0.1:8088/OnlineCourses"
 }

core/src/timetask.json

@@ -1 +1 @@
-{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2020-03-28 15:56:01"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2020-03-28 15:56:06"}},"marketisstart":true,"marketrate":300}
+{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2020-05-13 15:10:08"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2020-05-13 15:10:08"}},"marketisstart":true,"marketrate":300}