mm_git 1.0.0 → 1.0.2

package/index.js

@@ -93,6 +93,20 @@ Git.prototype.fetch = function(param) {
 	return this.cmd('git fetch' + (param ? " " + param : ""));
 }
 
+/**
+ * 强制更新
+ * @param {String} param 参数
+ * @return {String} 返回执行结果
+ */
+Git.prototype.update = function(param = 'master') {
+	var ret = this.cmd('git pull');
+	if (ret.indexOf('merge') !== -1) {
+		this.cmd('git fetch --all');
+		return this.cmd('git reset --hard origin/' + param);
+	}
+	return ret;
+}
+
 /**
  * 克隆
  * @param {String} remote_branch_name 远程仓库 例如：https://gitee.com/qiuwenwu91/plugin_yiyan.git

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mm_git",
-    "version": "1.0.0",
+    "version": "1.0.2",
     "description": "git代码仓库自动部署、热更新到服务器管理工具",
     "main": "index.js",
     "scripts": {

package/test.js

@@ -9,15 +9,18 @@ async function test() {
 	var version = git.version();
 	console.log("当前git版本", version);
 
-	var output = git.pull();
-	console.log("ceshi", output);
+	var ret = git.update();
+	console.log("强制更新", ret);
 	
-	git.add();
-	var ret = git.commit("测试一下");
-	console.log("测试提交", ret);
-	
-	var ret = git.push();
-	console.log("测试推送", ret);
+	// var output = git.pull();
+	// console.log("ceshi", output);
+
+	// git.add();
+	// var ret = git.commit("测试一下");
+	// console.log("测试提交", ret);
+
+	// var ret = git.push();
+	// console.log("测试推送", ret);
 	// var res = git.install();
 	// console.log("安装git", res);
 	// console.log("检测git是否安装", git.check());

package/demo/LICENSE

@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

package/demo/api_tool_client/qianfan/api.json

@@ -1,33 +0,0 @@
-{
-	// 路由路径
-	"path": "/api/tool/qianfan",
-	// 名称, 用于动态增删改API配置
-	"name": "tool_qianfan",
-	// 标题, 用于开发文档显示
-	"title": "百度云千帆",
-	// 描述, 用于介绍该路由的作用
-	"description": "百度云千帆的AI聊天API接口",
-	// 函数文件, 用于驱动脚本, 实现业务 
-	"func_file": "./index.js",
-	// 请求方法, 选填 GET, POST, ALL。 ALL指同时支持GET/POST
-	"method": "ALL",
-	// 开放域, 如果域未开放, 则只有特定的协议头才能访问该API, 同时API文档不接见
-	"scope": true,
-	// 缓存时长, 单位: 分钟。使用缓存后, 二次访问API直接从缓存读取, 不重复执行业务脚本
-	"cache": 0,
-	// 是否启用
-	"state": 1,
-	// 是否客户端缓存, 使用客户端则不再访问服务器, 直接从浏览器中拿; 使用服务端缓存则会访问服务器   
-	"client_cache": false,
-	// 参数配置路径, 用于校验API请求参数是否正确, 同时显示在API文档中 
-	"param_path": "./param.json",
-	/* 授权协议 */
-	"oauth": {
-		// 是否需要登录, true表示需要登录才能访问该接口
-		"signIn": false,
-		// 会员权限级别, 如果小于该值, 则无法访问, 0为不限制
-		"vip": 0,
-		// 管理员权限级别, 如果小于该值, 则无法访问, 0为不限制
-		"gm": 0
-	}
-}

package/demo/api_tool_client/qianfan/index.js

