Merge branch 'dev' of http://gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway into dev

@@ -3,6 +3,7 @@ ENV APP_DIR $GOPATH/src/project-20210826
 RUN mkdir -p $APP_DIR
 WORKDIR $APP_DIR/
 COPY ./pkg pkg
+COPY ./config config
 COPY ./go.mod go.mod
 COPY ./go.sum go.sum
 COPY ./main.go main.go

+2021/09/07 01:40:08.650  [D] [hook.go:130]  CREATE TABLE IF NOT EXISTS "login_access" ("login_access_id" bigserial, "account" text, "platform" text, "company_id" bigint, "organization_id" bigint, "access_token" text, "refresh_token" text, "access_expired" bigint, "refresh_expired" bigint, "created_time" timestamptz, "updated_time" timestamptz, PRIMARY KEY ("login_access_id")) null
+2021/09/07 01:40:09.439  [I] [hooks.go:101]  generate router from comments
+2021/09/07 01:40:09.440  [I] [???:0]  http server Running on http://:8083
+2021/09/07 01:40:12.667  [I] [filter.go:81]  http请求 [
+  {
+    "framework": "beego",
+    "method": "GET",
+    "url": "/log"
+  }
+]
+2021/09/07 01:40:12.667  [D] [filter.go:81]  http请求 [
+  {
+    "framework": "beego",
+    "method": "GET",
+    "url": "/log"
+  }
+]
+2021/09/07 01:40:12.669  [D] [filter.go:81]  http响应 [
+  {
+    "framework": "beego",
+    "method": "GET",
+    "outputData": null,
+    "url": "/log"
+  }
+]
+2021/09/07 01:40:12.669  [D] [router.go:664]  |            ::1| 200 |   2.412278ms|   match| GET      /log   r:/log
+2021/09/07 01:42:14.324  [D] [hook.go:130]  CREATE TABLE IF NOT EXISTS "login_access" ("login_access_id" bigserial, "account" text, "platform" text, "company_id" bigint, "organization_id" bigint, "access_token" text, "refresh_token" text, "access_expired" bigint, "refresh_expired" bigint, "created_time" timestamptz, "updated_time" timestamptz, PRIMARY KEY ("login_access_id")) null
+2021/09/07 01:42:15.705  [I] [hooks.go:101]  generate router from comments
+2021/09/07 01:42:15.706  [I] [???:0]  http server Running on http://:8083

+-----BEGIN RSA PRIVATE KEY-----
+MIIEpQIBAAKCAQEAy0OxRf+NheQG9epxbrudwnrzqVgqK5zCuRAkLUgaSMATVXEA
+iDzJN39om+Q49MmtEk4pXGzKUyzkFJG96PA8tJq0E+bSDtSK3n+2mjZb6pChmgHw
+KEX7T8ZVLqJBSrfrI4Z2BJDNEC+3wvVW3zpog1RlfKgft6NYUzNLUqE5Mxzq7lpD
+eRsq+FhzM1sOeEb2dAmUlDDs+7HcR3Kj0ttKeg+hKqIottQ/H6Tq4c8deEQGnO0+
+RN3CygyETbYmLuWttI/sUltulWJALIuU81Yr6uCOq5MSt2WsU8CTuhRwGXSvcQCO
+FLYppYktoMDOGIBQffmJc/DdT1d35fvdpKbm+QIDAQABAoIBAQC8X7+qX2uI6gqJ
+XPxC4x0RX2DxUAPE50KOv6bHUEsLoPZJ+K/Fko/oHuuTja47Lax3inhKb4gSDUhS
+x754YivgNH8u8ns5wz/vc+yGflowyFj7oVAwAqslA2luDnD0Df6crcAx+wAQQCjN
+RRF9T2QMUeq73BOI3Ji+gosLyN55vms2KadrwpPQwYN7qhdrerE7vPqCZeswzs1/
+A5M9PVGBG+simNea5kv+tVJUdLi6ckGAB5KabyhpG779ckwzV/aZy3wIj4SvUvCd
+bewH0xPHx5TqnMOXtzHgktClmL7hIYxy9sL14Dn0KVHbyolQ7IqmJtjXYqG84Fmx
+AfyDfeABAoGBAPP820tKElrfTuZ+Z19kJBTp6I5iax2Ph10glUHLlLqJ82clI/Gl
+CbMtnGmD72HfnJei82xqoVLsUkN9Sp+TSNJALh4N8rHkAtwq5kWToiAWZydwxVsp
+x5OWEN3+QFIdjVW6fhg6jZSK5HHIqMdZOVvbfKP+Cv9fWWzlS7/WVTlJAoGBANVF
+kol+KojM4DEASrw0s1mfPr0XvUFvKJ2TgVGR3HxAk4r0e0WwJdSfwGiB/ePcc6g5
+D5dxBe8W5g3+V0DaC0f1DDNXg2MjYWoByWrurbm14FRnpMnx/UfZLo7rq8T9YrUT
+Bd/y0/JasndN27bIfd60n233IYMqhV2+wBwqD3AxAoGAE2/wdHYJMk4Z9gjZ6WKL
+8VKVIUq759X4XbXrzhsO1TGKP4xY6bZRKIIYtNs65dwvmHD13Yw9H+MNxqyjlkTg
+h0dvpRtNW1ij1bBhOefCAbZnL2AviMyyRpKs81J/A0uxZ8P8qad4gf3ypxHqSD9W
+b3fz3QivDZsl/6Pgvf6wOWkCgYEA1Cv9x5lj2WrxEu62axyG3P9nHBm055cdsf5g
+JfVVg6t+3TuyM7c1O52efpnsKrdTvKTf1QrVG3INdxh0V4lUtcac16sVhBhbvml+
+p0pCPMIrJe1ibKG5F7SB9B+TaEuo2nnNW2mp367JY5VqoyI8zsWk4nJ8vZAc1BGD
+78EMUNECgYEAtV0pta3GuHKOLX1HMRsUsYuWjLqAbahnciF6MnjNWSonEK3VjMhI
+g+krP/9sWoC3cFOG+4s96ubjDTWImvQvCrPaENdvlNwgp035bn51eFRv00QchM2H
+VCS9Nhoqj5BIHl1G7Q13+tYTzjUWtteG902nWDVhgSlNLJf1rbTn34g=
+-----END RSA PRIVATE KEY-----

