Merge remote-tracking branch 'origin/master'

Author: twj666

.github/workflows/release.yml

@@ -83,8 +83,15 @@ jobs:
 
       - name: Build with Maven
         if: ${{ env.SKIP != 'image'}}
+        env:
+          JASYPT_ALGO: ${{ secrets.JASYPT_ALGO }}
+          JASYPT_PWD: ${{ secrets.JASYPT_PWD }}
         run: |
           cd prompto-lab-app
+          echo "jasypt:" > src/main/resources/you-cant-see-that.yml
+          echo "  encryptor:" >> src/main/resources/you-cant-see-that.yml
+          echo "    algorithm: $JASYPT_ALGO" >> src/main/resources/you-cant-see-that.yml
+          echo "    password:  $JASYPT_PWD" >> src/main/resources/you-cant-see-that.yml
           mvn package -Dmaven.test.skip=true
 
       - name: Build and Push Docker Images

prompto-lab-app/pom.xml

@@ -123,7 +123,18 @@
             <artifactId>fastjson</artifactId>
             <version>2.0.57</version>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.30</version>
+            <scope>provided</scope>
+        </dependency>
 
+        <dependency>
+            <groupId>com.github.ulisesbocchio</groupId>
+            <artifactId>jasypt-spring-boot-starter</artifactId>
+            <version>3.0.3</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

prompto-lab-app/src/main/java/io/github/timemachinelab/core/qatree/CommonQA.java

@@ -0,0 +1,17 @@
+package io.github.timemachinelab.core.qatree;
+
+import lombok.Data;
+
+@Data
+public class CommonQA extends QA {
+
+    public CommonQA() {
+        super(QAType.QA);
+    }
+
+    private String question;
+
+    private String answer;
+
+
+}

prompto-lab-app/src/main/java/io/github/timemachinelab/core/qatree/FormQA.java

@@ -0,0 +1,19 @@
+package io.github.timemachinelab.core.qatree;
+
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Data
+public class FormQA extends QA {
+
+    private String question;
+
+    private Map<String, String> answerMap;
+
+    public FormQA() {
+        super(QAType.FORM);
+        answerMap = new HashMap<>();
+    }
+}

prompto-lab-app/src/main/java/io/github/timemachinelab/core/qatree/QA.java

@@ -0,0 +1,26 @@
+package io.github.timemachinelab.core.qatree;
+
+import lombok.Data;
+
+@Data
+public abstract class QA {
+
+    protected final QAType type;
+
+    protected long createTime;
+
+    protected long updateTime;
+
+    public QA(QAType type) {
+        this.type = type;
+        this.createTime = System.currentTimeMillis();
+        this.updateTime = this.createTime;
+    }
+
+    /**
+     * 更新updateTime为当前时间戳
+     */
+    public void updateTimestamp() {
+        this.updateTime = System.currentTimeMillis();
+    }
+}

prompto-lab-app/src/main/java/io/github/timemachinelab/core/qatree/QAType.java

@@ -0,0 +1,14 @@
+package io.github.timemachinelab.core.qatree;
+
+public enum QAType {
+
+    QA("QA"),
+    SELECTION("Selection"),
+    FORM("Form");
+
+    private String name;
+
+    QAType(String name) {
+        this.name = name;
+    }
+}

prompto-lab-app/src/main/java/io/github/timemachinelab/core/qatree/QaTree.java

@@ -0,0 +1,34 @@
+package io.github.timemachinelab.core.qatree;
+
+import lombok.Data;
+import lombok.Getter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class QaTree {
+
+    @Getter
+    private QaTreeNode root;
+
+    private Map<String, QaTreeNode> nodeMap = new HashMap<>();
+
+    public QaTree(QaTreeNode root) {
+        this.root = root;
+        nodeMap.put(root.getId(), root);
+    }
+
+    public void addNode(String parentId, QaTreeNode node) {
+        QaTreeNode parent = nodeMap.get(parentId);
+        if (parent == null) {
+            return;
+        }
+        parent.append(node);
+        nodeMap.put(node.getId(), node);
+    }
+
+    public QaTreeNode getNodeById(String id) {
+        return nodeMap.get(id);
+    }
+
+}

prompto-lab-app/src/main/java/io/github/timemachinelab/core/qatree/QaTreeDomain.java

@@ -0,0 +1,20 @@
+package io.github.timemachinelab.core.qatree;
+
+import org.springframework.stereotype.Component;
+
+@Component
+public class QaTreeDomain {
+
+    public QaTree createTree(String userStartQuestion) {
+        CommonQA startQA = new CommonQA();
+        startQA.setQuestion(userStartQuestion);
+        QaTreeNode startNode = new QaTreeNode(startQA);
+
+        return new QaTree(startNode);
+    }
+
+    public QaTree appendNode(QaTree tree, String parentId, QA qa) {
+        tree.addNode(parentId, new QaTreeNode(qa));
+        return tree;
+    }
+}

prompto-lab-app/src/main/java/io/github/timemachinelab/core/qatree/QaTreeNode.java

@@ -0,0 +1,44 @@
+package io.github.timemachinelab.core.qatree;
+
+import lombok.Data;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+@Data
+public class QaTreeNode {
+
+    private final String id;
+
+    private Map<String, QaTreeNode> children;
+
+    private QA qa;
+
+    public QaTreeNode(QA qa) {
+        this.id = UUID.randomUUID().toString();
+        this.children = new HashMap<>();
+        this.qa = qa;
+    }
+
+    public void append(QA qa) {
+        QaTreeNode node = new QaTreeNode(qa);
+        this.append(node);
+    }
+
+    public void append(QaTreeNode node) {
+        children.put(node.getId(), node);
+    }
+
+    public QaTreeNode getChild(String id) {
+        return children.get(id);
+    }
+
+    public boolean hasChild(String id) {
+        return children.containsKey(id);
+    }
+
+    public void removeChild(String id) {
+        children.remove(id);
+    }
+
+}

prompto-lab-app/src/main/java/io/github/timemachinelab/core/qatree/SelectionQA.java

@@ -0,0 +1,14 @@
+package io.github.timemachinelab.core.qatree;
+
+public class SelectionQA extends QA {
+
+    public SelectionQA() {
+        super(QAType.SELECTION);
+    }
+
+    private String question;
+
+    private String[] options;
+
+    private Integer selectedOption;
+}