OKOK

Author: lugt

.gitignore

@@ -299,4 +299,7 @@ CMakeFiles/**
 *.depend
 *.stamp
 CMakeCache.txt
+
+
+release_egret/**
 *.sln

browser/SeasHandler.cpp

@@ -58,62 +58,50 @@ bool CefV8HandlerImpl::Execute(const CefString& name  //JavaScript calling funct
 		if (arguments.size() == 2 && arguments[0]->IsString() && arguments[1]->IsString()) {
 			std::string userName = arguments[0]->GetStringValue();
 			std::string passWord = arguments[1]->GetStringValue();
+
+			CefRefPtr<CefV8Value> ret = CefV8Value::CreateObject(NULL, NULL);
+
 			if (userName.length() > 0 && passWord.length() > 0) {
 				//用户名、密码有效 ，展开登陆逻辑， 操作结束后，返回retval  
-				// Create a new V8 string value. See the "Basic JS Types" section below.
 				CefRefPtr<CefV8Value> str = CefV8Value::CreateString("1.0.7a");
-				//userName = "aaa"; 				
-				//sqlite3_exec();
-				
-				
-
-				sqlite3 *db;
-				char *zErrMsg = 0;
-				int  rc;
-				char *sql;
+				ret->SetValue("version", str, V8_PROPERTY_ATTRIBUTE_NONE);
+								
+				sqlite3 *db;				char *zErrMsg = 0;				int  rc;				char *sql;
 
 				/* Open database */
 				rc = sqlite3_open("test.db", &db);
+				std::string errmsg;
 				if (rc) {
-					fprintf(stderr, "Can't open database: %s\n", sqlite3_errmsg(db));
-					exit(0);
-				}
-				else {
-					fprintf(stdout, "Opened database successfully\n");
-				}
-
-				/* Create SQL statement */
-				sql = "CREATE TABLE COMPANY("  \
-					"ID INT PRIMARY KEY     NOT NULL," \
-					"NAME           TEXT    NOT NULL," \
-					"AGE            INT     NOT NULL," \
-					"ADDRESS        CHAR(50)," \
-					"SALARY         REAL );";
-
-				/* Execute SQL statement */
-				rc = sqlite3_exec(db, sql, SeasResourceHandler::c0allback, 0, &zErrMsg);
-				if (rc != SQLITE_OK) {
-					fprintf(stderr, "SQL error: %s\n", zErrMsg);
-					sqlite3_free(zErrMsg);
-				}
-				else {
-					fprintf(stdout, "Table created successfully\n");
-				}
-				sqlite3_close(db);
-
-
-				
-				
-				
-				
-				
-				//std::string sql = "SELECT FROM users WHERE usernmae = '"+userName+"'";				
-				//std::string sql = "SELECT FROM users WHERE usernmae = 'aaa'";				
-				//{equipId:182, group:1, name:"louxiadaxingjiqiyihao", delay:100, period :1000 }
-				//sqlite_exec_sql(sql);
-				CefRefPtr<CefV8Value> ret = CefV8Value::CreateObject(NULL,NULL);
-				ret->SetValue("ret", CefV8Value::CreateInt(1000), V8_PROPERTY_ATTRIBUTE_NONE);
-				SeaCefUtils::setStatus( "ss" ); // 标记登陆成功    
+					errmsg  = "Can't open database: \n";
+					errmsg += CefString(sqlite3_errmsg(db));
+					ret->SetValue("ret", CefV8Value::CreateInt(-920), V8_PROPERTY_ATTRIBUTE_NONE);
+				}else {
+					errmsg = "Opened database successfully\n";
+					/* Create SQL statement */
+					sql = "CREATE TABLE COMPANY("  \
+						"ID INT PRIMARY KEY     NOT NULL," \
+						"NAME           TEXT    NOT NULL," \
+						"AGE            INT     NOT NULL," \
+						"ADDRESS        CHAR(50)," \
+						"SALARY         REAL );";
+					ret->SetValue("sql", CefV8Value::CreateString(sql), V8_PROPERTY_ATTRIBUTE_NONE);
+
+					/* Execute SQL statement */
+					std::string exec_msg;
+					rc = sqlite3_exec(db, sql, SeasResourceHandler::c0allback, 0, &zErrMsg);
+					if (rc != SQLITE_OK) {
+						exec_msg = "SQL error: %s\n";
+						exec_msg += zErrMsg;
+						sqlite3_free(zErrMsg);
+					}	else {
+						exec_msg = "Table created successfully\n";
+					}
+					sqlite3_close(db);
+					ret->SetValue("db_exec_msg", CefV8Value::CreateString(exec_msg), V8_PROPERTY_ATTRIBUTE_NONE);
+					ret->SetValue("ret", CefV8Value::CreateInt(1000), V8_PROPERTY_ATTRIBUTE_NONE);
+					SeaCefUtils::setStatus("login" + userName); // 标记登陆成功   
+				} 
+				ret->SetValue("db_open_msg", CefV8Value::CreateString(errmsg), V8_PROPERTY_ATTRIBUTE_NONE);
 				retval = ret;
 				handle = true;
 			}