+-----BEGIN CERTIFICATE-----
+MIIGazCCBVOgAwIBAgIQZBwijHoFToh2kjGwQ1E6bjANBgkqhkiG9w0BAQsFADBc
+MQswCQYDVQQGEwJDTjEaMBgGA1UEChMRV29UcnVzIENBIExpbWl0ZWQxMTAvBgNV
+BAMMKFdvVHJ1cyBPViBTZXJ2ZXIgQ0EgIFtSdW4gYnkgdGhlIElzc3Vlcl0wHhcN
+MjEwMjA0MDAwMDAwWhcNMjIwMzA2MjM1OTU5WjCB0TELMAkGA1UEBhMCQ04xDzAN
+BgNVBBETBjM1MDAxNTESMBAGA1UEBwwJ56aP5bee5biCMU8wTQYDVQQJDEbpqazl
+sL7ljLrmuZbph4zot68yN+WPtzEj5qW85LqU5qW8NTEw44CBNTEx5a6k77yI6Ieq
+6LS46K+V6aqM5Yy65YaF77yJMTAwLgYDVQQKDCfnpo/lu7rkubDkubDkubDkv6Hm
+ga/np5HmioDmnInpmZDlhazlj7gxGjAYBgNVBAMMESouZmptYWltYWltYWkuY29t
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy0OxRf+NheQG9epxbrud
+wnrzqVgqK5zCuRAkLUgaSMATVXEAiDzJN39om+Q49MmtEk4pXGzKUyzkFJG96PA8
+tJq0E+bSDtSK3n+2mjZb6pChmgHwKEX7T8ZVLqJBSrfrI4Z2BJDNEC+3wvVW3zpo
+g1RlfKgft6NYUzNLUqE5Mxzq7lpDeRsq+FhzM1sOeEb2dAmUlDDs+7HcR3Kj0ttK
+eg+hKqIottQ/H6Tq4c8deEQGnO0+RN3CygyETbYmLuWttI/sUltulWJALIuU81Yr
+6uCOq5MSt2WsU8CTuhRwGXSvcQCOFLYppYktoMDOGIBQffmJc/DdT1d35fvdpKbm
++QIDAQABo4ICsTCCAq0wHwYDVR0jBBgwFoAUDUmPFTN7wE+2+zo4Cfw0Fdpg3RQw
+HQYDVR0OBBYEFMGZEgzwtp+UhpTAS9nmSxlo9tIlMA4GA1UdDwEB/wQEAwIFoDAM
+BgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBJBgNV
+HSAEQjBAMDQGCysGAQQBsjEBAgIWMCUwIwYIKwYBBQUHAgEWF2h0dHBzOi8vc2Vj
+dGlnby5jb20vQ1BTMAgGBmeBDAECAjA9BgNVHR8ENjA0MDKgMKAuhixodHRwOi8v
+Y3JsLmNybG9jc3AuY24vV29UcnVzT1ZTZXJ2ZXJDQV8yLmNybDBsBggrBgEFBQcB
+AQRgMF4wOAYIKwYBBQUHMAKGLGh0dHA6Ly9haWEuY3Jsb2NzcC5jbi9Xb1RydXNP
+VlNlcnZlckNBXzIuY3J0MCIGCCsGAQUFBzABhhZodHRwOi8vb2NzcC5jcmxvY3Nw
+LmNuMIIBBQYKKwYBBAHWeQIEAgSB9gSB8wDxAHcARqVV63X6kSAwtaKJafTzfREs
+QXS+/Um4havy/HD+bUcAAAF3brV9qAAABAMASDBGAiEAjrXS+1JJW9jag/XfW+kY
+oL4sGGDNvcZgV35E0EcGQVACIQCjQh8k5oSFtqo7Qrbx2k3OISjfPSYRXNNsG4Ba
+MyDmRwB2AN+lXqtogk8fbK3uuF9OPlrqzaISpGpejjsSwCBEXCpzAAABd261fdAA
+AAQDAEcwRQIgcPQQJ3rkCFaQPKwT3rtfQkr0taPzw0KW7yqu+MtmBH0CIQChKeMk
+v7Xs0z7J47lM6HTPOU+xXL2riC69LC1KCOS6GTAtBgNVHREEJjAkghEqLmZqbWFp
+bWFpbWFpLmNvbYIPZmptYWltYWltYWkuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQBn
++jDy7sZS0gZzwMR4hnZHWqFYcJR3wnk77xr+5Yu2ifhlxaLHE3rEY3xTR9LsPwfW
+pdg2McinPCI6vs009NYIpeTiHzVDPzKu2BaUfKj+EHLwZQGfXkNhp3cpqZMiTkr/
+YNqf25GXsBa+spwzyHh9MBXXCfWRfdHX7JlH5zyoLNztTp8unxaRYldjghHDA3Q7
+8Fyz6OncY3I4U4KKBSq2/TTxveDW6NxTTuJTPOg3/qSIkwdOBLuIzuhxmF4D9wpl
+LMHmne2CilVeg73/GAzQt/w7FzmdvaHPAOVYWzdaTNALiXJxbi7EyO8q/uNK0GqY
+hljMsnA1hApG+/2sOP/P
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIF4TCCA8mgAwIBAgIQHQgpVDhMv3SvabmRFpvwLTANBgkqhkiG9w0BAQwFADCB
+iDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0pl
+cnNleSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNV
+BAMTJVVTRVJUcnVzdCBSU0EgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMjAw
+MTA4MDAwMDAwWhcNMzAwMTA3MjM1OTU5WjBcMQswCQYDVQQGEwJDTjEaMBgGA1UE
+ChMRV29UcnVzIENBIExpbWl0ZWQxMTAvBgNVBAMMKFdvVHJ1cyBPViBTZXJ2ZXIg
+Q0EgIFtSdW4gYnkgdGhlIElzc3Vlcl0wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCARFLq6kqQRZ4SdFMPdd3XJTcOdVVT5bvZZx0VVDrkw3TmSAloQVFf
+RhqDOSXg4CsIaa64qFSrC3a5sc8LgRhx7AUdvoUdfvdxIY1uoyxRWpoWO8oTUkSn
+EXjEPf+zrcU5cWTOi32xWL9vklYds7iOQwgsKAHDzt4an8MLGvcLxAHciyiKcDEh
+HZOGUHO5bKaCq+kP2rJCfVSlNvdyl1B8q+aGWXoi0gXGVL7WX4pcWj+DGuITbLB2
+MzMytse4MjLJ84zaXh0UD4STlyD8tu/fakdxIwQ7K3/pP3RoGj1R9CvMWXUU+fZm
+KNLW5565hd9Bh3Wkz8b4ApgMD9o3RUjTAgMBAAGjggFwMIIBbDAfBgNVHSMEGDAW
+gBRTeb9aqitKz1SA4dibwJ3ysgNmyzAdBgNVHQ4EFgQUDUmPFTN7wE+2+zo4Cfw0
+Fdpg3RQwDgYDVR0PAQH/BAQDAgGGMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0l
+BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQEC
+AhYwCAYGZ4EMAQICMFAGA1UdHwRJMEcwRaBDoEGGP2h0dHA6Ly9jcmwudXNlcnRy
+dXN0LmNvbS9VU0VSVHJ1c3RSU0FDZXJ0aWZpY2F0aW9uQXV0aG9yaXR5LmNybDBx
+BggrBgEFBQcBAQRlMGMwOgYIKwYBBQUHMAKGLmh0dHA6Ly9jcnQudXNlcnRydXN0
+LmNvbS9VU0VSVHJ1c3RSU0FBQUFDQS5jcnQwJQYIKwYBBQUHMAGGGWh0dHA6Ly9v
+Y3NwLnVzZXJ0cnVzdC5jb20wDQYJKoZIhvcNAQEMBQADggIBAA5G7XA+fNKyj7Fy
+uotoII38/32eZ4UrC1vGFPEtDyd0yzOrr7SvQUoO2GLxFzIQ0SsgMNXJ4UAhMkTD
+yz1OA0tx0g0GjOQXBGA/yfRR7SgitRJAdbqkPfppMn+dtKXCHHx35ohTL0PklRdb
+mXacvR7rXUIiJMdsvZZqYwc+DpGJ+Zv0sRJZEL7pm1oZv6EV+UzjAlOnLe6yrnyD
+c99Kk1H/RFPUzduUWjiVR2aMDT1oMiwYeB2Zq60Sb201jqZPNQj5E+TkDD5BPFVc
+kLeRi3LyXBUuBvXPsdLtBNlr+LExtCDd66kjeUe2/YbTHF4ai5PZPraQxgbOJJyc
+gizGl/JOgrIQPUOLSQvXlxpKEqS+0z6KqV52bco2PNrC0f8ILKuw0nsfhgcGy46d
+Su8fmU9+FT6e61i2nteKvt8qkkSkAJKQxRUWYduN24mG/OOIkoeOPdYHi+qEfbyI
+qxiiqcH9cZgLK9AVuJoKtt7vg21OyrWi7S5T/WbTfTz9XL7QGe8ZODZZx6d50uo/
+lDOmXm3p/kdGApvUF1UrL+og22jBLi0Ns6xzCfzrI3SpC9abvU8E9EnxQABuu/gM
+/B63dbaZzSsMVFxeECD9nMWv7IH+/rqyGmjqEJzgKdPGvXhqpebQ1HhWrV+j+ipc
+jplXB1j3GCozDFsninXG102N6wC8
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFgTCCBGmgAwIBAgIQOXJEOvkit1HX02wQ3TE1lTANBgkqhkiG9w0BAQwFADB7
+MQswCQYDVQQGEwJHQjEbMBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYD
+VQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UE
+AwwYQUFBIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTE5MDMxMjAwMDAwMFoXDTI4
+MTIzMTIzNTk1OVowgYgxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpOZXcgSmVyc2V5
+MRQwEgYDVQQHEwtKZXJzZXkgQ2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBO
+ZXR3b3JrMS4wLAYDVQQDEyVVU0VSVHJ1c3QgUlNBIENlcnRpZmljYXRpb24gQXV0
+aG9yaXR5MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAgBJlFzYOw9sI
+s9CsVw127c0n00ytUINh4qogTQktZAnczomfzD2p7PbPwdzx07HWezcoEStH2jnG
+vDoZtF+mvX2do2NCtnbyqTsrkfjib9DsFiCQCT7i6HTJGLSR1GJk23+jBvGIGGqQ
+Ijy8/hPwhxR79uQfjtTkUcYRZ0YIUcuGFFQ/vDP+fmyc/xadGL1RjjWmp2bIcmfb
+IWax1Jt4A8BQOujM8Ny8nkz+rwWWNR9XWrf/zvk9tyy29lTdyOcSOk2uTIq3XJq0
+tyA9yn8iNK5+O2hmAUTnAU5GU5szYPeUvlM3kHND8zLDU+/bqv50TmnHa4xgk97E
+xwzf4TKuzJM7UXiVZ4vuPVb+DNBpDxsP8yUmazNt925H+nND5X4OpWaxKXwyhGNV
+icQNwZNUMBkTrNN9N6frXTpsNVzbQdcS2qlJC9/YgIoJk2KOtWbPJYjNhLixP6Q5
+D9kCnusSTJV882sFqV4Wg8y4Z+LoE53MW4LTTLPtW//e5XOsIzstAL81VXQJSdhJ
+WBp/kjbmUZIO8yZ9HE0XvMnsQybQv0FfQKlERPSZ51eHnlAfV1SoPv10Yy+xUGUJ
+5lhCLkMaTLTwJUdZ+gQek9QmRkpQgbLevni3/GcV4clXhB4PY9bpYrrWX1Uu6lzG
+KAgEJTm4Diup8kyXHAc/DVL17e8vgg8CAwEAAaOB8jCB7zAfBgNVHSMEGDAWgBSg
+EQojPpbxB+zirynvgqV/0DCktDAdBgNVHQ4EFgQUU3m/WqorSs9UgOHYm8Cd8rID
+ZsswDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8wEQYDVR0gBAowCDAG
+BgRVHSAAMEMGA1UdHwQ8MDowOKA2oDSGMmh0dHA6Ly9jcmwuY29tb2RvY2EuY29t
+L0FBQUNlcnRpZmljYXRlU2VydmljZXMuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggr
+BgEFBQcwAYYYaHR0cDovL29jc3AuY29tb2RvY2EuY29tMA0GCSqGSIb3DQEBDAUA
+A4IBAQAYh1HcdCE9nIrgJ7cz0C7M7PDmy14R3iJvm3WOnnL+5Nb+qh+cli3vA0p+
+rvSNb3I8QzvAP+u431yqqcau8vzY7qN7Q/aGNnwU4M309z/+3ri0ivCRlv79Q2R+
+/czSAaF9ffgZGclCKxO/WIu6pKJmBHaIkU4MiRTOok3JMrO66BQavHHxW/BBC5gA
+CiIDEOUMsfnNkjcZ7Tvx5Dq2+UUTJnWvu6rvP3t3O9LEApE9GQDTF1w52z97GA1F
+zZOFli9d31kWTz9RvdVFGD/tSo7oBmF0Ixa1DVBzJ0RHfxBdiSprhTEUxOipakyA
+vGp4z7h/jnZymQyd/teRCBaho1+V
+-----END CERTIFICATE-----

