rabin 6 years ago
parent
commit
6a973deb84
3 changed files with 11 additions and 4 deletions
  1. 7 3
      conf/env.conf
  2. 2 1
      front/page/origin.py
  3. 2 0
      web/templates/inc/menu.html

+ 7 - 3
conf/env.conf

@@ -56,7 +56,8 @@ port				= 8088
 debug				= False
 max_buffer_size		= 210763776
 process				= 0
-url					= http://www.xinnongbaohe.com:8088/device
+;url					= http://www.xinnongbaohe.com:8088/device
+url					= http://v3.xinnongbaohe.com/device
 qrcode				= http://pan.baidu.com/share/qrcode?w=300&h=300&url=
 mobile				= True
 
@@ -66,5 +67,8 @@ port				= 8089
 debug				= False
 max_buffer_size		= 210763776
 process				= 0
-url					= http://www.xinnongbaohe.com:8089/
-farmurl				= http://www.xinnongbaohe.com:8089/farm?id=
+;url					= http://www.xinnongbaohe.com:8089/
+;farmurl				= http://www.xinnongbaohe.com:8089/farm?id=
+url					= http://www.xinnongbaohe.com/
+farmurl				= http://farm.xinnongbaohe.com/?id=
+originurl			= http://s.xinnongbaohe.com/?id=

+ 2 - 1
front/page/origin.py

@@ -67,7 +67,8 @@ class view_path(Load):
 	def get(self):
 		id = self.input('id')
 		self.data['info'] = self.service('common').one('origin_batch', id=id)
-		self.data['url'] = self.data['setting']['web'] + 'origin?id=' + id + '&code=' + self.data['info']['number']
+		#self.data['url'] = self.data['setting']['web'] + 'origin?id=' + id + '&code=' + self.data['info']['number']
+		self.data['url'] = self.data['setting']['originurl'] + id + '&code=' + self.data['info']['number']
 		self.data['qrcode'] = Demeter.config['front']['qrcode'] + self.data['url']
 		self.view("origin/view.html")
 

+ 2 - 0
web/templates/inc/menu.html

@@ -11,6 +11,8 @@
             {% else %}
             <li><a href="{{data['setting']['front']}}">登录管理</a></li>
             {% end %}
+
+            <li><a href="http://old.xinnongbaohe.com/" target="_blank">旧版入口</a></li>
         </ul>
     </div>
 </div>