From bd59b4f24c6a2613d36872b271ca918e242496b2 Mon Sep 17 00:00:00 2001
From: lxyer <237809796@qq.com>
Date: Thu, 28 Feb 2019 23:07:32 +0800
Subject: [PATCH] .

---
 conf/apidoc-template.html | 110 --------------------------------------
 conf/application.xml      |  22 ++------
 conf/conf.txt             |   1 +
 pom.xml                   |   4 +-
 4 files changed, 6 insertions(+), 131 deletions(-)
 delete mode 100644 conf/apidoc-template.html
 create mode 100644 conf/conf.txt
diff --git a/conf/apidoc-template.html b/conf/apidoc-template.html
deleted file mode 100644
index 0801538..0000000
--- a/conf/apidoc-template.html
+++ /dev/null
@@ -1,110 +0,0 @@
-<!doctype html>
-<html>
-    <head>
-        <meta charset="UTF-8"><title>接口文档(apidoc生成)</title>
-        <style type="text/css">
-            body {text-align: center;margin:auto;}
-            a{text-decoration: none;}
-            .table {margin: auto;border-collapse: collapse;border-spacing: 0;display: block;width: 100%;overflow: auto;word-break: normal;word-break: keep-all;}
-            .table td,.table th{padding: 0.2rem 0.8rem 0.2rem 0.8rem;border: 1px solid #aaa;}
-            .table td {text-align: left;}
-            .s {font-size: 0.8rem; vertical-align: middle;}
-            .subtable {border-spacing: 0;border: 0;margin:0;}
-            .subtable td{border: 0;padding: 0 0 0 10px;}
-            .typetable {border-spacing: 0;border: 0;margin:0;}
-            .typetable td{border: 0;padding: 2px 20px 2px 10px;}
-            .typetable .l{border-bottom: 1px solid red;}
-        </style>
-    </head>
-    <body>
-
-        <script>
-            var createhtml = function (jsoncontent) {
-                var classmap = jsoncontent.types;
-                var html = [];
-                html.push('<div style="width:' + Math.floor(window.screen.width * 0.7) + 'px;margin:0 auto;text-align: center;">');
-                html.push('<br/><br/><table class="table" align="center">');
-                for (var i = 0; i < jsoncontent.servers.length; i++) {
-                    var servlets = jsoncontent.servers[i].servlets;
-                    if (servlets.length && (servlets[0].comment || "").indexOf("【") === 0) {
-                        servlets.sort(function (a, b) {
-                            return a.comment > b.comment ? -1 : (a.comment == b.comment ? 0 : 1);
-                        });
-                    }
-                    for (var j = 0; j < servlets.length; j++) {
-                        var servlet = servlets[j];
-                        if (html.length > 2) html.push(' <tr><th colspan="5" style="border-bottom:0;">&nbsp;</th></tr>');
-                        html.push(' <tr><th colspan="5" style="border-top:' + ((html.length > 2) ? 0 : 1) + ';">' + (servlet.comment || '未知模块') + '</th></tr>');
-                        html.push(' <tr><th>请求URL</th><th>描 述</th><th>鉴 权</th><th>参 数 <span style="font-size:12px;">(粗体: 必填项; 红色: Header; 蓝色: Cookie)</span></th><th>输 出</th></tr>');
-                        for (var k = 0; k < servlet.mappings.length; k++) {
-                            var action = servlet.mappings[k];
-                            html.push(' <tr>');
-                            html.push('<td style="color:#ff00ff;">' + action.url + '</td>');
-                            html.push('<td>' + action.comment + '</td>');
-                            html.push('<td class="s" style="width:80px;">模块ID: ' + servlet.moduleid + '<br/>操作ID: ' + action.actionid + '<br/>需鉴权: ' + (action.auth ? '<font style="font-weight:bold;color:green;">true</font>' : '<font color=red>false</font>') + '</td>');
-                            var paramshtml = [];
-                            paramshtml.push('<table class="subtable">');
-                            for (var p = 0; p < action.params.length; p++) {
-                                var param = action.params[p];
-                                var t = param.type.substring(param.type.lastIndexOf('.') + 1);
-                                if (classmap[param.type.replace('[]', '')]) {
-                                    t = '<a href="#' + param.type.replace('[]', '') + '">' + t + '</a>';
-                                }
-                                if (param.name == '&') {
-                                    paramshtml.push('<tr><td style="font-size:12px;">内置 </td><td> ' + t + '</td><td> 当前用户</td></tr>');
-                                } else {
-                                    var w = param.required ? "font-weight:bold;" : "";
-                                    var c = ' style="' + w + '"';
-                                    if (param.src == "HEADER") c = ' style="color:red;' + w + '"';
-                                    if (param.src == "COOKIE") c = ' style="color:blue;' + w + '"';
-                                    paramshtml.push('<tr><td ' + c + '> ' + param.name + ' </td><td> ' + t + '</td><td> ' + param.comment + '</td></tr>');
-                                }
-                            }
-                            paramshtml.push('</table>');
-                            html.push('<td class="s" style="padding:0 5px;">' + paramshtml.join('') + '</td>');
-                            var rs = [];
-                            rs.push(action.result.replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/([a-zA-Z0-9_\$]+\.)+/g, ""));
-                            var results = action.results || [];
-                            for (var r = 0; r < results.length; r++) {
-                                rs.push('<a href="#' + results[r].replace('[]', '') + '">' + results[r].replace(/([a-zA-Z0-9_\$]+\.)+/g, "") + '</a>');
-                            }
-                            html.push('<td>' + rs.join("<br/>") + '</td>');
-                            html.push('</tr>');
-                        }
-                    }
-                }
-                for (var type in classmap) {
-                    html.push(' <tr><th colspan="5" style="border-bottom:0;">&nbsp;</th></tr>');
-                    html.push(' <tr id="' + type + '"><th colspan="5" style="border-top:0;">' + type + '</th></tr>');
-                    html.push(' <tr><td colspan="5"><table class="typetable">');
-                    for (var fieldname in classmap[type]) {
-                        var field = classmap[type][fieldname];
-                        var t = field.type.replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/\$/g, ".").replace(/([a-zA-Z0-9_\$]+\.)+/g, "");
-                        if (t == 'boolean' || t == 'short' || t == 'int' || t == 'long' || t == 'float' || t == 'double'
-                                || t == 'boolean[]' || t == 'short[]' || t == 'int[]' || t == 'long[]' || t == 'float[]' || t == 'double[]') {
-                            t = '<font color=blue>' + t + '</font>';
-                        } else if (t == 'String' || t == 'String[]' || t == 'LongRange' || t.indexOf('Map&lt;') === 0) {
-                            t = '<font color=red>' + t + '</font>';
-                        }
-                        var c = (field.comment || '');
-                        if (field.primary) {
-                            c = '【主键】 ' + c;
-                        } else if (!field.updatable) {
-                            c = '【只读】 ' + c;
-                        }
-                        html.push(' <tr class="l"><td>' + fieldname + '</td><td>' + t + '</td><td colspan="2">' + c + '</td></tr>');
-                    }
-                    html.push(' </table></td></tr>');
-                }
-                html.push('</table><br/><br/><br/>');
-                html.push('</div>');
-                return html.join('');
-            };
-        </script>
-
-        <script>
-            var jsoncontent = '${content}'; //这里必须要用单引号引起来
-            document.write(createhtml(jsoncontent));
-        </script>
-    </body>
-</html>
diff --git a/conf/application.xml b/conf/application.xml
index 0000291..9087145 100644
--- a/conf/application.xml
+++ b/conf/application.xml
@@ -1,29 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <application port="5002">
-    <!--  详细配置说明见： http://redkale.org/redkale.html#redkale_confxml  -->
     <resources>
