重构

pom.xml

@@ -63,20 +63,17 @@
             <groupId>com.rsbi.ext</groupId>
             <artifactId>ext3</artifactId>
             <version>1.5</version>
-            <type>jar</type>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/libs/ext3-1.5.jar</systemPath>
         </dependency>
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
             <version>1.2.25</version>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-io -->
+        <!-- https://mvnrepository.com/artifact/commons-io/commons-io -->
         <dependency>
-            <groupId>org.apache.commons</groupId>
+            <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>1.3.2</version>
+            <version>2.8.0</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/com.github.pagehelper/pagehelper -->
         <dependency>

src/main/java/com/ruisitech/bi/util/RSBIUtils.java

@@ -2,7 +2,6 @@ package com.ruisitech.bi.util;
 
 import com.alibaba.fastjson.JSONObject;
 import com.rsbi.ext.engine.view.context.ExtContext;
-import com.rsbi.ext.runtime.tag.CalendarTag;
 import com.ruisitech.bi.entity.frame.User;
 import com.ruisitech.bi.service.frame.ShiroDbRealm;
 import org.apache.ibatis.session.SqlSession;
@@ -210,12 +209,6 @@ public final class RSBIUtils {
 		return exist;
 	}
 	
-	public static String getFestival(Object key, HttpServletRequest req){
-		String df = (String)req.getAttribute("dateformat");
-		String ret = CalendarTag.getFestival((String)key, df);
-		return ret;
-	}
-	
 	/**
 	 * 将容易引起xss漏洞的半角字符直接替换成全角字符 在保证不删除数据的情况下保存 
 	 * @param value

src/main/java/com/ruisitech/bi/web/bireport/ChartController.java

@@ -36,6 +36,7 @@ public class ChartController extends BaseController  {
 		//ser.setParams(tableService.getMvParams());
 		ser.initPreview();
 		String ret = ser.buildMV(mv, req.getServletContext());
+		System.out.println(ret);
 		JSONObject obj = JSONObject.parseObject(ret);
 		return super.buildSucces(obj.toJSONString());
 	}

src/main/java/com/ruisitech/ext/service/SpringBootDaoProvider.java

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2018 本系统版权归成都睿思商智科技有限公司所有
+ * 用户不能删除系统源码上的版权信息, 使用许可证地址:
+ * https://www.ruisitech.com/licenses/index.html
+ */
+package com.ruisitech.ext.service;
+
+import com.rsbi.ext.engine.dao.DaoHelper;
+import com.rsbi.ext.engine.dao.DaoProvider;
+import com.ruisitech.bi.util.RSBIUtils;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+
+import javax.servlet.ServletContext;
+
+/**
+ * springboot 提供 ext3 框架使用的 daoHelper 类
+ * @ClassName SpringBootDaoProvider
+ * @Description SpringBootDaoProvider
+ * @Author huangqin
+ * @Date 2020/12/31 4:18 下午
+ */
+public class SpringBootDaoProvider implements DaoProvider  {
+
+    @Override
+    public DaoHelper getDaoHelper(ServletContext sctx) {
+        WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(sctx);
+        DaoHelper dao = (DaoHelper)ctx.getBean("daoHelper");
+        return dao;
+    }
+}

src/main/webapp/WEB-INF/ext2/ext-config/ext-config.xml

@@ -12,6 +12,7 @@
 	<constant name="fieldLoader" value="com.ruisitech.ext.service.MyCrossFieldLoader" />
 	<constant name="xmlLoader" value="com.ruisitech.ext.service.LoadXmlFromDB"/>
 	<constant name="contextListener" value="com.ruisitech.bi.util.MVCleanListener"/>
+	<constant name="daoProvider" value="com.ruisitech.ext.service.SpringBootDaoProvider"/>
 
 	<chart shape="line" class="com.rsbi.ext.engine.view.emitter.chart.echarts.LineChart"/>
 	<chart shape="area" class="com.rsbi.ext.engine.view.emitter.chart.echarts.AreaChart"/>

src/main/webapp/WEB-INF/ext2/ext-config/pages/frame/LeftMenu.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ext-config>
-		<textField type="hidden" id="node" show="true"/>
-		<include page="/pages/frame/Menu-left.jsp"></include>
-</ext-config>

