Merge branch 'master' into release

src/components/AdminPage/IPCam/index.js

@@ -169,7 +169,7 @@ class IPCamPage extends React.Component {
                     <Message>
                         <Message.Header>攝影機事件通知位址</Message.Header>
                         <p>
-                            {`${location.protocol}//${location.host}${location.port != '' ? `:${location.port}` : ''}/camevent`}
+                            {`${location.protocol}//${location.host}/camevent`}
                         </p>
                     </Message>
                     <Button basic content="新增" icon="plus" floated="right" type="button" style={{marginBottom: '15px'}} color="green" onClick={()=>{this.openModal(0)}} />