@@ -91,14 +91,16 @@ spec:
               value: ""
             - name: LOG_LEVEL
               value: "debug"
+            - name: LOG_FRAMEWORK
+              value: "beego"
             - name: LOG_TYPE
-              value: file
+              value: "file"
             - name: ERROR_BASE_CODE
               value: "1"
             - name: ERROR_BASE_CODE_MULTIPLE
               value: "1000"
             - name: ENABLE_KAFKA_LOG
-              value: "true"
+              value: "false"
             - name: HTTP_PORT
               value: "8082"
             - name: ALLIED_CREATION_USER_HOST

+apiVersion: v1
+kind: Service
+metadata:
+  name: allied-creation-gateway
+  namespace: mmm-suplus-test
+  labels:
+    k8s-app: allied-creation-gateway
+spec:
+  ports:
+    - name: "http"
+      port: 80
+      targetPort: 8082
+    - name: "https"
+      port: 443
+      targetPort: 443
+  selector:
+    k8s-app: allied-creation-gateway
+---
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: allied-creation-gateway
+  namespace: mmm-suplus-test
+  labels:
+    k8s-app: allied-creation-gateway
+spec:
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        k8s-app: allied-creation-gateway
+    spec:
+      affinity:
+        nodeAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - preference: {}
+              weight: 100
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                  - key: kubernetes.io/hostname
+                    operator: In
+                    values:
+                      - cn-hangzhou.i-bp1djh1xn7taumbue1ze
+                      - cn-hangzhou.i-bp1djh1xn7taumbue1zd
+                      - cn-hangzhou.i-bp1euf5u1ph9kbhtndhb
+                      - cn-hangzhou.i-bp1hyp5oips9cdwxxgxy
+      containers:
+        - name: allied-creation-gateway
+          image: 192.168.0.243:5000/mmm/allied-creation-gateway:dev
+          imagePullPolicy: Always
+          ports:
+            - containerPort: 8082
+            - containerPort: 443
+          volumeMounts:
+            - mountPath: /opt/logs
+              name: accesslogs
+          env:
+            - name: POSTGRESQL_DB_NAME
+              valueFrom:
+                configMapKeyRef:
+                  name: suplus-config
+                  key: postgresqlalliedcreation.dbname
+            - name: POSTGRESQL_USER
+              valueFrom:
+                configMapKeyRef:
+                  name: suplus-config
+                  key: postgresql.user
+            - name: POSTGRESQL_PASSWORD
+              valueFrom:
+                configMapKeyRef:
+                  name: suplus-config
+                  key: postgresql.password
+            - name: POSTGRESQL_HOST
+              valueFrom:
+                configMapKeyRef:
+                  name: suplus-config
+                  key: postgresql.host
+            - name: POSTGRESQL_PORT
+              valueFrom:
+                configMapKeyRef:
+                  name: suplus-config
+                  key: postgresql.port
+            - name: REDIS_HOST
+              valueFrom:
+                configMapKeyRef:
+                  name: suplus-config
+                  key: redis.ip
+            - name: REDIS_PORT
+              valueFrom:
+                configMapKeyRef:
+                  name: suplus-config
+                  key: redis.port
+            - name: REDIS_AUTH
+              value: ""
+            - name: LOG_LEVEL
+              value: "debug"
+            - name: LOG_FRAMEWORK
+              value: "beego"
+            - name: LOG_TYPE
+              value: "file"
+            - name: ERROR_BASE_CODE
+              value: "1"
+            - name: ERROR_BASE_CODE_MULTIPLE
+              value: "1000"
+            - name: ENABLE_KAFKA_LOG
+              value: "false"
+            - name: HTTP_PORT
+              value: "8082"
+            - name: ALLIED_CREATION_USER_HOST
+              value: "https://allied-creation-user-test.fjmaimaimai.com"
+            - name: ALLIED_CREATION_COOPERATION_HOST
+              value: "https://allied-creation-cooperation-test.fjmaimaimai.com"
+            - name: ALLIED_CREATION_BASIC_HOST
+              value: "https://allied-creation-basic-test.fjmaimaimai.com"
+            - name: SMS_SERVE_HOST
+              value: "https://sms.fjmaimaimai.com:9897"
+      #        - name: REDIS_HOST
+      #          valueFrom:
+      #            configMapKeyRef:
+      #              name: suplus-config
+      #              key: redis.ip
+      #        - name: REDIS_PORT
+      #          valueFrom:
+      #            configMapKeyRef:
+      #              name: suplus-config
+      #              key: redis.port
+      volumes:
+        - name: accesslogs
+          emptyDir: {}