src/main/webapp/WEB-INF/ext2/ext-config/pages/frame/Menu.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ext-config>
-		<textField type="hidden" id="name" show="true"/>
-		<textField type="hidden" id="note" show="true"/>
-		<textField type="hidden" id="id" show="true"/>
-		<textField type="hidden" id="pid" show="true"/>
-		<textField type="hidden" id="order" show="true"/>
-		<textField type="hidden" id="url" show="true"/>
-		<textField type="hidden" id="avatar" show="true"/>
-		<box title="菜单管理">
-		<include page="/pages/frame/Menu.jsp"></include>
-		</box>
-	
-</ext-config>

src/main/webapp/WEB-INF/ext2/ext-config/pages/frame/Password-mod.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ext-config>
-			<div align="center" style="margin:10px;">
-				
-				<if test = "${flag}=='y'">
-				<text>修改密码成功。</text><br/><br/>
-				<button type="button" onClick="parent.closeMe()" desc="关闭"/>
-				</if>
-				<if test = "${flag}=='n'">
-				<text>操作失败,输入密码与原密码不符。</text><br/><br/>
-				<link title="返回" action="frame.Password" method=""/>
-				</if>
-				
-			</div>
-</ext-config>

src/main/webapp/WEB-INF/ext2/ext-config/pages/frame/Password.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ext-config>
-			<div align="center" style="margin:10px;">
-			<textField type="hidden" id="flag" show="true"/>
-				<textField id="password1" desc="原 密 码" type = "password" require="true"/><br/><br/>
-				<textField id="password2" desc="新 密 码" type = "password" require="true"/><br/><br/>
-				<textField id="password3" desc="密码确认" type = "password" require="true"/><br/><br/>
-				<div align="center">
-				<button action="frame.Password" method="mod" desc="提交" checkParam="true"/>
-				<button type="button" onClick="parent.closeMe()" desc="关闭"/>
-				</div>
-			</div>
-			
-			
-			<submitCheck>
-			<![CDATA[
-			if(ff.password2.value != ff.password3.value){
-				alert('两次密码不一致.');
-				return false;
-			}
-			if(ff.password2.value.length < 6 || ff.password2.value.length < 6){
-				alert('密码长度过短，必须6位以上.');
-				return false;
-			}
-			]]>
-			</submitCheck>
-</ext-config>

src/main/webapp/WEB-INF/ext2/ext-config/pages/frame/Role-list.xml

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ext-config>
-		<box title="角色管理">
-		
-			
-			<div align="left">
-				<textField id="role_name" desc="角色名称"/>
-				
-				<button action="frame.Role" method="list" desc="搜索" checkParam="false"/>
-			</div>
-			<div align="left" style="padding:5px;">
-			
-				<button action="frame.Role" desc="新增" method="preAdd" checkParam="false" submit="get"></button>
-				<button action="frame.Role" method="preMod" submit="get" desc="修改"></button>
-				<button action="frame.Role" method="delete" desc="删除" confirm="true" styleClass="btn btn-danger btn-sm"></button>
-			</div>
-			<dataGrid>
-				<col-config>
-					<col type="checkbox" alias="role_id" id="id" require="true" desc="多选" width="8%" />
-					<col alias="role_name" desc="角色名称" width="20%" order="true"/>
-					<col alias="create_user" desc="创建人" width="11%" order="true"/>
-					<col alias="role_id" desc="操作" width="25%">
-						<colLink byAlias="role_id" action="frame.Role" desc=" 关联用户 " method="roleUserList" styleClass="btn btn-primary btn-xs" />
-						<colLink byAlias="role_id" action="frame.Role" desc=" 授权菜单 " method="roleMenuList" styleClass="btn btn-primary btn-xs"/>
-					</col>
-				</col-config>
-				<ds pageSize="15">
-					<![CDATA[
-						select role_id,role_name,role_desc,create_user from sc_role
-						#if(${role_name} != '')
-						where role_name like '%${role_name}%'
-						#end
-						order by ord 
-							
-				]]>
-				</ds>
-			</dataGrid>
-		</box>
-</ext-config>

src/main/webapp/WEB-INF/ext2/ext-config/pages/frame/Role-preAdd.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ext-config>
-		<box title="角色新增">
-			<br/>
-			<textField desc="角色名称" id="name" size="39" require="true"/><br/><br/>
-			<textField desc=" 排 &amp;nbsp;  &amp;nbsp; 序  " id="ord" size="39" require="true" value="0"/><br/><br/>
-			<textField desc="备注信息" id="desc" size="23" type="textarea"/><br/><br/>
-			<button desc="保存" action="frame.Role" method="add"/> 
-			<link action="frame.Role" method="list" title="返回"/>
-		</box>
-</ext-config>

