cloudcc-cli 1.6.5 → 1.6.6

package/core/core/CCTrigger.java

@@ -0,0 +1,23 @@
+package com.cloudcc.core;
+
+public interface CCTrigger {
+    public void do_insert_before() throws Exception;
+
+    public void do_insert_after() throws Exception;
+
+    public void do_update_before() throws Exception;
+
+    public void do_update_after() throws Exception;
+    public void do_upsert_before() throws Exception;
+
+    public void do_upsert_after() throws Exception;
+
+    public void do_delete_before() throws Exception;
+
+    public void do_delete_after() throws Exception;
+    public void setRecordOldVal (String id);
+
+    public void do_approval() throws Exception;
+
+    public String getObjectApiName();
+}

package/core/core/CCTriggerHandler.java

@@ -0,0 +1,15 @@
+package com.cloudcc.core;
+
+import java.util.Map;
+
+public abstract class CCTriggerHandler extends CCService {
+    public Map record_new;
+    public Map record_old;
+    public ServiceResult trigger;
+    public CCTriggerHandler(Map triggernew, Map triggerold, ServiceResult svc, UserInfo uinfo){
+        super(uinfo);
+        this.record_new = triggernew;
+        this.record_old = triggerold;
+        this.trigger = svc;
+    }
+}

package/core/core/DevLogger.java

@@ -0,0 +1,39 @@
+package com.cloudcc.core;
+
+/**
+ * @author jarry
+ *
+ * 系统日志输出
+ */
+public class DevLogger {
+    UserInfo userInfo;
+    public  DevLogger(UserInfo userInfo){
+        this.userInfo = userInfo;
+    }
+
+    /**
+     * info日志
+     * @param log
+     */
+    public static void devLogInfo(String log){
+        System.out.println("Info日志"+log);
+    }
+
+    /**
+     * Error日志
+     * @param log
+     */
+    public static void devLogError(String log){
+        System.out.println("Info日志"+log);
+    }
+
+    /**
+     * 异常日志
+     * @param log
+     * @param e
+     */
+    public static void devLogError(String log,Exception e){
+        System.out.println("Info日志"+log);
+        System.out.println(e);
+    }
+}

package/core/core/OperatationEnum.java

@@ -0,0 +1,5 @@
+package com.cloudcc.core;
+
+public enum OperatationEnum {
+    INSERT,UPDATE,UPSERT,DELETE,APPROVE
+}

package/core/core/PeakInterf.java

@@ -0,0 +1,6 @@
+package com.cloudcc.core;
+
+public interface PeakInterf {
+    public UserInfo uinfo = new UserInfo();
+    public void execute();
+}

package/core/core/PeakSvc.java

@@ -0,0 +1,8 @@
+package com.cloudcc.core;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+public class PeakSvc {
+    @Autowired
+    public CCService ccService;
+}

package/core/core/ServiceResult.java

@@ -0,0 +1,35 @@
+package com.cloudcc.core;
+
+import com.alibaba.fastjson.JSONObject;
+
+import java.util.HashMap;
+
+public class ServiceResult extends HashMap {
+    public String success;
+    public String message;
+    public String Id;
+
+	public void addErrorMessage(String msg) throws Exception{
+        this.put("message",msg);
+        this.put("success","false");
+        throw new Exception(msg);
+    }
+
+    public String getMessage(){
+        return (String)this.get("message");
+    }
+
+    public String getSuccess(){
+        return   (String)this.get("success");
+    }
+    public String getId(){
+        return   (String)this.get("id");
+    }
+
+    @Override
+    public String toString(){
+        JSONObject data = new JSONObject();
+        data.putAll(this);
+        return data.toString();
+    }
+}

package/core/core/TriggerInvoker.java

