biz9-logic 4.8.299 → 4.8.302

package/biz9_config

@@ -1,4 +1,4 @@
-VERSION='7.7.9'
+VERSION='7.8.2'
 TITLE='BiZ9-Logic';
 REPO='git@github.com:biz9framework/biz9-logic.git';
 BRANCH='main';

package/index.js

@@ -5,8 +5,6 @@ License GNU General Public License v3.0
 Description: BiZ9 Framework: Logic-JS
 */
 const moment = require('moment');
-const { exec } = require('child_process');
-const sharp = require('sharp');
 const { get_new_item_main,get_data_config_main,get_cloud_url_main,get_biz_item_main,get_cloud_filter_obj_main,get_new_full_item_main } = require('./main');
 const { Log,Str,DateTime,Num,Obj } = require('/home/think2/www/doqbox/biz9-framework/biz9-utility/code');
 class Message {
@@ -1149,266 +1147,266 @@ class DataItem {
 	};
 }
 class Dashboard_Url {
-	static user_home = (app_id,url,params) => {
+	static user_home = (app_id,url,param) => {
 		let action_url="dashboard/user_home";
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
-	static app_home = (app_id,url,params) => {
+	static app_home = (app_id,url,param) => {
 		let action_url="dashboard/app_home";
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
 }
 class Blog_Post_Url {
-	static detail = (app_id,url,key,params) => {
+	static detail = (app_id,url,key,param) => {
 		let action_url="blog_post/detail/"+key;
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
-	static home = (app_id,url,params) => {
+	static home = (app_id,url,param) => {
 		let action_url="blog_post";
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
-	static search = (app_id,url,params) => {
+	static search = (app_id,url,param) => {
 		let action_url="blog_post/search";
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
 }
 class Product_Url {
-	static detail = (app_id,url,key,params) => {
+	static detail = (app_id,url,key,param) => {
 		let action_url="product/detail/"+key;
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
-	static home = (app_id,url,params) => {
+	static home = (app_id,url,param) => {
 		let action_url="product";
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
-	static search = (app_id,url,params) => {
+	static search = (app_id,url,param) => {
 		let action_url="product/search";
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
 }
 class Event_Url {
-	static detail = (app_id,url,key,params) => {
+	static detail = (app_id,url,key,param) => {
 		let action_url="event/detail/"+key;
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
-	static home = (app_id,url,params) => {
+	static home = (app_id,url,param) => {
 		let action_url="event";
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
-	static search = (app_id,url,params) => {
+	static search = (app_id,url,param) => {
 		let action_url="event/search";
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
 }
 class Service_Url {
-	static detail = (app_id,url,key,params) => {
+	static detail = (app_id,url,key,param) => {
 		let action_url="service/detail/"+key;
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
-	static home = (app_id,url,params) => {
+	static home = (app_id,url,param) => {
 		let action_url="service/search";
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
-	static search = (app_id,url,params) => {
+	static search = (app_id,url,param) => {
 		let action_url="service/search";
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
 }
 class Gallery_Url {
-	static detail = (app_id,url,key,params) => {
+	static detail = (app_id,url,key,param) => {
 		let action_url="gallery/detail/"+key;
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
-	static home = (app_id,url,params) => {
+	static home = (app_id,url,param) => {
 		let action_url="gallery";
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
-	static search = (app_id,url,params) => {
+	static search = (app_id,url,param) => {
 		let action_url="gallery/search";
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
 }
 class User_Url {
-	static info = (app_id,url,params) => {
+	static info = (app_id,url,param) => {
 		let action_url="user/info/";
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
-	static register = (app_id,url,params) => {
+	static register = (app_id,url,param) => {
 		let action_url="user/register";
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
-	static login = (app_id,url,params) => {
+	static login = (app_id,url,param) => {
 		let action_url="user/login";
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
-	static logout = (app_id,url,params) => {
+	static logout = (app_id,url,param) => {
 		let action_url="user/logout";
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
 }
 class Image_Url {
-	static post = (app_id,url,params) => {
+	static post = (app_id,url,param) => {
 		let action_url="main/image/post";
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
-	static post_cdn = (app_id,url,params) => {
+	static post_cdn = (app_id,url,param) => {
 		let action_url="main/image/post_cdn";
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
 }
 class Item_Url {
-	static activity = (app_id,url,params) => {
+	static activity = (app_id,url,param) => {
 		let action_url="item/activity";
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
-	static cart = (app_id,url,cart_number,params) => {
+	static cart = (app_id,url,cart_number,param) => {
 		let action_url="item/cart/"+cart_number;
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
-	static content = (app_id,url,key,params) => {
+	static content = (app_id,url,key,param) => {
 		let action_url="item/content/"+key;
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
-	static custom_field = (app_id,url,data_type,key,params) => {
+	static custom_field = (app_id,url,data_type,key,param) => {
 		let action_url="item/custom_field/"+data_type+"/"+key;
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
-	static delete_order = (app_id,url,id,params) => {
+	static delete_order = (app_id,url,id,param) => {
 		let action_url="item/delete_order/"+id;
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
-	static delete_cart = (app_id,url,id,params) => {
+	static delete_cart = (app_id,url,id,param) => {
 		let action_url="item/delete_cart/"+id;
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
-	static favorite = (app_id,url,parent_data_type,page_current,page_size,params) => {
+	static favorite = (app_id,url,parent_data_type,page_current,page_size,param) => {
 		let action_url="item/favorite/"+parent_data_type+"/"+page_current+"/"+page_size;
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
-	static order = (app_id,url,order_number,params) => {
+	static order = (app_id,url,order_number,param) => {
 		let action_url="item/order/"+order_number;
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
-	static post_cart = (app_id,url,parent_data_type,params) => {
+	static post_cart = (app_id,url,parent_data_type,param) => {
 		let action_url="item/post_cart/"+parent_data_type;
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
-	static post_cms = (app_id,url,data_type,id,params) => {
+	static post_cms = (app_id,url,data_type,id,param) => {
 		let action_url = "item/post_cms/"+data_type+"/"+id;
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
-	static post_favorite = (app_id,url,parent_data_type,parent_item_id,params) => {
+	static post_favorite = (app_id,url,parent_data_type,parent_item_id,param) => {
 		let action_url="item/post_favorite"+parent_data_type+"/"+parent_item_id;
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
-	static post_field_value = (app_id,url,item_data_type,parent_item_id,value_id,params) => {
+	static post_field_value = (app_id,url,item_data_type,parent_item_id,value_id,param) => {
 		let action_url="item/post_field_value/"+item_data_type+"/"+parent_item_id;
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
-	static post_review = (app_id,url,parent_data_type,item_id,params) => {
+	static post_review = (app_id,url,parent_data_type,item_id,param) => {
 		let action_url="item/post_review/"+parent_data_type+"/"+item_id;
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
-	static post_order = (app_id,url,params) => {
+	static post_order = (app_id,url,param) => {
 		let action_url="item/post_order";
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
-	static review = (app_id,url,parent_data_type,page_current,page_size,params) => {
+	static review = (app_id,url,parent_data_type,page_current,page_size,param) => {
 		let action_url="item/review/"+parent_data_type+"/"+page_current+"/"+page_size;
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
-	static search_cart = (app_id,url,parent_data_type,params) => {
+	static search_cart = (app_id,url,parent_data_type,param) => {
 		let action_url="item/search_cart/"+parent_data_type;
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
-	static search_order = (app_id,url,parent_data_type,params) => {
+	static search_order = (app_id,url,parent_data_type,param) => {
 		let action_url="item/search_order/"+parent_data_type;
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
-	static template = (app_id,url,key,params) => {
+	static template = (app_id,url,key,param) => {
 		let action_url="item/template/"+key;
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
 }
 class Category_Url {
-	static detail = (app_id,url,key,params) => {
+	static detail = (app_id,url,key,param) => {
 		let action_url="category/detail/"+key;
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
-	static home = (app_id,url,params) => {
+	static home = (app_id,url,param) => {
 		let action_url="category";
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
-	static search = (app_id,url,params) => {
+	static search = (app_id,url,param) => {
 		let action_url="category/search";
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
 }
 class Page_Url {
-	static get = (app_id,url,title_url,params) => {
+	static get = (app_id,url,title_url,param) => {
 		let action_url="page/get/"+title_url;
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
-	static home = (app_id,url,params) => {
+	static home = (app_id,url,param) => {
 		let action_url="page/home";
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
-	static about = (app_id,url,params) => {
+	static about = (app_id,url,param) => {
 		let action_url="page/about";
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
-	static contact = (app_id,url,params) => {
+	static contact = (app_id,url,param) => {
 		let action_url="page/contact";
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
-	static faq = (app_id,url,key,params) => {
+	static faq = (app_id,url,key,param) => {
 		let action_url="page/faq/"+key;
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
 }
 class Url{
-	static copy = (app_id,url,data_type,id,params) => {
+	static copy = (app_id,url,data_type,id,param) => {
 		let action_url = "main/crud/copy/"+data_type + "/" + id;
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
-	static delete = (app_id,url,data_type,id,params) => {
+	static delete = (app_id,url,data_type,id,param) => {
 		let action_url = "main/crud/delete/"+data_type + "/" + id;
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
-	static delete_check_protection = (app_id,url,data_type,id,params) => {
+	static delete_check_protection = (app_id,url,data_type,id,param) => {
 		let action_url = "main/crud/delete_item_check_protection/"+data_type + "/" + id;
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
-	static delete_search = (app_id,url,data_type,params) => {
+	static delete_search = (app_id,url,data_type,param) => {
 		let action_url = "main/crud/delete_list/"+data_type;
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
-	static url = (app_id,url,action_url,params) => {
-		return get_cloud_url_main(app_id,url,action_url,params);
+	static url = (app_id,url,action_url,param) => {
+		return get_cloud_url_main(app_id,url,action_url,param);
 	}
-	static get = (app_id,url,data_type,key,params) => {
+	static get = (app_id,url,data_type,key,param) => {
 		let action_url= "main/crud/get/"+data_type + "/" + key;
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
-	static get_parent_top = (app_id,url,data_type,id,params) => {
+	static get_parent_top = (app_id,url,data_type,id,param) => {
 		let action_url = "main/crud/get_parent_top/"+data_type+"/"+id;
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
-	static search = (app_id,url,data_type,params) => {
+	static search = (app_id,url,data_type,param) => {
 		let action_url = "main/crud/search/"+data_type;
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
-	static upload_file = (app_id,url,data_type,id,params) => {
+	static upload_file = (app_id,url,data_type,id,param) => {
 		let action_url = "main/crud/post/"+data_type + "/" + id;
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
-	static post = (app_id,url,data_type,id,params) => {
+	static post = (app_id,url,data_type,id,param) => {
 		let action_url = "main/crud/post/"+data_type + "/" + id;
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
-	static post_list = (app_id,url,params) => {
+	static post_list = (app_id,url,param) => {
 		let action_url = "main/crud/post_list";
-		return get_cloud_url_main(app_id,url,action_url,params);
+		return get_cloud_url_main(app_id,url,action_url,param);
 	};
 }
 class Category_Logic {
@@ -1898,139 +1896,14 @@ class App_Logic {
 		return app;
 	}
 }
-
 class Image_Logic {
-	static get_url = (host,image_filename,size) =>{
-		return host+"/"+size + "_"+image_filename;
-	}
-	static get_new_by_base64 = (base64) =>{
-		return DataItem.get_new(DataType.IMAGE,0,
-			{
-				mime_type:!Str.check_is_null(Str.get_file_type_from_base64(base64)) ? Str.get_file_type_from_base64(base64).mimeType : 'image/jpeg',
-				extension:!Str.check_is_null(Str.get_file_type_from_base64(base64)) ? Str.get_file_type_from_base64(base64).extension : 'jpeg',
-				image_filename:!Str.check_is_null(Str.get_file_type_from_base64(base64)) ? Str.get_guid()+"."+Str.get_file_type_from_base64(base64).extension : 'not_found.jpeg',
-				buffer:!Str.check_is_null(Str.get_file_type_from_base64(base64)) ? Buffer.from(base64.split(';base64,').pop(), 'base64') : null,
-		});
-	}
- 	static get_cloud_flare_batch_token = (cloud_flare_account_id,cloud_flare_api_token) => {
-        return new Promise((callback) => {
-            let data_batch,error=null;
-            const url = "https://api.cloudflare.com/client/v4/accounts/"+cloud_flare_account_id+"/images/v1/batch_token";
-            const headers = {
-                "Accept": "application/json",
-                "Authorization": "Bearer " +cloud_flare_api_token
-            };
-            let curlCommand = `curl -s -H "Accept: ${headers.Accept}"`;
-            if (headers.Authorization) {
-                curlCommand += ` -H "Authorization: ${headers.Authorization}"`;
-            }
-            curlCommand += ` "${url}"`;
-            exec(curlCommand,async(err,stdout,stderr) => {
-                if (err) {
-                    err = `1 Error executing curl command: ${error.message}`;
-                    console.error(err);
-                    error=Log.append(error,err);
-                    return;
-                }
-                if (stderr) {
-                    err = `2 Curl stderr: ${stderr}`;
-                    console.error(err);
-                    error=Log.append(error,err);
-                    return;
-                }
-                try {
-                    const jsonData =await JSON.parse(stdout);
-                    data_batch =  jsonData.result.token;
-                    if(data_batch!== null){
-                        callback([error,data_batch]);
-                    }
-                } catch (parseError) {
-                    console.error(`Error parsing JSON response: ${parseError.message}`);
-                    console.log('Raw Response:', stdout);
-                    callback([parseError,null]);
-                }
-            });
-        });
-    };
- 	static post_cloud_flare_batch_image = (cloud_flare_api_token,batch_token,image_filename,item_file_path) => {
-        let error = null;
-        return new Promise((callback) => {
-            async.series([
-                async function(call){
-                    const post_url = "https://batch.imagedelivery.net/images/v1";
-                    const headers = {
-                        "Accept": "application/json",
-                        "Authorization": "Bearer " +batch_token
-                    };
-                    let curlCommand = `curl -s -H "Accept: ${headers.Accept}"`;
-                    curlCommand += ` -H "Authorization: ${headers.Authorization}"`;
-                    curlCommand += " -H X-Auth-Key: "+ cloud_flare_api_token;
-                    curlCommand += " -F requireSignedURLs=false";
-                    curlCommand += " -F id="+image_filename;
-                    curlCommand += " -F file=@"+item_file_path;
-                    curlCommand += ` "${post_url}"`;
-                    exec(curlCommand, (err, stdout, stderr) => {
-                        if (err) {
-                            err = `Error executing curl command: ${err.message}`;
-                            console.error(err);
-                            error=Log.append(error,err);
-                        }
-                        if (stderr) {
-                            err = `Curl stderr: ${stderr}`;
-                            console.error(err);
-                            error=Log.append(error,err);
-                        }
-                        try {
-                            const jsonData = JSON.parse(stdout);
-                            console.log('cool');
-                            console.log(jsonData);
-                            console.log('bean');
-                            if(jsonData!== null){
-                                callback([error,jsonData]);
-                            }
-                        } catch (parseError) {
-                            console.error(`Error parsing JSON response: ${parseError.message}`);
-                            console.log('Raw Response:', stdout);
-                            error=Log.append(error,parseError);
-                            callback([error,null]);
-                        }
-                    });
-                },
-            ])
-        });
-    };
-
- 	static post_write = (buffer,size,path_filename,is_square) => {
-        return new Promise((callback) => {
-            let data,error=null;
-            if(is_square){
-            sharp(buffer)
-                .resize(size)
-                .toFile(path_filename,(err, info) => {
-                    if(err){
-                        error=Log.append(error,'Error thumb saving file:');
-                        console.error('Error thumb saving file:', err);
-                    }
-                    if(info!==null){
-                        callback([error,true]);
-                    }
-                });
-            }else{
-            sharp(buffer)
-                .resize(size,size,{fit:sharp.fit.fill,quality:100})
-                .toFile(path_filename,(err, info) => {
-                    if(err){
-                        error=Log.append(error,'Error thumb saving file:');
-                        console.error('Error thumb saving file:', err);
-                    }
-                    if(info!==null){
-                        callback([error,true]);
-                    }
-                });
-            }
-        });
+	static get_url = (host,image_filename,size,param) =>{
+		if(!param){
+			param="";
+		}
+		return host+"/"+size + "_"+image_filename+param;
 	}
-	static get_process_list = (upload_dir,image_filename) =>{
+static get_process_list = (upload_dir,image_filename) =>{
 		 return [
 			{
 				image_filename:FieldType.IMAGE_SIZE_THUMB+"_"+image_filename,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "biz9-logic",
-  "version": "4.8.299",
+  "version": "4.8.302",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"