src/main/webapp/WEB-INF/ext2/ext-config/pages/frame/Role-preMod.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ext-config>
-		<box title="角色修改"><br/>
-		<data key="ruleKey">
-			select role_name,role_desc,ord from sc_role t where t.role_id = '${id}'
-		
-		</data>
-			<textField type="hidden" id="id" show="true"/>
-			<textField desc="角色名称" id="role_name" size="39" require="true" value="${ruleKey.role_name}">
-			
-			</textField>
-			
-			<br/><br/>
-			<textField desc=" 排 &amp;nbsp;  &amp;nbsp; 序  " id="ord" size="39" require="true" value="${ruleKey.ord}"/><br/><br/>
-			<textField desc="备注信息" id="role_desc" size="23" type="textarea" value = "${ruleKey.role_desc}"/><br/><br/>
-			<button desc="保存" action="frame.Role" method="mod"/> 
-			<link action="frame.Role" method="list" title="返回"/>
-		</box>
-</ext-config>

src/main/webapp/WEB-INF/ext2/ext-config/pages/frame/Role-roleDataList.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ext-config>
-		<box title="角色管理 >> 数据权限">
-			<data key="roleKey">select role_name "name" from sc_role t where t.role_id = '${role_id}'</data>
-			<text>
-				<template>
-					<![CDATA[
-					<div style="margin:10px 0px 5px 3px; font-size:13px; float:left">
-					当前角色：$roleKey.name
-					</div>
-					]]>
-				</template>
-			</text>
-			<textField type="hidden" id="role_id" show="true"/>
-			<textField type="hidden" id="node" show="true"/>
-			<textField type="hidden" id="dataIds" show="true"/>
-			<div align="right" style="padding:5px;">
-				<button action="frame.Role" desc=" 保存 " type="button" onClick="getDataIds()" ></button>
-				<link title="返回" action="frame.Role" method="list"/>
-			</div>
-			<include page="/pages/frame/role/role-data.jsp"></include>
-		</box>
-</ext-config>

src/main/webapp/WEB-INF/ext2/ext-config/pages/frame/Role-roleMenuList.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ext-config>
-		<box title="角色管理 >> 所辖菜单">
-			<data key="roleKey">select role_name "name" from sc_role t where t.role_id = '${role_id}'</data>
-			<text>
-				<template>
-					<![CDATA[
-					<div style="margin:10px 0px 5px 3px; font-size:13px; float:left">
-					当前角色：$roleKey.name
-					</div>
-					]]>
-				</template>
-			</text>
-			<textField type="hidden" id="role_id" show="true"/>
-			<textField type="hidden" id="node" show="true"/>
-			<textField type="hidden" id="menuIds" show="true"/>
-			<div align="right" style="padding:5px;">
-				<button action="frame.Role" desc=" 保存 " type="button" onClick="getMenuIds()" ></button>
-				<link title="返回" action="frame.Role" method="list"/>
-			</div>
-			<include page="/pages/frame/role/role-menu.jsp"></include>
-		</box>
-</ext-config>

src/main/webapp/WEB-INF/ext2/ext-config/pages/frame/Role-roleReportList.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ext-config>
-		<box title="角色管理 >> 所辖报表">
-			<data key="roleKey">select role_name "name" from sc_role t where t.role_id = '${role_id}'</data>
-			<text>
-				<template>
-					<![CDATA[
-					<div style="margin:10px 0px 5px 3px; font-size:13px; float:left">
-					当前角色：$roleKey.name
-					</div>
-					]]>
-				</template>
-			</text>
-			<textField type="hidden" id="role_id" show="true"/>
-			<div align="right" style="padding:5px;">
-				<button action="frame.Role" desc=" 保存 " type="button" onClick="getReportIds()" ></button>
-				<link title="返回" action="frame.Role" method="list"/>
-			</div>
-			<include page="/pages/frame/role/role-report.jsp"></include>
-		</box>
-</ext-config>

src/main/webapp/WEB-INF/ext2/ext-config/pages/frame/Role-roleUserList.xml

