Jelajahi Sumber

!661 修改docker数据库默认配置
Merge pull request !661 from 逐浪人/next

zuohuaijun 3 tahun lalu
induk
melakukan
a43c909edc

+ 8 - 3
docker/app/Configuration/App.json

@@ -1,5 +1,5 @@
 {
-    "$schema": "https://gitee.com/dotnetchina/Furion/raw/net6/schemas/v3/furion-schema.json",
+    "$schema": "https://gitee.com/dotnetchina/Furion/raw/v4/schemas/v4/furion-schema.json",
 
     "Urls": "http://*:5050", // 配置默认端口
     //"https_port": 44326,
@@ -10,10 +10,10 @@
         "InjectSpecificationDocument": true // 生产环境是否开启Swagger
     },
     "DynamicApiControllerSettings": {
-        "DefaultRoutePrefix": "api", // 默认路由前缀
+        //"DefaultRoutePrefix": "api", // 默认路由前缀
         "CamelCaseSeparator": "", // 骆驼(驼峰)/帕斯卡命名分隔符
         "LowercaseRoute": false, // 小写路由格式
-        "AsLowerCamelCase": true, // 启用小驼峰命名(首字母小写)
+        "AsLowerCamelCase": true // 启用小驼峰命名(首字母小写)
         //"KeepVerb": false // 保留动作谓词
         //"KeepName": true // 保留默认名称
     },
@@ -30,6 +30,11 @@
         "WithExposedHeaders": [ "Content-Disposition", "X-Pagination", "access-token", "x-access-token" ], // 如果前端不代理且是axios请求
         "SignalRSupport": true // 启用 SignalR 跨域支持
     },
+    "SnowId": {
+        "WorkerId": 1, // 机器码 全局唯一
+        "WorkerIdBitLength": 1, // 机器码位长 默认值6,取值范围 [1, 19]
+        "SeqBitLength": 6 // 序列数位长 默认值6,取值范围 [3, 21](建议不小于4)
+    },
     "Cryptogram": {
         "CryptoType": "SM2", // 密码加密算法 MD5、SM2(国密)
         "PublicKey": "04F6E0C3345AE42B51E06BF50B98834988D54EBC7460FE135A48171BC0629EAE205EEDE253A530608178A98F1E19BB737302813BA39ED3FA3C51639D7A20C7391A", // 公钥

+ 2 - 0
docker/app/Configuration/Database.json

@@ -8,6 +8,7 @@
                 "DbType": "MySql", // MySql、SqlServer、Sqlite、Oracle、PostgreSQL、Dm、Kdbndp、Oscar、MySqlConnector、Access、OpenGauss、QuestDB、HG、ClickHouse、GBase、Odbc、Custom
                 "ConnectionString": "server=mysql;Database=admin;Uid=root;Pwd=root;",
                 "EnableInitDb": true, // 启用库表初始化
+				"EnableInitSeed": true, // 启用种子初始化
                 "EnableDiffLog": false, // 启用库表差异日志
                 "EnableUnderLine": true // 启用驼峰转下划线
             },
@@ -16,6 +17,7 @@
                 "DbType": "MySql",
                 "ConnectionString": "server=mysql;Database=test;Uid=root;Pwd=root;",
                 "EnableInitDb": true, // 启用库表初始化
+				"EnableInitSeed": true, // 启用种子初始化
                 "EnableDiffLog": false, // 启用库表差异日志
                 "EnableUnderLine": true // 启用驼峰转下划线
             }

+ 2 - 2
docker/nginx/conf/nginx.conf

