修改部署文档

doc/README.md

@@ -1 +1,4 @@
-# 文档
+# 文档
+阿里云登录验证
+爻象教育
+yaoxiangedu2018

doc/deploy.md

@@ -9,4 +9,19 @@ pwd
 #cp $WORKSPACE/target/diagnosis.jar /home/jenkins/diagnosis8081.jar
 #/opt/diagnosis/8081/starh.sh &
 
-docker run -itd --name=gogs -p10080:3000 -v gogs-data:/data gogs/gogs
+#docker run -itd --name=gogs -p10080:3000 -v gogs-data:/data gogs/gogs
+
+迁移git地址
+git remote set-url origin https://gogs.yaoxiangedu.com/feick/diagnosis.git
+取消git ssl认证
+git config http.sslVerify "false"
+
+gogs mysql 
+gogs 5tgbNHY^
+
+minio 配置
+https://minio.yaoxiangedu.com/
+admin
+#admin123!
+
+图片地址为https://minio.yaoxiangedu.com/prod/93f875864008493ab40073eca554393a.png

doc/yaoxiangedu.com.key

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCop/+xVDPiVBJp
+ixnr9LiXUU4bKq/9zSqMEJoTfiR4FcoG3RFC4KqQIcCAVNvSGft0iPLhqIgtOMAn
+peReeU7hAdNxiDJCz57AcEnq6gSJg81vO4F128LwRpOqi+dolNF6MfQkahLjvLLE
+fD5JRm9fmHx539h2qAu4UQ1keyk6On1AlRad1f68nKzE+FbPT+uYJit4ScPxemR2
+3/kKLWzGdSjGiHQf/hSORCuHI+RsKB+aFoVphF0Wpv2Z4BCauJcfG7W5c6KCnp8f
+AlEfDUfwP1+fSOIiUvf2CiMGxHFzcmMVIyy0pJKWcFEx31hodN/skrMNtnXcsIjw
++KDebL/NAgMBAAECggEAEeAMZ50HCrviX7FQhAOh9Ne3MYXqtTmjgsjXq6047ElS
+6jtP8wigyznojzFvQutiDU3egDA+jpxvMUSR2bl9tLde06+dtBsRNlAwZWd8J58C
+jQF/jSBHnvO7/t1pH1p2gT7+I0XizqRXRh/s8hM3BqjAuKIS7TCOXXCpvLaY/gS8
+5X83ocYY9qSOqvBbMg/i7hEISr/KIoLuQD4s3wU1JsP88Br5wxMErdj2VdtgTRk6
+qrDkrEcBnIlxRComjcmEvF7bJyWI2vaTr+VGsBIEVrMyuQT5VUuWJOxZI8Z/ZjiB
+y81tqxidubNhBeXg3dy+Dt5BVWVA2PbHUfUvKVKgOQKBgQDVtOKweCN7JMga+P3m
+u4UdvEvUYQjdiJfrMALP7rhitsK6PHtFrcbfzQ4HHQ2Hs8R+GhYwlQp/fDAuNAcs
+Xr/JEurHr/kFWDjoUxEuYIQVLJYIJCViHaei4kdt3iKgYvM4nZGkWbb0QKglCuPo
+/rWQK0yNBMWrBCoQ48J5L+NBTwKBgQDKCLUVsQWiJ/Q3l63Yu3Iqlu8dFoNtzn5Y
+bpQlKA8XCRg9AG9xmHFyfjiRZ0wEsPYtjgXPOLxIpjgWw9nSxFXiGeqgazHvMCrx
+KKKvaO5QvQtmNx04urPnTU+kRjQqFNljXGXEfAOgwYHmFEzI1azi+J6rK7X2Lh46
+/cmJZ4+OIwKBgDIrEaBtw56QBu3WD/zPfrN5Va/Yy7T98PQERFS97Mk3sET6F9JG
+tk4pnCZtWpTFzdXwl8713g4JgGIIUrrGz20LpNQV6nanvExF292wSLGT0vC8U45R
++d2SE0SmhihysjhTPTKA4SM73n07rj8vND5Q+9qLCUBZbOqkHS5H4KifAoGAInGL
+ldAhOrz/CL9GNy31z8b9qwLck0riBWeMwCztLasyQ6wgU8h+htt3/2oR7rbQsYGG
+AgcVKnmUFGV9bE5mqe5rLsA3uiSHHagk3CzSfFdOazW4OKSz6RooGsSRPh9h1Gu7
+Od0+rRhwce5CDPdIy0VBn8MK+ZZxNvNveYp7UesCgYBS5E68UwsVZvJ3s2JSSpJR
+l3WkfZNAFb9Ibi2zRMGwX6SQMqlk/C1CPnxaQVwNRjP4Xn3r1A4vUqRqWQtPhOP6
+ny3GOP5a2NTkraNu//Ej+Af5cgVJ+96fGV8+3G/RMxcH95pACWVj+ndQEMHuBZ6b
+r2wE8auM1xu9XVnolf8luA==
+-----END PRIVATE KEY-----

doc/yaoxiangedu.com.pem