@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ext-config>
-	
-		<box title="角色管理 >> 所辖用户">
-			<data key="ruleKey">select role_name "name" from sc_role t where t.role_id = '${role_id}'</data>
-			<text>
-				<template>
-					<![CDATA[
-					<div style="margin:10px 0px 5px 3px; font-size:13px; float:left">
-					当前角色  <font color='red'>$ruleKey.name</font>  所管辖用户列表：             
-					</div>
-					]]>
-				</template>
-				
-			</text>
-			
-			<textField type="hidden" id="role_id" show="true"/>
-			<div align="right" style="padding:5px;">
-				<button action="frame.Role" desc="添加" method="roleUserPreAdd" checkParam="false" submit="get"></button>
-				<button action="frame.Role" method="roleUserDel" desc="删除" styleClass="btn btn-danger btn-sm" confirm="true"></button>
-				<link title="返回" action="frame.Role" method="list"/>
-			</div>
-			<dataGrid>
-				<col-config>
-					<col type="checkbox" alias="user_id" id="id" require="true" desc="多选" width="10%" />
-					<col alias="staff_id" desc="工号" width="15%"/>
-					<col alias="login_name" desc="用户名" width="15%"/>
-					<col alias="state" desc="状态" width="15%"/>
-				</col-config>
-				<ds pageSize="15">
-					<![CDATA[
-						select a.user_id,staff_id,login_name, '' as "desc", a.state "state" 
-						from sc_login_user a, role_user_rela c
-						where  c.user_id = a.user_id and c.role_id = '${role_id}'
-				]]>
-				</ds>
-			</dataGrid>
-		</box>
-	
-</ext-config>

src/main/webapp/WEB-INF/ext2/ext-config/pages/frame/Role-roleUserPreAdd.xml

@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ext-config>
-		<box title="角色管理 >> 所辖用户 >> 添加用户">
-			<textField type="hidden" id="role_id" show="true"/>
-			<fieldset title="查询条件">
-				<textField id="staffId" desc="工 &amp;nbsp; 号"/>
-				<textField id="login_name" desc=" 用户名称"/> 
-				<select desc=" 用户状态" id="state">
-				 <option value="">不限</option>
-				 <option value="1">开启</option>
-				 <option value="0">关闭</option>
-				</select>
-				<button action="frame.Role" method="roleUserPreAdd" desc="搜索" checkParam="false"/>
-				<br/>
-			</fieldset>
-			<data key="roleKey">select role_name "name" from sc_role t where t.role_id = '${role_id}'</data>
-			<text>
-				<template>
-					<![CDATA[
-					<div style="margin:10px 0px 5px 3px; font-size:13px; float:left">
-					当前角色：$roleKey.name               
-					</div>
-					]]>
-				</template>
-			</text>
-			<div align="right" style="padding:5px;">
-				<button action="frame.Role" desc="添加所选用户到指定角色" method="roleUserAdd"></button>
-				<link title="返回" action="frame.Role" method="list"/>
-			</div>
-			<!-- 查询是否需要控制用户的状态 -->
-			<dataGrid>
-				<col-config>
-					<col type="checkbox" alias="user_id" id="id" require="true" desc="多选" width="10%" />
-					<col alias="staff_id" desc="用户工号" width="15%"/>
-					<col alias="login_name" desc="用户名" width="15%"/>
-					<col alias="state" desc="状态" width="15%"/>
-				</col-config>
-				<!-- 根据flag判断是否需要控制用户，查询不同的sql -->
-				<ds pageSize="15">
-					<![CDATA[
-					select user_id,staff_id,login_name, '' as "desc", a.state "state"   
-					from sc_login_user a
-					where user_id not in (select user_id from role_user_rela where role_id = '${role_id}')
-					#if(${staffId} != '')
-						and staff_id = '${staffId}'
-					#end
-					#if(${login_name} != '')
-						and login_name = '${login_name}'
-					#end
-					#if(${state} != '')
-						and a.state = '${state}'
-					#end
-				]]>
-				</ds>
-			</dataGrid>
-		</box>
-</ext-config>

src/main/webapp/WEB-INF/ext2/ext-config/pages/frame/User-preAdd.xml

