Merge pull request #2572 from emqx/dev/1.8.1

Sync code from refs/heads/dev/1.8.1 to enterprise

scripts/checkPackageVersion.js

@@ -2,9 +2,15 @@
 const packageJSON = require('../package.json')
 const axios = require('axios')
 const baseURL = process.env.HOST_URL || 'http://localhost:18083'
-const packageVersion = packageJSON.version
+const rawPackageVersion = packageJSON.version
 
-const emqxVersionRegex = /^[ev](\d+\.\d+\.\d+)/
+const packageVersionRegex = /^(\d+\.\d+)/
+const matchPackageVersion = (packageVersion) => {
+  const matchRet = packageVersion.match(packageVersionRegex)
+  return matchRet ? matchRet[1] : ''
+}
+
+const emqxVersionRegex = /^[ev](\d+\.\d+)/
 const matchEmqxVersion = (emqxVersion) => {
   const matchRet = emqxVersion.match(emqxVersionRegex)
   return matchRet ? matchRet[1] : ''
@@ -13,6 +19,7 @@ const matchEmqxVersion = (emqxVersion) => {
 const check = async () => {
   const { data } = await axios.get(`${baseURL}/api/v5/status`, { params: { format: 'json' } })
   const { rel_vsn } = data
+  const packageVersion = matchPackageVersion(rawPackageVersion)
   const emqxVersion = matchEmqxVersion(rel_vsn)
   if (emqxVersion !== packageVersion) {
     console.log('EMQX Version:', emqxVersion)