+#!/bin/bash
+export PATH=/root/local/bin:$PATH
+kubectl -n mmm-suplus-test get pods | grep -q allied-creation-gateway
+if [ "$?" == "1" ];then
+	kubectl create -f /tmp/test/allied-creation-gateway/allied-creation-gateway.yaml --record
+	kubectl -n mmm-suplus-test get svc | grep -q allied-creation-gateway
+	if [ "$?" == "0" ];then
+		echo "allied-creation-gateway service install success!"
+	else
+		echo "allied-creation-gateway service install fail!"
+	fi
+	kubectl -n mmm-suplus-test get pods | grep -q allied-creation-gateway
+	if [ "$?" == "0" ];then
+		echo "allied-creation-gateway deployment install success!"
+	else
+		echo "allied-creation-gateway deployment install fail!"
+	fi
+else
+	kubectl delete -f /tmp/test/allied-creation-gateway/allied-creation-gateway.yaml
+	kubectl -n mmm-suplus-test get svc | grep -q allied-creation-gateway
+	while [ "$?" == "0" ]
+	do
+	kubectl -n mmm-suplus-test get svc | grep -q allied-creation-gateway
+	done
+	kubectl -n mmm-suplus-test get pods | grep -q allied-creation-gateway
+	while [ "$?" == "0" ]
+	do
+	kubectl -n mmm-suplus-test get pods | grep -q allied-creation-gateway
+	done
+	kubectl create -f /tmp/test/allied-creation-gateway/allied-creation-gateway.yaml --record
+	kubectl -n mmm-suplus-test get svc | grep -q allied-creation-gateway
+	if [ "$?" == "0" ];then
+		echo "allied-creation-gateway service update success!"
+	else
+		echo "allied-creation-gateway service update fail!"
+	fi
+	kubectl -n mmm-suplus-test get pods | grep -q allied-creation-gateway
+	if [ "$?" == "0" ];then
+		echo "allied-creation-gateway deployment update success!"
+	else
+		echo "allied-creation-gateway deployment update fail!"
+	fi
+fi
\ No newline at end of file

