Merge remote-tracking branch 'origin/push-dev' into push-186server

Conflicts:
	bigdata-web/src/main/resources/doc_result_mapping_filter.dict
	nlp/src/main/resources/push-tc.dict
	nlp/src/main/resources/synonym.dict
	nlp/src/main/resources/tc.dict

bigdata-web/src/main/resources/application.yml

@@ -12,7 +12,7 @@ spring:
       charset: UTF-8
       enabled: true
   datasource:       # mybatis 配置，使用druid数据源
-    url: jdbc:mysql://192.168.2.235:3306/bigdata-web?useUnicode=true&characterEncoding=UTF-8
+    url: jdbc:mysql://1.1.1.1:3306/bigdata-web?useUnicode=true&characterEncoding=UTF-8
     username: root
     password: diagbot@20180822
     type: com.alibaba.druid.pool.DruidDataSource

bigdata-web/src/main/resources/doc_result_mapping_diag.dict

@@ -81,6 +81,7 @@ jnQH++UTPaibBHhE3G65A5OH5JCq/vF1WhqDUIQPQGM=
 de3O9146cmULVgLDGsMmxnAul+X1XFtHy4x6AQXguls=
 9UQdU1VIB/Ztd8WtUYdrl/znlgPCB6PWstNvNKfkPxHtfbwrS7yCE0pgEZ36UZf7
 zybTgccYrmvNZmfBQxP52cK0z0/1KIV28K8JgXllPjTLjHoBBeC6Ww==
+9U2iKDgg7A8Fwc85LPgI0O/1mwKFPYtV1K7XQRHlBMM=
 kdU8UcCILZA2zqe2dEz9kO/1mwKFPYtV1K7XQRHlBMM=
 x9ZTV7gEMRCi91Qg24vlA75amaIn5rxJIrRdP5MeE9j1rLaDeGOQwfOj8LtFg+GJ
 FQUi8oWeKA22mkhDBQ8Od0ffVX1Kx6/gaXBl6wZu5y0=
@@ -410,7 +411,6 @@ su0V2rk2gah2w8q8JxH30WL6uHlLqsog
 GPdd2yIwWWesOniOA5cBq41ncbSjshCEmQCWLXtYoTFPfX7y11TKwA==
 mtIyd1Hqz2UxOjWwaO+5DiH/h1pywZ5c0pCfO/z5g6Y=
 1MHev69zrjZj004btOAkes94cw1mrZqiQE1oNjRzv0A=
-PbYt1gxECy9PyDHKyZ3KARCOh35FTrhDYCbiEbl34508wX/qhzBqr0pgEZ36UZf7
 EjAf+Fk40oLXv2qPN2R841D8sLBRuvnPVj3R0+P6Ke796uutIWsx7JC4iPbph9qG
 it7CAuuV7SAxR6MAda5351Pq3vaS3WGD
 IS3trY+w1C5ped3RWFjnRS7e/oaau9gAXpBSJ5uhUAo=

bigdata-web/src/main/resources/doc_result_mapping_filter.dict

@@ -592,7 +592,7 @@ yF2SpsmhECSar/KlvxFeSkpgEZ36UZf7
 j5r7gucVUZPs4b5Jwjzq68W9GueaBowJ
 Lz3xBm67RkXY924iRAKOQk4eis8kMKHS
 kQHtQ28+jmQfVaZv0wNjt/GBY5WQh50G
-PbYt1gxECy9PyDHKyZ3KARCOh35FTrhD/GpXn+qARR6ar/KlvxFeSkpgEZ36UZf7
+9U2iKDgg7A8Fwc85LPgI0A5bPEpxqF0ApA8RkamQclo=
 mtIyd1Hqz2UxOjWwaO+5DhBTSR9hz9lOLfj2n/p3fLw=
 fDYkXHftmz8W40YEz3OcsqEBNVDBg6GLpA8RkamQclo=
 it7CAuuV7SAxR6MAda5350Cbw8kxCNmGLKs3fnGbwV4=
@@ -2123,7 +2123,7 @@ DwvME4SMq1/7h/YRiJ6gVsW9GueaBowJ
 q/tOvvxyfvc4+DNNE3C1afjKFewesK8PpA8RkamQclo=
 F23WHjKfkdf4ErwLn5tQpyibZTYEHi63Lfj2n/p3fLw=
 MHWWVpSYUhZEawdhbeBqoiibZTYEHi63Lfj2n/p3fLw=
-MHWWVpSYUhYA9JZPKhe9Ma1IJ1MKyp9bLfj2n/p3fLw=
+MHWWVpSYUhY9RmTPGYbXJsZqpYuuouNcLfj2n/p3fLw=
 nbcWBOXQbk+ar/KlvxFeSkpgEZ36UZf7
 r83+pje9TfUxmcJ2zmeXuEsdlhPMumPUpA8RkamQclo=
 r83+pje9TfX4Y5RlyU+ewVU2x1UvNSu2LKs3fnGbwV4=
@@ -2375,11 +2375,11 @@ b99ckthBy79Iov/OkhMGtwfPcXNEp9OtpA8RkamQclo=
 mAmZG1s9/9JIov/OkhMGtwfPcXNEp9OtpA8RkamQclo=
 do2JGEcPxdct+4rZZWVGzcW9GueaBowJ
 9T6u0tR9icd7xt1zuP9rAvGBY5WQh50G
-LHVx7Zn5CiWar/KlvxFeSkpgEZ36UZf7
+vomimJs1AibWlAqmeM6IlMW9GueaBowJ
 Ltkz09VBFNBz1+secNFvmcW9GueaBowJ
 WYKU8xMEBDNz1+secNFvmcW9GueaBowJ
 S5d2VgOgz6Zz1+secNFvmcW9GueaBowJ
-I0U1e85rFi6ar/KlvxFeSkpgEZ36UZf7
+PYIKxqjozGYfkfusuLWfeMW9GueaBowJ
 MhlMjxiTc7qar/KlvxFeSkpgEZ36UZf7
 FHqNqR4hpoMcIB5IOOGpW/GBY5WQh50G
 QqPqll5V3q9hG1GOd1SqWfGBY5WQh50G
@@ -2598,7 +2598,7 @@ K0J7ONfzdSXYtyCGIxGLh/GBY5WQh50G
 5HWmNITKxfOar/KlvxFeSkpgEZ36UZf7
 Y4X9vVMMg/+ar/KlvxFeSkpgEZ36UZf7
 BxzAMdSPd7SUYNPBtgCxWsW9GueaBowJ
-kdFwOgAO3Taar/KlvxFeSkpgEZ36UZf7
+xI1Rq/syVvCar/KlvxFeSkpgEZ36UZf7
 PT7EluLYvVaar/KlvxFeSkpgEZ36UZf7
 6RTgPt7+SJiar/KlvxFeSkpgEZ36UZf7
 f4TFE/a+M7War/KlvxFeSkpgEZ36UZf7
@@ -2721,7 +2721,7 @@ duFRM+c3t/Oar/KlvxFeSkpgEZ36UZf7
 f+93HRUI55uar/KlvxFeSkpgEZ36UZf7
 X07kXpTX7M+ar/KlvxFeSkpgEZ36UZf7
 iBgLTwZ5Ct+ar/KlvxFeSkpgEZ36UZf7
-ZH0D2nn9KPear/KlvxFeSkpgEZ36UZf7
+47RH8BKXHY4DzJZvNiJvj8W9GueaBowJ
 cPH0KmtUB4mVm1SFZ62q88W9GueaBowJ
 Wj8YF9oF3xT9btnCSsbuM/GBY5WQh50G
 adPgnaK/9Av9btnCSsbuM/GBY5WQh50G
@@ -2875,7 +2875,7 @@ abrjMS7yCaSlPjPtLYw13sW9GueaBowJ
 qJyJhtR9wYU8nC8JCD+Fg/GBY5WQh50G
 ZHtzyNcEGMWlPjPtLYw13sW9GueaBowJ
 bXh54wBD2HcZd1BiYTH+McW9GueaBowJ
-RDE4s/2CWUsZd1BiYTH+McW9GueaBowJ
+gn8GGMt3OKVcb0czTGxsyFU2x1UvNSu2LKs3fnGbwV4=
 RwfaZMa+tcJkNVRINR3RaFU2x1UvNSu2LKs3fnGbwV4=
 RwfaZMa+tcIhXzxcl4+Idb9VMd3r2VAjqj/BG/dwngmar/KlvxFeSkpgEZ36UZf7
 X7f5/6c1hQf8kd36tO7FgjYcxUMmUSB5Lfj2n/p3fLw=
@@ -3686,7 +3686,7 @@ yUBIpiXiGhvv9rvI0pFhBiep3cfgEnvHQax04aCP8eU=
 GXmfQxQxc/O0cFJ32Vjob3arBDzzEcb8
 mA0dp7Zpk/MZd1BiYTH+McW9GueaBowJ
 eCqeov2ppexi4zS+8Hameiep3cfgEnvHQax04aCP8eU=
-PKQN6qmaVCKotx1auhvpP8W9GueaBowJ
+PKQN6qmaVCKotx1auhvpP+FuxsZaj2kS
 3sa1hNHtmvbJxE/QKjcluljjDimEltcP
 38nqcMvXAjAH8w0ilRS4qljjDimEltcP
 pZBf+FFGmrd0BId7gijn0FjjDimEltcP
