From 2b70b747f4bb6741288ed4504c78d345800a0b3f Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 21 Nov 2022 10:27:29 +0800
Subject: [PATCH 1/4] 1

---
 server/httpproxy/controllers/proxy.js | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/server/httpproxy/controllers/proxy.js b/server/httpproxy/controllers/proxy.js
index 7789fe2..040ff5e 100644
--- a/server/httpproxy/controllers/proxy.js
+++ b/server/httpproxy/controllers/proxy.js
@@ -4,7 +4,7 @@ const utils = require('j7/utils');
 const http = require('j7/http');
 const serviceFactory = require('../services/factory');
 
-async function get(session) {
+async function internalGet(session) {
   const seqId = session.request('seq_id');
   const targetUrl = session.request('target_url');
   const cbUrl = session.request('cb_url');
@@ -28,6 +28,18 @@ async function get(session) {
     await http.get(cbUrl, rspJson);
   });
   session.rspOk();
+}
+
+async function internalPost(session, postData) {
+}
+
+async function get(session) {
+  const postData = session.request('__POST');
+  if (postData) {
+
+  } else {
+    await internalGet(session);
+  }
 };
 
 async function post(session) {

From f24807cd689e4841c2106db6189588599f7c39d4 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 21 Nov 2022 10:32:07 +0800
Subject: [PATCH 2/4] 1

---
 server/httpproxy/controllers/proxy.js | 25 ++++++++++++++++++++++++-
 third_party/j7                        |  2 +-
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/server/httpproxy/controllers/proxy.js b/server/httpproxy/controllers/proxy.js
index 040ff5e..34525ef 100644
--- a/server/httpproxy/controllers/proxy.js
+++ b/server/httpproxy/controllers/proxy.js
@@ -31,12 +31,35 @@ async function internalGet(session) {
 }
 
 async function internalPost(session, postData) {
+  const seqId = session.request('seq_id');
+  const targetUrl = session.request('target_url');
+  const cbUrl = session.request('cb_url');
+  const reqJson = session.requestToJson();
+  new Promise(async (resolve) => {
+    const params = utils.jsonDecode(session.request('params'));
+    const {err, data} = await http.post(targetUrl, params, postData);
+    const rspJson = {
+      'errcode': 0,
+      'errmsg': '',
+      'seq_id': seqId,
+      'req_json': reqJson,
+      'data': data
+    };
+    if (err) {
+      rspJson['errcode'] = 1;
+      rspJson['errmsg'] = '' + err;
+    }
+    console.log('data', data);
+    console.log('rspJson:' + utils.jsonEncode(rspJson));
+    await http.get(cbUrl, rspJson);
+  });
+  session.rspOk();
 }
 
 async function get(session) {
   const postData = session.request('__POST');
   if (postData) {
-
+    await internalPost(session, postData);
   } else {
     await internalGet(session);
   }
diff --git a/third_party/j7 b/third_party/j7
index 59b3ef2..be7d128 160000
--- a/third_party/j7
+++ b/third_party/j7
@@ -1 +1 @@
-Subproject commit 59b3ef222d3468ccb7096a801a43da7d9b158412
+Subproject commit be7d128a8d1ee85a33182bf0af1fcc272f3ad23d

From a302e875a0ce333626305552341cddfb43cd1f0c Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 21 Nov 2022 10:57:59 +0800
Subject: [PATCH 3/4] 1

---
 server/httpproxy/controllers/proxy.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/httpproxy/controllers/proxy.js b/server/httpproxy/controllers/proxy.js
index 34525ef..da37825 100644
--- a/server/httpproxy/controllers/proxy.js
+++ b/server/httpproxy/controllers/proxy.js
@@ -57,7 +57,8 @@ async function internalPost(session, postData) {
 }
 
 async function get(session) {
-  const postData = session.request('__POST');
+  const params = utils.jsonDecode(session.request('params'));
+  const postData = utils.getVal(params, '__POST', '');
   if (postData) {
     await internalPost(session, postData);
   } else {

From 6a2a15858afc4de6cfdb68d92c2f0e51f1f6b1c4 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 21 Nov 2022 19:13:08 +0800
Subject: [PATCH 4/4] 1

---
 server/httpproxy/controllers/proxy.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/httpproxy/controllers/proxy.js b/server/httpproxy/controllers/proxy.js
index da37825..c7c2138 100644
--- a/server/httpproxy/controllers/proxy.js
+++ b/server/httpproxy/controllers/proxy.js
@@ -37,6 +37,7 @@ async function internalPost(session, postData) {
   const reqJson = session.requestToJson();
   new Promise(async (resolve) => {
     const params = utils.jsonDecode(session.request('params'));
+    delete params['__POST'];
     const {err, data} = await http.post(targetUrl, params, postData);
     const rspJson = {
       'errcode': 0,