fix

web-vue/src/i18n/locales/en_us.json

@@ -363,6 +363,7 @@
   "i18n_22670d3682": "Please select the script to use",
   "i18n_226a6f9cdd": "Please check if the ws proxy is turned on.",
   "i18n_226b091218": "type",
+  "i18n_2296651945": "#Currently supported uses plugin Java maven、node、go、python3、gradle 。 If the requirements are not met, you can configure the plugin yourself",
   "i18n_22b03c024d": "QR code",
   "i18n_22c799040a": "container",
   "i18n_22cf31df5d": "Current access IP:",
@@ -726,6 +727,7 @@
   "i18n_4244830033": "Please select a certificate file",
   "i18n_424a2ad8f7": "prepare",
   "i18n_429b8dfb98": "project distribution",
+  "i18n_429d4dbc55": "#This example is for reference only. In practice, you need to configure it yourself according to the warehouse situation and construction process",
   "i18n_42a93314b4": "base image",
   "i18n_42b6bd1b2f": "Warehouse path",
   "i18n_42f766b273": "mount partition",
@@ -1361,7 +1363,7 @@
   "i18n_7b8e7d4abc": "Do you really want to delete the execution record?",
   "i18n_7b961e05d0": "Indicates the last day of the month",
   "i18n_7bcbf81120": "receive packet",
-  "i18n_7bcc3f169c": "#Built-in variable ${JPOM_WORKING_DIR} ${JPOM_BUILD_ID}",
+  "i18n_7bcc3f169c": "#Built-in variable {'${JPOM_WORKING_DIR}'} {'${JPOM_BUILD_ID}'}",
   "i18n_7bf62f7284": "Manually cancel distribution",
   "i18n_7c0ee78130": "build log",
   "i18n_7c223eb6e9": "Release system announcement",
@@ -2347,6 +2349,7 @@
   "i18n_d1b8eaaa9e": "You need to enter the verification code to confirm the binding before it takes effect.",
   "i18n_d1f0fac71d": "Script cannot be saved without node selected",
   "i18n_d1f56b0a7e": "The incoming parameters are: monitors Id, monitors Name, nodeId, nodeName, projectId, projectName, title, content, runStatus",
+  "i18n_d242bc3990": "#You can also customize the basic image to achieve complex business",
   "i18n_d263a9207f": "Support html format",
   "i18n_d27cf91998": "Reference address:",
   "i18n_d2cac1245d": "Whether to [",
@@ -2631,7 +2634,7 @@
   "i18n_edc1185b8e": "Attempt to auto-renew failed",
   "i18n_edd716f524": "Please select a first-level directory for publication",
   "i18n_ede2c450d1": "No login logs",
-  "i18n_ee19907fad": "#Basic image, currently only supports ubuntu-latest",
+  "i18n_ee19907fad": "#Basic image, currently supports ubuntu-latest、ubuntu-git",
   "i18n_ee4fac2f3c": "In order to avoid monitoring blockage caused by some nodes failing to respond in time, the node statistical timeout time is not affected by the node timeout configuration, and the default timeout time (10 seconds) will be used.",
   "i18n_ee6ce96abb": "s second",
   "i18n_ee8ecb9ee0": "priority",

web-vue/src/i18n/locales/zh_cn.json

@@ -363,6 +363,7 @@
   "i18n_22670d3682": "请选择要使用的脚本",
   "i18n_226a6f9cdd": "请检查是否开启 ws 代理",
   "i18n_226b091218": "类型",
+  "i18n_2296651945": "# 目前支持的 uses 插件端 java、maven、node、go、python3、gradle 。如果不满足需求，可自行配置插件",
   "i18n_22b03c024d": "二维码",
   "i18n_22c799040a": "容器",
   "i18n_22cf31df5d": "当前访问IP：",
@@ -726,6 +727,7 @@
   "i18n_4244830033": "请选择证书文件",
   "i18n_424a2ad8f7": "准备",
   "i18n_429b8dfb98": "项目分发",