@@ -4025,7 +4025,7 @@ JfNtumkrZmxvbR4XDkKjgrM3dyQ5iENypA8RkamQclo=
 b8ErQvNUZge21gN+q0c3vkCbw8kxCNmGLKs3fnGbwV4=
 JfNtumkrZmw7DinSsD8MBDI7066I+E8fOKlkYg16NpxBrHThoI/x5Q==
 BT/fHxNzenCkg4xLkEPgScW9GueaBowJ
-FQUi8oWeKA0OsheGum+CXUCbw8kxCNmGLKs3fnGbwV4=
+FQUi8oWeKA0OsheGum+CXTpygRlUhqd4LKs3fnGbwV4=
 pEpH+RMCU2G21gN+q0c3vkCbw8kxCNmGLKs3fnGbwV4=
 YmFbY+KQ4Y5k2APy5BDRcxL2q31jZPZ5Lfj2n/p3fLw=
 EpkhMubA/KXQpA+y/oKUUUCbw8kxCNmGLKs3fnGbwV4=
@@ -12391,7 +12391,7 @@ uGTuryj+tOsAtM+BG/Lw42RljqFXQAYlpA8RkamQclo=
 Y16URROdqEx+wPtZwxseas5kz3R9Tp4GLfj2n/p3fLw=
 9pzYhs9wWQp+7mLkPHSV2fem7VGBz0ebRVRxFox4OVZ4qi09YuwSoA==
 uGTuryj+tOvQ5JYaky+hnappkFDHp45ppA8RkamQclo=
-uGTuryj+tOsRr2l/83xC+cW9GueaBowJ
+Q9NJBY/PsOGar/KlvxFeSkpgEZ36UZf7
 Lgrg85i6pxiJ97P/3YQTQUCbw8kxCNmGLKs3fnGbwV4=
 8v64ZC+8UFtEqQq8xrZUWPGBY5WQh50G
 XHih9lYA8/pN0PUQkzwUHkCbw8kxCNmGLKs3fnGbwV4=
@@ -13003,14 +13003,14 @@ B8w+Leibou83jfinsyzjqVFheItN0h2Nr0v5pOAFNwL24UV6E7l+x/GBY5WQh50G
 By5Q/SU5xirWuCFgQKtxiFFheItN0h2Nr0v5pOAFNwL24UV6E7l+x/GBY5WQh50G
 cPDKivAIKoe6sipaQQr451FheItN0h2Nr0v5pOAFNwL24UV6E7l+x/GBY5WQh50G
 BXQUha07j2YW40YEz3OcslFheItN0h2Nr0v5pOAFNwL24UV6E7l+x/GBY5WQh50G
-+/2OC1vcA4AmhbdxontiXFFheItN0h2Nr0v5pOAFNwL24UV6E7l+x/GBY5WQh50G
++/2OC1vcA4BvjyLPnTxTH1FheItN0h2NOKlkYg16NpxBrHThoI/x5Q==
 vKMadaRxCnvp6gLrPkJa61FheItN0h2Nr0v5pOAFNwL24UV6E7l+x/GBY5WQh50G
 46RKeKrgKofEEUMXkymMT12lphhhK8g50gM7h93s2O2ar/KlvxFeSkpgEZ36UZf7
 glddNMedxyRFQbW3noP3pqxxzpsSi8aWOKlkYg16NpxBrHThoI/x5Q==
 36s42ZhwjJ4UHNlX3+xyXSsHiIwWK6GHHK0Z6b6L8Xd4qi09YuwSoA==
 EoFoqzO/R+G5M8tS1KZ/PfyvYCTODPerpA8RkamQclo=
 B8w+Leibou83jfinsyzjqVFheItN0h2NvZ/OTI+wfdX24UV6E7l+x/GBY5WQh50G
-rjhqzeVmkFn4UdCOgcORtlFheItN0h2NvZ/OTI+wfdX24UV6E7l+x/GBY5WQh50G
+rjhqzeVmkFlzCIj6arogkeJA/Bid8pBH0gM7h93s2O2ar/KlvxFeSkpgEZ36UZf7
 5Y1mwjb8gugiKdKAOW+k6VFheItN0h2NvZ/OTI+wfdX24UV6E7l+x/GBY5WQh50G
 1AooRnXbEgh9WYdAmyfR9lFheItN0h2NvZ/OTI+wfdX24UV6E7l+x/GBY5WQh50G
 By5Q/SU5xirWuCFgQKtxiFFheItN0h2NvZ/OTI+wfdX24UV6E7l+x/GBY5WQh50G
@@ -15779,7 +15779,7 @@ Fuf6pvQ8ckB1sXunLF29Tm0y3wWUmRqWLfj2n/p3fLw=
 dRXKYlKp0ivy/Y8+prgNnmJVRywqXq/cpA8RkamQclo=
 aak3L9Lnp6mEma3UH3skIH6SIIr1I1MdLfj2n/p3fLw=
 FQUi8oWeKA2BEzUegK+LzUCbw8kxCNmGLKs3fnGbwV4=
-5Bgoob8FfZTO0EtYHLOvphBTSR9hz9lOLfj2n/p3fLw=
+5Bgoob8FfZTO0EtYHLOvpl6Dp6GRg+8/Lfj2n/p3fLw=
 kvJ9l6NV5Fnuq8q2TQycqAa2szONeQhPOKlkYg16NpxBrHThoI/x5Q==
 FQUi8oWeKA1hE5NxRs2+jUCbw8kxCNmGLKs3fnGbwV4=
 FQUi8oWeKA36tmOrM4e4pBBTSR9hz9lOLfj2n/p3fLw=
@@ -17635,7 +17635,7 @@ rJe5qexUTGX0M2+bu54jF83FCMWIWAvioUj4PeHWd1glCgJCFyLtncW9GueaBowJ
 9zUaxn05IBwLbL1x0Ek7nqwTAGVP2Ej/hdMdO/Wb8omar/KlvxFeSkpgEZ36UZf7
 9zUaxn05IBwCKqSROb+hZdkaACmksho9NRjgcVFmXJX24UV6E7l+x/GBY5WQh50G
 9zUaxn05IBwCUsI920A0/ZMHnOgVyIc8SgTzckro4aqar/KlvxFeSkpgEZ36UZf7
-n/H6l3GoIIPGTCHzeDEooyzdtGGixx4DpA8RkamQclo=
+n/H6l3GoIIPGTCHzeDEooyzdtGGixx4DKNiJWUbqLQM=
 T8EFg6F1LsJSoAO1PSjvmtb//tEXgv7UoUj4PeHWd1glCgJCFyLtncW9GueaBowJ
 9zUaxn05IBwcX8Vjb9aFbUCbw8kxCNmGLKs3fnGbwV4=
 9zUaxn05IBxsSts9cCbhXjhDlSszOMFBG/PT4CIbso2JTi94DFtl4PGBY5WQh50G
@@ -24757,7 +24757,7 @@ uaO7JcCmMYADzJZvNiJvj8W9GueaBowJ
 fpw86t7pQ95yKOx04asUT1U2x1UvNSu2LKs3fnGbwV4=
 YrISNdfglNUDzHTY3BGfYFU2x1UvNSu2LKs3fnGbwV4=
 sg35A0tkC58Zd1BiYTH+McW9GueaBowJ
-vomimJs1AibWlAqmeM6IlMW9GueaBowJ
+P8NwXOEu0aIfkfusuLWfeMW9GueaBowJ
 7LIDtnFOI2TWlAqmeM6IlMW9GueaBowJ
 XXIUiO8imQdG8LJA3p+w9lU2x1UvNSu2LKs3fnGbwV4=
 sdpLBAj5O9Plvv5zOgyMCMW9GueaBowJ
@@ -24846,8 +24846,8 @@ odVNTZCTdNadDVv4I3U+u+QFSal561I3iA0Bi14abud4qi09YuwSoA==
 Zi3MfnqZVN0Zd1BiYTH+McW9GueaBowJ
 r1ZONniKqatVIvu+GVICG8W9GueaBowJ
 zYMAOKJvLrow9i74a4CY+sW9GueaBowJ
-1GFCh/NEeAt10vRYDQfANNw++a3T0iYULfj2n/p3fLw=
-0FdDfo+tL8NBPBYKqQa6XIKvSCi1oETwpA8RkamQclo=
+1GFCh/NEeAvdfNNPdDnpAtw++a3T0iYULfj2n/p3fLw=
+0FdDfo+tL8NBPBYKqQa6XASWUwa8omQ8pA8RkamQclo=
 VfWJhTbwnw4iLzckD7UsNMW9GueaBowJ
 WCRf4tmy49siLzckD7UsNMW9GueaBowJ
 oxaDrJgkHuwiLzckD7UsNMW9GueaBowJ
@@ -24903,3 +24903,392 @@ Ms5Ro6kj/wvw7IhLNWxtMcW9GueaBowJ
 uxVU72e6eCVyKOx04asUT3jlhm8zd61mLKs3fnGbwV4=
 xeW/o4zVrtHw7IhLNWxtMcW9GueaBowJ
 YdqF2mrXoSGVm1SFZ62q88W9GueaBowJ
