Commit Graph

104 Commits

Author SHA1 Message Date
罗干 acec61b828 Merge branch 'master' of http://192.168.0.27/dev0/PriceSystem
修改:     PriceSystem/test.py
2018-04-09 11:20:47 +08:00
罗干 ba5a047035 新文件: PriceSystem/fix/__init__.py
新文件:   PriceSystem/fix/__pycache__/__init__.cpython-36.pyc
	新文件:   PriceSystem/fix/__pycache__/price_fix.cpython-36.pyc
	新文件:   PriceSystem/fix/price_fix.py
	修改:     PriceSystem/ones_Sender.py
	修改:     PriceSystem/sell_price/zhuge0118A.py
	修改:     PriceSystem/test.py
2018-04-09 11:16:53 +08:00
admin 9b39a072af 切换seawweed数据库 2018-04-08 13:03:53 +08:00
罗干 bf4de2667b 修改: PriceSystem/sell_price/zhuge0118A.py
修改:     PriceSystem/test.py
2018-04-08 10:38:14 +08:00
罗干 e8b20aeffe Merge branch 'master' of http://192.168.0.27/dev0/PriceSystem 2018-04-08 10:25:41 +08:00
罗干 bc6b42a5d4 修改: PriceSystem/sell_price/zhuge0118A.py 2018-04-08 10:25:02 +08:00
admin dd86da6e6b 切换DB 2018-04-08 09:49:36 +08:00
admin af075ca9df Merge branch 'master' of 192.168.0.27:dev0/PriceSystem
# Conflicts:
#	PriceSystem/test.py
2018-04-08 09:13:08 +08:00
admin 0bfa23dc19 fix bug 2018-04-08 09:12:27 +08:00
罗干 e1a67b9b42 修改: PriceSystem/fangjia/__init__.py
修改:     PriceSystem/sell_price/zhuge0118A.py
	修改:     PriceSystem/test.py
2018-04-04 15:03:01 +08:00
罗干 87d9681346 Merge branch 'master' of http://192.168.0.27/dev0/PriceSystem 2018-04-04 13:59:45 +08:00
罗干 d90f4109d0 修改: PriceSystem/sell_price/zhuge0118A.py 2018-04-04 13:59:17 +08:00
admin 1f9d64e130 恢复异常打印 2018-04-04 13:46:11 +08:00
admin 70b645a6c9 优化 2018-04-04 13:43:54 +08:00
admin 0067e12701 优化 2018-04-04 13:39:53 +08:00
admin e7253c1d50 Merge branch 'master' of 192.168.0.27:dev0/PriceSystem 2018-04-04 13:35:07 +08:00
admin 10c9b6de6f 优化异常捕获 2018-04-04 13:34:59 +08:00
罗干 0f0d03aa79 修改: PriceSystem/fangjia/__init__.py 2018-04-04 11:18:12 +08:00
罗干 5c47775ed3 修改: PriceSystem/fangjia/__init__.py
修改:     PriceSystem/sell_price/zhuge0118A.py
:	修改:     PriceSystem/test.py
2018-04-03 17:35:13 +08:00
admin e13910e00c Merge branch 'master' of 192.168.0.27:dev0/PriceSystem
# Conflicts:
#	PriceSystem/test.py
2018-04-02 16:09:28 +08:00
admin a3bbb47d2e 更新 2018-04-02 16:06:05 +08:00
罗干 9ab2ed087c Merge branch 'master' of http://192.168.0.27/dev0/PriceSystem
修改:     PriceSystem/CalcCmdReceiver.py
	修改:     PriceSystem/fangjia/__init__.py
2018-04-02 16:03:52 +08:00
罗干 6be19aefa2 修改: PriceSystem/fangjia/__init__.py
修改:     PriceSystem/sell_price/zhuge0118A.py
	修改:     PriceSystem/test.py
