Browse Source

Merge branch 'develop' into feature/app_dev

* develop:
  change https certifile
  change https certifile
abiao 4 years ago
parent
commit
39f09a9d8b

+ 2 - 2
go/gopath/src/fohow.com/nginx/ngx_prod_config

@@ -40,8 +40,8 @@ server {
      server_name  ofohowapi.hiwavo.com;
      charset utf-8;
      #ssl on;
-     ssl_certificate      /home/www/fohow/api/go/gopath/src/fohow.com/static/api/4061141_ofohowapi.hiwavo.com.pem;
-     ssl_certificate_key  /home/www/fohow/api/go/gopath/src/fohow.com/static/api/4061141_ofohowapi.hiwavo.com.key;
+     ssl_certificate      /home/www/fohow/api/go/gopath/src/fohow.com/static/api/5754773_ofohowapi.hiwavo.com.pem;
+     ssl_certificate_key  /home/www/fohow/api/go/gopath/src/fohow.com/static/api/5754773_ofohowapi.hiwavo.com.key;
 
      ssl_session_cache    shared:SSL:1m;
      ssl_session_timeout  5m;

+ 0 - 27
go/gopath/src/fohow.com/static/api/4061141_ofohowapi.hiwavo.com.key

@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEA64W+pbeqeXnxUIZ/90+3oES/h3gbuAVnwetZMYwVm+JepcMq
-ZwBwYlSBO1/LRbvEmInvSLabDzO5K5zq+PCiPKdgcrRiA6MLStla2zPiIOZ5ThkJ
-DdktHJCxCFLd6zDAE6n0z8ym4+8PdAuTqcKLkbylcKAAalBR4bpiiVrmwDDXxRVU
-AdG+MoyS06kRcFyg6UqlhaLT2ep0bLLigTj3IruwdJudowUPlKhY+vXYUB5qGVJb
-c4OMEjnpmsU5M+M7oAvEk+dHXErPzApn2zVkuKT9nGPPurNAytMarayyBHJ4mUVE
-nyiqXUhNgVDr4/1bNhiG+HAKF08qo3rYZKCGeQIDAQABAoIBAQCRQyNMCJTPaaOp
-m9svSO6jneNXhX/rJwJQu3x+r7zgMWVY7Z+oeb/XFfHDEhlIgEAIKQL5oQ7P+IHb
-4WOXeKtHp6A3/wN45MXhO1/rVPvCeQQWZCCOdwV42dEmph2TorTFLAz/YWUJrnek
-hkNj78avc1/CsByxdaqbA58kwnkRzZ9R5XjRrk5oc70uSAAcJW4oS4yzs41oRauf
-Gns5W3rSTLNExD/VpNOEjlE4TMUdsWQ1V4zAgzOUKBV2kAtQxvfe6VBQdttHP1kz
-V36oaEj9ihhrozyr8dIzpCqrhEQsjSLRwXwWkT7emUntHMcClatooyWF8YE9GWPq
-TFvsKzLFAoGBAPXKI/2yIV4xp6SZNUPZ86Am3m1y5SnJtkj6E+4i9EtYh26Kwvv0
-U8FudjcQkzWTExMwHv1UYMTLX0lB10Xw8Hn9GwTrSAdCxgXzkzA59f6DZnfIcUS3
-fewM1y24iiLQv4O5vI31A1NAHeBwK0VhimRUvAJgWh7stjWzvN7Zk69PAoGBAPVO
-auAzKA48OVzYqhcKa7/tQckhZqS88ffM/z6fEQjAhgLPuWeGJHHD93y2eJC/s3pI
-ypNaW/YqpB/ASVJ3JvbgFNJrYKjb3BJdQkBm9LhlmUehPq/TvJ94/h8OaWmVQyBa
-LWGjohD8XuT63KbMcYu2Py/t7XQouaSgF52RKTu3AoGAJFOJ2jb3g4pnMoaKPsr5
-nNPhz99JS1HKpSKAy5NS88fTzFyp0L8dmdsPkbfbafGgwhc8nUhZPPypypP2kxm3
-EPB9i86SSLBvv/Vt7ZTDbKhS/qUbSIKuE7MaImHB2L9tbrSGz5xEr4ssXz10x75Q
-y99SIi/HYgauL2WvJmiV0TUCgYEAohhhUyk6rL1rAklBi9wc+0QiFm/1zaH1GlPh
-zlV6AhiF9VGiKCBh8LMX1NcWsD+cr49uHRS2c+IVdc2wJcgKfVPxLmI6CxrNP21U
-nA3sY/Tu5oBMVg9KMu7WrVrumRBCvRwZpM1mCGdbpV+HcsjhtvqEon1MTVej5H7N
-XBdR8d0CgYB55voJfz/95P6hxDAbz3DXHN/1sl1rS9pMvs/8f3C3KkCM9mG8LYvC
-MyQG9x9iCwpwswJiwojddl5Ob33z35twFJJAPPI304APcakHKOHmbOVQEKrORV92
-idCIrLyPSZ7yevlkXwB3vc5u1vNBaKw5RetzmTW1J0okwdfoZAeqXg==
------END RSA PRIVATE KEY-----

+ 27 - 0
go/gopath/src/fohow.com/static/api/5754773_ofohowapi.hiwavo.com.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAtnXWVj9kxwbq8dv1KuBhynbQdnRYnfbhqTXI7dslg8Fo0rdI
+q1eZ4ck+WZ6d51kJFMZ1u0EhySS2uQIQezMrIh6KVYPaXheRj/ZwQ1j7CmW8cGPG
+z7+ViJJQIrWALvyrOnPrtfBchfxo+qwOHnpXYfKtLQ7YtlPWo/PCTYHcZpNPLmeD
+HIUTXpnBMD9fd5PKG3WCDjVn3BAgFss+857Wt9pYmwzRAqEcQldA0llouM60r5SD
+8+CAv2478115c6BUk2q5CXKdpQElUP+4p3N5nTCVgyEBQqwAsXeq922FbOgxh2xZ
+DpB8Ip8pd35iErRPEgl0weUU2PlDcjsvZ0tOYwIDAQABAoIBABBIXsrOmHc8ck4I
+I45ifMedJ8hSZLAgHo5Dqv0y/9uMsIaRba5AwI5KL8K+qXfCVdGhTlNaIiI5oQbM
+nNzpuZEvaYftHtkjwE05IFaaQ7jvUEw1U0Ip5jXMXNNkIB7RVJSAUMopO5CHcHTi
+UtY8c7zdc7/gIc3PmImEENRq4NjUaOyXIJdpWgdEhTRdvHL2rCACA+Oif2C4wZwy
+cSwqzuynrsZuRHaJGMWqJo1GHsHRjrSYfD3/KcyksFiHh+zihL9aB/r7YOlCkvsV
+tlR+8g9W/YoBKeF8/r07V+/BjW+meDAlyExhH9SvoBZLw2QTgbsrqnw0QlJSqYTe
+eo0eFBUCgYEA5B9C1kAR8a6eP30MD0dH4Aqz6CglCYJUnpTf5sooODUUoTL5h/0E
+EehKuTGriSogg9K47VFbbK3WO2cVfBDvmMAcGUOuKFARnHkAOssZn8PwPg6jeE7A
+/kWAqlHBZ2aiokoF0NNWRXRAgCz5C+27WoprofZ/ioulgT5+BWOggE0CgYEAzMIP
+BaaXRJceLNpmmaERzaCxrDXuRQpvCzGu4RNhmsq07ta0+7q3kxsK7DJpBMm8onGy
+HyNpDSlGXjXWS1M4LhkAbtXAFff2/LN2P6E/MQIFzU+lvpawdF85PnLgIbx59ioT
+ljWbKL+CJfqT+FOM3nBmZr/O64QQjcMR9Cuw4W8CgYEAiGDYCFZNY/tMyA/uAcRP
+h/VeENDPM5wjEptWMBdzbAbvyl87Jr1wjXQeGBFFx77TqXt06wvUaGiUxvadtYo6
+c0uGgOQhXiBgJvd/16ZML2NoYPFHcUlDv7+1aB1wTmzhlbxDNdDipqsVVIuOaD87
+3qkaJ73CCgXqcBX4KSiib5ECgYEAkbSWVAMUKa8PvgM8d55yuMzdIhrOjzq5glG8
+jFXqYuhUkJEhAPEBqSDZSPMmYE3eegpGInpkSwVQGcJd2AREOil4cWaR5hAqJfDe
++LCZ8xnpXwyKeXFp56XLanD8pYUllNKkVYOYAgslZjlGCrQJzlBVzlA3wsibrwVd
+RU/B8ukCgYBWT9NAk8J5yDzdhRzjkgCyzKO5NWBswxhECjyi+mzU0RcaAVLjUSP3
+whEVcr9pWheOyIxihuED7CkR4ANTykAuxWOh5RioL0Fodr68sa1UPUUaW2EKxIt6
+eP4qtDIYkM8qAF/Zmn2INCdF8kbHX++OG7H33qo9oqbusd2gRtOJtA==
+-----END RSA PRIVATE KEY-----

+ 30 - 27
go/gopath/src/fohow.com/static/api/4061141_ofohowapi.hiwavo.com.pem

@@ -1,34 +1,37 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
+oe9B
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIIEqjCCA5KgAwIBAgIQAnmsRYvBskWr+YBTzSybsTANBgkqhkiG9w0BAQsFADBh

+ 1 - 1
go/gopath/src/fohow.com/static/api/fileauth.txt

@@ -1 +1 @@
-202104230000002udsw5w63ccox799t72o2fgy7h3hh6kn3jsotb1bopibfz29d2
+202106050000006766im4koi91j0kr1nfohr24ul5mepc8zgdos9kycrwn027sid