@@ -25,8 +25,8 @@ http {
         listen       80;
         server_name  localhost;
         charset utf-8;
-		ssl_certificate      /etc/nginx/key/server.pem;
-        ssl_certificate_key  /etc/nginx/key/server.key;
+		ssl_certificate      /etc/nginx/key/abc.admin.com.pem;
+        ssl_certificate_key  /etc/nginx/key/abc.admin.com.key;
         ssl_session_cache    shared:SSL:1m;
         location / {
             root   /usr/share/nginx/html;

+ 23 - 0
docker/nginx/key/abc.admin.com.crt

@@ -0,0 +1,23 @@
+-----BEGIN CERTIFICATE-----
+MIID6TCCAtGgAwIBAgIUaMxuYItti+c4Rj+p/bT43EdG6mcwDQYJKoZIhvcNAQEL
+BQAwZzELMAkGA1UEBhMCVVMxDTALBgNVBAgMBFV0YWgxDTALBgNVBAcMBExlaGkx
+GTAXBgNVBAoMEEFCQyBDb21wYW55LEluYy4xCzAJBgNVBAsMAklUMRIwEAYDVQQD
+DAlhZG1pbi5jb20wHhcNMjMwMzI4MDg0NDA0WhcNMzYxMjA0MDg0NDA0WjBrMQsw
+CQYDVQQGEwJVUzENMAsGA1UECAwEVXRhaDENMAsGA1UEBwwETGVoaTEZMBcGA1UE
+CgwQQUJDIENvbXBhbnksSW5jLjELMAkGA1UECwwCSVQxFjAUBgNVBAMMDWFiYy5h
+ZG1pbi5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCn0L97ITGf
+i2KFMBm8lzz9VGfZ0iKMi0ijHH5pVOPqsgA19phQ0DZ6G4Wy1EbdF3wnWZdDEYke
+nqxHVykzulFN9W3Tc5Ao67zBZLcBc8Oe9zo88nh/J03ds8nyPhY3zTptAGKsEeoS
+Ko0LY7m1Ozf2npLa2E+NH815/+WzMoM3jvi3iCXWJ4bvvhjNPDp+oqY+6wzcU9SM
+T+zMvRPoVmVvevVhzSpfH2dhZG44mBcTdkaxnvxuEJm8uAfAA1vFCyM/2n3gDUGO
+IxQSv6nNKgVnIqsa9/gWOjR3EoOejw6a+Hlx9hFL9Tv4hsJ0o2AKsjGl5WchNvIt
+ONQgeeHAGUMzAgMBAAGjgYgwgYUwQwYDVR0RBDwwOocEfwAAAYcEwKgBAYcEwKgA
+/IINYWJjLmFkbWluLmNvbYIMbXguYWRtaW4uY29tgglsb2NhbGhvc3QwHQYDVR0O
+BBYEFB0HsgY6EF2yi6+Czg6xUn/25NmzMB8GA1UdIwQYMBaAFJFdp03B0hlqnbc+
+Ko98wa7Wj7EpMA0GCSqGSIb3DQEBCwUAA4IBAQAFAvdmaSGZtyGwbeZtft9R7BHP
+dxYDgCYvKZJ0BNtE06E5V6m8b8GilVPLGvDwWftXWPMX5Vq2WSq22fPVqG0pdmPR
+bit80G7rlauY5Ub/ws785F9ZoTPM71kO55eHHAFaKqGT7UMGairyk8Je8fYV4SZ/
+YCseDOidSN47Rq1ZRbbc3og5zTtFwrfWuv8uP0acgUayT1cAVg/D3SOmljIp3X+S
+5i+OQQK96AC6RbFczL8ErCJwhS0CAwHc1Q3EBTliOBXMeMy/B965DtwQl5rMwCHk
+HIFTMIj4006O3tEksR/33DThqENnxj6bKL3Pt0Mu5XkRKVl6k1vf2IgYM29L
+-----END CERTIFICATE-----

+ 17 - 0
docker/nginx/key/abc.admin.com.csr

@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICsDCCAZgCAQAwazELMAkGA1UEBhMCVVMxDTALBgNVBAgMBFV0YWgxDTALBgNV
+BAcMBExlaGkxGTAXBgNVBAoMEEFCQyBDb21wYW55LEluYy4xCzAJBgNVBAsMAklU
+MRYwFAYDVQQDDA1hYmMuYWRtaW4uY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAp9C/eyExn4tihTAZvJc8/VRn2dIijItIoxx+aVTj6rIANfaYUNA2
+ehuFstRG3Rd8J1mXQxGJHp6sR1cpM7pRTfVt03OQKOu8wWS3AXPDnvc6PPJ4fydN
+3bPJ8j4WN806bQBirBHqEiqNC2O5tTs39p6S2thPjR/Nef/lszKDN474t4gl1ieG
+774YzTw6fqKmPusM3FPUjE/szL0T6FZlb3r1Yc0qXx9nYWRuOJgXE3ZGsZ78bhCZ
+vLgHwANbxQsjP9p94A1BjiMUEr+pzSoFZyKrGvf4Fjo0dxKDno8Omvh5cfYRS/U7
++IbCdKNgCrIxpeVnITbyLTjUIHnhwBlDMwIDAQABoAAwDQYJKoZIhvcNAQELBQAD
+ggEBACLBJSKDMGJd97ruygNmlzboOi+1dTbxvYM9dkB5EEbz9ixif5M81fE+/oMk
+IbuBiqiKATjBlwXnU5nTBK+llw9r+Ro2pa4pSjEcpfD1cZS9r/ap1EAOxy++x215
+Jt87U2/xFMnYdsmSZgb+LtkaVJyiaK1tW/dbPbqhu0/wWaB394XxnfkJre4u207o
+TRMHLaVzU1t8OJ/aFkisoiWKhAQ32DK1gulLUoujBeFmN7HSQpXmIueV9T1nfHFU
+2XMYNQ4o1w35rt4n2oAguUlqZ6w8z90xfBbxI3V0QP4ejw5Z4hIRLajDano5GymP
+jcTrbtN5b1dUt52DZ73jXaVXdU0=
+-----END CERTIFICATE REQUEST-----

+ 28 - 0
docker/nginx/key/abc.admin.com.key

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCn0L97ITGfi2KF
+MBm8lzz9VGfZ0iKMi0ijHH5pVOPqsgA19phQ0DZ6G4Wy1EbdF3wnWZdDEYkenqxH
+VykzulFN9W3Tc5Ao67zBZLcBc8Oe9zo88nh/J03ds8nyPhY3zTptAGKsEeoSKo0L
+Y7m1Ozf2npLa2E+NH815/+WzMoM3jvi3iCXWJ4bvvhjNPDp+oqY+6wzcU9SMT+zM
+vRPoVmVvevVhzSpfH2dhZG44mBcTdkaxnvxuEJm8uAfAA1vFCyM/2n3gDUGOIxQS
+v6nNKgVnIqsa9/gWOjR3EoOejw6a+Hlx9hFL9Tv4hsJ0o2AKsjGl5WchNvItONQg
+eeHAGUMzAgMBAAECggEAO7Rok7GVGpq4FAOvfGngYI7pndUFxrP9RU7raKUzq3nl
+2k0gFsxlPV9SW3PrvFhRKxzUVJ/GBZdVWtJXTdiReaeCifL5DJ4GW1XuSD18ETAL
+T8jCdxawPNrs09skA3loOoSjFm4PNaRe5vj1htWJTRxQyjygXOi+LZQOEIm9poOL
+UZwlDUDco4K46lrW1znwym6idpEkZ0tYh5c9Szf0KOwmrP6cp63bqRK3Yr7pt7ry
+ooKDzhxe/kvdOOlz1RrI+NWiJxYwcG+LEIVWRggqQmC4Aw2EgqOSsqmKLlBaZruA
+LcmmS7ZBQQx93NAB6BBLC5W5yCq2K5FnF/C6oJvimQKBgQDKZAIsi+SLfshqLxwB
+tCx6xE4/94hhbBmKKDMgsREQLUHwxL31V9WO92dl9n7DSe/TFIrEnjhNZcOH7SSM
+rsszYbRkmngxeU25xZQIqY8/cSzzobmdWAQ9HMZkcyqJlPxjFervW0HKvAJf1Yxk
+B0I1ZZWGXRGVe+IZi0JKyu1iiwKBgQDURDaJUuRyGLK/T5lIkq2Mq2fSFxnXs+5t
+uLoYhMmt8LQAi0fae+wEggHQcInOPmo/RR8sBMkQLpXoEdGLDuilEzuaFxCDq6xj
+h2UenM5pVUFdmWKikXVDkwOZcVBz1vpLDqhNEZKTdhAMjQ1Y/yt2SFRXshiRQ6d/
+JHSn9Jx++QKBgCUhGcEAXQo2VSAdyl6JpktTbiOQDsYIpdrRqyeJNF8qXlmETnEP
+Dw+uVZrAENtU2hl4QEj32c5hJ/Ds0XK5sm+XshduuzQgU+EL3S+Fo9D4u01q0vmJ
+pyVq/P56nkglO/QVlkcZD8XYnfrk21+ScVQIcdj3g/1Pf9g90wiTl98nAoGAfCcZ
+ruBo9cM0aWlpQmVoVOq8YslYOC3puwtc7ZJdU/uBjP/qGwR4W3qfDQeF0rf29OK9
+BMYXw/s7eu1RHoCt2j+RkOMEqb7zqZM7tdgJctqGzPQ2GNfzOn72j/0TDW4kH1qH
+Xex1SwK3CGBH+lHlXd2YV2K3s99aTKdKBCKyliECgYAIzxFHKtE5rR4s6jjCvkVR
+chCdB4+ZOhcq6kxFQZfL3wEHGPNACgV8SxaYKxvMC901tfnwF8mYFjNOKHvCv51v
+zGU1MZeRNqvylA1qEBk2YC8EYW++8vxtPZi3sqt5XWPuPAsiM+wq0CTEsnRbnMBz
+1CN0ZpoW8SJlP1I/0+D1UQ==
+-----END PRIVATE KEY-----

+ 20 - 0
docker/nginx/key/abc.admin.com.pem

@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDWzCCAkMCFGGtfh5AXKkyuDGfnTa1i/qhdKxrMA0GCSqGSIb3DQEBCwUAMGcx
+CzAJBgNVBAYTAlVTMQ0wCwYDVQQIDARVdGFoMQ0wCwYDVQQHDARMZWhpMRkwFwYD
+VQQKDBBBQkMgQ29tcGFueSxJbmMuMQswCQYDVQQLDAJJVDESMBAGA1UEAwwJYWRt
+aW4uY29tMCAXDTIzMDMyODA4NDQwNFoYDzIxMjMwMzA0MDg0NDA0WjBrMQswCQYD
+VQQGEwJVUzENMAsGA1UECAwEVXRhaDENMAsGA1UEBwwETGVoaTEZMBcGA1UECgwQ
+QUJDIENvbXBhbnksSW5jLjELMAkGA1UECwwCSVQxFjAUBgNVBAMMDWFiYy5hZG1p
+bi5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCn0L97ITGfi2KF
+MBm8lzz9VGfZ0iKMi0ijHH5pVOPqsgA19phQ0DZ6G4Wy1EbdF3wnWZdDEYkenqxH
+VykzulFN9W3Tc5Ao67zBZLcBc8Oe9zo88nh/J03ds8nyPhY3zTptAGKsEeoSKo0L
+Y7m1Ozf2npLa2E+NH815/+WzMoM3jvi3iCXWJ4bvvhjNPDp+oqY+6wzcU9SMT+zM
+vRPoVmVvevVhzSpfH2dhZG44mBcTdkaxnvxuEJm8uAfAA1vFCyM/2n3gDUGOIxQS
+v6nNKgVnIqsa9/gWOjR3EoOejw6a+Hlx9hFL9Tv4hsJ0o2AKsjGl5WchNvItONQg
+eeHAGUMzAgMBAAEwDQYJKoZIhvcNAQELBQADggEBADvGF9b/ih7+ru3U9+YBN1SI
+h5MMK9WI5IZBQfeyY5aD1UmMb68e0SjnfFhDhpl0U1xUNkqINq/8+JAAwUkOm2B1
+nb/2uySOvONO8WnGvWlYPHPycnlAOwQNAlArE+F8TC6aKdlcB63NByacxnUt9Gcz
+92N2PJJr3QU0uKF5xDnWgDKCPStH8cCRn/PufSngljuevxou45roKXNRAV6sAGJ7
+wybuZVZ9RxjaLB5CKuLoO42CxJFzZyhUG7ixpWLsoC62P7bOK6IVo8G77wn185qX
+gskY2bwNisuMYD+k2SoTiLmaqUh4n+j+BJaHyQc4vFRZ475+y6hC0NRU0cNxMlc=
+-----END CERTIFICATE-----

+ 22 - 0
docker/nginx/key/admin.com.crt

@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDrzCCApegAwIBAgIUNv3hC7V8ueWe5ztnEpC5drzUE70wDQYJKoZIhvcNAQEL
+BQAwZzELMAkGA1UEBhMCVVMxDTALBgNVBAgMBFV0YWgxDTALBgNVBAcMBExlaGkx
+GTAXBgNVBAoMEEFCQyBDb21wYW55LEluYy4xCzAJBgNVBAsMAklUMRIwEAYDVQQD
+DAlhZG1pbi5jb20wHhcNMjMwMzI4MDg0NDA0WhcNMzYxMjA0MDg0NDA0WjBnMQsw
+CQYDVQQGEwJVUzENMAsGA1UECAwEVXRhaDENMAsGA1UEBwwETGVoaTEZMBcGA1UE
+CgwQQUJDIENvbXBhbnksSW5jLjELMAkGA1UECwwCSVQxEjAQBgNVBAMMCWFkbWlu
+LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALcCIGMfuoXia4zK
+Zp6JFiqjz9MFWsepJjVF3IkrvJuMB8dfGoVEaB82frVoEzFFMyfnD+vM1yib0oj+
+gj3z5cxLeo5zuoy6KGaPfOMLyMgCiNGgLCbEvQ/yNtDZx26qAGw10S51EeOQFzg3
+wW4ysouh8RyT+ljkmMeB4ym7GuMDh00mI/ecHOK/Prl7hkBPk+dpc7/A+EUvmqNf
+IcgbZiw49NqbWGsFCAAYCWRVUhOU36GJTSX1pojTsKUwyifHgSGE7BQRBddQTaAz
+j2VnoJhMcj4/Lk7xxoRi2m/xQEHMnfYprhyajUCe38/zK81Wuh10K8QT2deaP8Qb
+uwVbWR8CAwEAAaNTMFEwHQYDVR0OBBYEFJFdp03B0hlqnbc+Ko98wa7Wj7EpMB8G
+A1UdIwQYMBaAFJFdp03B0hlqnbc+Ko98wa7Wj7EpMA8GA1UdEwEB/wQFMAMBAf8w
+DQYJKoZIhvcNAQELBQADggEBAGzMI5EIQ5VICdxFTBz+9DhDcRt44pBmwGbVEo3L
+a2ndjRA2Mz0eUcsTWtzy8ZEjBQdFyCo63xj96yHAhUR6yUJo4lUVMvfi3SswW/AO
+aataw55ya7yK7yR8PHw3Bxh69OmEXzQJWV0r8vMBrm7Bwn1AEcyLj/m5mnZA6Rjt
+2CdLtWMPF26mVrRBRw8uLLm4f1/WO38XRPPiR7pc1ZhcrXUZfzZ/nLx/a3w4D66G
+FCWVdyfvBAK7ajoO9htZufVdPgO1xr1zmQlbEZ5/Wri3HufohnnbjLQr8Gu/eL+d
+qvUpj3mgAX+2jg+voviSlZWb1r1QSTTWvUPiKgcLbAH6cZY=
+-----END CERTIFICATE-----

+ 28 - 0
docker/nginx/key/admin.com.key

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC3AiBjH7qF4muM
+ymaeiRYqo8/TBVrHqSY1RdyJK7ybjAfHXxqFRGgfNn61aBMxRTMn5w/rzNcom9KI
+/oI98+XMS3qOc7qMuihmj3zjC8jIAojRoCwmxL0P8jbQ2cduqgBsNdEudRHjkBc4
+N8FuMrKLofEck/pY5JjHgeMpuxrjA4dNJiP3nBzivz65e4ZAT5PnaXO/wPhFL5qj
+XyHIG2YsOPTam1hrBQgAGAlkVVITlN+hiU0l9aaI07ClMMonx4EhhOwUEQXXUE2g
+M49lZ6CYTHI+Py5O8caEYtpv8UBBzJ32Ka4cmo1Ant/P8yvNVroddCvEE9nXmj/E
+G7sFW1kfAgMBAAECggEAFcXN/p0Gvuj6LKzj2paqqXYFwrBPZZOtNQdTvooSjVry
+jfi1mgdSb+w21PRF3EXEWUn3LfGX43/uY1gMPLyoqU6NjScdmaKILfOCQyzivVD3
+4CCzQAWGDMCfXueZ/4OAO1+HvIQ3FaDN8mVHwQmNDmm82s6MKUlBF/NPCGb3Quyz
+Uad7o/SiZowUjHaBZA3homssP508+zWHfZSD59eMoIpAWUFT4BLnhZGLCzryUK1J
+R+lw+hWJjE2cqdVsC8gULW0vrgASGE46c/ZBwprjA8pWUR05OWQHV+ukLcn68yby
+q+hCN27wAvOfxS86TjAcpmXAWR515dBcbpKKDkQKcQKBgQC3HvzrKvaZSe4H0ESA
+cIMudgv6zjZveSrCW1brr1Xxp43cs9yFJEDmobhd4zOQlqcbNZjBOeOGQEsk3OYQ
+5Z4qzDQDA90Do9aRl0lttQuZZlfgRwrHyGfwBJXwuWUXdTk8td0Tz7aD1IhDJgez
+JTdrpOq8reQQKTrtW4og2qXkSQKBgQD/16b2j4CQqJgdUO7cOgEzwaYDA4zxyFuR
+KURpTgMAe6SpprTwMHJjnEMVwokpjHBpZtOoNQJYbuj6YfK8G7WzRG2JlBG6SL2k
+MRQ7mUoUsz2e0khRsGza3iFsFFBQKWX6ObwiAoTF9Ckr/Jf+ToovCGYD7G3f7tkf
+8jTLjeUCJwKBgQCjT3iCBlPcS0mEIGInJbBoLBDtASEc8zOGF82B7WG5XROwQ5uk
+Bbv3szxoRurCxQiMxJTRpl3aadZaLsLjSNRxGKI+GiDuURxXxVNQCskoalRuiQz9
+NSY0sPJDuCOG8x0znoFmXLVKBq3rLKxrQQKW9oH9+RrOquaJrjyWpkiSOQKBgDHD
+9QpI56073jr1n0DfV5SFupEjg6sUWhtmd5Q0RIk3g9QsRU3jXpzZrILzEFMwqj0W
+b11s0kP5bwAlRV4p1bJFQTldwAUIWTszAMiHDM3x/66BIOgi9Umto7quSOEO7HM7
+/8htzP3kfI292KLzDBYSACYLO2QvxbRdHL/rnfxJAoGBAKFJ+XojL5d0uVZ/rrlf
+s0QwWpG8wIlyLqsiB4VOfwhAI+bTQd8D+wY72iDqu86e2QMWmf4lSeYufOBjVyCN
+uIj5o4ILRKhEj33/Q1fCtcB+zE4RQVihtsnCJYYGymDgY2mW4mGCXzBderMMehuL
+/Qina3knHwaK/RPH/xn5UkCG
+-----END PRIVATE KEY-----

+ 22 - 0
docker/nginx/key/admin.com.pem

@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDsTCCApmgAwIBAgIUWwu7jhpXsbRfKhA6SZ+hhCZAEKIwDQYJKoZIhvcNAQEL
+BQAwZzELMAkGA1UEBhMCVVMxDTALBgNVBAgMBFV0YWgxDTALBgNVBAcMBExlaGkx
+GTAXBgNVBAoMEEFCQyBDb21wYW55LEluYy4xCzAJBgNVBAsMAklUMRIwEAYDVQQD
+DAlhZG1pbi5jb20wIBcNMjMwMzI4MDg0NDA0WhgPMjEyMzAzMDQwODQ0MDRaMGcx
+CzAJBgNVBAYTAlVTMQ0wCwYDVQQIDARVdGFoMQ0wCwYDVQQHDARMZWhpMRkwFwYD
+VQQKDBBBQkMgQ29tcGFueSxJbmMuMQswCQYDVQQLDAJJVDESMBAGA1UEAwwJYWRt
+aW4uY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtwIgYx+6heJr
+jMpmnokWKqPP0wVax6kmNUXciSu8m4wHx18ahURoHzZ+tWgTMUUzJ+cP68zXKJvS
+iP6CPfPlzEt6jnO6jLooZo984wvIyAKI0aAsJsS9D/I20NnHbqoAbDXRLnUR45AX
+ODfBbjKyi6HxHJP6WOSYx4HjKbsa4wOHTSYj95wc4r8+uXuGQE+T52lzv8D4RS+a
+o18hyBtmLDj02ptYawUIABgJZFVSE5TfoYlNJfWmiNOwpTDKJ8eBIYTsFBEF11BN
+oDOPZWegmExyPj8uTvHGhGLab/FAQcyd9imuHJqNQJ7fz/MrzVa6HXQrxBPZ15o/
+xBu7BVtZHwIDAQABo1MwUTAdBgNVHQ4EFgQUkV2nTcHSGWqdtz4qj3zBrtaPsSkw
+HwYDVR0jBBgwFoAUkV2nTcHSGWqdtz4qj3zBrtaPsSkwDwYDVR0TAQH/BAUwAwEB
+/zANBgkqhkiG9w0BAQsFAAOCAQEARdXGosx7WvGYQl4hD5ROuiu/iixPera8+tkj
+aFSOlSouhl9MrFocqzlz5vnpgtCgc8d5TKFkhKGXMa/CDC4GOSC0KNzdoAuZagJJ
+0XtthkQ4t3mhEgwdEFyHBYUEVvJFwxQFXlNvPqykeVeqZNRrzpHZCxG5atjtvWWV
+APHACk7IvHWsu84lEvwomUr4oHnjv7DldCZ6e41j6bCjGg+/GiIuCcOKwK2WzhUZ
+aoK4FyWoy1oNfBUI4/tJS4ea95n4UehQ9OklwL8yRh+w6LwyJFEhCQsSR+k+95/9
+8OPgmo0bFBDHknGXTQp/inFGTgghrOoQtSayLonWbWe+rg906w==
+-----END CERTIFICATE-----

+ 0 - 28
docker/nginx/key/rootCA.key

@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEuwIBADANBgkqhkiG9w0BAQEFAASCBKUwggShAgEAAoIBAQC/fby+rsUFyQrH
-AFsD1rVmEMwJFZTaLfI1LqFmu9PQeVchHrULBs49NHZHsmZM1DRVGa/F/29HGZlh
-0rvzFZ9ufcWaKZzOuTw7nVSwtNqqaMmttBcdL7aSEH2TyKUNLTQir/NUEm4SI28Z
-q7jR0MnhtGMdht9UBPWTC1jdKRhZ5CvGZMKIFrXuYs9YNkNn63pSwaFXjcUEoots
-cX6i0uNXc20MqRiHkJKm/zdNwO5CVUTKs+T+09IabToc1pNQqAzsPNByn/IETfZQ
-GrwAW82tZFzq89ByzItioxkdzch7jYbXcru7cnbkFCt9lSDUPWqBxf/D6uDASFN+
-11w1vuF7AgMBAAECgf9T03Ldn+h9n9nTqf7YaxQw3jqVezJp6dU/tvbOm9D7YO+h
-Oq3kFMFE1pBGBcGPegA7hPIG/zEdu5+cmYGLPXR8cnBBYY+YqvV/8BtWDF41TBBS
-tcesy/H9/vXG3f2nC0Tpg/qJjt0o8WsXnownb0/f02zlbwMhb06Z7ghfDJ5YEAw+
-LrgMbqVbEKpUHNvlSTjTbvHLyOgvTQLMMLHK/K2Pqh77JbQ8uY9LxkPJaBTGY/nP
-Wwk7BY9OXlqwWLEg3XZDurUmMoJM3YY9Vn6SiGsaaE3oXF0S/aVCn3UE3z4WQs3o
-1HR0LQYNyeKesGn4LzbLfBi7nOjD2gw7m5f+kNECgYEA7Xtwmm/iYGBIuqQ6kVuV
-7TY8smQcjQmEt/vMz7RxehKzXPV9lLWefEREPRO5vUxxkgqyfLf83Qo0scDTXE7f
-9DS9WBr93b/p4mNGLOzTYrMsqi0b9JeK5qkUdo10ySKukQjkIoWGt84TMcpjGzkp
-6QQ4VcqHGMyDzq0yjkYTKPMCgYEAzmw8bezC0Hsd1wo6xayrU5g0cHuZVx4gHsBJ
-3DMuiV4paYh4YSIi+sYFiXfY5GaSo9MLz2irHqax7CF0kBQAnkimhRuLGknHnpL9
-OATZwxI4cUxj9JmSPHEQHke2+ORv4mGXXEFsti9ohQa1hgFERsDx0Hagct9MLh/y
-Qm7tB1kCgYEA3u3+sWsQNeqMu3BJboRsBGbiqY+i4Z6q0M913xEDaVW+vCfTQFMR
-uJOY/0DSHmpxPmf+T2ej3pejCa36e2+reiI8EEYeRBjQ5GzOxoN2l/OcnQ+Fa6EK
-iib0h6mYlOuStaGEDwgLg+XWTOoxCLArsIr+m0JoeZYasVwS1k3f1JMCgYBGVuOQ
-oakQ2aMlb7rvORN4fNkBq1xpLz7Ku8NvYZFuBcQezf4XO0aoJWolmc0ypzE42eWg
-W45T94GRcSUDI43CYgc8PFJ+Nr3q7zOSLzT1H/RTxzAYXWxTZEOVzeIvlcf6YD7v
-lOuyeR0ol0yrySq24XCFFKc//Y87+G7Y7GugoQKBgEtC3URF/I516wB0SBBdDajQ
-6Bv7t+2HRawoCrAr/ypwhfVpqVK/cR5ic1ZnKF+HWI6DAeXewX+oxqJ1qa8moR9f
-kAHccvmD7gNlT0S6Cu/GWXamQ2EbiqduoBIvZjMXXobQzVNUkWlJZcOuK6VP3OK/
-658W86CTTAkOaptkRKJ3
------END PRIVATE KEY-----

+ 0 - 22
docker/nginx/key/rootCA.pem

@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDtzCCAp+gAwIBAgIULdTDO28ZEBkePNYBqXBRD2Oi/4EwDQYJKoZIhvcNAQEL
-BQAwajELMAkGA1UEBhMCVVMxDTALBgNVBAgMBFV0YWgxDTALBgNVBAcMBExlaGkx
-GzAZBgNVBAoMEllvdXIgQ29tcGFueSwgSW5jLjELMAkGA1UECwwCSVQxEzARBgNV
-BAMMCnJvb3RjYS5jb20wIBcNMjMwMjEzMTIwMTA3WhgPMjEyMzAxMjAxMjAxMDda
-MGoxCzAJBgNVBAYTAlVTMQ0wCwYDVQQIDARVdGFoMQ0wCwYDVQQHDARMZWhpMRsw
-GQYDVQQKDBJZb3VyIENvbXBhbnksIEluYy4xCzAJBgNVBAsMAklUMRMwEQYDVQQD
-DApyb290Y2EuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv328
-vq7FBckKxwBbA9a1ZhDMCRWU2i3yNS6hZrvT0HlXIR61CwbOPTR2R7JmTNQ0VRmv
-xf9vRxmZYdK78xWfbn3Fmimczrk8O51UsLTaqmjJrbQXHS+2khB9k8ilDS00Iq/z
-VBJuEiNvGau40dDJ4bRjHYbfVAT1kwtY3SkYWeQrxmTCiBa17mLPWDZDZ+t6UsGh
-V43FBKKLbHF+otLjV3NtDKkYh5CSpv83TcDuQlVEyrPk/tPSGm06HNaTUKgM7DzQ
-cp/yBE32UBq8AFvNrWRc6vPQcsyLYqMZHc3Ie42G13K7u3J25BQrfZUg1D1qgcX/
-w+rgwEhTftdcNb7hewIDAQABo1MwUTAdBgNVHQ4EFgQUdiQRjsHS0UtFL2GvbO4w
-LdGsBuYwHwYDVR0jBBgwFoAUdiQRjsHS0UtFL2GvbO4wLdGsBuYwDwYDVR0TAQH/
-BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAe7m0BcWvIn1XBVcZMnpl3sUbv95d
-PMgP6i6A9Uz10ctqG6ArolkQyhDIDSZC1jTj+X1vqi7WZHCAF1VLXiboXQ7SuOid
-UTfK2SeqqJczZ1HeHvGc0zP692k5hKH/8orTnkGuhirEclKATxzQLq8ted352ntM
-Swf9xDUAauWRDmiVA3FJFsCQ2AkWSxpqgzs3y3Ti2wj3hVkOdVmAqDfMYj6nlh0O
-NP+lci8KGboeC879h1wtB+aob4ro7ysnIaq19PrvYMUUeIEWy6F8plfhp5WSCfR9
-aQ61VG/pSH/hKlJ0Tt9goBzbXOrQqxtNTCxXnyNjy08uOJro5q41GLk6Cw==
------END CERTIFICATE-----

+ 0 - 17
docker/nginx/key/server.csr

@@ -1,17 +0,0 @@
------BEGIN CERTIFICATE REQUEST-----
-MIICrzCCAZcCAQAwajELMAkGA1UEBhMCVVMxDTALBgNVBAgMBFV0YWgxDTALBgNV
-BAcMBExlaGkxGzAZBgNVBAoMEllvdXIgQ29tcGFueSwgSW5jLjELMAkGA1UECwwC
-SVQxEzARBgNVBAMMCnRlc3QtcmVkaXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCwBqR84rO6u/68nBt3/N0WB15GzG98aYe/7CPZSeZmTx+2y86mX+G3
-V/ZHr3JqnyZ9M+OC5qfyAzSKCB9GMpmfXYuPefu/QHt/HlDFon3kFT9q9bQqpudC
-i5EElc+XEf0RKtt9buG+bU75gBP0XaJQ/v0GDEFG8VWssCVSh/zRieQPHynNUJrZ
-fF0hEOEwkrvSBgz412WzAMo5jslSTEW2WNYUrsw986IutWCP9REU8L0jQiU53jp7
-QHLIo55jJaCjrpaL6Zb55LIA8G8DxgX5zMRBpiE3S8iXup4pp8KQMj5O/8iZb47Y
-+FD8c4VpapNvUXiohVZ2JfNG++lzfoU5AgMBAAGgADANBgkqhkiG9w0BAQsFAAOC
-AQEAmIot1a3AwFUIDy/lYoArLHmIgD24XHTApOuQgIvIp2SNMCZXJ++nVRAuWc8s
-Dwvm8XzHIIY+Dnux0WF61wEKILWdCzkO7X5+DSnVHEJsJmrh69ZlolnDIQ6WWwFn
-HpaatvVM3DoPo0mLQzNsywDdp3XEhSF9WQtXyLrEsxnfwKxjalePT+IucuD7y/xQ
-p+zcodaXId1f9QBfWJK7OJGlgNZA29hhhsfzLi4IDAmu7gz3z4VmK47eSL4QrZPP
-EEyMKGf66bFLnuqeiqIvZMfUW/ZAEeA7bvL3GytEjThX0QxrXiipCJNlTSeGiQVw
-3vMLoVS3B77gk1Q+bFrIea39DA==
------END CERTIFICATE REQUEST-----

+ 0 - 28
docker/nginx/key/server.key

@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCwBqR84rO6u/68
-nBt3/N0WB15GzG98aYe/7CPZSeZmTx+2y86mX+G3V/ZHr3JqnyZ9M+OC5qfyAzSK
-CB9GMpmfXYuPefu/QHt/HlDFon3kFT9q9bQqpudCi5EElc+XEf0RKtt9buG+bU75
-gBP0XaJQ/v0GDEFG8VWssCVSh/zRieQPHynNUJrZfF0hEOEwkrvSBgz412WzAMo5
-jslSTEW2WNYUrsw986IutWCP9REU8L0jQiU53jp7QHLIo55jJaCjrpaL6Zb55LIA
-8G8DxgX5zMRBpiE3S8iXup4pp8KQMj5O/8iZb47Y+FD8c4VpapNvUXiohVZ2JfNG
-++lzfoU5AgMBAAECggEALWNBFYyVAFDKMdLkyE8UqMH0nrfHBWLmpGecpMIH3RiI
-2mb53W96sX5GXBySmYh48a6n+tBDvMTzzqWifsS8VNnXiwLOlXVogpIMDLHF2UJb
-TFaXgqnvlnqLRY3lbZQvVzZgSxsErUfdJbtPKeLc4BqnnmAZktPWngT7UqkK2PJS
-ICsM2zKekXlmZM5BsiTE9wpr8sf+il3tZ6Qjbc4zNNZT2A0/o4M1yicRRyvIRafv
-qSn2YwVN0OWTHJl9Og32NDIWxVMTBmodz1ozkKoEsNirO35+EyYfgk3V10nrKDFG
-GNmMQ+Bm5x4rcpGjxZLRi3bR7Vhu7zIOjqT3tGN+WwKBgQDdc8T5ldJcVVnu1Qc6
-aDh0q7ZLUVL6WNHVltSuIdc4Ti9bKB9GaT0fTD8tOZA7AEEcIPS/bDrEuXQNlafK
-vJ4SOA+j3fZHO5/QVQ11oikU4grn1lLtL5AXziuni2j07K+eWAMyQji3ZTqeZ0BF
-az1g0hp9eHRd3tbGGfgiW8GE4wKBgQDLfKovCAfk4GD/1T4NhNkXQhMF78e5AnJn
-VGtzOup1hQsp6kd+H6DdrxHp1F/UjTnFNtiBTpn0z5nfUofQ9foeaW9Zdgd8KyzQ
-QgAnJEerMENqmau6G1F0MuyLuRX98MPYfhAe2hgGFM6WibNY2X+w+E1EdliMETkj
-VVWMVqSEMwKBgQC7waUW65UAXgky+oD3X1fGa7PSZfARe+7kxc4qmVyNS5TRF9J0
-c1O0ToQeBvknXQ7XF4YLKmslUgt4XRN3S7ZFwixYhh+Bw6a7DvGrc8KbBw+yAsAq
-gzILTO0sT4G8b1RyzzJekVDfBT/O/8G5WbQfe+Ojz9XxpLa6HViJYPxRewKBgGzW
-+3g4hXBoi7mLZ6t3eV61WtN8E4njwyl9wBNcWfgN95Ct3Rua80Jf1+cIT1GzUEkq
-MtfHIRYOzLDkxfyA9Q27O3HQbeR+e3PROZ+2CheIsyabl3zuC71pV5jMoPS5CSgN
-FbZK1Tq7elyOvr0xaNlRlpKd8nLI65T4mc98sHZ9AoGAP1dNd7HTtujB1asu9BhB
-glmArau0+VK6wj2Z4fkRNQRfUK9aTShh3ncC36Yz/42yhsq4j/DXyFUHmYZSllc+
-aB6O87bu8U1Fl07RsojPl/rr9uUlaRFvl01lDb5ZkFblroJE6fBHs7btMXV5LMRw
-pNnhs3GZTdUSq2QBwnpBJ18=
------END PRIVATE KEY-----

+ 0 - 21
docker/nginx/key/server.pem

@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDXTCCAkUCFBLO6MbB0GilC6mLepE/DhA/mvLKMA0GCSqGSIb3DQEBCwUAMGox
-CzAJBgNVBAYTAlVTMQ0wCwYDVQQIDARVdGFoMQ0wCwYDVQQHDARMZWhpMRswGQYD
-VQQKDBJZb3VyIENvbXBhbnksIEluYy4xCzAJBgNVBAsMAklUMRMwEQYDVQQDDApy
-b290Y2EuY29tMCAXDTIzMDIxMzEyMDEwN1oYDzIxMjMwMTIwMTIwMTA3WjBqMQsw
-CQYDVQQGEwJVUzENMAsGA1UECAwEVXRhaDENMAsGA1UEBwwETGVoaTEbMBkGA1UE
-CgwSWW91ciBDb21wYW55LCBJbmMuMQswCQYDVQQLDAJJVDETMBEGA1UEAwwKdGVz
-dC1yZWRpczCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALAGpHzis7q7
-/rycG3f83RYHXkbMb3xph7/sI9lJ5mZPH7bLzqZf4bdX9kevcmqfJn0z44Lmp/ID
-NIoIH0YymZ9di495+79Ae38eUMWifeQVP2r1tCqm50KLkQSVz5cR/REq231u4b5t
-TvmAE/RdolD+/QYMQUbxVaywJVKH/NGJ5A8fKc1Qmtl8XSEQ4TCSu9IGDPjXZbMA
-yjmOyVJMRbZY1hSuzD3zoi61YI/1ERTwvSNCJTneOntAcsijnmMloKOulovplvnk
-sgDwbwPGBfnMxEGmITdLyJe6nimnwpAyPk7/yJlvjtj4UPxzhWlqk29ReKiFVnYl
-80b76XN+hTkCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAvx/cdvUwYsJdxiEOnk4H
-bD8QMcqIuNmHuMimC6Wlz/NMOboV7W6jZqyrCnAg1LV35bhYmhBftbeldnblJcBV
-VLkKVz8RQNEScjzpRcX3QcPciYSSOBfjrlDOT8EM9xzk8SlbyN/tylQSAjXiB6Jc
-PlBulIKxbPRRaaRWYpkyVSJFItHItDeh/HcNK19ouZhgHoG0puFoLqkp5hK1M6Ht
-zhCHCrruU5XJwZtDxWSNO96N0gtRd7dH6uI/Ifm2c5Jfg2Cz4vUduN2Y4FGLUafM
-HhPrz9y5S4xRK8qSKhDiobIBLtCibBDvg2RR/O89lPqzgEFD//iX3tvEFncDLZCV
-bw==
------END CERTIFICATE-----

+ 12 - 5
docker/nginx/key/ssl.sh

@@ -1,6 +1,13 @@
-openssl genrsa -out rootCA.key 2048
-openssl req -x509 -new -nodes -key rootCA.key -sha256 -days 36500 -out rootCA.pem -subj "/C=US/ST=Utah/L=Lehi/O=Your Company, Inc./OU=IT/CN=rootca.com"
-openssl genrsa -out server.key 2048
-openssl req -new -key server.key -out server.csr -subj "/C=US/ST=Utah/L=Lehi/O=Your Company, Inc./OU=IT/CN=test-redis"
-openssl x509 -req -in server.csr -CA rootCA.pem -CAkey rootCA.key -CAcreateserial -out server.pem -days 36500 -sha256
+# 生成根证书
+openssl genrsa -out admin.com.key 2048
+openssl req -x509 -new -nodes -key  admin.com.key -subj "/C=US/ST=Utah/L=Lehi/O=ABC Company,Inc./OU=IT/CN=admin.com" -days 5000 -out admin.com.crt
+# 生成服务证书请求
+openssl genrsa -out abc.admin.com.key 2048
+openssl req -new -key abc.admin.com.key -subj "/C=US/ST=Utah/L=Lehi/O=ABC Company,Inc./OU=IT/CN=abc.admin.com" -out abc.admin.com.csr
+# 用根证书签发服务器证书
+openssl x509 -req -in abc.admin.com.csr -CA admin.com.crt -CAkey admin.com.key -CAcreateserial -out abc.admin.com.crt -days 5000 -extfile <(printf "subjectAltName=IP:127.0.0.1,IP:192.168.1.1,IP:192.168.0.252,DNS:abc.admin.com,DNS:mx.admin.com,DNS:localhost")
+# extfile可选,可以为服务器证书关联多个IP或者域名
+
+openssl req -x509 -new -nodes -key admin.com.key -sha256 -days 36500 -out admin.com.pem -subj "/C=US/ST=Utah/L=Lehi/O=ABC Company,Inc./OU=IT/CN=admin.com"
+openssl x509 -req -in abc.admin.com.csr -CA admin.com.pem -CAkey admin.com.key -CAcreateserial -out abc.admin.com.pem -days 36500 -sha256