weaver-e10-builder 1.6.16 → 1.7.1

package/ecodecmd/src/loaddep.js

@@ -1,164 +1,164 @@
-
-
-const { mkdirs } = require('./util/index');
-const { calcFileMd5 } = require('./util/crypto-util');
-const path = require('path');
-const os = require('os');
-const fs = require('fs');
-const axios = require('axios');
-
-const cacheJarDir = path.join(os.homedir(), '.ecode_ide_plugin/cache');
-
-const download = (url, filepath) => {
-  return new Promise((resolve, reject) => {
-    const stream = fs.createWriteStream(filepath);
-    // 下载失败时别把半个文件留在缓存目录里
-    const fail = (err) => {
-      stream.destroy();
-      fs.rmSync(filepath, { force: true });
-      reject(err);
-    };
-    // 添加useragent
-    // 用 axios 而不是 request：request 已停止维护，且非 2xx 会被 axios 默认 reject，
-    // 不会再把错误页当 jar 写进缓存目录（旧写法用 pipe 的 close 事件判完成，判不出来）
-    axios({
-      url,
-      method: 'get',
-      responseType: 'stream',
-      headers: { 'User-Agent': 'ecodecmd' },
-    }).then((res) => {
-      res.data.pipe(stream);
-      stream.on('finish', () => resolve(''));
-      stream.on('error', fail);
-      res.data.on('error', fail);
-    }).catch(fail);
-  })
-}
-
-/**
- * 拉取jar包
- */
-const handleJar = async (serviceUrl, jarInfo) => {
-
-  console.info(`拉取 jar包: ${jarInfo.jarName}`);
-  const targetPath = path.join(cacheJarDir, jarInfo.md5);
-  if (!fs.existsSync(targetPath)) mkdirs(targetPath);
-  else {
-    // 判断jar包是否已经存在
-    if (fs.existsSync(path.join(targetPath, jarInfo.jarName))) {
-      // 校验文件是否正常
-      const md5 = calcFileMd5(path.join(targetPath, jarInfo.jarName));
-      if (md5 != jarInfo.md5) {
-        console.info(`jar包: ${jarInfo.jarName} 发生变更`);
-      } else {
-        // console.info(`jar包: ${jarInfo.jarName} 已存在`);
-        return;
-      }
-    }
-  }
-  const url = `${serviceUrl}/papi/inner/ide/getJar?jarPath=${jarInfo.path}`;
-  console.info('load url => ', url);
-  // 拷贝文件到指定缓存目录下
-  await download(url, path.join(targetPath, jarInfo.jarName));
-  console.info(`============> jar包: ${jarInfo.jarName} 拉取成功，dir: ${targetPath}`);
-}
-
-const buildGradleStr = `
-plugins {
-  id 'java'
-}
-
-group 'com.weaver.seconddev'
-version '1.0.0'
-description 'ecode 二开demo'
-
-java.targetCompatibility = JavaVersion.VERSION_1_8
-
-compileJava {
-  options.encoding = 'UTF-8'
-}
-
-jar {
-  manifest {
-      attributes 'weaver-ecode-seconddev-id': rootProject.group + '-' + rootProject.name,
-          'Implementation-Version': version,
-          'Implementation-Vendor-Id': rootProject.group,
-          'Implementation-Title': rootProject.name
-  }
-}
-
-repositories {
-  maven { url 'https://maven.aliyun.com/repository/public/' }
-  mavenLocal()
-  mavenCentral()
-}
-
-
-dependencies {
-
-  implementation group: 'junit', name: 'junit', version: '4.12'
-  compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.20'
-  annotationProcessor 'org.projectlombok:lombok:1.18.20'
-  implementation group: 'javax.servlet', name: 'javax.servlet-api', version: '4.0.1'
-
-  // 添加二开服务拉取的清单依赖
-  def includeType = ['**/*.jar', '**/*.class']
-  compile fileTree(dir: project.projectDir.getPath() + '/secDevLib', includes: includeType)
-  // 项目二开自定义依赖
-  // implementation fileTree(dir: project.projectDir.getPath() + "/devLib", includes: includeType)
-
-}
-
-
-`
-
-const settingGradleStr = `
-rootProject.name = 'seconddev-demo'
-`
-
-/**
- * 生成项目依赖目录结构， 即 生成 secDevLib 目录，settings.gradle文件，build.gradle文件
- * @param {*} projectPath 项目路径
- * @param {*} jarData jarlist
- */
-const createProjectItem = async (projectPath, jarData) => {
-  // 处理依赖
-  const secDevLibDir = path.join(projectPath, 'secDevLib');
-  console.info('创建二开依赖目录 => ', secDevLibDir);
-  if (!fs.existsSync(secDevLibDir)) mkdirs(secDevLibDir);
-  for (let i = 0; i < jarData.length; i++) {
-    if (fs.existsSync(path.join(secDevLibDir, jarData[i].jarName))) {
-      fs.rmSync(path.join(secDevLibDir, jarData[i].jarName));
-    }
-    fs.symlinkSync(path.join(cacheJarDir, jarData[i].md5, jarData[i].jarName), path.join(secDevLibDir, jarData[i].jarName));
-  }
-  console.info('创建gradle项目信息');
-  // 处理gradle文件
-  fs.writeFileSync(path.join(projectPath, 'build.gradle'), buildGradleStr);
-  fs.writeFileSync(path.join(projectPath, 'settings.gradle'), settingGradleStr);
-}
-
-/**
- * e10 依赖拉取
- */
-const loadJar = async (serviceUrl, projectPath) => {
-  const startTime = new Date().getTime();
-  console.info('============> 开始处理')
-  const listRes = await axios({url: `${serviceUrl}/papi/inner/ide/dependencyList`, method: 'get'})
-  if (listRes.status === 200 && listRes.data.code === 200) {
-    const { data = [] } = listRes.data;
-    for (let i = 0; i < data.length; i++) {
-      await handleJar(serviceUrl, data[i]);
-    }
-    createProjectItem(projectPath, data);
-    console.info(`============> 处理结束，jar包共计 ${data.length} 个， 耗时 ${new Date().getTime() - startTime} (ms)`);
-  } else {
-    console.info('dependencyList 接口异常：', listRes.status, listRes.data);
-  }
-}
-
-module.exports = function(serviceUrl, projectPath) {
-  
-  return loadJar(serviceUrl, projectPath);
-
+
+
+const { mkdirs } = require('./util/index');
+const { calcFileMd5 } = require('./util/crypto-util');
+const path = require('path');
+const os = require('os');
+const fs = require('fs');
+const axios = require('axios');
+
+const cacheJarDir = path.join(os.homedir(), '.ecode_ide_plugin/cache');
+
+const download = (url, filepath) => {
+  return new Promise((resolve, reject) => {
+    const stream = fs.createWriteStream(filepath);
+    // 下载失败时别把半个文件留在缓存目录里
+    const fail = (err) => {
+      stream.destroy();
+      fs.rmSync(filepath, { force: true });
+      reject(err);
+    };
+    // 添加useragent
+    // 用 axios 而不是 request：request 已停止维护，且非 2xx 会被 axios 默认 reject，
+    // 不会再把错误页当 jar 写进缓存目录（旧写法用 pipe 的 close 事件判完成，判不出来）
+    axios({
+      url,
+      method: 'get',
+      responseType: 'stream',
+      headers: { 'User-Agent': 'ecodecmd' },
+    }).then((res) => {
+      res.data.pipe(stream);
+      stream.on('finish', () => resolve(''));
+      stream.on('error', fail);
+      res.data.on('error', fail);
+    }).catch(fail);
+  })
+}
+
+/**
+ * 拉取jar包
+ */
+const handleJar = async (serviceUrl, jarInfo) => {
+
+  console.info(`拉取 jar包: ${jarInfo.jarName}`);
+  const targetPath = path.join(cacheJarDir, jarInfo.md5);
+  if (!fs.existsSync(targetPath)) mkdirs(targetPath);
+  else {
+    // 判断jar包是否已经存在
+    if (fs.existsSync(path.join(targetPath, jarInfo.jarName))) {
+      // 校验文件是否正常
+      const md5 = calcFileMd5(path.join(targetPath, jarInfo.jarName));
+      if (md5 != jarInfo.md5) {
+        console.info(`jar包: ${jarInfo.jarName} 发生变更`);
+      } else {
+        // console.info(`jar包: ${jarInfo.jarName} 已存在`);
+        return;
+      }
+    }
+  }
+  const url = `${serviceUrl}/papi/inner/ide/getJar?jarPath=${jarInfo.path}`;
+  console.info('load url => ', url);
+  // 拷贝文件到指定缓存目录下
+  await download(url, path.join(targetPath, jarInfo.jarName));
+  console.info(`============> jar包: ${jarInfo.jarName} 拉取成功，dir: ${targetPath}`);
+}
+
+const buildGradleStr = `
+plugins {
+  id 'java'
+}
+
+group 'com.weaver.seconddev'
+version '1.0.0'
+description 'ecode 二开demo'
+
+java.targetCompatibility = JavaVersion.VERSION_1_8
+
+compileJava {
+  options.encoding = 'UTF-8'
+}
+
+jar {
+  manifest {
+      attributes 'weaver-ecode-seconddev-id': rootProject.group + '-' + rootProject.name,
+          'Implementation-Version': version,
+          'Implementation-Vendor-Id': rootProject.group,
+          'Implementation-Title': rootProject.name
+  }
+}
+
+repositories {
+  maven { url 'https://maven.aliyun.com/repository/public/' }
+  mavenLocal()
+  mavenCentral()
+}
+
+
+dependencies {
+
+  implementation group: 'junit', name: 'junit', version: '4.12'
+  compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.20'
+  annotationProcessor 'org.projectlombok:lombok:1.18.20'
+  implementation group: 'javax.servlet', name: 'javax.servlet-api', version: '4.0.1'
+
+  // 添加二开服务拉取的清单依赖
+  def includeType = ['**/*.jar', '**/*.class']
+  compile fileTree(dir: project.projectDir.getPath() + '/secDevLib', includes: includeType)
+  // 项目二开自定义依赖
+  // implementation fileTree(dir: project.projectDir.getPath() + "/devLib", includes: includeType)
+
+}
+
+
+`
+
+const settingGradleStr = `
+rootProject.name = 'seconddev-demo'
+`
+
+/**
+ * 生成项目依赖目录结构， 即 生成 secDevLib 目录，settings.gradle文件，build.gradle文件
+ * @param {*} projectPath 项目路径
+ * @param {*} jarData jarlist
+ */
+const createProjectItem = async (projectPath, jarData) => {
+  // 处理依赖
+  const secDevLibDir = path.join(projectPath, 'secDevLib');
+  console.info('创建二开依赖目录 => ', secDevLibDir);
+  if (!fs.existsSync(secDevLibDir)) mkdirs(secDevLibDir);
+  for (let i = 0; i < jarData.length; i++) {
+    if (fs.existsSync(path.join(secDevLibDir, jarData[i].jarName))) {
+      fs.rmSync(path.join(secDevLibDir, jarData[i].jarName));
+    }
+    fs.symlinkSync(path.join(cacheJarDir, jarData[i].md5, jarData[i].jarName), path.join(secDevLibDir, jarData[i].jarName));
+  }
+  console.info('创建gradle项目信息');
+  // 处理gradle文件
+  fs.writeFileSync(path.join(projectPath, 'build.gradle'), buildGradleStr);
+  fs.writeFileSync(path.join(projectPath, 'settings.gradle'), settingGradleStr);
+}
+
+/**
+ * e10 依赖拉取
+ */
+const loadJar = async (serviceUrl, projectPath) => {
+  const startTime = new Date().getTime();
+  console.info('============> 开始处理')
+  const listRes = await axios({url: `${serviceUrl}/papi/inner/ide/dependencyList`, method: 'get'})
+  if (listRes.status === 200 && listRes.data.code === 200) {
+    const { data = [] } = listRes.data;
+    for (let i = 0; i < data.length; i++) {
+      await handleJar(serviceUrl, data[i]);
+    }
+    createProjectItem(projectPath, data);
+    console.info(`============> 处理结束，jar包共计 ${data.length} 个， 耗时 ${new Date().getTime() - startTime} (ms)`);
+  } else {
+    console.info('dependencyList 接口异常：', listRes.status, listRes.data);
+  }
+}
+
+module.exports = function(serviceUrl, projectPath) {
+  
+  return loadJar(serviceUrl, projectPath);
+
 }

package/package.json

@@ -1,50 +1,53 @@
-{
-  "name": "weaver-e10-builder",
-  "version": "1.6.16",
-  "description": "Eteams/Ebuilder CLI — 泛微 OA 命令行工具",
-  "type": "module",
-  "files": [
-    "dist",
-    "ecodecmd",
-    "skill-docs",
-    "assets"
-  ],
-  "bin": {
-    "e10-cli": "dist/index.js",
-    "ecodecmd": "ecodecmd/src/index.js"
-  },
-  "scripts": {
-    "dev": "tsx src/index.ts",
-    "build": "tsc",
-    "postinstall": "node ./dist/postinstall.js",
-    "pack:all": "node scripts/pack-editions.mjs",
-    "sync:docs": "node scripts/sync-skill-docs.mjs",
-    "start": "node dist/index.js",
-    "test": "tsx --test \"test/**/*.test.ts\""
-  },
-  "dependencies": {
-    "@napi-rs/keyring": "^1.3.0",
-    "@xmldom/xmldom": "0.8.15",
-    "archiver": "^5.3.1",
-    "axios": "^1.3.4",
-    "chalk": "^5.0.1",
-    "chokidar": "^3.5.3",
-    "commander": "^13.0.0",
-    "debug": "^4.3.4",
-    "fs-extra": "^10.1.0",
-    "js-base64": "^3.7.2",
-    "jszip": "3.10.1",
-    "mammoth": "^1.12.0",
-    "minimist": "^1.2.6",
-    "node-html-markdown": "^2.0.0",
-    "sql.js": "^1.11.0",
-    "tiny-pinyin": "^1.3.2",
-    "xlsx": "npm:@e965/xlsx@0.20.3"
-  },
-  "devDependencies": {
-    "@types/node": "^22.0.0",
-    "@types/sql.js": "^1.4.11",
-    "tsx": "^4.19.0",
-    "typescript": "^5.6.0"
-  }
-}
+{
+  "name": "weaver-e10-builder",
+  "version": "1.7.1",
+  "description": "Eteams/Ebuilder CLI — 泛微 OA 命令行工具",
+  "type": "module",
+  "files": [
+    "dist",
+    "ecodecmd",
+    "ecode-ui",
+    "skill-docs",
+    "assets"
+  ],
+  "bin": {
+    "e10-cli": "dist/index.js",
+    "ecodecmd": "ecodecmd/src/index.js"
+  },
+  "scripts": {
+    "dev": "tsx src/index.ts",
+    "build": "tsc",
+    "postinstall": "node ./dist/postinstall.js",
+    "pack:all": "node scripts/pack-editions.mjs",
+    "sync:docs": "node scripts/sync-skill-docs.mjs",
+    "build:ecode-ui": "node scripts/build-ecode-ui-types.mjs",
+    "start": "node dist/index.js",
+    "test": "tsx --test \"test/**/*.test.ts\""
+  },
+  "dependencies": {
+    "@napi-rs/keyring": "^1.3.0",
+    "@types/react": "^17.0.10",
+    "@xmldom/xmldom": "0.8.15",
+    "archiver": "^5.3.1",
+    "axios": "^1.3.4",
+    "chalk": "^5.0.1",
+    "chokidar": "^3.5.3",
+    "commander": "^13.0.0",
+    "debug": "^4.3.4",
+    "fs-extra": "^10.1.0",
+    "js-base64": "^3.7.2",
+    "jszip": "3.10.1",
+    "mammoth": "^1.12.0",
+    "minimist": "^1.2.6",
+    "node-html-markdown": "^2.0.0",
+    "sql.js": "^1.11.0",
+    "tiny-pinyin": "^1.3.2",
+    "xlsx": "npm:@e965/xlsx@0.20.3"
+  },
+  "devDependencies": {
+    "@types/node": "^22.0.0",
+    "@types/sql.js": "^1.4.11",
+    "tsx": "^4.19.0",
+    "typescript": "^5.6.0"
+  }
+}