+  "i18n_429d4dbc55": "# 本示例仅供参考实际需要您按照仓库情况和构建流程自行配置",
   "i18n_42a93314b4": "基础镜像",
   "i18n_42b6bd1b2f": "仓库路径",
   "i18n_42f766b273": "挂载分区",
@@ -1361,7 +1363,7 @@
   "i18n_7b8e7d4abc": "真的要删除执行记录么？",
   "i18n_7b961e05d0": "表示月的最后一天",
   "i18n_7bcbf81120": "接收包",
-  "i18n_7bcc3f169c": "# 内置变量 ${JPOM_WORKING_DIR} ${JPOM_BUILD_ID}",
+  "i18n_7bcc3f169c": "# 内置变量 {'${JPOM_WORKING_DIR}'} {'${JPOM_BUILD_ID}'}",
   "i18n_7bf62f7284": "手动取消分发",
   "i18n_7c0ee78130": "构建日志",
   "i18n_7c223eb6e9": "发布系统公告",
@@ -2347,6 +2349,7 @@
   "i18n_d1b8eaaa9e": "需要输入验证码,确认绑定后才生效奥",
   "i18n_d1f0fac71d": "没有选择节点不能保存脚本",
   "i18n_d1f56b0a7e": "传入参数有：monitorId、monitorName、nodeId、nodeName、projectId、projectName、title、content、runStatus",
+  "i18n_d242bc3990": "# 您还可以自定义基础镜像来实现复杂业务",
   "i18n_d263a9207f": "支持 html 格式",
   "i18n_d27cf91998": "参考地址：",
   "i18n_d2cac1245d": "是否将【",
@@ -2631,7 +2634,7 @@
   "i18n_edc1185b8e": "尝试自动续签失败",
   "i18n_edd716f524": "请选择发布的一级目录",
   "i18n_ede2c450d1": "没有任何登录日志",
-  "i18n_ee19907fad": "# 基础镜像 目前仅支持 ubuntu-latest",
+  "i18n_ee19907fad": "# 基础镜像 目前支持 ubuntu-latest、ubuntu-git",
   "i18n_ee4fac2f3c": "为了避免部分节点不能及时响应造成监控阻塞,节点统计超时时间不受节点超时配置影响将采用默认超时时间(10秒)",
   "i18n_ee6ce96abb": "s 秒",
   "i18n_ee8ecb9ee0": "优先级",

web-vue/src/i18n/locales/zh_hk.json

@@ -363,6 +363,7 @@
 	"i18n_22670d3682":"請選擇要使用的腳本",
 	"i18n_226a6f9cdd":"請檢查是否開啟 ws 代理",
 	"i18n_226b091218":"類型",
+	"i18n_2296651945":"# 目前支持的 uses 插件端 java、maven、node、go、python3、gradle 。如果不滿足需求，可自行配置插件",
 	"i18n_22b03c024d":"二維碼",
 	"i18n_22c799040a":"容器",
 	"i18n_22cf31df5d":"當前訪問IP：",
@@ -726,6 +727,7 @@
 	"i18n_4244830033":"請選擇證書文件",
 	"i18n_424a2ad8f7":"準備",
 	"i18n_429b8dfb98":"項目分發",
+	"i18n_429d4dbc55":"# 本示例僅供參考實際需要您按照倉庫情況和構建流程自行配置",
 	"i18n_42a93314b4":"基礎鏡像",
 	"i18n_42b6bd1b2f":"倉庫路徑",
 	"i18n_42f766b273":"掛載分區",
@@ -1361,7 +1363,7 @@
 	"i18n_7b8e7d4abc":"真的要刪除執行記錄麼？",
 	"i18n_7b961e05d0":"表示月的最後一天",
 	"i18n_7bcbf81120":"接收包",
