Merge remote-tracking branch 'origin/master'

src/main/resources/config/caSign.properties

@@ -1,26 +1,27 @@
 #\u662F\u5426\u5F00\u542F\u63A5\u53E3 1:\u5F00\u542F\uFF1B0:\u5173\u95ED
 isCaOpen=1
 #ca\u63A5\u53E3ip
-caServerIp=10.6.0.88
-#ca\u63A5\u53E3\u7AEF\u53E3
-caServerPort=8002
+#caServerIp=10.6.0.88
+##ca\u63A5\u53E3\u7AEF\u53E3
+#caServerPort=8002
 #\u7B7E\u7AE0\u7F16\u53F7
-signNo=4312686C726F27FF
+#signNo=3012E4D7D234DC58
+#\u7B7E\u7AE0\u7BA1\u7406\u540E\u53F0\u8D26\u53F7\uFF1Aoperator \u5BC6\u7801\uFF1A111111
 #\u5916\u7F51\u6D4B\u8BD5
 #ca\u63A5\u53E3ip
-#caServerIp=223.70.139.221
-##ca\u63A5\u53E3\u7AEF\u53E3
-#caServerPort=18002
+caServerIp=223.70.139.221
+#ca\u63A5\u53E3\u7AEF\u53E3
+caServerPort=18002
 ##\u7B7E\u7AE0\u7F16\u53F7
-#signNo=59BC18FE5DEB0F15
+signNo=59BC18FE5DEB0F15
 #\u7B7E\u7AE0\u4F4D\u7F6E\u5DE6\u504F
-signLeft=200
+signLeft=100
 #\u7B7E\u7AE0\u4F4D\u7F6E\u4E0A\u504F
-signTop=300
+signTop=750
 #\u7B7E\u7AE0\u4F4D\u7F6E\u53F3\u504F
-signRight=650
+signRight=150
 #\u7B7E\u7AE0\u4F4D\u7F6E\u4E0B\u504F
-signBottom=50
+signBottom=200
 
 
 #\u5907\u4EFD\u539F\u6587\u4EF6\u8DEF\u5F84