@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ext-config>
-		<box title="用户管理 >> 添加用户">
-			<div style="margin:10px;">
-			<textField id="node" type="hidden" show="true"/>
-			<textField id="staffId" desc="用户工号" size="40" require="true"/><text>(登录使用)</text><br/><br/>
-			<textField id="pwd" desc="登录密码" size="40" require="true" type="password" readonly="true" value="123456"/><text>(默认：123456)</text><br/><br/>
-			<textField id="name" desc="用户名称" size="40" require="true"/><br/><br/>
-			<select id="sex" desc="用户性别">
-				<option value="男">男</option>
-				<option value="女">女</option>
-			</select><br/><br/>
-			<select id="state" desc="账号状态">
-				<option value="1">启用</option>
-				<option value="0">停用</option>
-			</select><br/><br/>
-			
-			<textField id="mobile" desc="手机号码" size="40"/><br/><br/>
-			<textField id="offmobile" desc="办公电话" size="40"/><br/><br/>
-			<textField id="email" desc="电子邮件" size="40"/>
-			<br/><br/>
-			<button desc="保存" action="frame.User" method="save"/>
-			<link action="frame.User" title="返回"/>
-			</div>
-		</box>
-		<text>
-		<![CDATA[
-		<script language="javascript">
-		function showdept(){
-			$('#pdailog').dialog({
-				title: '选择组织机构',
-				width: 300,
-				height: 320,
-				closed: false,
-				cache: false,
-				modal: true,
-				toolbar:null,
-				content: "<ul id=\"depttree\"></ul>",
-				buttons:[{
-						text:'确定',
-						iconCls:'icon-ok',
-						handler:function(){
-							var node = $("#pdailog #depttree").tree("getSelected");
-							if(node == null){
-								 $.messager.alert("出错了。","请选择组织机构。", "error");
-								 return;
-							}
-							$("#dept").val(node.text);
-							$("#dept_id").val(node.id);
-							$('#pdailog').dialog('close');
-						}
-					},{
-						text:'关闭',
-						iconCls:"icon-cancel",
-						handler:function(){
-							$('#pdailog').dialog('close');
-						}
-					}]
-			});
-			$("#depttree").tree({
-				url:'../frame/Department!tree.action?t='+Math.random(),
-				animate:true
-			});
-		}
-		</script>
-		<div id="pdailog"></div>
-		]]>
-		</text>
-		
-</ext-config>

src/main/webapp/WEB-INF/ext2/ext-config/pages/frame/User-preMod.xml

@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ext-config>
-		<box title="用户管理 >> 修改用户">
-		<div style="margin:10px;">
-			<textField type="hidden" id="user_id" show="true"/>
-			<data key="user">
-				select a.* from sc_login_user a
-				 where a.user_id= '${user_id}'
-			</data>
-			<br/>
-			<textField id="staffId" desc="用户工号" size="40" require="true" value="${user.staff_id}"/><text>(登录使用)</text><br/><br/>
-			<textField id="name" desc="用户名称" size="40" require="true" value="${user.login_name}"/><br/><br/>
-			<textField id="areaNo" type="hidden" show="true" value="1"/>
-			<select id="sex" desc="用户性别" value="${user.gender}">
-				<option value=""></option>
-				<option value="男">男</option>
-				<option value="女">女</option>
-			</select><br/><br/>
-			
-			<select id="state" desc="账号状态" value="${user.state}">
-				<option value="1">启用</option>
-				<option value="0">停用</option>
-			</select><br/><br/>
-			
-			<textField id="mobile" desc="手机号码" size="40" value="${user.mobilePhone}"/><br/><br/>
-			<textField id="offmobile" desc="办公电话" size="40" value="${user.OFFICETEL}"/><br/><br/>
-			<textField id="email" desc="电子邮件" size="40" value="${user.EMAIL}"/>
-			<br/><br/>
-			
-			<button desc="保存" action="frame.User" method="mod"/>
-			<link action="frame.User" title="返回"/>
-			</div>
-		</box>
-		
-		<text>
-		<![CDATA[
-		<script language="javascript">
-		function showdept(){
-			$('#pdailog').dialog({
-				title: '选择组织机构',
-				width: 300,
-				height: 320,
-				closed: false,
-				cache: false,
-				modal: true,
-				toolbar:null,
-				content: "<ul id=\"depttree\"></ul>",
-				buttons:[{
-						text:'确定',
-						iconCls:'icon-ok',
-						handler:function(){
-							var node = $("#pdailog #depttree").tree("getSelected");
-							if(node == null){
-								 $.messager.alert("出错了。","请选择组织机构。", "error");
-								 return;
-							}
-							$("#dept").val(node.text);
-							$("#dept_id").val(node.id);
-							$('#pdailog').dialog('close');
-						}
-					},{
-						text:'关闭',
-						iconCls:"icon-cancel",
-						handler:function(){
-							$('#pdailog').dialog('close');
-						}
-					}]
-			});
-			$("#depttree").tree({
-				url:'../frame/Department!tree.action?t='+Math.random(),
-				animate:true
-			});
-		}
-		</script>
-		<div id="pdailog"></div>
-		]]>
-		</text>
-</ext-config>

