Merge branch 'gae-server-upgrade'

code/default/gae_proxy/local/config.py

@@ -36,7 +36,7 @@ def __init__(self, fn):
 
         # gae
         self.set_var("GAE_PASSWORD", "")
-        self.set_var("GAE_VALIDATE", 0)
+        self.set_var("GAE_VALIDATE", 1)
 
         # host rules
         self.set_var("hosts_direct", [

code/default/gae_proxy/server/README.md

@@ -1,6 +1,6 @@
 ## 设置使用密码：
 如果你担心流量被别人使用，可以设置使用密码。  
-编辑gae.py 里的 __password__  
+编辑main.py 里的 __password____
 注意在客户端中也需要设置一样的密码才能访问。  
 一般你不泄露appid，别人是无法使用你的流量的。  
 
@@ -21,6 +21,9 @@ https://cloud.google.com/sdk/docs/install
  `gcloud init`  
 
 
+## 未绑定信用卡的需要绑定:
+  https://console.cloud.google.com/billing/enable
+
 ## 部署：
 `cd XX-Net/code/default/gae_proxy/server/gae`  
 `gcloud app deploy`  

code/default/gae_proxy/server/gae/.gcloudignore

@@ -0,0 +1,19 @@
+# This file specifies files that are *not* uploaded to Google Cloud
+# using gcloud. It follows the same syntax as .gitignore, with the addition of
+# "#!include" directives (which insert the entries of the given .gitignore-style
+# file at that point).
+#
+# For more information, run:
+#   $ gcloud topic gcloudignore
+#
+.gcloudignore
+# If you would like to upload your .git directory, .gitignore file or files
+# from your .gitignore file, remove the corresponding line
+# below:
+.git
+.gitignore
+
+# Python pycache:
+__pycache__/
+# Ignored by the build system
+/setup.cfg

code/default/gae_proxy/server/gae/app.yaml

@@ -2,35 +2,7 @@ instance_class: F1
 automatic_scaling:
   max_instances: 1
 
-runtime: python27
-api_version: 1
-threadsafe: true
+runtime: python312
+app_engine_apis: true
 
-handlers:
-- url: /_gh/.*
-  script: gae.application
-  secure: optional
-
-- url: /2
-  script: wsgi.gae_application
-  secure: optional
-
-- url: /tasks/reset
-  script: gae.reset
-  secure: optional
-
-- url: /traffic
-  script: gae.traffic
-  secure: optional
-
-- url: /favicon.ico
-  script: gae.application
-  secure: optional
-
-- url: /.*
-  script: legacy.application
-  secure: optional
-
-libraries:
-- name: pycrypto
-  version: "latest"
+entrypoint: gunicorn -c gunicorn.conf.py --timeout 60 -b :$PORT main:app