diff --git a/projects/IoTCenter/IoTCenter.csproj b/projects/IoTCenter/IoTCenter.csproj index 11e92f28..fd551c28 100644 --- a/projects/IoTCenter/IoTCenter.csproj +++ b/projects/IoTCenter/IoTCenter.csproj @@ -2,7 +2,7 @@ netcoreapp3.1 true - 1.0.0-beta.416 + 1.0.0-beta.417 diff --git a/projects/IoTCenter/Views/Shared/_Layout.cshtml b/projects/IoTCenter/Views/Shared/_Layout.cshtml index 31277ee9..f8e8b60f 100644 --- a/projects/IoTCenter/Views/Shared/_Layout.cshtml +++ b/projects/IoTCenter/Views/Shared/_Layout.cshtml @@ -99,7 +99,8 @@ }
- + +
@@ -109,8 +110,12 @@ diff --git a/projects/IoTCenter/wwwroot/Info.plist b/projects/IoTCenter/wwwroot/Info.plist new file mode 100644 index 00000000..b41136a6 --- /dev/null +++ b/projects/IoTCenter/wwwroot/Info.plist @@ -0,0 +1,50 @@ + + + + + ApplicationProperties + + kind + software-package + url + https://iot.edusoa.com/IoTCenter/app.ipa + ApplicationPath + Applications/XamarinApp.iOS.app + CFBundleIdentifier + com.edusoa.iot + CFBundleShortVersionString + 1 + CFBundleVersion + 1.0 + IconPaths + + Applications/XamarinApp.iOS.app/AppIcon20x20@3x.png + Applications/XamarinApp.iOS.app/AppIcon20x20@2x.png + Applications/XamarinApp.iOS.app/AppIcon29x29@3x.png + Applications/XamarinApp.iOS.app/AppIcon29x29@2x.png + Applications/XamarinApp.iOS.app/AppIcon40x40@3x.png + Applications/XamarinApp.iOS.app/AppIcon40x40@2x.png + Applications/XamarinApp.iOS.app/AppIcon60x60@3x.png + Applications/XamarinApp.iOS.app/AppIcon60x60@2x.png + + SigningIdentity + 4FF86D960FFC0FAE33FCF84E207120421CB43FD0 + + ArchiveVersion + 2 + CreationDate + 2020-04-17T04:24:54Z + Name + XamarinApp + SchemeName + XamarinApp.iOS + ProjectGuid + {AA62DADB-0F16-454C-B8FF-93913C5AFCCB} + ProjectTypeGuids + {FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + SolutionName + XamarinApp + SolutionPath + /Users/mac/Desktop/XamarinApp/XamarinApp.sln + + diff --git a/projects/XamarinApp/XamarinApp.Android/Resources/Resource.designer.cs b/projects/XamarinApp/XamarinApp.Android/Resources/Resource.designer.cs index afc02358..2c4b28b3 100644 --- a/projects/XamarinApp/XamarinApp.Android/Resources/Resource.designer.cs +++ b/projects/XamarinApp/XamarinApp.Android/Resources/Resource.designer.cs @@ -8297,6 +8297,9 @@ namespace XamarinApp.Droid // aapt resource value: 0x7F070061 public const int design_snackbar_background = 2131165281; + // aapt resource value: 0x7F070065 + public const int icon = 2131165285; + // aapt resource value: 0x7F070062 public const int ic_mtrl_chip_checked_black = 2131165282; @@ -8306,53 +8309,50 @@ namespace XamarinApp.Droid // aapt resource value: 0x7F070064 public const int ic_mtrl_chip_close_circle = 2131165284; - // aapt resource value: 0x7F070065 - public const int mtrl_snackbar_background = 2131165285; - // aapt resource value: 0x7F070066 - public const int mtrl_tabs_default_indicator = 2131165286; + public const int mtrl_snackbar_background = 2131165286; // aapt resource value: 0x7F070067 - public const int navigation_empty_icon = 2131165287; + public const int mtrl_tabs_default_indicator = 2131165287; // aapt resource value: 0x7F070068 - public const int notification_action_background = 2131165288; + public const int navigation_empty_icon = 2131165288; // aapt resource value: 0x7F070069 - public const int notification_bg = 2131165289; + public const int notification_action_background = 2131165289; // aapt resource value: 0x7F07006A - public const int notification_bg_low = 2131165290; + public const int notification_bg = 2131165290; // aapt resource value: 0x7F07006B - public const int notification_bg_low_normal = 2131165291; + public const int notification_bg_low = 2131165291; // aapt resource value: 0x7F07006C - public const int notification_bg_low_pressed = 2131165292; + public const int notification_bg_low_normal = 2131165292; // aapt resource value: 0x7F07006D - public const int notification_bg_normal = 2131165293; + public const int notification_bg_low_pressed = 2131165293; // aapt resource value: 0x7F07006E - public const int notification_bg_normal_pressed = 2131165294; + public const int notification_bg_normal = 2131165294; // aapt resource value: 0x7F07006F - public const int notification_icon_background = 2131165295; + public const int notification_bg_normal_pressed = 2131165295; // aapt resource value: 0x7F070070 - public const int notification_template_icon_bg = 2131165296; + public const int notification_icon_background = 2131165296; // aapt resource value: 0x7F070071 - public const int notification_template_icon_low_bg = 2131165297; + public const int notification_template_icon_bg = 2131165297; // aapt resource value: 0x7F070072 - public const int notification_tile_bg = 2131165298; + public const int notification_template_icon_low_bg = 2131165298; // aapt resource value: 0x7F070073 - public const int notify_panel_notification_icon_bg = 2131165299; + public const int notification_tile_bg = 2131165299; // aapt resource value: 0x7F070074 - public const int options = 2131165300; + public const int notify_panel_notification_icon_bg = 2131165300; // aapt resource value: 0x7F070075 public const int tooltip_frame_dark = 2131165301; diff --git a/projects/XamarinApp/XamarinApp.Android/Resources/drawable/options.png b/projects/XamarinApp/XamarinApp.Android/Resources/drawable/options.png deleted file mode 100644 index 267af1cb..00000000 Binary files a/projects/XamarinApp/XamarinApp.Android/Resources/drawable/options.png and /dev/null differ diff --git a/projects/XamarinApp/XamarinApp.Android/Resources/mipmap-xxxhdpi/ic_launcher.png b/projects/XamarinApp/XamarinApp.Android/Resources/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 27d3a553..00000000 Binary files a/projects/XamarinApp/XamarinApp.Android/Resources/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/projects/XamarinApp/XamarinApp.Android/XamarinApp.Android.csproj b/projects/XamarinApp/XamarinApp.Android/XamarinApp.Android.csproj index 9c52735a..19b4a1b5 100644 --- a/projects/XamarinApp/XamarinApp.Android/XamarinApp.Android.csproj +++ b/projects/XamarinApp/XamarinApp.Android/XamarinApp.Android.csproj @@ -107,7 +107,7 @@ - + \ No newline at end of file diff --git a/projects/XamarinApp/XamarinApp/XamarinApp.csproj b/projects/XamarinApp/XamarinApp/XamarinApp.csproj index 3749ae78..eef60287 100644 --- a/projects/XamarinApp/XamarinApp/XamarinApp.csproj +++ b/projects/XamarinApp/XamarinApp/XamarinApp.csproj @@ -10,14 +10,6 @@ true - - - - - - - - diff --git a/projects/IoTCenter/wwwroot/app.apk b/projects/XamarinApp/app.apk similarity index 89% rename from projects/IoTCenter/wwwroot/app.apk rename to projects/XamarinApp/app.apk index 57f2cc91..a551a01d 100644 Binary files a/projects/IoTCenter/wwwroot/app.apk and b/projects/XamarinApp/app.apk differ diff --git a/projects/XamarinApp/app.ipa b/projects/XamarinApp/app.ipa new file mode 100644 index 00000000..3446a9d7 Binary files /dev/null and b/projects/XamarinApp/app.ipa differ diff --git a/tools/ios证书.zip b/tools/ios证书.zip new file mode 100644 index 00000000..10c4ade6 Binary files /dev/null and b/tools/ios证书.zip differ diff --git a/tools/nginx-1.16.0/conf/edusoa.key b/tools/nginx-1.16.0/conf/edusoa.key new file mode 100644 index 00000000..3902431d --- /dev/null +++ b/tools/nginx-1.16.0/conf/edusoa.key @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEowIBAAKCAQEA5vvS8tFXCO/L7gPl/x8iqkJBjWM9MsvNHTkiqJa7gP1CA1bO +qp4yVtVUdikiz8bmFchgfZHUs7QhZC3KM0araAFwym/SgAN4/STO+Mj9EHqVJqlu +k6kwZHTF77sZDppbyCEARf0ev5cGKQ44V0xHROOywdHbn0gTLX+Pz+4giPA5lQt+ +hxAL7dYDpumY3H0ZSO/+bn4YFCTHPdIkEqVJ0ifhCR/FR/x+GxAvosU29IV0/Vdj +X1YFq6Si4jMMNlJwgAwkdXTMOlaLe3fKv4X59aIHcBZecv7FukAm4WSPgHKrvwnv +wHDQsV3qRqtxUQzvVbuqTaowaMrK+OeBgASRLQIDAQABAoIBAG65mM29fDNUgDWA +uOgrTLrBOBtGzzdiatjvYqXeW9Phk5t2KWuwmgD2Ep7x6TYg6nrWqyqGlafvWXJk +YOFjpxccWa0xHX8wKvduhajM8ELOAGGgJtmx6Pi+4YOh9MkDRawR5cenJu5Avzs/ +DdMLRb7ISBCRQO6B5m+RDqdmR0JcvJVhg/8EFd/P4VLRVRiUx5kfA0KSLpGFNJ8b +aYxiHkW/4DIjlRBqa6ClZYjxQqek683h7S9aInB4gLgrA9fGSQ8+mPyvCSaANP79 +Npo0uN9v3ecdC97uDTRdhhxRmXYcXLL3VI17X6YE6YekarLVfHJWpl8coN2ALmZJ +5vWqeyECgYEA9mSwyr9HB7Iemx7jeJHo79pqWoflqqdYSf35jz6GOSZCkROocLzI +hVeXXwM1Gb882fRB0GUM+vsX9ypNP4jtelsBHt1CcPmdNYylN9C2+u4R9EPZC6BW +KiEsTJUmAWEK8poKa/DZBi/NS+wNyWUgkpwsFr9XbOzuPaMOVIldjDcCgYEA7/1T +hSpZ9WdIDhdavjr7roBD0/90G4Q8gBUlf/g04c0Xp9FzXDQdH1S0zeYbp+yqbWE9 +P+pic35UVlB58WvtM4IjAoD9Leae58TSh0TER66jU9lssS9obWyH3sfpXswcRpyW +oOlX7bJ8N8YAAhXGCVlAGrZj+VAtB5QaIIQJg7sCgYEAy2ULXBLSO9QZ18uD03// +XiBbMyiDuoAyLcJuRIVEn+CpisFDhu0QSqKn3lLzfrGTNgigW7tPH9AvVGWjJxON +ljeRkTztH/2ufQoBSTYOFs54G7/2Z9aPym9f9kgY+4J0Wxg2CizjumuzeTz/lITa +gqxQ6OZC8TQU5uS3a6mJg7kCgYAp/443NrMphBqTBLlHozDaV+4G0qSyEBE6ZPj8 +DSbMAUVLhBcJIsGZ8wv1IHjkiUFGBQdgARebmJcPx+OfQUDwi6yuyn4EI2DZtJMX +QwyKcuB4Uwt3cpF23NBmR1vq0BN+s/aUUGGn4l1ksUzdEIxopGrYgeS7A7Htqphr +6k9z8wKBgBwcnQJIY2g0cxkt6Idn2Ck2cn0UV0UMH78YqN4FE9LmkFlKw7eE7FiB +MH4hAVqSAJ64AKEv5Jt6MZamHPPmSj7A6Tj8F1KbJcGZvCpyfo1b76/LRKd1uzAV +CkjdHPp+tLywydadCRuHxtbSpLF9N91hIMDpdvLzQ3qclhT6GjtF +-----END RSA PRIVATE KEY----- diff --git a/tools/nginx-1.16.0/conf/edusoa.pem b/tools/nginx-1.16.0/conf/edusoa.pem new file mode 100644 index 00000000..6bc12156 --- /dev/null +++ b/tools/nginx-1.16.0/conf/edusoa.pem @@ -0,0 +1,91 @@ +-----BEGIN CERTIFICATE----- +MIIG2DCCBcCgAwIBAgIQDVAa3KQd3HqHhEcYxvwUETANBgkqhkiG9w0BAQsFADBf +MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 +d3cuZGlnaWNlcnQuY29tMR4wHAYDVQQDExVHZW9UcnVzdCBDTiBSU0EgQ0EgRzEw +HhcNMTkwODAyMDAwMDAwWhcNMjEwODAxMTIwMDAwWjCBkjELMAkGA1UEBhMCQ04x +DzANBgNVBAgMBuWQieaelzEPMA0GA1UEBwwG6ZW/5pilMTMwMQYDVQQKDCrkuJzl +jJfluIjlpKfnkIbmg7Pova/ku7bogqHku73mnInpmZDlhazlj7gxFTATBgNVBAsM +DFRlYWNoICZTdHVkeTEVMBMGA1UEAwwMKi5lZHVzb2EuY29tMIIBIjANBgkqhkiG +9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5vvS8tFXCO/L7gPl/x8iqkJBjWM9MsvNHTki +qJa7gP1CA1bOqp4yVtVUdikiz8bmFchgfZHUs7QhZC3KM0araAFwym/SgAN4/STO ++Mj9EHqVJqluk6kwZHTF77sZDppbyCEARf0ev5cGKQ44V0xHROOywdHbn0gTLX+P +z+4giPA5lQt+hxAL7dYDpumY3H0ZSO/+bn4YFCTHPdIkEqVJ0ifhCR/FR/x+GxAv +osU29IV0/VdjX1YFq6Si4jMMNlJwgAwkdXTMOlaLe3fKv4X59aIHcBZecv7FukAm +4WSPgHKrvwnvwHDQsV3qRqtxUQzvVbuqTaowaMrK+OeBgASRLQIDAQABo4IDWjCC +A1YwHwYDVR0jBBgwFoAUkZ9eMRWuEJ+tYMH3wcyqSDQvDCYwHQYDVR0OBBYEFCfR +yJ1xXm33YNyzOHnTZM2dFccPMCMGA1UdEQQcMBqCDCouZWR1c29hLmNvbYIKZWR1 +c29hLmNvbTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG +AQUFBwMCMHUGA1UdHwRuMGwwNKAyoDCGLmh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNv +bS9HZW9UcnVzdENOUlNBQ0FHMS5jcmwwNKAyoDCGLmh0dHA6Ly9jcmw0LmRpZ2lj +ZXJ0LmNvbS9HZW9UcnVzdENOUlNBQ0FHMS5jcmwwTAYDVR0gBEUwQzA3BglghkgB +hv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQ +UzAIBgZngQwBAgIwbwYIKwYBBQUHAQEEYzBhMCEGCCsGAQUFBzABhhVodHRwOi8v +b2NzcC5kY29jc3AuY24wPAYIKwYBBQUHMAKGMGh0dHA6Ly9jcmwuZGlnaWNlcnQt +Y24uY29tL0dlb1RydXN0Q05SU0FDQUcxLmNydDAJBgNVHRMEAjAAMIIBfQYKKwYB +BAHWeQIEAgSCAW0EggFpAWcAdgC72d+8H4pxtZOUI5eqkntHOFeVCqtS6BqQlmQ2 +jh7RhQAAAWxQXW/EAAAEAwBHMEUCIQDZhWuvn5hItpDiryuFo0ed2a6qCyu+6Nzj +hoFpYvhLLwIgNL7a0HNsWdPORihBATnbip942aQ+Wvz1N07/qQ3OJD8AdgCHdb/n +WXz4jEOZX73zbv9WjUdWNv9KtWDBtOr/XqCDDwAAAWxQXXBiAAAEAwBHMEUCIQCl +yTwBdNkJQMilIoRQrQOvbvihB4uvLMlssZknLmFsHAIgXt1Vn/ETW1xdyvzQH+vx +nrYdPP4NfmL7lU+tpa5tbDEAdQBElGUusO7Or8RAB9io/ijA2uaCvtjLMbU/0zOW +tbaBqAAAAWxQXW95AAAEAwBGMEQCICkw8IA+wHkgV10OkfsbEVYFVEpA13+Z3aYb +2mH89UA+AiAFyKjBvB+2kqFojAAPmUp8rgkgkY/f39MzCl4NOmmunjANBgkqhkiG +9w0BAQsFAAOCAQEAdsJDXde74RTRXW7ZEa7FQuaQKZFQkEKUPtRTr2RqGAPr1eqq +DmccPGeIAtvQnkOLIN4B0TQxxzniNhkMHTDOWbvzBmMtWjA4h7rH/eu4rKEE4d6E +zDXqMDAGrV1v8TmfGS7joCAqCBFLOifal8h7MivyMT5hjokTqi4pM+qDt1A+DHj+ +PtDFnNu/3XvYt64saJEtoAdyqT3Tbk8BR8OTzpXPlk5no/qP9p6lX/UoaJ06tasi +crni8LSYPbaBYT/HbFSzWtwAe5Azn9p9sGSQHgVb2Z4ryCDAwAXZJuy/GfCCvs4w +Jj9sK+F9aHBzU9PnudLr/vLS6w6BJPpg9E00qw== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFGjCCBAKgAwIBAgIQCgRw0Ja8ihLIkKbfgm7sSzANBgkqhkiG9w0BAQsFADBh +MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 +d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD +QTAeFw0xOTA2MjAxMjI3NThaFw0yOTA2MjAxMjI3NThaMF8xCzAJBgNVBAYTAlVT +MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j +b20xHjAcBgNVBAMTFUdlb1RydXN0IENOIFJTQSBDQSBHMTCCASIwDQYJKoZIhvcN +AQEBBQADggEPADCCAQoCggEBALFJ+j1KeZVG4jzgQob23lQ8PJUNhY31ufZihuUx +hYc6HSU4Lw0fxfA43a9DpJl74M3E6F1ZRBOfJ+dWnaiyYD0PxRIQd4wJisti4Uad +vz61IYY/oQ/Elxk/X7GFDquYuxCSyBdHtTVMXCxFSvQ2C/7jWZFDfGGKKNoQSiJy +wDe8iiHbUOakLMmXmOTZyWJnFdR/TH5YNTiMKCNUPHAleG4IigGxDyL/gbwrdDNi +bDA4lUNhD0xNvPjQ8BNKqm5HWDvirUuHdC+4hpi0GJO34O3iiRV16YmWTuVFNboU +LDZ0+PQtctJnatpuZKPGyKX6jCpPvzzPw/EhNDlpEdrYHZMCAwEAAaOCAc4wggHK +MB0GA1UdDgQWBBSRn14xFa4Qn61gwffBzKpINC8MJjAfBgNVHSMEGDAWgBQD3lA1 +VtFMu2bwo+IbG8OXsj3RVTAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0lBBYwFAYIKwYB +BQUHAwEGCCsGAQUFBwMCMA8GA1UdEwEB/wQFMAMBAf8wMQYIKwYBBQUHAQEEJTAj +MCEGCCsGAQUFBzABhhVodHRwOi8vb2NzcC5kY29jc3AuY24wRAYDVR0fBD0wOzA5 +oDegNYYzaHR0cDovL2NybC5kaWdpY2VydC1jbi5jb20vRGlnaUNlcnRHbG9iYWxS +b290Q0EuY3JsMIHOBgNVHSAEgcYwgcMwgcAGBFUdIAAwgbcwKAYIKwYBBQUHAgEW +HGh0dHBzOi8vd3d3LmRpZ2ljZXJ0LmNvbS9DUFMwgYoGCCsGAQUFBwICMH4MfEFu +eSB1c2Ugb2YgdGhpcyBDZXJ0aWZpY2F0ZSBjb25zdGl0dXRlcyBhY2NlcHRhbmNl +IG9mIHRoZSBSZWx5aW5nIFBhcnR5IEFncmVlbWVudCBsb2NhdGVkIGF0IGh0dHBz +Oi8vd3d3LmRpZ2ljZXJ0LmNvbS9ycGEtdWEwDQYJKoZIhvcNAQELBQADggEBABfg +eXrxIrtlixBv+KMDeqKxtNJbZiLDzJBkGCd4HI63X5eS6BElJBn6mI9eYVrr7qOL +Tp7WiO02Sf1Yrpaz/ePSjZ684o89UAGpxOfbgVSMvo/a07n/220jUWLxzaJhQNLu +lACXwwWsxYf8twP8glkoIHnUUNTlhsyyl1ZzvVC4bDpI4hC6QkJGync1MNqYSMj8 +tZbhQNw3HdSmcTO0Nc/J/pK2VZc6fFbKBgspmzdHc6jMKG2t4lisXEysS3wPcg0a +Nfr1Odl5+myh3MnMK08f6pTXvduLz+QZiIh8IYL+Z6QWgTZ9e2jnV8juumX1I8Ge +7cZdtNnTCB8hFfwGLUA= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBh +MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 +d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD +QTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAwMDAwMDBaMGExCzAJBgNVBAYTAlVT +MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j +b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkqhkiG +9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsB +CSDMAZOnTjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97 +nh6Vfe63SKMI2tavegw5BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt +43C/dxC//AH2hdmoRBBYMql1GNXRor5H4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7P +T19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y7vrTC0LUq7dBMtoM1O/4 +gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQABo2MwYTAO +BgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbR +TLtm8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUw +DQYJKoZIhvcNAQEFBQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/Esr +hMAtudXH/vTBH1jLuG2cenTnmCmrEbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg +06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIttep3Sp+dWOIrWcBAI+0tKIJF +PnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886UAb3LujEV0ls +YSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk +CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4= +-----END CERTIFICATE----- \ No newline at end of file diff --git a/tools/nginx-1.16.0/conf/nginx.conf b/tools/nginx-1.16.0/conf/nginx.conf index e88364e1..f7b36b73 100644 --- a/tools/nginx-1.16.0/conf/nginx.conf +++ b/tools/nginx-1.16.0/conf/nginx.conf @@ -16,6 +16,11 @@ events { http { include mime.types; default_type application/octet-stream; + types { + application/vnd.android.package-archive apk; + application/iphone pxl ipa; + text/plain plist; + } sendfile on; @@ -27,8 +32,18 @@ http { } server { - listen 0.0.0.0:80; - server_name localhost; + listen 80; + listen 443 ssl; + server_name iot.edusoa.com; + + #ssl on; + ssl_certificate edusoa.pem; + ssl_certificate_key edusoa.key; + ssl_session_timeout 5m; + ssl_protocols TLSv1 TLSv1.1 TLSv1.2; + #TLS1.1TLS1.2ҪOpenSSL1.0.1ϰ汾OpenSSL汾Ҫʹ ssl_protocols TLSv1; + ssl_ciphers HIGH:!RC4:!MD5:!aNULL:!eNULL:!NULL:!DH:!EDH:!EXP:+MEDIUM; + ssl_prefer_server_ciphers on; location / { #proxy_set_header Host $host:$server_port; diff --git a/tools/ssl证书.zip b/tools/ssl证书.zip new file mode 100644 index 00000000..cfdcbe9d Binary files /dev/null and b/tools/ssl证书.zip differ