src/main/webapp/WEB-INF/ext2/ext-config/pages/frame/User-save.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ext-config>
-		<box title="出错了">
-		<div style="margin:15px;">
-				<text>工号存在重复，请重新填写工号。</text>
-				<link title="返回" action="frame.User" method="preAdd" allowParam="false"></link>
-		</div>
-		</box>
-</ext-config>

src/main/webapp/WEB-INF/ext2/ext-config/pages/frame/User.xml

@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ext-config>
-<script>
- function showstate(a, b, c){
- 	var a = a.get("state");
- 	if(a == 0){
- 		out.print("停用");
- 	}else{
- 		out.print("启用");
- 	}
- }
-</script>
-
-		<box title="用户管理">
-				<textField id="staffId" desc="工 &amp;nbsp; 号"/>
-				<textField id="login_name" desc=" 用户名称"/> 
-				<select desc=" 账号状态 " id="state">
-				 <option value="">不限</option>
-				 <option value="1">启用</option>
-				 <option value="0">停用</option>
-				</select> 
-				<button action="frame.User" method="" desc="搜索" checkParam="false"/>
-			
-			
-			<div align="left" style="padding:3px;">
-				<button action="frame.User" desc="新建" method="preAdd" checkParam="false" submit="get"></button>
-				<button action="frame.User" method="preMod" submit="get" desc="修改">
-				</button>
-				<button action="frame.User" method="del" desc="删除" styleClass="btn btn-danger btn-sm" confirm="true" submit="get"></button>
-			</div>
-			
-			<dataGrid>
-				<col-config>
-					<col type="radio" alias="user_id" id="user_id" require="true" desc="单选" width="8%" />
-					<col alias="staff_id" desc="工号" width="10%"/>
-					<col alias="login_name" desc="用户名" width="10%"/>
-					<col alias="state" desc="状态" width="10%" jsFunc="showstate" align="center"/>
-					<col alias="log_cnt" desc="登陆次数" width="10%" align="center"/>
-					<col alias="ldate" desc="登陆时间" width="15%" align="center" formatPattern="yyyy-MM-dd HH:mm:ss"/>
-					<col alias="user_id" desc="操作" width="20%">
-						<colLink byAlias="user_id" action="frame.UserPermission" desc=" 关联角色 " styleClass="btn btn-primary btn-xs" method="roleList" />
-						<colLink byAlias="user_id" action="frame.UserPermission" desc=" 授权菜单 " styleClass="btn btn-primary btn-xs" method="menuList" />
-					</col>
-				</col-config>
-				<ds pageSize="15">
-					<![CDATA[
-					select user_id,staff_id,login_name, a.state "state",log_cnt,
-					#if($dbName == 'sqlite')
-					datetime(LOG_DATE/1000, 'unixepoch', 'localtime') as ldate
-					#end
-					#if($dbName == 'mysql')
-					LOG_DATE as ldate
-					#end
-					from sc_login_user a 
-					where 1=1
-					
-					#if(${staffId} != '')
-						and staff_id like '%${staffId}%'
-					#end
-					#if(${login_name} != '')
-						and login_name like '%${login_name}%'
-					#end
-					#if(${state} != '')
-						and a.state = '${state}'
-					#end 
-					]]>
-				</ds>
-			</dataGrid>
-		</box>
-</ext-config>

src/main/webapp/WEB-INF/ext2/ext-config/pages/frame/UserInfo.xml

