Merge branch 'master' of ssh://git.dever.cc:10022/xinnongbaohe/zeus

front/api/interface.py

@@ -51,6 +51,8 @@ class sync_path(Load):
 				data = json.loads(data)
 				for v in data:
 					update = {}
+					if 'password' in v:
+						Demeter.config['db_md5'] = 1
 					info = self.service('common').one(table, id=v['id'])
 					if info:
 						id = v['id']

front/page/user.py

@@ -21,7 +21,13 @@ class login_path(Load):
 				temp = user['password'].split('_')
 				if Demeter.md5(password, temp[1]) == user['password']:
 					self.set_secure_cookie('user', str(user['id']))
-					self.out('yes', {'id':user['id']})
+					farm = self.service('common').one('farm', id=user['farm_id'])
+					if 'eros_status' in farm and farm['eros_status'] == 1 and farm['eros_server']:
+						url = 'http://' + farm['eros_server'] + ':8081/user/login?username='+mobile+'&password='+temp[0]
+						#self.redirect(url)
+						self.out('yes', {'id':user['id'],'url':url})
+					else:
+						self.out('yes', {'id':user['id']})
 					return
 		self.out('手机号或安全码错误，登录失败')
 

front/static/pc/js/main.js

@@ -205,6 +205,10 @@ var Farm =
 		} else if(value.data == 'reload') {
 			this.Jump('');
 		} else {
+			if (value.data.url) {
+				this.Jump(value.data.url);
+				return;
+			}
 			if($("#url").length) {
 				url = $("#url").val();
 			} else {