Commit 6de32c6d authored by trumansdo's avatar trumansdo
Browse files

改变目录结构,以防止ide混合打开前端项目,导致误操作改变前端项目的格式


Signed-off-by: default avatartrumansdo <1012243881@qq.com>
parent afdf4eec
<!--# layout("/common/layout.html",{"jsBase":"/js/admin/user/"}){ --> <!--# layout("/common/layout.html",{"jsBase":"/js/admin/user/"}){ -->
<form class="layui-form layui-form-pane" id="addForm" <form class="layui-form layui-form-pane" id="addForm"
> >
<div class="layui-row"> <div class="layui-row">
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">用户姓名</label> <label class="layui-form-label">用户姓名</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="name" autocomplete="off" <input type="text" name="name" autocomplete="off"
placeholder="请输入标题" class="layui-input" value=""> placeholder="请输入标题" class="layui-input" value="">
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">用户帐号</label> <label class="layui-form-label">用户帐号</label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<input type="text" name="code" lay-verify="required" <input type="text" name="code" lay-verify="required"
placeholder="请输入" autocomplete="off" class="layui-input" placeholder="请输入" autocomplete="off" class="layui-input"
value=""> value="">
</div> </div>
</div> </div>
</div> </div>
<div class="layui-row"> <div class="layui-row">
<div class="layui-col-xs4"> <div class="layui-col-xs4">
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">所在机构</label> <label class="layui-form-label">所在机构</label>
<layui:orgInput style='layui-input-inline' name="orgId" id="orgId" <layui:orgInput style='layui-input-inline' name="orgId" id="orgId"
value=""></layui:orgInput> value=""></layui:orgInput>
</div> </div>
</div> </div>
</div> </div>
<div class="layui-col-xs4"> <div class="layui-col-xs4">
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">用户状态</label> <label class="layui-form-label">用户状态</label>
<layui:simpleDictSelect style='layui-input-inline' type="user_state" <layui:simpleDictSelect style='layui-input-inline' type="user_state"
id="state" name="state" value="" /> id="state" name="state" value="" />
</div> </div>
</div> </div>
</div> </div>
<div class="layui-row"> <div class="layui-row">
<div class="layui-col-xs4"> <div class="layui-col-xs4">
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">职务类型</label> <label class="layui-form-label">职务类型</label>
<layui:simpleDictSelect style='layui-input-inline' type="job_type" <layui:simpleDictSelect style='layui-input-inline' type="job_type"
id="jobType0" name="jobType0" value="" group="job_type"/> id="jobType0" name="jobType0" value="" group="job_type"/>
</div> </div>
</div> </div>
</div> </div>
<div class="layui-col-xs4"> <div class="layui-col-xs4">
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">职务类型明细</label> <label class="layui-form-label">职务类型明细</label>
<layui:simpleDictSelect style='layui-input-inline' type="" <layui:simpleDictSelect style='layui-input-inline' type=""
id="jobType1" name="jobType1" value="" group="job_type"/> id="jobType1" name="jobType1" value="" group="job_type"/>
</div> </div>
</div> </div>
</div> </div>
<div class="layui-row"> <div class="layui-row">
<layui:attachment name="attachmentId" batchFileUUID="${uuid()}" isNew="true" bizType="User"/> <layui:attachment name="attachmentId" batchFileUUID="${uuid()}" isNew="true" bizType="User"/>
</div> </div>
<layui:submitButtons id="saveUser" /> <layui:submitButtons id="saveUser" />
</form> </form>
<!--#} --> <!--#} -->
<script> <script>
layui.use(['add'], function(){ layui.use(['add'], function(){
var userAdd = layui.add var userAdd = layui.add
userAdd.init(); userAdd.init();
}); });
</script> </script>
<!--# layout("/common/layout.html",{"jsBase":"/js/admin/user/"}){ --> <!--# layout("/common/layout.html",{"jsBase":"/js/admin/user/"}){ -->
<form class="layui-form layui-form-pane" id="changePasswordForm" <form class="layui-form layui-form-pane" id="changePasswordForm"
> >
<div class="layui-row"> <div class="layui-row">
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">用户姓名</label> <label class="layui-form-label">用户姓名</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="name" disabled autocomplete="off" <input type="text" name="name" disabled autocomplete="off"
class="layui-input" value="${user.name}"> class="layui-input" value="${user.name}">
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">用户帐号</label> <label class="layui-form-label">用户帐号</label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<input type="text" name="code" disabled <input type="text" name="code" disabled
placeholder="请输入" autocomplete="off" class="layui-input" placeholder="请输入" autocomplete="off" class="layui-input"
value="${user.code}"> value="${user.code}">
</div> </div>
</div> </div>
</div> </div>
<div class="layui-row"> <div class="layui-row">
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">密码</label> <label class="layui-form-label">密码</label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<input type="password" name="password" autocomplete="off" <input type="password" name="password" autocomplete="off"
placeholder="请输入密码" class="layui-input" value=""> placeholder="请输入密码" class="layui-input" value="">
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">密码确认</label> <label class="layui-form-label">密码确认</label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<input type="password" name="password2" lay-verify="required" <input type="password" name="password2" lay-verify="required"
placeholder="请再次输入密码" autocomplete="off" class="layui-input" placeholder="请再次输入密码" autocomplete="off" class="layui-input"
> >
</div> </div>
</div> </div>
</div> </div>
<layui:submitButtons id="savePassword" /> <layui:submitButtons id="savePassword" />
<input type="hidden" name="id" value=${user.id} /> <input type="hidden" name="id" value=${user.id} />
</form> </form>
<!--#} --> <!--#} -->
<script> <script>
layui.use(['changePassword'], function(){ layui.use(['changePassword'], function(){
var changePassword = layui.changePassword var changePassword = layui.changePassword
changePassword.init(); changePassword.init();
}); });
</script> </script>
<!--# layout("/common/layout.html",{"jsBase":"/js/admin/user/"}){ --> <!--# layout("/common/layout.html",{"jsBase":"/js/admin/user/"}){ -->
<form class="layui-form layui-form-pane" id="updateForm" <form class="layui-form layui-form-pane" id="updateForm"
> >
<div class="layui-row"> <div class="layui-row">
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">用户姓名</label> <label class="layui-form-label">用户姓名</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="name" autocomplete="off" <input type="text" name="name" autocomplete="off"
placeholder="请输入标题" class="layui-input" value="${user.name}"> placeholder="请输入标题" class="layui-input" value="${user.name}">
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">用户帐号</label> <label class="layui-form-label">用户帐号</label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<input type="text" name="code" disabled lay-verify="required" <input type="text" name="code" disabled lay-verify="required"
placeholder="请输入" autocomplete="off" class="layui-input" placeholder="请输入" autocomplete="off" class="layui-input"
value="${user.code}"> value="${user.code}">
</div> </div>
</div> </div>
</div> </div>
<div class="layui-row"> <div class="layui-row">
<div class="layui-col-xs4"> <div class="layui-col-xs4">
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">所在机构</label> <label class="layui-form-label">所在机构</label>
<layui:orgInput style='layui-input-inline' name="orgId" id="orgId" <layui:orgInput style='layui-input-inline' name="orgId" id="orgId"
value="${user.orgId}"></layui:orgInput> value="${user.orgId}"></layui:orgInput>
</div> </div>
</div> </div>
</div> </div>
<div class="layui-col-xs4"> <div class="layui-col-xs4">
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">用户状态</label> <label class="layui-form-label">用户状态</label>
<layui:simpleDictSelect style='layui-input-inline' type="user_state" <layui:simpleDictSelect style='layui-input-inline' type="user_state"
id="state" name="state" value="${user.state}" /> id="state" name="state" value="${user.state}" />
</div> </div>
</div> </div>
</div> </div>
<div class="layui-row"> <div class="layui-row">
<div class="layui-col-xs4"> <div class="layui-col-xs4">
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">职务类型</label> <label class="layui-form-label">职务类型</label>
<layui:simpleDictSelect style='layui-input-inline' type="job_type" <layui:simpleDictSelect style='layui-input-inline' type="job_type"
id="jobType0" name="jobType0" value="${user.jobType0}" group="job_type"/> id="jobType0" name="jobType0" value="${user.jobType0}" group="job_type"/>
</div> </div>
</div> </div>
</div> </div>
<div class="layui-col-xs4"> <div class="layui-col-xs4">
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">职务类型明细</label> <label class="layui-form-label">职务类型明细</label>
<layui:simpleDictSelect style='layui-input-inline' type="" <layui:simpleDictSelect style='layui-input-inline' type=""
id="jobType1" name="jobType1" value="${user.jobType1}" group="job_type"/> id="jobType1" name="jobType1" value="${user.jobType1}" group="job_type"/>
</div> </div>
</div> </div>
</div> </div>
<div class="layui-row"> <div class="layui-row">
<layui:attachment name="attachmentId" batchFileUUID="${user.attachmentId}" isNew="false" bizId="${user.id}" bizType="User"/> <layui:attachment name="attachmentId" batchFileUUID="${user.attachmentId}" isNew="false" bizId="${user.id}" bizType="User"/>
</div> </div>
<layui:submitButtons id="saveUser" /> <layui:submitButtons id="saveUser" />
<input type="hidden" name="id" value=${user.id} /> <input type="hidden" name="id" value=${user.id} />
</form> </form>
<!--#} --> <!--#} -->
<script> <script>
layui.use(['edit'], function(){ layui.use(['edit'], function(){
var userEdit = layui.edit var userEdit = layui.edit
userEdit.init(); userEdit.init();
}); });
</script> </script>
<!--#layout("/common/layout.html",{"jsBase":"/js/admin/user/"}){ --> <!--#layout("/common/layout.html",{"jsBase":"/js/admin/user/"}){ -->
<layui:searchForm formId="searchForm" condition="${search}"> <layui:searchForm formId="searchForm" condition="${search}">
</layui:searchForm> </layui:searchForm>
<div class="layui-btn-group"> <div class="layui-btn-group">
<layui:accessButton function="user.add" action="add">增加</layui:accessButton> <layui:accessButton function="user.add" action="add">增加</layui:accessButton>
<layui:accessButton function="user.edit" action="edit">编辑</layui:accessButton> <layui:accessButton function="user.edit" action="edit">编辑</layui:accessButton>
<layui:accessButton function="user.del" action="del">删除</layui:accessButton> <layui:accessButton function="user.del" action="del">删除</layui:accessButton>
<layui:accessButton function="user.role" action="userRole">操作角色</layui:accessButton> <layui:accessButton function="user.role" action="userRole">操作角色</layui:accessButton>
<layui:accessButton function="user.role" action="userRole">流程角色</layui:accessButton> <layui:accessButton function="user.role" action="userRole">流程角色</layui:accessButton>
<layui:accessButton function="user.password" action="changePassword">修改密码</layui:accessButton> <layui:accessButton function="user.password" action="changePassword">修改密码</layui:accessButton>
<layui:accessButton function="user.export" action="exportUsers">导出Excel</layui:accessButton> <layui:accessButton function="user.export" action="exportUsers">导出Excel</layui:accessButton>
</div> </div>
<table id="userTable" lay-filter="userTable"></table> <table id="userTable" lay-filter="userTable"></table>
<!--#} --> <!--#} -->
<script> <script>
layui.use(['index'], function(){ layui.use(['index'], function(){
var index = layui.index var index = layui.index
index.init(); index.init();
}); });
</script> </script>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>admin-core</artifactId> <artifactId>admin-core</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<parent> <parent>
<groupId>com.ibeetl</groupId> <groupId>com.ibeetl</groupId>
<artifactId>admin</artifactId> <artifactId>admin</artifactId>
<version>1.3.2</version> <version>1.3.2</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<properties> <properties>
<maven.test.skip>true</maven.test.skip> <maven.test.skip>true</maven.test.skip>
<druid.version>1.1.10</druid.version> <druid.version>1.1.10</druid.version>
<lombok.version>1.18.2</lombok.version> <lombok.version>1.18.2</lombok.version>
<disruptor.version>3.4.2</disruptor.version> <disruptor.version>3.4.2</disruptor.version>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId> <artifactId>spring-boot-starter-tomcat</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jdbc</artifactId> <artifactId>spring-boot-starter-jdbc</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId> <artifactId>spring-boot-starter-aop</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-cache</artifactId> <artifactId>spring-boot-starter-cache</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId> <artifactId>spring-boot-starter-data-redis</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.ibeetl</groupId> <groupId>com.ibeetl</groupId>
<artifactId>beetl-framework-starter</artifactId> <artifactId>beetl-framework-starter</artifactId>
<version>1.2.13.RELEASE</version> <version>1.2.13.RELEASE</version>
</dependency> </dependency>
<!-- Log4j2 异步支持 --> <!-- Log4j2 异步支持 -->
<dependency> <dependency>
<groupId>com.lmax</groupId> <groupId>com.lmax</groupId>
<artifactId>disruptor</artifactId> <artifactId>disruptor</artifactId>
<version>${disruptor.version}</version> <version>${disruptor.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.session</groupId> <groupId>org.springframework.session</groupId>
<artifactId>spring-session-core</artifactId> <artifactId>spring-session-core</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
<version>${lombok.version}</version> <version>${lombok.version}</version>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId> <artifactId>druid-spring-boot-starter</artifactId>
<version>${druid.version}</version> <version>${druid.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.zaxxer</groupId> <groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId> <artifactId>HikariCP</artifactId>
</dependency> </dependency>
<!--<dependency> <!-- <dependency>
<groupId>mysql</groupId> <groupId>com.oracle</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>ojdbc6</artifactId>
</dependency>--> <version>11.2.0</version>
<!-- <dependency> </dependency> -->
<groupId>com.oracle</groupId> <dependency>
<artifactId>ojdbc6</artifactId> <groupId>org.jxls</groupId>
<version>11.2.0</version> <artifactId>jxls-reader</artifactId>
</dependency> --> <version>2.0.3</version>
<dependency> </dependency>
<groupId>org.jxls</groupId> <dependency>
<artifactId>jxls-reader</artifactId> <groupId>org.jxls</groupId>
<version>2.0.3</version> <artifactId>jxls</artifactId>
</dependency> <version>2.4.3</version>
<dependency> <exclusions>
<groupId>org.jxls</groupId> <exclusion>
<artifactId>jxls</artifactId> <artifactId>logback-core</artifactId>
<version>2.4.3</version> <groupId>ch.qos.logback</groupId>
<exclusions> </exclusion>
<exclusion> </exclusions>
<artifactId>logback-core</artifactId> </dependency>
<groupId>ch.qos.logback</groupId> <dependency>
</exclusion> <groupId>org.jxls</groupId>
</exclusions> <artifactId>jxls-poi</artifactId>
</dependency> <version>1.0.14</version>
<dependency> </dependency>
<groupId>org.jxls</groupId> <dependency>
<artifactId>jxls-poi</artifactId> <groupId>org.apache.commons</groupId>
<version>1.0.14</version> <artifactId>commons-lang3</artifactId>
</dependency> <version>3.3.2</version>
<dependency> </dependency>
<groupId>org.apache.commons</groupId> <dependency>
<artifactId>commons-lang3</artifactId> <groupId>org.apache.poi</groupId>
<version>3.3.2</version> <artifactId>poi</artifactId>
</dependency> <version>3.17</version>
<dependency> </dependency>
<groupId>org.apache.poi</groupId> <dependency>
<artifactId>poi</artifactId> <groupId>org.apache.poi</groupId>
<version>3.17</version> <artifactId>poi-ooxml</artifactId>
</dependency> <version>3.17</version>
<dependency> </dependency>
<groupId>org.apache.poi</groupId> </dependencies>
<artifactId>poi-ooxml</artifactId> </project>
<version>3.17</version>
</dependency>
</dependencies>
</project>
package com.ibeetl.admin.core.annotation; package com.ibeetl.admin.core.annotation;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
/** /**
* 用来标注功能id * 用来标注功能id
* <pre> * <pre>
* &#064;Function("user.add") * &#064;Function("user.add")
* public String addUser(){ * public String addUser(){
* } * }
* </pre> * </pre>
* *
* 只有拥有此项功能的角色才能操作,否则,权限不足 * 只有拥有此项功能的角色才能操作,否则,权限不足
* @author lijiazhi * @author lijiazhi
* *
*/ */
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
public @interface Function { public @interface Function {
public String value(); public String value();
public String name() default ""; public String name() default "";
} }
package com.ibeetl.admin.core.annotation; package com.ibeetl.admin.core.annotation;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
/** /**
* 用来标准一个查询类 * 用来标准一个查询类
* @author lijiazhi * @author lijiazhi
* *
*/ */
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
public @interface Query { public @interface Query {
public static final int TYPE_GENERAL = 1; public static final int TYPE_GENERAL = 1;
public static final int TYPE_DATE_BETWEEN = 2; public static final int TYPE_DATE_BETWEEN = 2;
//未实现 //未实现
public static final int TYPE_DATETIME_BETWEEN = 3; public static final int TYPE_DATETIME_BETWEEN = 3;
public static final int TYPE_VALUE_BETWEEN = 4; public static final int TYPE_VALUE_BETWEEN = 4;
public static final int TYPE_DICT = 5; public static final int TYPE_DICT = 5;
//用户自己定义 //用户自己定义
public static final int TYPE_CONTROL = 6; public static final int TYPE_CONTROL = 6;
/** /**
* 中文名字 * 中文名字
* @return * @return
*/ */
public String name(); public String name();
/** /**
* 查询类型,常规,范围,字典,前端自定义 * 查询类型,常规,范围,字典,前端自定义
* @return * @return
*/ */
public int type() default TYPE_GENERAL; public int type() default TYPE_GENERAL;
/** /**
* 是否显示在查询界面上 * 是否显示在查询界面上
* @return * @return
*/ */
public boolean display() default false; public boolean display() default false;
/** /**
* 模糊查询,仅仅针对TYPE_GENERAL * 模糊查询,仅仅针对TYPE_GENERAL
* @return * @return
*/ */
public boolean fuzzy() default false; public boolean fuzzy() default false;
/** /**
* 字典的主键,比如,"user_state" * 字典的主键,比如,"user_state"
* @return * @return
*/ */
public String dict() default ""; public String dict() default "";
/*描述*/ /*描述*/
public String comment() default ""; public String comment() default "";
/** /**
* 控件名字,如组织机构面板 * 控件名字,如组织机构面板
* @return * @return
*/ */
public String control() default ""; public String control() default "";
/** /**
* 顺序,值越小,排在前面 * 顺序,值越小,排在前面
* @return * @return
*/ */
public int order() default 0; public int order() default 0;
/*控件组*/ /*控件组*/
public String group() default ""; public String group() default "";
} }
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment