From 2f82a1b291496f90c13cd621e225aa0a8132be87 Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Fri, 8 Sep 2023 14:03:05 +0800
Subject: [PATCH] fix: docker supper dev prod

---
 docker/prod/default.conf          | 43 ++-------------------
 docker/prod/secret/spnapi/ssl.key | 27 ++++++++++++++
 docker/prod/secret/spnapi/ssl.pem | 62 +++++++++++++++++++++++++++++++
 3 files changed, 92 insertions(+), 40 deletions(-)
 create mode 100644 docker/prod/secret/spnapi/ssl.key
 create mode 100644 docker/prod/secret/spnapi/ssl.pem

diff --git a/docker/prod/default.conf b/docker/prod/default.conf
index 63a7958..61d6422 100644
--- a/docker/prod/default.conf
+++ b/docker/prod/default.conf
@@ -98,8 +98,8 @@ server {
   root /data;
 
   # ssl证书地址
-  ssl_certificate      /secret/ssl.pem;  # pem文件的路径
-  ssl_certificate_key  /secret/ssl.key;  # key文件的路径
+  ssl_certificate      /secret/spnapi/ssl.pem;  # pem文件的路径
+  ssl_certificate_key  /secret/spnapi/ssl.key;  # key文件的路径
 
   # ssl验证相关配置
   ssl_session_timeout  5m;    #缓存有效期
@@ -126,47 +126,10 @@ server {
 server {
   # 自定义访问端口
   listen 80;
-
-  # 服务名称
-  server_name task.kanglailab.com;
-
-  # 把http的域名请求转成https
-  return 301 https://$host$request_uri;
-}
-
-server {
-  # 自定义访问端口
-  listen 443 ssl;
-  client_max_body_size 100M;
-
   # 服务名称
   server_name task.kanglailab.com;
-
-  # 代理访问根地址
-  root /data;
-
-  # ssl证书地址
-  ssl_certificate      /secret/ssl.pem;  # pem文件的路径
-  ssl_certificate_key  /secret/ssl.key;  # key文件的路径
-
-  # ssl验证相关配置
-  ssl_session_timeout  5m;    #缓存有效期
-  ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:ECDHE:ECDH:AES:HIGH:!NULL:!aNULL:!MD5:!ADH:!RC4;    #加密算法
-  ssl_protocols TLSv1 TLSv1.1 TLSv1.2;    #安全链接可选的加密协议
-  ssl_prefer_server_ciphers on;           #使用服务器端的首选算法
-
-  #设置转发请求头参数
-  proxy_connect_timeout 15s;
-  proxy_send_timeout 15s;
-  proxy_read_timeout 15s;
-  proxy_set_header Host $http_host;
-  proxy_set_header X-Real-IP $remote_addr;
-  proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-  error_page 497 https://$host$request_uri;
-
-  # 代理访问kicc-ui地址
   location / {
-   proxy_pass http://localhost:8057;
+    proxy_pass http://localhost:8056;
   }
 }
 
diff --git a/docker/prod/secret/spnapi/ssl.key b/docker/prod/secret/spnapi/ssl.key
new file mode 100644
index 0000000..6ff65de
--- /dev/null
+++ b/docker/prod/secret/spnapi/ssl.key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAp07Y2/FaDY0lrV+7oqlu20cbRyj8wynN/AT98qlCBWhQ07zO
+Lpm29xL6z8ibeMdcPdEmtyTPxNRSWX0Y/6aHHkpES/2zfPRg/Fl2A/tB5ugyB4wq
+7HmKoD6xx2Q7JEKZTZQtSefkf+4JJGCElK1e0aste2yqaUiKg41nQdW0hlCKrNuS
+qkmJxvdu0oLml8/Y8zv48krGa2sRQspVOJETaltwuXaZIRBXuKK8O7PPfT7qdkoZ
+XdTxeFqZo0nxkkvFhaIJ3hTefZTNigQKW6Fwdxa2yu5NGRJtLAUcnm0kOKFqJ9AQ
+hj01hwEDwHhYa56JUEPBP0SDeK4rH/63O8iyhQIDAQABAoIBABwCcYBK5OhhYbYn
+kY5vHrHDsv+kD0LuH//J5yjlqLmmh+eW047OKakuCoLYQx0ChUENH5XoKgd6A0pb
+jOCZ5MOPq+Tr9Y1dDVKZ+I28lgEeDOgiEXqS84AV1uX6dANDSg6ImNdnZOP8+hdW
+uEN6zeW8qmngHJxxKk1RUkDdkfItStL8q2uY2H5ic24rujRs5zDmO7jvBk4ik98s
+0bue+zEpBBF0ti6nuhUAP8xA7pWwT96qKqBs1FXUOzQPtvwxoAyRMFrvhhvWSoEE
+Rz6Wzqnm2/djFc5ZgaV5PMxLYCLYLWdqXftnDFeJFgsb+/zfo0chzspUksYO+E+q
+kqbjzMECgYEA2eL3ocom4piQFHH5WEYm6fmq7xoAB7j04aGJmoMsWoQt0FaD63SS
+q2FzsskfvI7iiDykKE9e058QqDllV2Gqk3ui+mo6lBf30uwXQB7zaQZImfkWqhhK
+RntBuk2Z5Fis24z6mPU5+hozXNbpOCIhEEg/luFZjMKCLW7K8pmsakUCgYEAxJL0
+LUETiYajLqkZIuRTj/yGlqLTRTTD/RXh6dYJYpgdLu6iTk4AawJ5ABFaCyiUB9u+
+v8UcQydsKNtbESFZnG5zEnWlc+ovke8BUoyptOWCOGqeE4+v4SLlyB2GOWaVTTIF
+6fLPi2tG1waJn4j1NOHLnuGNWcdqMWrhXIYZy0ECgYEAjMPZgCj93j76Nns7wA/y
+bA7ko/yEMHkJnAukvrIoIYJrpsF+EMwLRbV77fGKE2Osbp/e3jwI42dMd6I9Gqr6
+bLXfoTCoD608aoQksURNtXhdxzvprJJsygQvfpFL7v5rDpyR+efUQQRUUpJ1sdI6
+0i4bBvsnw4yWVYvSidFGVpECgYBDK1vYYtZENgdomEuIirCrEMUEkBrVGRSnVGTf
+vE10rTm7obtAOpMV/cBO757vFSyQCtyBNt9TaxMgWuQhVF4EgBE+C4k/tJQQr7Sp
++nq633nBwVzGnmCg84XE/aGx14XI3QD8UgXtQ/ju3MMGCoyPR2CGp9ffB68Xt8fO
+D9ycgQKBgQCoiuWTRGoD1unhPXdRmz9W/sacxQdDCdCAhwCgId4E4Cz+O4STnV9O
+x5Q05Ng3CAkhvCnsBl6X5EaYELrWzkXZdCbSMUSW/22UszSGEo/564YycinnHxh5
+a6tqUw2zkKX7/ciRlaWl8sYavAnezR/IY9pjaZWUApxgOkvjPfrYZQ==
+-----END RSA PRIVATE KEY-----
diff --git a/docker/prod/secret/spnapi/ssl.pem b/docker/prod/secret/spnapi/ssl.pem
new file mode 100644
index 0000000..c1a9631
--- /dev/null
+++ b/docker/prod/secret/spnapi/ssl.pem
@@ -0,0 +1,62 @@
+-----BEGIN CERTIFICATE-----
+MIIF/zCCBOegAwIBAgIQCohwyJIit+WlcUoZJzvnNjANBgkqhkiG9w0BAQsFADBu
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMS0wKwYDVQQDEyRFbmNyeXB0aW9uIEV2ZXJ5d2hlcmUg
+RFYgVExTIENBIC0gRzEwHhcNMjIxMjI4MDAwMDAwWhcNMjMxMjI3MjM1OTU5WjAg
+MR4wHAYDVQQDExVzcG5hcGkua2FuZ2xhaWxhYi5jb20wggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCnTtjb8VoNjSWtX7uiqW7bRxtHKPzDKc38BP3yqUIF
+aFDTvM4umbb3EvrPyJt4x1w90Sa3JM/E1FJZfRj/poceSkRL/bN89GD8WXYD+0Hm
+6DIHjCrseYqgPrHHZDskQplNlC1J5+R/7gkkYISUrV7Rqy17bKppSIqDjWdB1bSG
+UIqs25KqSYnG927SguaXz9jzO/jySsZraxFCylU4kRNqW3C5dpkhEFe4orw7s899
+Pup2Shld1PF4WpmjSfGSS8WFogneFN59lM2KBApboXB3FrbK7k0ZEm0sBRyebSQ4
+oWon0BCGPTWHAQPAeFhrnolQQ8E/RIN4risf/rc7yLKFAgMBAAGjggLlMIIC4TAf
+BgNVHSMEGDAWgBRVdE+yck/1YLpQ0dfmUVyaAYca1zAdBgNVHQ4EFgQUeUlaths2
+RyhbJfsqLaPEwVr3PHAwIAYDVR0RBBkwF4IVc3BuYXBpLmthbmdsYWlsYWIuY29t
+MA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
+PgYDVR0gBDcwNTAzBgZngQwBAgEwKTAnBggrBgEFBQcCARYbaHR0cDovL3d3dy5k
+aWdpY2VydC5jb20vQ1BTMIGABggrBgEFBQcBAQR0MHIwJAYIKwYBBQUHMAGGGGh0
+dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTBKBggrBgEFBQcwAoY+aHR0cDovL2NhY2Vy
+dHMuZGlnaWNlcnQuY29tL0VuY3J5cHRpb25FdmVyeXdoZXJlRFZUTFNDQS1HMS5j
+cnQwCQYDVR0TBAIwADCCAX4GCisGAQQB1nkCBAIEggFuBIIBagFoAHcArfe++nz/
+EMiLnT2cHj4YarRnKV3PsQwkyoWGNOvcgooAAAGFWF4j2AAABAMASDBGAiEA7CGK
+31LER/2bW38oecD7fmsL4Hm5TXNS91Rixx6nVX8CIQCtgHzMIyYiJZ8eDMFaQ8yd
+ZK4DyYakfuAmleR2cToSeQB1ALNzdwfhhFD4Y4bWBancEQlKeS2xZwwLh9zwAw55
+NqWaAAABhVheI/YAAAQDAEYwRAIgL2DTPOOutzf6YQ0Zveb7Mzv/dva20WuIPYxi
+7BhoWRcCIBRQeLChbDVzkgH+YCRARo7NnyLQrxrnrUnA/btb/BSCAHYAtz77JN+c
+Tbp18jnFulj0bF38Qs96nzXEnh0JgSXttJkAAAGFWF4jyQAABAMARzBFAiEA/qN7
+hBXKMExJlX5sdQganv/G1un1wr3+pfwvRWy7ReICICOmCczHxwX8yUraL9eZUDLY
++0RRItb8vWPPwke9AQ0hMA0GCSqGSIb3DQEBCwUAA4IBAQCk0iNWjdneBEPQ5XAO
+p6tNkSIQHGaeCDrcPEHmEhowFRFFcuAO7TyydZMmoBQJwFDvoBSZSA6ZhfY7Xi/0
+LZMYMjCh9jdvfyXOyM+zy1foiqCDJHJL2TnV+FoqPgDZigQGCgPGwBiOFFOb4ppo
+ePuWE4ZsKpk+cHUU89QEasNJGyiSj7amKiQWRZeGIDuBtbOhW2OTiB3y+6H+YXIQ
+2B81bzPmjkDK33t5gRcw2HKMg1LSL+fX1o0QlsRepupwmoWQ0wmCC+t/DswdMBJO
+ozLJCL/42uBdrvWXopd2Llkf3TUMcOJZSd7Lswp51h8sBsxbVxGdTqbqoJpIr2EO
+44oV
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIEqjCCA5KgAwIBAgIQAnmsRYvBskWr+YBTzSybsTANBgkqhkiG9w0BAQsFADBh
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD
+QTAeFw0xNzExMjcxMjQ2MTBaFw0yNzExMjcxMjQ2MTBaMG4xCzAJBgNVBAYTAlVT
+MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j
+b20xLTArBgNVBAMTJEVuY3J5cHRpb24gRXZlcnl3aGVyZSBEViBUTFMgQ0EgLSBH
+MTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALPeP6wkab41dyQh6mKc
+oHqt3jRIxW5MDvf9QyiOR7VfFwK656es0UFiIb74N9pRntzF1UgYzDGu3ppZVMdo
+lbxhm6dWS9OK/lFehKNT0OYI9aqk6F+U7cA6jxSC+iDBPXwdF4rs3KRyp3aQn6pj
+pp1yr7IB6Y4zv72Ee/PlZ/6rK6InC6WpK0nPVOYR7n9iDuPe1E4IxUMBH/T33+3h
+yuH3dvfgiWUOUkjdpMbyxX+XNle5uEIiyBsi4IvbcTCh8ruifCIi5mDXkZrnMT8n
+wfYCV6v6kDdXkbgGRLKsR4pucbJtbKqIkUGxuZI2t7pfewKRc5nWecvDBZf3+p1M
+pA8CAwEAAaOCAU8wggFLMB0GA1UdDgQWBBRVdE+yck/1YLpQ0dfmUVyaAYca1zAf
+BgNVHSMEGDAWgBQD3lA1VtFMu2bwo+IbG8OXsj3RVTAOBgNVHQ8BAf8EBAMCAYYw
+HQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBIGA1UdEwEB/wQIMAYBAf8C
+AQAwNAYIKwYBBQUHAQEEKDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdp
+Y2VydC5jb20wQgYDVR0fBDswOTA3oDWgM4YxaHR0cDovL2NybDMuZGlnaWNlcnQu
+Y29tL0RpZ2lDZXJ0R2xvYmFsUm9vdENBLmNybDBMBgNVHSAERTBDMDcGCWCGSAGG
+/WwBAjAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BT
+MAgGBmeBDAECATANBgkqhkiG9w0BAQsFAAOCAQEAK3Gp6/aGq7aBZsxf/oQ+TD/B
+SwW3AU4ETK+GQf2kFzYZkby5SFrHdPomunx2HBzViUchGoofGgg7gHW0W3MlQAXW
+M0r5LUvStcr82QDWYNPaUy4taCQmyaJ+VB+6wxHstSigOlSNF2a6vg4rgexixeiV
+4YSB03Yqp2t3TeZHM9ESfkus74nQyW7pRGezj+TC44xCagCQQOzzNmzEAP2SnCrJ
+sNE2DpRVMnL8J6xBRdjmOsC3N6cQuKuRXbzByVBjCqAA8t1L0I+9wXJerLPyErjy
+rMKWaBFLmfK/AHNF4ZihwPGOc7w6UHczBZXH5RFzJNnww+WnKuTPI0HfnVH8lg==
+-----END CERTIFICATE-----