zheng-admin模块改名为zheng-ui
shuzheng
|
|
@ -6,5 +6,5 @@
|
||||||
target
|
target
|
||||||
*.log
|
*.log
|
||||||
*.log.*
|
*.log.*
|
||||||
**/resources/zheng-admin
|
**/resources/zheng-ui
|
||||||
generatorConfig.xml
|
generatorConfig.xml
|
||||||
|
|
@ -18,7 +18,7 @@
|
||||||
``` lua
|
``` lua
|
||||||
zheng
|
zheng
|
||||||
├── zheng-common -- SSM框架公共模块
|
├── zheng-common -- SSM框架公共模块
|
||||||
├── zheng-admin -- 后台管理系统模板（基于bootstrap实现的响应式Material Design风格的通用后台管理系统模板）
|
├── zheng-ui -- 后台管理系统模板（基于bootstrap实现的响应式Material Design风格的通用后台管理系统模板）
|
||||||
├── zheng-upms -- 用户权限管理系统（网关）
|
├── zheng-upms -- 用户权限管理系统（网关）
|
||||||
| ├── zheng-upms-dao -- MyBatisGenerator代码生成模块，无需开发
|
| ├── zheng-upms-dao -- MyBatisGenerator代码生成模块，无需开发
|
||||||
| ├── zheng-upms-client -- 集成upms依赖包，提供单点认证、授权、会话管理
|
| ├── zheng-upms-client -- 集成upms依赖包，提供单点认证、授权、会话管理
|
||||||
|
|
@ -109,9 +109,9 @@ zheng
|
||||||
|
|
||||||
Spring+SpringMVC+Mybatis框架集成公共模块，包括公共配置、MybatisGenerator扩展插件、通用BaseService、工具类等。[更多](zheng-common/README.md "更多")
|
Spring+SpringMVC+Mybatis框架集成公共模块，包括公共配置、MybatisGenerator扩展插件、通用BaseService、工具类等。[更多](zheng-common/README.md "更多")
|
||||||
|
|
||||||
> zheng-admin
|
> zheng-ui
|
||||||
|
|
||||||
基于bootstrap实现的响应式Material Design风格的通用后台管理系统，`zheng`项目所有系统都是使用该模块界面作为前端展示。[更多](zheng-admin/README.md "更多")
|
基于bootstrap实现的响应式Material Design风格的通用后台管理系统，`zheng`项目所有系统都是使用该模块界面作为前端展示。[更多](zheng-ui/README.md "更多")
|
||||||
|
|
||||||
> zheng-upms
|
> zheng-upms
|
||||||
|
|
||||||
|
|
@ -241,7 +241,7 @@ Spring+SpringMVC+Mybatis框架集成公共模块，包括公共配置、MybatisG
|
||||||
|
|
||||||
### 编译流程
|
### 编译流程
|
||||||
|
|
||||||
zheng-admin、zheng-common => zheng-oss、zheng-api => zheng-upms => 其他
|
zheng-ui、zheng-common => zheng-oss、zheng-api => zheng-upms => 其他
|
||||||
|
|
||||||
### 启动顺序
|
### 启动顺序
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -599,7 +599,7 @@ CREATE TABLE `upms_user` (
|
||||||
-- ----------------------------
|
-- ----------------------------
|
||||||
-- Records of upms_user
|
-- Records of upms_user
|
||||||
-- ----------------------------
|
-- ----------------------------
|
||||||
INSERT INTO `upms_user` VALUES ('1', 'admin', '3038D9CB63B3152A79B8153FB06C02F7', '66f1b370c660445a8657bf8bf1794486', '张恕征', '/resources/zheng-admin/images/avatar.jpg', null, '469741414@qq.com', '1', '0', '1');
|
INSERT INTO `upms_user` VALUES ('1', 'admin', '3038D9CB63B3152A79B8153FB06C02F7', '66f1b370c660445a8657bf8bf1794486', '张恕征', '/resources/zheng-ui/images/avatar.jpg', null, '469741414@qq.com', '1', '0', '1');
|
||||||
|
|
||||||
-- ----------------------------
|
-- ----------------------------
|
||||||
-- Table structure for upms_user_organization
|
-- Table structure for upms_user_organization
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.zheng</groupId>
|
<groupId>com.zheng</groupId>
|
||||||
<artifactId>zheng-admin</artifactId>
|
<artifactId>zheng-ui</artifactId>
|
||||||
<version>1.0.0</version>
|
<version>1.0.0</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
|
||||||
|
|
@ -1,2 +1,2 @@
|
||||||
env=${profile.env}
|
env=${profile.env}
|
||||||
zheng-admin.version=${zheng-admin.version}
|
zheng-ui.version=${zheng-ui.version}
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
profile.env=dev
|
profile.env=dev
|
||||||
zheng-admin.version=1.0.0
|
zheng-ui.version=1.0.0
|
||||||
### activeMq
|
### activeMq
|
||||||
AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0)
|
AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0)
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
profile.env=pre
|
profile.env=pre
|
||||||
zheng-admin.version=1.0.0
|
zheng-ui.version=1.0.0
|
||||||
### activeMq
|
### activeMq
|
||||||
AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0)
|
AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0)
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
profile.env=prod
|
profile.env=prod
|
||||||
zheng-admin.version=1.0.0
|
zheng-ui.version=1.0.0
|
||||||
### activeMq
|
### activeMq
|
||||||
AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0)
|
AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0)
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
profile.env=test
|
profile.env=test
|
||||||
zheng-admin.version=1.0.0
|
zheng-ui.version=1.0.0
|
||||||
### activeMq
|
### activeMq
|
||||||
AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0)
|
AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0)
|
||||||
|
|
@ -13,12 +13,12 @@
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
<title>标签列表</title>
|
<title>标签列表</title>
|
||||||
|
|
||||||
<link href="${basePath}/resources/zheng-admin/plugins/bootstrap-3.3.0/css/bootstrap.min.css" rel="stylesheet"/>
|
<link href="${basePath}/resources/zheng-ui/plugins/bootstrap-3.3.0/css/bootstrap.min.css" rel="stylesheet"/>
|
||||||
<link href="${basePath}/resources/zheng-admin/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css" rel="stylesheet"/>
|
<link href="${basePath}/resources/zheng-ui/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css" rel="stylesheet"/>
|
||||||
<link href="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/bootstrap-table.min.css" rel="stylesheet"/>
|
<link href="${basePath}/resources/zheng-ui/plugins/bootstrap-table-1.11.0/bootstrap-table.min.css" rel="stylesheet"/>
|
||||||
<link href="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.css" rel="stylesheet"/>
|
<link href="${basePath}/resources/zheng-ui/plugins/waves-0.7.5/waves.min.css" rel="stylesheet"/>
|
||||||
|
|
||||||
<link href="${basePath}/resources/zheng-admin/css/common.css" rel="stylesheet"/>
|
<link href="${basePath}/resources/zheng-ui/css/common.css" rel="stylesheet"/>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div id="main">
|
<div id="main">
|
||||||
|
|
@ -29,13 +29,13 @@
|
||||||
</div>
|
</div>
|
||||||
<table id="table"></table>
|
<table id="table"></table>
|
||||||
</div>
|
</div>
|
||||||
<script src="${basePath}/resources/zheng-admin/plugins/jquery.1.12.4.min.js"></script>
|
<script src="${basePath}/resources/zheng-ui/plugins/jquery.1.12.4.min.js"></script>
|
||||||
<script src="${basePath}/resources/zheng-admin/plugins/bootstrap-3.3.0/js/bootstrap.min.js"></script>
|
<script src="${basePath}/resources/zheng-ui/plugins/bootstrap-3.3.0/js/bootstrap.min.js"></script>
|
||||||
<script src="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/bootstrap-table.min.js"></script>
|
<script src="${basePath}/resources/zheng-ui/plugins/bootstrap-table-1.11.0/bootstrap-table.min.js"></script>
|
||||||
<script src="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-zh-CN.min.js"></script>
|
<script src="${basePath}/resources/zheng-ui/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-zh-CN.min.js"></script>
|
||||||
<script src="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.js"></script>
|
<script src="${basePath}/resources/zheng-ui/plugins/waves-0.7.5/waves.min.js"></script>
|
||||||
|
|
||||||
<script src="${basePath}/resources/zheng-admin/js/common.js"></script>
|
<script src="${basePath}/resources/zheng-ui/js/common.js"></script>
|
||||||
<script>
|
<script>
|
||||||
$(function() {
|
$(function() {
|
||||||
// bootstrap table初始化
|
// bootstrap table初始化
|
||||||
|
|
|
||||||
|
|
@ -22,15 +22,15 @@ public class ZhengAdminUtil implements InitializingBean, ServletContextAware {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setServletContext(ServletContext servletContext) {
|
public void setServletContext(ServletContext servletContext) {
|
||||||
_log.info("===== 开始解压zheng-admin =====");
|
_log.info("===== 开始解压zheng-ui =====");
|
||||||
String version = PropertiesFileUtil.getInstance().get("zheng-admin.version");
|
String version = PropertiesFileUtil.getInstance().get("zheng-ui.version");
|
||||||
_log.info("zheng-admin.jar 版本: {}", version);
|
_log.info("zheng-ui.jar 版本: {}", version);
|
||||||
String jarPath = servletContext.getRealPath("/WEB-INF/lib/zheng-admin-" + version + ".jar");
|
String jarPath = servletContext.getRealPath("/WEB-INF/lib/zheng-ui-" + version + ".jar");
|
||||||
_log.info("zheng-admin.jar 包路径: {}", jarPath);
|
_log.info("zheng-ui.jar 包路径: {}", jarPath);
|
||||||
String resources = servletContext.getRealPath("/resources") + "/zheng-admin";
|
String resources = servletContext.getRealPath("/resources") + "/zheng-ui";
|
||||||
_log.info("zheng-admin.jar 解压到: {}", resources);
|
_log.info("zheng-ui.jar 解压到: {}", resources);
|
||||||
JarUtil.decompress(jarPath, resources);
|
JarUtil.decompress(jarPath, resources);
|
||||||
_log.info("===== 解压zheng-admin完成 =====");
|
_log.info("===== 解压zheng-ui完成 =====");
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,14 @@
|
||||||
|
# zheng-ui
|
||||||
|
|
||||||
|
基于bootstrap实现的响应式Material Design风格的通用后台管理系统
|
||||||
|
|
||||||
|
# 在线演示
|
||||||
|
|
||||||
|
地址： [http://www.zhangshuzheng.cn/zhengAdmin](http://www.zhangshuzheng.cn/zhengAdmin "zhengAdmin")
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# License
|
||||||
|
MIT
|
||||||
|
|
||||||
|
|
@ -0,0 +1,40 @@
|
||||||
|
<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/xsd/maven-4.0.0.xsd">
|
||||||
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
<groupId>com.zheng</groupId>
|
||||||
|
<artifactId>zheng-ui</artifactId>
|
||||||
|
<version>1.0.0</version>
|
||||||
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
|
<name>zheng-ui</name>
|
||||||
|
<url>http://www.zhangshuzheng.cn</url>
|
||||||
|
|
||||||
|
<properties>
|
||||||
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
|
|
||||||
|
<maven.compiler.source>1.7</maven.compiler.source>
|
||||||
|
<maven.compiler.target>1.7</maven.compiler.target>
|
||||||
|
<maven.compiler.compilerVersion>1.7</maven.compiler.compilerVersion>
|
||||||
|
</properties>
|
||||||
|
|
||||||
|
<build>
|
||||||
|
<finalName>zheng-ui</finalName>
|
||||||
|
<resources>
|
||||||
|
<resource>
|
||||||
|
<directory>src</directory>
|
||||||
|
</resource>
|
||||||
|
</resources>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-surefire-plugin</artifactId>
|
||||||
|
<version>2.18.1</version>
|
||||||
|
<configuration>
|
||||||
|
<skipTests>true</skipTests>
|
||||||
|
<testFailureIgnore>true</testFailureIgnore>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
</project>
|
||||||
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 19 KiB |
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.8 KiB |
|
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 3.1 KiB |
|
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.4 KiB |
|
Before Width: | Height: | Size: 22 KiB After Width: | Height: | Size: 22 KiB |
|
Before Width: | Height: | Size: 26 KiB After Width: | Height: | Size: 26 KiB |
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.0 KiB |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 307 B After Width: | Height: | Size: 307 B |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 62 KiB After Width: | Height: | Size: 62 KiB |
|
Before Width: | Height: | Size: 434 KiB After Width: | Height: | Size: 434 KiB |
|
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 2.9 KiB |
|
Before Width: | Height: | Size: 233 KiB After Width: | Height: | Size: 233 KiB |