@@ -48,6 +48,7 @@ github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1
 github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc=
 github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
 github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
+github.com/elastic/go-elasticsearch/v6 v6.8.5 h1:U2HtkBseC1FNBmDr0TR2tKltL6FxoY+niDAlj5M8TK8=
 github.com/elastic/go-elasticsearch/v6 v6.8.5/go.mod h1:UwaDJsD3rWLM5rKNFzv9hgox93HoX8utj1kxD9aFUcI=
 github.com/elazarl/go-bindata-assetfs v1.0.0 h1:G/bYguwHIzWq9ZoyUQqrjTmJbbYn3j3CKKpKinvZLFk=
 github.com/elazarl/go-bindata-assetfs v1.0.0/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4=

@@ -27,6 +27,7 @@ func (srv UndertakerFeedbackService) SearchFeedback(cmd *command.SearchFeedbackC
 		result.Grid.List[i].ContractUndertaker.UserCode = v.ContractUndertaker.UserInfo.UserCode
 		result.Grid.List[i].ContractUndertaker.UserName = v.ContractUndertaker.UserInfo.UserName
 		result.Grid.List[i].ContractUndertaker.UserPhone = v.ContractUndertaker.UserInfo.UserPhone
+		result.Grid.List[i].CooperationMode.CooperationModeName = v.CooperationModeName
 	}
 	return result, nil
 }