@@ -1,82 +0,0 @@
-
-async function get_token(your_ak = "9AIGq44XVDMwAmlUcn6mrcdk", your_sk = "wNXmkhUQrXfIEiGYA6GjNY8G0GUs0DAA") {
-	var token = await $.cache.get("token_qianfan");
-	if (token) {
-		return token;
-	}
-	var url =
-		`https://aip.baidubce.com/oauth/2.0/token?grant_type=client_credentials&client_id=${your_ak}&client_secret=${your_sk}`
-	var http = new $.Http();
-	var res = await http.get(url);
-	if (res.body) {
-		var json = res.body.toJson();
-		if (json) {
-			token = json.access_token;
-			$.cache.set("token_qianfan", token, 7200);
-		}
-	}
-	return token;
-}
-
-async function send(token, content) {
-	var url =
-		`https://aip.baidubce.com/rpc/2.0/ai_custom/v1/wenxinworkshop/chat/completions_pro?access_token=${token}`
-	var http = new $.Http();
-
-	var body = {
-		"messages": [{
-			"role": "user",
-			"content": content,
-			"key": "1"
-		}],
-		"temperature": 0.95,
-		"top_p": 0.8,
-		"penalty_score": 1,
-		"enable_system_memory": false,
-		"disable_search": false,
-		"enable_citation": false,
-		"response_format": "text"
-	};
-	var res = await http.post(url, body);
-	if (res.body) {
-		var json = res.body.toJson();
-		if (json) {
-			return json;
-		}
-	}
-	return null;
-}
-
-// # 2. 使用access_token调用接口
-// curl--location--request POST
-// 	'"第一步中返回的 access_token'\
-// 	--header 'Content-Type: application/json'\
-// 	--data -
-// 	raw ''
-
-
-/**
- * 接口主函数
- * @param {Object} ctx HTTP上下文
- * @param {Object} db 数据管理器,如: { next: async function{}, ret: {} }
- * @return {Object} 执行结果
- */
-async function main(ctx, db) {
-	// 获取请求参数
-	var req = ctx.request;
-	var {
-		query,
-		body
-	} = req;
-	var param = Object.assign({}, query, body);
-	var {
-		content
-	} = param;
-	var ret;
-	var token = await get_token();
-	var res = await send(token, content);
-	ret = $.ret.obj(res);
-	return ret;
-};
-
-exports.main = main;

package/demo/api_tool_client/qianfan/param.json

@@ -1,51 +0,0 @@
-{
-	// 是否启用过滤, 启用过滤后, 不符合的参数会被过滤掉
-	"filter": true,
-	// 校验脚本文件, 可以使用脚本的方式加一步进行校验, 让传参更加安全
-	"func_file": "",
-	// get请求
-	"get": {
-		// 查询参数校验项
-		"query": ["uid"],
-		// 查询必填参数
-		"query_required": ["content"]
-	},
-	// post请求
-	"post": {
-		// 查询参数校验项
-		"query": ["uid"],
-		// 查询必填参数
-		"query_required": [],
-		// 正文参数校验项
-		"body": [],
-		// 正文必填参数
-		"body_required": ["content"]
-	},
-	// 校验列表
-	"list": [{
-			// 参数key名
-			"name": "uid",
-			// 参数中文名
-			"title": "用户ID",
-			// 数据类型
-			"type": "number",
-			// 数字类型时设置
-			"number": {
-				// 最小数值
-				"min": 1
-			},
-			// 分隔参数，允许传多个值，为空则限制1个值
-			"splitter": "|"
-		}, {
-			"name": "content",
-			"title": "聊天输入内容",
-			"type": "string",
-			// 字符串类型时设置
-			"string": {
-				// 最小数值
-				"min": 2
-			},
-			"splitter": "|"
-		}
-	]
-}

package/demo/dd.txt

@@ -1 +0,0 @@
-123

package/demo/index.js