@@ -0,0 +1,83 @@
+package com.cloudcc.core;
+
+import com.cloudcc.core.CCObject;
+import org.reflections.Reflections;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Set;
+
+public class TriggerInvoker {
+    UserInfo uinfo = null;
+    String operate = "";
+    String triggerTime = "";
+    public TriggerInvoker (UserInfo userInfo,String operate,String triggerTime){
+       this.uinfo = userInfo;
+       this.operate = operate;
+       this.triggerTime = triggerTime;
+    }
+    public TriggerInvoker(){
+
+    }
+    public ServiceResult handler(CCObject data) throws Exception{
+        String objectApiName = data.getObjectApiName();
+        ServiceResult sr = new ServiceResult();
+        Reflections ref = new Reflections("com.cloudcc.trigger");
+        Set<Class<? extends CCTrigger>> clsSets = ref.getSubTypesOf(CCTrigger.class);
+        for (Class<? extends CCTrigger> subCls : clsSets){
+            try {
+                Constructor cons = subCls.getConstructor(CCObject.class,CCObject.class,ServiceResult.class,UserInfo.class);
+                CCTrigger trigger = (CCTrigger) cons.newInstance(data,null,sr,uinfo);
+                String objectApiNameTmp = (String) trigger.getObjectApiName();
+                if (objectApiName != null && objectApiName.equals(objectApiNameTmp)) {
+                    if ("before".equals(triggerTime) && "insert".equals(operate)) {
+                        trigger.do_insert_before();
+                    }
+                    if ("after".equals(triggerTime) && "insert".equals(operate)) {
+                        String id = (String)data.get("id");
+                        trigger.setRecordOldVal(id);
+                        trigger.do_insert_after();
+                    }
+                    if ("before".equals(triggerTime) && "update".equals(operate)) {
+                        trigger.do_update_before();
+                    }
+                    if ("after".equals(triggerTime) && "update".equals(operate)) {
+                        String id = (String)data.get("id");
+                        trigger.setRecordOldVal(id);
+                        trigger.do_update_after();
+                    }
+                    if ("before".equals(triggerTime) && "upsert".equals(operate)) {
+                        trigger.do_upsert_before();
+                    }
+                    if ("after".equals(triggerTime) && "upsert".equals(operate)) {
+                        String id = (String)data.get("id");
+                        trigger.setRecordOldVal(id);
+                        trigger.do_upsert_after();
+                    }
+                    if ("before".equals(triggerTime) && "delete".equals(operate)) {
+                        trigger.do_delete_before();
+                    }
+                    if ("after".equals(triggerTime) && "delete".equals(operate)) {
+                        String id = (String)data.get("id");
+                        trigger.setRecordOldVal(id);
+                        trigger.do_delete_after();
+                    }
+                    if ("approval".equals(operate)) {
+                        trigger.do_approval();
+                    }
+                }
+            } catch (NoSuchMethodException e) {
+                throw new RuntimeException(e);
+            } catch (InvocationTargetException e) {
+                throw new RuntimeException(e);
+            } catch (InstantiationException e) {
+                throw new RuntimeException(e);
+            } catch (IllegalAccessException e) {
+                throw new RuntimeException(e);
+            }catch (Exception ex) {
+                throw ex;
+            }
+        }
+        return sr;
+    }
+}

package/core/core/TriggerMethod.java

@@ -0,0 +1,9 @@
+package com.cloudcc.core;
+
+public @interface TriggerMethod {
+    String name();
+    OperatationEnum operate();
+    TriggerTimeEnum triggerTime();
+    boolean isEnable() ;
+    String remark() default "";
+}

package/core/core/TriggerTimeEnum.java

@@ -0,0 +1,5 @@
+package com.cloudcc.core;
+
+public enum TriggerTimeEnum {
+    BEFORE,AFTER
+}

package/core/core/UserInfo.java