2018-04-02 16:03:07 +08:00
admin e4b1ed00df 解决冲突 2018-04-02 14:46:55 +08:00
admin be2f9f23a0 Merge branch 'master' of 192.168.0.27:dev0/PriceSystem 2018-04-02 14:43:26 +08:00
admin 77484c9271 修改计时方式 2018-04-02 14:43:13 +08:00
罗干 f9e0c8fde5 Merge branch 'master' of http://192.168.0.27/dev0/PriceSystem
修改:     PriceSystem/config/__init__.py
	修改:     PriceSystem/fangjia/__init__.py
	修改:     PriceSystem/sell_price/zhuge0118A.py
	修改:     PriceSystem/test.py
2018-04-02 14:35:13 +08:00
罗干 5c116d1e2b 修改: PriceSystem/fangjia/__init__.py
修改:     PriceSystem/sell_price/zhuge0118A.py
	修改:     PriceSystem/test.py
2018-04-02 14:33:43 +08:00
admin 09017dda8e 优化脚本 2018-04-02 14:21:34 +08:00
admin fe6f3b2922 修改数据库地址 2018-04-02 14:13:43 +08:00
admin 006bbc9064 切花DB 2018-04-02 14:03:18 +08:00
admin 032557c5a3 增加进程数 2018-04-02 11:23:19 +08:00
admin 0db1b7f077 优化代码 2018-04-02 10:38:39 +08:00
罗干 f4d1c80458 修改: PriceSystem/test.py 2018-03-30 11:27:24 +08:00
罗干 e976601925 修改: PriceSystem/sell_price/zhuge0118A.py
修改:     PriceSystem/test.py
2018-03-30 11:23:09 +08:00
罗干 d9b78e79ce 修改: PriceSystem/sell_price/zhuge0118A.py 2018-03-30 09:37:10 +08:00
罗干 fd10b0ea02 修改: PriceSystem/ones_Sender.py
修改:     PriceSystem/sell_price/zhuge0118A.py
	修改:     PriceSystem/test.py
2018-03-29 14:46:41 +08:00
罗干 94cd89b360 修改: PriceSystem/ones_Sender.py 2018-03-28 11:16:18 +08:00
罗干 23c124c2b2 Merge branch 'master' of http://192.168.0.27/dev0/PriceSystem
修改:     PriceSystem/config/__init__.py
	修改:     PriceSystem/fangjia/__init__.py
	新文件:   PriceSystem/fangjia/cachedObjectWrapper.py
	修改:     PriceSystem/ones_Sender.py
	修改:     PriceSystem/test.py
2018-03-28 10:16:54 +08:00
罗干 f1876a0e2b 修改: PriceSystem/fangjia/__init__.py
修改:     PriceSystem/ones_Sender.py
	修改:     PriceSystem/test.py
2018-03-28 10:13:03 +08:00
admin 4025e7533b 添加缓存 2018-03-26 18:06:06 +08:00
admin d45fbc7fdd Merge branch 'master' of 192.168.0.27:dev0/PriceSystem 2018-03-26 11:18:25 +08:00
罗干 d678f01d38 修改: PriceSystem/sell_price/zhuge0118A.py 2018-03-26 10:55:38 +08:00
admin 75fd00853a 修改时间 2018-03-20 17:31:03 +08:00
罗干 5163eb9ab9 新文件: PriceSystem/ones_Sender.py 2018-03-20 17:03:21 +08:00
罗干 002ac7ee90 PriceSystem/test.py
PriceSystem/ones_Sender.py
2018-03-20 17:00:18 +08:00
罗干 472d73be21 Merge branch 'master' of http://192.168.0.27/dev0/PriceSystem 2018-03-20 16:49:23 +08:00
罗干 3e63e49d4e 修改: PriceSystem/fangjia/__init__.py
修改:     PriceSystem/sell_price/zhuge0118A.py
	修改:     PriceSystem/test.py
	PriceSystem/one_Sender.py
2018-03-20 16:48:39 +08:00
admin ab3bbbe864 Merge branch 'master' of 192.168.0.27:dev0/PriceSystem 2018-03-15 11:38:48 +08:00
admin 3a602bd704 修改配置 2018-03-15 11:35:30 +08:00