@@ -1,144 +0,0 @@
-/**
- * @fileOverview yiyan
- * @author <a href="作者主页地址">插件作者</a>
- * @version 1.0
- */
-
-/**
- * 插件对象
- */
-module.exports = {
-	/**
-	 * 初始化
-	 * @param {Object} option 配置参数
-	 * @return {String} 成功返回null, 否则返回错误提示
-	 */
-	init(option) {
-		var msg = null;
-		return msg;
-	},
-
-	/**
-	 * 安装
-	 * @param {Object} option 配置参数
-	 * @return {String} 成功返回null,否则返回错误提示
-	 */
-	install(option) {
-		var msg = null;
-		return msg;
-	},
-
-	/**
-	 * 卸载
-	 * @param {Object} option 配置参数
-	 * @return {String} 成功返回null,否则返回错误提示
-	 */
-	uninstall(option) {
-		var msg = null;
-		return msg;
-	},
-
-	/**
-	 * 更新
-	 * @param {Object} option 配置参数
-	 * @return {String} 成功返回null, 否则返回错误提示
-	 */
-	update(option) {
-		var msg = null;
-		return msg;
-	},
-
-	/**
-	 * 启动
-	 * @param {Object} opiton 配置参数
-	 * @return {String} 成功返回null,否则返回错误提示
-	 */
-	start(option) {
-		var msg = null;
-		return msg;
-	},
-
-	/**
-	 * 暂停
-	 * @param {Object} opiton 配置参数
-	 * @return {String} 成功返回null,否则返回错误提示
-	 */
-	stop(option) {
-		var msg = null;
-		return msg;
-	},
-
-	/**
-	 * 结束
-	 * @param {Object} opiton 配置参数
-	 * @return {String} 成功返回null,否则返回错误提示
-	 */
-	end(option) {
-		var msg = null;
-		return msg;
-	},
-
-	/**
-	 * 插件
-	 * @param {String} item 插件项
-	 * @return {Object} 旗下插件和信息
-	 */
-	help(item) {
-		var tip = "";
-		switch (item) {
-			case "run":
-				break;
-			default:
-				break;
-		}
-		return tip;
-	},
-
-	/**
-	 * 主程序
-	 * @param {Object} param1 参数1
-	 * @param {Object} param2 参数2
-	 * @return {Object} 返回执行结果
-	 */
-	main(param1, param2) {
-		var ret = null;
-		return ret;
-	},
-
-	/**
-	 * 指令（类似命令提示符）
-	 * @param {String} content 指令内容
-	 * @return {String} 执行结果
-	 */
-	cmd(content) {
-		var ret = "";
-		return ret;
-	},
-
-	/**
-	 * API接口（用于其他插件调用该插件时）
-	 * @param {Object} ctx HTTP上下文
-	 * @param {Object} db 数据库管理器
-	 * @return {Object} 执行结果
-	 */
-	api(ctx, db) {
-		var ret = "";
-		return ret;
-	},
-
-	/**
-	 * 聊天（通过聊天的方式驱动插件, 用于机器人开发）
-	 * @param {String} from_user 发送消息人
-	 * @param {String} to_user 接收消息人
-	 * @param {String} content 内容
-	 * @param {String} group 群组 如果是个人，群组为空
-	 * @param {Number} type 群类型, 1永久会话/群、2临时会话/群
-	 * @param {String} msg_type 消息类型, event事件型、message消息型。默认消息型
-	 * @param {Object} 数据管理器
-	 * @return {String} 回复内容
-	 */
-	async chat(from_user, to_user, group, content, type, msg_type, db) {
-		var ret = "";
-		return ret;
-	}
-};

package/demo/plugin.json

@@ -1,18 +0,0 @@
-{
-    "app": "tool",
-    "name": "yiyan",
-    "title": "文心一言",
-    "description": "AI聊天机器人，可用于回答问题，创作文章。",
-    "version": "1.0.0",
-    "author": "自由人网络",
-    "web": "https://www.fman.top",
-    "state": 1,
-    "show": 0,
-    "func_file": "./index.js",
-    "func_name": "",
-    "lang_path": "./lang/",
-    "icon": "/tool/yiyan/img/logo.png",
-    "cmd": "tool.yiyan",
-    "end": true,
-    "sort": 10
-}

package/demo/static/static.json

@@ -1,18 +0,0 @@
-{
-	// 路由路径，注意：这里是泛路径，相当于/*
-	"path": "/tool/yiyan",
-	// 默认文件，当直接访问这个路径时，如果存在默认文件，这直接访问该文件
-	"index": "index.html",
-	// 资源缓存寿命，单位：秒
-	"maxAge": 0,
-	// 是否恒久不变，一般资源文件可能变化，所以这里一般是false
-	"immutable": false,
-	// 是否使用brotli压缩方式
-	"brotli": true,
-	// 是否启用gzip压缩方式
-	"gzip": true,
-	// 是否限制访问指定拓展名的文件，多个
-	"extensions": null,
-	// 是否转换JS、vue代码为amd标准，true的情况下会把es6和commonJS都转成amd格式
-	"convert_amd": false
-}