@@ -130,7 +118,7 @@ bool CefV8HandlerImpl::Execute(const CefString& name  //JavaScript calling funct
 	}else if (name == "SEA_userstatus") {
 
 		CefRefPtr<CefV8Value> ret = CefV8Value::CreateObject(NULL, NULL);
-			if (SeaCefUtils::getStatus() == "ss") { // 检查登陆状态   
+			if (SeaCefUtils::getStatus().substr(0,5) == "login") { // 检查登陆状态   
 				//Values are assigned to an array using the SetValue() method variant that takes an index as the first argument.
 				// Add two values to the array.
 				ret->SetValue("ret", CefV8Value::CreateInt(1000), V8_PROPERTY_ATTRIBUTE_NONE);
@@ -174,3 +162,14 @@ bool CefV8HandlerImpl::Execute(const CefString& name  //JavaScript calling funct
 	}
 	return true;
 }
+
+
+/**
+
+
+//std::string sql = "SELECT FROM users WHERE usernmae = '"+userName+"'";
+//std::string sql = "SELECT FROM users WHERE usernmae = 'aaa'";
+//{equipId:182, group:1, name:"louxiadaxingjiqiyihao", delay:100, period :1000 }
+//sqlite_exec_sql(sql);
+
+*/

browser/SeasHandler.h

@@ -516,9 +516,9 @@ class SeasResourceHandler : public CefResourceHandler {
 			//const std::string& org_url_host = CefString(&parts.host);
 
 			const std::string& org_url_path = CefString(&parts.path);
-			std::string url_path = org_url_path.substr(org_url_path.find("/", 2) + 1);
+			std::string url_path = org_url_path; //org_url_path.substr(org_url_path.find("/", 2) + 1);
 
-			std::string url_host = org_url_path.substr(2, org_url_path.find("/", 2) - 2);
+			std::string url_host = CefString(&parts.host);//org_url_path.substr(2, org_url_path.find("/", 2) - 2);
 
 			if (strstr(url_host.c_str(), "global") != NULL) {
 				request->SetURL(CefString("https://north.niimei.com"));
@@ -614,7 +614,14 @@ class SeasResourceHandler : public CefResourceHandler {
 		CEF_REQUIRE_IO_THREAD();
 
 		DCHECK(!data_.empty() || isStreamed == true && totalLength > 0);
+		
+		CefResponse::HeaderMap p;
+		response->GetHeaderMap(p);
+/*		if (p.find(CefString("Access-Control-Allow-Origin")).) {
 
+		}*/
+		//p.insert(std::make_pair("Access-Control-Allow-Origin", "*"));
+		response->SetHeaderMap(p);		
 		response->SetMimeType(mime_type_);
 		response->SetStatus(200);
 

btzero_10_flat/js/qr.js

@@ -2,19 +2,10 @@
 <html>
 <head>
 <meta charset="utf-8">
-<title>URL认证</title>
+<title>QEA 点击授权</title>
 </head>
 
 <body>
-	this.urlloader = new egret.URLLoader();
-        var urlreq:egret.URLRequest = new egret.URLRequest();
-        urlreq.url = "http://httpbin.org/user-agent";
-        this.urlloader.load( urlreq );
-        this.urlloader.addEventListener(egret.Event.COMPLETE, this.onComplete, this);
-    }
-    private onComplete(event:egret.Event):void
-    {
-        console.log( this.urlloader.data );
-    }
+		点我即可授权
 </body>
 </html>