+6bY8BN6Dq1DzmaJssu2UxlU2x1UvNSu2LKs3fnGbwV4=
+Hs0NLY1uuN/sfvV66gXKL1U2x1UvNSu2LKs3fnGbwV4=
+GuvgiRI3oe9j3e0Gh7ejZ1U2x1UvNSu2LKs3fnGbwV4=
+UhrrGmzO7wCTwThubVEyN8W9GueaBowJ
+I/2Wdf7f82+TwThubVEyN8W9GueaBowJ
+4sx8mzgu5NfKL7l2wIrhhsW9GueaBowJ
+rNLEHxbYIWiXTyfKXAtKuiibZTYEHi63Lfj2n/p3fLw=
+Rc5nyKvyzup3qBA82Nzce1U2x1UvNSu2LKs3fnGbwV4=
+ggPQkuf2ewCGx9fCRqDXufGBY5WQh50G
+g1jovPf6F1E+03JbZpPE8P9R9iFTMZBjLfj2n/p3fLw=
+g1jovPf6F1HELq1aCd7o7KYnlEO5YRCRpA8RkamQclo=
+k8a/7OnKdbqQQEe6QYMOivGBY5WQh50G
+KOknmXdWiawLZPoUxOJNarmS8RD7jLqyLfj2n/p3fLw=
+OIKRKVKuOMP+4LYBQ6tfFiSRkpoZSSoNLfj2n/p3fLw=
+ovrYHo+skar2b4pXd5HF58W9GueaBowJ
+md7FgUY16RT+4LYBQ6tfFiSRkpoZSSoNLfj2n/p3fLw=
+md7FgUY16RRpHAHM1WsmQySRkpoZSSoNLfj2n/p3fLw=
+3GBnrfosR77sfvV66gXKL1U2x1UvNSu2LKs3fnGbwV4=
+cNYvbdkCgfiGIMT8R6RiZRGgambkOcQApA8RkamQclo=
+wnJmxSAOfmLlvv5zOgyMCMW9GueaBowJ
+Yb+2BiR/pIaqL5VnWSv1KySRkpoZSSoNLfj2n/p3fLw=
+WptjQ8u7Cl3I+AuaFp+2p8W9GueaBowJ
+nfa+7nsJwgpiouLlVRAtBvGBY5WQh50G
+Ii7gEM48I7rAVFClvboEclc9S2qI1uIw1PhGUALSc4t4qi09YuwSoA==
+qL8VxTNHEhYHVl7OD+mhhVU2x1UvNSu2LKs3fnGbwV4=
+6STBrEt9p/ZcKGxd/YVBvuohT2odj49s9LUUBMQGZDR4qi09YuwSoA==
+Z0A2kuK86msDq+4Ol8ZiR/n573jbNz09pA8RkamQclo=
+VHWDZ+jzfAt6YIGlqsBOpX8uWWzar+2OLfj2n/p3fLw=
+ApmEtMU6smIqg98R2I7/v1U2x1UvNSu2LKs3fnGbwV4=
+84qV57HGeuEXSJ4ndsWp1MW9GueaBowJ
+7KziSZAu06RMly1z2zmFRFU2x1UvNSu2LKs3fnGbwV4=
+9UV+Wd0dZhWar/KlvxFeSkpgEZ36UZf7
+jgggdlL4muzlkUFprKYkkFU2x1UvNSu2LKs3fnGbwV4=
+XLKUBc5ANOrlkUFprKYkkFU2x1UvNSu2LKs3fnGbwV4=
+bmWbk+OdZtR/hFFV+a7//VU2x1UvNSu2LKs3fnGbwV4=
+dsPjjZCNRi363DmHJFd7d8W9GueaBowJ
+Bt/3oM6G+PaOONWxwcrl8VU2x1UvNSu2LKs3fnGbwV4=
+IosC9kM1DJCNeKkcn7RSeMkdPR0jFOkqLfj2n/p3fLw=
+D7m+tc/QrHCar/KlvxFeSkpgEZ36UZf7
+IEZdPblDrG/2U8otGscvgp0ibSCTBuVdpA8RkamQclo=
+hf0j2x17NQDWlAqmeM6IlMW9GueaBowJ
+my0JNzUXyuUZd1BiYTH+McW9GueaBowJ
+bMIyr+HSE3vcL50VNMzQVMW9GueaBowJ
+XXIUiO8imQdcNzQgT7Qg/0lx3FLOaYNqttoP512dY39BrHThoI/x5Q==
+cA6kPjEpsoJfCx13OzaCVcW9GueaBowJ
+F2r11E4eqC3QHD/P1ZyZ2MW9GueaBowJ
+Gy/XgVWIkNsZd1BiYTH+McW9GueaBowJ
+261M969mfle7m9eaSTizPsosnbifQaEnLfj2n/p3fLw=
+wp/TObDvT5iQjI80orEFIMW9GueaBowJ
+KbKku7ucQ38agKPCFJhOJFU2x1UvNSu2LKs3fnGbwV4=
+sf94f+eU0c8XnU/5xtHjBvGBY5WQh50G
+Yk0Ke0EcobY1cZVPr81FEyibZTYEHi63Lfj2n/p3fLw=
+WWBFaR0HCBnC6JC0JDUd+cW9GueaBowJ
+Zt437lU2WKb6sRuPnnwQI1U2x1UvNSu2LKs3fnGbwV4=
+RbVL22sbu4zYrQcj50z1BZyFMorHdN2vLfj2n/p3fLw=
+UBFExqgKXmrz2nLUywn+SsBUZADARJXWLfj2n/p3fLw=
+4fpWUFa+lAC7xXCDssaqasW9GueaBowJ
+dNK2aBTZIxQ/DyFoHSUMSO9f7DCg/y6tLfj2n/p3fLw=
+s8oXtu0KrEpz7n7I4UwACe9f7DCg/y6tLfj2n/p3fLw=
+stU0riR+EQBz7n7I4UwACe9f7DCg/y6tLfj2n/p3fLw=
+yz+PICsSa0KiXwDjUpDwTAgCCOpaanEZLfj2n/p3fLw=
+fcTTwro3YPTTwfRpvFm8MATCwHiAbn7tj5FRm5YPtmV4qi09YuwSoA==
+nSBq5urieLj5FuTX1uz5tAcJpBhQjqB2Lfj2n/p3fLw=
+7KZCoy1mU+CVWHYSGvHe8VU2x1UvNSu2LKs3fnGbwV4=
+bCmg7DWPEghU0fwNOOkfCMW9GueaBowJ
+m10T595ukB7xlnAdJ6xvDlh2AuVY7QMWLfj2n/p3fLw=
+ohRrCSCa+dcuWE0/DRvMuFh2AuVY7QMWLfj2n/p3fLw=
+ohRrCSCa+df4SEZyvqBrLcW9GueaBowJ
+faV4LClJD0UtgQqZTIy+AsW9GueaBowJ
+gkjD/6rQHN3otu0uXE6UncW9GueaBowJ
+cHpfhFuVxBOxfCb/lPUKlMW9GueaBowJ
+UgTZ0qsYk9GychQ6Us/ngsW9GueaBowJ
+gp0wkGsrJ1KAFz51Xh3n08W9GueaBowJ
+ApmEtMU6smLBjqlaOqk1O1U2x1UvNSu2LKs3fnGbwV4=
+zpx5S5sZogOOwjk+wlafMUnHB+XJJ7a5Lfj2n/p3fLw=
+IHPdczs3Cv1or2DeJsGGbV1TneuFEystkkFvFpXWUt2ar/KlvxFeSkpgEZ36UZf7
+x4uilTVhyM/fHfaE5MWBd11TneuFEystkkFvFpXWUt2ar/KlvxFeSkpgEZ36UZf7
+oD4sgRB5CDd/6kMGUp+c6VU2x1UvNSu2LKs3fnGbwV4=
+3fBL/mHZJfT9WZowZhg+N8W9GueaBowJ
+rgm99SdZOTmowx8jH8y2PcW9GueaBowJ
+TeJ0FEDJyxFnlScNVO/wZsW9GueaBowJ
+DU4i/Y4+KQI1C3KcwKiX/yibZTYEHi63Lfj2n/p3fLw=
+NZJxkb84brhoUEhkms8PTyibZTYEHi63Lfj2n/p3fLw=
+vfx4L5SWOCMfkfusuLWfeMW9GueaBowJ
+uuyT96dmXFBstiIFhte0D8W9GueaBowJ
+Kx+fLtBkIsuEaHHBshHiCSibZTYEHi63Lfj2n/p3fLw=
+pvdW2LzMagzLqkQC0FCDucW9GueaBowJ
+/lHJ++WmBu+Fiw0cQqBlT7USFoNJzQK6pA8RkamQclo=
+UB++3LWUbBebDgRU606c8iibZTYEHi63Lfj2n/p3fLw=
+UB++3LWUbBfHIpwLwNesbkRMBpcnoniiLfj2n/p3fLw=
+3lYEJRmTL04d7C3Uh8bXwk7/mcroWxeJl5BKi3bWqR/fLVtuT350xJqD8eGUp1EsLfj2n/p3fLw=
+Be1T87t+ge6IDqE7/lksCLdyEziS17EZpA8RkamQclo=
+Be4s15r6PWqM2hOr72bcNFU2x1UvNSu2LKs3fnGbwV4=
+6KeVNIzodFaF88ZJkdnAW1U2x1UvNSu2LKs3fnGbwV4=
+Pwacc4yn9Iu7P7/3UYT6MlU2x1UvNSu2LKs3fnGbwV4=
+PQlTF2j6ne1aD4sPG+/RtsW9GueaBowJ
+n74rvvb1YUY8nC8JCD+Fg/GBY5WQh50G
+QL7uetpIgQgXb1NFSmYJDMW9GueaBowJ
+4PKKfypoD1yar/KlvxFeSkpgEZ36UZf7
+5yftLq3xaf5cmHb422HiJptFKPVvVZKbLfj2n/p3fLw=
+8smmiRZ1UC+/e1Vig7WiicW9GueaBowJ
+zApfiZwdjC+/e1Vig7WiicW9GueaBowJ
++zImXiS2e2H55trt25lHWWabn/vj6ZcFLfj2n/p3fLw=
+Nk00WO0ynZ3nHYoOGQGyH+WgMpOCr0YELfj2n/p3fLw=
+LOfVxfmUfRBUUOUiLTLW/cW9GueaBowJ
+oMvVnuZZkmt1EDU2aZ7LGOklq0geL4pIpA8RkamQclo=
+D3C9tHD21prnJgfvU1fkSyibZTYEHi63Lfj2n/p3fLw=
+kQHtQ28+jmRQTcI8S9f0YBzd1Zn+LndCOKlkYg16NpxBrHThoI/x5Q==
+0DdEo4ivfdS/1VUj+CLqE+narJMwfHzELfj2n/p3fLw=
+ib079HkmfIwFhfnjPKd+oUCbw8kxCNmGLKs3fnGbwV4=
+Ug9yBDBbRy1AJGxQk4iM7oJVnd+ppTRBfyMs8Ji0e3R4qi09YuwSoA==
+b+p7oPuIEcUZtGtdyQdnXkCbw8kxCNmGLKs3fnGbwV4=
+HCEq+yB3xiQXu9lhRvmKDJ9C2w8N4lKwOKlkYg16NpxBrHThoI/x5Q==
+ovrYHo+skarGXNkgSB0sk1Fz9ySp6WTnpA8RkamQclo=
+skMOGlO4bYZM+DkHvzYQSle6UChhQBTNpA8RkamQclo=
+DORn3ThSYBcxAy2R4oMe1mGlGktE6kBlLfj2n/p3fLw=
+xHKzWRXvgcYMhaNDM6sUrMW9GueaBowJ
+bORvZe7L22cGdz/iLTmzTFU2x1UvNSu2LKs3fnGbwV4=
+YYazlXIvocPmE8RLXWaxbcsy7/SJicNgLfj2n/p3fLw=
+McawZNEvh++ar/KlvxFeSkpgEZ36UZf7
+2WBUBaGSq5Kar/KlvxFeSkpgEZ36UZf7
+iCB1GUvvqVFXemvATqpTTT8lAJWl3FnwLfj2n/p3fLw=
+aE+18/DsjwIsI0Xju+5OB8W9GueaBowJ
+r21LbzFJ1MMsI0Xju+5OB8W9GueaBowJ
+PMnLxNQ/Q5mar/KlvxFeSkpgEZ36UZf7
+RRmtNZvkAQO4BgSZ4yE5giaeuZsnUcPlttoP512dY39BrHThoI/x5Q==
+l1yLWahM8CMDzJZvNiJvj8W9GueaBowJ
+Be1T87t+ge46jeBYCwvSSCibZTYEHi63Lfj2n/p3fLw=
+TjKKqXM+0uwt+4rZZWVGzcW9GueaBowJ
+T56Tgy/ifDb62JyfVxB9rfGBY5WQh50G
+BG+MfhlwppKVm1SFZ62q88W9GueaBowJ
+MHWWVpSYUhY/dZglFe46ltK2YctRSXCkLfj2n/p3fLw=
+hrssvoC/uK3EDQhKcf/o8MW9GueaBowJ
+MHWWVpSYUhY2z9SsdJr2mcW9GueaBowJ
+jAJIvwKpsMW2EkinjidSXVU2x1UvNSu2LKs3fnGbwV4=
+bEN5K/VInjJpOarA+DaFn8W9GueaBowJ
+fcTTwro3YPQNLBVQVO59LVU2x1UvNSu2LKs3fnGbwV4=
+GpR2li1sn5VUdVUem0h0xcW9GueaBowJ
+ERwzEHJFSaTsXD3BMgg8zaCCIWcWSwEdpA8RkamQclo=
+ZJsdNVAA+GqJRkzkTrxIMrnqQIBshtv/Lfj2n/p3fLw=
+dEKCZG/r+qaVm1SFZ62q88W9GueaBowJ
+7Gn08Ne+p4aVm1SFZ62q88W9GueaBowJ
+XKvDmxSJQt5yKOx04asUT1U2x1UvNSu2LKs3fnGbwV4=
+E/qT2/YO9dgMhaNDM6sUrMW9GueaBowJ
+d7q+saFWKQEMhaNDM6sUrMW9GueaBowJ
+OgJkiiRLMa0Zd1BiYTH+McW9GueaBowJ
+Ia0GAZyPZmQZd1BiYTH+McW9GueaBowJ
+pF0E12cBymgcKtoMVw0a38W9GueaBowJ
+zp08dORmAZscKtoMVw0a38W9GueaBowJ
+W8LZoVVj3qQXnU/5xtHjBvGBY5WQh50G
+EdjFCbSdEdQwU4j9tFrZ0VU2x1UvNSu2LKs3fnGbwV4=
+ZZbomeatflOrEsVjYu3JL1U2x1UvNSu2LKs3fnGbwV4=
+ZZbomeatflMke79qeOFpsbmS8RD7jLqyLfj2n/p3fLw=
+ZZbomeatflOfRFCdYFYo71U2x1UvNSu2LKs3fnGbwV4=
+ZZbomeatflNj94lT0N6iqbmS8RD7jLqyLfj2n/p3fLw=
+gqmUBQSUywCVm1SFZ62q88W9GueaBowJ
+movXsGeJRWsFoEKzDWXdKMW9GueaBowJ
+movXsGeJRWsMhaNDM6sUrMW9GueaBowJ
+aFanbWx5rhYcKtoMVw0a38W9GueaBowJ
+v3hdPmyScHoHviJxWio/ulU2x1UvNSu2LKs3fnGbwV4=
+XXIUiO8imQdTWgcdzplVHlU2x1UvNSu2LKs3fnGbwV4=
+vpFTdXB73ZSt7r/5Z/dmrC9SYh+dXcBhpA8RkamQclo=
+KbIdnEaaWdAZd1BiYTH+McW9GueaBowJ
+aksm/GLo33mVBvQX9nXRsMW9GueaBowJ
+9TrSTUEd0UmyEuF74+xIzMW9GueaBowJ
+lku2N2jDKsRYSBV1BXO2zsW9GueaBowJ
+/3xJp1HyJ55bMaZHFBcicMW9GueaBowJ
+9lnhkDhZwSQ+csjkIxMwXMW9GueaBowJ
+1v6cNqEf9bg+uXzEF1Kk0cW9GueaBowJ
+nq+dzOELmlRFyqxPOvb/PcW9GueaBowJ
+cIriPnLOXPscIB5IOOGpW/GBY5WQh50G
+hFKAj1jGMUmKVtlpTBc8t8W9GueaBowJ
+WHDeP/Eu6rUZd1BiYTH+McW9GueaBowJ
+FuHFdp9GLbzbcsEDWj3khMW9GueaBowJ
+CRefhXD2AfFyKOx04asUT1U2x1UvNSu2LKs3fnGbwV4=
+W+PxW86fz3eAFz51Xh3n08W9GueaBowJ
+ApmEtMU6smKVbaq0hPsRvlU2x1UvNSu2LKs3fnGbwV4=
+7q8NrdxtyXFUUOUiLTLW/cW9GueaBowJ
+zN+HSi8ZrFS97o13/SqmW8W9GueaBowJ
+sNxS2qAQrNdkvG845/OVBsW9GueaBowJ
+iK3yuYNm11vN21VnYiBLcFU2x1UvNSu2LKs3fnGbwV4=
+E6IvCjhg78yar/KlvxFeSkpgEZ36UZf7
+Gzka6Dl0D+0Zd1BiYTH+McW9GueaBowJ
+6BKoof5vME3shV13rJjysMW9GueaBowJ
+AiHgDcyzZmEkuQ2L145c8lU2x1UvNSu2LKs3fnGbwV4=
+9XfnOE+iXfRaD4sPG+/RtsW9GueaBowJ
+petAwAFzfPOAFz51Xh3n08W9GueaBowJ
+bYP4eZXu1JMZd1BiYTH+McW9GueaBowJ
+zdISnbEr02KVm1SFZ62q88W9GueaBowJ
+zwpPF4xpwUpy5iy5i6/iD1U2x1UvNSu2LKs3fnGbwV4=
+LebqTsJXaCi6xV+sKIq0GFjjDimEltcP
+VxU2fhgAi1WpYY/eI42QpFjjDimEltcP
+UTeuvR+4o3q19ZY8eezNt1jjDimEltcP
+fxV3guBUhmC5xNnVFI8vBT70S6X17pVDLfj2n/p3fLw=
+vQzHePbdE1m6ywKYuPGVLVU2x1UvNSu2LKs3fnGbwV4=
+Z3lN0vFCqrwTy4nnnM1mDcW9GueaBowJ
+S6sBcmX01bT6vvUXh4LedvGBY5WQh50G
+UlIz4dzbI0m2RXpQFOaA7cW9GueaBowJ
+CTT4odSq6pO8pP1mP8OiqwSWUwa8omQ8pA8RkamQclo=
+iWgFsdm8YEf1NJ3PhsrX5d/5Tq0mzjtNttoP512dY39BrHThoI/x5Q==
+fSdCl1Ik52tCV3BU6fC8MrAwOxQY09F7ttoP512dY39BrHThoI/x5Q==
+fSdCl1Ik52tCV3BU6fC8MvE53lfJIWocLfj2n/p3fLw=
+fSdCl1Ik52tCV3BU6fC8MnSBe0d4MomqttoP512dY39BrHThoI/x5Q==
+fSdCl1Ik52tCV3BU6fC8MixRdQjgWw/NttoP512dY39BrHThoI/x5Q==
+fSdCl1Ik52tCV3BU6fC8Msp21IRfgb4xttoP512dY39BrHThoI/x5Q==
+a7vtXyMPCbCV2Qw9WrpHWcW9GueaBowJ
+MV7t13mpfMaIu+nPJjko1cW9GueaBowJ
+0kk1gI2XgVkYUIY1NRdDpIlXPvmR4c0xLfj2n/p3fLw=
+0kk1gI2XgVnmOGLByQQpEgmy3a5Evvfm8oxTVQp9l6JBrHThoI/x5Q==
+Gk0o2EJfKJHCcR/NKoHXEk5B8NfD73EAICQymMf1jpdI6SrCqNIkdMW9GueaBowJ
+Gk0o2EJfKJHCcR/NKoHXEocyr8NKkjynx6URp2zp1sjoOlcNReyIokpgEZ36UZf7
+Gk0o2EJfKJFYJsANkj2BM6NTMIxL5uYAeKotPWLsEqA=
+Gk0o2EJfKJGbMcNQNf7F6IFGBxTHJ5tj6c8QjV8q3CxKYBGd+lGX+w==
+CX/EJ65zcweDIpuRFcUt41jjDimEltcP
+cZqh0zhyT4It+4rZZWVGzVjjDimEltcP
+fNk4Nt2UC3wt+4rZZWVGzVjjDimEltcP
+GUAOOEhjw/kkj2BWI540ACep3cfgEnvHQax04aCP8eU=
+GUAOOEhjw/nJiCd2ZRPagiep3cfgEnvHQax04aCP8eU=
+zUHxY1tHrQGKp9db0R/12Sep3cfgEnvHQax04aCP8eU=
+UUik7VIpDyhG0jdKtPsuasBUZADARJXWLfj2n/p3fLw=
+UUik7VIpDygs2nyfvT1Oon5pIN0aZoGBLfj2n/p3fLw=
+7KziSZAu06SLmP0ujqS3M1U2x1UvNSu2LKs3fnGbwV4=
+kufl4jWl4k8E5cxACgqSQcW9GueaBowJ
+XLKpe1H4VQiQDQG8mi0OzlU2x1UvNSu2LKs3fnGbwV4=
+pvdW2LzMagyHIAckSxn4hCibZTYEHi63Lfj2n/p3fLw=
+fkGZhX/El4RlgUrPhCv5G8W9GueaBowJ
+XLKpe1H4VQhDDZdOtMseEJzj11qLzuXEpA8RkamQclo=
+qgptQDm5mShDDZdOtMseEJzj11qLzuXEpA8RkamQclo=
+ApmEtMU6smJDDZdOtMseEJzj11qLzuXEpA8RkamQclo=
+9ydnzW/kbQVDDZdOtMseEJzj11qLzuXEpA8RkamQclo=
+rdgjdvEorHwF77ajBr5BWVU2x1UvNSu2LKs3fnGbwV4=
+YIA0iVBnnMiar/KlvxFeSkpgEZ36UZf7
+9ydnzW/kbQUF77ajBr5BWVU2x1UvNSu2LKs3fnGbwV4=
+x103cwLnlco00z6eP3Php6HIVVr+506SLfj2n/p3fLw=
+9SXyXpslnYFpDKDGhKC5V8W9GueaBowJ
+IIYE2I/8g90gMUPma35YDcW9GueaBowJ
+cv6ls1geCgppDKDGhKC5V8W9GueaBowJ
+9Rw+Ebvycj8LX1aHkQJka8W9GueaBowJ
+nI9z8PbGuYdnlScNVO/wZsW9GueaBowJ
+5HNYxlZxEDm903KPOqUxSMW9GueaBowJ
+OtCpKkgQ0xsWqm5p03PQ9MW9GueaBowJ
+q4uXcsZnU8H600DXchTSqMW9GueaBowJ
+Rnij/HOIS3iw0amVAwG0JcW9GueaBowJ
+JO1emKtXPNqOn7xAGnZZo8W9GueaBowJ
+4Q1KiuSl39o/n+5qVN0QbcW9GueaBowJ
+5HNYxlZxEDkYTxHeWM3NMVU2x1UvNSu2LKs3fnGbwV4=
+5HNYxlZxEDmxmCMuY78UglU2x1UvNSu2LKs3fnGbwV4=
+5HNYxlZxEDnhLleteDzLFlU2x1UvNSu2LKs3fnGbwV4=
+5HNYxlZxEDnXXV1mwgEUOVU2x1UvNSu2LKs3fnGbwV4=
+5HNYxlZxEDlfUarZrdZ/s06uZWO3tvfwpA8RkamQclo=
+5HNYxlZxEDm3E6OurQHoWvZUk3Yn9JRqpA8RkamQclo=
+5HNYxlZxEDk44pL0uT3ZR+OjQmGSDkDOpA8RkamQclo=
+5HNYxlZxEDk8N4rUZwkXQdKa+d/nE+59pA8RkamQclo=
+qgr7A+C36yMcY7r+pIxWOlU2x1UvNSu2LKs3fnGbwV4=
+7CCyEQXuVSwSdpqVjmhCoacdbZIKQMQ6ttoP512dY39BrHThoI/x5Q==
+7CCyEQXuVSwSdpqVjmhCobv0YnDYo/6WpA8RkamQclo=
+fhOM/y2qmLzJBy+REYLWdcW9GueaBowJ
+IXzJiNXztfi/OfaUqhZkHMW9GueaBowJ
+B5DO9dw1D2YMJ6HqNay6UZbUpsLvst6tpA8RkamQclo=
+/Ejs9xtVoJOLmP0ujqS3M1U2x1UvNSu2LKs3fnGbwV4=
+6rO7lnNpD4jPf3TOCqf5EsW9GueaBowJ
++tMQIlXeU1aIu+nPJjko1cW9GueaBowJ
+iVgG1u1OC8jZhcmL/fVDkQ3PVsg0HPaupA8RkamQclo=
+2auQrCxhHIs2z9SsdJr2mcW9GueaBowJ
+B2EBAR60Ipo8MuG4ta/TPMW9GueaBowJ
+jM5dfwEEr+jR4uFRnyRZLvGBY5WQh50G
+/4YxpeXdrVQcKtoMVw0a38W9GueaBowJ
+PYIKxqjozGYMhaNDM6sUrMW9GueaBowJ
+HJdP8N2ouYgMhaNDM6sUrMW9GueaBowJ
+m1YJwXArLVodYWtGokLrlAcJpBhQjqB2Lfj2n/p3fLw=
+J+FkXZr2UG0HgZ5qsH83A1U2x1UvNSu2LKs3fnGbwV4=
+0k4Va28nLjgXSJ4ndsWp1MW9GueaBowJ
+iVgG1u1OC8iGRmTrF4CNl6CCIWcWSwEdpA8RkamQclo=
+Gy/XgVWIkNt/7vAVZWs3PVU2x1UvNSu2LKs3fnGbwV4=
+iVgG1u1OC8imse85JbbzWpLmz9PsVQgHpA8RkamQclo=
+EgHgqVRmyJxVIvu+GVICG8W9GueaBowJ
+woEsaznqCj+x28Fa7MhMtgcJpBhQjqB2Lfj2n/p3fLw=
+t5tE5rpAQc3bcsEDWj3khMW9GueaBowJ
+b6dsgd1ymNPbcsEDWj3khMW9GueaBowJ
+9hVhu2qkdQm9zKbcXd7wZuWgMpOCr0YELfj2n/p3fLw=
+IbxcPvQYISPxJ0nxSuvoBOWgMpOCr0YELfj2n/p3fLw=
+3BvyzjY734YD3fxpgTCZEMW9GueaBowJ
+3BvyzjY734Y2z9SsdJr2mcW9GueaBowJ
+JPNNI7Mn7GkiwmNPI5hFOcW9GueaBowJ
+bDLebPwWS+QMhaNDM6sUrMW9GueaBowJ
+Uo8AprcHMc0MhaNDM6sUrMW9GueaBowJ
+FI0I1iUvrGUMimBy7b/3TfGBY5WQh50G
+AGJVehsOLzjPGQKETruFHVU2x1UvNSu2LKs3fnGbwV4=
+cxWtyrMIvu0MimBy7b/3TfGBY5WQh50G
+oPhDFaqTtcdIhYT70RP81MW9GueaBowJ
+K7BTE1NKVRJnlScNVO/wZsW9GueaBowJ
+3tvdV9GbJnjt42Kh6f2ATyibZTYEHi63Lfj2n/p3fLw=
+poSIReHvfs9cvqHEv9dAC8W9GueaBowJ
+x8NVSBNGt9wK3CNl6+bvGcW9GueaBowJ
+Pw2l3LTTiphoxC6nmLURfXjlhm8zd61mLKs3fnGbwV4=
+iO/G5G1J0KQq2xJK7F0FB8W9GueaBowJ
+1kmoZaRRYJVxfj2ZXadxmUnHB+XJJ7a5Lfj2n/p3fLw=
+zmDLzWugzUoK3CNl6+bvGcW9GueaBowJ
+OuYRjO39P10D3j6CW68L8VU2x1UvNSu2LKs3fnGbwV4=
+hJ6abW11Qe+XaYNKrbp4IVU2x1UvNSu2LKs3fnGbwV4=
+6oVo0vCUNv2lE5/j4pbAe5/TUQi7iH/kpA8RkamQclo=
+pETewWDLfxgD3fxpgTCZEMW9GueaBowJ
+6oVo0vCUNv2lE5/j4pbAex6xWlQLrme/pA8RkamQclo=
+Mki4Br8j/EMhKSoxeWYDfB6xWlQLrme/pA8RkamQclo=
+2gjhNrDt+ec2z9SsdJr2mcW9GueaBowJ
+b/WI/AkkF2ilE5/j4pbAe5/TUQi7iH/kpA8RkamQclo=
+uuyT96dmXFCCxoHI9rlE7i60FqoYrd3tpA8RkamQclo=
+KrmwdNkdWQF7fAzeubscWP5Tio1UsjhULfj2n/p3fLw=
+iIhsY//rth4t3sV9KmqDlVU2x1UvNSu2LKs3fnGbwV4=
+B5DO9dw1D2aF0GJQet94v7mS8RD7jLqyLfj2n/p3fLw=
+B5DO9dw1D2Y2wAJnZvbmb2NT3kuWy/O8ttoP512dY39BrHThoI/x5Q==
+B5DO9dw1D2YudlNG/+/9/qrWKUTI9fMlttoP512dY39BrHThoI/x5Q==
+B5DO9dw1D2aqMO3uR0TyZ6rWKUTI9fMlttoP512dY39BrHThoI/x5Q==
+iF+IWDLZbrzwIZo7pz1I/y60FqoYrd3tpA8RkamQclo=
+dRNqv/mzb28zPy+xTizJ2sW9GueaBowJ
+TGvQyY2r9tvwIZo7pz1I/y60FqoYrd3tpA8RkamQclo=
+TGvQyY2r9tulE5/j4pbAex6xWlQLrme/pA8RkamQclo=
+KIJkUkBTAk82z9SsdJr2mcW9GueaBowJ
+AMOcjAKHLog2z9SsdJr2mcW9GueaBowJ
+KIJkUkBTAk/MG+WjKMWDHZiGvzlrt38WLfj2n/p3fLw=
+NEZjxU1y8/D6D97kELcDfZiGvzlrt38WLfj2n/p3fLw=
+oLUPa+ZwxkaCxoHI9rlE7i60FqoYrd3tpA8RkamQclo=
+00kBSxiurzlZY1iE2x6xdC60FqoYrd3tpA8RkamQclo=
+00kBSxiurzk1W1wcExbGm2qXFjD/hPpjpA8RkamQclo=
+xhWftWtq9ZuF9iSYd3AnDSibZTYEHi63Lfj2n/p3fLw=
+KcRso6Pv9PQZPOn9DOStwVU2x1UvNSu2LKs3fnGbwV4=
+Y1t0AWU3jI0wU4j9tFrZ0VU2x1UvNSu2LKs3fnGbwV4=
+XYi78xtbQvLH7dNbiaeM7cW9GueaBowJ
+nMNtJxazs8+OINWxlhDwW6CCIWcWSwEdpA8RkamQclo=
+XYi78xtbQvIE5cxACgqSQcW9GueaBowJ
+UFlcFnv2Y2vDe7j1GWWablU2x1UvNSu2LKs3fnGbwV4=
+chYBQcbRLsLbu6LzlGCUDMW9GueaBowJ
+d4v7xluIC1e3akOkOBxi1MW9GueaBowJ
+MMO8flvYWlB/7vAVZWs3PVU2x1UvNSu2LKs3fnGbwV4=
+yQHJWsvh1X8M7ZopTnn2DcW9GueaBowJ
+kg/VJpJMLpajuHrFpyBhxuBQxf4LqYrrttoP512dY39BrHThoI/x5Q==
+2cAUuTJ4vfTHa4dKkvWlNu9f7DCg/y6tLfj2n/p3fLw=
+u4VFHLSprlvvX2SVReoPwP1Nz1arETAXttoP512dY39BrHThoI/x5Q==
+W0ATnZ2YT3z/fJb1vqgysg1b00l+T1xZTr9TUAvTlVp4qi09YuwSoA==
+eM7Y3vKqA+ED3j6CW68L8VU2x1UvNSu2LKs3fnGbwV4=
+EtZ4IniAVKwhXhqTVE96hSgwMneSN3bhLfj2n/p3fLw=
+ZA5uxxoztkrYvSJh4xRYG8W9GueaBowJ
+7KZCoy1mU+Bh0hq4xlrKSlU2x1UvNSu2LKs3fnGbwV4=
+aMsbvjbfGsWU5ROAz9tjdKCCIWcWSwEdpA8RkamQclo=
+n78AZY/FF/hhN2jFDh022MW9GueaBowJ
+sXi2ZzZ3QkLWlAqmeM6IlMW9GueaBowJ
+fkoR7Gg7DVcZd1BiYTH+McW9GueaBowJ
+0GIGQBI1htzC6JC0JDUd+cW9GueaBowJ
+BVsqqvlJD8fC6JC0JDUd+cW9GueaBowJ
+Xl0zOoAehnoReV4ojJPyzsW9GueaBowJ
+Xl0zOoAehnpGDbIjOsg9BsW9GueaBowJ
+7Y6DZNY2xGVGDbIjOsg9BsW9GueaBowJ
+Y06nT2UaW3A8MuG4ta/TPMW9GueaBowJ
+zaPSCoLSBPOar/KlvxFeSkpgEZ36UZf7
++ojTIp5v4bTL/sokDgVDU/GBY5WQh50G
+nfEjT0clHSXbcsEDWj3khMW9GueaBowJ
+Zz3SLgfjpSkPt774Yig0zcW9GueaBowJ
+O6Zqq9szOgTvBT/HxMP098kq2uUJ22kmLfj2n/p3fLw=
+joRcuCpi9AbvBT/HxMP098kq2uUJ22kmLfj2n/p3fLw=
+1GFCh/NEeAs9j3CJsTummckq2uUJ22kmLfj2n/p3fLw=
+Gez3zi23Dv7bX3r9n5n9rVAOaiVFDWCVLfj2n/p3fLw=
+52DONQ5vJPoD3j6CW68L8VU2x1UvNSu2LKs3fnGbwV4=
+rZz1pvqy+sK4WuaLlIj4C1U2x1UvNSu2LKs3fnGbwV4=
+7KZCoy1mU+BPqYo78YZNl1U2x1UvNSu2LKs3fnGbwV4=
+Nh+GralU559T1PVj65URnktPXbvHUhUapA8RkamQclo=
+7KZCoy1mU+BT1PVj65URnktPXbvHUhUapA8RkamQclo=
+7KZCoy1mU+AT3kdFlxOhVlU2x1UvNSu2LKs3fnGbwV4=
+ohRrCSCa+dcc6LCerjhE/denvOXaq/4aLfj2n/p3fLw=
+5FKR7ZBjMMRvmmOPkg+QT4hgWqUjWkoMLfj2n/p3fLw=
+t+3mCkAXJ99k8y/FQLrbvMW9GueaBowJ
+KzFC+vIaFx8IcO7CBm5YFMW9GueaBowJ
+9GrcUCCAs8Gds4aEnF5s8sW9GueaBowJ
+21FEZWwAuXd/4l/xelo0PHjlhm8zd61mLKs3fnGbwV4=
+IyME371/COyXuFJBMWyVwsW9GueaBowJ
+IyME371/COzGXNkgSB0sk1Fz9ySp6WTnblxKVJlly/8=
+QU4izwJvsBt3zT+Zu92mpS4lXN+c2P3VblxKVJlly/8=
+swNZuvrdsrWE4wRyM4o99sW9GueaBowJ
+VgukSku0t4fHfHhqyT00t8W9GueaBowJ
+hX4JO4ilY+uBMt3R9eghj8W9GueaBowJ
+IoIoNIGjGAn6D97kELcDfZiGvzlrt38WLfj2n/p3fLw=
+O/9Yk/OXbUXl9Rg5UPuTfvGBY5WQh50G
+c0vlrxEP6MMD3j6CW68L8VU2x1UvNSu2LKs3fnGbwV4=
+W9HH6C1O869eXZePrhiZj21LWJ3FTBP2pA8RkamQclo=
+4agv4pnXwGY8MuG4ta/TPMW9GueaBowJ
+VYMAX5VW3DQ8MuG4ta/TPMW9GueaBowJ
+eM0CZeWk/0Q8MuG4ta/TPMW9GueaBowJ
+hU2JsvCVd8iVbaq0hPsRvlU2x1UvNSu2LKs3fnGbwV4=
+aH2Pl8NYolGpMiYwptT3qCibZTYEHi63Lfj2n/p3fLw=
+pYF12yPYxOBcb0czTGxsyFU2x1UvNSu2LKs3fnGbwV4=

