1.2.3

#### 优化： - 优化**侧边栏内容**输入窗口高度，现在可显示8行； - 优化**3D标签云**的js加载时机，避免**开启3D风格但未添加标签云模块**时的js引入。 #### 修复： - 修复引用文本下的部分内容下边距不一致的问题。 #### 移除： - 移除广告模式**图片+链接**相关配置，广告改为由**侧边栏内容**配置，支持加载多广告，使用**图片+链接**配置磕查看**本站使用的侧边栏模块**中的**广告**部分。
2025-03-15 17:49:40 +08:00 · 2024-05-30 08:02:09 +08:00 · 2024-05-30 08:02:09 +08:00 · ccba5f18cb
commit ccba5f18cb
parent b871f79317 fde9ee058b
11 changed files with 45 additions and 101 deletions
--- a/settings.yaml
+++ b/settings.yaml
@ -64,7 +64,7 @@ spec:
          value: false
          help: 固定标题栏时不会随着页面滚动而隐藏，始终显示标题栏。
          options:
-            - label: 不固定
+            - label: 默认
              value: false
            - label: 固定
              value: true
@ -695,10 +695,10 @@ spec:
            - $formkit: code
              name: content
              language: html
-              height: 100px
+              height: 150px
              label: 侧边栏内容
              placeholder: 请输入 HTML 内容
-              help: '非必填，仅在侧边栏类型为公告、广告(自定义广告代码)、自定义时生效。'
+              help: '非必填，仅在侧边栏类型为公告、广告、自定义时生效。'
        - $formkit: radio
          name: enable_color_character
          label:  侧边栏信息-开启彩字切换
@ -871,6 +871,7 @@ spec:
        - $formkit: radio
          name: show_ad_tag
          label:  侧边栏广告-显示“广告”标签
+          help: '控制所有“广告模块”的显示广告标签功能。'
          value: true
          options:
            - value: true
@ -880,32 +881,13 @@ spec:
        - $formkit: radio
          name: ad_tag_close
          label:  侧边栏广告-点击“广告”标签可关闭广告
+          help: '控制所有“广告模块”的关闭广告功能。'
          value: true
          options:
            - value: true
              label:  是
            - value: false
              label:  否
-        - $formkit: radio
-          name: ad_mode
-          label:  侧边栏广告-广告展示方法
-          help: '选择“自定义广告代码”时，必须在“侧边栏内容”中填写广告代码。'
-          value: true
-          options:
-            - value: true
-              label:  图片+链接
-            - value: false
-              label:  自定义广告代码
-        - $formkit: text
-          name: ad_target_url
-          label:  侧边栏广告-广告目标地址
-          placeholder: '请输入链接地址'
-          help: '填写广告跳转的目标路径。'
-        - $formkit: attachment
-          name: ad_image
-          label:  侧边栏广告-广告图片链接
-          placeholder: '请输入/选择图片路径'
-          help: '图片+链接模式时不能为空。'
        - $formkit: number
          name: recent_posts_num
          label:  侧边栏最近文章-展示文章数量