-	"i18n_7bcc3f169c":"# 內置變量 ${JPOM_WORKING_DIR} ${JPOM_BUILD_ID}",
+	"i18n_7bcc3f169c":"# 內置變量 {'${JPOM_WORKING_DIR}'} {'${JPOM_BUILD_ID}'}",
 	"i18n_7bf62f7284":"手動取消分發",
 	"i18n_7c0ee78130":"構建日誌",
 	"i18n_7c223eb6e9":"發佈系統公吿",
@@ -2347,6 +2349,7 @@
 	"i18n_d1b8eaaa9e":"需要輸入驗證碼,確認綁定後才生效奧",
 	"i18n_d1f0fac71d":"沒有選擇節點不能保存腳本",
 	"i18n_d1f56b0a7e":"傳入參數有：monitorId、monitorName、nodeId、nodeName、projectId、projectName、title、content、runStatus",
+	"i18n_d242bc3990":"# 您還可以自定義基礎鏡像來實現複雜業務",
 	"i18n_d263a9207f":"支持 html 格式",
 	"i18n_d27cf91998":"參考地址：",
 	"i18n_d2cac1245d":"是否將【",
@@ -2631,7 +2634,7 @@
 	"i18n_edc1185b8e":"嘗試自動續簽失敗",
 	"i18n_edd716f524":"請選擇發佈的一級目錄",
 	"i18n_ede2c450d1":"沒有任何登錄日誌",
-	"i18n_ee19907fad":"# 基礎鏡像 目前僅支持 ubuntu-latest",
+	"i18n_ee19907fad":"# 基礎鏡像 目前支持 ubuntu-latest、ubuntu-git",
 	"i18n_ee4fac2f3c":"為了避免部分節點不能及時響應造成監控阻塞,節點統計超時時間不受節點超時配置影響將採用默認超時時間(10秒)",
 	"i18n_ee6ce96abb":"s 秒",
 	"i18n_ee8ecb9ee0":"優先級",

web-vue/src/i18n/locales/zh_tw.json

@@ -363,6 +363,7 @@
 	"i18n_22670d3682":"請選擇要使用的指令碼",
 	"i18n_226a6f9cdd":"請檢查是否開啟 ws 代理",
 	"i18n_226b091218":"型別",
+	"i18n_2296651945":"# 目前支援的 uses 外掛端 java、maven、node、go、python3、gradle 。如果不滿足需求，可自行配置外掛",
 	"i18n_22b03c024d":"二維碼",
 	"i18n_22c799040a":"容器",
 	"i18n_22cf31df5d":"當前訪問IP：",
@@ -726,6 +727,7 @@
 	"i18n_4244830033":"請選擇證書檔案",
 	"i18n_424a2ad8f7":"準備",
 	"i18n_429b8dfb98":"專案分發",
+	"i18n_429d4dbc55":"# 本示例僅供參考實際需要您按照倉庫情況和構建流程自行配置",
 	"i18n_42a93314b4":"基礎映象",
 	"i18n_42b6bd1b2f":"倉庫路徑",
 	"i18n_42f766b273":"掛載分割槽",
@@ -1361,7 +1363,7 @@
 	"i18n_7b8e7d4abc":"真的要刪除執行記錄麼？",
 	"i18n_7b961e05d0":"表示月的最後一天",
 	"i18n_7bcbf81120":"接收包",
-	"i18n_7bcc3f169c":"# 內建變數 ${JPOM_WORKING_DIR} ${JPOM_BUILD_ID}",
+	"i18n_7bcc3f169c":"# 內建變數 {'${JPOM_WORKING_DIR}'} {'${JPOM_BUILD_ID}'}",
 	"i18n_7bf62f7284":"手動取消分發",
 	"i18n_7c0ee78130":"構建日誌",
 	"i18n_7c223eb6e9":"釋出系統公告",
@@ -2347,6 +2349,7 @@
 	"i18n_d1b8eaaa9e":"需要輸入驗證碼,確認繫結後才生效奧",
 	"i18n_d1f0fac71d":"沒有選擇節點不能儲存指令碼",
 	"i18n_d1f56b0a7e":"傳入引數有：monitorId、monitorName、nodeId、nodeName、projectId、projectName、title、content、runStatus",
