.

pom.xml

@@ -79,7 +79,7 @@
                                     <type>${project.packaging}</type>
                                 </artifactItem>
                             </artifactItems>
-                            <outputDirectory>lib</outputDirectory>
+                            <outputDirectory>libs</outputDirectory>
                         </configuration>
                     </execution>
                 </executions>

root/api/user.js

@@ -0,0 +1,9 @@
+//import red from '../res/js/red'
+
+const login = ({username,  pwd}) => {
+    return {username};
+}
+
+const logout = () => {
+
+}

root/index.html

@@ -100,15 +100,15 @@
                 /*{name: "DDL", url: "/qtask/ddl.html"},*/
                 {name: "MetaData", url: "/meta", nodes: [
                         /*{url:"/metadata/metatable/list.html", name:"TableList"},*/
-                        {url:"/metadata/metatable/metaTable.html", name:"MetaTable"},
+                        {url:"/metadata/metatable/metaTable.html", name:"MetaTable", icon: "icon-table"},
                         /*{url:"/metadata/metaLink.html", name:"MetaLink"},*/
-                        {url:"/metadata/metaService.html", name:"MetaService"},
+                        {url:"/metadata/metaService.html", name:"MetaService", icon:"icon-usecase"},
-                        {url:"/metadata/dataList.html", name:"数据查询"},
+                        {url:"/metadata/dataList.html", name:"数据查询", icon:"icon-bug"},
                     ]
                 },
                 {
                     name: "QTask", url: "/qtask", nodes: [
-                        {url:"/qtask/list.html", name:"QTask", icon:"icon-beaker"},
+                        {url:"/qtask/list.html", name:"QTask", icon:"icon-cube-alt"},
                         {url:"/qtask/debug.html", name:"QTask-Debug", icon:"icon-bug"},
                     ]
                 },

root/metadata/dataList.html

@@ -8,8 +8,8 @@
 <row class="data-list">
     <h3>高级查询 - [测试用例]</h3>
     <div class="col-md-6">
-        <select class="form-control" v-model="table" style="width: 300px;">
+        <select class="form-control" v-model="service" style="width: 300px;">
-            <option v-for="t in tables" :value="t.name">{{t.comment}}&nbsp;&nbsp;&nbsp;[{{t.name}}]</option>
+            <option v-for="t in services" :value="t.name">{{t.comment}}&nbsp;&nbsp;&nbsp;[{{t.name}}]</option>
         </select>
     </div>
     <div class="col-md-6">
@@ -99,8 +99,10 @@
                 cols: [],
                 filters: []
             },
-            tables: [],
+            services:[],
-            table: "",
+            service:"",
+            //tables: [],
+            //table: "",
             //filters: [],
 
             addFilter: "recompany",
@@ -196,14 +198,14 @@
                 location.href = "/export/data?fBean=" + JSON.stringify(fBean) + "&platToken=" + red.getPlatToken() + "&cate=csv";
                 return;
             },