-        <!-- 如果需要使用redis,此处配置  -->
-        <!--<source name="redis" value="org.redkalex.cache.RedisCacheSource" xxx="16">
+        <source name="redis" value="org.redkalex.cache.RedisCacheSource" xxx="16">
             <node addr="redishost" port="6379" password="pwd123"/>
-        </source>-->
+        </source>
 
-        <properties>
-            <property name="isDev" value="true"/>
+        <properties load="conf.txt">
 
-            <!-- MongoService 使用到的一些配置
-            <property name="mongo.host" value="127.0.0.1"/>
-            <property name="mongo.port" value="27017"/>
-            <property name="mongo.database" value="redbbs"/>
-            -->
-
-            <!-- ArangoService 使用到的配置
-            <property name="arango.host" value="127.0.0.1"/>
-            <property name="arango.port" value="8529"/>
-            <property name="arango.database" value="redbbs"/>
-            <property name="arango.user" value="root"/>
-            <property name="arango.password" value="root"/>
-            -->
         </properties>
     </resources>
         
diff --git a/conf/conf.txt b/conf/conf.txt
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/conf/conf.txt
@@ -0,0 +1 @@
+
diff --git a/pom.xml b/pom.xml
index 6217594..c16e0f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,8 +14,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>11</source>
+                    <target>11</target>
                 </configuration>
             </plugin>
         </plugins>
