Compare commits

...

24 Commits

Author SHA1 Message Date
thinkgem
171b5f426f 默认关闭根据模块状态去更新相连的菜单状态 2020-10-06 15:24:00 +08:00
thinkgem
e2664614da 启动脚本更新优化 2020-09-29 13:42:09 +08:00
thinkgem
a64991f5e3 初始化数据库脚本优化 2020-09-14 23:00:13 +08:00
thinkgem
39ec6649d5 体验细节优化 2020-09-05 15:14:25 +08:00
thinkgem
80a5f83791 配置文件整合优化 2020-09-04 14:23:00 +08:00
thinkgem
5204015db5 点击右上角【Star】收藏本软件 ^_^ 2020-09-04 14:20:57 +08:00
thinkgem
80a35fec5d 新增亮蓝主题 2020-09-01 11:33:29 +08:00
thinkgem
9d19595c9a update desktop 2020-09-01 11:22:54 +08:00
thinkgem
2cffa9c396 点击右上角【Star】收藏本软件 ^_^ 2020-09-01 09:40:58 +08:00
thinkgem
fac969bd9c 更该为新的Maven仓库地址 2020-08-25 15:10:21 +08:00
thinkgem
596f6eee4e 点击右上角【Star】收藏本软件 ^_^ 2020-08-24 21:43:05 +08:00
thinkgem
7fc8394cbd support new IDE 2020-08-24 10:50:22 +08:00
thinkgem
c0ab584687 新增亮蓝主题 2020-08-18 22:24:54 +08:00
thinkgem
ff5c7ef05b v4.0.8 2020-08-18 15:45:22 +08:00
thinkgem
b470509623 点击右上角【Star】收藏本软件 ^_^ 2020-08-18 10:23:39 +08:00
thinkgem
87c0a7116f 点击右上角【Star】收藏本软件 ^_^ 2020-08-17 21:43:21 +08:00
thinkgem
4bc10be699 优化浏览器记住密码点2次登录按钮问题;优化缩放135%下有垂直滚动条问题 2020-08-17 21:15:44 +08:00
thinkgem
13af0ac9f9 点击右上角【Star】收藏本软件 ^_^ 2020-05-22 19:12:08 +08:00
thinkgem
c1684b51a2 update 2020-03-31 14:58:56 +08:00
thinkgem
a73ee3688d upgrade spring boot 1.5.10 to 1.5.17 2018-10-18 21:50:10 +08:00
thinkgem
2d81b86b10 EmpUserController.treeData不过滤mgr_type条件。 2018-10-18 21:49:17 +08:00
thinkgem
2fd28e18f9 db2 support 2018-09-22 13:55:39 +08:00
thinkgem
d5d05050e3 sql script decimal(38) to decimal(31) 2018-09-19 21:52:34 +08:00
thinkgem
ada63af9dc 修正作业调度新增报主键验证不通过问题。 2018-09-18 20:42:58 +08:00
95 changed files with 3697 additions and 9450 deletions

11
.gitignore vendored
View File

