diff --git a/calendar.js b/calendar.js
index 81a8f79..749a115 100644
--- a/calendar.js
+++ b/calendar.js
@@ -4,6 +4,24 @@
  * @date 2021/11/29 09:59:26
  */
 
+import chalk from 'chalk'
+import { sloar2lunar } from './lunar.js'
+
+const CAL_HEAD = ['日', '一', '二', '三', '四', '五', '六'].map((s, i) => {
+  s = '星期' + s
+  if (i === 0 || i === 6) {
+    s = chalk.red(s)
+  }
+  return '  ' + s + '  ' + chalk.grey('|')
+})
+const VLINE = chalk.grey('|')
+const DASHED_LINE = chalk.grey('|' + (' '.repeat(10) + '|').repeat(7))
+
+// 画间隔线
+function drawDashedLine(start = '', pipe = ' ') {
+  return chalk.grey(start + (pipe.repeat(10) + '|').repeat(7))
+}
+
 //获取今年的年份/月份，返回的是数组
 export function getThisYearMonth() {
   var d = new Date()
@@ -32,24 +50,126 @@ function getToday() {
 
 //计算日历数组
 export function getCalendarTable(year, month) {
-  var nums = getTotalDays(year, month)
-  var numsFixed = 1 - getFirstDay(year, month)
+  var lnums = getTotalDays(year, month - 1) //上个月天数
+  var nums = getTotalDays(year, month) // 本月天数
+  var ld = 1 - getFirstDay(year, month) //第一周需要补多少天
+  var nd = 0 // 最后一周需要补多少天, 具体看下方的计算
   var today = getToday()
   var list = []
 
-  for (let i = numsFixed; i <= nums; i++) {
-    let day = {
-      day: i < 1 ? '  ' : (i + '').padStart(2, '0')
+  for (let i = ld; i <= nums; i++) {
+    let tmp = {
+      day: i < 1 ? lnums - -i : (i + '').padStart(2, '0')
     }
     if (i > 0) {
       let week = getFirstDay(year, month, i)
-      day.weekend = week === 0 || week === 6
-      day.picked = !!isPicked({ year, month, day: i }, today)
+      tmp.weekend = week === 0 || week === 6
+      tmp.picked = !!isPicked({ year, month, day: i }, today)
+      tmp.lunar = sloar2lunar(year, month, i)
+    } else {
+      // 从上个月中补齐第1周
+      tmp.grey = 1
+      tmp.lunar = sloar2lunar(year, month - 1, lnums - -i)
     }
-    list.push(day)
+    list.push(tmp)
   }
-  while (list.length % 6 !== 0) {
-    list.push({ day: '  ' })
+
+  nd = list.length % 7
+  nd = nd > 0 ? 7 - nd : 0
+
+  // 最后一行不够1周时, 从下个月的日期中补齐
+  for (let day = 1; day <= nd; day++) {
+    list.push({
+      day: (day + '').padStart(2, '0'),
+      lunar: sloar2lunar(year, month + 1, day),
+      grey: 1
+    })
   }
   return list
 }
+
+// 画表头
+function drawThead(year, month) {
+  var dateStr = `${year}年${month + 1}月`
+
+  dateStr =
+    chalk.grey('| ') + chalk.cyan(dateStr) + ' '.repeat(75 - dateStr.length - 2) + chalk.grey('|')
+
+  console.log(chalk.grey(' ' + '_'.repeat(76)))
+  console.log(chalk.grey('|' + ' '.repeat(76) + '|'))
+  console.log(dateStr)
+  console.log(chalk.grey('|' + '_'.repeat(76) + '|'))
+  console.log(drawDashedLine('|'))
+  console.log(chalk.grey('|') + CAL_HEAD.join(''))
+  console.log(drawDashedLine('|', '_'))
+}
+
+// 画日期
+function drawTbody(year, month) {
+  var table = getCalendarTable(year, month)
+  var line = 0
+
+  for (let i = 0; i < 3 * Math.ceil(table.length / 7) + 1; i++) {
+    let tr = ''
+    for (let j = 0; j < 7; j++) {
+      let tmp = table[line + j]
+
+      if (!tmp) {
+        break
+      }
+
+      if (j === 0) {
+        tr += VLINE
+      }
+      switch (i % 3) {
+        case 0:
+          if (i === 0) {
+            tr += chalk.grey(' '.repeat(10) + '|')
+          } else {
+            tr += chalk.grey('-'.repeat(j === 6 ? 10 : 11) + (j === 6 ? '|' : ''))
+            if (j === 6) {
+              line += 7
+            }
+          }
+          break
+
+        case 1:
+          if (tmp.picked) {
+            tr += chalk.bgRed.whiteBright.bold(' '.repeat(4) + tmp.day + ' '.repeat(4)) + VLINE
+          } else {
+            // 有grey字段的, 优先置灰, 这种为 非本月份的日期
+            if (tmp.grey) {
+              tmp.day = chalk.grey(tmp.day)
+            } else {
+              if (tmp.weekend) {
+                tmp.day = chalk.redBright.bold(tmp.day)
+              } else {
+                tmp.day = chalk.whiteBright.bold(tmp.day)
+              }
+            }
+            tr += ' '.repeat(4) + tmp.day + ' '.repeat(4) + VLINE
+          }
+          break
+
+        case 2:
+          if (tmp.picked) {
+            tr += chalk.bgRed.white.bold(' '.repeat(3) + tmp.lunar + ' '.repeat(3)) + VLINE
+          } else {
+            tmp.lunar = chalk.grey(tmp.lunar)
+
+            tr += ' '.repeat(3) + tmp.lunar + ' '.repeat(3) + VLINE
+          }
+          break
+      }
+    }
+
+    console.log(tr)
+  }
+  console.log('') // 再打印一个空行, 用于分隔多个日历
+}
+
+// 渲染日历
+export function drawCalendar(year, month) {
+  drawThead(year, month)
+  drawTbody(year, month)
+}
diff --git a/img/demo1.png b/img/demo1.png
index d750087..7160984 100644
Binary files a/img/demo1.png and b/img/demo1.png differ
diff --git a/index.js b/index.js
index 0f83076..101e765 100644
--- a/index.js
+++ b/index.js
@@ -6,90 +6,113 @@
  * @date 2021/11/26 17:20:02
  */
 
-import chalk from 'chalk'
-import figlet from 'figlet'
-import { getThisYearMonth, getCalendarTable } from './calendar.js'
-
-const CAL_HEAD = ['日', '一', '二', '三', '四', '五', '六'].map((s, i) => {
-  if (i === 0 || i === 6) {
-    s = chalk.red.bold(s)
-  } else {
-    s = chalk.bold(s)
-  }
-  return ' '.repeat(4) + s + ' '.repeat(4) + chalk.grey('|')
-})
-const VLINE = chalk.grey('|')
-const DASHED_LINE = chalk.grey('|' + (' '.repeat(10) + '|').repeat(7))
+import fs from 'iofs'
+import { getThisYearMonth, drawCalendar } from './calendar.js'
 
+var { version } = JSON.parse(fs.cat('./package.json'))
+var argvs = process.argv.slice(2)
+var action = argvs.shift()
 var [year, month] = getThisYearMonth()
-var table = getCalendarTable(year, month)
-var line = 0
-var dateStr = figlet.textSync(`${year} . ${month + 1}`)
 
-function drawDashedLine(start = '', pipe = ' ') {
-  return chalk.grey(start + (pipe.repeat(10) + '|').repeat(7))
-}
-
-dateStr = dateStr
-  .split('\n')
-  .map(s => chalk.grey('| ') + chalk.cyan(s) + ' '.repeat(77 - s.length - 2) + chalk.grey('|'))
-  .slice(0, -1)
-  .join('\n')
-
-console.log(chalk.grey(' ' + '_'.repeat(76)))
-console.log(dateStr)
-console.log(chalk.grey('|' + '_'.repeat(76) + '|'))
-console.log(drawDashedLine('|'))
-console.log(chalk.grey('|') + CAL_HEAD.join(''))
-console.log(drawDashedLine('|', '_'))
-
-// 渲染日历表格
-for (let i = 0; i < 3 * 5 + 1; i++) {
-  let tr = ''
-  for (let j = 0; j < 7; j++) {
-    let tmp = table[line + j]
-
-    if (!tmp) {
-      break
-    }
-
-    if (j === 0) {
-      tr += VLINE
-    }
-    switch (i % 3) {
-      case 0:
-        if (i === 0) {
-          tr += chalk.grey(' '.repeat(10) + '|')
-        } else {
-          tr += chalk.grey('-'.repeat(j === 6 ? 10 : 11) + (j === 6 ? '|' : ''))
-          if (j === 6) {
-            line += 7
-          }
-        }
-        break
-
-      case 1:
-        if (tmp.picked) {
-          tr += chalk.bgRed.whiteBright.bold(' '.repeat(4) + tmp.day + ' '.repeat(4)) + VLINE
-        } else {
-          if (tmp.weekend) {
-            tmp.day = chalk.redBright(tmp.day)
-          } else {
-            tmp.day = chalk.whiteBright(tmp.day)
-          }
-          tr += ' '.repeat(4) + tmp.day + ' '.repeat(4) + VLINE
-        }
-        break
-
-      case 2:
-        if (tmp.picked) {
-          tr += chalk.bgRed(' '.repeat(10)) + VLINE
-        } else {
-          tr += ' '.repeat(10) + VLINE
-        }
-        break
-    }
+function drawOneYear(y) {
+  for (let i = 0; i < 12; i++) {
+    drawCalendar(y, i)
   }
-
-  console.log(tr)
+}
+
+function print(...args) {
+  args[0] = args[0].padEnd(20, ' ')
+  if (args.length > 1) {
+    args.splice(1, 0, '   -   ')
+  }
+  console.log.apply(null, args)
+}
+
+function print_help() {
+  print('='.repeat(64))
+  print(`终端版万年历                    v${version},    作者: 宇天`)
+  print('='.repeat(64))
+  print('用法: cal [command] args...')
+  print('Commands:')
+  print('  -y {year}', '打印指定年份的日历')
+  print('  -m', '打印指定月份的日历')
+  print('  -h', '查看帮助文档')
+  print('  -v', '查看程序的版本')
+  process.exit()
+}
+
+switch (action) {
+  case '-y':
+    switch (argvs.length) {
+      // 再无其他参数, 由打印当前年份所有的日历
+      case 0:
+        drawOneYear(year)
+        break
+
+      // 有1~2个参数,  cal -y 2020 2,   cal -y 2020 5
+      case 1:
+      case 2:
+        year = +argvs.shift()
+        month = +argvs.shift()
+
+        if (year === year) {
+          if (month < 13 && month > 0) {
+            drawCalendar(year, month - 1)
+          } else {
+            drawOneYear(year)
+          }
+        } else {
+          console.log('-y 参数异常')
+        }
+        break
+
+      // 3个参数  cal -y 2020 -m 1
+      case 3:
+        action = argvs.shift()
+        month = +argvs.shift()
+        if (action === '-m' && month < 13 && month > 0) {
+          drawCalendar(year, month - 1)
+        } else {
+          console.log('-m 参数异常')
+        }
+        break
+      default:
+        console.log('-y 参数异常')
+        break
+    }
+
+    break
+
+  case '-m':
+    month = +argvs.shift()
+    if (month < 13 && month > 0) {
+      drawCalendar(year, month - 1)
+    } else {
+      console.log('-m 参数异常')
+    }
+    break
+
+  case '-v':
+    print(version)
+    process.exit()
+    break
+
+  default:
+    if (action) {
+      year = +action
+      month = +argvs.shift()
+      if (year === year) {
+        if (month < 13 && month > 0) {
+          drawCalendar(year, month - 1)
+        } else {
+          drawOneYear(year)
+        }
+      } else {
+        console.log('参数异常')
+      }
+    } else {
+      drawCalendar(year, month)
+    }
+
+    break
 }
diff --git a/lunar.js b/lunar.js
new file mode 100644
index 0000000..75e799d
--- /dev/null
+++ b/lunar.js
@@ -0,0 +1,359 @@
+/* 公历转农历代码思路：
+1、建立农历年份查询表
+2、计算输入公历日期与公历基准的相差天数
+3、从农历基准开始遍历农历查询表，计算自农历基准之后每一年的天数，并用相差天数依次相减，确定农历年份
+4、利用剩余相差天数以及农历每个月的天数确定农历月份
+5、利用剩余相差天数确定农历哪一天 */
+
+// 农历1949-2100年查询表
+const LUNAR_YEARS = [
+  0x0b557, //1949
+  0x06ca0,
+  0x0b550,
+  0x15355,
+  0x04da0,
+  0x0a5b0,
+  0x14573,
+  0x052b0,
+  0x0a9a8,
+  0x0e950,
+  0x06aa0, //1950-1959
+  0x0aea6,
+  0x0ab50,
+  0x04b60,
+  0x0aae4,
+  0x0a570,
+  0x05260,
+  0x0f263,
+  0x0d950,
+  0x05b57,
+  0x056a0, //1960-1969
+  0x096d0,
+  0x04dd5,
+  0x04ad0,
+  0x0a4d0,
+  0x0d4d4,
+  0x0d250,
+  0x0d558,
+  0x0b540,
+  0x0b6a0,
+  0x195a6, //1970-1979
+  0x095b0,
+  0x049b0,
+  0x0a974,
+  0x0a4b0,
+  0x0b27a,
+  0x06a50,
+  0x06d40,
+  0x0af46,
+  0x0ab60,
+  0x09570, //1980-1989
+  0x04af5,
+  0x04970,
+  0x064b0,
+  0x074a3,
+  0x0ea50,
+  0x06b58,
+  0x055c0,
+  0x0ab60,
+  0x096d5,
+  0x092e0, //1990-1999
+  0x0c960,
+  0x0d954,
+  0x0d4a0,
+  0x0da50,
+  0x07552,
+  0x056a0,
+  0x0abb7,
+  0x025d0,
+  0x092d0,
+  0x0cab5, //2000-2009
+  0x0a950,
+  0x0b4a0,
+  0x0baa4,
+  0x0ad50,
+  0x055d9,
+  0x04ba0,
+  0x0a5b0,
+  0x15176,
+  0x052b0,
+  0x0a930, //2010-2019
+  0x07954,
+  0x06aa0,
+  0x0ad50,
+  0x05b52,
+  0x04b60,
+  0x0a6e6,
+  0x0a4e0,
+  0x0d260,
+  0x0ea65,
+  0x0d530, //2020-2029
+  0x05aa0,
+  0x076a3,
+  0x096d0,
+  0x04afb,
+  0x04ad0,
+  0x0a4d0,
+  0x1d0b6,
+  0x0d250,
+  0x0d520,
+  0x0dd45, //2030-2039
+  0x0b5a0,
+  0x056d0,
+  0x055b2,
+  0x049b0,
+  0x0a577,
+  0x0a4b0,
+  0x0aa50,
+  0x1b255,
+  0x06d20,
+  0x0ada0, //2040-2049
+  0x14b63,
+  0x09370,
+  0x049f8,
+  0x04970,
+  0x064b0,
+  0x168a6,
+  0x0ea50,
+  0x06b20,
+  0x1a6c4,
+  0x0aae0, //2050-2059
+  0x0a2e0,
+  0x0d2e3,
+  0x0c960,
+  0x0d557,
+  0x0d4a0,
+  0x0da50,
+  0x05d55,
+  0x056a0,
+  0x0a6d0,
+  0x055d4, //2060-2069
+  0x052d0,
+  0x0a9b8,
+  0x0a950,
+  0x0b4a0,
+  0x0b6a6,
+  0x0ad50,
+  0x055a0,
+  0x0aba4,
+  0x0a5b0,
+  0x052b0, //2070-2079
+  0x0b273,
+  0x06930,
+  0x07337,
+  0x06aa0,
+  0x0ad50,
+  0x14b55,
+  0x04b60,
+  0x0a570,
+  0x054e4,
+  0x0d160, //2080-2089
+  0x0e968,
+  0x0d520,
+  0x0daa0,
+  0x16aa6,
+  0x056d0,
+  0x04ae0,
+  0x0a9d4,
+  0x0a2d0,
+  0x0d150,
+  0x0f252, //2090-2099
+  0x0d520 //2100
+]
+
+const LUNAR_MONTH = ['正', '二', '三', '四', '五', '六', '七', '八', '九', '十', '冬', '腊']
+const LUNAR_DAY = {
+  0: '初',
+  1: '一',
+  2: '二',
+  3: '三',
+  4: '四',
+  5: '五',
+  6: '六',
+  7: '七',
+  8: '八',
+  9: '九',
+  10: '十',
+  20: '廿'
+}
+// 生肖、天干、地支, 节气
+const ZODIAC = ['鼠', '牛', '虎', '兔', '龙', '蛇', '马', '羊', '猴', '鸡', '狗', '猪']
+const HEAVENLY_STEMS = ['甲', '乙', '丙', '丁', '戊', '己', '庚', '辛', '壬', '癸']
+const EARTHLY_BRANCHES = ['子', '丑', '寅', '卯', '辰', '巳', '午', '未', '申', '酉', '戌', '亥']
+const SOLAR_TERMS = [
+  '立春',
+  '雨水',
+  '惊蛰',
+  '春分',
+  '清明',
+  '谷雨',
+  '立夏',
+  '小满',
+  '芒种',
+  '夏至',
+  '小暑',
+  '大暑',
+  '立秋',
+  '处暑',
+  '白露',
+  '秋分',
+  '寒露',
+  '霜降',
+  '立冬',
+  '小雪',
+  '大雪',
+  '冬至',
+  '小寒',
+  '大寒'
+]
+
+// 公历转农历函数
+export function sloar2lunar(sy, sm, sd) {
+  // 计算与公历基准的相差天数
+  let daySpan = (Date.UTC(sy, sm, sd) - Date.UTC(1949, 0, 29)) / (24 * 60 * 60 * 1000) + 1
+  let ly, lm, ld
+  // 确定输出的农历年份
+  for (let j = 0; j < LUNAR_YEARS.length; j++) {
+    daySpan -= lunarYearDays(LUNAR_YEARS[j])
+    if (daySpan <= 0) {
+      ly = 1949 + j
+      // 获取农历年份确定后的剩余天数
+      daySpan += lunarYearDays(LUNAR_YEARS[j])
+      break
+    }
+  }
+
+  // 确定输出的农历月份
+  for (let k = 0; k < lunarYearMonths(LUNAR_YEARS[ly - 1949]).length; k++) {
+    daySpan -= lunarYearMonths(LUNAR_YEARS[ly - 1949])[k]
+    if (daySpan <= 0) {
+      // 有闰月时，月份的数组长度会变成13，因此，当闰月月份小于等于k时，lm不需要加1
+      if (hasLeapMonth(LUNAR_YEARS[ly - 1949]) && hasLeapMonth(LUNAR_YEARS[ly - 1949]) <= k) {
+        if (hasLeapMonth(LUNAR_YEARS[ly - 1949]) < k) {
+          lm = k
+        } else if (hasLeapMonth(LUNAR_YEARS[ly - 1949]) === k) {
+          lm = '闰' + k
+        } else {
+          lm = k + 1
+        }
+      } else {
+        lm = k + 1
+      }
+      // 获取农历月份确定后的剩余天数
+      daySpan += lunarYearMonths(LUNAR_YEARS[ly - 1949])[k]
+      break
+    }
+  }
+
+  // 确定输出农历哪一天
+  ld = daySpan
+
+  // console.log(sm, sd, ly, lm, ld)
+  // 将计算出来的农历月份转换成汉字月份，闰月需要在前面加上闰字
+  if (hasLeapMonth(LUNAR_YEARS[ly - 1949]) && (typeof lm === 'string' && lm.indexOf('闰') > -1)) {
+    lm = `闰${LUNAR_MONTH[/\d/.exec(lm) - 1]}`
+  } else {
+    lm = LUNAR_MONTH[lm - 1]
+  }
+
+  // 将计算出来的农历年份转换为天干地支年
+  ly = getTianGan(ly) + getDiZhi(ly)
+
+  if (ld < 1) {
+    return ' '.repeat(4)
+  }
+
+  if (ld === 1) {
+    return lm + '月'
+  }
+  if (ld < 11) {
+    return LUNAR_DAY[0] + LUNAR_DAY[ld]
+  }
+
+  if (ld < 20) {
+    return LUNAR_DAY[10] + LUNAR_DAY[ld - 10]
+  }
+
+  if (ld === 20) {
+    return LUNAR_DAY[2] + LUNAR_DAY[10]
+  }
+
+  if (ld === 30) {
+    return LUNAR_DAY[3] + LUNAR_DAY[10]
+  }
+
+  return LUNAR_DAY[20] + LUNAR_DAY[ld - 20]
+}
+
+// 计算农历年是否有闰月，参数为存储农历年的16进制
+// 农历年份信息用16进制存储，其中16进制的最后1位可以用于判断是否有闰月
+function hasLeapMonth(ly) {
+  // 获取16进制的最后1位，需要用到&与运算符
+  if (ly & 0xf) {
+    return ly & 0xf
+  } else {
+    return false
+  }
+}
+
+// 如果有闰月，计算农历闰月天数，参数为存储农历年的16进制
+// 农历年份信息用16进制存储，其中16进制的第1位（0x除外）可以用于表示闰月是大月还是小月
+function leapMonthDays(ly) {
+  if (hasLeapMonth(ly)) {
+    // 获取16进制的第1位（0x除外）
+    return ly & 0xf0000 ? 30 : 29
+  } else {
+    return 0
+  }
+}
+
+// 计算农历一年的总天数，参数为存储农历年的16进制
+// 农历年份信息用16进制存储，其中16进制的第2-4位（0x除外）可以用于表示正常月是大月还是小月
+function lunarYearDays(ly) {
+  let totalDays = 0
+
+  // 获取正常月的天数，并累加
+  // 获取16进制的第2-4位，需要用到>>移位运算符
+  for (let i = 0x8000; i > 0x8; i >>= 1) {
+    let monthDays = ly & i ? 30 : 29
+    totalDays += monthDays
+  }
+  // 如果有闰月，需要把闰月的天数加上
+  if (hasLeapMonth(ly)) {
+    totalDays += leapMonthDays(ly)
+  }
+
+  return totalDays
+}
+
+// 获取农历每个月的天数
+// 参数需传入16进制数值
+function lunarYearMonths(ly) {
+  let monthArr = []
+
+  // 获取正常月的天数，并添加到monthArr数组中
+  // 获取16进制的第2-4位，需要用到>>移位运算符
+  for (let i = 0x8000; i > 0x8; i >>= 1) {
+    monthArr.push(ly & i ? 30 : 29)
+  }
+  // 如果有闰月，需要把闰月的天数加上
+  if (hasLeapMonth(ly)) {
+    monthArr.splice(hasLeapMonth(ly), 0, leapMonthDays(ly))
+  }
+
+  return monthArr
+}
+
+// 将农历年转换为天干，参数为农历年
+function getTianGan(ly) {
+  let tianGanKey = (ly - 3) % 10
+  if (tianGanKey === 0) tianGanKey = 10
+  return HEAVENLY_STEMS[tianGanKey - 1]
+}
+
+// 将农历年转换为地支，参数为农历年
+function getDiZhi(ly) {
+  let diZhiKey = (ly - 3) % 12
+  if (diZhiKey === 0) diZhiKey = 12
+  return EARTHLY_BRANCHES[diZhiKey - 1]
+}
diff --git a/package.json b/package.json
index 59647f5..39e3f2e 100644
--- a/package.json
+++ b/package.json
@@ -9,8 +9,7 @@
     "cal": "index.js"
   },
   "dependencies": {
-    "chalk": "^4.0.0",
-    "figlet": "^1.5.2"
+    "chalk": "^4.0.0"
   },
   "repository": {
     "type": "git",