cloudcc-cli 1.9.6 → 1.9.8

package/pom.xml

@@ -0,0 +1,100 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.cloudcc.core</groupId>
+    <artifactId>ccopenapi</artifactId>
+    <version>0.0.1</version>
+    <packaging>jar</packaging>
+    <name>ccopenapi</name>
+    <dependencies>
+        <!-- 添加 fastjson 依赖 -->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.75</version>
+        </dependency>
+        <!-- 添加 log4j 依赖 -->
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.17</version>
+        </dependency>
+        <!-- 添加 org.reflections 依赖 -->
+        <dependency>
+            <groupId>org.reflections</groupId>
+            <artifactId>reflections</artifactId>
+            <version>0.9.12</version>
+        </dependency>
+        <!-- 添加 Jackson 依赖 -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.13.3</version>
+        </dependency>
+        <!-- 添加 slf4j 依赖 -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.32</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>1.7.32</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>3.2.0</version>
+                <executions>
+                    <execution>
+                        <id>add-extra-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>${project.basedir}/java</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.2.0</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <includes>
+                                <include>com/cloudcc/**/*.class</include>
+                            </includes>
+                            <classifier>classes</classifier>                            <!-- 添加 classifier 元素 -->
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

package/src/classes/create.js

@@ -11,7 +11,10 @@ async function create(name) {
         try {
             fs.mkdirSync(classesPath, { recursive: true })
             const javaTmp =
-                `// @SOURCE_CONTENT_START
+                `package classes.${name};
+
+import com.cloudcc.core.*;
+// @SOURCE_CONTENT_START
 public class ${name}{
     private UserInfo userInfo;
     private CCService cs;
@@ -24,14 +27,28 @@ public class ${name}{
         this.cs=cs;
     }
     
-    public String demo(String str){
+    public String getName(String str){
         str = "demo";
         return str;
     }
 }
 // @SOURCE_CONTENT_END    
+`
+            const javaTestTmp =
+                `package classes.${name};
+
+import com.cloudcc.core.*;
+
+public class ${name}Test {
+    public static void main(String[] args) {
+        ${name} obj = new ${name}(new UserInfo());
+        String name = obj.getName("test");
+        System.out.println("name:" + name);
+    }
+}
 `
             fs.writeFileSync(path.join(classesPath, name + ".java"), javaTmp)
+            fs.writeFileSync(path.join(classesPath, name + "Test.java"), javaTestTmp)
             fs.writeFileSync(path.join(classesPath, "config.json"), `{"name":"${name}","version":"${getPackageJson().extandVersion || '2'}"}`)
             console.log()
             console.log(chalk.green("Successfully Created:" + name))

package/template/index.js

@@ -1,6 +1,33 @@
 const fs = require("fs");
 const chalk = require("chalk")
 const path = require("path")
+
+// 添加递归复制文件夹的函数
+function copyFolderSync(source, target) {
+    // 确保目标文件夹存在
+    if (!fs.existsSync(target)) {
+        fs.mkdirSync(target, { recursive: true });
+    }
+
+    // 读取源文件夹内容
+    const files = fs.readdirSync(source);
+
+    // 遍历并复制每个文件/文件夹
+    files.forEach(file => {
+        const sourcePath = path.join(source, file);
+        const targetPath = path.join(target, file);
+
+        // 判断是文件还是文件夹
+        if (fs.statSync(sourcePath).isDirectory()) {
+            // 如果是文件夹，递归复制
+            copyFolderSync(sourcePath, targetPath);
+        } else {
+            // 如果是文件，直接复制
+            fs.copyFileSync(sourcePath, targetPath);
+        }
+    });
+}
+
 module.exports = function (creator, options, callback) {
     const { name, description } = options;
 
@@ -15,6 +42,15 @@ module.exports = function (creator, options, callback) {
     const public = path.join(projectPath, "public");
     fs.mkdirSync(public)
 
+    const libPath = path.join(projectPath, "lib");
+    fs.mkdirSync(libPath)
+
+    const templateLibPath = path.join(__dirname, "lib");
+    if (fs.existsSync(templateLibPath)) {
+        copyFolderSync(templateLibPath, libPath);
+        console.log(`${chalk.grey(`Copy lib folder to ${name}/lib`)} ${chalk.green('✔ ')}`);
+    }
+
     creator.copyTpl('cloudcc-cli.configjs', path.join(projectPath, "cloudcc-cli.config.js"))
 
     creator.copyTpl('gitignore', path.join(projectPath, ".gitignore"))
@@ -45,7 +81,8 @@ module.exports = function (creator, options, callback) {
         console.log(`${chalk.grey(`Create directory: ${name}/public`)} ${chalk.green('✔ ')}`);
         console.log(`${chalk.grey(`Create file: ${name}/public/index.html`)} ${chalk.green('✔ ')}`);
 
-        console.log(`${chalk.grey(`Create file: ${name}/src`)} ${chalk.green('✔ ')}`);
+        console.log(`${chalk.grey(`Create directory: ${name}/lib`)} ${chalk.green('✔ ')}`);
+        console.log(`${chalk.grey(`Create directory: ${name}/src`)} ${chalk.green('✔ ')}`);
         console.log(`${chalk.grey(`Create file: ${name}/src/App.vue`)} ${chalk.green('✔ ')}`);
         console.log(`${chalk.grey(`Create file: ${name}/src/main.js`)} ${chalk.green('✔ ')}`);
 

package/core/core/CCObject.java

@@ -1,48 +0,0 @@
-package com.cloudcc.core;
-
-import java.util.HashMap;
-
-/**
- * @author T.han
- * @date 2023/8/17 16:18
- * @project CloudccNewPro
- * @Description //TODO
- */
-public class CCObject extends HashMap<String,Object> {
-    public static final String OBJECT_API = "CCObjectAPI";
-    public static final String IS_SHARED = "isShared";
-
-    public CCObject() {
-        /* compiled code */
-        
-    }
-
-    public CCObject(String ccobj) {
-        /* compiled code */
-        put("CCObjectAPI", ccobj);
-
-    }
-
-    public CCObject(String ccobj, String isShared) {
-        /* compiled code */
-        put("CCObjectAPI", ccobj);
-        put("isShared", "isShared");
-    }
-
-    public void putSumValue(String sumValueKey, String value) {
-        /* compiled code */
-        put("sum" + sumValueKey, value);
-    }
-
-    public Object getSumValue(String sumValueKey) {
-        /* compiled code */
-        return get("sum" + sumValueKey);
-    }
-
-    public String getObjectApiName() {
-        /* compiled code */
-        return (String)get("CCObjectAPI");
-    }
-
-
-}

package/core/core/CCTriggerHandler.java

@@ -1,15 +0,0 @@
-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/PeakSvc.java

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

package/core/core/ServiceResult.java

@@ -1,35 +0,0 @@
-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/UserInfo.java

@@ -1,45 +0,0 @@
-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");
-	}
-}