-            tableList: function () {
+            serviceList: function () {
-                red.getJSON("/meta/tablelist",{}, function (json) {
+                red.getJSON("/meta/service_list",{}, function (json) {
-                    vm.tables = json;
+                    vm.services = json;
-                    vm.table = vm.tables[0].name;
+                    vm.service = vm.services[0].name;
                 });
             },
             loadCfg: function () {
-                red.getJSON("/meta/listcfg", {key: vm.table, platToken: red.getPlatToken()}, function (json) {
+                red.getJSON("/meta/cfg", {key: this.service, platToken: red.getPlatToken()}, function (json) {
                     vm.cfg = json;
                 });
             },
@@ -256,7 +258,7 @@
             }
         },
         mounted: function () {
-            this.tableList();
+            this.serviceList();
         }
     });
 </script>

root/metadata/metaService.html

@@ -1,4 +1,7 @@
 <style>
+    .table td, .table th{
+        padding: 6px;
+    }
     .panel-body {
         padding: 0;
     }
@@ -55,8 +58,7 @@
     <div class="col-xs-6" style="padding-left: 0px;">
         <div class="tab-content">
             <div class="tab-pane fade active in" id="">
-                <table class="table-bordered table-auto" style="width: 100%">
+                <table :class="[{'table':status!=2},'table-bordered', 'table-auto']" style="width: 100%">
-                    <thead>
                     <tr style="background-color: #f1f1f1">
                         <td v-show="status==3 || status==4 || status==5 || status==6"><input type="checkbox"></td>
                         <th v-show="status==1"></th>
@@ -67,8 +69,6 @@
                         <th>附加属性</th>
                         <th>备注</th>
                     </tr>
-                    </thead>
-                    <tbody>
                     <tr v-for="(item, index) in serviceDetail['tables'][sheet].items">
                         <td v-show="status==3"><input type="checkbox" v-model="serviceInfo.exports" :value="sheet + '$' + item.name" class=""></td>
                         <td v-show="status==4"><input type="checkbox" v-model="serviceInfo.imports" :value="sheet + '$' + item.name" class=""></td>
@@ -83,7 +83,6 @@
                         <td v-show="status!=2" v-text="item.inExt"></td>
                         <td v-show="status!=2" v-text="item.remark"></td>
                     </tr>
-                    </tbody>
                 </table>
             </div>
         </div>

root/metadata/metatable/metaTable.html

@@ -1,9 +1,12 @@
+<style>
+
+</style>
 <row class="meta-list">
     <div class="col-md-12" style="padding-top: 10px;">
         <div class="input-group list-head">
 
             <span class="input-group-btn">
-                <button class="btn btn-default" type="button">选择Table</button>
+                <button class="btn btn-default" type="button">选择Table{{status}}</button>
             </span>
             <select class="form-control" v-model="table" style="width: 180px;">
                 <option v-for="item in tables" :value="item.name"> {{item.name}}&nbsp;&nbsp;&nbsp;[{{item.comment}}]</option>
@@ -42,8 +45,7 @@
     </div>
 
     <div class="col-md-7">
-        <table class="table-bordered" style="width: 100%">
+        <table :class="[{'table':status!=2},'table-bordered']" style="width: 100%">
-            <thead>
             <tr style="background-color: #f1f1f1">
                 <td v-show="status==3 || status==4 || status==5 || status==6"><input type="checkbox"></td>
                 <th v-show="status==1"></th>
@@ -54,8 +56,6 @@
                 <th>附加属性</th>
                 <th>备注</th>
             </tr>
-            </thead>
-            <tbody>
             <tr v-for="(item, index) in meta.items">
                 <td v-show="status==3"><input type="checkbox" v-model="meta.exports" :value="item.name" class="form-control"></td>
                 <td v-show="status==4"><input type="checkbox" v-model="meta.imports" :value="item.name" class="form-control"></td>
@@ -86,7 +86,6 @@
                 <td v-show="status==2"><input v-model="item.inExt" class="form-control"></td>
                 <td v-show="status==2"><input v-model="item.remark" class="form-control"></td>
             </tr>
-            </tbody>
         </table>
     </div>
 
@@ -300,7 +299,7 @@
                 filters: [{name:"", filterType:[""]}]
             },//完整的元数据数据，
             move: false,
-            status: 0, //页面默认状态
+            status: 7, //页面默认状态
             table: "", //页面选择的业务类型
             itemSort: [], //待保存的业务属性
 

root/res/css/red-kit.css

@@ -139,3 +139,7 @@ th{
     color: #145ccd;
     content: '\e6b8';
 }
+
+.table td, .table th{
+    padding: 5px;
+}

root/user/login.html

@@ -100,8 +100,10 @@
 <script src="../res/zui/lib/jquery/jquery.js"></script>
 <script src="../res/zui/js/zui.js"></script>
 <script src="../res/js/red.js"></script>
+<!--<script src="../api/user.js"></script>//-->
 <script src="https://cdn.jsdelivr.net/npm/vue"></script>
 <script>