@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ext-config>
-
-<text>
- <![CDATA[
- <style>
- .t_uinfo {
- 	width: 100%;
-    border-collapse: collapse;
-	border: 1px solid #CACACA;
-    border-spacing: 0px;
-    border-cellpadding: 0px;
- }
- 
- .t_uinfo td {
- 	border: 1px solid #CACACA;
-    PADDING: 3px;
-    font-size: 12px;
-     height:25px;
- }
-  .t_uinfo th {
- 	border: 1px solid #CACACA;
-    PADDING: 3px;
-    font-size: 13px;
-     height:25px;
-    background-color:#F1F7FE;
-    font-weight:normal;
- }
- </style>
-  ]]>
-</text>
-
-
-<data key="uinfo">
-select login_name, log_date log_date, staff_id, state, log_cnt, date_start, date_end, b.name company, a.space_size
-from sc_login_user a, code_company b
- where user_id = ${s.userId} and a.site_id = b.id
-</data>
-
-			<div align="center"  class="crossReport">
-			
-			<text>
-			<template>
-			 <![CDATA[
-			
-<table cellpadding="0" cellspacing="0" class="t_uinfo">
-<tr>
-<th align="left" width='35%'>登录名： </th>
-<td align="left">${uinfo.staff_id}</td>
-</tr>
-<tr>
-<th align="left">所属企业： </th>
-<td align="left">${uinfo.company}</td>
-</tr>
-<tr>
-<th align="left">账号状态： </th>
-<td align="left">#if($uinfo.state == 1)
-      正常
-    #end
-    #if($uinfo.state == 2)
-      试用
-    #end
- #if($uinfo.state == 0)
-      停用
-    #end
-</td>
-</tr>
-<tr>
-<th align="left">登录次数： </th>
-<td align="left">${uinfo.log_cnt}次</td>
-</tr>
-<tr>
-<th align="left">上次登录时间： </th>
-<td align="left"> $extUtils.dateFmt(${uinfo.log_date}, 'yyyy-MM-dd HH:mm:ss') </td>
-</tr>
-<tr>
-<th align="left">账号开通时间： </th>
-<td align="left"> $extUtils.dateFmt(${uinfo.date_start}, 'yyyy-MM-dd HH:mm:ss') </td>
-</tr>
-<tr>
-<th align="left">账号截至时间： </th>
-<td align="left"> $extUtils.dateFmt(${uinfo.date_end},'yyyy-MM-dd HH:mm:ss') </td>
-</tr>
-<tr>
-<th align="left">剩余天数： </th>
-<td align="left"> $extUtils.dateBetweenNow(${uinfo.date_end}) 天  &nbsp;   <a href='../frame/Pay.action' target='_blank' class="easyui-linkbutton">充值</a> </td>
-</tr>
-<tr>
-<th align="left">已用空间： </th>
-<td align="left"> <font color='red'>${size}</font>兆  / 总空间：${uinfo.space_size}兆  &nbsp;   <a href='../frame/Pay!kr.action' target='_blank' class="easyui-linkbutton">扩容</a>  </td>
-</tr>
-</table>			
-<br/> 
-			 ]]>
-			</template>
-			</text>
-			
-			<textField type="hidden" id="flag" show="true"/>
-				<div>
-				<button type="button" onClick="parent.closeMe()" desc="关闭"/>
-				</div>
-			</div>
-			
-</ext-config>

src/main/webapp/WEB-INF/ext2/ext-config/pages/frame/UserPermission-dataList.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ext-config>
-		<box title="用户管理 >> 数据权限">
-			<textField type="hidden" id="user_id" show="true"/>
-			<div align="right" style="padding:5px;">
-				<button action="frame.User" desc=" 保存 " type="button" onClick="getReportIds()" ></button>
-				<link title="返回" action="frame.User" method=""/>
-			</div>
-			<include page="/pages/frame/User-data.jsp"></include>
-		</box>
-</ext-config>

src/main/webapp/WEB-INF/ext2/ext-config/pages/frame/UserPermission-menuList.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ext-config>
-		<box title="用户管理 >> 所辖菜单">
-			<textField type="hidden" id="user_id" show="true"/>
-			<textField type="hidden" id="id" show="true"/>
-			<textField type="hidden" id="menuIds" show="true"/>
-			<div align="right" style="padding:5px;">
-				<button action="s.user.sc.menu" desc=" 保存 " type="button" onClick="getMenuIds()" method="save"></button>
-				<link title="返回" action="frame.User" method=""/>
-			</div>
-			<include page="/pages/frame/User-menu.jsp"></include>
-		</box>
-</ext-config>