+	"i18n_d242bc3990":"# 您還可以自定義基礎映象來實現複雜業務",
 	"i18n_d263a9207f":"支援 html 格式",
 	"i18n_d27cf91998":"參考地址：",
 	"i18n_d2cac1245d":"是否將【",
@@ -2631,7 +2634,7 @@
 	"i18n_edc1185b8e":"嘗試自動續簽失敗",
 	"i18n_edd716f524":"請選擇釋出的一級目錄",
 	"i18n_ede2c450d1":"沒有任何登入日誌",
-	"i18n_ee19907fad":"# 基礎映象 目前僅支援 ubuntu-latest",
+	"i18n_ee19907fad":"# 基礎映象 目前支援 ubuntu-latest、ubuntu-git",
 	"i18n_ee4fac2f3c":"為了避免部分節點不能及時響應造成監控阻塞,節點統計超時時間不受節點超時配置影響將採用預設超時時間(10秒)",
 	"i18n_ee6ce96abb":"s 秒",
 	"i18n_ee8ecb9ee0":"優先順序",

web-vue/src/pages/build/edit.vue

@@ -1550,13 +1550,25 @@ export default {
 
       dslDefault:
         this.$t('i18n_ee19907fad') +
+        '\n' +
+        this.$t('i18n_d242bc3990') +
+        '\n' +
+        this.$t('i18n_429d4dbc55') +
+        '\n' +
         'runsOn: ubuntu-latest\n' +
         this.$t('i18n_f1a2a46f52') +
+        '\n' +
         'fromTag: xxx\n' +
         this.$t('i18n_36df970248') +
+        '\n' +
         this.$t('i18n_30ff009ab3') +
+        '\n' +
         this.$t('i18n_ed40308fe9') +
+        '\n' +
         this.$t('i18n_df5f80946d') +
+        '\n' +
+        this.$t('i18n_2296651945') +
+        '\n' +
         'steps:\n' +
         '  - uses: java\n' +
         '    version: 8\n' +
@@ -1569,30 +1581,39 @@ export default {
         '#  - uses: python3\n' +
         '#    version: 3.6.6\n' +
         this.$t('i18n_23559b6453') +
+        '\n' +
         '  - uses: cache\n' +
         '    path: /root/.m2\n' +
         this.$t('i18n_1abf39bdb6') +
+        '\n' +
         '    type: global\n' +
         this.$t('i18n_f63345630c') +
+        '\n' +
         '  - uses: cache\n' +
         '    path: ${JPOM_WORKING_DIR}/web-vue/node_modules\n' +
         this.$t('i18n_5457c2e99f') +
+        '\n' +
         '    mode: copy\n' +
         '  - run: npm config set registry https://registry.npmmirror.com\n' +
         this.$t('i18n_7bcc3f169c') +
+        '\n' +
         '  - run: cd  ${JPOM_WORKING_DIR}/web-vue && npm i && npm run build\n' +
         '  - run: cd ${JPOM_WORKING_DIR} && mvn package -s script/settings.xml\n' +
         this.$t('i18n_ea89a319ec') +
+        '\n' +
         '# binds:\n' +
         '#  - /Users/user/.m2/settings.xml:/root/.m2/\n' +
         this.$t('i18n_8d90b15eaf') +
+        '\n' +
         '# dirChildrenOnly = true will create /var/data/titi and /var/data/tata dirChildrenOnly = false will create /var/data/root/titi and /var/data/root/tata\n' +
         '# copy:\n' +
         '#  - /Users/user/.m2/settings.xml:/root/.m2/:false\n' +
         this.$t('i18n_2b94686a65') +
+        '\n' +
         'env:\n' +
         '  NODE_OPTIONS: --max-old-space-size=900\n' +
         this.$t('i18n_993a5c7eee') +
+        '\n' +
         '#hostConfig:\n' +
         '#  CpuShares: 1',
       loading: false,