Skip to content

Commit 2eeeec0

Browse files
marchboymarchboy
committed
'updated'
1 parent 212c49a commit 2eeeec0

File tree

2 files changed

+42
-30
lines changed

2 files changed

+42
-30
lines changed

‎.vscode/sftp.json

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,24 @@
11
{
22
"protocol": "sftp",
3-
"host": "localhost",
4-
"port": 22,
5-
"username": "username",
6-
"remotePath": "/"
3+
"host": "pdatbiz02.rmz.flamingo-inc.com",
4+
"port": 33335,
5+
"username": "jinjun.gui",
6+
"remotePath": "/home/jinjun.gui/car_audio_play",
7+
"privateKeyPath": "E:/keys/jinjun.gui",
8+
"interactiveAuth": false,
9+
"context": "E:/pythonProject/CarAudio",
10+
"uploadOnSave": true,
11+
"downloadOnOpen": true,
12+
"syncMode": "full",
13+
"watcher": {
14+
"files": "**/*",
15+
"autoUpload": false,
16+
"autoDelete": false
17+
},
18+
"ignore": [
19+
".vscode",
20+
".git",
21+
".DS_Store",
22+
"*.pyc"
23+
]
724
}

‎CarAudio/logs/car_audio_20180801.log

Lines changed: 21 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
1-
[2018-08-01 15:02:33] - settings.py - INFO: �ú�Ŷ
2-
[2018-08-01 15:06:26] - root - INFO: �ú�Ŷo
3-
[2018-08-01 15:11:40,884] - settings.py - INFO: �ú�Ŷo
4-
[2018-08-01 15:16:09] - settings.py - Test p - INFO: �ú�Ŷo
5-
[2018-08-01 15:16:49] --- settings.py --- Test p --- INFO: �ú�Ŷo
6-
[2018-08-01 15:18:29] --- settings.py --- Test p --- INFO: ��ү���Ŷ������
7-
[2018-08-01 15:26:30] --- settings.py --- RequestParas --- INFO: {'car_brand': 'BMW', 'car_model': '530', 'command_text': '����Ҵ��촰'}
8-
[2018-08-01 15:31:57] --- settings.py --- RequestParas --- INFO: {'car_brand': 'BMW', 'car_model': '530', 'command_text': '����Ҵ��촰'}
1+
[2018-08-01 15:02:33] - settings.py - INFO: �ú�Ŷ
2+
[2018-08-01 15:06:26] - root - INFO: �ú�Ŷo
3+
[2018-08-01 15:11:40,884] - settings.py - INFO: �ú�Ŷo
4+
[2018-08-01 15:16:09] - settings.py - Test p - INFO: �ú�Ŷo
5+
[2018-08-01 15:16:49] --- settings.py --- Test p --- INFO: �ú�Ŷo
6+
[2018-08-01 15:18:29] --- settings.py --- Test p --- INFO: ��ү���Ŷ������
7+
[2018-08-01 15:26:30] --- settings.py --- RequestParas --- INFO: {'car_brand': 'BMW', 'car_model': '530', 'command_text': '����Ҵ��촰'}
8+
[2018-08-01 15:31:57] --- settings.py --- RequestParas --- INFO: {'car_brand': 'BMW', 'car_model': '530', 'command_text': '����Ҵ��촰'}
99
[2018-08-01 15:31:58] --- settings.py --- CarCommand --- INFO: {'CAN_command': 'OPEN SUNROOF'}
10-
[2018-08-01 15:34:23]---settings.py---RequestParas---INFO:{'car_brand': 'BMW', 'car_model': '530', 'command_text': '����Ҵ��촰'}
10+
[2018-08-01 15:34:23]---settings.py---RequestParas---INFO:{'car_brand': 'BMW', 'car_model': '530', 'command_text': '����Ҵ��촰'}
1111
[2018-08-01 15:34:25]---settings.py---CarCommand---INFO:{'CAN_command': 'OPEN SUNROOF'}
12-
[2018-08-01 15:34:46] --- settings.py --- RequestParas --- INFO: {'car_brand': 'BMW', 'car_model': '530', 'command_text': '����Ҵ��촰'}
12+
[2018-08-01 15:34:46] --- settings.py --- RequestParas --- INFO: {'car_brand': 'BMW', 'car_model': '530', 'command_text': '����Ҵ��촰'}
1313
[2018-08-01 15:34:47] --- settings.py --- CarCommand --- INFO: {'CAN_command': 'OPEN SUNROOF'}
14-
[2018-08-01 15:36:19] --- settings.py --- RequestParas --- INFO: {'car_brand': 'BMW', 'car_model': '530', 'command_text': '����Ҵ��촰'}
14+
[2018-08-01 15:36:19] --- settings.py --- RequestParas --- INFO: {'car_brand': 'BMW', 'car_model': '530', 'command_text': '����Ҵ��촰'}
1515
[2018-08-01 15:36:19] --- settings.py --- CarCommand --- INFO: {'CAN_command': 'OPEN SUNROOF'}
16-
[2018-08-01 15:38:07] --- settings.py --- RequestParas --- INFO: {'car_brand': 'LEXUS', 'car_model': 'LS', 'command_text': '�ܰ��Ҵ򿪳�����'}
16+
[2018-08-01 15:38:07] --- settings.py --- RequestParas --- INFO: {'car_brand': 'LEXUS', 'car_model': 'LS', 'command_text': '�ܰ��Ҵ򿪳�����'}
1717
[2018-08-01 15:38:07] --- settings.py --- CarCommand --- INFO: {'CAN_command': ''}
18-
[2018-08-01 15:39:01] --- settings.py --- RequestParas --- INFO: {'car_brand': 'LEXUS', 'car_model': 'LS', 'command_text': '�ܰ��Ҵ򿪳�����'}
18+
[2018-08-01 15:39:01] --- settings.py --- RequestParas --- INFO: {'car_brand': 'LEXUS', 'car_model': 'LS', 'command_text': '�ܰ��Ҵ򿪳�����'}
1919
[2018-08-01 15:39:03] --- settings.py --- CarCommand --- INFO: {'CAN_command': 'OPEN CAR LIGHT'}
20-
[2018-08-01 15:45:58] --- settings.py --- RequestParas --- INFO: {'car_brand': '����', 'car_model': '˼��', 'command_text': '�ܰ��ҹر�ǰ�����'}
20+
[2018-08-01 15:45:58] --- settings.py --- RequestParas --- INFO: {'car_brand': '����', 'car_model': '˼��', 'command_text': '�ܰ��ҹر�ǰ�����'}
2121
[2018-08-01 15:45:58] --- settings.py --- CarCommand --- INFO: {'CAN_command': 'CLOSE HEADLIGHT'}
22-
[2018-08-01 15:46:51] --- settings.py --- RequestParas --- INFO: {'car_brand': 'BMW', 'car_model': '530', 'command_text': '����Ҵ��촰'}
22+
[2018-08-01 15:46:51] --- settings.py --- RequestParas --- INFO: {'car_brand': 'BMW', 'car_model': '530', 'command_text': '����Ҵ��촰'}
2323
[2018-08-01 15:46:51] --- settings.py --- CarCommand --- INFO: {'CAN_command': 'OPEN SUNROOF'}
24-
[2018-08-01 16:08:11] --- settings --- RequestParas --- INFO: {'car_brand': 'BMW', 'car_model': '530', 'command_text': '����Ҵ��촰'}
24+
[2018-08-01 16:08:11] --- settings --- RequestParas --- INFO: {'car_brand': 'BMW', 'car_model': '530', 'command_text': '����Ҵ��촰'}
2525
[2018-08-01 16:08:14] --- settings --- CarCommand --- INFO: {'CAN_command': 'OPEN SUNROOF'}
26-
[2018-08-01 16:09:10] --- __console --- RequestParas --- INFO: {'car_brand': 'BMW', 'car_model': '530', 'command_text': '����Ҵ��촰'}
26+
[2018-08-01 16:09:10] --- __console --- RequestParas --- INFO: {'car_brand': 'BMW', 'car_model': '530', 'command_text': '����Ҵ��촰'}
2727
[2018-08-01 16:09:13] --- __console --- CarCommand --- INFO: {'CAN_command': 'OPEN SUNROOF'}
28-
[2018-08-01 16:13:08] --- RequestParas --- INFO: {'car_brand': 'BMW', 'car_model': '530', 'command_text': '����Ҵ��촰'}
28+
[2018-08-01 16:13:08] --- RequestParas --- INFO: {'car_brand': 'BMW', 'car_model': '530', 'command_text': '����Ҵ��촰'}
2929
[2018-08-01 16:13:09] --- CarCommand --- INFO: {'CAN_command': 'OPEN SUNROOF'}
3030
[2018-08-01 17:05:37] --- RequestParas --- INFO: {u'car_model': u'530', u'car_brand': u'BMW', u'command_text': u'\u8bf7\u5e2e\u6211\u6253\u5f00\u5929\u7a97'}
3131
[2018-08-01 17:06:16] --- RequestParas --- INFO: {u'car_model': u'530', u'car_brand': u'BMW', u'command_text': u'\u8bf7\u5e2e\u6211\u6253\u5f00\u5929\u7a97'}
@@ -38,13 +38,8 @@
3838
[2018-08-01 17:59:32] --- RequestParas --- INFO: {u'car_model': u'530', u'car_brand': u'BMW', u'command_text': u'\u8bf7\u5e2e\u6211\u6253\u5f00\u5929\u7a97'}
3939
[2018-08-01 18:02:33] --- RequestParas --- INFO: {u'car_model': u'530', u'car_brand': u'BMW', u'command_text': u'\u8bf7\u5e2e\u6211\u6253\u5f00\u5929\u7a97'}
4040
[2018-08-01 18:02:34] --- CarCommand --- INFO: {'CAN_command': u'OPEN SUNROOF'}
41-
[2018-08-01 18:28:14] --- RequestParas --- INFO: {'car_brand': 'BMW', 'car_model': '530', 'command_text': '����Ҵ��촰'}
42-
[2018-08-01 18:28:48] --- RequestParas --- INFO: {'car_brand': 'BMW', 'car_model': '530', 'command_text': '����Ҵ��촰'}
41+
[2018-08-01 18:28:14] --- RequestParas --- INFO: {'car_brand': 'BMW', 'car_model': '530', 'command_text': '����Ҵ��촰'}
42+
[2018-08-01 18:28:48] --- RequestParas --- INFO: {'car_brand': 'BMW', 'car_model': '530', 'command_text': '����Ҵ��촰'}
4343
[2018-08-01 18:28:49] --- CarCommand --- INFO: {'CAN_command': 'OPEN SUNROOF'}
44-
[2018-08-01 18:41:51] --- RequestParas --- INFO: {'car_brand': 'BMW', 'car_model': '530', 'command_text': '����Ҵ��촰'}
44+
[2018-08-01 18:41:51] --- RequestParas --- INFO: {'car_brand': 'BMW', 'car_model': '530', 'command_text': '����Ҵ��촰'}
4545
[2018-08-01 18:41:52] --- CarCommand --- INFO: {'CAN_command': 'OPEN SUNROOF'}
46-
<<<<<<< HEAD
47-
[2018-08-01 19:03:48] --- RequestParas --- INFO: {'car_brand': 'BMW', 'car_model': '530', 'command_text': '����Ҵ��촰'}
48-
[2018-08-01 19:03:48] --- CarCommand --- INFO: {'CAN_command': 'OPEN SUNROOF'}
49-
=======
50-
>>>>>>> 9ff99e0158cbe3beca5127f4ed6cbadb859b6fa5

0 commit comments

Comments
 (0)