hs-web · 1325886312 · Apr 28, 2018 · Apr 28, 2018 · Apr 28, 2018 · Apr 28, 2018
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,9 @@
-FROM java:8
+FROM openjdk:8
 
 COPY target/hsweb-demo.jar /app.jar
 COPY hsweb-ui /hsweb-ui
+COPY docker-entrypoint.sh /
+#COPY data /data
+COPY config /config
 EXPOSE 8080
-ENTRYPOINT ["java","-jar","/app.jar"]
+ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/README.md b/README.md
@@ -13,10 +13,19 @@ http://cdn-blog.jetbrains.org.cn/doc/all.html
     $ ./mvnw spring-boot:run
 ```
 
+docker:
+```bash
+    $ docker run -d --name hsweb3-demo -p 8089:8089 hsweb/hsweb-demo:3.0.1
+```
+
 或者导入ide,等待maven依赖下载完后执行: 
 ``org.hswebframework.web.demo.Application.main``
 
-启动成功后打开: http://localhost:8089 ,帐号:admin 密码:admin
+启动成功后打开: http://localhost:8089 ,帐号:admin 密码:admin.
+
+## 数据库
+demo默认使用h2作为数据库,可直接修改`application-dev.yml`配置中的:`spring.datasource.url`,
+启动服务会自动初始化数据.目前支持:`h2`,`oracle`,`mysql`,`postgresql`.
 
 ## 无法下载依赖?
 查看maven的settings.xml是否配置了私服,删掉或者mirrorOf不要为*

diff --git a/config/font/FZLTCXHJW.TTF b/config/font/FZLTCXHJW.TTF
diff --git a/config/font/YaHei.Consolas.1.12.ttf b/config/font/YaHei.Consolas.1.12.ttf
diff --git a/config/font/simfang.ttf b/config/font/simfang.ttf
diff --git a/config/font/simhei.ttf b/config/font/simhei.ttf
diff --git a/config/font/simkai.ttf b/config/font/simkai.ttf
diff --git a/config/font/simsun.ttc b/config/font/simsun.ttc
diff --git a/config/fop-configuration.xml b/config/fop-configuration.xml
@@ -0,0 +1,47 @@
+<fop version="1.0">
+    <!-- Strict user configuration -->
+    <strict-configuration>true</strict-configuration>
+
+    <!-- Strict FO validation -->
+    <strict-validation>true</strict-validation>
+
+    <!-- Base URL for resolving relative URLs -->
+    <base>./config</base>
+
+    <!-- Font Base URL for resolving relative font URLs -->
+    <font-base>./config/font</font-base>
+
+    <!-- Source resolution in dpi (dots/pixels per inch) for determining the size of pixels in SVG and bitmap images, default: 72dpi -->
+    <source-resolution>72</source-resolution>
+    <!-- Target resolution in dpi (dots/pixels per inch) for specifying the target resolution for generated bitmaps, default: 72dpi -->
+    <target-resolution>72</target-resolution>
+
+    <!-- default page-height and page-width, in case
+         value is specified as auto -->
+    <default-page-settings height="11in" width="8.26in"/>
+
+    <!-- Use file name nl_Bel instead of the default nl_BE -->
+    <hyphenation-pattern lang="nl" country="BE">nl_Bel</hyphenation-pattern>
+
+    <!-- etc. etc..... -->
+    <fonts>
+        <font kerning="yes" embed-url="config/font/YaHei.Consolas.1.12.ttf">
+            <font-triplet name="YaHei Consolas Hybrid" style="normal" weight="normal"/>
+            <font-triplet name="Microsoft YaHei" style="normal" weight="normal"/>
+            <font-triplet name="微软雅黑" style="normal" weight="normal"/>
+        </font>
+        <font kerning="yes" embed-url="config/font/FZLTCXHJW.TTF">
+            <font-triplet name="FZLanTingHeiS" style="normal" weight="normal"/>
+        </font>
+        <font kerning="yes" embed-url="config/font/simfang.ttf">
+            <font-triplet name="宋体" style="normal" weight="normal"/>
+            <font-triplet name="仿宋" style="normal" weight="normal"/>
+        </font>
+        <font kerning="yes" embed-url="config/font/simhei.ttf">
+            <font-triplet name="黑体" style="normal" weight="normal"/>
+        </font>
+        <font kerning="yes" embed-url="config/font/simkai.ttf">
+            <font-triplet name="楷体" style="normal" weight="normal"/>
+        </font>
+    </fonts>
+</fop>
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -0,0 +1,22 @@
+version: '2'
+services:
+  #  redis:
+  #    image: redis
+  #    ports:
+  #      - "6379:6379"
+  mysql:
+    image: mysql:5.7
+    volumes:
+    - "database:/var/lib/mysql"
+    restart: always
+    command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
+    environment:
+      TZ: Asia/Shanghai
+      MYSQL_USER: root
+      MYSQL_HOST: "%"
+      MYSQL_ROOT_PASSWORD: 12345
+      MYSQL_DATABASE: hsweb
+    ports:
+    - "3306:3306"
+volumes:
+  database:
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+java -jar $JAVA_OPTS -server \
+-XX:+UnlockExperimentalVMOptions \
+-XX:+UseCGroupMemoryLimitForHeap \
+-XX:-OmitStackTraceInFastThrow \
+-Djava.security.egd=file:/dev/./urandom \
+/app.jar
diff --git a/hsweb-ui/admin/autz-settings/permission-setting.html b/hsweb-ui/admin/autz-settings/permission-setting.html
@@ -0,0 +1,147 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>权限设置</title>
+    <script data-main="permission-setting.js" src="../boot.js" type="text/javascript"></script>
+</head>
+<body style="display: none">
+<div id="layout" class="mini-layout" style="width:100%;height:92%;">
+
+    <div  title="快捷导航" expanded="false" showProxyText="true" width="220" region="east"
+         showCloseButton="true" showSplitIcon="true">
+        <ul id="permission-tree" class="mini-tree" style="width:100%;padding:5px;height: 100%" showTreeIcon="true" textField="name" idField="id">
+        </ul>
+    </div>
+    <div title="center"  region="center">
+        <div class="mini-fit" id="permission-container">
+
+        </div>
+    </div>
+</div>
+
+<div style="width: 100px;margin: 10px auto auto;">
+    <a class="mini-button save-button">保存</a>
+    <a class="mini-button close-button" plain="true">关闭</a>
+</div>
+
+<div class="mini-window" allowResize="true" showToolbar="true" id="fieldWindow" style="width: 600px;height: 400px"
+     title="字段权限">
+    <div property="toolbar" style="padding:5px;">
+        <a class="mini-button save-field-access">保存</a>
+        <a class="mini-button" plain="true" onclick="mini.get('fieldWindow').hide()">关闭</a>
+    </div>
+    <div class="mini-fit" id="field-access-container">
+    </div>
+</div>
+
+<div class="mini-window" allowResize="true" showToolbar="true" id="dataAccessWindow" style="width: 600px;height: 400px"
+     title="数据权限">
+    <div property="toolbar" style="padding:5px;">
+        <a class="mini-button save-data-access">保存</a>
+        <a class="mini-button" plain="true" onclick="mini.get('dataAccessWindow').hide()">关闭</a>
+    </div>
+    <div class="mini-fit" id="data-access-container">
+        <div class="data-access-group OWN_USER">
+            <div class="data-access-title ">
+                <span>仅限本人的数据</span>
+            </div>
+            <div class="data-access-action-list">
+                <input id="OWN_USER" class="mini-checkboxlist">
+            </div>
+        </div>
+
+        <div class="data-access-group POSITION_SCOPE">
+            <div class="data-access-title ">
+                <span>仅限本人和下属的数据</span>
+            </div>
+            <div class="data-access-action-list">
+                <input id="POSITION_SCOPE" class="mini-checkboxlist">
+            </div>
+        </div>
+
+        <div class="data-access-group DEPARTMENT_SCOPE">
+            <div class="data-access-title ">
+                <span>仅限所在部门的数据</span>
+            </div>
+            <div class="data-access-action-list">
+                <input id="DEPARTMENT_SCOPE" class="mini-checkboxlist">
+            </div>
+        </div>
+
+        <div class="data-access-group ORG_SCOPE">
+            <div class="data-access-title ">
+                <span>仅限所在机构的数据</span>
+            </div>
+            <div class="data-access-action-list">
+                <input id="ORG_SCOPE" class="mini-checkboxlist">
+            </div>
+        </div>
+
+    </div>
+</div>
+
+</body>
+</html>
+<style type="text/css">
+    .mini-panel-toolbar {
+        background: white;
+        padding: 4px;
+    }
+
+    .field-access-group, .data-access-group {
+        width: 95%;
+        margin: auto;
+        min-height: 30px;
+        border-bottom: 1px solid #c9c9c9;
+        font-size: 16px;
+    }
+
+    .field-access-title, .data-access-title {
+        float: left;
+        height: 25px;
+        line-height: 25px;
+        width: 150px;
+    }
+
+    .data-access-title span {
+        cursor: pointer;
+    }
+
+
+    span.mini-tools-edit {
+        width: 16px;
+        height: 16px;
+        background: url(../../plugins/miniui/themes/icons/edit.gif) no-repeat;
+    }
+
+    .mini-panel-border {
+        border: 1px solid white;
+    }
+
+    .mini-list-icon {
+        font-size: 18px;
+        height: 13px;
+    }
+
+    .mini-checkboxlist table {
+        width: 100%;
+    }
+
+    .mini-checkboxlist-td {
+        width: 24.99999%;
+    }
+
+    .mini-checkboxlist table label, .mini-radiobuttonlist table label {
+        font-size: 16px;
+        cursor: pointer;
+    }
+
+    .panel-button {
+        margin-right: 10px;
+        color: #0b93d9;
+        text-decoration: none;
+        font-size: 14px;
+        font-weight: bold;
+    }
+</style>