src/main/webapp/WEB-INF/ext2/ext-config/pages/frame/UserPermission-preAddRole.xml

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ext-config>
-		<box title="用户管理 >> 所属用户 >> 添加角色">
-			<textField type="hidden" id="user_id" show="true"/>
-				<textField id="role_name" desc=" 角色名称"/> 
-				<button action="frame.UserPermission" method="preAddRole" desc="搜索" checkParam="false"/>
-				<br/>
-			<data key="userKey">select login_name "name" from sc_login_user t where t.user_id = '${user_id}'</data>
-			<text>
-				<template>
-					<![CDATA[
-					<div style="margin:10px 0px 5px 3px; font-size:13px; float:left">
-					当前用户  <font color='red'> $userKey.name </font> 添加角色：               
-					</div>
-					]]>
-				</template>
-			</text>
-			<div align="right" style="padding:5px;">
-				<button action="frame.UserPermission" desc="添加所选角色到指定用户" method="addRole"></button>
-				<link title="返回" action="frame.User" method=""/>
-			</div>
-			<!-- 查询是否需要控制用户的状态 -->
-			<dataGrid>
-				<col-config>
-					<col type="checkbox" alias="role_id" id="role_id" require="true" desc="多选" width="10%" />
-					<col alias="role_name" desc="角色名称" width="15%"/>
-					<col alias="role_desc" desc="地域" width="15%" />
-					<col alias="create_user" desc="创建用户" width="15%"/>
-					<col alias="create_date" desc="创建时间" width="15%"/>
-				</col-config>
-				<!-- 根据flag判断是否需要控制用户，查询不同的sql -->
-				<ds pageSize="15">
-					<![CDATA[
-					select role_id,role_name,role_desc, create_user,create_date  
-					from sc_role a
-					where role_id not in 
-					(
-						select role_id from role_user_rela where user_id = ${user_id}
-					)
-					#if(${role_name} != '')
-						and role_name like '%${role_name}%'
-					#end
-				
-				]]>
-				</ds>
-			</dataGrid>
-		</box>
-</ext-config>

src/main/webapp/WEB-INF/ext2/ext-config/pages/frame/UserPermission-reportList.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ext-config>
-		<box title="用户管理 >> 用户报表">
-			<textField type="hidden" id="user_id" show="true"/>
-			<div align="right" style="padding:5px;">
-				<button action="frame.User" desc=" 保存 " type="button" onClick="getReportIds()" ></button>
-				<link title="返回" action="frame.User" method=""/>
-			</div>
-			<include page="/pages/frame/User-report.jsp"></include>
-		</box>
-</ext-config>

src/main/webapp/WEB-INF/ext2/ext-config/pages/frame/UserPermission-roleList.xml

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ext-config>
-		<box title="用户管理 >> 用户角色">
-				<data key="roleKey">select login_name "name" from sc_login_user t where t.user_id = '${user_id}'</data>
-			<text>
-				<template>
-					<![CDATA[
-					<div style="margin:10px 0px 5px 3px; font-size:13px; float:left">
-					当前用户  <font color='red'>$roleKey.name</font> 所属角色列表：
-					</div>
-					]]>
-				</template>
-			</text>
-			<textField id="user_id" type="hidden" show="true"></textField>
-			<div align="right" style="padding:5px;">
-				<button action="frame.UserPermission" desc="添加" method="preAddRole" checkParam="false" submit="get"></button>
-				<button action="frame.UserPermission" method="delRole" desc="删除" styleClass="btn btn-danger btn-sm" confirm="true"></button>
-				<link action="frame.User" method="" title="返回"/>
-			</div>
-			<dataGrid>
-				<col-config>
-					<col type="checkbox" alias="role_id" id="role_id" require="true" desc="多选" width="10%" />
-					<col alias="role_name" desc="角色" width="15%"/>
-					<col alias="staff_id" desc="工号" width="15%"/>
-					<col alias="login_name" desc="用户名" width="15%"/>						
-				</col-config>
-				<ds>
-					<![CDATA[
-					select a.user_id, c.staff_id, a.role_id, b.role_name,c.user_id,c.login_name
-  					from role_user_rela a, sc_role b, sc_login_user c
- 					where a.role_id = b.role_id and c.user_id = a.user_id
-   					and c.user_id = '${user_id}'
- 					order by create_date
-				]]>
-				</ds>
-			</dataGrid>
-		</box>
-</ext-config>

src/main/webapp/WEB-INF/ext2/ext-config/pages/test.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ext-config>
-<br/>
-<br/>
-<div style="margin:10px;">
-<text>abcedfg</text>
-</div>
-
-<include page="/resource/css/catalog2.css" />
-
-</ext-config>