--- a/src/css/style.less
+++ b/src/css/style.less
@ -3458,51 +3458,18 @@ button.swiper-pagination-bullet {
    border-left: 5px solid var(--theme);
    border-radius: var(--radius-inner);

-    & > :not(:last-child) {
+    & :not(:last-child) {
      margin-bottom: 4px !important;
    }

+    & :last-child {
+      margin-bottom: 0 !important;
+    }
+
    & > figure {
      margin-top: 0 !important;
    }

-    & > :last-child {
-      margin: 0 !important;
-
-      & > li:last-child {
-        margin-bottom: 0 !important;
-
-        & > p:last-child {
-          margin-bottom: 0 !important;
-        }
-      }
-    }
-
-    ol,
-    ul {
-
-      li {
-
-        ol, ul {
-          &:not(:last-child) {
-            margin-bottom: 4px !important;
-          }
-
-          &:last-child {
-            margin-bottom: 0 !important;
-          }
-        }
-
-        p:not(:last-child) {
-          margin-bottom: 4px !important;
-        }
-
-        p:last-child {
-          margin-bottom: 0 !important;
-        }
-      }
-    }
-
  }

  a:not([class]) {
--- a/src/js/common.js
+++ b/src/js/common.js
@ -578,22 +578,6 @@ const commonContext = {
    DreamConfig.effects_universe_mode && Utils.cachedScript(`${DreamConfig.theme_base}/js/effects/universe.min.js?mew=${DreamConfig.theme_version}`)
    DreamConfig.effects_circle_magic_mode && Utils.cachedScript(`${DreamConfig.theme_base}/js/effects/circleMagic.min.js?mew=${DreamConfig.theme_version}`)
  },
-  /*初始化标签云滚动样式*/
-  initTagCloud() {
-    if (!$('.tagcloud').length || !DreamConfig.show_tagcloud_style) {
-      return
-    }
-
-    tagcloud({
-      selector: '.tagcloud .card-content', //元素选择器
-      fontsize: 18, //基本字体大小, 单位px
-      radius: 75, //滚动半径, 单位px
-      mspeed: 'slow', //滚动最大速度, 取值: slow, normal(默认), fast
-      ispeed: 'slow', //滚动初速度, 取值: slow, normal(默认), fast
-      direction: 45, //初始滚动方向, 取值角度(顺时针360): 0对应top, 90对应left, 135对应right-bottom(默认)...
-      keep: false //鼠标移出组件后是否继续随鼠标滚动, 取值: false, true(默认) 对应 减速至初速度滚动, 随鼠标滚动
-    })
-  },
  /* 显示主题版本信息 */
  showThemeVersion() {
    if (!DreamConfig.enable_console_version_info) {
--- a/templates/assets/css/style.min.css
+++ b/templates/assets/css/style.min.css
--- a/templates/assets/js/common.min.js
+++ b/templates/assets/js/common.min.js
@ -11,4 +11,4 @@
 								</div>
 								<div class="progress-percentage">${e.percent}</div>
 							</div>
-						</div>`}),$(".aside-timelife").html(n)}},initSecurityLink(){DreamConfig.enable_security_link&&DreamConfig.security_link_url&&0!==DreamConfig.security_link_url.length&&$(document).on("click","a[target=_blank]",e=>{e.preventDefault();var t,e=$(e.currentTarget).attr("href"),n=window.location.hostname;window.open("_blank").location=(n=n,t=(t=e).toLowerCase().trim(),n=n.toLowerCase().trim(),t.startsWith("//")?t=window.location.protocol+t:t.startsWith("/")&&(t=window.location.origin+t),(t=t.startsWith("http://")||t.startsWith("https://")?t.replace(/\/$/,""):t).includes(n)?e:DreamConfig.security_link_url+"?target="+encodeURIComponent(e))})},initGrayMode(){var e,t,n;(!0===DreamConfig.gray_mode||"custom"===DreamConfig.gray_mode&&(e=Date.now(),t=new Date(DreamConfig.gray_mode_start_time).getTime(),n=new Date(DreamConfig.gray_mode_end_time).getTime(),t<=e)&&e<=n)&&$("html").addClass("gray-mode")},initEffects(){Utils.isMobile()||(DreamConfig.cursor_move&&Utils.cachedScript(`${DreamConfig.theme_base}/js/cursor/move/${DreamConfig.cursor_move}.min.js?mew=`+DreamConfig.theme_version),DreamConfig.cursor_click&&Utils.cachedScript(`${DreamConfig.theme_base}/js/cursor/click/${DreamConfig.cursor_click}.min.js?mew=`+DreamConfig.theme_version),DreamConfig.enable_live2d&&Utils.cachedScript(DreamConfig.theme_base+"/js/autoload.min.js?mew="+DreamConfig.theme_version),DreamConfig.effects_lantern_mode&&Utils.cachedScript(DreamConfig.theme_base+"/js/effects/lantern.min.js?mew="+DreamConfig.theme_version),DreamConfig.effects_sakura_mode&&Utils.cachedScript(DreamConfig.theme_base+"/js/effects/sakura.min.js?mew="+DreamConfig.theme_version),DreamConfig.effects_snowflake_mode&&Utils.cachedScript(DreamConfig.theme_base+"/js/effects/snowflake.min.js?mew="+DreamConfig.theme_version),DreamConfig.effects_universe_mode&&Utils.cachedScript(DreamConfig.theme_base+"/js/effects/universe.min.js?mew="+DreamConfig.theme_version),DreamConfig.effects_circle_magic_mode&&Utils.cachedScript(DreamConfig.theme_base+"/js/effects/circleMagic.min.js?mew="+DreamConfig.theme_version))},initTagCloud(){$(".tagcloud").length&&DreamConfig.show_tagcloud_style&&tagcloud({selector:".tagcloud .card-content",fontsize:18,radius:75,mspeed:"slow",ispeed:"slow",direction:45,keep:!1})},showThemeVersion(){DreamConfig.enable_console_version_info&&window.logger(`%c页面加载耗时：${Math.round(performance.now())}ms | Theme By Dream2 Plus `+DreamConfig.theme_version,"color:#fff; background: linear-gradient(270deg, #986fee, #8695e6, #68b7dd, #18d7d3); padding: 8px 15px; border-radius: 0 15px 0 15px")}};window.commonContext=t;let o=-1;{const n=["initCarousel","sparkInput","websiteTime"],i=["initEffects","showThemeVersion"];Object.keys(t).forEach(e=>!n.includes(e)&&!i.includes(e)&&t[e]()),document.addEventListener("DOMContentLoaded",function(){$("html").addClass("loaded"),n.forEach(e=>t[e]&&t[e]())}),window.addEventListener("load",function(){i.forEach(e=>t[e]&&t[e]()),$("html").addClass("ready")})}})();
+						</div>`}),$(".aside-timelife").html(n)}},initSecurityLink(){DreamConfig.enable_security_link&&DreamConfig.security_link_url&&0!==DreamConfig.security_link_url.length&&$(document).on("click","a[target=_blank]",e=>{e.preventDefault();var t,e=$(e.currentTarget).attr("href"),n=window.location.hostname;window.open("_blank").location=(n=n,t=(t=e).toLowerCase().trim(),n=n.toLowerCase().trim(),t.startsWith("//")?t=window.location.protocol+t:t.startsWith("/")&&(t=window.location.origin+t),(t=t.startsWith("http://")||t.startsWith("https://")?t.replace(/\/$/,""):t).includes(n)?e:DreamConfig.security_link_url+"?target="+encodeURIComponent(e))})},initGrayMode(){var e,t,n;(!0===DreamConfig.gray_mode||"custom"===DreamConfig.gray_mode&&(e=Date.now(),t=new Date(DreamConfig.gray_mode_start_time).getTime(),n=new Date(DreamConfig.gray_mode_end_time).getTime(),t<=e)&&e<=n)&&$("html").addClass("gray-mode")},initEffects(){Utils.isMobile()||(DreamConfig.cursor_move&&Utils.cachedScript(`${DreamConfig.theme_base}/js/cursor/move/${DreamConfig.cursor_move}.min.js?mew=`+DreamConfig.theme_version),DreamConfig.cursor_click&&Utils.cachedScript(`${DreamConfig.theme_base}/js/cursor/click/${DreamConfig.cursor_click}.min.js?mew=`+DreamConfig.theme_version),DreamConfig.enable_live2d&&Utils.cachedScript(DreamConfig.theme_base+"/js/autoload.min.js?mew="+DreamConfig.theme_version),DreamConfig.effects_lantern_mode&&Utils.cachedScript(DreamConfig.theme_base+"/js/effects/lantern.min.js?mew="+DreamConfig.theme_version),DreamConfig.effects_sakura_mode&&Utils.cachedScript(DreamConfig.theme_base+"/js/effects/sakura.min.js?mew="+DreamConfig.theme_version),DreamConfig.effects_snowflake_mode&&Utils.cachedScript(DreamConfig.theme_base+"/js/effects/snowflake.min.js?mew="+DreamConfig.theme_version),DreamConfig.effects_universe_mode&&Utils.cachedScript(DreamConfig.theme_base+"/js/effects/universe.min.js?mew="+DreamConfig.theme_version),DreamConfig.effects_circle_magic_mode&&Utils.cachedScript(DreamConfig.theme_base+"/js/effects/circleMagic.min.js?mew="+DreamConfig.theme_version))},showThemeVersion(){DreamConfig.enable_console_version_info&&window.logger(`%c页面加载耗时：${Math.round(performance.now())}ms | Theme By Dream2 Plus `+DreamConfig.theme_version,"color:#fff; background: linear-gradient(270deg, #986fee, #8695e6, #68b7dd, #18d7d3); padding: 8px 15px; border-radius: 0 15px 0 15px")}};window.commonContext=t;let o=-1;{const n=["initCarousel","sparkInput","websiteTime"],i=["initEffects","showThemeVersion"];Object.keys(t).forEach(e=>!n.includes(e)&&!i.includes(e)&&t[e]()),document.addEventListener("DOMContentLoaded",function(){$("html").addClass("loaded"),n.forEach(e=>t[e]&&t[e]())}),window.addEventListener("load",function(){i.forEach(e=>t[e]&&t[e]()),$("html").addClass("ready")})}})();
--- a/templates/common/config.html
+++ b/templates/common/config.html
@ -12,12 +12,12 @@

    html {
      --theme: [(${theme.config.basic_style.theme_color})];
-      [(${theme.config.enhance.cursor_style == 'breeze' ? '--cursor-default:url(/themes/theme-dream2-plus/assets/cursor/breeze/Arrow.cur),auto;--cursor-pointer:url(/themes/theme-dream2-plus/assets/cursor/breeze/Hand.cur),pointer;--cursor-text:url(/themes/theme-dream2-plus/assets/cursor/breeze/IBeam.cur),auto;--cursor-zoom-in:url(/themes/theme-dream2-plus/assets/cursor/breeze/Cross.cur),zoom-in;'
-      : theme.config.enhance.cursor_style == 'black_cat' ? '--cursor-default:url(/themes/theme-dream2-plus/assets/cursor/black_cat/normal.cur),auto;--cursor-pointer:url(/themes/theme-dream2-plus/assets/cursor/black_cat/ayuda.cur),pointer;--cursor-text:url(/themes/theme-dream2-plus/assets/cursor/black_cat/texto.cur),auto;--cursor-zoom-in:url(/themes/theme-dream2-plus/assets/cursor/black_cat/precision.cur),zoom-in;'
-      : theme.config.enhance.cursor_style == 'overwatch' ? '--cursor-default:url(/themes/theme-dream2-plus/assets/cursor/overwatch/pointer.cur),auto;--cursor-pointer:url(/themes/theme-dream2-plus/assets/cursor/overwatch/link.cur),pointer;--cursor-text:url(/themes/theme-dream2-plus/assets/cursor/overwatch/text.cur),auto;--cursor-zoom-in:url(/themes/theme-dream2-plus/assets/cursor/overwatch/cross.cur),zoom-in;'
-      : theme.config.enhance.cursor_style == 'rainbow_rain' ? '--cursor-default:url(/themes/theme-dream2-plus/assets/cursor/rainbow_rain/normal.cur),auto;--cursor-pointer:url(/themes/theme-dream2-plus/assets/cursor/rainbow_rain/link.cur),pointer;--cursor-text:url(/themes/theme-dream2-plus/assets/cursor/rainbow_rain/texto.cur),auto;--cursor-zoom-in:url(/themes/theme-dream2-plus/assets/cursor/rainbow_rain/precision.cur),zoom-in;'
-      : theme.config.enhance.cursor_style == 'marry' ? '--cursor-default:url(/themes/theme-dream2-plus/assets/cursor/marry/arrow.cur),auto;--cursor-pointer:url(/themes/theme-dream2-plus/assets/cursor/marry/arrow.cur),pointer;--cursor-text:url(/themes/theme-dream2-plus/assets/cursor/marry/beam.cur),auto;--cursor-zoom-in:url(/themes/theme-dream2-plus/assets/cursor/marry/move.cur),zoom-in;'
-      : theme.config.enhance.cursor_style != 'none' ? '--cursor-default: url(/themes/theme-dream2-plus/assets/cursor/' + theme.config.enhance.cursor_style + '/arrow.cur), auto;--cursor-pointer: url(/themes/theme-dream2-plus/assets/cursor/' + theme.config.enhance.cursor_style + '/hand.cur), pointer;--cursor-text: url(/themes/theme-dream2-plus/assets/cursor/' + theme.config.enhance.cursor_style + '/arrow.cur), auto;--cursor-zoom-in: url(/themes/theme-dream2-plus/assets/cursor/' + theme.config.enhance.cursor_style + '/arrow.cur), zoom-in;'
+      [(${theme.config.enhance.cursor_style == 'breeze' ? '--cursor-default:url('+#theme.assets('/')+'/cursor/breeze/Arrow.cur),auto;--cursor-pointer:url('+#theme.assets('/')+'/cursor/breeze/Hand.cur),pointer;--cursor-text:url('+#theme.assets('/')+'/cursor/breeze/IBeam.cur),auto;--cursor-zoom-in:url('+#theme.assets('/')+'/cursor/breeze/Cross.cur),zoom-in;'
+      : theme.config.enhance.cursor_style == 'black_cat' ? '--cursor-default:url('+#theme.assets('/')+'/cursor/black_cat/normal.cur),auto;--cursor-pointer:url('+#theme.assets('/')+'/cursor/black_cat/ayuda.cur),pointer;--cursor-text:url('+#theme.assets('/')+'/cursor/black_cat/texto.cur),auto;--cursor-zoom-in:url('+#theme.assets('/')+'/cursor/black_cat/precision.cur),zoom-in;'
+      : theme.config.enhance.cursor_style == 'overwatch' ? '--cursor-default:url('+#theme.assets('/')+'/cursor/overwatch/pointer.cur),auto;--cursor-pointer:url('+#theme.assets('/')+'/cursor/overwatch/link.cur),pointer;--cursor-text:url('+#theme.assets('/')+'/cursor/overwatch/text.cur),auto;--cursor-zoom-in:url('+#theme.assets('/')+'/cursor/overwatch/cross.cur),zoom-in;'
+      : theme.config.enhance.cursor_style == 'rainbow_rain' ? '--cursor-default:url('+#theme.assets('/')+'/cursor/rainbow_rain/normal.cur),auto;--cursor-pointer:url('+#theme.assets('/')+'/cursor/rainbow_rain/link.cur),pointer;--cursor-text:url('+#theme.assets('/')+'/cursor/rainbow_rain/texto.cur),auto;--cursor-zoom-in:url('+#theme.assets('/')+'/cursor/rainbow_rain/precision.cur),zoom-in;'
+      : theme.config.enhance.cursor_style == 'marry' ? '--cursor-default:url('+#theme.assets('/')+'/cursor/marry/arrow.cur),auto;--cursor-pointer:url('+#theme.assets('/')+'/cursor/marry/arrow.cur),pointer;--cursor-text:url('+#theme.assets('/')+'/cursor/marry/beam.cur),auto;--cursor-zoom-in:url('+#theme.assets('/')+'/cursor/marry/move.cur),zoom-in;'
+      : theme.config.enhance.cursor_style != 'none' ? '--cursor-default: url('+#theme.assets('/')+'/cursor/' + theme.config.enhance.cursor_style + '/arrow.cur), auto;--cursor-pointer: url('+#theme.assets('/')+'/cursor/' + theme.config.enhance.cursor_style + '/hand.cur), pointer;--cursor-text: url('+#theme.assets('/')+'/cursor/' + theme.config.enhance.cursor_style + '/arrow.cur), auto;--cursor-zoom-in: url('+#theme.assets('/')+'/cursor/' + theme.config.enhance.cursor_style + '/arrow.cur), zoom-in;'
      : ''})]
    }

@ -99,8 +99,6 @@
    DreamConfig["effects_lantern_left"] = effects_lantern_left;
    DreamConfig["effects_lantern_right"] = effects_lantern_right;

-    /** 启用标签云的风格 */
-    DreamConfig["show_tagcloud_style"] = [[${theme.config.sidebar.show_tagcloud_style}]];
    /** 控制台主题信息 */
    DreamConfig["enable_console_version_info"] = [[${theme.config.enhance.enable_console_version_info}]];
    /** 安全链接配置 */
--- a/templates/common/scripts.html
+++ b/templates/common/scripts.html
@ -3,7 +3,6 @@
    <script th:src="@{/assets/js/btoc.min.js(mew=${theme.spec.version})}"></script>
    <script th:if="${isFirstIndex == true && !#lists.isEmpty(theme.config.basic_style.carousel_options)}" data-pjax
            th:src="@{/assets/lib/swiper@8.4.6/swiper-bundle.min.js}"></script>
-    <script th:if="${theme.config.sidebar.show_tagcloud_style}" th:src="@{/assets/js/tagcloud.min.js(mew=${theme.spec.version})}"></script>
    <script th:src="@{/assets/js/common.min.js(mew=${theme.spec.version})}"></script>

    <th:block th:if="${isPost}">
--- a/templates/widget/ad_piece.html
+++ b/templates/widget/ad_piece.html
@ -1,10 +1,7 @@
 <div xmlns:th="https://www.thymeleaf.org"
     th:fragment="widget (sidebar)"
     th:class="'card widget ' + ${sidebar.hide}">
-  <a th:if="${theme.config.sidebar.ad_mode}" target="_blank" th:href="${theme.config.sidebar.ad_target_url}">
-    <img width="100%" th:src="${theme.config.sidebar.ad_image}" alt="广告"/>
-  </a>
-  <th:block th:unless="${theme.config.sidebar.ad_mode}" th:utext="${sidebar.content}"/>
+  <th:block th:utext="${sidebar.content}"/>
  <span th:if="${theme.config.sidebar.show_ad_tag}" class="ad-tag">广告
                <svg th:if="${theme.config.sidebar.ad_tag_close}" class="click-close" data-close=".widget"
                     xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15 15"><path
--- a/templates/widget/tagcloud.html
+++ b/templates/widget/tagcloud.html
@ -7,16 +7,33 @@
      enableTagsColor = ${theme.config.sidebar.enable_tagcloud_color}">

    <div class="card-title">
-        <i th:class="${#strings.defaultString(sidebar.icon, 'ri-cloud-line') + ' card-title-label'}"></i><span th:text="${#strings.defaultString(sidebar.title, '标签云')}"></span>
-        <a th:if="${theme.config.sidebar.tagcloud_more}" class="card-more" th:href="@{/tags}">更多<i class="ri-arrow-right-double-line"></i></a>
+        <i th:class="${#strings.defaultString(sidebar.icon, 'ri-cloud-line') + ' card-title-label'}"></i><span
+            th:text="${#strings.defaultString(sidebar.title, '标签云')}"></span>
+        <a th:if="${theme.config.sidebar.tagcloud_more}" class="card-more" th:href="@{/tags}">更多<i
+                class="ri-arrow-right-double-line"></i></a>
    </div>
    <div th:if="${isEmpty}" class="card-empty">暂无标签</div>
    <div th:unless="${isEmpty}" class="card-content">
        <a
-          th:each="tag : ${tags}"
-          th:href="@{${tag.status.permalink}}"
-          th:text="${tag.spec.displayName}"
-          th:with="size = ${#strings.length(tag.spec.displayName) + #strings.length(tag.spec.slug) + (tag.postCount != null ? tag.postCount : 0)}"
-          th:style="'font-size: ' + ${size < 14 ? 14 : size > 32 ? 32 : size} + 'px;' + ${(enableTagsColor && tag.spec.color != '#ffffff')? 'color: ' + tag.spec.color +';' : ''}"></a>
+                th:each="tag : ${tags}"
+                th:href="@{${tag.status.permalink}}"
+                th:text="${tag.spec.displayName}"
+                th:with="size = ${#strings.length(tag.spec.displayName) + #strings.length(tag.spec.slug) + (tag.postCount != null ? tag.postCount : 0)}"
+                th:style="'font-size: ' + ${size < 14 ? 14 : size > 32 ? 32 : size} + 'px;' + ${(enableTagsColor && tag.spec.color != '#ffffff')? 'color: ' + tag.spec.color +';' : ''}"></a>
    </div>
+
+    <th:block th:if="${theme.config.sidebar.show_tagcloud_style}">
+        <script th:src="@{/assets/js/tagcloud.min.js(mew=${theme.spec.version})}"></script>
+        <script>
+          $(function(){ tagcloud({
+            selector: '.tagcloud .card-content',
+            fontsize: 18,
+            radius: 75,
+            mspeed: 'slow',
+            ispeed: 'slow',
+            direction: 45,
+            keep: false
+          }) })
+        </script>
+    </th:block>
 </div>
--- a/theme.yaml
+++ b/theme.yaml
@ -30,7 +30,7 @@ spec:
  settingName: theme-dream2-plus-setting
  configMapName: theme-dream2-plus-configMap
  # 版本号
-  version: 1.2.2.000004
+  version: 0.0.0.1
  # 最低支持的 Halo 版本
  require: ">=2.12.0"
  # 许可
--- a/2
+++ b/2
@ -1 +1 @@
-1.2.2
+1.2.3
 @ -1 +1 @@
 .2.2
 .2.3