@@ -8,8 +8,11 @@ import (
 const SERVICE_NAME = "allied-creation-gateway"
 
 var LOG_LEVEL = "debug"
-var LOG_TYPE = "console"
+var LOG_TYPE = "console"// file, console, es
+var LOG_FRAMEWORK = "beego" // beego logrus
 var LOG_FILE = "app.log"
+var LOG_PREFIX = "[allied-creation-gateway]"
+
 var HTTP_PORT int = 8083
 
 //天联共创基础模块

@@ -19,6 +19,10 @@ func init() {
 	//	POSTGRESQL_PORT = os.Getenv("TOPIC_LOG_STASH")
 	//}
 	if os.Getenv("ENABLE_KAFKA_LOG") != "" {
-		ENABLE_KAFKA_LOG = true
+		if os.Getenv("ENABLE_KAFKA_LOG") == "true" {
+			ENABLE_KAFKA_LOG = true
+		} else if os.Getenv("ENABLE_KAFKA_LOG") == "false" {
+			ENABLE_KAFKA_LOG = false
+		}
 	}
 }

@@ -81,6 +81,9 @@ type (
 				CreatedAt jtime.TimeToUnixMsec `json:"createdAt"`
 				// 共创模式名称
 				CooperationModeName string `json:"cooperationModeName"`
+				CooperationMode     struct {
+					CooperationModeName string `json:"cooperationModeName"`
+				} `json:"cooperationMode"`
 			} `json:"list"`
 			Total int `json:"total"`
 		} `json:"grid"`