+    //import { login } from '../api/user.js'
     var vm = new Vue({
         el: ".login",
         data: {
@@ -114,8 +116,11 @@
 
         },
         methods: {
-            loginCheck: function (row) {
+            loginCheck: function ({username,  pwd}) {
-                $.post("/user/login", row, function (json) {
+                /*login({username,  pwd}).then(res => {
+                    console.log("res", res)
+                });*/
+                $.post("/user/login", {username,  pwd}, function (json) {
                     if (json.code == 0) {
                         vm.loadPlats();
                         red.showMsg({msg:"请选择业务平台"})

src/main/java/net/tccn/base/Kv.java

@@ -5,7 +5,10 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
 import java.util.function.Function;
 import java.util.function.Predicate;
 

src/main/java/net/tccn/base/arango/ArangoSource.java

@@ -8,11 +8,7 @@ import com.arangodb.entity.MultiDocumentEntity;
 import javax.persistence.Table;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 

src/main/java/net/tccn/base/arango/Doc.java

@@ -8,13 +8,7 @@ import com.arangodb.entity.DocumentCreateEntity;
 import javax.persistence.Table;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.Collection;
+import java.util.*;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
 

src/main/java/net/tccn/dbq/fbean/Parser.java

@@ -1,9 +1,5 @@
 package net.tccn.dbq.fbean;
 
-import net.tccn.meta.MetaService;
-
-import java.util.Map;
-
 /**
  * Created by liangxianyou at 2018/12/24 15:47.
  */

src/main/java/net/tccn/meta/MetaExecutor.java

@@ -1,7 +1,6 @@
 package net.tccn.meta;
 
 import net.tccn.base.JBean;
-import net.tccn.qtask.QTask;
 
 /**
  * Created by liangxianyou at 2019/3/7 16:13.

src/main/java/net/tccn/meta/MetaService.java

@@ -1,6 +1,5 @@
 package net.tccn.meta;
 
-import net.tccn.base.Kv;
 import net.tccn.base.arango.Doc;
 
 import javax.persistence.Table;

src/main/java/net/tccn/qtask/Task.java

@@ -47,6 +47,17 @@ public class Task {
     }
 
 
+    public static void add(String x) {
+        x = x + 1;
+        System.out.println("add: x= " + x);
+    }
+
+    public static void main(String[] args) {
+        String x = "x";
+        add(x);
+
+        System.out.println("main: x=" + x);
+    }
 
 
 }

src/main/java/net/tccn/qtask/impl/QTaskAbs.java

@@ -1,7 +1,7 @@
 package net.tccn.qtask.impl;
 
-import net.tccn.qtask.Task;
 import net.tccn.qtask.QTask;
+import net.tccn.qtask.Task;
 
 public abstract class QTaskAbs implements QTask {
 

src/main/java/net/tccn/qtask/impl/QTaskEs.java

@@ -1,8 +1,8 @@
 package net.tccn.qtask.impl;
 
-import net.tccn.qtask.Task;
-import net.tccn.qtask.QRuner;
 import net.tccn.base.Kv;
+import net.tccn.qtask.QRuner;
+import net.tccn.qtask.Task;
 
 public class QTaskEs extends QTaskAbs {
 

src/main/java/net/tccn/qtask/impl/QTaskHttp.java

@@ -1,9 +1,12 @@
 package net.tccn.qtask.impl;
 
-import net.tccn.qtask.Task;
 import net.tccn.qtask.QTask;
+import net.tccn.qtask.Task;
 
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.net.*;
 import java.util.HashMap;
 import java.util.Map;

src/main/java/net/tccn/qtask/impl/QTaskMethod.java

@@ -1,8 +1,8 @@
 package net.tccn.qtask.impl;
 
-import net.tccn.qtask.Task;
 import net.tccn.base.Kv;
 import net.tccn.qtask.QTask;
+import net.tccn.qtask.Task;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;

src/main/java/net/tccn/qtask/impl/QTaskMysql.java

@@ -1,7 +1,7 @@
 package net.tccn.qtask.impl;
 
-import net.tccn.qtask.Task;
 import net.tccn.qtask.QTask;
+import net.tccn.qtask.Task;
 
 public class QTaskMysql extends QTaskAbs implements QTask {
 

src/main/java/net/tccn/service/MetadataService.java

@@ -2,8 +2,8 @@ package net.tccn.service;
 
 import net.tccn.base.JBean;
 import net.tccn.base.Kv;
-import net.tccn.dbq.jdbc.api.DbAccount;
 import net.tccn.dbq.Field;
+import net.tccn.dbq.jdbc.api.DbAccount;
 import net.tccn.dbq.qtask.SysPlat;
 import net.tccn.meta.MetaKit;
 import net.tccn.meta.MetaService;