Merge remote-tracking branch 'origin/test'

@@ -23,6 +23,7 @@ RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
     && rm -rf /var/cache/apk/* /tmp/* /var/tmp/* $HOME/.cache ## 清除缓存
     && rm -rf /var/cache/apk/* /tmp/* /var/tmp/* $HOME/.cache ## 清除缓存
 WORKDIR /root/
 WORKDIR /root/
 COPY --from=builder /go/src/opp .
 COPY --from=builder /go/src/opp .
+
 EXPOSE 8080
 EXPOSE 8080
 EXPOSE 443
 EXPOSE 443
 CMD ["./opp"]
 CMD ["./opp"]

+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAjlYTMGgbnNvRnlNpSBXkXCC9FGcRjHnZb5ez/bgatsUawan9
+Ou4a92X2cF1xQvALrvV8FgNpkUL4o8XUeWAN4DWOpSNKNUyEYy68jXr4FSUFSBEt
+UytZrAWd5K+nvdNiACZFUfNyCDy2vs1mBtsA9TVyJEjk2MU+xMjCg8Jiv4LwGJze
+33x7VDi/qurbaWQpLHvpsrDTtaC51s+JWu5etK1rDO45gjpo6QmaSuNxkuPAjJVO
+1qwCf0Fz5H3EHiVFmz09nVbFCH/7a/d8WB1NMNRZAEOkOLUdVFLkrINMawcWBqx4
+dl+ODIa8D50IiHuAbx4j6kXbNkDpQAYz+zOmNQIDAQABAoIBAB+bfyLgd4NHcB7V
+vHsgu2d28K37blLwywdkG3jj3XDJR9YKMtzXe58FIirVIT3hUuLdChtUUijLA65Q
+k8yJN0Oa+Qx0T/oSfhKNUhsj27vMTwYwJE3EAmN4EtYx6JC3hFtupDWc1y17mAQ6
+VeX/U5DgN7LVihYWBQiLYWCDdcy7iBCCdgODHv1Zp6/Y1XLv5L9vUU1XK1GcIgZb
+Ubbql6np6tzQm3LMS1xyhl4vwFSRDx9sSZ9C6dWlNT+3qLNjnPCsvY6709DgGgYz
+Qu3C31uxDLzjS4KAYbOMmJl/knzyyhXHvRb1hz7kOsdmzUGOZl9ga/bcIbzDmpAG
+7PnK1mECgYEA2zj0CjPj4TIuP2jVYkToMz6yE9glwZBWS7PEL/PicIf13ZH37Uuq
+7HxAquKOlJKWnvOmLkNxfkTScomueC3OCrR0OSnBf6vhcgZ5qg8l/waXyNFMjwgq
+Ng6bqrd5xDxHKsL38KvkWQzbtFra21gb0IIgkdTwtmQ5qGXyYbg5O2ECgYEApjcN
+rDVDDyDdQwVbQROb3MA/6q2aryHZJiJsMD/oFXINn3QsNCshkqw6MOFdoKNPiI4q
+dH6V3fhNFW+IdxnRdO/A1Ew56LaMUsx+Ed/iKexB//xfxT1ZtlLI4VxQF6alg9Sn
+lOfXnrFs97JEnLu4GmNILNBYVtYuuIgLQ3LgT1UCgYEAs2WNF9hU8JG/FPb2QB/B
+oUX6NpEYfKlgZTzsHI3JTWuFwVdVe2QDsNkRloYmReEbz2H2KT/Z3Yn2afLPyts5
+FLuNrMXF6nO+3y/7WjZhUqyTg6v7qcT1vh0AOJlC1Vq6pny8p8AS8ui51oLPPNaC
+lIQYoR6QCcJFCNC8pEk81KECgYBtvnXJmRUgvPs6UCQTUKYdV9Yb1eoG7htZAWtb
+ZCaRWk/CU0sIWt384Lg/I93UvV8681r2tcmv2EzU9WIt+R8BzXcM9RNbIoR9+sTW
+enLyaSqeoPx+12YPapN1sKS1KPOpmlPXjkggYFdpKAwDTDJfQeQaqqlZFGuerTx6
+mTOfTQKBgD6w9VSxrkUU2LpThnmz3derO3EsnVediluDyoGxHdArvLlr2e4dS3Tl
+EdOCX3BYecYeJIeW6tapR1l90Wd4isPz2Q6ZteeFG62AV9/65MhUjt2JfAAs72gx
+P9yD5agisxXWlMyV3zrcYthyhuD0NBxkn0OMHX6QCbB+/DDQ0x+z
+-----END RSA PRIVATE KEY-----

+-----BEGIN CERTIFICATE-----
+MIIF8zCCBNugAwIBAgIQNQFdwmxIowVU6OuCfaJfMzANBgkqhkiG9w0BAQsFADBE
+MQswCQYDVQQGEwJDTjEaMBgGA1UECgwRV29TaWduIENBIExpbWl0ZWQxGTAXBgNV
+BAMMEFdvU2lnbiBPViBTU0wgQ0EwHhcNMTgwMjEyMDkyNzQxWhcNMjEwMjEwMDky
+NzQxWjCBlzELMAkGA1UEBhMCQ04xMDAuBgNVBAoMJ+emj+W7uuS5sOS5sOS5sOS/
+oeaBr+enkeaKgOaciemZkOWFrOWPuDESMBAGA1UECwwJ5oqA5pyv6YOoMRIwEAYD
+VQQHDAnnpo/lt57luIIxEjAQBgNVBAgMCeemj+W7uuecgTEaMBgGA1UEAwwRKi5m
+am1haW1haW1haS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCO
+VhMwaBuc29GeU2lIFeRcIL0UZxGMedlvl7P9uBq2xRrBqf067hr3ZfZwXXFC8Auu
+9XwWA2mRQvijxdR5YA3gNY6lI0o1TIRjLryNevgVJQVIES1TK1msBZ3kr6e902IA
+JkVR83IIPLa+zWYG2wD1NXIkSOTYxT7EyMKDwmK/gvAYnN7ffHtUOL+q6ttpZCks
+e+mysNO1oLnWz4la7l60rWsM7jmCOmjpCZpK43GS48CMlU7WrAJ/QXPkfcQeJUWb
+PT2dVsUIf/tr93xYHU0w1FkAQ6Q4tR1UUuSsg0xrBxYGrHh2X44MhrwPnQiIe4Bv
+HiPqRds2QOlABjP7M6Y1AgMBAAGjggKLMIIChzAMBgNVHRMBAf8EAjAAMDwGA1Ud
+HwQ1MDMwMaAvoC2GK2h0dHA6Ly93b3NpZ24uY3JsLmNlcnR1bS5wbC93b3NpZ24t
+b3ZjYS5jcmwwdwYIKwYBBQUHAQEEazBpMC4GCCsGAQUFBzABhiJodHRwOi8vd29z
+aWduLW92Y2Eub2NzcC1jZXJ0dW0uY29tMDcGCCsGAQUFBzAChitodHRwOi8vcmVw
+b3NpdG9yeS5jZXJ0dW0ucGwvd29zaWduLW92Y2EuY2VyMB8GA1UdIwQYMBaAFKET
+VNxWcywngsrIhO/uvwD9X6tWMB0GA1UdDgQWBBTweqaiBhFfCx9IQBfvV0NgQfmx
+vTAOBgNVHQ8BAf8EBAMCBaAwggEgBgNVHSAEggEXMIIBEzAIBgZngQwBAgIwggEF
+BgwqhGgBhvZ3AgUBDAIwgfQwgfEGCCsGAQUFBwICMIHkMB8WGEFzc2VjbyBEYXRh
+IFN5c3RlbXMgUy5BLjADAgEBGoHAVXNhZ2Ugb2YgdGhpcyBjZXJ0aWZpY2F0ZSBp
+cyBzdHJpY3RseSBzdWJqZWN0ZWQgdG8gdGhlIENFUlRVTSBDZXJ0aWZpY2F0aW9u
+IFByYWN0aWNlIFN0YXRlbWVudCAoQ1BTKSBpbmNvcnBvcmF0ZWQgYnkgcmVmZXJl
+bmNlIGhlcmVpbiBhbmQgaW4gdGhlIHJlcG9zaXRvcnkgYXQgaHR0cHM6Ly93d3cu
+Y2VydHVtLnBsL3JlcG9zaXRvcnkuMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
+BQcDAjAtBgNVHREEJjAkghEqLmZqbWFpbWFpbWFpLmNvbYIPZmptYWltYWltYWku
+Y29tMA0GCSqGSIb3DQEBCwUAA4IBAQBHCrxm1qPBW0LuEhloYvMqwKJsIj2loPd1
+c8EIL7t6ePX+nQCqQfwYjSNMXkt7CqcQlMuFKez81h4dP+CF+SzjHkmQpSXb7J9X
+SMctV4hzaLqMfwTE5sg48mj0bIrOPaR3ycLtOWIek3UJh3nYqPcXyDxN7ZoheNZ5
+hi68fCqzOwGVCAzaoB9ZQKZkJ0SYcf9xtBzGkrOBu1B7JNga7ZlWqeInc93elLga
+nq3qTIwvJxwsjq1o2rVeGFQ4G7M+TfbBUzq1VMni3H9ot9L4Za4B0iGFk9vYTATd
+QVZsCXJ4dCtB+sYNfMsQsMsu9TmBb3/unwyLhPM1OWVXWPOYbIC8
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIEtTCCA52gAwIBAgIRAO8FGnQaHZQJ/KXkZA+NPJswDQYJKoZIhvcNAQELBQAw
+fjELMAkGA1UEBhMCUEwxIjAgBgNVBAoTGVVuaXpldG8gVGVjaG5vbG9naWVzIFMu
+QS4xJzAlBgNVBAsTHkNlcnR1bSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEiMCAG
+A1UEAxMZQ2VydHVtIFRydXN0ZWQgTmV0d29yayBDQTAeFw0xNjExMDkwODMzNDRa
+Fw0yNjExMDkwODMzNDRaMEQxCzAJBgNVBAYTAkNOMRowGAYDVQQKDBFXb1NpZ24g
+Q0EgTGltaXRlZDEZMBcGA1UEAwwQV29TaWduIE9WIFNTTCBDQTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAKRzU7QtbSdi6uUiqewzx81eEdrg0RROHTs1
+eXndSwxxUAVDC+FPYvpgWc+bYMVjUJQEIP+SNzsIGvB/YoabRoN7cLBDzPTgYnW8
+Pl/wYWXuGNyr1E7bV9Fec37HlvhE39Ntwp31gjMFwTOZ7Zw0QzS7w9PjO4A4anwb
+maBJgrRa3GFSgoJ+WIr5brQ6hEgm7rKRNPx6L9Sj2aSl/EWRPPv73j5xeWGcgOPp
+U+8eZmqpX+XfCl34o5OQJWi/F7bACetVhvFtWGuLNcZ0eYwU13jOEx3NNsILzIYP
+oWJztxd3aPkQOX6cNbJGTvLRcfmGDM0ASq3/BsCrR0o/ruCcd6cCAwEAAaOCAWYw
+ggFiMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFKETVNxWcywngsrIhO/u
+vwD9X6tWMB8GA1UdIwQYMBaAFAh2zcsH/yT2xc3tu5C84oQ3RnX3MA4GA1UdDwEB
+/wQEAwIBBjAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwNQYDVR0fBC4w
+LDAqoCigJoYkaHR0cDovL3N1YmNhLmNybC5jZXJ0dW0ucGwvY3RuY2EuY3JsMGsG
+CCsGAQUFBwEBBF8wXTAoBggrBgEFBQcwAYYcaHR0cDovL3N1YmNhLm9jc3AtY2Vy
+dHVtLmNvbTAxBggrBgEFBQcwAoYlaHR0cDovL3JlcG9zaXRvcnkuY2VydHVtLnBs
+L2N0bmNhLmNlcjA5BgNVHSAEMjAwMC4GBFUdIAAwJjAkBggrBgEFBQcCARYYaHR0
+cDovL3d3dy5jZXJ0dW0ucGwvQ1BTMA0GCSqGSIb3DQEBCwUAA4IBAQCLBeq0MMgd
+qULSuAua1YwHNgbFAAnMXd9iiSxbIKoSfYKsrFggNCFX73ex4b64iIhQ2BBr82/B
+MNpC4rEvnr1x0oFv8DBO1GYimQaq8E9hjnO1UYYEPelVsykOpnDLklTsBZ4vhhq/
+hq1mbs+6G+vsAjO9jVnuxP6toOTNBqvURRumMF0P165MoFdh0kzSjUts+1d8Llnb
+DJaZht0O19k1ZdBBmPD3cwbTI+tChOELAVt4Nb5dDGPWqSxc5Nl2j95T3aK1KL2d
+2vV16DSVShJIz04QHatcJlNZLJDbSu70c5fPU8YiJdRpfkubANAmwcDB+uNhtYz+
+zEji0KnE2oNA
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIEtDCCA5ygAwIBAgIRAJOShUABZXFflH8oj+/JmygwDQYJKoZIhvcNAQELBQAw
+PjELMAkGA1UEBhMCUEwxGzAZBgNVBAoTElVuaXpldG8gU3AuIHogby5vLjESMBAG
+A1UEAxMJQ2VydHVtIENBMB4XDTA4MTAyMjEyMDczN1oXDTI3MDYxMDEwNDYzOVow
+fjELMAkGA1UEBhMCUEwxIjAgBgNVBAoTGVVuaXpldG8gVGVjaG5vbG9naWVzIFMu
+QS4xJzAlBgNVBAsTHkNlcnR1bSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEiMCAG
+A1UEAxMZQ2VydHVtIFRydXN0ZWQgTmV0d29yayBDQTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAOP7faNyusLwyRSH9WsBTuFuQAe6bSddf/dbLbNax1Ff
+q6QypmGHtm4PhtIwApf412lXoRg5XWpkecYBWaw8MUo4fNIE0kso6CBfOweizE1z
+2/OuT8dW1Vqnlon686to1COGWSfPCSe8rG5ygxwwct/gounS4XR1Gb0qnnsVVAQb
+10M5rVUoxeIau/TA5K44STPMdoWfOUXSpJ7yEoxR+HzkLX/1rF/rFp+xLdG6zJFC
+d0wlyZA4b9vwzPuOHpdZPtVgTuYFKO1JeRNLukjbL/ly0znK/h/YNHL1tEDPMQHD
+7N4RLRddH7hQ0V4Zp2neBzMoylCV+adUy1SGUEWp+UkCAwEAAaOCAWswggFnMA8G
+A1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFAh2zcsH/yT2xc3tu5C84oQ3RnX3MFIG
+A1UdIwRLMEmhQqRAMD4xCzAJBgNVBAYTAlBMMRswGQYDVQQKExJVbml6ZXRvIFNw
+LiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBDQYIDAQAgMA4GA1UdDwEB/wQEAwIB
+BjAsBgNVHR8EJTAjMCGgH6AdhhtodHRwOi8vY3JsLmNlcnR1bS5wbC9jYS5jcmww
+aAYIKwYBBQUHAQEEXDBaMCgGCCsGAQUFBzABhhxodHRwOi8vc3ViY2Eub2NzcC1j
+ZXJ0dW0uY29tMC4GCCsGAQUFBzAChiJodHRwOi8vcmVwb3NpdG9yeS5jZXJ0dW0u
+cGwvY2EuY2VyMDkGA1UdIAQyMDAwLgYEVR0gADAmMCQGCCsGAQUFBwIBFhhodHRw
+Oi8vd3d3LmNlcnR1bS5wbC9DUFMwDQYJKoZIhvcNAQELBQADggEBAI3m/UBmo0yc
+p6uh2oTdHDAH5tvHLeyDoVbkHTwmoaUJK+h9Yr6ydZTdCPJ/KEHkgGcCToqPwzXQ
+1aknKOrS9KsGhkOujOP5iH3g271CgYACEnWy6BdxqyGVMUZCDYgQOdNv7C9C6kBT
+Yr/rynieq6LVLgXqM6vp1peUQl4E7Sztapx6lX0FKgV/CF1mrWHUdqx1lpdzY70a
+QVkppV4ig8OLWfqaova9ML9yHRyZhpzyhTwd9yaWLy75ArG1qVDoOPqbCl60BMDO
+TjksygtbYvBNWFA0meaaLNKQ1wmB1sCqXs7+0vehukvZ1oaOGR+mBkdCcuBWCgAc
+eLmNzJkEN0k=
+-----END CERTIFICATE-----

------BEGIN CERTIFICATE-----
-MIIDazCCAlOgAwIBAgIUfNa5XwS9Ip1iVYqYC8+k1MXVch4wDQYJKoZIhvcNAQEL
-BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
-GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0yMDAxMTkwOTI5MDRaFw0zMDAx
-MTYwOTI5MDRaMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEw
-HwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDBtL4yx1zofo2vQEe1B2WHVgBwo0K+XghB/u0hH6+S
-Amzwg7/zyAqTxZvM83mTxparxwE7pPyEPP94ykJ8M/pHCLwNRNhgf291rB+EUJzN
-riAE5OB579fMFtzrZaXyEo3Jj+Vk04zWNtQ9OnrtYMZ7Irwqcoo6pAF3wDjCk0eQ
-A+9IRmqFrKl1VG3eKDAz8Yih9N0i+4HvmUEwzfX/7RY5Vj2Bz69w4Bc+e4cgROii
-bufYbK6Dy7+DJPwp5ufBEpQYRaK+lXBTLs2lpJYE9/ysL7NQ9UP44YfRtHJvF+lZ
-miCMl0aSetuGPiqCVDWgINZl+cY8qdh0fQL9rqaRsj0xAgMBAAGjUzBRMB0GA1Ud
-DgQWBBQETkybLI+sJek0nIVG6IPVnVqWEjAfBgNVHSMEGDAWgBQETkybLI+sJek0
-nIVG6IPVnVqWEjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQA9
-7FgDR3y8xSo+CgcWdJbvX7M6l24uDaQNBxkPcIdQO9DuPz2vrWhS2JYTkBAI7T0t
-gT7fDVWzpVcueDxPqckalzklMvJnjJd7jl9+y/o68DGMqIVTbzwwldeGr0zeOYgE
-JFZ7AlI7XE42W1AGujz3ZSVtvsjj1FKNLLAKErUOZRew9GrzQlJF9IrmGeEJSJvX
-fPfXZ8cVmJ9gS3gJRlwNP5pKsty58pGBOW7tmnXWF60toKHNmoNmZ2MVKD6tn2Sb
-ASCmLnPxnIzIbYDztPJREeszipIizbJQPe4Qc2qpFCR3gbom2HsqSeEFuNA3Cggr
-NAGhN9BUXUAGlCbvOz18
------END CERTIFICATE-----

------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEAwbS+Msdc6H6Nr0BHtQdlh1YAcKNCvl4IQf7tIR+vkgJs8IO/
-88gKk8WbzPN5k8aWq8cBO6T8hDz/eMpCfDP6Rwi8DUTYYH9vdawfhFCcza4gBOTg
-ee/XzBbc62Wl8hKNyY/lZNOM1jbUPTp67WDGeyK8KnKKOqQBd8A4wpNHkAPvSEZq
-haypdVRt3igwM/GIofTdIvuB75lBMM31/+0WOVY9gc+vcOAXPnuHIEToom7n2Gyu
-g8u/gyT8KebnwRKUGEWivpVwUy7NpaSWBPf8rC+zUPVD+OGH0bRybxfpWZogjJdG
-knrbhj4qglQ1oCDWZfnGPKnYdH0C/a6mkbI9MQIDAQABAoIBAEekgMApKjy3KdIK
-lTroPG3cqhb+2x2ri6RVFAEvRfFbwk0GfYU9lGPpL2GTH4E/btSjqtoTgG2sXdSg
-Ag0L8GI7YcoKj3jJSUEdYx697fDImQEWYcvXoFnUjurlUoYAxL4q4W30LF/CMadf
-rL2FEIPUagHNEUD1DbHrv1J/xHUHyjuVEh9DAZ50KqHiP3ebA5evPAmnTXmgqWCx
-56c7APIh7Iid4SMYkRh4ZtE4m02AmjRcnKgcrNw44gZTq9OjAdbYbiud4U0AzOiJ
-kAFNve/YFOre5VTyTckYE4MQpMRqhXw7zT8H0upNqLVSnfgaC3J4rucXdthPnn0j
-c7wdohECgYEA8eVFxiCqKzk31CHSsTLIN5uudf0SmUjys6a6Y7gLK3t1eibexwRq
-oKH0XLBAK4g/U0U8ORr2LkB+D9cjQRr0/++SUTRP8vlUZbj3zkI5hrZN0h6r8vk+
-lxK3oUZX+YCSJJ+Z2cBVzJ6o3PLflv/3GtcbAUvyxT6FcqOAYLTKaX0CgYEAzQAn
-gEKcDvbyX/FSfjFemN3xR71IuKZVEif/3Cgw6kEjODOt+3oTYyVubX8YiTO0E89D
-1rnbxyK3gIfOqjyOIKZGFLHjFs+J7aaKqTUuMDIVKIIUl18YWEP9aaJKLZQ9u4jw
-GhrkPi/kRWg3VrnZMgrBTzFOKx0khATdmwZYUMUCgYEAjF4tJRGjbb2gRfryll0P
-jiVLEbCvcD/ChrmDg4YzBSJ5Q073C6nmbhxM/tRQCHLhvGJ61fBtVt2ZyXtgO9F2
-xmWxFGo00pwYe4bgVdJcK23yrrGZuj8kMOptoKp/NouDQrlSv+c6YqjW+I//a1JR
-hEO6qf/2ersTGTkDsBp5MskCgYEAnuTIuTxn052K/dyBsTg490nH03AeZqjd9WW1
-hoJMb7WvQ8eiyfG0BzwjHJHPhcDiihwzm8KRXAdHrkMVZ5PqIdpfJXk/6BVS9jYI
-8eA7fbXD+pLgvPdDWl7Qk8jrr+pf8vTQDZvcX2slhrqhcgI5G/WEIgq4aOh8vis7
-TQac+3UCgYAMS0k2lv8k0TBf+XlsK2oJNamxjrTkLpEKhPTCLEI0uP5CxR6UNHFA
-jeotW/ms+AyaZUXTt8+wQ4/JbhSuMWDbTO5KMzlVI5biDEu48YVFYUgnlXlvKRA7
-qC7q6Opss26RP+HYXBdHObVvNkTxB49kirwMzbwSjG3xFQsopaeS6g==
------END RSA PRIVATE KEY-----

@@ -21,7 +21,7 @@ yunpian_sms_sdk_url  ="https://sms.yunpian.com/v2/sms/single_send.json"
 yunpian_app_key ="0bf6fb10a11a68a95dee80901eb545b5"
 yunpian_app_key ="0bf6fb10a11a68a95dee80901eb545b5"
 
 
 #存储 http://ability.fjmaimaimai.com:8080/
 #存储 http://ability.fjmaimaimai.com:8080/
-source_host ="http://mmm-opp-test.fjmaimaimai.com/"
+source_host ="https://mmm-opp-test.fjmaimaimai.com/"
 source_virtual_path=file/opp
 source_virtual_path=file/opp
 source_path ="${aliyun_file_access||/var/www/opp/file}"
 source_path ="${aliyun_file_access||/var/www/opp/file}"
 
 

@@ -10,6 +10,9 @@ spec:
     - name: "http"
     - name: "http"
       port: 80
       port: 80
       targetPort: 8080
       targetPort: 8080
+    - name: "https"
+      port: 443
+      targetPort: 443
   selector:
   selector:
     k8s-app: mmmopp
     k8s-app: mmmopp
 ---
 ---
@@ -53,6 +56,7 @@ spec:
               name: mmmjihuitest2-pvc1
               name: mmmjihuitest2-pvc1
           ports:
           ports:
             - containerPort: 8080
             - containerPort: 8080
+            - containerPort: 443
           env:
           env:
             - name: MYSQL_HOST
             - name: MYSQL_HOST
               valueFrom:
               valueFrom:

@@ -87,11 +87,11 @@ func main() {
 	beego.InsertFilter("file/opp/*", beego.BeforeStatic, FilterBeforeStatic)
 	beego.InsertFilter("file/opp/*", beego.BeforeStatic, FilterBeforeStatic)
 
 
 	//https
 	//https
-	//beego.BConfig.Listen.EnableHTTPS = true
-	//beego.BConfig.Listen.Graceful = true
-	//beego.BConfig.Listen.HTTPSPort = 8089
-	//beego.BConfig.Listen.HTTPSCertFile = "conf/server.crt"
-	//beego.BConfig.Listen.HTTPSKeyFile = "conf/server.key"
+	beego.BConfig.Listen.EnableHTTPS = true
+	beego.BConfig.Listen.Graceful = true
+	beego.BConfig.Listen.HTTPSPort = 443
+	beego.BConfig.Listen.HTTPSCertFile = "conf/_.fjmaimaimai.com_bundle.crt"
+	beego.BConfig.Listen.HTTPSKeyFile = "conf/_.fjmaimaimai.com.key"
 	contrab.Run()
 	contrab.Run()
 
 
 	beego.Run()
 	beego.Run()

@@ -103,7 +103,7 @@ func (this *DepartmentStatisticsResponse) Less(i, j int) bool {
 		return true
 		return true
 	}
 	}
 	if this.List[i].ACTotal == this.List[j].ACTotal && this.List[i].ChanceApprovedTotal == this.List[j].ChanceApprovedTotal && this.List[i].AchievementTotal == this.List[j].AchievementTotal {
 	if this.List[i].ACTotal == this.List[j].ACTotal && this.List[i].ChanceApprovedTotal == this.List[j].ChanceApprovedTotal && this.List[i].AchievementTotal == this.List[j].AchievementTotal {
-		if this.List[i].Dep.Id > this.List[j].Dep.Id {
+		if this.List[i].Dep.Time > this.List[j].Dep.Time {
 			return true
 			return true
 		}
 		}
 	}
 	}

@@ -1539,7 +1539,7 @@ func ChancePool(header *protocol.RequestHeader, request *protocol.ChancePoolRequ
 		log.Error(err)
 		log.Error(err)
 		return
 		return
 	}
 	}
-	rsp = &protocol.ChancePoolResponse{Total: total}
+	rsp = &protocol.ChancePoolResponse{Total: total, List: make([]protocol.CommonListItem, 0)}
 	for i := 0; i < len(myChances); i++ {
 	for i := 0; i < len(myChances); i++ {
 		chance := myChances[i]
 		chance := myChances[i]
 		if provider, err = agg.GetUserBaseInfo(chance.Uid, header.CompanyId); err != nil {
 		if provider, err = agg.GetUserBaseInfo(chance.Uid, header.CompanyId); err != nil {