@@ -4,12 +4,11 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"io"
-	"strconv"
-
 	"github.com/beego/beego/v2/core/logs"
-	"github.com/linmadan/egglib-go/log"
+	_ "github.com/beego/beego/v2/core/logs/es"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/constant"
+	"io"
+	"strconv"
 )
 
 type LoggerConfig struct {
@@ -26,35 +25,7 @@ type BeegoLog struct {
 	beeLogger   *logs.BeeLogger
 }
 
-var _ log.Logger = &BeegoLog{}
-
-func NewBeegoLog(conf LoggerConfig) *BeegoLog {
-	logger := logs.GetBeeLogger()
-	logger.SetLevel(conf.Level)
-	if constant.LOG_TYPE == "file" { // 日志存储到文件
-		confByte, _ := json.Marshal(conf)
-		err := logger.SetLogger(logs.AdapterFile, string(confByte))
-		if err != nil {
-			fmt.Println(err.Error())
-			return nil
-		}
-	} else { // 日志输出到控制台
-		err := logger.SetLogger(logs.AdapterConsole, `{"level":7,"color":true}`)
-		if err != nil {
-			fmt.Println(err.Error())
-			return nil
-		}
-	}
-	logger.SetPrefix(constant.SERVICE_NAME)
-	logger.EnableFuncCallDepth(true)
-	logger.SetLogFuncCallDepth(5)
-	return &BeegoLog{
-		beeLogger: logger,
-	}
-}
-
 func (logger *BeegoLog) AddHook(write io.Writer) {
-
 }
 
 func (logger *BeegoLog) SetServiceName(serviceName string) {
@@ -118,3 +89,35 @@ func (logger *BeegoLog) Fatal(msg string, appends ...map[string]interface{}) {
 func (logger *BeegoLog) Panic(msg string, appends ...map[string]interface{}) {
 	logs.Error(msg, appends)
 }
+
+func NewBeegoLog(conf LoggerConfig) *BeegoLog {
+	logger := logs.GetBeeLogger()
+	logger.SetLevel(conf.Level)
+	if constant.LOG_TYPE == "file" { // 日志存储到文件
+		confByte, _ := json.Marshal(conf)
+		err := logger.SetLogger(logs.AdapterFile, string(confByte))
+		if err != nil {
+			fmt.Println(err.Error())
+			return nil
+		}
+	} else if constant.LOG_TYPE == "es" { // 日志存储到ES
+		err := logger.SetLogger(logs.AdapterEs, `{"dsn":"http://192.168.100.222:9200/","level":7}`)
+		if err != nil {
+			fmt.Println(err.Error())
+			return nil
+		}
+	} else { // 日志输出到控制台
+		err := logger.SetLogger(logs.AdapterConsole, `{"level":7,"color":true}`)
+		if err != nil {
+			fmt.Println(err.Error())
+			return nil
+		}
+	}
+	logger.SetPrefix(constant.LOG_PREFIX)
+	logger.EnableFuncCallDepth(true)
+	logger.SetLogFuncCallDepth(5)
+	logger.SetPrefix(constant.LOG_PREFIX)
+	return &BeegoLog{
+		beeLogger: logger,
+	}
+}

 package log
 
 import (
+	"github.com/linmadan/egglib-go/log/logrus"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/constant"
 
 	"github.com/linmadan/egglib-go/log"
@@ -9,13 +10,15 @@ import (
 var Logger log.Logger
 
 func init() {
-	// Logger = logrus.NewLogrusLogger()
-	// Logger.SetServiceName(constant.SERVICE_NAME)
-	// Logger.SetLevel(constant.LOG_LEVEL)
-	// //
-	Logger = NewBeegoLog(LoggerConfig{
-		Filename: constant.LOG_FILE,
-		Level:    7,
-		MaxSize:  1024 * 1024 * 2,
-	})
+	if constant.LOG_FRAMEWORK == "beego" {
+		Logger = NewBeegoLog(LoggerConfig{
+			Filename: constant.LOG_FILE,
+			Level:    7,
+			MaxSize:  1024 * 1024 * 2,
+		})
+	} else if constant.LOG_FRAMEWORK == "logrus" {
+		Logger = logrus.NewLogrusLogger()
+		Logger.SetServiceName(constant.SERVICE_NAME)
+		Logger.SetLevel(constant.LOG_LEVEL)
+	}
 }

@@ -33,10 +33,10 @@ func init() {
 		}
 	}
 	//https支持
-	web.BConfig.Listen.EnableHTTPS = false
-	web.BConfig.Listen.HTTPSPort = 80
-	web.BConfig.Listen.HTTPSCertFile = ""
-	web.BConfig.Listen.HTTPSKeyFile = ""
+	web.BConfig.Listen.EnableHTTPS = true
+	web.BConfig.Listen.HTTPSPort = 443
+	web.BConfig.Listen.HTTPSCertFile = "./config/fjmaimaimai.com_bundle.crt"
+	web.BConfig.Listen.HTTPSKeyFile = "./config/fjmaimaimai.com.key"
 
 	filters.SecureKeyMap["token"] = "x-mmm-accesstoken"
 	web.InsertFilter("/*", web.BeforeRouter, filters.AllowCors())

+package controllers
+
+import "io/ioutil"
+
+type LoggerController struct {
+	BaseController
+}
+
+func (controller LoggerController) Index() {
+	bytes, _ := ioutil.ReadFile("./app.log")
+	controller.Ctx.WriteString(string(bytes))
+}

+package routers
+
+import (
+	"github.com/beego/beego/v2/server/web"
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/port/beego/controllers"
+)
+
+func init() {
+	web.Router("/log", &controllers.LoggerController{}, "Get:Index")
+}