mali-applet-ui 1.1.58 → 1.1.60

package/env/index.js

@@ -11,10 +11,16 @@ const pack = require('../package.json')
 
 const apiURL = 'http://192.168.10.217:3000'
 
+function hasEmptyConf (key) {
+  return !key || key === 'default'
+}
+
 function getEnvCode (mode) {
   const maps = {
     dev: 'development',
     test: 'testing',
+    sit: 'integrationtest',
+    uat: 'acceptancetest',
     demo: 'demo',
     pre: 'prerelease',
     prod: 'production'
@@ -26,6 +32,8 @@ function getEnvName (mode) {
   const maps = {
     dev: '开发环境',
     test: '测试环境',
+    sit: '集成测试环境',
+    uat: '验收测试环境',
     demo: '演示环境',
     pre: '预发布环境',
     prod: '正式环境'
@@ -149,7 +157,7 @@ function initEnvScript (rootPath, confs) {
       const envName = `.env.${customName || 'default'}.${subName || 'default'}.${platform || 'default'}.${getEnvCode(mode)}`
       if (!fs.existsSync(path.resolve(rootPath, envName))) {
         console.log(`${pack.name} 生成配置文件 ${envName}`)
-        fs.writeFileSync(path.resolve(rootPath, envName), `# ${[customName || '', getEnvName(mode)].map(v => v).join('-')}\n`)
+        fs.writeFileSync(path.resolve(rootPath, envName), `# ${[customName ? getCustomName(customName) : '', subName ? getSubModuleName(subName) : '', getEnvName(mode)].filter(v => v).map(v => v).join('-')}\n`)
       }
     })
   })
@@ -338,8 +346,9 @@ function getTransporter () {
   if (!currTransporter) {
     currTransporter = new Promise((resolve, reject) => {
       axios.get(`${apiURL}/emai/getSmtpOptions`).then(res => {
-        const transporter = nodemailer.createTransport(smtpTransport(res.data))
-        resolve(transporter)
+        const smtpOptions = res.data
+        const transporter = nodemailer.createTransport(smtpTransport(smtpOptions))
+        resolve({ transporter, smtpOptions })
       }).catch((e) => {
         console.log('获取邮箱配置失败')
         reject(e)
@@ -351,19 +360,24 @@ function getTransporter () {
 
 function sendMail ({ receivedBy, subject, html }) {
   return new Promise((resolve, reject) => {
-    getTransporter().then((transporter) => {
-      transporter.sendMail({
-        from: 'xuliangzhan@ddscan.cn',
-        to: receivedBy,
-        subject,
-        html
-      }, function (error) {
-        if (error) {
-          reject(error)
-        } else {
-          resolve()
-        }
-      })
+    getTransporter().then(({ transporter, smtpOptions }) => {
+      if (smtpOptions) {
+        transporter.sendMail({
+          from: smtpOptions.auth.user,
+          to: receivedBy,
+          subject,
+          html
+        }, function (error) {
+          if (error) {
+            reject(error)
+          } else {
+            resolve()
+          }
+        })
+      } else {
+        const e = {}
+        reject(e)
+      }
     }).catch((e) => {
       reject(e)
     })
@@ -406,19 +420,31 @@ function sendQyWechatMsg (webhook, opts) {
   })
 }
 
+const runSystemName = `${getPlatformName(process.env.VUE_APP_PLATFORM_NAME)}小程序`
+
 function getBuildMsg (description, time) {
+  const title = [getCustomName(process.env.VUE_APP_CUSTOM_MODULE), hasEmptyConf(process.env.VUE_APP_SUB_MODULE) ? description : getSubModuleName(process.env.VUE_APP_SUB_MODULE)].filter(v => v).join('-')
   return `
-  # <font color="info">${[getCustomName(process.env.VUE_APP_CUSTOM_MODULE), description, `（${getPlatformName(process.env.VUE_APP_PLATFORM_NAME)}小程序）`].join('')}</font> 【${getEnvName(process.env.VUE_APP_MODE)}】 开始构建
+  # <font color="info">${title}</font> 开始构建
+>> 平台：<font color="comment">${runSystemName}</font>
+${process.env.GIT_BRANCH ? `>> Git分支：<font color="comment">${process.env.GIT_BRANCH}</font>` : ''}
+${process.env.VUE_APP_MODE ? `>> 环境：<font color="info">${getEnvName(process.env.VUE_APP_MODE)}</font>` : ''}
 >> 构建时间：<font color="comment">${XEUtils.toDateString(XEUtils.toStringDate(process.env.VUE_APP_PUBLISH_DATE, 'yyyyMMddHHmmss'), 'yyyy-MM-dd HH:mm:ss')}</font>
 >> 预计用时：<font color="comment">${time || 15}分钟</font>
+${process.env.BUILD_USER ? `>> 操作人：${process.env.BUILD_USER}` : ''}
 <font color="comment">-自动化发版</font>
 `
 }
 
 function getBuildSuccessMsg (description) {
+  const title = [getCustomName(process.env.VUE_APP_CUSTOM_MODULE), hasEmptyConf(process.env.VUE_APP_SUB_MODULE) ? description : getSubModuleName(process.env.VUE_APP_SUB_MODULE)].filter(v => v).join('-')
   return `
-# <font color="info">${[getCustomName(process.env.VUE_APP_CUSTOM_MODULE), description, `（${getPlatformName(process.env.VUE_APP_PLATFORM_NAME)}小程序）`].join('')}</font> 【${getEnvName(process.env.VUE_APP_MODE)}】 <font color="info">体验版更新成功</font>
->> 构建时间：<font color="comment">${XEUtils.toDateString(XEUtils.toStringDate(process.env.VUE_APP_PUBLISH_DATE, 'yyyyMMddHHmmss'), 'yyyy-MM-dd HH:mm:ss')}</font>
+# <font color="info">${title}</font> <font color="info">发版成功</font>
+>> 平台：<font color="comment">${runSystemName}</font>
+${process.env.GIT_BRANCH ? `>> Git分支：<font color="comment">${process.env.GIT_BRANCH}</font>` : ''}
+${process.env.VUE_APP_MODE ? `>> 环境：<font color="info">${getEnvName(process.env.VUE_APP_MODE)}</font>` : ''}
+${process.env.VUE_APP_PUBLISH_DATE ? `>> 部署时间：<font color="comment">${XEUtils.toDateString(XEUtils.toStringDate(process.env.VUE_APP_PUBLISH_DATE, 'yyyyMMddHHmmss'), 'yyyy-MM-dd HH:mm:ss')}</font>` : ''}
+${process.env.BUILD_USER ? `>> 操作人：${process.env.BUILD_USER}` : ''}
 <font color="comment">-自动化发版</font>`
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mali-applet-ui",
-  "version": "1.1.58",
+  "version": "1.1.60",
   "description": "码里UI-小程序组件库(vue2)",
   "files": [
     "lib",