@@ -0,0 +1,45 @@
+package com.cloudcc.core;
+
+import com.cloudcc.core.CCObject;
+
+public class UserInfo extends CCObject{
+	public String binding;
+	public String getUserId() {
+		return  (String)this.get("id");
+	}
+
+	public String getRoleId() {
+		return  (String)this.get("role");
+	}
+	
+	public UserInfo (String username,String pwd) throws Exception {
+		this.put("userName", username);
+		this.put("password", pwd);
+	}
+	
+	public UserInfo() {
+		
+	}
+
+	public String getLoginName(){
+		return (String)this.get("userName");
+	}
+	public String getProfileId() {
+		// TODO Auto-generated method stub
+		return (String)this.get("profileId");
+	}
+	public void setBinding(String bind){
+		this.binding = bind;
+		this.put("binding",bind);
+	}
+	public String getBinding(){
+		if (this.binding == null){
+			return (String)this.get("binding");
+		} else {
+			return this.binding;
+		}
+	}
+	public String getUserName() {
+		return  (String)this.get("name");
+	}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudcc-cli",
-  "version": "1.6.5",
+  "version": "1.6.6",
   "description": "cloudcc-cli",
   "keywords": [
     "cloudcc",

package/src/classes/create.js

@@ -2,18 +2,15 @@ const { checkUpdate } = require("../../utils/checkVersion")
 const fs = require("fs");
 const path = require("path")
 const chalk = require("chalk")
-/**
- * 创建文件
- * @param {string} name 文件名称
- */
+
 async function create(name) {
     let res = await checkUpdate();
     if (!res) {
         const classesPath = path.join(process.cwd(), "classes/" + name);
         try {
             fs.mkdirSync(classesPath, { recursive: true })
-            const javaTmp = `
-public class ${name}{
+            const javaTmp = 
+`public class ${name}{
     private UserInfo userInfo;
     
     public ${name}(UserInfo userInfo){
@@ -30,11 +27,11 @@ public class ${name}{
             fs.writeFileSync(path.join(classesPath, name + ".java"), javaTmp)
             fs.writeFileSync(path.join(classesPath, "config.json"), `{"name":"${name}","version":"3"}`)
             console.log()
-            console.log(chalk.green("创建成功：" + name))
+            console.log(chalk.green("Successfully Created:" + name))
             console.log()
         } catch (e) {
             console.log()
-            console.log(chalk.red("创建失败：" + e))
+            console.log(chalk.red("Creation Failed:" + e))
             console.log()
         }
     }

package/src/classes/publish.js

@@ -1,4 +1,4 @@
-// 检查cli版本更新功能
+
 const { checkUpdate } = require("../../utils/checkVersion")
 const fs = require("fs");
 const path = require("path")
@@ -6,20 +6,17 @@ const chalk = require("chalk")
 const { postNormal } = require("../../utils/http")
 
 const { getBusToken } = require("../../utils/utils")
-/**
- * 发布文件
- * @param {string} name 文件名称
- */
+
 async function publish(name) {
   let res = await checkUpdate();
   if (!res) {
     console.log();
-    console.log(chalk.green('发布中，请稍后...'));
+    console.log(chalk.green('Posting, please wait...'));
     console.log();
     const classPath = path.join(process.cwd(), `classes/${name}/`);
     let classContent = fs.readFileSync(classPath + `${name}.java`, 'utf8');
     let configContent = JSON.parse(fs.readFileSync(classPath + "config.json", 'utf8'));
-    // 获取token成功后，发布内容
+    
     if (await getBusToken()) {
       let body = {
         "id": configContent.id,
@@ -28,18 +25,17 @@ async function publish(name) {
         "source": encodeURI(classContent),
         "folderId": "wgd"
       }
-      let url = new URL(global.baseUrl).origin
-      let res = await postNormal(url + "/setup/api/ccfag/save", body)
+      let res = await postNormal(global.setupSvc + "/api/ccfag/save", body)
       if (res.result) {
-        console.log(chalk.green('发布成功！'));
+        console.log(chalk.green('Success！'));
         console.log();
-        // 组件发布成功后，判断下配置文件是否有id，如果没有，那么将id存储到配置中
+        
         if (!configContent.id) {
           configContent.id = res.data
           fs.writeFileSync(path.join(classPath, "config.json"), JSON.stringify(configContent))
         }
       } else {
-        console.log(chalk.red('发布失败：' + res.returnInfo));
+        console.log(chalk.red('Fail：' + res.returnInfo));
       }
     }
   }

package/src/config/get.js

@@ -1,9 +1,7 @@
 
 const chalk = require("chalk")
 const path = require("path")
-/**
- * 获取token
- */
+
 async function get(projectPath = process.cwd()) {
     let config = require(path.join(projectPath, "cloudcc-cli.config.js"))
     if (config) {

package/src/config/use.js

@@ -1,8 +1,6 @@
 const path = require("path")
 const fs = require("fs")
-/**
- * 获取token
- */
+
 function use(env, projectPath = process.cwd()) {
     let config = require(path.join(projectPath, "cloudcc-cli.config.js"));
     config.use = env;

package/src/object/get.js

@@ -1,13 +1,11 @@
 const { getBusToken } = require("../../utils/utils")
 const { postNormal } = require("../../utils/http")
-/**
- * 获取对象集合
- */
+
+
 async function get(path = process.cwd()) {
-    // 获取token成功后，发布内容
+    
     if (await getBusToken(path)) {
-        let url = new URL(global.baseUrl).origin
-        let res = await postNormal(url + "/setup/api/customObject/standardObjList")
+        let res = await postNormal(global.setupSvc + "/api/customObject/standardObjList")
         console.log(JSON.stringify(res.data))
         return res.data
     }

package/src/plugin/create.js

@@ -1,15 +1,10 @@
 const fs = require('fs');
 const inquirer = require("inquirer")
-// 检查cli版本更新功能
+
 const { checkUpdate } = require("../../utils/checkVersion")
 const temp = `<template>
 <div class="cc-container">
   <div>Hello CloudCC</div>
-  <div>
-    <a href="https://cloudccone.feishu.cn/wiki/JZ7CwcRfriU8taknCKCcwKEmncd">
-      开发者文档</a
-    >
-  </div>
 </div>
 </template>
 
@@ -18,12 +13,12 @@ export default {
 data() {
   return {
     componentInfo: {
-      // 组件唯一标识，全局唯一
+      
       component: "cloudcc-demo-01",
-      // 组件名称，在页面编辑器显示的名字
+      
       compName: "cloudcc-demo-01",
-      // 组件描述信息
-      compDesc: "组件描述信息",
+      
+      compDesc: "Component description information",
     },
     isLock: false,
   };
@@ -37,13 +32,11 @@ padding: 8px;
 background: goldenrod;
 }
 </style>`
-/**
- * 创建组件模板文件
- */
+
 class Builder {
   constructor() {
     this.options = {
-      // 开发配置信息
+      
       devConsoleConfig: {
       },
     }
@@ -52,7 +45,7 @@ class Builder {
   async init() {
     let res = await checkUpdate();
     if (!res) {
-      // 获得用户输入
+      
       let answers;
       if (this.plugin) {
         answers = { buildFileName: this.plugin + "/demo.vue" }
@@ -63,16 +56,13 @@ class Builder {
       fs.writeFileSync(answers.buildFileName, temp);
     }
   }
-  /**
-   *  命令行交互
-   * @returns 结果
-   */
+  
   ask() {
     const prompt = [];
     prompt.push({
       type: "input",
       name: "buildFileName",
-      message: "请输入文件名，如index.vue",
+      message: "Please enter a file name, such as index.vue",
     })
     return inquirer.prompt(prompt)
   }

package/src/plugin/create1.js

@@ -1,23 +1,15 @@
-// 检查cli版本更新功能
+
 const { checkUpdate } = require("../../utils/checkVersion")
 const fs = require("fs");
 const path = require("path")
 const chalk = require("chalk")
 
 
-/**
- * 创建文件
- * @param {string} name 文件名称
- */
+
 async function create(name) {
   const temp = `<template>
 <div class="cc-container">
   <div>Hello CloudCC</div>
-  <div>
-    <a href="https://cloudccone.feishu.cn/wiki/JZ7CwcRfriU8taknCKCcwKEmncd">
-      开发者文档</a
-    >
-  </div>
 </div>
 </template>
 
@@ -26,12 +18,12 @@ export default {
 data() {
   return {
     componentInfo: {
-      // 组件唯一标识，全局唯一
+      
       component: "${name}",
-      // 组件名称，在页面编辑器显示的名字
+      
       compName: "${name}",
-      // 组件描述信息
-      compDesc: "组件描述信息",
+      
+      compDesc: "Component description information",
     },
     isLock: false,
   };
@@ -54,11 +46,11 @@ background: goldenrod;
       fs.writeFileSync(path.join(pluginPath, name + ".vue"), temp)
       fs.writeFileSync(path.join(pluginPath, "config.json"), `{"name":"${name}"}`)
       console.log()
-      console.log(chalk.green("创建成功：" + name))
+      console.log(chalk.green("Successfully Created:" + name))
       console.log()
     } catch (e) {
       console.log()
-      console.log(chalk.red("创建失败：" + e))
+      console.log(chalk.red("Creation Failed:" + e))
       console.log()
     }
   }