@@ -2,18 +2,23 @@
**/target
**/webapp/userfiles
**/WEB-INF/classes
**/transaction-logs
**/logs/*.log*
*.epoch
*.lic
.settings
.apt_generated
.factorypath
.classpath
.project
.vscode
.idea
*.ipr
*.iml
*.iws
*.lic
.DS_Store
Thumbs.db
*.epoch
rebel.xml

View File

@@ -1,2 +0,0 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8

View File

@@ -1,4 +0,0 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1

View File

@@ -877,4 +877,5 @@ For more information on this, and how to apply and follow the GNU AGPL, see
理解您的用意。
5. 在延伸的代码中(修改和有源代码衍生的代码中)需要带有原来代码中的协议、版权声明和其他
原作者规定需要包含的说明(请尊重原作者的著作权,不要删除或修改文件中的`@author`信息)。
6. 您可以应用于商业软件,但必须遵循以上条款原则(请协助改进本作品)。
6. 您可以应用于商业软件,但必须遵循以上条款原则(请协助改进本作品 http://jeesite.com)。
7. 您若套用本平台的一些代码或功能参考,需要在您的软件介绍明显位置说明出处。

113
README.md
View File

@@ -1,45 +1,51 @@
# 引言
JeeSite 是一个 Java EE 企业级快速开发平台基于经典技术组合Spring Boot、Spring MVC、Apache Shiro、MyBatis、Beetl、Bootstrap、AdminLTE在线代码生成功能包括核心模块如组织机构、角色用户、菜单及按钮授权、数据权限、系统参数、内容管理、工作流等。采用松耦合设计界面无刷新一键换肤众多账号安全设置密码策略在线定时任务配置支持集群支持SAAS支持多数据源。
## 交流方式
* 交流 QQ 群(千人大群):`127515876``209330483``223507718``709534275``730390092``1373527``183903863(外包)`
* 问题反馈:<https://gitee.com/thinkgem/jeesite4/issues>  [【新手必读】](https://gitee.com/thinkgem/jeesite4/issues/I18ARR)
* 码云Gitee<https://gitee.com/thinkgem/jeesite4>
* GitHub<https://github.com/thinkgem/jeesite4>
* 作者博客:<https://my.oschina.net/thinkgem>
* **技术服务:**<http://s.jeesite.com>
* 官方网站:<http://jeesite.com>
* 官方论坛:<http://jeesite.net>
* 关注微信公众号,了解最新动态:
![JeeSite4微信公众号](https://images.gitee.com/uploads/images/2020/0727/091951_a3ab258c_6732.jpeg "JeeSite4微信公众号")
## 平台介绍
JeeSite 快速开发平台不仅仅是一个后台开发框架它是一个企业级快速开发解决方案基于经典技术组合Spring Boot、Spring MVC、Apache Shiro、MyBatis、Beetl、Bootstrap、AdminLTE采用经典开发模式让初学者能够更快的入门并投入到团队开发中去。在线代码生成功能包括模块如组织机构、角色用户、菜单及按钮授权、数据权限、系统参数、内容管理、工作流等。采用松耦合设计模块增减便捷界面无刷新一键换肤众多账号安全设置密码策略文件在线预览消息推送多元化第三方登录在线定时任务配置支持集群支持SAAS支持多数据源支持读写分离、分库分表支持微服务应用。
JeeSite 快速开发平台的主要目的是能够让初级的研发人员快速的开发出复杂的业务功能(经典架构会的人多),让开发者注重专注业务,其余有平台来封装技术细节,降低技术难度,从而节省人力成本,缩短项目周期,提高软件安全质量。
JeeSite 自开源以来已被广大爱好者用到了企业、政府、医疗、金融、互联网等各个领域中JeeSite 架构简单精良、易于扩展、大众思维的设计模式,深入开发者的内心,并得到一致好评,于[2016](http://www.oschina.net/project/top_cn_2016?sort=1)和[2017](http://www.oschina.net/project/top_cn_2017?sort=1)连续两年获得开源中国《最受欢迎中国开源软件》奖杯,期间也帮助了不少刚毕业的大学生作为入门教材,快速的去实践。
JeeSite 自 2013 年发布以来已被广大爱好者用到了企业、政府、医疗、金融、互联网等各个领域中JeeSite 架构精良、易于扩展、大众思维的设计模式、工匠精神打磨每一个细节,深入开发者的内心,并荣获开源中国《最受欢迎中国开源软件》奖杯,期间也帮助了不少刚毕业的大学生,教师作为入门教材,快速的去实践。
4.0的升级,作者结合了多年总结和经验,以及各方面的应用案例,对架构完成了一次全部重构,也纳入很多新的思想。不管是从开发者模式、底层架构、逻辑处理还是到用户界面,用户交互体验上都有很大的进步,在不忘学习成本、提高开发效率的情况下,安全方面也做和很多工作,包括:身份认证、密码策略、安全审计、日志收集。
JeeSite4 的升级,作者结合了多年总结和经验,以及各方面的应用案例,对架构完成了一次全部重构,也纳入很多新的思想。不管是从开发者模式、底层架构、逻辑处理还是到用户界面,用户交互体验上都有很大的进步,在不忘学习成本、提高开发效率的情况下,安全方面也做和很多工作,包括:身份认证、密码策略、安全审计、日志收集。努力为大中小微企业打造全方位企业级快速开发解决方案。
**我们的优势:** 架构清晰、技术先进、入门简单、易于维护、易于扩展、安全稳定
学会使用 JeeSite 的知识点非常多,也非常少,因为她使用的都是一些通用的技术,通俗的设计风格,多数基础知识点大家都能掌握。 你只需要学会 JeeSite 的功能使用及组件应用就可以完成开发了
### 4.0 新特性
* <http://jeesite4.mydoc.io/?t=281645>
### 4.x 的新特性及优势:<http://jeesite.com/docs/feature/>
## 技术选型
* 主框架Spring Boot 1.5、Spring Framework 4.3、Apache Shiro 1.4
* 主框架Spring Boot 1.5、Spring Framework 4.3、Apache Shiro 1.6
* 持久层Apache MyBatis 3.4、Hibernate Validation 5.3、Alibaba Druid 1.1
* 视图层Spring MVC 4.3、Beetl 2.7 替换JSP、Bootstrap 3.3、AdminLTE 2.4
* 前端组件jQuery 1.12、jqGrid 4.7、layer 3.0、zTree 3.5、jquery-validation
* 工具组件Apache Commons、Logback 1.1、Jackson 2.8、POI 3.14、Quartz 2.2
* 技术选型详情:<http://jeesite.com/docs/technology/>
## 内置功能
* <http://jeesite.com/docs/function/>
## 生态系统
* 分布式微服务系统Spring Cloud<https://gitee.com/thinkgem/jeesite4-cloud>
* JFlow工作流引擎<https://gitee.com/thinkgem/jeesite4-jflow> <http://ccflow.org>
* 技术选型详情<http://jeesite4.mydoc.io/?t=273599>
## 内置功能菜单
* <http://jeesite4.mydoc.io/?t=270187>
## 开发手册
* 持久层开发手册 (Dao)<http://jeesite4.mydoc.io/?t=267351>
* 业务层开发手册 (Service)<http://jeesite4.mydoc.io/?t=267352>
* 视图层开发手册 (WebView)<http://jeesite4.mydoc.io/?t=267353>
* 权限管理应用基础 (Shiro)<http://jeesite4.mydoc.io/?t=298473>
* 常用JS类库API (jeesite.js)<http://jeesite4.mydoc.io/?t=301473>
* 数据表格API (DataGrid.js)<http://jeesite4.mydoc.io/?t=301488>
* 修改 (默认) 视图,新增主题:<http://jeesite4.mydoc.io/?t=267355>
* 手机 API 接口调用、前后分离:<http://jeesite4.mydoc.io/?t=270527>
* 代码生成工具使用手册:<http://jeesite4.mydoc.io/?t=316743>
* 常见问题:<http://jeesite4.mydoc.io/?t=284210>
* Flowable业务流程模块BPM<http://jeesite.com/docs/bpm/>
* 内容管理模块CMS<https://gitee.com/thinkgem/jeesite4-cms>
# 快速体验
@@ -52,56 +58,49 @@ JeeSite 自开源以来已被广大爱好者用到了企业、政府、医疗、
### 本地运行
1. 环境准备:`JDK 1.8``Maven 3.3``MySQL 5.7`
2. 下载源码:<https://gitee.com/thinkgem/jeesite4/attach_files>
3. 打开文件:/web`/src/main/resources/config/jeesite.yml` 配置JDBC连接
4. 执行脚本:/web`/bin/init-data.bat` 初始化数据库
5. 执行脚本:/web`/bin/run-tomcat.bat` 启动服务即可
2. 执行命令:`git clone https://gitee.com/thinkgem/jeesite4.git` 下载源码
3. 打开文件:`/web/src/main/resources/config/jeesite.yml` 配置JDBC连接
4. 执行脚本:`/web/bin/init-data.bat` 初始化数据库
5. 执行脚本:`/web/bin/run-tomcat.bat` 启动服务即可
6. 浏览器访问:<http://127.0.0.1:8980/js/> 账号 system 密码 admin
7. 常见问题:<http://jeesite4.mydoc.io/?t=284210>
7. 部署常见问题:<http://jeesite.com/docs/faq/>
### 开发环境
1. 部署运行:<http://jeesite4.mydoc.io/?t=267354>
2. 常见问题:<http://jeesite4.mydoc.io/?t=284210>
1. 部署运行文档<http://jeesite.com/docs/install-deploy/>
2. 部署常见问题:<http://jeesite.com/docs/faq/>
# 今后如何升级?
## 在线文档
尽量不修改web项目以外的源码项目如 jeesite-common、jeesite-modele-core如果修改了请 Pull Requests 上来,否则代码编码将与官方不同步,将对你的日后升级带来困难。
* 在线文档学习地址:<http://docs.jeesite.com>
JeeSite的小版本4.0.x升级是非常便捷的你只需要将 pom.xml 文件中的 parent.version 版本修改到最新版本即可同版本下你可进行Maven快照强制更新即可将最新版的依赖jar更新到本地下面介绍一下在Eclipse里如何操作
## 技术服务与支持
在web项目上右键选择菜单 -> Maven -> Update Project...或按Alt+F5 -> 点击 Select All 按钮 -> 选择 Force Update of Snapshots/Releases 复选框 -> 点击OK按钮即可。
* 没有资金的支撑就很难得到发展,特别是一个好的产品,如果 JeeSite 帮助了您,请为我们点赞。支持我们,您可以得到一些回报,有了这些我们会把公益事业做的更好,回报社区和社会,请给我们一些动力吧,在此非常感谢已支持我们的朋友!
* **联系方式官方商务QQ[1766571055](http://wpa.qq.com/msgrd?v=3&uin=1766571055&site=qq&menu=yes)**
* 技术服务支持网页:<http://s.jeesite.com>
如果进行相对大的版本4.x.x升级这里我们会附加一个声明帮助你进行迁移操作。
# 授权协议声明
## 授权协议声明
1. 已开源的代码,授权协议采用 AGPL v3 + Apache Licence v2 进行发行。
2. 您可以免费使用、修改和衍生代码,但不允许修改后和衍生的代码做为闭源软件发布。
3. 修改后和衍生的代码必须也按照AGPL协议进行流通对修改后和衍生的代码必须向社会公开。
4. 如果您修改了代码,需要在被修改的文件中进行说明,并遵守代码格式规范,帮助他人更好的理解您的用意。
5. 在延伸的代码中(修改和有源代码衍生的代码中)需要带有原来代码中的协议、版权声明和其他原作者规定需要包含的说明(请尊重原作者的著作权,不要删除或修改文件中的`@author`信息)。
5. 在延伸的代码中(修改和有源代码衍生的代码中)需要带有原来代码中的协议、版权声明和其他原作者规定
需要包含的说明(请尊重原作者的著作权,不要删除或修改文件中的`@author`信息)。
6. 您可以应用于商业软件,但必须遵循以上条款原则(请协助改进本作品)。
7. 关系平台的发展战略考虑,底层部分代码暂未开源,但这不影响您的二次开发
8. 请知悉社区版用户数不可超过100个最大允许10个用户同时在线不含匿名
7. 您若套用本平台的一些代码或功能参考,需要在您的软件介绍明显位置说明出处
8. **当前 v4.0.8 版本,没有系统用户数量限制,没有最大在线人数限制。**
### 获得技术服务支持:<http://jeesite4.mydoc.io/?t=267685>
## 今后如何升级?
* 随着JeeSite发展我们也需要有相应的资金支持才能持续的开发和维护。支持我们您可以得到一些回报我们有了这些也会把开源事业做的更好请给我们一些动力吧谢谢您的支持
尽量不修改 web 项目以外的源码项目,如 jeesite-common、jeesite-modele-core如果修改了请 Pull Requests 上来,否则代码与官方不同步,会将对你的日后升级增加难度。
# 技术交流方式
如果您修改了依赖模块代码,也没关系,这时你需要利用 Git 版本控制工具,与官方仓库代码进行同步,合并代码即可。
* QQ 群号: `127515876(已满)` `209330483(已满)` `223507718(已满)` `709534275` `730390092`
* 问题反馈:<https://gitee.com/thinkgem/jeesite4/issues>  [【新手必读】](http://www.dianbo.org/9238/stone/tiwendezhihui.htm)
* 码云Gitee<https://gitee.com/thinkgem/jeesite4>
* GitHub<https://github.com/thinkgem/jeesite4>
* 作者博客:<https://my.oschina.net/thinkgem>
* 官方网站:<http://jeesite.com>
* 官方论坛:<http://jeesite.net>
* 微信公众号:
![https://static.oschina.net/uploads/space/2018/0302/145133_OGZf_941661.jpg](https://static.oschina.net/uploads/space/2018/0302/145133_OGZf_941661.jpg "JeeSite4微信公众号")
每个版本升级,我们都会附带详细更新日志:<http://jeesite.com/docs/upgrade/>
在这里,你可以看到 JeeSite 新增哪些新功能和改进,在每个版本下都有对应升级方法。
# Git 全局设置技巧

View File

@@ -1,5 +0,0 @@
eclipse.preferences.version=1
encoding//src/main/java=UTF-8
encoding//src/main/resources=UTF-8
encoding//src/test/java=UTF-8
encoding/<project>=UTF-8

View File

@@ -1,8 +0,0 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.7

View File

@@ -1,4 +0,0 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1

View File

@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="jeesite-common">
<wb-resource deploy-path="/" source-path="/src/main/java"/>
<wb-resource deploy-path="/" source-path="/src/main/resources"/>
</wb-module>
</project-modules>

View File

@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
<installed facet="jst.utility" version="1.0"/>
<installed facet="java" version="1.7"/>
</faceted-project>

View File

@@ -1,2 +0,0 @@
disabled=06target
eclipse.preferences.version=1

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.jeesite</groupId>
<artifactId>jeesite-parent</artifactId>
<version>4.0.7-SNAPSHOT</version>
<version>4.0.8-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>

View File

@@ -0,0 +1,159 @@
/*
* Skin: Black
* ----------
*/
.main-header .navbar {
background-color: #303643;
}
.main-header .navbar .nav > li > a {
color: #eaeaea;
}
.main-header .navbar .nav > li > a:hover,
.main-header .navbar .nav > li > a:active,
.main-header .navbar .nav > li > a:focus,
.main-header .navbar .nav .open > a,
.main-header .navbar .nav .open > a:hover,
.main-header .navbar .nav .open > a:focus,
.main-header .navbar .nav > .active > a {
background: rgba(0, 0, 0, 0.1);
color: #f6f6f6;
}
.main-header .navbar .sidebar-toggle {
color: #ffffff;
}
.main-header .navbar .sidebar-toggle:hover {
color: #f6f6f6;
background: rgba(0, 0, 0, 0.1);
}
.main-header .navbar .sidebar-toggle {
color: #fff;
}
.main-header .navbar .sidebar-toggle:hover {
background-color: #367fa9;
}
@media (max-width: 767px) {
.main-header .navbar .dropdown-menu li.divider {
background-color: rgba(255, 255, 255, 0.1);
}
.main-header .navbar .dropdown-menu li a {
color: #fff;
}
.main-header .navbar .dropdown-menu li a:hover {
background: #367fa9;
}
}
.main-header .logo {
/* background-color: #2A579A; */
color: #f6f6f6;
border-bottom: 0 solid transparent;
}
.main-header .logo:hover {
/* background-color: #204F93; */
background: rgba(0, 0, 0, 0.2);
}
.main-header li.user-header {
background-color: #2A579A;
}
.content-header {
background: transparent;
}
.sidebar,
.left-side {
background-color: #E3E7EC;
}
.content-wrapper,
.main-footer {
border-left: 1px solid #d2d6de;
}
.user-panel > .info,
.user-panel > .info > a {
color: #555;
}
.sidebar-menu > li {
-webkit-transition: border-left-color 0.3s ease;
-o-transition: border-left-color 0.3s ease;
transition: border-left-color 0.3s ease;
}
.sidebar-menu > li.header {
color: #848484;
background: #E3E7EC;
}
.sidebar-menu > li > a {
border-left: 3px solid transparent;
font-weight: 600;
}
.sidebar-menu > li:hover > a,
.sidebar-menu > li.active > a {
color: #000;
background: #EAEDF1;
}
.sidebar-menu > li.active {
border-left-color: #2A579A;
}
.sidebar-menu > li.active > a {
font-weight: 600;
}
.sidebar-menu > li.menu-open > a,
.sidebar-menu > li > .treeview-menu {
background: #EAEDF1;
}
.sidebar a {
color: #555;
}
.sidebar a:hover {
text-decoration: none;
}
.treeview-menu > li > a {
color: #555;
}
.treeview-menu > li.active > a,
.treeview-menu > li > a:hover {
color: #000;
}
.sidebar-form {
border-radius: 3px;
border: 1px solid #d2d6de;
margin: 10px 10px;
}
.sidebar-form input[type="text"],
.sidebar-form .btn {
box-shadow: none;
background-color: #fff;
border: 1px solid transparent;
height: 35px;
}
.sidebar-form input[type="text"] {
color: #666;
border-top-left-radius: 2px;
border-top-right-radius: 0;
border-bottom-right-radius: 0;
border-bottom-left-radius: 2px;
}
.sidebar-form input[type="text"]:focus,
.sidebar-form input[type="text"]:focus + .input-group-btn .btn {
background-color: #fff;
color: #666;
}
.sidebar-form input[type="text"]:focus + .input-group-btn .btn {
border-left-color: #fff;
}
.sidebar-form .btn {
color: #999;
border-top-left-radius: 0;
border-top-right-radius: 2px;
border-bottom-right-radius: 2px;
border-bottom-left-radius: 0;
}
.main-footer {
border-top-color: #d2d6de;
}
.skin-blue.layout-top-nav .main-header > .logo {
background-color: #2A579A;
color: #ffffff;
border-bottom: 0 solid transparent;
}
.skin-blue.layout-top-nav .main-header > .logo:hover {
background-color: #3b8ab8;
}
.sidebar-menu .treeview-item.active > a {color:#000;background-color:#fff;}

View File

@@ -76,7 +76,6 @@
background: transparent;
box-shadow: none;
}
.wrapper,
.sidebar,
.left-side {
background-color: #263238;

View File

@@ -0,0 +1,141 @@
/*
* Skin: Black
* ----------
*/
.main-header .navbar {
background-color: #263238;
}
.main-header .navbar .nav > li > a {
color: #eaeaea;
}
.main-header .navbar .nav > li > a:hover,
.main-header .navbar .nav > li > a:active,
.main-header .navbar .nav > li > a:focus,
.main-header .navbar .nav .open > a,
.main-header .navbar .nav .open > a:hover,
.main-header .navbar .nav .open > a:focus,
.main-header .navbar .nav > .active > a {
background: rgba(0, 0, 0, 0.2);
color: #f6f6f6;
}
.main-header .navbar .sidebar-toggle {
color: #ffffff;
}
.main-header .navbar .sidebar-toggle:hover {
color: #f6f6f6;
background: rgba(0, 0, 0, 0.2);
}
.main-header .navbar .sidebar-toggle {
color: #fff;
}
.main-header .navbar .sidebar-toggle:hover {
background-color: #367fa9;
}
@media (max-width: 767px) {
.main-header .navbar .dropdown-menu li.divider {
background-color: rgba(255, 255, 255, 0.1);
}
.main-header .navbar .dropdown-menu li a {
color: #fff;
}
.main-header .navbar .dropdown-menu li a:hover {
background: #367fa9;
}
}
.main-header .logo {
/* background-color: #367fa9; */
color: #f6f6f6;
border-bottom: 0 solid transparent;
}
.main-header .logo:hover {
/* background-color: #357ca5; */
background: rgba(0, 0, 0, 0.2);
}
.main-header li.user-header {
background-color: #3c8dbc;
}
.content-header {
background: transparent;
}
.sidebar,
.left-side {
background-color: #263238;
}
.user-panel > .info,
.user-panel > .info > a {
color: #fff;
}
.sidebar-menu > li.header {
color: #4b646f;
background: #1a2226;
}
.sidebar-menu > li > a {
border-left: 3px solid transparent;
}
.sidebar-menu > li:hover > a,
.sidebar-menu > li.active > a {
color: #ffffff;
background: #2c3b41;
/* border-left-color: #3c8dbc; */
}
.sidebar-menu > li.menu-open > a,
.sidebar-menu > li > .treeview-menu {
background: #2c3b41;
}
.sidebar a {
color: #eaeaea;
}
.sidebar a:hover {
text-decoration: none;
}
.treeview-menu > li > a {
color: #c7d0da;
}
.treeview-menu > li.active > a,
.treeview-menu > li > a:hover {
color: #ffffff;
}
.sidebar-form {
border-radius: 3px;
border: 1px solid #374850;
margin: 10px 10px;
}
.sidebar-form input[type="text"],
.sidebar-form .btn {
box-shadow: none;
background-color: #374850;
border: 1px solid transparent;
height: 35px;
}
.sidebar-form input[type="text"] {
color: #666;
border-top-left-radius: 2px;
border-top-right-radius: 0;
border-bottom-right-radius: 0;
border-bottom-left-radius: 2px;
}
.sidebar-form input[type="text"]:focus,
.sidebar-form input[type="text"]:focus + .input-group-btn .btn {
background-color: #fff;
color: #666;
}
.sidebar-form input[type="text"]:focus + .input-group-btn .btn {
border-left-color: #fff;
}
.sidebar-form .btn {
color: #999;
border-top-left-radius: 0;
border-top-right-radius: 2px;
border-bottom-right-radius: 2px;
border-bottom-left-radius: 0;
}
.skin-blue.layout-top-nav .main-header > .logo {
background-color: #3c8dbc;
color: #ffffff;
border-bottom: 0 solid transparent;
}
.skin-blue.layout-top-nav .main-header > .logo:hover {
background-color: #3b8ab8;
}
.sidebar-menu .treeview-item.active > a {color:#fff;background-color:#3c8dbc;}

View File

@@ -0,0 +1,214 @@
/*
* http://jeesite.com
*/
a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sortable {
color:#1890ff;
}
.main-header .navbar {
background-color: #1890ff;
}
.main-header .navbar .nav > li > a {
color: #ffffff;
}
.main-header .navbar .nav > li > a:hover,
.main-header .navbar .nav > li > a:active,
.main-header .navbar .nav > li > a:focus,
.main-header .navbar .nav .open > a,
.main-header .navbar .nav .open > a:hover,
.main-header .navbar .nav .open > a:focus,
.main-header .navbar .nav > .active > a {
background: rgba(0, 0, 0, 0.1);
color: #f6f6f6;
}
.main-header .navbar .sidebar-toggle {
color: #ffffff;
}
.main-header .navbar .sidebar-toggle:hover {
color: #f6f6f6;
background: rgba(0, 0, 0, 0.1);
}
.main-header .navbar .sidebar-toggle {
color: #fff;
}
.main-header .navbar .sidebar-toggle:hover {
background-color: #367fa9;
}
@media (max-width: 767px) {
.main-header .navbar .dropdown-menu li.divider {
background-color: rgba(255, 255, 255, 0.1);
}
.main-header .navbar .dropdown-menu li a {
color: #fff;
}
.main-header .navbar .dropdown-menu li a:hover {
background: #367fa9;
}
}
.main-header .logo {
background-color: #1890ff;
color: #ffffff;
border-bottom: 0 solid transparent;
}
.main-header .logo:hover {
background-color: #1890ff;
}
.main-header li.user-header {
background-color: #1890ff;
}
.content-header {
background: transparent;
}
.sidebar,
.left-side {
background-color: #ffffff;
}
.content-wrapper,
.main-footer {
border-left: 1px solid #eeeeee;
}
.user-panel > .info,
.user-panel > .info > a {
color: #555;
}
.sidebar-menu > li {
-webkit-transition: border-left-color 0.3s ease;
-o-transition: border-left-color 0.3s ease;
transition: border-left-color 0.3s ease;
}
.sidebar-menu > li.header {
color: #848484;
background: #f8f8f8;
}
.sidebar-menu > li > a {
border-left: 3px solid transparent;
font-weight: 600;
}
.sidebar-menu > li:hover > a,
.sidebar-menu > li.active > a {
color: #000;
background: #ffffff;
}
.sidebar-menu > li.active {
border-left-color: #1890ff;
}
.sidebar-menu > li.active > a {
font-weight: 600;
}
.sidebar-menu > li.menu-open > a,
.sidebar-menu > li > .treeview-menu {
background: #ffffff;
}
.sidebar a {
color: #555;
}
.sidebar a:hover {
text-decoration: none;
}
.treeview-menu > li > a {
color: #555;
}
.treeview-menu > li.active > a,
.treeview-menu > li > a:hover {
color: #000;
}
.sidebar-form {
border-radius: 3px;
border: 1px solid #d2d6de;
margin: 10px 10px;
}
.sidebar-form input[type="text"],
.sidebar-form .btn {
box-shadow: none;
background-color: #fff;
border: 1px solid transparent;
height: 35px;
}
.sidebar-form input[type="text"] {
color: #666;
border-top-left-radius: 2px;
border-top-right-radius: 0;
border-bottom-right-radius: 0;
border-bottom-left-radius: 2px;
}
.sidebar-form input[type="text"]:focus,
.sidebar-form input[type="text"]:focus + .input-group-btn .btn {
background-color: #fff;
color: #666;
}
.sidebar-form input[type="text"]:focus + .input-group-btn .btn {
border-left-color: #fff;
}
.sidebar-form .btn {
color: #999;
border-top-left-radius: 0;
border-top-right-radius: 2px;
border-bottom-right-radius: 2px;
border-bottom-left-radius: 0;
}
.main-footer {
border-top-color: #d2d6de;
}
.skin-blue.layout-top-nav .main-header > .logo {
background-color: #1890ff;
color: #ffffff;
border-bottom: 0 solid transparent;
}
.skin-blue.layout-top-nav .main-header > .logo:hover {
background-color: #3b8ab8;
}
.sidebar-menu .treeview-item.active > a {color:#1890ff;background-color:#e1f1ff;border-right:solid #57a6ee;}
.content-wrapper, .right-side, body {background-color:#f8f8f8;}
.btn-primary, .btn-primary:hover, .btn-primary:active,
.btn-primary.hover, .btn-primary.focus, .btn-primary:focus,
.btn-primary.active.focus, .btn-primary.active:focus, .btn-primary.active:hover,
.btn-primary:active.focus, .btn-primary:active:focus, .btn-primary:active:hover,
.open>.dropdown-toggle.btn-primary.focus, .open>.dropdown-toggle.btn-primary:focus,
.open>.dropdown-toggle.btn-primary:hover, .layui-layer-btn .layui-layer-btn0,
.select2-container--default .select2-selection--multiple .select2-selection__choice,
.select2-container--default .select2-results__option--highlighted[aria-selected],
.wup_container .placeholder .webuploader-pick {background-color:#1890ff!important;border-color:#1890ff;}
.form-unit, th[aria-selected=true] .ui-jqgrid-sortable {color:#1890ff;}
.form-unit {border-bottom: 1px solid #eee;}
.tabpanel_mover li {padding:1px 16px 2px 3px;margin:6px 0 6px 6px;border:1px solid #e4e4e4;
border-radius:3px;background:#fff;box-shadow:0 0 5px #e6e6e6;}
.tabpanel_mover li.active {background-color:#3aa0ff;}
.tabpanel_mover li.active div {color:#fff;}
.tabpanel_mover li .closer {font:11px/1 FontAwesome;top:6px;right:2px;background:none;opacity:0.7;}
.tabpanel_mover li .closer:before {content:"\f00d";}
.tabpanel_mover li .closer:hover {background:none;-moz-transform: scale(1.2);-webkit-transform: scale(1.2);
-o-transform: scale(1.2);-ms-transform: scale(1.2);transform: scale(1.2);color:#d30606;}
.tabpanel_mover li.active .closer:hover {color:#fff;opacity:0.9;}
.tabpanel_tab_content {background-color:#fafafa;border-bottom-color:#eeeeee;overflow:visible;}
/* .tabpanel_mover li {background:#fff;border-right:1px solid #eee;padding:8px 16px 8px 5px;}
.tabpanel_mover li.active {background-color:#fff;border-bottom:3px solid #3aa0ff;}
.tabpanel_mover li.active div {color:#0975d9;}
.tabpanel_mover li .closer {background:none;font:11px/1 FontAwesome;opacity:0.7;}
.tabpanel_mover li .closer:before {content:"\f00d";}
.tabpanel_mover li .closer:hover {background:none;-moz-transform: scale(1.2);-webkit-transform: scale(1.2);
-o-transform: scale(1.2);-ms-transform: scale(1.2);transform: scale(1.2);color:#d30606;}
.tabpanel_tab_content {background-color:#fafafa;border-bottom-color:#eeeeee;overflow:visible;} 替换上面 tab 样式,改变 tab 风格。*/
/* .main-content {padding:10px;}
.ui-layout-container {padding:10px;}
.ui-layout-resizer {background:transparent;}
.ui-layout-pane {box-shadow:0 0 5px #e0e0e0;}
.ui-layout-pane>.main-content {padding:0;}
.ui-layout-content>.wrapper>.main-content {padding:0;}
.box-main,.nav-main{border-radius:3px;box-shadow:0 0 5px #e0e0e0;} 解开注释,可给内容页面,添加内边距样式 */
.box-main>.box-header {border-bottom-color:#eeeeee;}
.box-main>.box-header .box-title .fa {color:#1890ff;}
.nav-tabs-custom>.nav-tabs>li.active {border-top-color:#3aa0ff;}
.form-control:focus,.select2-container--default.select2-container--focus .select2-selection--multiple,
.select2-container--default .select2-search--dropdown .select2-search__field {border-color:#66afe9!important;}
.table thead tr, .ui-jqgrid-htable thead tr, .ui-jqgrid-hdiv, .ui-jqgrid-hbox {background-color:#f6f6f6;}
.ui-jqgrid .ui-jqgrid-htable th.ui-th-column-header, .ui-jqgrid .ui-jqgrid-htable th.ui-th-column,
.ui-jqgrid .ui-jqgrid-labels th, .ui-jqgrid .ui-widget-content, .ui-jqgrid tr.ui-row-ltr td,
.ui-jqgrid tr.ui-row-rtl td, .ui-jqgrid tr.ui-row-ltr td:last-child {border-color:#eaeaea;}
.ui-state-hover td, .ui-widget-content .ui-state-hover td, .ui-widget-header .ui-state-hover td,
.ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus {background:#f5f5f5;}
.ui-jqgrid tr.ui-state-highlight.ui-row-ltr td {background-color:#e5f3ff;}
/* .ui-jqgrid tr.ui-row-ltr td {border-right:0!important;} 解开注释,可去除表格单元格的竖边框线 */

View File

@@ -56,7 +56,6 @@
.content-header {
background: transparent;
}
.wrapper,
.sidebar,
.left-side {
background-color: #263238;

View File

@@ -0,0 +1,214 @@
/*
* http://jeesite.com
*/
a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sortable {
color:#1e5edb;
}
.main-header .navbar {
background-color: #1951be;
}
.main-header .navbar .nav > li > a {
color: #ffffff;
}
.main-header .navbar .nav > li > a:hover,
.main-header .navbar .nav > li > a:active,
.main-header .navbar .nav > li > a:focus,
.main-header .navbar .nav .open > a,
.main-header .navbar .nav .open > a:hover,
.main-header .navbar .nav .open > a:focus,
.main-header .navbar .nav > .active > a {
background: rgba(0, 0, 0, 0.1);
color: #f6f6f6;
}
.main-header .navbar .sidebar-toggle {
color: #ffffff;
}
.main-header .navbar .sidebar-toggle:hover {
color: #f6f6f6;
background: rgba(0, 0, 0, 0.1);
}
.main-header .navbar .sidebar-toggle {
color: #fff;
}
.main-header .navbar .sidebar-toggle:hover {
background-color: #367fa9;
}
@media (max-width: 767px) {
.main-header .navbar .dropdown-menu li.divider {
background-color: rgba(255, 255, 255, 0.1);
}
.main-header .navbar .dropdown-menu li a {
color: #fff;
}
.main-header .navbar .dropdown-menu li a:hover {
background: #367fa9;
}
}
.main-header .logo {
background-color: #1951be;
color: #ffffff;
border-bottom: 0 solid transparent;
}
.main-header .logo:hover {
background-color: #1951be;
}
.main-header li.user-header {
background-color: #1951be;
}
.content-header {
background: transparent;
}
.sidebar,
.left-side {
background-color: #ffffff;
}
.content-wrapper,
.main-footer {
border-left: 1px solid #eeeeee;
}
.user-panel > .info,
.user-panel > .info > a {
color: #555;
}
.sidebar-menu > li {
-webkit-transition: border-left-color 0.3s ease;
-o-transition: border-left-color 0.3s ease;
transition: border-left-color 0.3s ease;
}
.sidebar-menu > li.header {
color: #848484;
background: #f8f8f8;
}
.sidebar-menu > li > a {
border-left: 3px solid transparent;
font-weight: 600;
}
.sidebar-menu > li:hover > a,
.sidebar-menu > li.active > a {
color: #000;
background: #ffffff;
}
.sidebar-menu > li.active {
border-left-color: #1e5edb;
}
.sidebar-menu > li.active > a {
font-weight: 600;
}
.sidebar-menu > li.menu-open > a,
.sidebar-menu > li > .treeview-menu {
background: #ffffff;
}
.sidebar a {
color: #555;
}
.sidebar a:hover {
text-decoration: none;
}
.treeview-menu > li > a {
color: #555;
}
.treeview-menu > li.active > a,
.treeview-menu > li > a:hover {
color: #000;
}
.sidebar-form {
border-radius: 3px;
border: 1px solid #d2d6de;
margin: 10px 10px;
}
.sidebar-form input[type="text"],
.sidebar-form .btn {
box-shadow: none;
background-color: #fff;
border: 1px solid transparent;
height: 35px;
}
.sidebar-form input[type="text"] {
color: #666;
border-top-left-radius: 2px;
border-top-right-radius: 0;
border-bottom-right-radius: 0;
border-bottom-left-radius: 2px;
}
.sidebar-form input[type="text"]:focus,
.sidebar-form input[type="text"]:focus + .input-group-btn .btn {
background-color: #fff;
color: #666;
}
.sidebar-form input[type="text"]:focus + .input-group-btn .btn {
border-left-color: #fff;
}
.sidebar-form .btn {
color: #999;
border-top-left-radius: 0;
border-top-right-radius: 2px;
border-bottom-right-radius: 2px;
border-bottom-left-radius: 0;
}
.main-footer {
border-top-color: #d2d6de;
}
.skin-blue.layout-top-nav .main-header > .logo {
background-color: #1e5edb;
color: #ffffff;
border-bottom: 0 solid transparent;
}
.skin-blue.layout-top-nav .main-header > .logo:hover {
background-color: #3b8ab8;
}
.sidebar-menu .treeview-item.active > a {color:#001C6B;background-color:#e1f1ff;border-right:solid #7791ce;}
.content-wrapper, .right-side, body {background-color:#f8f8f8;}
.btn-primary, .btn-primary:hover, .btn-primary:active,
.btn-primary.hover, .btn-primary.focus, .btn-primary:focus,
.btn-primary.active.focus, .btn-primary.active:focus, .btn-primary.active:hover,
.btn-primary:active.focus, .btn-primary:active:focus, .btn-primary:active:hover,
.open>.dropdown-toggle.btn-primary.focus, .open>.dropdown-toggle.btn-primary:focus,
.open>.dropdown-toggle.btn-primary:hover, .layui-layer-btn .layui-layer-btn0,
.select2-container--default .select2-selection--multiple .select2-selection__choice,
.select2-container--default .select2-results__option--highlighted[aria-selected],
.wup_container .placeholder .webuploader-pick {background-color:#1e5edb!important;border-color:#1e5edb!important;}
.form-unit, th[aria-selected=true] .ui-jqgrid-sortable {color:#1e5edb;}
.form-unit {border-bottom: 1px solid #eee;}
.tabpanel_mover li {padding:1px 16px 2px 3px;margin:6px 0 6px 6px;border:1px solid #e4e4e4;
border-radius:3px;background:#fff;box-shadow:0 0 5px #e6e6e6;}
.tabpanel_mover li.active {background-color:#1e5edb;}
.tabpanel_mover li.active div {color:#fff;}
.tabpanel_mover li .closer {font:11px/1 FontAwesome;top:6px;right:2px;background:none;opacity:0.7;}
.tabpanel_mover li .closer:before {content:"\f00d";}
.tabpanel_mover li .closer:hover {background:none;-moz-transform: scale(1.2);-webkit-transform: scale(1.2);
-o-transform: scale(1.2);-ms-transform: scale(1.2);transform: scale(1.2);color:#d30606;}
.tabpanel_mover li.active .closer:hover {color:#fff;opacity:0.9;}
.tabpanel_tab_content {background-color:#fafafa;border-bottom-color:#eeeeee;overflow:visible;}
/* .tabpanel_mover li {background:#fff;border-right:1px solid #eee;padding:8px 16px 8px 5px;}
.tabpanel_mover li.active {background-color:#fff;border-bottom:3px solid #1e5edb;}
.tabpanel_mover li.active div {color:#0975d9;}
.tabpanel_mover li .closer {background:none;font:11px/1 FontAwesome;opacity:0.7;}
.tabpanel_mover li .closer:before {content:"\f00d";}
.tabpanel_mover li .closer:hover {background:none;-moz-transform: scale(1.2);-webkit-transform: scale(1.2);
-o-transform: scale(1.2);-ms-transform: scale(1.2);transform: scale(1.2);color:#d30606;}
.tabpanel_tab_content {background-color:#fafafa;border-bottom-color:#eeeeee;overflow:visible;} 替换上面 tab 样式,改变 tab 风格。*/
/* .main-content {padding:10px;}
.ui-layout-container {padding:10px;}
.ui-layout-resizer {background:transparent;}
.ui-layout-pane {box-shadow:0 0 5px #e0e0e0;}
.ui-layout-pane>.main-content {padding:0;}
.ui-layout-content>.wrapper>.main-content {padding:0;}
.box-main,.nav-main{border-radius:3px;box-shadow:0 0 5px #e0e0e0;} 解开注释,可给内容页面,添加内边距样式 */
.box-main>.box-header {border-bottom-color:#eeeeee;}
.box-main>.box-header .box-title .fa {color:#1e5edb;}
.nav-tabs-custom>.nav-tabs>li.active {border-top-color:#1e5edb;}
.form-control:focus,.select2-container--default.select2-container--focus .select2-selection--multiple,
.select2-container--default .select2-search--dropdown .select2-search__field {border-color:#6980c3!important;}
.table thead tr, .ui-jqgrid-htable thead tr, .ui-jqgrid-hdiv, .ui-jqgrid-hbox {background-color:#f6f6f6;}
.ui-jqgrid .ui-jqgrid-htable th.ui-th-column-header, .ui-jqgrid .ui-jqgrid-htable th.ui-th-column,
.ui-jqgrid .ui-jqgrid-labels th, .ui-jqgrid .ui-widget-content, .ui-jqgrid tr.ui-row-ltr td,
.ui-jqgrid tr.ui-row-rtl td, .ui-jqgrid tr.ui-row-ltr td:last-child {border-color:#eaeaea;}
.ui-state-hover td, .ui-widget-content .ui-state-hover td, .ui-widget-header .ui-state-hover td,
.ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus {background:#f5f5f5;}
.ui-jqgrid tr.ui-state-highlight.ui-row-ltr td {background-color:#e5f3ff;}
/* .ui-jqgrid tr.ui-row-ltr td {border-right:0!important;} 解开注释,可去除表格单元格的竖边框线 */

View File

@@ -56,7 +56,6 @@
.content-header {
background: transparent;
}
.wrapper,
.sidebar,
.left-side {
background-color: #263238;

View File

@@ -56,7 +56,6 @@
.content-header {
background: transparent;
}
.wrapper,
.sidebar,
.left-side {
background-color: #263238;

View File

@@ -56,7 +56,6 @@
.content-header {
background: transparent;
}
.wrapper,
.sidebar,
.left-side {
background-color: #263238;

View File

@@ -56,7 +56,6 @@
.content-header {
background: transparent;
}
.wrapper,
.sidebar,
.left-side {
background-color: #263238;

View File

@@ -1,249 +0,0 @@
/*
* Default Layout Theme
*
* Created for jquery.layout
*
* Copyright (c) 2010
* Fabrizio Balliano (http://www.fabrizioballiano.net)
* Kevin Dalman (http://allpro.net)
*
* Dual licensed under the GPL (http://www.gnu.org/licenses/gpl.html)
* and MIT (http://www.opensource.org/licenses/mit-license.php) licenses.
*
* Last Updated: 2010-02-10
* NOTE: For best code readability, view this with a fixed-space font and tabs equal to 4-chars
*/
.ui-draggable-handle{-ms-touch-action:none;touch-action:none}
/*
* DEFAULT FONT
* Just to make demo-pages look better - not actually relevant to Layout!
*/
/* body { */
/* font-family: Geneva, Arial, Helvetica, sans-serif; */
/* font-size: 100%; */
/* *font-size: 80%; */
/* } */
/*
* PANES & CONTENT-DIVs
*/
.ui-layout-pane { /* all 'panes' */
/* background: #FFF; */
/* border: 1px solid #eee; */
/* padding: 10px; */
overflow: auto;
/* DO NOT add scrolling (or padding) to 'panes' that have a content-div,
otherwise you may get double-scrollbars - on the pane AND on the content-div
- use ui-layout-wrapper class if pane has a content-div
- use ui-layout-container if pane has an inner-layout
*/
}
/* (scrolling) content-div inside pane allows for fixed header(s) and/or footer(s) */
.ui-layout-content {
padding: 10px;
position: relative; /* contain floated or positioned elements */
overflow: auto; /* add scrolling to content-div */
width: 100%;
border: 0;
}
/*
* UTILITY CLASSES
* Must come AFTER pane-class above so will override
* These classes are NOT auto-generated and are NOT used by Layout
*/
.layout-child-container,
.layout-content-container {
padding: 0;
overflow: hidden;
}
.layout-child-container {
border: 0; /* remove border because inner-layout-panes probably have borders */
}
.layout-scroll {
overflow: auto;
}
.layout-hide {
display: none;
}
/*
* RESIZER-BARS
*/
.ui-layout-resizer { /* all 'resizer-bars' */
background: #fafafa;
border: 1px solid #eee;
border-width: 0;
}
.ui-layout-resizer-drag { /* REAL resizer while resize in progress */
}
.ui-layout-resizer-hover { /* affects both open and closed states */
}
/* NOTE: It looks best when 'hover' and 'dragging' are set to the same color,
otherwise color shifts while dragging when bar can't keep up with mouse */
.ui-layout-resizer-open-hover , /* hover-color to 'resize' */
.ui-layout-resizer-dragging { /* resizer beging 'dragging' */
background: #fafafa;
}
.ui-layout-resizer-dragging { /* CLONED resizer being dragged */
border: 1px solid #eee;
}
.ui-layout-resizer-north-dragging,
.ui-layout-resizer-south-dragging {
border-width: 1px 0;
}
.ui-layout-resizer-west-dragging,
.ui-layout-resizer-east-dragging {
border-width: 0 1px;
}
/* NOTE: Add a 'dragging-limit' color to provide visual feedback when resizer hits min/max size limits */
.ui-layout-resizer-dragging-limit { /* CLONED resizer at min or max size-limit */
background: #E1A4A4; /* red */
}
.ui-layout-resizer-closed-hover { /* hover-color to 'slide open' */
background: #EBD5AA;
}
.ui-layout-resizer-sliding { /* resizer when pane is 'slid open' */
/* opacity: .10; show only a slight shadow */
/* filter: alpha(opacity=10); */
}
.ui-layout-resizer-sliding-hover { /* sliding resizer - hover */
/* opacity: 1.00; on-hover, show the resizer-bar normally */
/* filter: alpha(opacity=100); */
}
/* sliding resizer - add 'outside-border' to resizer on-hover
* this sample illustrates how to target specific panes and states */
.ui-layout-resizer-north-sliding-hover { border-bottom-width: 1px; }
.ui-layout-resizer-south-sliding-hover { border-top-width: 1px; }
.ui-layout-resizer-west-sliding-hover { border-right-width: 1px; }
.ui-layout-resizer-east-sliding-hover { border-left-width: 1px; }
/*
* TOGGLER-BUTTONS
*/
.ui-layout-toggler {
border: 1px solid #eee; /* match pane-border */
background-color: #eee;
}
.ui-layout-resizer-hover .ui-layout-toggler {
opacity: 1.00;
filter: alpha(opacity=100);
}
.ui-layout-toggler-hover , /* need when NOT resizable */
.ui-layout-resizer-hover .ui-layout-toggler-hover { /* need specificity when IS resizable */
background-color: #FC6;
opacity: 1.00;
filter: alpha(opacity=100);
}
.ui-layout-toggler-north ,
.ui-layout-toggler-south {
border-width: 0 1px; /* left/right borders */
}
.ui-layout-toggler-west ,
.ui-layout-toggler-east {
border-width: 1px 0; /* top/bottom borders */
}
/* hide the toggler-button when the pane is 'slid open' */
.ui-layout-resizer-sliding .ui-layout-toggler {
display: none;
}
/*
* style the text we put INSIDE the togglers
*/
.ui-layout-toggler .ui-content {
color: #666;
font-size: 12px;
font-weight: bold;
line-height: 8px;
width: 100%;
padding-bottom: 0.35ex; /* to 'vertically center' text inside text-span */
}
.ui-layout-toggler .ui-content .fa{
line-height: 8px;
}
.ui-layout-toggler-north-closed .fa:before,
.ui-layout-toggler-south-open .fa:before {
content: "\f0d7";/* 下 */
}
.ui-layout-toggler-south-closed .fa:before,
.ui-layout-toggler-north-open .fa:before {
content: "\f0d8";/* 上 */
}
.ui-layout-toggler-west-closed .fa:before,
.ui-layout-toggler-east-open .fa:before {
content: "\f0da";/* 右 */
}
.ui-layout-toggler-east-closed .fa:before,
.ui-layout-toggler-west-open .fa:before {
content: "\f0d9";/* 左 */
}
/*
* PANE-MASKS
* these styles are hard-coded on mask elems, but are also
* included here as !important to ensure will overrides any generic styles
*/
.ui-layout-mask {
border: none !important;
padding: 0 !important;
margin: 0 !important;
overflow: hidden !important;
position: absolute !important;
opacity: 0 !important;
filter: Alpha(Opacity="0") !important;
}
.ui-layout-mask-inside-pane { /* masks always inside pane EXCEPT when pane is an iframe */
top: 0 !important;
left: 0 !important;
width: 100% !important;
height: 100% !important;
}
div.ui-layout-mask {} /* standard mask for iframes */
iframe.ui-layout-mask {} /* extra mask for objects/applets */
/*
* Default printing styles
*/
@media print {
/*
* Unless you want to print the layout as it appears onscreen,
* these html/body styles are needed to allow the content to 'flow'
*/
html {
height: auto !important;
overflow: visible !important;
}
body.ui-layout-container {
position: static !important;
top: auto !important;
bottom: auto !important;
left: auto !important;
right: auto !important;
/* only IE6 has container width & height set by Layout */
_width: auto !important;
_height: auto !important;
}
.ui-layout-resizer, .ui-layout-toggler {
display: none !important;
}
/*
* Default pane print styles disables positioning, borders and backgrounds.
* You can modify these styles however it suit your needs.
*/
.ui-layout-pane {
border: none !important;
background: transparent !important;
position: relative !important;
top: auto !important;
bottom: auto !important;
left: auto !important;
right: auto !important;
width: auto !important;
height: auto !important;
overflow: visible !important;
}
}

View File

@@ -1,5 +0,0 @@
eclipse.preferences.version=1
encoding//src/main/java=UTF-8
encoding//src/main/resources=UTF-8
encoding//src/test/java=UTF-8
encoding/<project>=UTF-8

View File

@@ -1,8 +0,0 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.7

View File

@@ -1,4 +0,0 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1

View File

@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="jeesite-module-core">
<wb-resource deploy-path="/" source-path="/src/main/java"/>
<wb-resource deploy-path="/" source-path="/src/main/resources"/>
</wb-module>
</project-modules>

View File

@@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
<fixed facet="jst.utility"/>
<fixed facet="java"/>
<installed facet="jst.utility" version="1.0"/>
<installed facet="java" version="1.7"/>
</faceted-project>

View File

@@ -1,2 +0,0 @@
disabled=06target
eclipse.preferences.version=1

View File

@@ -1,7 +0,0 @@
activeProfiles=
eclipse.preferences.version=1
fullBuildGoals=process-test-resources
resolveWorkspaceProjects=true
resourceFilterGoals=process-resources resources\:testResources
skipCompilerPlugin=true
version=1

File diff suppressed because it is too large Load Diff

View File

@@ -1,40 +1,4 @@
/* Drop Tables */
IF OBJECT_ID('[js_gen_table_column]') IS NOT NULL DROP TABLE [js_gen_table_column];
IF OBJECT_ID('[js_gen_table]') IS NOT NULL DROP TABLE [js_gen_table];
IF OBJECT_ID('[js_sys_company_office]') IS NOT NULL DROP TABLE [js_sys_company_office];
IF OBJECT_ID('[js_sys_employee_post]') IS NOT NULL DROP TABLE [js_sys_employee_post];
IF OBJECT_ID('[js_sys_user_data_scope]') IS NOT NULL DROP TABLE [js_sys_user_data_scope];
IF OBJECT_ID('[js_sys_user_role]') IS NOT NULL DROP TABLE [js_sys_user_role];
IF OBJECT_ID('[js_sys_user]') IS NOT NULL DROP TABLE [js_sys_user];
IF OBJECT_ID('[js_sys_employee]') IS NOT NULL DROP TABLE [js_sys_employee];
IF OBJECT_ID('[js_sys_company]') IS NOT NULL DROP TABLE [js_sys_company];
IF OBJECT_ID('[js_sys_area]') IS NOT NULL DROP TABLE [js_sys_area];
IF OBJECT_ID('[js_sys_config]') IS NOT NULL DROP TABLE [js_sys_config];
IF OBJECT_ID('[js_sys_dict_data]') IS NOT NULL DROP TABLE [js_sys_dict_data];
IF OBJECT_ID('[js_sys_dict_type]') IS NOT NULL DROP TABLE [js_sys_dict_type];
IF OBJECT_ID('[js_sys_file_upload]') IS NOT NULL DROP TABLE [js_sys_file_upload];
IF OBJECT_ID('[js_sys_file_entity]') IS NOT NULL DROP TABLE [js_sys_file_entity];
IF OBJECT_ID('[js_sys_job_log]') IS NOT NULL DROP TABLE [js_sys_job_log];
IF OBJECT_ID('[js_sys_job]') IS NOT NULL DROP TABLE [js_sys_job];
IF OBJECT_ID('[js_sys_lang]') IS NOT NULL DROP TABLE [js_sys_lang];
IF OBJECT_ID('[js_sys_log]') IS NOT NULL DROP TABLE [js_sys_log];
IF OBJECT_ID('[js_sys_role_menu]') IS NOT NULL DROP TABLE [js_sys_role_menu];
IF OBJECT_ID('[js_sys_menu]') IS NOT NULL DROP TABLE [js_sys_menu];
IF OBJECT_ID('[js_sys_module]') IS NOT NULL DROP TABLE [js_sys_module];
IF OBJECT_ID('[js_sys_msg_inner_record]') IS NOT NULL DROP TABLE [js_sys_msg_inner_record];
IF OBJECT_ID('[js_sys_msg_inner]') IS NOT NULL DROP TABLE [js_sys_msg_inner];
IF OBJECT_ID('[js_sys_msg_push]') IS NOT NULL DROP TABLE [js_sys_msg_push];
IF OBJECT_ID('[js_sys_msg_pushed]') IS NOT NULL DROP TABLE [js_sys_msg_pushed];
IF OBJECT_ID('[js_sys_msg_template]') IS NOT NULL DROP TABLE [js_sys_msg_template];
IF OBJECT_ID('[js_sys_office]') IS NOT NULL DROP TABLE [js_sys_office];
IF OBJECT_ID('[js_sys_post]') IS NOT NULL DROP TABLE [js_sys_post];
IF OBJECT_ID('[js_sys_role_data_scope]') IS NOT NULL DROP TABLE [js_sys_role_data_scope];
IF OBJECT_ID('[js_sys_role]') IS NOT NULL DROP TABLE [js_sys_role];
/* Create Tables */
@@ -292,7 +256,7 @@ CREATE TABLE [js_sys_file_entity]
[file_path] nvarchar(1000) NOT NULL,
[file_content_type] varchar(200) NOT NULL,
[file_extension] varchar(100) NOT NULL,
[file_size] decimal(38) NOT NULL,
[file_size] decimal(31) NOT NULL,
PRIMARY KEY ([file_id])
);

View File

@@ -1,41 +1,5 @@
SET SESSION FOREIGN_KEY_CHECKS=0;
/* Drop Tables */
DROP TABLE IF EXISTS js_gen_table_column;
DROP TABLE IF EXISTS js_gen_table;
DROP TABLE IF EXISTS js_sys_company_office;
DROP TABLE IF EXISTS js_sys_employee_post;
DROP TABLE IF EXISTS js_sys_user_data_scope;
DROP TABLE IF EXISTS js_sys_user_role;
DROP TABLE IF EXISTS js_sys_user;
DROP TABLE IF EXISTS js_sys_employee;
DROP TABLE IF EXISTS js_sys_company;
DROP TABLE IF EXISTS js_sys_area;
DROP TABLE IF EXISTS js_sys_config;
DROP TABLE IF EXISTS js_sys_dict_data;
DROP TABLE IF EXISTS js_sys_dict_type;
DROP TABLE IF EXISTS js_sys_file_upload;
DROP TABLE IF EXISTS js_sys_file_entity;
DROP TABLE IF EXISTS js_sys_job_log;
DROP TABLE IF EXISTS js_sys_job;
DROP TABLE IF EXISTS js_sys_lang;
DROP TABLE IF EXISTS js_sys_log;
DROP TABLE IF EXISTS js_sys_role_menu;
DROP TABLE IF EXISTS js_sys_menu;
DROP TABLE IF EXISTS js_sys_module;
DROP TABLE IF EXISTS js_sys_msg_inner_record;
DROP TABLE IF EXISTS js_sys_msg_inner;
DROP TABLE IF EXISTS js_sys_msg_push;
DROP TABLE IF EXISTS js_sys_msg_pushed;
DROP TABLE IF EXISTS js_sys_msg_template;
DROP TABLE IF EXISTS js_sys_office;
DROP TABLE IF EXISTS js_sys_post;
DROP TABLE IF EXISTS js_sys_role_data_scope;
DROP TABLE IF EXISTS js_sys_role;
/* Create Tables */
@@ -293,7 +257,7 @@ CREATE TABLE js_sys_file_entity
file_path varchar(1000) NOT NULL COMMENT '文件相对路径',
file_content_type varchar(200) NOT NULL COMMENT '文件内容类型',
file_extension varchar(100) NOT NULL COMMENT '文件后缀扩展名',
file_size decimal(38) NOT NULL COMMENT '文件大小(单位B)',
file_size decimal(31) NOT NULL COMMENT '文件大小(单位B)',
PRIMARY KEY (file_id),
UNIQUE (file_md5)
) COMMENT = '文件实体表';

View File

@@ -1,13 +0,0 @@
-- 打开 my.ini 给 [mysqld] 增加如下配置:
-- sql_mode=ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION
set global read_only=0;
create user 'jeesite'@'%' identified by 'jeesite';
create database jeesite DEFAULT CHARSET utf8 COLLATE utf8_general_ci;
grant all privileges on jeesite.* to 'jeesite'@'%' identified by 'jeesite';
flush privileges;

View File

@@ -1,40 +1,4 @@
/* Drop Tables */
DROP TABLE js_gen_table_column CASCADE CONSTRAINTS;
DROP TABLE js_gen_table CASCADE CONSTRAINTS;
DROP TABLE js_sys_company_office CASCADE CONSTRAINTS;
DROP TABLE js_sys_employee_post CASCADE CONSTRAINTS;
DROP TABLE js_sys_user_data_scope CASCADE CONSTRAINTS;
DROP TABLE js_sys_user_role CASCADE CONSTRAINTS;
DROP TABLE js_sys_user CASCADE CONSTRAINTS;
DROP TABLE js_sys_employee CASCADE CONSTRAINTS;
DROP TABLE js_sys_company CASCADE CONSTRAINTS;
DROP TABLE js_sys_area CASCADE CONSTRAINTS;
DROP TABLE js_sys_config CASCADE CONSTRAINTS;
DROP TABLE js_sys_dict_data CASCADE CONSTRAINTS;
DROP TABLE js_sys_dict_type CASCADE CONSTRAINTS;
DROP TABLE js_sys_file_upload CASCADE CONSTRAINTS;
DROP TABLE js_sys_file_entity CASCADE CONSTRAINTS;
DROP TABLE js_sys_job_log CASCADE CONSTRAINTS;
DROP TABLE js_sys_job CASCADE CONSTRAINTS;
DROP TABLE js_sys_lang CASCADE CONSTRAINTS;
DROP TABLE js_sys_log CASCADE CONSTRAINTS;
DROP TABLE js_sys_role_menu CASCADE CONSTRAINTS;
DROP TABLE js_sys_menu CASCADE CONSTRAINTS;
DROP TABLE js_sys_module CASCADE CONSTRAINTS;
DROP TABLE js_sys_msg_inner_record CASCADE CONSTRAINTS;
DROP TABLE js_sys_msg_inner CASCADE CONSTRAINTS;
DROP TABLE js_sys_msg_push CASCADE CONSTRAINTS;
DROP TABLE js_sys_msg_pushed CASCADE CONSTRAINTS;
DROP TABLE js_sys_msg_template CASCADE CONSTRAINTS;
DROP TABLE js_sys_office CASCADE CONSTRAINTS;
DROP TABLE js_sys_post CASCADE CONSTRAINTS;
DROP TABLE js_sys_role_data_scope CASCADE CONSTRAINTS;
DROP TABLE js_sys_role CASCADE CONSTRAINTS;
/* Create Tables */
@@ -292,7 +256,7 @@ CREATE TABLE js_sys_file_entity
file_path nvarchar2(1000) NOT NULL,
file_content_type varchar2(200) NOT NULL,
file_extension varchar2(100) NOT NULL,
file_size number(38) NOT NULL,
file_size number(31) NOT NULL,
PRIMARY KEY (file_id)
);

View File

@@ -1,15 +0,0 @@
create user jeesite
identified by jeesite
quota unlimited on users;
grant connect,resource,create session,select any table,
create any view,create any table,create any index,
drop any table,drop any view,drop any index
to jeesite;
-- 多数据源分布式事务下需要对目标用户进行如下授权否则会提示错误ResourceException: Error in recovery
grant select on sys.dba_pending_transactions to jeesite;
grant select on sys.pending_trans$ to jeesite;
grant select on sys.dba_2pc_pending to jeesite;
grant execute on sys.dbms_system to jeesite;

View File

@@ -1,40 +1,4 @@
/* Drop Tables */
DROP TABLE IF EXISTS js_gen_table_column;
DROP TABLE IF EXISTS js_gen_table;
DROP TABLE IF EXISTS js_sys_company_office;
DROP TABLE IF EXISTS js_sys_employee_post;
DROP TABLE IF EXISTS js_sys_user_data_scope;
DROP TABLE IF EXISTS js_sys_user_role;
DROP TABLE IF EXISTS js_sys_user;
DROP TABLE IF EXISTS js_sys_employee;
DROP TABLE IF EXISTS js_sys_company;
DROP TABLE IF EXISTS js_sys_area;
DROP TABLE IF EXISTS js_sys_config;
DROP TABLE IF EXISTS js_sys_dict_data;
DROP TABLE IF EXISTS js_sys_dict_type;
DROP TABLE IF EXISTS js_sys_file_upload;
DROP TABLE IF EXISTS js_sys_file_entity;
DROP TABLE IF EXISTS js_sys_job_log;
DROP TABLE IF EXISTS js_sys_job;
DROP TABLE IF EXISTS js_sys_lang;
DROP TABLE IF EXISTS js_sys_log;
DROP TABLE IF EXISTS js_sys_role_menu;
DROP TABLE IF EXISTS js_sys_menu;
DROP TABLE IF EXISTS js_sys_module;
DROP TABLE IF EXISTS js_sys_msg_inner_record;
DROP TABLE IF EXISTS js_sys_msg_inner;
DROP TABLE IF EXISTS js_sys_msg_push;
DROP TABLE IF EXISTS js_sys_msg_pushed;
DROP TABLE IF EXISTS js_sys_msg_template;
DROP TABLE IF EXISTS js_sys_office;
DROP TABLE IF EXISTS js_sys_post;
DROP TABLE IF EXISTS js_sys_role_data_scope;
DROP TABLE IF EXISTS js_sys_role;
/* Create Tables */
@@ -292,7 +256,7 @@ CREATE TABLE js_sys_file_entity
file_path varchar(1000) NOT NULL,
file_content_type varchar(200) NOT NULL,
file_extension varchar(100) NOT NULL,
file_size decimal(38) NOT NULL,
file_size decimal(31) NOT NULL,
PRIMARY KEY (file_id)
) WITHOUT OIDS;

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.jeesite</groupId>
<artifactId>jeesite-parent</artifactId>
<version>4.0.7-SNAPSHOT</version>
<version>4.0.8-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
@@ -58,42 +58,4 @@
<url>http://jeesite.com</url>
</organization>
<repositories>
<repository>
<id>aliyun-repos</id>
<name>Aliyun Repository</name>
<url>http://maven.aliyun.com/nexus/content/groups/public</url>
<releases><enabled>true</enabled></releases>
<snapshots><enabled>false</enabled></snapshots>
</repository>
<repository>
<id>sonatype-repos</id>
<name>Sonatype Repository</name>
<url>https://oss.sonatype.org/content/groups/public</url>
<releases><enabled>true</enabled></releases>
<snapshots><enabled>false</enabled></snapshots>
</repository>
<repository>
<id>sonatype-repos-s</id>
<name>Sonatype Repository</name>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases><enabled>false</enabled></releases>
<snapshots><enabled>true</enabled></snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>aliyun-repos</id>
<name>Aliyun Repository</name>
<url>http://maven.aliyun.com/nexus/content/groups/public</url>
<releases><enabled>true</enabled></releases>
<snapshots><enabled>false</enabled></snapshots>
</pluginRepository>
</pluginRepositories>
</project>

View File

@@ -53,6 +53,16 @@ public class OfficeController extends BaseController {
return officeService.get(officeCode, isNewRecord);
}
/**
* 机构列表
* @param office
*/
@RequiresPermissions("sys:office:view")
@RequestMapping(value = "index")
public String index(Office office, Model model) {
return REDIRECT + adminPath + "/sys/office/list";
}
/**
* 机构列表
* @param office

View File

@@ -367,7 +367,6 @@ public class EmpUserController extends BaseController {
empUser.setRoleCode(roleCode);
empUser.setStatus(User.STATUS_NORMAL);
empUser.setUserType(User.USER_TYPE_EMPLOYEE);
empUser.setMgrType(User.MGR_TYPE_NOT_ADMIN);
if (!(isAll != null && isAll)) {
empUserService.addDataScopeFilter(empUser);
}

View File

@@ -183,7 +183,7 @@ user:
# 菜单管理
menu:
# 根据模块状态去更新相连的菜单状态仅作为微服务时设为false
updateStatusByModuleStatus: true
updateStatusByModuleStatus: false
# 国际化管理(专业版+
lang:
@@ -431,7 +431,7 @@ web:
# 自定义正则表达式验证(主键、登录名)
validator:
id: '[a-zA-Z0-9_\-/\u4e00-\u9fa5]{0,64}'
id: '[a-zA-Z0-9_\-/#\u4e00-\u9fa5]{0,64}'
user.loginCode: '[a-zA-Z0-9_\u4e00-\u9fa5]{4,20}'
# 关闭核心模块的Web功能仅作为微服务时设为false

View File

@@ -5,4 +5,5 @@
4.0.4
4.0.5
4.0.6
4.0.7
4.0.7
4.0.8

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -50,7 +50,7 @@ else {
<% if (@Global.getConfigToBoolean('error.page.printErrorInfo', 'true')){ %>
<div class="box mt20">
${@StringUtils.toHtml(@ExceptionUtils.getStackTraceAsString(ex))}<br/>
此异常信息若不想输出,可打开jeesite.yml文件设置error.page.printErrorInfo=false即可
此异常信息若不想输出,可打开 'application.yml' 文件,设置 'error.page.printErrorInfo: false' 即可
</div>
<% } %>
<% } %>

File diff suppressed because one or more lines are too long

View File

@@ -1,153 +1,154 @@
<% layout('/layouts/default.html', {title: '切换主题风格'}){ %>
<% layout('/layouts/default.html', {title:'切换主题风格'}){ %>
<link rel="stylesheet" href="${ctxStatic}/icheck/1.0/square/blue.css?${_version}">
<style>
.list-unstyled{margin:10px;}
.list-unstyled{margin:10px;}
.full-opacity-hover{opacity:1;filter:alpha(opacity=1);border:1px solid #fff}
.full-opacity-hover:hover{border:1px solid #f00;}
.full-opacity-hover:hover{border:1px solid #f00;}
</style>
<ul class="list-unstyled clearfix">
<li style="float:left; width: 33.33333%; padding: 5px;"><a href="javascript:void(0)" data-skin="skin-blue" style="display: block; box-shadow: 0 0 3px rgba(0,0,0,0.4)" class="clearfix full-opacity-hover">
<div>
<span style="display:block; width: 20%; float: left; height: 15px; background: #367fa9"></span><span class="bg-light-blue" style="display:block; width: 80%; float: left; height: 15px;"></span>
</div>
<div>
<span style="display:block; width: 20%; float: left; height: 35px; background: #222d32"></span><span style="display:block; width: 80%; float: left; height: 35px; background: #f4f5f7"></span>
</div>
</a>
<p class="text-center no-margin">
</p>
<li style="float:left;width:33.33333%;padding:5px;">
<a href="javascript:" data-skin="skin-blue" style="display:block;box-shadow:0 0 3px rgba(0,0,0,0.4)" class="clearfix full-opacity-hover">
<span style="display:block;width:20%;float:left;height:13px;" class="bg-light-blue-active"></span>
<span style="display:block;width:80%;float:left;height:13px;" class="bg-light-blue"></span>
<span style="display:block;width:20%;float:left;height:30px;background:#222d32"></span>
<span style="display:block;width:80%;float:left;height:30px;background:#f4f5f7"></span>
</a>
<p class="text-center no-margin"></p>
</li>
<li style="float:left; width: 33.33333%; padding: 5px;"><a href="javascript:void(0)" data-skin="skin-black" style="display: block; box-shadow: 0 0 3px rgba(0,0,0,0.4)" class="clearfix full-opacity-hover">
<div style="box-shadow: 0 0 2px rgba(0,0,0,0.1)" class="clearfix">
<span style="display:block; width: 20%; float: left; height: 15px; background: #fefefe"></span><span style="display:block; width: 80%; float: left; height: 15px; background: #fefefe"></span>
</div>
<div>
<span style="display:block; width: 20%; float: left; height: 35px; background: #222"></span><span style="display:block; width: 80%; float: left; height: 35px; background: #f4f5f7"></span>
</div>
</a>
<p class="text-center no-margin">
</p>
<li style="float:left;width:33.33333%;padding:5px;display:none;">
<a href="javascript:" data-skin="skin-black" style="display:block;box-shadow:0 0 3px rgba(0,0,0,0.4)" class="clearfix full-opacity-hover">
<span style="display:block;width:20%;float:left;height:13px;background:#fefefe"></span>
<span style="display:block;width:80%;float:left;height:13px;background:#fefefe"></span>
<span style="display:block;width:20%;float:left;height:30px;background:#222d32"></span>
<span style="display:block;width:80%;float:left;height:30px;background:#f4f5f7"></span>
</a>
<p class="text-center no-margin"></p>
</li>
<li style="float:left; width: 33.33333%; padding: 5px;"><a href="javascript:void(0)" data-skin="skin-purple" style="display: block; box-shadow: 0 0 3px rgba(0,0,0,0.4)" class="clearfix full-opacity-hover">
<div>
<span style="display:block; width: 20%; float: left; height: 15px;" class="bg-purple-active"></span><span class="bg-purple" style="display:block; width: 80%; float: left; height: 15px;"></span>
</div>
<div>
<span style="display:block; width: 20%; float: left; height: 35px; background: #222d32"></span><span style="display:block; width: 80%; float: left; height: 35px; background: #f4f5f7"></span>
</div>
</a>
<p class="text-center no-margin">
</p>
<li style="float:left;width:33.33333%;padding:5px;">
<a href="javascript:" data-skin="skin-black2" style="display:block;box-shadow:0 0 3px rgba(0,0,0,0.4)" class="clearfix full-opacity-hover">
<span style="display:block;width:20%;float:left;height:13px;background:#303643"></span>
<span style="display:block;width:80%;float:left;height:13px;background:#303643"></span>
<span style="display:block;width:20%;float:left;height:30px;background:#222d32"></span>
<span style="display:block;width:80%;float:left;height:30px;background:#f4f5f7"></span>
</a>
<p class="text-center no-margin">黑(经典)</p>
</li>
<li style="float:left; width: 33.33333%; padding: 5px;"><a href="javascript:void(0)" data-skin="skin-green" style="display: block; box-shadow: 0 0 3px rgba(0,0,0,0.4)" class="clearfix full-opacity-hover">
<div>
<span style="display:block; width: 20%; float: left; height: 15px;" class="bg-green-active"></span><span class="bg-green" style="display:block; width: 80%; float: left; height: 15px;"></span>
</div>
<div>
<span style="display:block; width: 20%; float: left; height: 35px; background: #222d32"></span><span style="display:block; width: 80%; float: left; height: 35px; background: #f4f5f7"></span>
</div>
</a>
<p class="text-center no-margin">
绿
</p>
<li style="float:left;width:33.33333%;padding:5px;">
<a href="javascript:" data-skin="skin-purple" style="display:block;box-shadow:0 0 3px rgba(0,0,0,0.4)" class="clearfix full-opacity-hover">
<span style="display:block;width:20%;float:left;height:13px;" class="bg-purple-active"></span>
<span style="display:block;width:80%;float:left;height:13px;" class="bg-purple"></span>
<span style="display:block;width:20%;float:left;height:30px;background:#222d32"></span>
<span style="display:block;width:80%;float:left;height:30px;background:#f4f5f7"></span>
</a>
<p class="text-center no-margin"></p>
</li>
<li style="float:left; width: 33.33333%; padding: 5px;"><a href="javascript:void(0)" data-skin="skin-red" style="display: block; box-shadow: 0 0 3px rgba(0,0,0,0.4)" class="clearfix full-opacity-hover">
<div>
<span style="display:block; width: 20%; float: left; height: 15px;" class="bg-red-active"></span><span class="bg-red" style="display:block; width: 80%; float: left; height: 15px;"></span>
</div>
<div>
<span style="display:block; width: 20%; float: left; height: 35px; background: #222d32"></span><span style="display:block; width: 80%; float: left; height: 35px; background: #f4f5f7"></span>
</div>
</a>
<p class="text-center no-margin">
</p>
<li style="float:left;width:33.33333%;padding:5px;">
<a href="javascript:" data-skin="skin-green" style="display:block;box-shadow:0 0 3px rgba(0,0,0,0.4)" class="clearfix full-opacity-hover">
<span style="display:block;width:20%;float:left;height:13px;" class="bg-green-active"></span>
<span style="display:block;width:80%;float:left;height:13px;" class="bg-green"></span>
<span style="display:block;width:20%;float:left;height:30px;background:#222d32"></span>
<span style="display:block;width:80%;float:left;height:30px;background:#f4f5f7"></span>
</a>
<p class="text-center no-margin">绿</p>
</li>
<li style="float:left; width: 33.33333%; padding: 5px;"><a href="javascript:void(0)" data-skin="skin-yellow" style="display: block; box-shadow: 0 0 3px rgba(0,0,0,0.4)" class="clearfix full-opacity-hover">
<div>
<span style="display:block; width: 20%; float: left; height: 15px;" class="bg-yellow-active"></span><span class="bg-yellow" style="display:block; width: 80%; float: left; height: 15px;"></span>
</div>
<div>
<span style="display:block; width: 20%; float: left; height: 35px; background: #222d32"></span><span style="display:block; width: 80%; float: left; height: 35px; background: #f4f5f7"></span>
</div>
</a>
<p class="text-center no-margin">
</p>
<li style="float:left;width:33.33333%;padding:5px;">
<a href="javascript:" data-skin="skin-red" style="display:block;box-shadow:0 0 3px rgba(0,0,0,0.4)" class="clearfix full-opacity-hover">
<span style="display:block;width:20%;float:left;height:13px;" class="bg-red-active"></span>
<span style="display:block;width:80%;float:left;height:13px;" class="bg-red"></span>
<span style="display:block;width:20%;float:left;height:30px;background:#222d32"></span>
<span style="display:block;width:80%;float:left;height:30px;background:#f4f5f7"></span>
</a>
<p class="text-center no-margin"></p>
</li>
<li style="float:left; width: 33.33333%; padding: 5px;"><a href="javascript:void(0)" data-skin="skin-blue-light" style="display: block; box-shadow: 0 0 3px rgba(0,0,0,0.4)" class="clearfix full-opacity-hover">
<div>
<span style="display:block; width: 20%; float: left; height: 15px; background: #367fa9"></span><span class="bg-light-blue" style="display:block; width: 80%; float: left; height: 15px;"></span>
</div>
<div>
<span style="display:block; width: 20%; float: left; height: 35px; background: #f9fafc"></span><span style="display:block; width: 80%; float: left; height: 35px; background: #f4f5f7"></span>
</div>
</a>
<p class="text-center no-margin" style="font-size: 12px">
蓝灰
</p>
<li style="float:left;width:33.33333%;padding:5px;">
<a href="javascript:" data-skin="skin-yellow" style="display:block;box-shadow:0 0 3px rgba(0,0,0,0.4)" class="clearfix full-opacity-hover">
<span style="display:block;width:20%;float:left;height:13px;" class="bg-yellow-active"></span>
<span style="display:block;width:80%;float:left;height:13px;" class="bg-yellow"></span>
<span style="display:block;width:20%;float:left;height:30px;background:#222d32"></span>
<span style="display:block;width:80%;float:left;height:30px;background:#f4f5f7"></span>
</a>
<p class="text-center no-margin"></p>
</li>
<li style="float:left; width: 33.33333%; padding: 5px;"><a href="javascript:void(0)" data-skin="skin-black-light" style="display: block; box-shadow: 0 0 3px rgba(0,0,0,0.4)" class="clearfix full-opacity-hover">
<div style="box-shadow: 0 0 2px rgba(0,0,0,0.1)" class="clearfix">
<span style="display:block; width: 20%; float: left; height: 15px; background: #fefefe"></span><span style="display:block; width: 80%; float: left; height: 15px; background: #fefefe"></span>
</div>
<div>
<span style="display:block; width: 20%; float: left; height: 35px; background: #f9fafc"></span><span style="display:block; width: 80%; float: left; height: 35px; background: #f4f5f7"></span>
</div>
</a>
<p class="text-center no-margin" style="font-size: 12px">
白灰
</p>
<li style="float:left;width:33.33333%;padding:5px;">
<a href="javascript:" data-skin="skin-blue-light" style="display:block;box-shadow:0 0 3px rgba(0,0,0,0.4)" class="clearfix full-opacity-hover">
<span style="display:block;width:20%;float:left;height:13px;background:#254b83;"></span>
<span style="display:block;width:80%;float:left;height:13px;background:#2a579a;"></span>
<span style="display:block;width:20%;float:left;height:30px;background:#f9fafc"></span>
<span style="display:block;width:80%;float:left;height:30px;background:#f4f5f7"></span>
</a>
<p class="text-center no-margin">蓝灰(经典)</p>
</li>
<li style="float:left; width: 33.33333%; padding: 5px;"><a href="javascript:void(0)" data-skin="skin-purple-light" style="display: block; box-shadow: 0 0 3px rgba(0,0,0,0.4)" class="clearfix full-opacity-hover">
<div>
<span style="display:block; width: 20%; float: left; height: 15px;" class="bg-purple-active"></span><span class="bg-purple" style="display:block; width: 80%; float: left; height: 15px;"></span>
</div>
<div>
<span style="display:block; width: 20%; float: left; height: 35px; background: #f9fafc"></span><span style="display:block; width: 80%; float: left; height: 35px; background: #f4f5f7"></span>
</div>
</a>
<p class="text-center no-margin" style="font-size: 12px">
紫灰
</p>
<li style="float:left;width:33.33333%;padding:5px;display:none;">
<a href="javascript:" data-skin="skin-black-light" style="display:block;box-shadow:0 0 3px rgba(0,0,0,0.4)" class="clearfix full-opacity-hover">
<span style="display:block;width:20%;float:left;height:13px;background:#fefefe"></span>
<span style="display:block;width:80%;float:left;height:13px;background:#fefefe"></span>
<span style="display:block;width:20%;float:left;height:30px;background:#f9fafc"></span>
<span style="display:block;width:80%;float:left;height:30px;background:#f4f5f7"></span>
</a>
<p class="text-center no-margin">白灰</p>
</li>
<li style="float:left; width: 33.33333%; padding: 5px;"><a href="javascript:void(0)" data-skin="skin-green-light" style="display: block; box-shadow: 0 0 3px rgba(0,0,0,0.4)" class="clearfix full-opacity-hover">
<div>
<span style="display:block; width: 20%; float: left; height: 15px;" class="bg-green-active"></span><span class="bg-green" style="display:block; width: 80%; float: left; height: 15px;"></span>
</div>
<div>
<span style="display:block; width: 20%; float: left; height: 35px; background: #f9fafc"></span><span style="display:block; width: 80%; float: left; height: 35px; background: #f4f5f7"></span>
</div>
</a>
<p class="text-center no-margin" style="font-size: 12px">
绿灰
</p>
<li style="float:left;width:33.33333%;padding:5px;">
<a href="javascript:" data-skin="skin-black-light2" style="display:block;box-shadow:0 0 3px rgba(0,0,0,0.4)" class="clearfix full-opacity-hover">
<span style="display:block;width:20%;float:left;height:13px;background:#303643"></span>
<span style="display:block;width:80%;float:left;height:13px;background:#303643"></span>
<span style="display:block;width:20%;float:left;height:30px;background:#f9fafc"></span>
<span style="display:block;width:80%;float:left;height:30px;background:#f4f5f7"></span>
</a>
<p class="text-center no-margin">黑灰</p>
</li>
<li style="float:left; width: 33.33333%; padding: 5px;"><a href="javascript:void(0)" data-skin="skin-red-light" style="display: block; box-shadow: 0 0 3px rgba(0,0,0,0.4)" class="clearfix full-opacity-hover">
<div>
<span style="display:block; width: 20%; float: left; height: 15px;" class="bg-red-active"></span><span class="bg-red" style="display:block; width: 80%; float: left; height: 15px;"></span>
</div>
<div>
<span style="display:block; width: 20%; float: left; height: 35px; background: #f9fafc"></span><span style="display:block; width: 80%; float: left; height: 35px; background: #f4f5f7"></span>
</div>
</a>
<p class="text-center no-margin" style="font-size: 12px">
红灰
</p>
<li style="float:left;width:33.33333%;padding:5px;">
<a href="javascript:" data-skin="skin-purple-light" style="display:block;box-shadow:0 0 3px rgba(0,0,0,0.4)" class="clearfix full-opacity-hover">
<span style="display:block;width:20%;float:left;height:13px;" class="bg-purple-active"></span>
<span style="display:block;width:80%;float:left;height:13px;" class="bg-purple"></span>
<span style="display:block;width:20%;float:left;height:30px;background:#f9fafc"></span>
<span style="display:block;width:80%;float:left;height:30px;background:#f4f5f7"></span>
</a>
<p class="text-center no-margin">紫灰</p>
</li>
<li style="float:left; width: 33.33333%; padding: 5px;"><a href="javascript:void(0)" data-skin="skin-yellow-light" style="display: block; box-shadow: 0 0 3px rgba(0,0,0,0.4)" class="clearfix full-opacity-hover">
<div>
<span style="display:block; width: 20%; float: left; height: 15px;" class="bg-yellow-active"></span><span class="bg-yellow" style="display:block; width: 80%; float: left; height: 15px;"></span>
</div>
<div>
<span style="display:block; width: 20%; float: left; height: 35px; background: #f9fafc"></span><span style="display:block; width: 80%; float: left; height: 35px; background: #f4f5f7"></span>
</div>
</a>
<p class="text-center no-margin" style="font-size: 12px">
黄灰
</p>
<li style="float:left;width:33.33333%;padding:5px;">
<a href="javascript:" data-skin="skin-green-light" style="display:block;box-shadow:0 0 3px rgba(0,0,0,0.4)" class="clearfix full-opacity-hover">
<span style="display:block;width:20%;float:left;height:13px;" class="bg-green-active"></span>
<span style="display:block;width:80%;float:left;height:13px;" class="bg-green"></span>
<span style="display:block;width:20%;float:left;height:30px;background:#f9fafc"></span>
<span style="display:block;width:80%;float:left;height:30px;background:#f4f5f7"></span>
</a>
<p class="text-center no-margin">绿灰</p>
</li>
<li style="float:left;width:33.33333%;padding:5px;">
<a href="javascript:" data-skin="skin-red-light" style="display:block;box-shadow:0 0 3px rgba(0,0,0,0.4)" class="clearfix full-opacity-hover">
<span style="display:block;width:20%;float:left;height:13px;" class="bg-red-active"></span>
<span style="display:block;width:80%;float:left;height:13px;" class="bg-red"></span>
<span style="display:block;width:20%;float:left;height:30px;background:#f9fafc"></span>
<span style="display:block;width:80%;float:left;height:30px;background:#f4f5f7"></span>
</a>
<p class="text-center no-margin">红灰</p>
</li>
<li style="float:left;width:33.33333%;padding:5px;">
<a href="javascript:" data-skin="skin-yellow-light" style="display:block;box-shadow:0 0 3px rgba(0,0,0,0.4)" class="clearfix full-opacity-hover">
<span style="display:block;width:20%;float:left;height:13px;" class="bg-yellow-active"></span>
<span style="display:block;width:80%;float:left;height:13px;" class="bg-yellow"></span>
<span style="display:block;width:20%;float:left;height:30px;background:#f9fafc"></span>
<span style="display:block;width:80%;float:left;height:30px;background:#f4f5f7"></span>
</a>
<p class="text-center no-margin">黄灰</p>
</li>
<li style="float:left;width:33.33333%;padding:5px;">
<a href="javascript:" data-skin="skin-blue2" style="display:block;box-shadow:0 0 3px rgba(0,0,0,0.4)" class="clearfix full-opacity-hover">
<span style="display:block;width:20%;float:left;height:13px;background:#1648ab"></span>
<span style="display:block;width:80%;float:left;height:13px;background:#1951be"></span>
<span style="display:block;width:20%;float:left;height:30px;background:#f9fafc"></span>
<span style="display:block;width:80%;float:left;height:30px;background:#f4f5f7"></span>
</a>
<p class="text-center no-margin">亮蓝(新)</p>
</li>
<li style="float:left;width:33.33333%;padding:5px;">
<a href="javascript:" data-skin="skin-blue-light2" style="display:block;box-shadow:0 0 3px rgba(0,0,0,0.4)" class="clearfix full-opacity-hover">
<span style="display:block;width:20%;float:left;height:13px;background:#1681e5"></span>
<span style="display:block;width:80%;float:left;height:13px;background:#1890ff"></span>
<span style="display:block;width:20%;float:left;height:30px;background:#f9fafc"></span>
<span style="display:block;width:80%;float:left;height:30px;background:#f4f5f7"></span>
</a>
<p class="text-center no-margin">浅蓝(新)</p>
</li>
</ul>
<% } %>

View File

@@ -1,2 +1,6 @@
<% include('/include/csslibs.html', {libs: libs!}){} %>
<link rel="stylesheet" href="${ctxStatic}/common/common.css?${_version}">
<% include('/include/csslibs.html', {libs: libs!}){}
// 获取当前皮肤样式名称详见jeesite-common项目下的static/adminlte/css/skins目录
var defaultSkinName = @Global.getConfig('sys.index.skinName', 'skin-blue-light');
var skinName = cookie('skinName_'+session.userCode, false, defaultSkinName); %>
<link rel="stylesheet" href="${ctxStatic}/adminlte/css/skins/${skinName}.css?${_version}">
<link rel="stylesheet" href="${ctxStatic}/common/common.css?${_version}">

View File

@@ -1,8 +1,4 @@
<%
// 默认皮肤样式名称详见jeesite-common项目下的static/adminlte/css/skins目录
var defaultSkinName = @Global.getConfig('sys.index.skinName', 'skin-blue-light');
// 从cookie里获取样式名取不到使用默认样式
var skinName = cookie('skinName_'+user.userCode, false, defaultSkinName);
// 侧边栏的默认显示样式1默认显示侧边栏2默认折叠侧边栏
var sidebarStyle = @Global.getConfig('sys.index.sidebarStyle', '1');
var sidebarCollapse = (sidebarStyle == '2' ? 'sidebar-collapse' : '');
@@ -11,7 +7,6 @@ var bodyClass = 'fixed noscroll2 sidebar-mini ' + sidebarCollapse;
<% layout('/layouts/default.html', {title: '', bodyClass: bodyClass, libs: ['tabPage']}){ %>
<% include('/include/upgrade.html'){} // 如果客户浏览器版本过低,则显示浏览器升级提示。 %>
<link rel="stylesheet" href="${ctxStatic}/jquery-toastr/2.0/toastr.min.css?${_version}">
<link rel="stylesheet" href="${ctxStatic}/adminlte/css/skins/${skinName}.css?${_version}">
<link rel="stylesheet" href="${ctxStatic}/modules/sys/sysIndex.css?${_version}">
<header class="main-header">
<% include('sysIndex/topMenu.html'){} %>

View File

@@ -9,8 +9,8 @@
</a><%-->*/%>
<div class="navbar-custom-menu">
<ul class="nav navbar-nav">
<% if(__info_type == '0'){ %>
<li><a href="http://jeesite.com" target="_blank"><i class="fa fa-diamond"></i> 官方网站</a></li>
<% if(__info_type == '0' || __info_type == '9'){ %>
<li><a href="http://jeesite.com" target="_blank"><i class="fa fa-diamond"></i> JeeSite</a></li>
<% } %>
<li><a href="javascript:" id="fullScreen" title="${text('全屏')}"><i class="fa fa-arrows-alt"></i></a></li>
<li><a href="javascript:" id="switchSkin" title="${text('切换主题')}" style="margin-top:-1px;"><i class="fa fa-dashboard"></i></a></li>

View File

@@ -11,16 +11,18 @@
<div class="login-box-body">
<#form:form id="loginForm" model="${user!}" action="${ctx}/login" method="post">
<div class="form-group has-feedback">
<span class="glyphicon glyphicon-user form-control-feedback" title="${text('登录账号')}"></span>
<span class="icon-user form-control-feedback" title="${text('登录账号')}"></span>
<#form:input type="text" name="username" class="form-control required"
data-msg-required="${text('请填写登录账号.')}" placeholder="${text('登录账号')}"
value="${cookie('rememberUserCode')}"/>
</div>
<div class="form-group has-feedback">
<span class="glyphicon glyphicon-lock form-control-feedback"
<span class="icon-lock form-control-feedback"
title="${text('登录密码,鼠标按下显示密码')}"
onmousedown="$('#password').attr('type','text')"
onmouseup="$('#password').attr('type','password')"></span>
onmouseup="$('#password').attr('type','password')"
onmouseenter="$(this).removeClass('icon-lock').addClass('icon-eye')"
onmouseout="$(this).removeClass('icon-eye').addClass('icon-lock')"></span>
<#form:input type="password" name="password" class="form-control required"
data-msg-required="${text('请填写登录密码.')}" placeholder="${text('登录密码')}" autocomplete="off"/>
</div>
@@ -40,10 +42,10 @@
<div class="mt5 icheck">
<label title="${text('公共场所慎用,下次不需要再填写帐号')}"><input type="checkbox"
name="rememberUserCode"${isNotBlank(cookie('rememberUserCode'))?' checked':''}
class="form-control" data-style="square-blue"> ${text('记住账号')}</label> &nbsp;
class="form-control" data-style="minimal-grey"> ${text('记住账号')}</label> &nbsp;
<label title="${text('公共场所慎用,下次不需要再填写帐号和密码')}"><input type="checkbox"
name="rememberMe"${isNotBlank(cookie('rememberMe'))?' checked':''}
class="form-control" data-style="square-blue"> ${text('记住密码')}</label>
class="form-control" data-style="minimal-grey"> ${text('记住密码')}</label>
</div>
</div>
<div class="form-group">

View File

@@ -1,4 +0,0 @@
eclipse.preferences.version=1
encoding//src/main/java=UTF-8
encoding//src/main/resources=UTF-8
encoding/<project>=UTF-8

View File

@@ -1,5 +0,0 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.7

View File

@@ -1,4 +0,0 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1

View File

@@ -1,2 +0,0 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8

View File

@@ -1,4 +0,0 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1

View File

@@ -1,7 +0,0 @@
activeProfiles=
eclipse.preferences.version=1
fullBuildGoals=process-test-resources
resolveWorkspaceProjects=true
resourceFilterGoals=process-resources resources\:testResources
skipCompilerPlugin=true
version=1

View File

@@ -6,12 +6,12 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.10.RELEASE</version>
<version>1.5.22.RELEASE</version>
</parent>
<groupId>com.jeesite</groupId>
<artifactId>jeesite-parent</artifactId>
<version>4.0.7-SNAPSHOT</version>
<version>4.0.8-SNAPSHOT</version>
<packaging>pom</packaging>
<name>JeeSite Parent</name>
@@ -34,13 +34,14 @@
<mybatis-spring.version>1.3.1</mybatis-spring.version>
<jsqlparser.version>1.1</jsqlparser.version>
<druid.version>1.1.10</druid.version>
<shiro.version>1.4.0</shiro.version>
<shiro.version>1.4.2</shiro.version>
<beetl.version>2.7-SNAPSHOT</beetl.version>
<ehcache-web.version>2.0.4</ehcache-web.version>
<quartz.version>2.2.3</quartz.version>
<!-- environment setting -->
<java.version>1.7</java.version>
<tomcat.version>8.5.57</tomcat.version>
<maven.test.skip>true</maven.test.skip>
<eclipse-plugin-download-sources>false</eclipse-plugin-download-sources>
<eclipse-plugin-download-javadocs>false</eclipse-plugin-download-javadocs>
@@ -67,6 +68,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version><!--$NO-MVN-MAN-VER$ -->
<configuration>
<showWarnings>true</showWarnings>
<!-- <compilerArguments> -->
@@ -80,6 +82,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.3.1</version><!--$NO-MVN-MAN-VER$ -->
<configuration>
<encoding>${project.build.sourceEncoding}</encoding>
<archive>
@@ -152,6 +155,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.1.1</version>
<configuration>
<packagingExcludes></packagingExcludes>
<warSourceExcludes></warSourceExcludes>
@@ -167,6 +171,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
<version>2.10</version>
<configuration>
<downloadSources>${eclipse-plugin-download-sources}</downloadSources>
<downloadJavadocs>${eclipse-plugin-download-javadocs}</downloadJavadocs>
@@ -206,11 +211,11 @@
</executions>
</plugin>
<!-- YUI Compressor (CSS/JS压缩) -->
<!-- JavaScript CSS Compress -->
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>yuicompressor-maven-plugin</artifactId>
<version>1.5.1</version>
<groupId>com.jeesite.maven</groupId>
<artifactId>compressor-maven-plugin</artifactId>
<version>1.0.0-SNAPSHOT</version>
<executions>
<execution>
<phase>prepare-package</phase>
@@ -233,20 +238,6 @@
<exclude>**/*.min.js</exclude>
<exclude>**/*.min.css</exclude>
</excludes>
<!-- <aggregations> -->
<!-- <aggregation> -->
<!-- <removeIncluded>true</removeIncluded> -->
<!-- <insertNewLine>true</insertNewLine> -->
<!-- <inputDir>${project.build.directory}/${project.build.finalName}</inputDir> -->
<!-- <output>${project.build.directory}/${project.build.finalName}/app/js/app.pack.js</output> -->
<!-- <includes> -->
<!-- <include>app/js/app*.js</include> -->
<!-- </includes> -->
<!-- <excludes> -->
<!-- <exclude>**/**min.js</exclude> -->
<!-- </excludes> -->
<!-- </aggregation> -->
<!-- </aggregations> -->
</configuration>
</plugin>
@@ -285,54 +276,39 @@
</organization>
<repositories>
<repository>
<id>aliyun-repos</id>
<name>Aliyun Repository</name>
<url>http://maven.aliyun.com/nexus/content/groups/public</url>
<url>https://maven.aliyun.com/repository/public</url>
<releases><enabled>true</enabled></releases>
<snapshots><enabled>false</enabled></snapshots>
</repository>
<repository>
<id>sonatype-repos</id>
<name>Sonatype Repository</name>
<url>https://oss.sonatype.org/content/groups/public</url>
<releases><enabled>true</enabled></releases>
<snapshots><enabled>false</enabled></snapshots>
<id>jeesite-repos</id>
<url>http://maven.jeesite.net/repository/maven-public</url>
</repository>
<repository>
<id>sonatype-repos-s</id>
<name>Sonatype Repository</name>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases><enabled>false</enabled></releases>
<snapshots><enabled>true</enabled></snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>aliyun-repos</id>
<name>Aliyun Repository</name>
<url>http://maven.aliyun.com/nexus/content/groups/public</url>
<url>https://maven.aliyun.com/repository/public</url>
<releases><enabled>true</enabled></releases>
<snapshots><enabled>false</enabled></snapshots>
</pluginRepository>
<pluginRepository>
<id>jeesite-repos</id>
<url>http://maven.jeesite.net/repository/maven-public</url>
</pluginRepository>
</pluginRepositories>
<profiles>
<!-- 打包项目 -->
<profile>
<id>javadoc</id>
<build>
<plugins>
<!-- Java Document Generate -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<groupId>com.jeesite.maven</groupId>
<artifactId>compressor-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
@@ -343,10 +319,9 @@
<id>package</id>
<build>
<plugins>
<!-- YUI Compressor (CSS/JS压缩) -->
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>yuicompressor-maven-plugin</artifactId>
<groupId>com.jeesite.maven</groupId>
<artifactId>compressor-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
@@ -357,21 +332,16 @@
<id>deploy</id>
<build>
<plugins>
<!-- YUI Compressor (CSS/JS压缩) -->
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>yuicompressor-maven-plugin</artifactId>
<groupId>com.jeesite.maven</groupId>
<artifactId>compressor-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
<distributionManagement>
<repository>
<id>sonatype-repos</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
</repository>
<snapshotRepository>
<id>sonatype-repos-s</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<id>jeesite-repos-s</id>
<url>http://maven.jeesite.net/repository/maven-snapshots</url>
</snapshotRepository>
</distributionManagement>
</profile>

View File

@@ -1,4 +0,0 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1

View File

@@ -5,7 +5,7 @@
<groupId>com.jeesite</groupId>
<artifactId>jeesite-root</artifactId>
<version>4.0.7-SNAPSHOT</version>
<version>4.0.8-SNAPSHOT</version>
<packaging>pom</packaging>
<name>JeeSite</name>

View File

@@ -1,15 +1,15 @@
# 服务条款
1. 不得应用于危害国家安全、荣誉和利益的行为,不能以任何形式用于非法为目的的行为。
2. 付费之前请确认已通过社区版了解和试用“产品”,并确认产品功能符合您的需求;付费之后源代码与社区版本相同,不另外提供源代码,您只需上传许可文件即可;许可文件一经发出概不提供退货服务。
3. 您必须了解使用本软件的风险,本软件无法保证100%没有漏洞,所以由软件漏洞造成的损失不予赔偿,也不承担任何因使用本软件而产生相关法律责任。请软件上线使用前进行足够的安全测试,以避免此问题发生
4. 基于JeeSite开发的项目或产品名称以及公司名称同意支持和参与JeeSite推广的案例公布。
5. 若您已经购买本产品许可文件或以其它方式获得的许可文件,将被视为您对本服务条款全部的完全接受,如果您未能遵守本服务条款,您的许可授权将被终止,许可的权利将被收回,同时您应承担相应法律责任
1. 不得将 JeeSite 应用于危害国家安全、荣誉和利益的行为,不能以任何形式用于非法为目的的行为。
2. 关于底层未开源代码,我们保证不添加任何数据安全性控制代码,请放心使用。但您也需了解使用本软件的风险,
是软件皆有漏洞,任何软件无法保证100%没有漏洞。请软件上线使用前进行足够的安全测。
3. 付费之前请确认已通过社区版或免费版了解和试用本产品,并确认产品功能符合您的需求。付费之后源代码与
社区版本相同,无需另外的源代码。已提供技术服务支持的或许可文件一经发出均不提供退货服务
4. 基于 JeeSite 开发的项目或产品名称以及公司名称,同意支持 JeeSite 推广的案例公布,谢谢您的支持。
5. 若您已经购买本产品许可文件或以其它方式使用本产品,将被视为您对本服务条款全部的完全接受,如果您未
能遵守本服务条款,您的许可授权将被终止,许可的权利将被收回,同时您应承担相应法律责任。
# 联系方式
QQ1766571055
**请认准唯一收款账号(其它付款均不作为有效凭证)**
![ThinkGem的支付宝收款二维码](https://static.oschina.net/uploads/img/201803/16112020_sFWX.jpg "ThinkGem的支付宝收款二维码")
商务1QQ1766571055
商务2QQ1928733133

View File

@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry excluding="**/bower_components/*|**/node_modules/*|**/*.min.js" kind="src" path="WebContent"/>
<classpathentry kind="output" path=""/>
</classpath>

View File

@@ -1,2 +0,0 @@
eclipse.preferences.version=1
oracle.eclipse.tools.common.services\:disable=true

View File

@@ -1,23 +0,0 @@
//_hiddenCategory_\:http\://ckfinder.com=false
//_hiddenCategory_\:http\://java.sun.com/jsp/jstl/core=false
//_hiddenCategory_\:http\://java.sun.com/jsp/jstl/fmt=false
//_hiddenCategory_\:http\://java.sun.com/jsp/jstl/sql=false
//_hiddenCategory_\:http\://java.sun.com/jsp/jstl/xml=false
//_hiddenCategory_\:http\://java.sun.com/jstl/core=false
//_hiddenCategory_\:http\://java.sun.com/jstl/core_rt=false
//_hiddenCategory_\:http\://java.sun.com/jstl/fmt=false
//_hiddenCategory_\:http\://java.sun.com/jstl/fmt_rt=false
//_hiddenCategory_\:http\://java.sun.com/jstl/sql=false
//_hiddenCategory_\:http\://java.sun.com/jstl/sql_rt=false
//_hiddenCategory_\:http\://java.sun.com/jstl/xml=false
//_hiddenCategory_\:http\://java.sun.com/jstl/xml_rt=false
//_hiddenCategory_\:http\://shiro.apache.org/tags=false
//_hiddenCategory_\:http\://www.opensymphony.com/sitemesh/decorator=false
//_hiddenCategory_\:http\://www.opensymphony.com/sitemesh/page=false
//_hiddenCategory_\:http\://www.springframework.org/tags=false
//_hiddenCategory_\:http\://www.springframework.org/tags/form=false
_hiddenCategory_\:HTML=false
_hiddenCategory_\:ManagedBeans=false
_hiddenCategory_\:PageVariables=false
_hiddenCategory_\:jsp11=false
eclipse.preferences.version=1

View File

@@ -1,5 +0,0 @@
eclipse.preferences.version=1
encoding//src/main/java=UTF-8
encoding//src/main/resources=UTF-8
encoding//src/test/java=UTF-8
encoding/<project>=UTF-8

View File

@@ -1,13 +0,0 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.8

View File

@@ -1,4 +0,0 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1

View File

@@ -1,20 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="web">
<dependent-module archiveName="jeesite-module-core-4.0.7-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/jeesite-module-core/jeesite-module-core">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="jeesite-common-4.0.7-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/jeesite-common/jeesite-common">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="jeesite-framework-4.0.7-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/jeesite-framework/jeesite-framework">
<dependency-type>uses</dependency-type>
</dependent-module>
<property name="component.exclusion.patterns"/>
<property name="java-output-path" value="/src/main/webapp/WEB-INF/classes"/>
<property name="context-root" value="web"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/resources"/>
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
</wb-module>
</project-modules>

View File

@@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
<fixed facet="jst.web"/>
<fixed facet="jst.java"/>
<installed facet="jst.java" version="1.8"/>
<installed facet="jst.web" version="3.0"/>
</faceted-project>

View File

@@ -1 +0,0 @@
org.eclipse.wst.jsdt.launching.baseBrowserLibrary

View File

@@ -1 +0,0 @@
Window

View File

@@ -1,2 +0,0 @@
disabled=06target
eclipse.preferences.version=1

View File

@@ -1,7 +0,0 @@
activeProfiles=
eclipse.preferences.version=1
fullBuildGoals=process-test-resources
resolveWorkspaceProjects=true
resourceFilterGoals=process-resources resources\:testResources
skipCompilerPlugin=true
version=1

View File

@@ -9,7 +9,9 @@ echo [
echo.
pause
echo.
echo [<5B><>Ϣ] <EFBFBD>˲<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ָ<EFBFBD><EFBFBD><EFBFBD>ʼ״̬<EFBFBD><EFBFBD>
echo [<5B><>Ϣ] Ϊ<EFBFBD><EFBFBD>ȫ<EFBFBD>ڼ䣬<EFBFBD><EFBFBD><EFBFBD>ȱ<EFBFBD><EFBFBD><EFBFBD> application.yml <20><><EFBFBD><EFBFBD><EFBFBD>õ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݿ⡣
echo [<5B><>Ϣ] <20>˲<EFBFBD><CBB2><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ܻ<EFBFBD><DCBB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݱ<EFBFBD><DDB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ָ<EFBFBD><D6B8><EFBFBD>ʼ״̬<D7B4><CCAC>
echo [<5B><>Ϣ] <20><><EFBFBD><EFBFBD>ʾ<EFBFBD><CABE><EFBFBD><EFBFBD><EFBFBD>Ѵ<EFBFBD><D1B4>ڣ<EFBFBD><DAA3><EFBFBD><EFBFBD><EFBFBD>ɾ<EFBFBD><C9BE><EFBFBD><EFBFBD><EFBFBD>ݱ<EFBFBD><DDB1><EFBFBD><EFBFBD>ٲ<EFBFBD><D9B2><EFBFBD><EFBFBD><EFBFBD>
echo.
echo [<5B><>Ϣ] ȷ<>ϼ<EFBFBD><CFBC><EFBFBD><EFBFBD>𣿷<EFBFBD><F0A3BFB7><EFBFBD><EFBFBD><EFBFBD><EFBFBD>رմ<D8B1><D5B4>ڡ<EFBFBD><DAA1><EFBFBD>5<EFBFBD><35>
echo.

View File

@@ -9,7 +9,9 @@ echo ""
echo "[信息] 初始化数据库,请谨慎操作。"
read -s -n1 -p "请按任意键继续 ... "
echo ""
echo "[信息] 此操作会清空您的现有数据表,并恢复初始状态。"
echo "[信息] 为安全期间,请先备份 application.yml 里设置的数据库。"
echo "[信息] 此操作可能会清空您的现有数据表,并恢复初始状态。"
echo "[信息] 若提示,表已存在,请先删除数据表后再操作。"
read -s -n1 -p "请按任意键继续 ... "
echo ""
echo "[信息] 确认继续吗否则请关闭窗口。5"

View File

@@ -1,40 +1,4 @@
/* Drop Tables */
IF OBJECT_ID('[js_gen_table_column]') IS NOT NULL DROP TABLE [js_gen_table_column];
IF OBJECT_ID('[js_gen_table]') IS NOT NULL DROP TABLE [js_gen_table];
IF OBJECT_ID('[js_sys_company_office]') IS NOT NULL DROP TABLE [js_sys_company_office];
IF OBJECT_ID('[js_sys_employee_post]') IS NOT NULL DROP TABLE [js_sys_employee_post];
IF OBJECT_ID('[js_sys_user_data_scope]') IS NOT NULL DROP TABLE [js_sys_user_data_scope];
IF OBJECT_ID('[js_sys_user_role]') IS NOT NULL DROP TABLE [js_sys_user_role];
IF OBJECT_ID('[js_sys_user]') IS NOT NULL DROP TABLE [js_sys_user];
IF OBJECT_ID('[js_sys_employee]') IS NOT NULL DROP TABLE [js_sys_employee];
IF OBJECT_ID('[js_sys_company]') IS NOT NULL DROP TABLE [js_sys_company];
IF OBJECT_ID('[js_sys_area]') IS NOT NULL DROP TABLE [js_sys_area];
IF OBJECT_ID('[js_sys_config]') IS NOT NULL DROP TABLE [js_sys_config];
IF OBJECT_ID('[js_sys_dict_data]') IS NOT NULL DROP TABLE [js_sys_dict_data];
IF OBJECT_ID('[js_sys_dict_type]') IS NOT NULL DROP TABLE [js_sys_dict_type];
IF OBJECT_ID('[js_sys_file_upload]') IS NOT NULL DROP TABLE [js_sys_file_upload];
IF OBJECT_ID('[js_sys_file_entity]') IS NOT NULL DROP TABLE [js_sys_file_entity];
IF OBJECT_ID('[js_sys_job_log]') IS NOT NULL DROP TABLE [js_sys_job_log];
IF OBJECT_ID('[js_sys_job]') IS NOT NULL DROP TABLE [js_sys_job];
IF OBJECT_ID('[js_sys_lang]') IS NOT NULL DROP TABLE [js_sys_lang];
IF OBJECT_ID('[js_sys_log]') IS NOT NULL DROP TABLE [js_sys_log];
IF OBJECT_ID('[js_sys_role_menu]') IS NOT NULL DROP TABLE [js_sys_role_menu];
IF OBJECT_ID('[js_sys_menu]') IS NOT NULL DROP TABLE [js_sys_menu];
IF OBJECT_ID('[js_sys_module]') IS NOT NULL DROP TABLE [js_sys_module];
IF OBJECT_ID('[js_sys_msg_inner_record]') IS NOT NULL DROP TABLE [js_sys_msg_inner_record];
IF OBJECT_ID('[js_sys_msg_inner]') IS NOT NULL DROP TABLE [js_sys_msg_inner];
IF OBJECT_ID('[js_sys_msg_push]') IS NOT NULL DROP TABLE [js_sys_msg_push];
IF OBJECT_ID('[js_sys_msg_pushed]') IS NOT NULL DROP TABLE [js_sys_msg_pushed];
IF OBJECT_ID('[js_sys_msg_template]') IS NOT NULL DROP TABLE [js_sys_msg_template];
IF OBJECT_ID('[js_sys_office]') IS NOT NULL DROP TABLE [js_sys_office];
IF OBJECT_ID('[js_sys_post]') IS NOT NULL DROP TABLE [js_sys_post];
IF OBJECT_ID('[js_sys_role_data_scope]') IS NOT NULL DROP TABLE [js_sys_role_data_scope];
IF OBJECT_ID('[js_sys_role]') IS NOT NULL DROP TABLE [js_sys_role];
/* Create Tables */
@@ -292,7 +256,7 @@ CREATE TABLE [js_sys_file_entity]
[file_path] nvarchar(1000) NOT NULL,
[file_content_type] varchar(200) NOT NULL,
[file_extension] varchar(100) NOT NULL,
[file_size] decimal(38) NOT NULL,
[file_size] decimal(31) NOT NULL,
PRIMARY KEY ([file_id])
);

View File

@@ -24,66 +24,6 @@
--# JTDS driver
--#
IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[FK_QRTZ_TRIGGERS_QRTZ_JOB_DETAILS]') AND OBJECTPROPERTY(id, N'ISFOREIGNKEY') = 1)
ALTER TABLE [dbo].[js_job_TRIGGERS] DROP CONSTRAINT FK_QRTZ_TRIGGERS_QRTZ_JOB_DETAILS
;
IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[FK_QRTZ_CRON_TRIGGERS_QRTZ_TRIGGERS]') AND OBJECTPROPERTY(id, N'ISFOREIGNKEY') = 1)
ALTER TABLE [dbo].[js_job_CRON_TRIGGERS] DROP CONSTRAINT FK_QRTZ_CRON_TRIGGERS_QRTZ_TRIGGERS
;
IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[FK_QRTZ_SIMPLE_TRIGGERS_QRTZ_TRIGGERS]') AND OBJECTPROPERTY(id, N'ISFOREIGNKEY') = 1)
ALTER TABLE [dbo].[js_job_SIMPLE_TRIGGERS] DROP CONSTRAINT FK_QRTZ_SIMPLE_TRIGGERS_QRTZ_TRIGGERS
;
IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[FK_QRTZ_SIMPROP_TRIGGERS_QRTZ_TRIGGERS]') AND OBJECTPROPERTY(id, N'ISFOREIGNKEY') = 1)
ALTER TABLE [dbo].[js_job_SIMPROP_TRIGGERS] DROP CONSTRAINT FK_QRTZ_SIMPROP_TRIGGERS_QRTZ_TRIGGERS
;
IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[js_job_CALENDARS]') AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1)
DROP TABLE [dbo].[js_job_CALENDARS]
;
IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[js_job_CRON_TRIGGERS]') AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1)
DROP TABLE [dbo].[js_job_CRON_TRIGGERS]
;
IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[js_job_BLOB_TRIGGERS]') AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1)
DROP TABLE [dbo].[js_job_BLOB_TRIGGERS]
;
IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[js_job_FIRED_TRIGGERS]') AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1)
DROP TABLE [dbo].[js_job_FIRED_TRIGGERS]
;
IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[js_job_PAUSED_TRIGGER_GRPS]') AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1)
DROP TABLE [dbo].[js_job_PAUSED_TRIGGER_GRPS]
;
IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[js_job_SCHEDULER_STATE]') AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1)
DROP TABLE [dbo].[js_job_SCHEDULER_STATE]
;
IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[js_job_LOCKS]') AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1)
DROP TABLE [dbo].[js_job_LOCKS]
;
IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[js_job_JOB_DETAILS]') AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1)
DROP TABLE [dbo].[js_job_JOB_DETAILS]
;
IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[js_job_SIMPLE_TRIGGERS]') AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1)
DROP TABLE [dbo].[js_job_SIMPLE_TRIGGERS]
;
IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[js_job_SIMPROP_TRIGGERS]') AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1)
DROP TABLE [dbo].[js_job_SIMPROP_TRIGGERS]
;
IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[js_job_TRIGGERS]') AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1)
DROP TABLE [dbo].[js_job_TRIGGERS]
;
CREATE TABLE [dbo].[js_job_CALENDARS] (
[SCHED_NAME] [VARCHAR] (120) NOT NULL ,
[CALENDAR_NAME] [VARCHAR] (200) NOT NULL ,

View File

@@ -1,12 +1,4 @@
/* Drop Tables */
IF OBJECT_ID('[test_data]') IS NOT NULL DROP TABLE [test_data];
IF OBJECT_ID('[test_data_child]') IS NOT NULL DROP TABLE [test_data_child];
IF OBJECT_ID('[test_tree]') IS NOT NULL DROP TABLE [test_tree];
/* Create Tables */

View File

@@ -1,41 +1,5 @@
SET SESSION FOREIGN_KEY_CHECKS=0;
/* Drop Tables */
DROP TABLE IF EXISTS js_gen_table_column;
DROP TABLE IF EXISTS js_gen_table;
DROP TABLE IF EXISTS js_sys_company_office;
DROP TABLE IF EXISTS js_sys_employee_post;
DROP TABLE IF EXISTS js_sys_user_data_scope;
DROP TABLE IF EXISTS js_sys_user_role;
DROP TABLE IF EXISTS js_sys_user;
DROP TABLE IF EXISTS js_sys_employee;
DROP TABLE IF EXISTS js_sys_company;
DROP TABLE IF EXISTS js_sys_area;
DROP TABLE IF EXISTS js_sys_config;
DROP TABLE IF EXISTS js_sys_dict_data;
DROP TABLE IF EXISTS js_sys_dict_type;
DROP TABLE IF EXISTS js_sys_file_upload;
DROP TABLE IF EXISTS js_sys_file_entity;
DROP TABLE IF EXISTS js_sys_job_log;
DROP TABLE IF EXISTS js_sys_job;
DROP TABLE IF EXISTS js_sys_lang;
DROP TABLE IF EXISTS js_sys_log;
DROP TABLE IF EXISTS js_sys_role_menu;
DROP TABLE IF EXISTS js_sys_menu;
DROP TABLE IF EXISTS js_sys_module;
DROP TABLE IF EXISTS js_sys_msg_inner_record;
DROP TABLE IF EXISTS js_sys_msg_inner;
DROP TABLE IF EXISTS js_sys_msg_push;
DROP TABLE IF EXISTS js_sys_msg_pushed;
DROP TABLE IF EXISTS js_sys_msg_template;
DROP TABLE IF EXISTS js_sys_office;
DROP TABLE IF EXISTS js_sys_post;
DROP TABLE IF EXISTS js_sys_role_data_scope;
DROP TABLE IF EXISTS js_sys_role;
/* Create Tables */
@@ -293,7 +257,7 @@ CREATE TABLE js_sys_file_entity
file_path varchar(1000) NOT NULL COMMENT '文件相对路径',
file_content_type varchar(200) NOT NULL COMMENT '文件内容类型',
file_extension varchar(100) NOT NULL COMMENT '文件后缀扩展名',
file_size decimal(38) NOT NULL COMMENT '文件大小(单位B)',
file_size decimal(31) NOT NULL COMMENT '文件大小(单位B)',
PRIMARY KEY (file_id),
UNIQUE (file_md5)
) COMMENT = '文件实体表';

View File

@@ -6,17 +6,6 @@
-- By: Ron Cordell - roncordell
-- I didn't see this anywhere, so I thought I'd post it here. This is the script from Quartz to create the tables in a MySQL database, modified to use INNODB instead of MYISAM.
DROP TABLE IF EXISTS js_job_FIRED_TRIGGERS;
DROP TABLE IF EXISTS js_job_PAUSED_TRIGGER_GRPS;
DROP TABLE IF EXISTS js_job_SCHEDULER_STATE;
DROP TABLE IF EXISTS js_job_LOCKS;
DROP TABLE IF EXISTS js_job_SIMPLE_TRIGGERS;
DROP TABLE IF EXISTS js_job_SIMPROP_TRIGGERS;
DROP TABLE IF EXISTS js_job_CRON_TRIGGERS;
DROP TABLE IF EXISTS js_job_BLOB_TRIGGERS;
DROP TABLE IF EXISTS js_job_TRIGGERS;
DROP TABLE IF EXISTS js_job_JOB_DETAILS;
DROP TABLE IF EXISTS js_job_CALENDARS;
CREATE TABLE js_job_JOB_DETAILS(
SCHED_NAME VARCHAR(120) NOT NULL,

View File

@@ -1,13 +1,5 @@
SET SESSION FOREIGN_KEY_CHECKS=0;
/* Drop Tables */
DROP TABLE IF EXISTS test_data;
DROP TABLE IF EXISTS test_data_child;
DROP TABLE IF EXISTS test_tree;
/* Create Tables */

View File

@@ -1,40 +1,4 @@
/* Drop Tables */
DROP TABLE js_gen_table_column CASCADE CONSTRAINTS;
DROP TABLE js_gen_table CASCADE CONSTRAINTS;
DROP TABLE js_sys_company_office CASCADE CONSTRAINTS;
DROP TABLE js_sys_employee_post CASCADE CONSTRAINTS;
DROP TABLE js_sys_user_data_scope CASCADE CONSTRAINTS;
DROP TABLE js_sys_user_role CASCADE CONSTRAINTS;
DROP TABLE js_sys_user CASCADE CONSTRAINTS;
DROP TABLE js_sys_employee CASCADE CONSTRAINTS;
DROP TABLE js_sys_company CASCADE CONSTRAINTS;
DROP TABLE js_sys_area CASCADE CONSTRAINTS;
DROP TABLE js_sys_config CASCADE CONSTRAINTS;
DROP TABLE js_sys_dict_data CASCADE CONSTRAINTS;
DROP TABLE js_sys_dict_type CASCADE CONSTRAINTS;
DROP TABLE js_sys_file_upload CASCADE CONSTRAINTS;
DROP TABLE js_sys_file_entity CASCADE CONSTRAINTS;
DROP TABLE js_sys_job_log CASCADE CONSTRAINTS;
DROP TABLE js_sys_job CASCADE CONSTRAINTS;
DROP TABLE js_sys_lang CASCADE CONSTRAINTS;
DROP TABLE js_sys_log CASCADE CONSTRAINTS;
DROP TABLE js_sys_role_menu CASCADE CONSTRAINTS;
DROP TABLE js_sys_menu CASCADE CONSTRAINTS;
DROP TABLE js_sys_module CASCADE CONSTRAINTS;
DROP TABLE js_sys_msg_inner_record CASCADE CONSTRAINTS;
DROP TABLE js_sys_msg_inner CASCADE CONSTRAINTS;
DROP TABLE js_sys_msg_push CASCADE CONSTRAINTS;
DROP TABLE js_sys_msg_pushed CASCADE CONSTRAINTS;
DROP TABLE js_sys_msg_template CASCADE CONSTRAINTS;
DROP TABLE js_sys_office CASCADE CONSTRAINTS;
DROP TABLE js_sys_post CASCADE CONSTRAINTS;
DROP TABLE js_sys_role_data_scope CASCADE CONSTRAINTS;
DROP TABLE js_sys_role CASCADE CONSTRAINTS;
/* Create Tables */
@@ -292,7 +256,7 @@ CREATE TABLE js_sys_file_entity
file_path nvarchar2(1000) NOT NULL,
file_content_type varchar2(200) NOT NULL,
file_extension varchar2(100) NOT NULL,
file_size number(38) NOT NULL,
file_size number(31) NOT NULL,
PRIMARY KEY (file_id)
);

View File

@@ -8,30 +8,6 @@
-- runing in dedicated mode, so only consider the above as a hint ;-)
--
delete from js_job_fired_triggers;
delete from js_job_simple_triggers;
delete from js_job_simprop_triggers;
delete from js_job_cron_triggers;
delete from js_job_blob_triggers;
delete from js_job_triggers;
delete from js_job_job_details;
delete from js_job_calendars;
delete from js_job_paused_trigger_grps;
delete from js_job_locks;
delete from js_job_scheduler_state;
drop table js_job_calendars;
drop table js_job_fired_triggers;
drop table js_job_blob_triggers;
drop table js_job_cron_triggers;
drop table js_job_simple_triggers;
drop table js_job_simprop_triggers;
drop table js_job_triggers;
drop table js_job_job_details;
drop table js_job_paused_trigger_grps;
drop table js_job_locks;
drop table js_job_scheduler_state;
CREATE TABLE js_job_job_details
(

View File

@@ -1,12 +1,4 @@
/* Drop Tables */
DROP TABLE test_data CASCADE CONSTRAINTS;
DROP TABLE test_data_child CASCADE CONSTRAINTS;
DROP TABLE test_tree CASCADE CONSTRAINTS;
/* Create Tables */

View File

@@ -1,40 +1,4 @@
/* Drop Tables */
DROP TABLE IF EXISTS js_gen_table_column;
DROP TABLE IF EXISTS js_gen_table;
DROP TABLE IF EXISTS js_sys_company_office;
DROP TABLE IF EXISTS js_sys_employee_post;
DROP TABLE IF EXISTS js_sys_user_data_scope;
DROP TABLE IF EXISTS js_sys_user_role;
DROP TABLE IF EXISTS js_sys_user;
DROP TABLE IF EXISTS js_sys_employee;
DROP TABLE IF EXISTS js_sys_company;
DROP TABLE IF EXISTS js_sys_area;
DROP TABLE IF EXISTS js_sys_config;
DROP TABLE IF EXISTS js_sys_dict_data;
DROP TABLE IF EXISTS js_sys_dict_type;
DROP TABLE IF EXISTS js_sys_file_upload;
DROP TABLE IF EXISTS js_sys_file_entity;
DROP TABLE IF EXISTS js_sys_job_log;
DROP TABLE IF EXISTS js_sys_job;
DROP TABLE IF EXISTS js_sys_lang;
DROP TABLE IF EXISTS js_sys_log;
DROP TABLE IF EXISTS js_sys_role_menu;
DROP TABLE IF EXISTS js_sys_menu;
DROP TABLE IF EXISTS js_sys_module;
DROP TABLE IF EXISTS js_sys_msg_inner_record;
DROP TABLE IF EXISTS js_sys_msg_inner;
DROP TABLE IF EXISTS js_sys_msg_push;
DROP TABLE IF EXISTS js_sys_msg_pushed;
DROP TABLE IF EXISTS js_sys_msg_template;
DROP TABLE IF EXISTS js_sys_office;
DROP TABLE IF EXISTS js_sys_post;
DROP TABLE IF EXISTS js_sys_role_data_scope;
DROP TABLE IF EXISTS js_sys_role;
/* Create Tables */
@@ -292,7 +256,7 @@ CREATE TABLE js_sys_file_entity
file_path varchar(1000) NOT NULL,
file_content_type varchar(200) NOT NULL,
file_extension varchar(100) NOT NULL,
file_size decimal(38) NOT NULL,
file_size decimal(31) NOT NULL,
PRIMARY KEY (file_id)
) WITHOUT OIDS;

View File

@@ -3,17 +3,6 @@
-- In your Quartz properties file, you'll need to set
-- org.quartz.jobStore.driverDelegateClass = org.quartz.impl.jdbcjobstore.PostgreSQLDelegate
drop table js_job_fired_triggers;
DROP TABLE js_job_PAUSED_TRIGGER_GRPS;
DROP TABLE js_job_SCHEDULER_STATE;
DROP TABLE js_job_LOCKS;
drop table js_job_simple_triggers;
drop table js_job_cron_triggers;
drop table js_job_simprop_triggers;
DROP TABLE js_job_BLOB_TRIGGERS;
drop table js_job_triggers;
drop table js_job_job_details;
drop table js_job_calendars;
CREATE TABLE js_job_job_details
(

View File

@@ -1,12 +1,4 @@
/* Drop Tables */
DROP TABLE IF EXISTS test_data;
DROP TABLE IF EXISTS test_data_child;
DROP TABLE IF EXISTS test_tree;
/* Create Tables */

View File

@@ -11,8 +11,8 @@
</page_setting>
<category_index>0</category_index>
<zoom>1.0</zoom>
<x>131</x>
<y>31</y>
<x>0</x>
<y>0</y>
<default_color>
<r>128</r>
<g>128</g>
@@ -41,7 +41,7 @@
<suspend_validator>false</suspend_validator>
<export_setting>
<export_ddl_setting>
<output_path>db\mysql\test.sql</output_path>
<output_path>db\test.sql</output_path>
<encoding>UTF-8</encoding>
<line_feed>CR+LF</line_feed>
<is_open_after_saved>false</is_open_after_saved>
@@ -58,7 +58,7 @@
<create_view>false</create_view>
<drop_index>false</drop_index>
<drop_sequence>false</drop_sequence>
<drop_table>true</drop_table>
<drop_table>false</drop_table>
<drop_tablespace>false</drop_tablespace>
<drop_trigger>false</drop_trigger>
<drop_view>false</drop_view>
@@ -168,7 +168,7 @@
</settings>
<dictionary>
<word>
<id>b6d7af0ea5dad1a0925ff63d5bd2d33946640369</id>
<id>136ca02f1b3a96a8f2e242d5dd64d48f566143ef</id>
<length>64</length>
<decimal>null</decimal>
<array>false</array>
@@ -184,7 +184,7 @@
<type>varchar(n)</type>
</word>
<word>
<id>810c114a1c22e1766589ec6b6da020db683137f8</id>
<id>f116706ac00cd3a3ee88b2a88debf7ebc3eeb12d</id>
<length>100</length>
<decimal>null</decimal>
<array>false</array>
@@ -1020,12 +1020,12 @@
</tablespace_set>
<contents>
<table>
<id>fb11bc47b30b0d8e468d3cd16ed660bf57bc8863</id>
<height>217</height>
<width>320</width>
<id>666aac17612ed79dc297a8c75b9f1f7a4cad049c</id>
<height>438</height>
<width>346</width>
<font_name>Segoe UI</font_name>
<font_size>9</font_size>
<x>396</x>
<x>480</x>
<y>36</y>
<color>
<r>128</r>
@@ -1546,12 +1546,12 @@
</table_properties>
</table>
<table>
<id>b7226377b79c26a490f7bf5789c1f74ed96e1b6f</id>
<height>359</height>
<width>323</width>
<id>45418c07c4a2b3552116f1d6bbd3884de6348ea2</id>
<height>438</height>
<width>387</width>
<font_name>Segoe UI</font_name>
<font_size>9</font_size>
<x>756</x>
<x>876</x>
<y>36</y>
<color>
<r>128</r>
@@ -2184,7 +2184,7 @@
<group_name>BaseEntityCorp</group_name>
<columns>
<normal_column>
<word_id>b6d7af0ea5dad1a0925ff63d5bd2d33946640369</word_id>
<word_id>136ca02f1b3a96a8f2e242d5dd64d48f566143ef</word_id>
<id>b8ea4b73d6d32a222e5abfd453287575ae518480</id>
<description></description>
<unique_key_name></unique_key_name>
@@ -2217,7 +2217,7 @@
</sequence>
</normal_column>
<normal_column>
<word_id>810c114a1c22e1766589ec6b6da020db683137f8</word_id>
<word_id>f116706ac00cd3a3ee88b2a88debf7ebc3eeb12d</word_id>
<id>b94f5fe344185c40739cf93d1090686001bb11e0</id>
<description></description>
<unique_key_name></unique_key_name>

View File

@@ -6,14 +6,14 @@
<parent>
<groupId>com.jeesite</groupId>
<artifactId>jeesite-parent</artifactId>
<version>4.0.7-SNAPSHOT</version>
<version>4.0.8-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<artifactId>jeesite-web</artifactId>
<packaging>war</packaging>
<name>JeeSite Boot</name>
<name>JeeSite Web</name>
<url>http://jeesite.com</url>
<inceptionYear>2013-Now</inceptionYear>
@@ -120,41 +120,28 @@
</organization>
<repositories>
<repository>
<id>aliyun-repos</id>
<name>Aliyun Repository</name>
<url>http://maven.aliyun.com/nexus/content/groups/public</url>
<url>https://maven.aliyun.com/repository/public</url>
<releases><enabled>true</enabled></releases>
<snapshots><enabled>false</enabled></snapshots>
</repository>
<repository>
<id>sonatype-repos</id>
<name>Sonatype Repository</name>
<url>https://oss.sonatype.org/content/groups/public</url>
<releases><enabled>true</enabled></releases>
<snapshots><enabled>false</enabled></snapshots>
<id>jeesite-repos</id>
<url>http://maven.jeesite.net/repository/maven-public</url>
</repository>
<repository>
<id>sonatype-repos-s</id>
<name>Sonatype Repository</name>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases><enabled>false</enabled></releases>
<snapshots><enabled>true</enabled></snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>aliyun-repos</id>
<name>Aliyun Repository</name>
<url>http://maven.aliyun.com/nexus/content/groups/public</url>
<url>https://maven.aliyun.com/repository/public</url>
<releases><enabled>true</enabled></releases>
<snapshots><enabled>false</enabled></snapshots>
</pluginRepository>
<pluginRepository>
<id>jeesite-repos</id>
<url>http://maven.jeesite.net/repository/maven-public</url>
</pluginRepository>
</pluginRepositories>
</project>

View File

@@ -1,9 +1,145 @@
#======================================#
#========== Project settings ==========#
#======================================#
# 产品或项目名称、软件开发公司名称
productName: JeeSite Demo
companyName: ThinkGem
# 产品版本、版权年份
productVersion: V4.0
copyrightYear: 2018
#是否演示模式
demoMode: false
#======================================#
#========== Server settings ===========#
#======================================#
server:
port: 8980
context-path: /js
tomcat:
uri-encoding: UTF-8
#======================================#
#========== Database sttings ==========#
#======================================#
# 数据库连接
jdbc:
# Mysql 数据库配置
type: mysql
driver: com.mysql.jdbc.Driver
url: jdbc:mysql://127.0.0.1:3306/jeesite?useSSL=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull
username: root
password: 123456
testSql: SELECT 1
# # Oracle 数据库配置
# type: oracle
# driver: oracle.jdbc.driver.OracleDriver
# url: jdbc:oracle:thin:@127.0.0.1:1521/orcl
# username: jeesite
# password: jeesite
# testSql: SELECT 1 FROM DUAL
# # Sql Server 数据库配置
# type: mssql
# driver: net.sourceforge.jtds.jdbc.Driver
# url: jdbc:jtds:sqlserver://127.0.0.1:1433/jeesite
# username: jeesite
# password: jeesite
# testSql: SELECT 1
# # PostgreSql 数据库配置注意一定要创建的schema与username相同否则将找不到数据表字典信息
# type: postgresql
# driver: org.postgresql.Driver
# url: jdbc:postgresql://127.0.0.1:5432/jeesite
# username: jeesite
# password: jeesite
# testSql: SELECT 1
# # 连接信息加密
# encrypt:
#
# # 加密连接用户名
# username: false
# # 加密连接密码
# password: true
#
# # 数据库连接池配置
# pool:
#
# # 初始化连接数
# init: 1
# # 最小连接数
# minIdle: 3
# # 最大连接数
# maxActive: 20
# # 多数据源名称列表,启用方式:@MyBatisDao(dataSourceName="ds2")
# dataSourceNames: ds2
#
# # 多数据源配置ds2
# ds2:
# type: oracle
# driver: oracle.jdbc.driver.OracleDriver
# url: jdbc:oracle:thin:@127.0.0.1:1521/orcl
# username: jeesite
# password: jeesite
# testSql: SELECT 1 FROM DUAL
# encrypt:
# username: false
# password: true
# pool:
# init: 1
# minIdle: 3
# maxActive: 20
# # JTA 分布式事务v4.0.4+
# jta:
# enabled: false
# # 表名前缀
# tablePrefix: js_
# # Druid连接池监控
# druid:
# stat:
# enabled: true
# Redis 配置
#redis:
# enabled: false
#
# # Redis 连接参数
# host: 127.0.0.1
# port: 6379
# isSSL: false
# timeout: 2000
# password: 1234
# database: 0
# clientName: ~
#
# # Redis 连接池配置
# pool:
# maxIdle: 3
# maxTotal: 20
#
# # 是否启用Redis系统缓存及会话专业版
# cacheAndSession: false
#
# # 定义Key的前缀标识
# keyPrefix: ${jdbc.tablePrefix}
#======================================#
#========== Spring settings ===========#
#======================================#
spring:
@@ -13,3 +149,387 @@ spring:
main:
banner-mode: "off"
#======================================#
#========== System settings ===========#
#======================================#
# 管理基础路径
#adminPath: /a
#
# 前端基础路径
#frontPath: /f
#
# 分页配置
#page:
#
# # 分页默认大小
# pageSize: 20
# 用户相关参数
#user:
#
# # 指定超级管理员编号(研发团队使用的账号)
# superAdminCode: system
#
# # 超级管理员获取菜单的最小权重默认20>=40二级管理员>=60系统管理员>=80超级管理员
# superAdminGetMenuMinWeight: 40
#
# # 系统管理员角色编号(客户方管理员使用的角色)
# corpAdminRoleCode: corpAdmin
#
# # 用户类型配置信息employee员工member会员btype往来单位persion个人expert专家...
# # JSON格式说明{"用户类型":{"dao":"Dao的Bean名称","loginView":"登录视图","indexView":"主页框架面视图"}}
# userTypeMap: >
# {
# "employee":{"dao":"employeeDao","loginView":"","indexView":""},
# "member":{"dao":"memberDao","loginView":"","indexView":"modules/sys/sysIndexMember"},
# "btype":{"dao":"btypeInfoDao","loginView":"","indexView":"modules/sys/sysIndexBtype"},
# "persion":{"dao":"persionDao","loginView":"","indexView":"modules/sys/sysIndexPersion"},
# "expert":{"dao":"expertDao","loginView":"","indexView":"modules/sys/sysIndexExpert"}
# }
#
# # 数据权限设置参数可新增自定义数据权限moduleCode: 针对模块, ctrlPermi: 权限类型, 0全部 1拥有权限 2管理权限
# dataScopes: >
# [{
# moduleCode: "core",
# ctrlPermi: "0",
# ctrlName: "机构权限",
# ctrlName_en: "Office",
# ctrlType: "Office",
# ctrlDataUrl: "/sys/office/treeData",
# chkboxType: {"Y":"ps","N":"ps"},
# expandLevel: -1,
# remarks: ""
# },{
# moduleCode: "core",
# ctrlName: "公司权限",
# ctrlName_en: "Company",
# ctrlType: "Company",
# ctrlPermi: "0",
# ctrlDataUrl: "/sys/company/treeData",
# chkboxType: {"Y":"ps","N":"ps"},
# expandLevel: -1,
# remarks: ""
# },{
# moduleCode: "core",
# ctrlName: "角色权限",
# ctrlName_en: "Role",
# ctrlType: "Role",
# ctrlPermi: "2",
# ctrlDataUrl: "/sys/role/treeData",
# chkboxType: {"Y":"ps","N":"ps"},
# expandLevel: -1,
# remarks: ""
# }]
#
# # 多租户模式SAAS模式专业版
# useCorpModel: false
# 菜单管理
#menu:
# # 根据模块状态去更新相连的菜单状态仅作为微服务时设为false
# updateStatusByModuleStatus: true
# 国际化管理(专业版+
#lang:
# enabled: true
# 任务调度(个人版+
#job:
# enabled: true
#
# # 是否自动启动任务调度(可关闭)
# autoStartup: true
#
# # 任务调度启动延迟设置(单位:秒)(建议设置项目启动完成后的时间)
# startupDelay: 60
#
# # 任务调度线程池
# threadPool:
# threadCount: 10
# threadPriority: 5
#
# # 调度设置集群中每一个实例都必须使用相同的instanceName名称 (区分特定的调度器实例)
# # 每一个instanceId必须不同设置AUTO则自动生成
# scheduler:
# instanceName: JeeSiteScheduler
# instanceId: AUTO
#
# # 任务调度集群设置
# jobStore:
# isClustered: true
# dataSourceName: job
# clusterCheckinInterval: 1000
#
# # 调度日志
# log:
# # 计划调度日志
# scheduler:
# enabled: true
# # 是否只保存错误日志
# errorLevel: true
# # 任务执行日志
# jobDetail:
# enabled: true
# # 是否只保存错误日志
# errorLevel: true
# # 计划触发日志
# trigger:
# enabled: false
#======================================#
#========= Framework settings =========#
#======================================#
# Shiro 相关配置
#shiro:
#
# #索引页路径
# defaultPath: ${shiro.loginUrl}
#
# # 登录相关设置
# loginUrl: ${adminPath}/login
# logoutUrl: ${shiro.loginUrl}
# successUrl: ${adminPath}/index
#
## # Jasig CAS 相关配置
## casServerUrl: http://127.0.0.1:8981/cas
## casClientUrl: http://127.0.0.1:8980/js
## loginUrl: ${shiro.casServerUrl}?service=${shiro.casClientUrl}${adminPath}/login-cas
## logoutUrl: ${shiro.casServerUrl}/logout?service=${shiro.loginUrl}
## successUrl: ${shiro.casClientUrl}${adminPath}/index
#
# # 简单 SSO 登录相关配置
# sso:
#
# # 如果启用/sso/{username}/{token}单点登录请修改此安全key并与单点登录系统key一致。
# secretKey: ~
#
# # 是否加密单点登录安全Key
# encryptKey: true
#
# # 登录提交信息加密(如果不需要加密,设置为空即可)
# loginSubmit:
#
# # 登录提交信息安全Key加密用户名、密码、验证码后再提交key设置为3个用逗号分隔
# secretKey: thinkgem,jeesite,com
#
# # 记住我密钥设置(设置为空则使用默认)
# rememberMe:
# # 密钥必须通过 com.jeesite.common.shiro.web.RememberMeManager 的main方法生成
# secretKey: ~
#
# # 指定获取客户端IP的Header名称防止IP伪造。指定为空则使用原生方法获取IP。
# remoteAddrHeaderName: X-Forwarded-For
#
# # 允许的请求方法设定,解决安全审计问题
# allowRequestMethods: GET,POST
#
# # 是否允许账号多地登录如果设置为false同一个设备类型的其它地点登录的相同账号被踢下线
# isAllowMultiAddrLogin: true
#
# # 是否允许刷新主框架页如果设置为false刷新主页将导致重新登录。如安全性比较高的如银行个人首页不允许刷新。
# isAllowRefreshIndex: true
#
# # 是否允许嵌入到外部网站iframe中true不限制false不允许
# isAllowExternalSiteIframe: true
#
# # 是否允许跨域访问,如果允许,设置允许的域名,全部域名设置*号,如果不允许,此设置应该为空
## accessControlAllowOrigin: http://demo.jeesite.com
## accessControlAllowOrigin: '*'
#
# # 是否在登录后生成新的Session默认false
# isGenerateNewSessionAfterLogin: false
#
# # URI 权限过滤器定义
# filterChainDefinitions: |
# /ReportServer/** = user
# ${adminPath}/** = user
#
# Session 相关
#session:
#
# #全局会话超时,单位:毫秒, 20m=1200000ms, 30m=1800000ms, 60m=3600000ms, 12h=43200000ms, 1day=86400000ms
# sessionTimeout: 1800000
#
# #手机APP设备会话超时参数设置登录请求参数加 param_deviceType=mobileApp 时有效
# mobileAppSessionTimeout: 43200000
#
# #定时清理失效会话,清理用户直接关闭浏览器造成的孤立会话
# sessionTimeoutClean: 1200000
#
# #会话唯一标识SessionId在Cookie中的名称。
# sessionIdCookieName: jeesite.session.id
#
# #共享的SessionId的Cookie名称保存到跟路径下第三方应用获取。同一域名下多个项目时需设置共享Cookie的名称。
# #shareSessionIdCookieName: ${session.sessionIdCookieName}
#
# MyBatis 相关
#mybatis:
#
# # @MyBatisDao、Aliases 扫描基础包,如果多个,用“,”分隔
# scanBasePackage: com.jeesite.modules
#
# # TypeHandlers 扫描基础包,如果多个,用“,”分隔
# scanTypeHandlersPackage: ~
#
# # Mapper文件刷新线程
# mapper:
# refresh:
# enabled: true
# delaySeconds: 60
# sleepSeconds: 3
# mappingPath: mappings
#
# 缓存设置
#ehcache:
#
# # 缓存配置文件路径
# configFile: cache/ehcache-local.xml
## configFile: cache/ehcache-rmi.xml
#
# # 清理缓存的缓存名称
# clearNames: sysCache,userCache,corpCache,cmsCache,pageCachingFilter
#
# # 页面缓存配置
# pageCaching:
# enabled: false
# urlPatterns: "*.html"
#
# Web 相关
#web:
#
# # MVC 视图相关
# view:
#
# # 系统主题名称,主题视图优先级最高,如果主题下无这个视图文件则访问默认视图
# # 引入页面头部:'/themes/'+themeName+'/include/header.html'
# # 引入页面尾部:'/themes/'+themeName+'/include/footer.html'
# themeName: default
#
# # MVC 拦截器
# interceptor:
#
# # 后台管理日志记录拦截器
# log:
# enabled: true
# addPathPatterns: >
# ${adminPath}/**
# excludePathPatterns: >
# ${adminPath}/index,
# ${adminPath}/login,
# ${adminPath}/desktop,
# ${adminPath}/sys/online/count,
# ${adminPath}/state/server/rtInfo,
# ${adminPath}/**/treeData,
# ${adminPath}/file/**,
# ${adminPath}/tags/*,
# ${adminPath}/msg/**
#
# # 前台自动切换到手机视图拦截器
# mobile:
# enabled: false
# addPathPatterns: >
# ${frontPath}/**
# excludePathPatterns: ~
#
# # 静态文件后缀,过滤静态文件,以提高访问性能。
# staticFile: .css,.js,.map,.png,.jpg,.gif,.jpeg,.bmp,.ico,.swf,.psd,.htc,.crx,.xpi,.exe,.ipa,.apk,.otf,.eot,.svg,.ttf,.woff,.woff2
#
# # 静态文件后缀排除的url路径指定哪些uri路径不进行静态文件过滤。
# staticFileExcludeUri: /druid/
#
# # 自定义正则表达式验证(主键、登录名)
# validator:
# id: '[a-zA-Z0-9_\-/\u4e00-\u9fa5]{0,64}'
# user.loginCode: '[a-zA-Z0-9_\u4e00-\u9fa5]{4,20}'
#
# # 关闭核心模块的Web功能仅作为微服务时设为false
# core:
# enabled: true
#
# 错误页面500.html是否输出错误信息正式环境为提供安全性可设置为false
#error:
# page:
# printErrorInfo: true
#======================================#
#========== FileUpload settings =======#
#======================================#
#file:
# enabled: true
#
# # 文件上传根路径设置路径中不允许包含“userfiles”在指定目录中系统会自动创建userfiles目录如果不设置默认为contextPath路径
## baseDir: D:/jeesite
#
# # 上传文件的相对路径支持yyyy, MM, dd, HH, mm, ss, E
# uploadPath: '{yyyy}{MM}/'
#
# # 上传单个文件最大字节500M在这之上还有 > Tomcat限制 > Nginx限制等。
# maxFileSize: 500*1024*1024
#
# #设置允许上传的文件后缀
# imageAllowSuffixes: .gif,.bmp,.jpeg,.jpg,.ico,.png,.tif,.tiff,
# mediaAllowSuffixes: .flv,.swf,.mkv,webm,.mid,.mov,.mp3,.mp4,.m4v,.mpc,.mpeg,.mpg,.swf,.wav,.wma,.wmv,.avi,.rm,.rmi,.rmvb,.aiff,.asf,.ogg,.ogv,
# fileAllowSuffixes: .doc,.docx,.rtf,.xls,.xlsx,.csv,.ppt,.pptx,.pdf,.vsd,.txt,.md,.xml,.rar,.zip,7z,.tar,.tgz,.jar,.gz,.gzip,.bz2,.cab,.iso,.ipa,.apk,
#
# #允许上传的文件内容类型图片、word、excel、ppt防止修改后缀恶意上传文件默认不启用验证
## allowContentTypes: image/jpeg,image/gif,image/bmp,image/png,image/x-png,
## application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document,
## application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,
## application/vnd.ms-powerpoint,application/vnd.openxmlformats-officedocument.presentationml.presentation
#======================================#
#========== Message settings ==========#
#======================================#
# 消息提醒中心(专业版)
#msg:
#
# # 是否开启实时发送消息(保存消息后立即检查未读消息并发送),分布式部署下请单独配置消息发送服务,不建议开启此选项。
# realtime:
# # 是否开启
# enabled: true
# # 消息实时推送任务Bean名称
# beanName: msgLocalPushTask
#
# # 邮件发送参数
# email:
# beanName: emailSendService
# fromAddress: test@163.com
# fromPassword: 123456
# fromHostName: smtp.163.com
# sslOnConnect: false
# sslSmtpPort: 994
#
# # 短信网关
# sms:
# beanName: smsSendService
# url: http://localhost:80/msg/sendSms
# data: account=demo&pswd=demo&product=
# prefix: ~
# suffix: 【JeeSite】
#======================================#
#========== Video settings ============#
#======================================#
#video:
#
# # 视频格式转换 ffmpeg.exe 所放的路径
# ffmpegFile: d:/tools/video/ffmpeg-4.9/bin/ffmpeg.exe
## ffmpegFile: d:/tools/video/libav-10.6-win64/bin/avconv.exe
#
# # 视频格式转换 mencoder.exe 所放的路径
# mencoderFile: d:/tools/video/mencoder-4.9/mencoder.exe
#
# # 将mp4视频的元数据信息转到视频第一帧
# qtFaststartFile: d:/tools/video/qt-faststart/qt-faststart.exe
#======================================#
#========== Project settings ==========#
#======================================#

View File

@@ -1,511 +0,0 @@
#============================#
#===== Project settings =====#
#============================#
# 产品或项目名称、软件开发公司名称
productName: JeeSite Demo
companyName: ThinkGem
# 产品版本、版权年份
productVersion: V4.0
copyrightYear: 2018
#是否演示模式
demoMode: false
#============================#
#===== Database sttings =====#
#============================#
# 数据库连接
jdbc:
# Mysql 数据库配置
type: mysql
driver: com.mysql.jdbc.Driver
url: jdbc:mysql://127.0.0.1:3306/jeesite?useSSL=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull
username: root
password: 123456
testSql: SELECT 1
# # Oracle 数据库配置
# type: oracle
# driver: oracle.jdbc.driver.OracleDriver
# url: jdbc:oracle:thin:@127.0.0.1:1521/orcl
# username: jeesite
# password: jeesite
# testSql: SELECT 1 FROM DUAL
# # Sql Server 数据库配置
# type: mssql
# driver: net.sourceforge.jtds.jdbc.Driver
# url: jdbc:jtds:sqlserver://127.0.0.1:1433/jeesite
# username: jeesite
# password: jeesite
# testSql: SELECT 1
# # PostgreSql 数据库配置注意一定要创建的schema与username相同否则将找不到数据表字典信息
# type: postgresql
# driver: org.postgresql.Driver
# url: jdbc:postgresql://127.0.0.1:5432/jeesite
# username: jeesite
# password: jeesite
# testSql: SELECT 1
# # 连接信息加密
# encrypt:
#
# # 加密连接用户名
# username: false
# # 加密连接密码
# password: true
#
# # 数据库连接池配置
# pool:
#
# # 初始化连接数
# init: 1
# # 最小连接数
# minIdle: 3
# # 最大连接数
# maxActive: 20
# # 多数据源名称列表,启用方式:@MyBatisDao(dataSourceName="ds2")
# dataSourceNames: ds2
#
# # 多数据源配置ds2
# ds2:
# type: oracle
# driver: oracle.jdbc.driver.OracleDriver
# url: jdbc:oracle:thin:@127.0.0.1:1521/orcl
# username: jeesite
# password: jeesite
# testSql: SELECT 1 FROM DUAL
# encrypt:
# username: false
# password: true
# pool:
# init: 1
# minIdle: 3
# maxActive: 20
# # JTA 分布式事务v4.0.4+
# jta:
# enabled: false
# # 表名前缀
# tablePrefix: js_
# # Druid连接池监控
# druid:
# stat:
# enabled: true
# Redis 配置
#redis:
# enabled: false
#
# # Redis 连接参数
# host: 127.0.0.1
# port: 6379
# isSSL: false
# timeout: 2000
# password: 1234
# database: 0
# clientName: ~
#
# # Redis 连接池配置
# pool:
# maxIdle: 3
# maxTotal: 20
#
# # 是否启用Redis系统缓存及会话专业版
# cacheAndSession: false
#
# # 定义Key的前缀标识
# keyPrefix: ${jdbc.tablePrefix}
#============================#
#===== System settings ======#
#============================#
# 管理基础路径
#adminPath: /a
#
# 前端基础路径
#frontPath: /f
#
# 分页配置
#page:
#
# # 分页默认大小
# pageSize: 20
# 用户相关参数
#user:
#
# # 指定超级管理员编号(研发团队使用的账号)
# superAdminCode: system
#
# # 超级管理员获取菜单的最小权重默认20>=40二级管理员>=60系统管理员>=80超级管理员
# superAdminGetMenuMinWeight: 40
#
# # 系统管理员角色编号(客户方管理员使用的角色)
# corpAdminRoleCode: corpAdmin
#
# # 用户类型配置信息employee员工member会员btype往来单位persion个人expert专家...
# # JSON格式说明{"用户类型":{"dao":"Dao的Bean名称","loginView":"登录视图","indexView":"主页框架面视图"}}
# userTypeMap: >
# {
# "employee":{"dao":"employeeDao","loginView":"","indexView":""},
# "member":{"dao":"memberDao","loginView":"","indexView":"modules/sys/sysIndexMember"},
# "btype":{"dao":"btypeInfoDao","loginView":"","indexView":"modules/sys/sysIndexBtype"},
# "persion":{"dao":"persionDao","loginView":"","indexView":"modules/sys/sysIndexPersion"},
# "expert":{"dao":"expertDao","loginView":"","indexView":"modules/sys/sysIndexExpert"}
# }
#
# # 数据权限设置参数可新增自定义数据权限moduleCode: 针对模块, ctrlPermi: 权限类型, 0全部 1拥有权限 2管理权限
# dataScopes: >
# [{
# moduleCode: "core",
# ctrlPermi: "0",
# ctrlName: "机构权限",
# ctrlName_en: "Office",
# ctrlType: "Office",
# ctrlDataUrl: "/sys/office/treeData",
# chkboxType: {"Y":"ps","N":"ps"},
# expandLevel: -1,
# remarks: ""
# },{
# moduleCode: "core",
# ctrlName: "公司权限",
# ctrlName_en: "Company",
# ctrlType: "Company",
# ctrlPermi: "0",
# ctrlDataUrl: "/sys/company/treeData",
# chkboxType: {"Y":"ps","N":"ps"},
# expandLevel: -1,
# remarks: ""
# },{
# moduleCode: "core",
# ctrlName: "角色权限",
# ctrlName_en: "Role",
# ctrlType: "Role",
# ctrlPermi: "2",
# ctrlDataUrl: "/sys/role/treeData",
# chkboxType: {"Y":"ps","N":"ps"},
# expandLevel: -1,
# remarks: ""
# }]
#
# # 多租户模式SAAS模式专业版
# useCorpModel: false
# 菜单管理
#menu:
# # 根据模块状态去更新相连的菜单状态仅作为微服务时设为false
# updateStatusByModuleStatus: true
# 国际化管理(专业版+
#lang:
# enabled: true
# 任务调度(个人版+
#job:
# enabled: true
#
# # 是否自动启动任务调度(可关闭)
# autoStartup: true
#
# # 任务调度启动延迟设置(单位:秒)(建议设置项目启动完成后的时间)
# startupDelay: 60
#
# # 任务调度线程池
# threadPool:
# threadCount: 10
# threadPriority: 5
#
# # 调度设置集群中每一个实例都必须使用相同的instanceName名称 (区分特定的调度器实例)
# # 每一个instanceId必须不同设置AUTO则自动生成
# scheduler:
# instanceName: JeeSiteScheduler
# instanceId: AUTO
#
# # 任务调度集群设置
# jobStore:
# isClustered: true
# dataSourceName: job
# clusterCheckinInterval: 1000
#
# # 调度日志
# log:
# # 计划调度日志
# scheduler:
# enabled: true
# # 是否只保存错误日志
# errorLevel: true
# # 任务执行日志
# jobDetail:
# enabled: true
# # 是否只保存错误日志
# errorLevel: true
# # 计划触发日志
# trigger:
# enabled: false
#============================#
#==== Framework settings ====#
#============================#
# Shiro 相关配置
#shiro:
#
# #索引页路径
# defaultPath: ${shiro.loginUrl}
#
# # 登录相关设置
# loginUrl: ${adminPath}/login
# logoutUrl: ${shiro.loginUrl}
# successUrl: ${adminPath}/index
#
## # Jasig CAS 相关配置
## casServerUrl: http://127.0.0.1:8981/cas
## casClientUrl: http://127.0.0.1:8980/js
## loginUrl: ${shiro.casServerUrl}?service=${shiro.casClientUrl}${adminPath}/login-cas
## logoutUrl: ${shiro.casServerUrl}/logout?service=${shiro.loginUrl}
## successUrl: ${shiro.casClientUrl}${adminPath}/index
#
# # 简单 SSO 登录相关配置
# sso:
#
# # 如果启用/sso/{username}/{token}单点登录请修改此安全key并与单点登录系统key一致。
# secretKey: ~
#
# # 是否加密单点登录安全Key
# encryptKey: true
#
# # 登录提交信息加密(如果不需要加密,设置为空即可)
# loginSubmit:
#
# # 登录提交信息安全Key加密用户名、密码、验证码后再提交key设置为3个用逗号分隔
# secretKey: thinkgem,jeesite,com
#
# # 记住我密钥设置(设置为空则使用默认)
# rememberMe:
# # 密钥必须通过 com.jeesite.common.shiro.web.RememberMeManager 的main方法生成
# secretKey: ~
#
# # 指定获取客户端IP的Header名称防止IP伪造。指定为空则使用原生方法获取IP。
# remoteAddrHeaderName: X-Forwarded-For
#
# # 允许的请求方法设定,解决安全审计问题
# allowRequestMethods: GET,POST
#
# # 是否允许账号多地登录如果设置为false同一个设备类型的其它地点登录的相同账号被踢下线
# isAllowMultiAddrLogin: true
#
# # 是否允许刷新主框架页如果设置为false刷新主页将导致重新登录。如安全性比较高的如银行个人首页不允许刷新。
# isAllowRefreshIndex: true
#
# # 是否允许嵌入到外部网站iframe中true不限制false不允许
# isAllowExternalSiteIframe: true
#
# # 是否允许跨域访问,如果允许,设置允许的域名,全部域名设置*号,如果不允许,此设置应该为空
## accessControlAllowOrigin: http://demo.jeesite.com
## accessControlAllowOrigin: '*'
#
# # 是否在登录后生成新的Session默认false
# isGenerateNewSessionAfterLogin: false
#
# # URI 权限过滤器定义
# filterChainDefinitions: |
# /ReportServer/** = user
# ${adminPath}/** = user
#
# Session 相关
#session:
#
# #全局会话超时,单位:毫秒, 20m=1200000ms, 30m=1800000ms, 60m=3600000ms, 12h=43200000ms, 1day=86400000ms
# sessionTimeout: 1800000
#
# #手机APP设备会话超时参数设置登录请求参数加 param_deviceType=mobileApp 时有效
# mobileAppSessionTimeout: 43200000
#
# #定时清理失效会话,清理用户直接关闭浏览器造成的孤立会话
# sessionTimeoutClean: 1200000
#
# #会话唯一标识SessionId在Cookie中的名称。
# sessionIdCookieName: jeesite.session.id
#
# #共享的SessionId的Cookie名称保存到跟路径下第三方应用获取。同一域名下多个项目时需设置共享Cookie的名称。
# #shareSessionIdCookieName: ${session.sessionIdCookieName}
#
# MyBatis 相关
#mybatis:
#
# # @MyBatisDao、Aliases 扫描基础包,如果多个,用“,”分隔
# scanBasePackage: com.jeesite.modules
#
# # TypeHandlers 扫描基础包,如果多个,用“,”分隔
# scanTypeHandlersPackage: ~
#
# # Mapper文件刷新线程
# mapper:
# refresh:
# enabled: true
# delaySeconds: 60
# sleepSeconds: 3
# mappingPath: mappings
#
# 缓存设置
#ehcache:
#
# # 缓存配置文件路径
# configFile: cache/ehcache-local.xml
## configFile: cache/ehcache-rmi.xml
#
# # 清理缓存的缓存名称
# clearNames: sysCache,userCache,corpCache,cmsCache,pageCachingFilter
#
# # 页面缓存配置
# pageCaching:
# enabled: false
# urlPatterns: "*.html"
#
# Web 相关
#web:
#
# # MVC 视图相关
# view:
#
# # 系统主题名称,主题视图优先级最高,如果主题下无这个视图文件则访问默认视图
# # 引入页面头部:'/themes/'+themeName+'/include/header.html'
# # 引入页面尾部:'/themes/'+themeName+'/include/footer.html'
# themeName: default
#
# # MVC 拦截器
# interceptor:
#
# # 后台管理日志记录拦截器
# log:
# enabled: true
# addPathPatterns: >
# ${adminPath}/**
# excludePathPatterns: >
# ${adminPath}/index,
# ${adminPath}/login,
# ${adminPath}/desktop,
# ${adminPath}/sys/online/count,
# ${adminPath}/state/server/rtInfo,
# ${adminPath}/**/treeData,
# ${adminPath}/file/**,
# ${adminPath}/tags/*,
# ${adminPath}/msg/**
#
# # 前台自动切换到手机视图拦截器
# mobile:
# enabled: false
# addPathPatterns: >
# ${frontPath}/**
# excludePathPatterns: ~
#
# # 静态文件后缀,过滤静态文件,以提高访问性能。
# staticFile: .css,.js,.map,.png,.jpg,.gif,.jpeg,.bmp,.ico,.swf,.psd,.htc,.crx,.xpi,.exe,.ipa,.apk,.otf,.eot,.svg,.ttf,.woff,.woff2
#
# # 静态文件后缀排除的url路径指定哪些uri路径不进行静态文件过滤。
# staticFileExcludeUri: /druid/
#
# # 自定义正则表达式验证(主键、登录名)
# validator:
# id: '[a-zA-Z0-9_\-/\u4e00-\u9fa5]{0,64}'
# user.loginCode: '[a-zA-Z0-9_\u4e00-\u9fa5]{4,20}'
#
# # 关闭核心模块的Web功能仅作为微服务时设为false
# core:
# enabled: true
#
# 错误页面500.html是否输出错误信息正式环境为提供安全性可设置为false
#error:
# page:
# printErrorInfo: true
#============================#
#=== FileUpload settings ====#
#============================#
#file:
# enabled: true
#
# # 文件上传根路径设置路径中不允许包含“userfiles”在指定目录中系统会自动创建userfiles目录如果不设置默认为contextPath路径
## baseDir: D:/jeesite
#
# # 上传文件的相对路径支持yyyy, MM, dd, HH, mm, ss, E
# uploadPath: '{yyyy}{MM}/'
#
# # 上传单个文件最大字节500M在这之上还有 > Tomcat限制 > Nginx限制等。
# maxFileSize: 500*1024*1024
#
# #设置允许上传的文件后缀
# imageAllowSuffixes: .gif,.bmp,.jpeg,.jpg,.ico,.png,.tif,.tiff,
# mediaAllowSuffixes: .flv,.swf,.mkv,webm,.mid,.mov,.mp3,.mp4,.m4v,.mpc,.mpeg,.mpg,.swf,.wav,.wma,.wmv,.avi,.rm,.rmi,.rmvb,.aiff,.asf,.ogg,.ogv,
# fileAllowSuffixes: .doc,.docx,.rtf,.xls,.xlsx,.csv,.ppt,.pptx,.pdf,.vsd,.txt,.md,.xml,.rar,.zip,7z,.tar,.tgz,.jar,.gz,.gzip,.bz2,.cab,.iso,.ipa,.apk,
#
# #允许上传的文件内容类型图片、word、excel、ppt防止修改后缀恶意上传文件默认不启用验证
## allowContentTypes: image/jpeg,image/gif,image/bmp,image/png,image/x-png,
## application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document,
## application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,
## application/vnd.ms-powerpoint,application/vnd.openxmlformats-officedocument.presentationml.presentation
#============================#
#===== Message settings =====#
#============================#
# 消息提醒中心(专业版)
#msg:
#
# # 是否开启实时发送消息(保存消息后立即检查未读消息并发送),分布式部署下请单独配置消息发送服务,不建议开启此选项。
# realtime:
# # 是否开启
# enabled: true
# # 消息实时推送任务Bean名称
# beanName: msgLocalPushTask
#
# # 邮件发送参数
# email:
# beanName: emailSendService
# fromAddress: test@163.com
# fromPassword: 123456
# fromHostName: smtp.163.com
# sslOnConnect: false
# sslSmtpPort: 994
#
# # 短信网关
# sms:
# beanName: smsSendService
# url: http://localhost:80/msg/sendSms
# data: account=demo&pswd=demo&product=
# prefix: ~
# suffix: 【JeeSite】
#============================#
#===== Video settings =======#
#============================#
#video:
#
# # 视频格式转换 ffmpeg.exe 所放的路径
# ffmpegFile: d:/tools/video/ffmpeg-4.9/bin/ffmpeg.exe
## ffmpegFile: d:/tools/video/libav-10.6-win64/bin/avconv.exe
#
# # 视频格式转换 mencoder.exe 所放的路径
# mencoderFile: d:/tools/video/mencoder-4.9/mencoder.exe
#
# # 将mp4视频的元数据信息转到视频第一帧
# qtFaststartFile: d:/tools/video/qt-faststart/qt-faststart.exe
#============================#
#===== Project settings =====#
#============================#

View File

@@ -3,7 +3,6 @@ rem /**
rem * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
rem *
rem * Author: ThinkGem@163.com
rem *
rem */
echo.
echo [<5B><>Ϣ] <20><><EFBFBD><EFBFBD>Web<65><62><EFBFBD>̡<EFBFBD>
@@ -16,14 +15,20 @@ cd %~dp0
title %cd%
rem <20><><EFBFBD><EFBFBD>JDKĿ¼
rem set "JAVA_HOME=%cd%\jdk1.8.0_x64"
rem <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>·<EFBFBD><C2B7>
set "CLASS_PATH=%cd%/../"
rem <20>Ż<EFBFBD>JVM<56><4D><EFBFBD><EFBFBD>
set JAVA_OPTS=-Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
set "JAVA_OPTS=-Xms512m -Xmx1024m"
rem <20><>ʽһ<CABD><D2BB><EFBFBD><EFBFBD><EFBFBD>û<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
rem set JAVA_OPTS=%JAVA_OPTS% -Dspring.profiles.active=prod
rem <20><>ʽһ<CABD><D2BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ⲿ<EFBFBD>Զ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
rem set "JAVA_OPTS=%JAVA_OPTS% -Dspring.config.location=%cd%\app.yml"
rem <20><>ʽ<EFBFBD><CABD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ⲿ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
rem set JAVA_OPTS=%JAVA_OPTS% -Dspring.config.location=%cd%\app.yml
rem <20><>ʽ<EFBFBD><CABD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>û<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ƣ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ز<EFBFBD>ͬ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD>
rem set "JAVA_OPTS=%JAVA_OPTS% -Dspring.profiles.active=prod"
if "%JAVA_HOME%" == "" goto noJavaHome
if not "%JAVA_HOME%" == "" goto gotJavaHome
@@ -34,11 +39,11 @@ set RUN_JAVA=java
goto runJava
:gotJavaHome
set RUN_JAVA="%JAVA_HOME%\bin\java"
set "RUN_JAVA=%JAVA_HOME%\bin\java"
goto runJava
:runJava
call "%RUN_JAVA%" -cp %cd%/../ %JAVA_OPTS% org.springframework.boot.loader.WarLauncher
call "%RUN_JAVA%" -cp %CLASS_PATH% %JAVA_OPTS% org.springframework.boot.loader.WarLauncher
goto end
:end

View File

@@ -3,25 +3,30 @@
# * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
# *
# * Author: ThinkGem@163.com
# *
# */
echo ""
echo "[信息] 运行Web工程。"
echo ""
# 设置JDK目录
# JAVA_HOME="$PWD/jdk1.8.0_x64"
# 设置类加载路径
CLASS_PATH="$PWD/../"
# 优化JVM参数
JAVA_OPTS="$MAVEN_OPTS -Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m"
JAVA_OPTS="-Xms512m -Xmx1024m"
# 方式一、配置环境名称
# 方式一、配置外部自定义的属性文件(建议)
# JAVA_OPTS="$JAVA_OPTS -Dspring.config.location=$PWD/app.yml"
# 方式二、配置环境名称,加载不同的属性文件
# JAVA_OPTS="$JAVA_OPTS -Dspring.profiles.active=prod"
# 方式二、配置外部属性文件(建议)
# JAVA_OPTS="$JAVA_OPTS -Dspring.config.location=$PWD\app.yml"
if [ -z "$JAVA_HOME" ]; then
RUN_JAVA=java
else
RUN_JAVA="$JAVA_HOME"/bin/java
fi
exec $RUN_JAVA -cp $PWD/../ $JAVA_OPTS org.springframework.boot.loader.WarLauncher
exec $RUN_JAVA -cp $CLASS_PATH $JAVA_OPTS org.springframework.boot.loader.WarLauncher