bigdata-web/src/test/java/org/diagbot/CacheFileManagerTest.java

@@ -26,7 +26,7 @@ public class CacheFileManagerTest {
     }
 
     public void contextMappingInitialized() {
-        MysqlJdbc nlpJdbc = new MysqlJdbc("root", "diagbot@20180822", "jdbc:mysql://192.168.2.235:3306/med-s?useUnicode=true&characterEncoding=UTF-8");
+        MysqlJdbc nlpJdbc = new MysqlJdbc("root", "lantone", "jdbc:mysql://192.168.2.121:3306/med?useUnicode=true&characterEncoding=UTF-8");
         Connection conn = nlpJdbc.connect();
         Statement st = null;
         ResultSet rs = null;

graph-web/src/main/resources/application.yml

@@ -12,7 +12,7 @@ spring:
       charset: UTF-8
       enabled: true
   datasource:       # mybatis 配置，使用druid数据源
-    url: jdbc:mysql://192.168.2.235:3306/graph-web?useUnicode=true&characterEncoding=UTF-8
+    url: jdbc:mysql://1.1.1.1:3306/graph-web?useUnicode=true&characterEncoding=UTF-8
     username: root
     password: diagbot@20180822
     type: com.alibaba.druid.pool.DruidDataSource

graph/src/main/resources/sexAge.dict

@@ -592,7 +592,7 @@ QXHaYAMJQ7/FvRrnmgaMCQ==
 j5r7gucVUZPp5ZxWLLR5AS349p/6d3y8
 Lz3xBm67RkVVyamDmYnpfjGNMMvXHJmC
 kQHtQ28+jmRWIB83VXJqByyrN35xm8Fe
-PbYt1gxECy9PyDHKyZ3KARCOh35FTrhDf9e/2UjqI0fFvRrnmgaMCQ==
+9U2iKDgg7A8Fwc85LPgI0GDbMrtym4KUeKotPWLsEqA=
 mtIyd1Hqz2UxOjWwaO+5Dj8PLzc11tWsQax04aCP8eU=
 fDYkXHftmz8W40YEz3OcstSGSakSJUzZeKotPWLsEqA=
 it7CAuuV7SAxR6MAda5356QPEZGpkHJa
@@ -1158,7 +1158,7 @@ JfNtumkrZmxvbR4XDkKjggxr6LyaSznieKotPWLsEqA=
 b8ErQvNUZge21gN+q0c3vqQPEZGpkHJa
 JfNtumkrZmw7DinSsD8MBDI7066I+E8fmq/ypb8RXkpKYBGd+lGX+w==
 BT/fHxNzenARRLLJRGBoUC349p/6d3y8
-FQUi8oWeKA0OsheGum+CXaQPEZGpkHJa
+FQUi8oWeKA0OsheGum+CXW5cSlSZZcv/
 pEpH+RMCU2G21gN+q0c3vqQPEZGpkHJa
 YmFbY+KQ4Y5k2APy5BDRc21xZMWnmwq9Qax04aCP8eU=
 EpkhMubA/KXQpA+y/oKUUaQPEZGpkHJa
@@ -2476,7 +2476,7 @@ Eq5VJuqm/iCChQBQ0HmJGvBjDc6YVozAmq/ypb8RXkpKYBGd+lGX+w==
 R1Vwa0rLfaVKtqgxnW7bwc/RvG5HYC/sM8bOVEfASk/FvRrnmgaMCQ==
 atzWyH9igvz89EZrxmAsAdNT95SkLHLIrPHeV7tOs3vxgWOVkIedBg==
 atzWyH9igvy//lF/+Pk+H9NT95SkLHLIrPHeV7tOs3vxgWOVkIedBg==
-H2eaHSBk3dpWgHE3Y5h4cgaP0uYN8IByQax04aCP8eU=
+pwmJtiBT1985FZ311/7ePyyrN35xm8Fe
 6GD7Nfjee9oPoBuAz6CxwvoGdXtgcCHU01MYuuUMKUcYHy38j8RheCyrN35xm8Fe
 sVXI6TfppIV/T9Uhc6irVYRTFQfd158KM8bOVEfASk/FvRrnmgaMCQ==
 zIfEYJb04elWgHE3Y5h4cgaP0uYN8IByQax04aCP8eU=
@@ -9523,7 +9523,7 @@ uGTuryj+tOsAtM+BG/Lw4yQQ8K42nLpDeKotPWLsEqA=
 Y16URROdqEx+wPtZwxseavlalACax0r5Qax04aCP8eU=
 9pzYhs9wWQp+7mLkPHSV2fem7VGBz0eb2xu6/IA5JtzxgWOVkIedBg==
 uGTuryj+tOvQ5JYaky+hnbLNgfAK5e0aeKotPWLsEqA=
-uGTuryj+tOtgN4Xv6QXDPC349p/6d3y8
+lky5VKsiFuTFvRrnmgaMCQ==
 Lgrg85i6pxiJ97P/3YQTQaQPEZGpkHJa
 8v64ZC+8UFumPH5L1vFOZiyrN35xm8Fe
 XHih9lYA8/pN0PUQkzwUHqQPEZGpkHJa
@@ -10134,14 +10134,14 @@ B8w+Leibou83jfinsyzjqVFheItN0h2Nr0v5pOAFNwI1m1w9fAg2gSyrN35xm8Fe
 By5Q/SU5xirWuCFgQKtxiFFheItN0h2Nr0v5pOAFNwI1m1w9fAg2gSyrN35xm8Fe
 cPDKivAIKoe6sipaQQr451FheItN0h2Nr0v5pOAFNwI1m1w9fAg2gSyrN35xm8Fe
 BXQUha07j2YW40YEz3OcslFheItN0h2Nr0v5pOAFNwI1m1w9fAg2gSyrN35xm8Fe
-+/2OC1vcA4AmhbdxontiXFFheItN0h2Nr0v5pOAFNwI1m1w9fAg2gSyrN35xm8Fe
++/2OC1vcA4BvjyLPnTxTH1FheItN0h2Nmq/ypb8RXkpKYBGd+lGX+w==
 vKMadaRxCnvp6gLrPkJa61FheItN0h2Nr0v5pOAFNwI1m1w9fAg2gSyrN35xm8Fe
 46RKeKrgKofEEUMXkymMT12lphhhK8g51zMNsa85/xrFvRrnmgaMCQ==
 glddNMedxyRFQbW3noP3pqxxzpsSi8aWmq/ypb8RXkpKYBGd+lGX+w==
 36s42ZhwjJ4UHNlX3+xyXSsHiIwWK6GHxC/de4m0Po3xgWOVkIedBg==
 EoFoqzO/R+G5M8tS1KZ/PUHja5jX2PQaeKotPWLsEqA=
 B8w+Leibou83jfinsyzjqVFheItN0h2NvZ/OTI+wfdU1m1w9fAg2gSyrN35xm8Fe
-rjhqzeVmkFn4UdCOgcORtlFheItN0h2NvZ/OTI+wfdU1m1w9fAg2gSyrN35xm8Fe
+rjhqzeVmkFlzCIj6arogkeJA/Bid8pBH1zMNsa85/xrFvRrnmgaMCQ==
 5Y1mwjb8gugiKdKAOW+k6VFheItN0h2NvZ/OTI+wfdU1m1w9fAg2gSyrN35xm8Fe
 1AooRnXbEgh9WYdAmyfR9lFheItN0h2NvZ/OTI+wfdU1m1w9fAg2gSyrN35xm8Fe
 By5Q/SU5xirWuCFgQKtxiFFheItN0h2NvZ/OTI+wfdU1m1w9fAg2gSyrN35xm8Fe
@@ -11330,7 +11330,7 @@ mscuPrILVGDj6uG6UR98vC349p/6d3y8
 qjQEvkTAaKWzXmKqIXy3v1rXPHULrPf4DOlg+yEfronxgWOVkIedBg==
 biT7+6/eTSsjCQFsbwhTAQCP9heTbolSQjn5f5QIlePFvRrnmgaMCQ==
 XS8bUKaQun+GBiOZZsX6ivEGCkxJgIepeKotPWLsEqA=
-B+/CSTZg+VcRe3RZpYFL37zZvY15Bd9uagk4/sCxk10eOekIAqoYODS2bTxfc9RKLKs3fnGbwV4=
+B+/CSTZg+VcRe3RZpYFL37zZvY15Bd9uN3lC3PQXsDLFvRrnmgaMCQ==
 GhRXduWr8cb6kiy7/ILyevFm22FHP8f5MfpsscypK+Kb6klcP6QHjSyrN35xm8Fe
 mscuPrILVGDPKZNsQ93yjailoxXz6kJWp1HdWxYPpjrxgWOVkIedBg==
 bKuUJ1epVUJVk4WHEHm5hj8PLzc11tWsQax04aCP8eU=
@@ -12908,7 +12908,7 @@ Fuf6pvQ8ckB1sXunLF29Tjb0lF7RYqvcQax04aCP8eU=
 dRXKYlKp0ivy/Y8+prgNnvQ9ESntPVrIeKotPWLsEqA=
 aak3L9Lnp6mEma3UH3skIHl8JsYXjPfCQax04aCP8eU=
 FQUi8oWeKA2BEzUegK+LzaQPEZGpkHJa
-5Bgoob8FfZTO0EtYHLOvpj8PLzc11tWsQax04aCP8eU=
+5Bgoob8FfZTO0EtYHLOvpsM1yUIjER1sQax04aCP8eU=
 kvJ9l6NV5Fnuq8q2TQycqAa2szONeQhPmq/ypb8RXkpKYBGd+lGX+w==
 FQUi8oWeKA1hE5NxRs2+jaQPEZGpkHJa
 FQUi8oWeKA36tmOrM4e4pD8PLzc11tWsQax04aCP8eU=
@@ -14764,7 +14764,7 @@ rJe5qexUTGX0M2+bu54jF83FCMWIWAvioUj4PeHWd1iLKVWCCOezlS349p/6d3y8
 9zUaxn05IBwLbL1x0Ek7nqwTAGVP2Ej/otnt8g0PR3zFvRrnmgaMCQ==
 9zUaxn05IBwCKqSROb+hZdkaACmksho9NRjgcVFmXJU1m1w9fAg2gSyrN35xm8Fe
 9zUaxn05IBwCUsI920A0/ZMHnOgVyIc8N3lC3PQXsDLFvRrnmgaMCQ==
-n/H6l3GoIIPGTCHzeDEooxP9xkCi/4b4eKotPWLsEqA=
+n/H6l3GoIIPGTCHzeDEooxP9xkCi/4b4eXyyRiJmUlY=
 T8EFg6F1LsJSoAO1PSjvmtb//tEXgv7UoUj4PeHWd1iLKVWCCOezlS349p/6d3y8
 9zUaxn05IBwcX8Vjb9aFbaQPEZGpkHJa
 9zUaxn05IBxsSts9cCbhXjhDlSszOMFBG/PT4CIbso149wiynVG8pCyrN35xm8Fe
@@ -21306,3 +21306,8 @@ LVbLn2n5fv+1UD1kKrrIq6QPEZGpkHJa
 VynNxYGlkQBoQiPzscAqGy349p/6d3y8
 LDpfYG6SR7kjJBLpKNC7Wm5cSlSZZcv/
 XsRueZvhAyoSM4JWt9br8qQPEZGpkHJa
+kQHtQ28+jmRQTcI8S9f0YBzd1Zn+LndCmq/ypb8RXkpKYBGd+lGX+w==
+ib079HkmfIwFhfnjPKd+oaQPEZGpkHJa
+Ug9yBDBbRy1AJGxQk4iM7oJVnd+ppTRB9ZdcuU/iHiTxgWOVkIedBg==
+b+p7oPuIEcUZtGtdyQdnXqQPEZGpkHJa
+HCEq+yB3xiQXu9lhRvmKDJ9C2w8N4lKwmq/ypb8RXkpKYBGd+lGX+w==

graph/src/test/java/org/diagbot/graph/CacheFile.java

@@ -12,10 +12,13 @@ public class CacheFile {
     public static void main(String[] args) {
         CacheFile cacheFile = new CacheFile();
         cacheFile.diagSort();
+        cacheFile.sexAge();
+//        cacheFile.contentMaping();
+        cacheFile.vitalMaping();
     }
     //诊断大小类对应
     public void diagSort(){
-        MysqlJdbc nlpJdbc = new MysqlJdbc("root", "diagbot@20180822", "jdbc:mysql://192.168.2.235:3306/bigdata-web?useUnicode=true&characterEncoding=UTF-8");
+        MysqlJdbc nlpJdbc = new MysqlJdbc("root", "lantone", "jdbc:mysql://192.168.2.121:3306/med?useUnicode=true&characterEncoding=UTF-8");
         Connection conn = nlpJdbc.connect();
         Statement st = null;
         ResultSet rs = null;
@@ -43,7 +46,7 @@ public class CacheFile {
     }
     //诊断和性别,年龄的对应
     public void sexAge(){
-        MysqlJdbc nlpJdbc = new MysqlJdbc("root", "diagbot@20180822", "jdbc:mysql://192.168.2.235:3306/med-s?useUnicode=true&characterEncoding=UTF-8");
+        MysqlJdbc nlpJdbc = new MysqlJdbc("root", "lantone", "jdbc:mysql://192.168.2.121:3306/med?useUnicode=true&characterEncoding=UTF-8");
         Connection conn = nlpJdbc.connect();
         Statement st = null;
         ResultSet rs = null;
@@ -77,7 +80,7 @@ public class CacheFile {
 
     //标签类型对应
     public void contentMaping()  {
-        MysqlJdbc nlpJdbc = new MysqlJdbc("root", "diagbot@20180822", "jdbc:mysql://192.168.2.235:3306/med-s?useUnicode=true&characterEncoding=UTF-8");
+        MysqlJdbc nlpJdbc = new MysqlJdbc("root", "lantone", "jdbc:mysql://192.168.2.121:3306/med?useUnicode=true&characterEncoding=UTF-8");
         Connection conn = nlpJdbc.connect();
         Statement st = null;
         ResultSet rs = null;
@@ -105,7 +108,7 @@ public class CacheFile {
     }
     //体征及体征结果
     public void vitalMaping()  {
-        MysqlJdbc nlpJdbc = new MysqlJdbc("root", "diagbot@20180822", "jdbc:mysql://192.168.2.235:3306/med-s?useUnicode=true&characterEncoding=UTF-8");
+        MysqlJdbc nlpJdbc = new MysqlJdbc("root", "lantone", "jdbc:mysql://192.168.2.121:3306/med?useUnicode=true&characterEncoding=UTF-8");
         Connection conn = nlpJdbc.connect();
         Statement st = null;
         ResultSet rs = null;

graphdb/src/main/resources/application.yml

@@ -13,7 +13,7 @@ spring:
 # 驱动配置信息
   datasource:
     driver-class-name: org.neo4j.jdbc.Driver
-    url: jdbc:neo4j:http://192.168.2.232:7474
+    url: jdbc:neo4j:http://192.168.2.233:7474
     username: neo4j
     password: root
     #定义初始连接数

nlp-web/src/main/resources/application.yml

@@ -12,7 +12,7 @@ spring:
       charset: UTF-8
       enabled: true
   datasource:       # mybatis 配置，使用druid数据源
-    url: jdbc:mysql://192.168.2.235:3306/med-s?useUnicode=true&characterEncoding=UTF-8
+    url: jdbc:mysql://1.1.1.1:3306/med-s?useUnicode=true&characterEncoding=UTF-8
     username: root
     password: diagbot@20180822
     type: com.alibaba.druid.pool.DruidDataSource

nlp/src/main/java/org/diagbot/nlp/util/DictUtil.java

@@ -29,7 +29,7 @@ public class DictUtil {
     }
 
     public void writeToDict(String path) {
-        MysqlJdbc nlpJdbc = new MysqlJdbc("root", "diagbot@20180822", "jdbc:mysql://192.168.2.235:3306/med-s?useUnicode=true&characterEncoding=UTF-8");
+        MysqlJdbc nlpJdbc = new MysqlJdbc("root", "lantone", "jdbc:mysql://192.168.2.121:3306/med?useUnicode=true&characterEncoding=UTF-8");
         Connection conn = nlpJdbc.connect();
         Statement st = null;
         ResultSet rs = null;

push-web/src/main/resources/application.yml

@@ -12,7 +12,7 @@ spring:
       charset: UTF-8
       enabled: true
   datasource:       # mybatis 配置，使用druid数据源
-      url: jdbc:mysql://192.168.2.235:3306/bigdata-web?useUnicode=true&characterEncoding=UTF-8
+      url: jdbc:mysql://1.1.1.1:3306/bigdata-web?useUnicode=true&characterEncoding=UTF-8
       username: root
       password: diagbot@20180822
       type: com.alibaba.druid.pool.DruidDataSource

push-web/src/main/resources/static/dist/js/push.js

@@ -1,6 +1,6 @@
-var nlp_web_url = "http://192.168.2.234:5002/nlp-web";
-var bigdata_web_url = "http://192.168.2.234:5001/bigdata-web";
-var graph_web_url = "http://192.168.2.234:5003/graph-web";
+var nlp_web_url = "http://192.168.2.186:5002/nlp-web";
+var bigdata_web_url = "http://192.168.2.186:5001/bigdata-web";
+var graph_web_url = "http://192.168.2.186:5003/graph-web";
 // var push_web_url = "http://192.168.2.234:5008/push-web";
 
 // var nlp_web_url = "http://192.168.3.180:5002/nlp-web";