Merge branch 'normal'

Conflicts:
	root.py

Author: liyonghelpme

__init__.py

@@ -9,8 +9,11 @@
 import memcache
 import time
 import json
+import MySQLdb
 # Global session manager: DBSession() returns the Thread-local
 # session object appropriate for the current web request.
+con = MySQLdb.connect(host='localhost', passwd='2e4n5k2w2x', user='root', db='stcHong')
+cursor = con.cursor()
 maker = sessionmaker(autoflush=True, autocommit=False,
                      extension=ZopeTransactionExtension())
 DBSession = scoped_session(maker)
@@ -19,11 +22,12 @@
 timestr=str(time.strftime('%Y-%m-%d-%H:%M:%S',time.localtime(time.time())))
 taskbonus=[]
 wartaskbonus=[]
-f = file('taskbonus.json')
+f = file('/root/tg2env/taskbonus.json')
 source = f.read()
 target = json.JSONDecoder().decode(source)
-f2=file('wartask.json')
+f2=file('/root/tg2env/wartask.json')
 source2=f2.read()
+logfile = file("log.txt", "w")
 if source2!=None:
     target2 = json.JSONDecoder().decode(source2)
 for t in target:
@@ -35,7 +39,6 @@
 #newtask = newtask.read()
 #newtask = json.loads(newtask)
 
-logfile=open("logfile"+timestr,'w')
 # Base class for all of our model classes: By default, the data model is
 # defined with SQLAlchemy's declarative extension, but if you need more
 # control, you can switch to the traditional method.
@@ -152,4 +155,6 @@ def init_model(engine):
 from stchong.model.dragon import Dragon
 from stchong.model.petAtt import PetAtt
 from stchong.model.message import Message
+from stchong.model.emptyCastal import EmptyCastal
+from stchong.model.emptyResult import EmptyResult
 #from stchong.model.useraccount import userAccount

clearPet.py

@@ -0,0 +1,19 @@
+from sqlalchemy import *
+from sqlalchemy.orm import mapper, relation
+from sqlalchemy import Table, ForeignKey, Column
+from sqlalchemy.types import Integer, Unicode
+from sqlalchemy.orm import relation, backref
+from stchong.model import DeclarativeBase, metadata, DBSession
+
+class EmptyCastal(DeclarativeBase):
+    __tablename__ = 'emptyCastal'
+    #{ Columns uid and pid can pet move from one to others ? if so pid should be independent from user 
+    cid = Column(Integer, primary_key=True)#castal id
+    uid = Column(Integer)#owner -1 empty
+    mid = Column(Integer)#map
+    gid = Column(Integer)#position 
+    inf = Column(Integer)
+    cav = Column(Integer)
+    attribute = Column(Integer)
+    lastTime = Column(Integer)
+

emptyCastal.py

@@ -0,0 +1,13 @@
+from sqlalchemy import *
+from sqlalchemy.orm import mapper, relation
+from sqlalchemy import Table, ForeignKey, Column
+from sqlalchemy.types import Integer, Unicode
+from sqlalchemy.orm import relation, backref
+from stchong.model import DeclarativeBase, metadata, DBSession
+
+class EmptyResult(DeclarativeBase):
+    __tablename__ = 'emptyResult'
+    #{ Columns uid and pid can pet move from one to others ? if so pid should be independent from user 
+    eid = Column(Integer, primary_key=True)#castal id
+    uid = Column(Integer)#owner -1 empty
+    data = Column(String)

emptyResult.py

@@ -0,0 +1,127 @@
+
+user  root root;
+worker_processes  1;
+
+error_log  logs/error.log;
+#error_log  logs/error.log  notice;
+#error_log  logs/error.log  info;
+
+pid        logs/nginx.pid;
+
+
+events {
+    worker_connections  1024;
+}
+
+
+http {
+    include       mime.types;
+    default_type  application/octet-stream;
+
+    #log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+    #                  '$status $body_bytes_sent "$http_referer" '
+    #                  '"$http_user_agent" "$http_x_forwarded_for"';
+
+    #access_log  logs/access.log  main;
+
+    sendfile        on;
+    #tcp_nopush     on;
+
+    #keepalive_timeout  0;
+    keepalive_timeout  65;
+
+    #gzip  on;
+    upstream tg_server{
+        server  223.4.85.114:8080 weight=1; 
+        server  223.4.85.114:8088 weight=1;
+    }
+    upstream battle{
+       server 0.0.0.0:8002;    
+    }
+    server {
+        listen       8000;
+        server_name  localhost;
+
+        #charset koi8-r;
+
+        #access_log  logs/host.access.log  main;
+
+        location / {
+            root   html;
+            index  index.html index.htm;
+            proxy_pass http://tg_server;
+        }
+        location ~ /war {
+	    proxy_pass http://battle;        
+	}
+        #error_page  404              /404.html;
+
+        # redirect server error pages to the static page /50x.html
+        #
+        error_page   500 502 503 504  /50x.html;
+        location = /50x.html {
+            root   html;
+        }
+
+        # proxy the PHP scripts to Apache listening on 127.0.0.1:80
+        #
+        #location ~ \.php$ {
+        #    proxy_pass   http://127.0.0.1;
+        #}
+
+        # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
+        #
+        #location ~ \.php$ {
+        #    root           html;
+        #    fastcgi_pass   127.0.0.1:9000;
+        #    fastcgi_index  index.php;
+        #    fastcgi_param  SCRIPT_FILENAME  /scripts$fastcgi_script_name;
+        #    include        fastcgi_params;
+        #}
+
+        # deny access to .htaccess files, if Apache's document root
+        # concurs with nginx's one
+        #
+        #location ~ /\.ht {
+        #    deny  all;
+        #}
+    }
+
+
+    # another virtual host using mix of IP-, name-, and port-based configuration
+    #
+    #server {
+    #    listen       8000;
+    #    listen       somename:8080;
+    #    server_name  somename  alias  another.alias;
+
+    #    location / {
+    #        root   html;
+    #        index  index.html index.htm;
+    #    }
+    #}
+
+
+    # HTTPS server
+    #
+    #server {
+    #    listen       443;
+    #    server_name  localhost;
+
+    #    ssl                  on;
+    #    ssl_certificate      cert.pem;
+    #    ssl_certificate_key  cert.key;
+
+    #    ssl_session_timeout  5m;
+
+    #    ssl_protocols  SSLv2 SSLv3 TLSv1;
+    #    ssl_ciphers  ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP;
+    #    ssl_prefer_server_ciphers   on;
+
+    #    location / {
+    #        root   html;
+    #        index  index.html index.htm;
+    #    }
+    #}
+
+}