@@ -0,0 +1,31 @@
+-----BEGIN CERTIFICATE-----
+MIIFaTCCBFGgAwIBAgISA55IF2O5EKxCiDCK/xii1FTOMA0GCSqGSIb3DQEBCwUA
+MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
+ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xOTEyMjkwMjMzNDlaFw0y
+MDAzMjgwMjMzNDlaMBoxGDAWBgNVBAMTD3lhb3hpYW5nZWR1LmNvbTCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKin/7FUM+JUEmmLGev0uJdRThsqr/3N
+KowQmhN+JHgVygbdEULgqpAhwIBU29IZ+3SI8uGoiC04wCel5F55TuEB03GIMkLP
+nsBwSerqBImDzW87gXXbwvBGk6qL52iU0Xox9CRqEuO8ssR8PklGb1+YfHnf2Hao
+C7hRDWR7KTo6fUCVFp3V/rycrMT4Vs9P65gmK3hJw/F6ZHbf+QotbMZ1KMaIdB/+
+FI5EK4cj5GwoH5oWhWmEXRam/ZngEJq4lx8btblzooKenx8CUR8NR/A/X59I4iJS
+9/YKIwbEcXNyYxUjLLSkkpZwUTHfWGh03+ySsw22ddywiPD4oN5sv80CAwEAAaOC
+AncwggJzMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
+BQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUR86usAbP5BFGh4qfzR3JZNo+
+TaEwHwYDVR0jBBgwFoAUqEpqYwR93brm0Tm3pkVl7/Oo7KEwbwYIKwYBBQUHAQEE
+YzBhMC4GCCsGAQUFBzABhiJodHRwOi8vb2NzcC5pbnQteDMubGV0c2VuY3J5cHQu
+b3JnMC8GCCsGAQUFBzAChiNodHRwOi8vY2VydC5pbnQteDMubGV0c2VuY3J5cHQu
+b3JnLzAtBgNVHREEJjAkghEqLnlhb3hpYW5nZWR1LmNvbYIPeWFveGlhbmdlZHUu
+Y29tMEwGA1UdIARFMEMwCAYGZ4EMAQIBMDcGCysGAQQBgt8TAQEBMCgwJgYIKwYB
+BQUHAgEWGmh0dHA6Ly9jcHMubGV0c2VuY3J5cHQub3JnMIIBBAYKKwYBBAHWeQIE
+AgSB9QSB8gDwAHYA8JWkWfIA0YJAEC0vk4iOrUv+HUfjmeHQNKawqKqOsnMAAAFv
+T7eYWgAABAMARzBFAiAAy3Wv4kLCaeeT3LMLAud3LC+Tmv6y9b/dfl1JNe40rgIh
+ALkIIQbvc6TqWwaFDCUGQP4tbAYLr++9mIvXsIT8ldGJAHYAB7dcG+V9aP/xsMYd
+IxXHuuZXfFeUt2ruvGE6GmnTohwAAAFvT7eYogAABAMARzBFAiEA/acgr4RKfKFe
+VWxqperED1Y+PxjPQOCXVpnWYzSYm7ICIHd1TUbn4w7euNrDl6/wy/VRKg+PHjQk
+YE1i3+g3yTY7MA0GCSqGSIb3DQEBCwUAA4IBAQAANhzjYhKYmiblYrbWmC2dpYLx
+thnTz+Q/9HeAmtFfG8hQ28hV+v4ghQqAIPQ+g/mLUkREfRifW7l7au35K3RDsNYt
+Mi2crdJW0t4I6q014kXbNvUGMh8D34Mhy67+UI08MzaZ+K7omkfSNnPlurnCbo+8
+r1+eZD2aomS0u0/z0iqMwC3XMzZ42WHbPv4O/o+vgu6fBaDoHCRIO6XGUteJFPet
+77DMjE6/IgCoMmSe4tP1BwYRuDY/fJMYdB/VbLigfZWkMWSBZOGRc4+FoEwAVV2O
+8LJTixFBNjhujvrkSXfPMWLhSTck+EbIgeJSjjBsMqOQQZZkSZypRVHbFc79
+-----END CERTIFICATE-----

src/main/resources/application-cloud.properties

@@ -26,7 +26,7 @@ spring.redis.port=6379
 #local.downloadUrl=http://${serverOutsideAddress}:9000/file/download/
 
 #外部要使用，所以不能为内部地址
-minio.url=http://minio.yaoxiangedu.com:31752/
+minio.url=https://minio.yaoxiangedu.com/
 minio.buckets=prod
 minio.defaultBucket=prod
 minio.accessKey=admin

src/test/java/edu/math/diagnosis/service/PMPTest.java

@@ -0,0 +1,67 @@
+package edu.math.diagnosis.service;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+public class PMPTest {
+
+    public static final int min = 106;
+    public static final int max = 131;
+    public static final int times = 1000000;
+    public static final int num = 200;
+    public static final int select = max - min;
+    private static final ArrayList<Integer> qs = new ArrayList<>(num);
+
+    @Before
+    public void setup() {
+        for (int i = 0; i < num; i++) {
+            qs.add(i);
+        }
+        Collections.shuffle(qs);
+    }
+
+    @Test
+    public void test() {
+//        Random random = new Random();
+        ArrayList<Integer> temp;
+        List<Double> rate = new ArrayList<>(max - min);
+        for (int i = min; i < max; i++) {
+            int count = 0;
+            for (int j = 0; j < times; j++) {
+                Set<Integer> right = generate(i, num);
+                Set<Integer> choose = generate(select, num);
+                right.retainAll(choose);
+                if (i - right.size() >= min) {
+                    count++;
+                }
+            }
+            rate.add(count * 1.0 / times);
+        }
+        for (int i = min; i < max; i++) {
+            System.out.println(i + " " + rate.get(i - min));
+        }
+    }
+
+    private static Set<Integer> generate(int i, int num) {
+        Set<Integer> result = new TreeSet<>();
+        int count = 0;
+        do {
+            int gen = (int) (1 + Math.random() * num);
+            result.add(gen);
+            count++;
+        } while (count < i || result.size() == num);
+        return result;
+    }
+
+    @Test
+    public void test1() {
+        Set<Integer> a = generate(124, 200);
+        Set<Integer> b = generate(25, 200);
+        a.retainAll(b);
+        System.out.println(a);
+        System.out.println(a.size());
+    }
+}