JEECG 3.7.5 beta VUE+ElementUI SPA单页面应用版本发布

README.md

@@ -1,7 +1,7 @@
 JEECG 微云快速开发平台
 ===============
 
-当前最新版本： 3.7.5（发布日期：20180516）
+当前最新版本： 3.7.5 beta（发布日期：20180519）
 
 前言：
 -----------------------------------
@@ -78,7 +78,7 @@ JEECG
 *   <b>技术点二十五：</b>支持二级管理员，权限细化管理</br>
 *   <b>技术点二十六：</b>代码生成器支持resutful接口生成</br>
 
-* 	JEECG V3.7.5, 经过了专业压力测试,性能测试，保证后台数据的准确性和页面访问速度</br>
+* 	JEECG V3.7.5 beta, 经过了专业压力测试,性能测试，保证后台数据的准确性和页面访问速度</br>
 * 	支持多种浏览器: IE, 火狐, Google 等</br>
 * 	支持数据库: Mysql,Oracle,Postgre,SqlServer等</br>
 * 	基础权限: 用户，角色，菜单权限，按钮权限，数据权限</br>

jeecg-framework/docs/入门必读.txt

@@ -4,7 +4,7 @@
     eclipse + maven + jdk7 + tomcat7 + mysql
 	
 2. 手工执行初始化SQL脚本
-    docs/db/jeecg_3.7.5_mysql.sql
+    docs/db/jeecg_3.7.5_beta_mysql.sql
 	注意： 必须手工执行doc\db下的数据库脚本
 	
 3. 入门开发环境搭建

jeecg-framework/docs/数据库说明.txt

@@ -5,7 +5,7 @@
 
 1.oracle 导入命令
    说明： jeecg脚本导出用户是scott
-   imp scott/tiger@orcl file=jeecg_3.7.5_oracle11g.dmp
+   imp scott/tiger@orcl file=jeecg_3.7.5_beta_oracle11g.dmp
    导入其他用户的表
    imp jeecgos/jeecgos@orcl file=/opt/datatmp/jeecg_3.7.5_oracle11g.dmp fromuser=scott touser=jeecgos ignore=y commit=y buffer=300000000 feedback=10000
 
@@ -16,6 +16,6 @@
 
 4.老版本数据库增量升级
     执行老版本升级SQL脚本
-	3.7.3升级到3.7.5
-    docs/老版本增量升级/jeecg_mysql-3.7.3-update-3.7.5.sql
+	3.7.3升级到3.7.5_beta
+    docs/老版本增量升级/jeecg_mysql-3.7.3_beta-update-3.7.5.sql
 	

jeecg-framework/docs/老版本增量升级/jeecg_mysql-3.7.3_beta-update-3.7.5.sql

@@ -25,4 +25,11 @@ MODIFY COLUMN `username`  varchar(50) NOT NULL COMMENT '用户账号' AFTER `use
 INSERT INTO `t_s_muti_lang` (`id`, `lang_key`, `lang_context`, `lang_code`, `create_date`, `create_by`, `create_name`, `update_date`, `update_by`, `update_name`) VALUES ('402881f2635d5b6e01635d773ab20001', 'username.rang2to50', '用户账号范围在2~50位字符', 'zh-cn', '2018-05-14 15:04:44', 'admin', '管理员', NULL, NULL, NULL);
 INSERT INTO `t_s_muti_lang` (`id`, `lang_key`, `lang_context`, `lang_code`, `create_date`, `create_by`, `create_name`, `update_date`, `update_by`, `update_name`) VALUES ('402881f2635d5b6e01635d77bb650003', 'username.rang2to50', 'User account need 2~50 bits', 'en', '2018-05-14 15:05:17', 'admin', '管理员', NULL, NULL, NULL);
 INSERT INTO `t_s_function` (`ID`, `functioniframe`, `functionlevel`, `functionname`, `functionorder`, `functionurl`, `parentfunctionid`, `iconid`, `desk_iconid`, `functiontype`, `function_icon_style`, `create_by`, `create_name`, `update_by`, `update_date`, `create_date`, `update_name`) VALUES ('402860816361f06a016361f1be0d0001', NULL, '1', 'BootstrapTable(标签版2)', '32', 'jeecgListDemoController.do?bootstrapTableTagDemo2', '4028f6815af3ce54015af3d1ad610001', '8a8ab0b246dc81120146dc8180460000', '8a8ab0b246dc81120146dc8180dd001e', '0', 'fa-life-ring', 'admin', '管理员', 'admin', '2018-05-15 19:27:32', '2018-05-15 11:57:02', '管理员');
-update t_s_muti_lang set lang_context = '3.7.5' where lang_key ='system.version.number';
+ALTER TABLE `jform_graphreport_head`
+MODIFY COLUMN `create_name`  varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL AFTER `create_by`,
+MODIFY COLUMN `update_name`  varchar(100) NULL DEFAULT NULL AFTER `update_by`;
+INSERT INTO `t_s_muti_lang` (`id`, `lang_key`, `lang_context`, `lang_code`, `create_date`, `create_by`, `create_name`, `update_date`, `update_by`, `update_name`) VALUES ('40286081637677e601637724773f0037', 'common.please.select.two.item', '请选择两条数据', 'zh-cn', '2018-05-19 14:44:28', 'admin', '管理员', NULL, NULL, NULL);
+INSERT INTO `t_s_muti_lang` (`id`, `lang_key`, `lang_context`, `lang_code`, `create_date`, `create_by`, `create_name`, `update_date`, `update_by`, `update_name`) VALUES ('40286081637677e601637725f4a50039', 'common.please.select.two.item', 'Please select two data', 'en', '2018-05-19 14:46:06', 'admin', '管理员', NULL, NULL, NULL);
+delete FROM t_s_depart_authg_function_rel where auth_id = '4028838d5f351a87015f351fc33d0002';
+delete FROM t_s_depart_authg_function_rel where auth_id = '4028911b5c0bf9b9015c0c034d8e0013';
+update t_s_muti_lang set lang_context = '3.7.5-beta' where lang_key ='system.version.number';

jeecg-framework/pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.jeecgframework</groupId>
 	<artifactId>jeecg</artifactId>
-	<version>3.7.5</version>
+	<version>3.7.5-beta</version>
 	<packaging>war</packaging>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -16,10 +16,6 @@
 		<hibernate-common-annotations.version>4.0.2.Final</hibernate-common-annotations.version>
 		<hibernate-jpa.version>1.0.1.Final</hibernate-jpa.version>
 
-		<!-- 工作流 -->
-		<activiti.version>5.11</activiti.version>
-		<mybatis.version>3.1.1</mybatis.version>
-
 		<!-- 辅助依赖包 -->
 		<cglib.version>2.2</cglib.version>
 		<aspectj.version>1.6.9</aspectj.version>
@@ -27,8 +23,6 @@
 		<javassist.version>3.15.0-GA</javassist.version>
 		<ant.version>1.6.5</ant.version>
 
-		<mybatis-spring.version>1.1.1</mybatis-spring.version>
-
 		<!-- 工具包 -->
         <!-- json start -->
 		<jackson.version>1.8.4</jackson.version>
@@ -92,7 +86,6 @@
 		<activation.version>1.1.1</activation.version>
 		<aopalliance.version>1.0</aopalliance.version>
 		<xstream.version>1.4.4</xstream.version>
-		<groovy.version>2.3.3</groovy.version>
         <!--poi 工具类 -->
         <jeasypoi.version>2.1.4</jeasypoi.version>
 		<cxf.version>3.0.2</cxf.version>
@@ -267,14 +260,6 @@
 			<artifactId>hibernate-jpa-2.0-api</artifactId>
 			<version>${hibernate-jpa.version}</version>
 		</dependency>
-
-		<!-- anltr  hibernate重复
-		<dependency>
-			<groupId>org.antlr</groupId>
-			<artifactId>antlr</artifactId>
-			<version>${antlr.version}</version>
-		</dependency>
-		-->
 		<!-- spring orm -->
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -287,31 +272,6 @@
 			<version>${spring.version}</version>
 		</dependency>
 
-		<!--工作流依赖包 -->
-		<!--
-		<dependency>
-			<groupId>org.activiti</groupId>
-			<artifactId>activiti-engine</artifactId>
-			<version>${activiti.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.activiti</groupId>
-			<artifactId>activiti-spring</artifactId>
-			<version>${activiti.version}</version>
-		</dependency>
-		-->
-		<!-- mybatis 20170218-去掉无效引用-scott
-		<dependency>
-			<groupId>org.mybatis</groupId>
-			<artifactId>mybatis</artifactId>
-			<version>${mybatis.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.mybatis</groupId>
-			<artifactId>mybatis-spring</artifactId>
-			<version>${mybatis-spring.version}</version>
-		</dependency>
-		 -->
 
 		<!-- 数据库相关依赖包 _start -->
         <!--proxool start -->
@@ -334,13 +294,6 @@
             	</exclusion>
             </exclusions>
         </dependency>
-        <!--
-        <dependency>
-            <groupId>com.cloudhopper.proxool</groupId>
-            <artifactId>proxool-cglib</artifactId>
-            <version>${proxool.version}</version>
-        </dependency>
-        -->
         <!-- proxool end-->
 		<dependency>
 			<groupId>commons-pool</groupId>
@@ -367,26 +320,27 @@
 			<version>${mysql.version}</version>
 			<scope>runtime</scope>
 		</dependency>
-		<!--  sqlserver -->
+		<!--  sqlserver 2008-->
 		<dependency>
 		    <groupId>com.microsoft.sqlserver</groupId>
 		    <artifactId>sqljdbc4</artifactId>
 		    <version>${sqlserver.version}</version>
 		</dependency>
-		<!--<dependency>
+		<!--sqlserver 2005 
+		<dependency>
 			<groupId>org.jeecgframework</groupId>
 			<artifactId>jdbc2005</artifactId>
 			<version>${sqlserver.version}</version>
 			<scope>runtime</scope>
 		</dependency>-->
-		<!--  oracle -->
+		<!--  oracle 
         <dependency>
             <groupId>com.oracle</groupId>
             <artifactId>ojdbc14</artifactId>
             <version>${ojdbc14.version}</version>
             <scope>system</scope>
             <systemPath>${project.basedir}/src/main/webapp/WEB-INF/lib/ojdbc14-10.2.0.5.0-20170917.jar</systemPath>
-        </dependency>
+        </dependency>-->
         <!-- jtds for mssql/db2 
 		<dependency>
 			<groupId>net.sourceforge.jtds</groupId>
@@ -657,12 +611,7 @@
 			<artifactId>ehcache-core</artifactId>
 			<version>${ehcache.version}</version>
 		</dependency>
-		<!-- freemarker
-		<dependency>
-			<groupId>org.freemarker</groupId>
-			<artifactId>freemarker</artifactId>
-			<version>${freemarker.version}</version>
-		</dependency> -->
+		<!-- freemarker -->
 		<dependency>
 			<groupId>org.jeecgframework</groupId>
 			<artifactId>freemarker-null</artifactId>
@@ -841,12 +790,6 @@
 			<artifactId>xstream</artifactId>
 			<version>${xstream.version}</version>
 		</dependency>
-		<!-- groovy 脚本-->
-		<dependency>
-		    <groupId>org.codehaus.groovy</groupId>
-		    <artifactId>groovy</artifactId>
-		    <version>${groovy.version}</version>
-		</dependency>
 		
 		<dependency>
 		  <groupId>commons-httpclient</groupId>
@@ -875,6 +818,15 @@
 		</dependency>
 		<!-- baidu ueditor-->
 		
+		<!-- jeecg plugin-ui-->
+		<dependency>
+			<groupId>org.jeecgframework</groupId>
+			<artifactId>jeecg-plugin-ui</artifactId>
+			<version>1.0.0</version>
+			<scope>system</scope>
+          	<systemPath>${project.basedir}/src/main/webapp/WEB-INF/lib/jeecg-plugin-ui-1.0.0-20180519.jar</systemPath>
+		</dependency>
+		
 		<!-- jsoup HTML parser library @ http://jsoup.org/ -->
 		<dependency>
 		  <groupId>org.jsoup</groupId>
@@ -926,12 +878,6 @@
 			<version>1.0-SNAPSHOT</version>
 			<type>jar</type>
 		</dependency>
-		<dependency>
-			<groupId>org.p3framework</groupId>
-			<artifactId>jeecg-p3-generate</artifactId>
-			<version>1.1-SNAPSHOT</version>
-			<type>jar</type>
-		</dependency>
 		<!-- 插件demo -->
 		<dependency>
 			<groupId>org.p3framework</groupId>

jeecg-framework/src/main/java/org/jeecgframework/core/common/entity/IdEntity.java

@@ -7,7 +7,10 @@ import javax.persistence.MappedSuperclass;
 
 import org.hibernate.annotations.GenericGenerator;
 @MappedSuperclass
-public abstract class IdEntity {
+public abstract class IdEntity implements java.io.Serializable {
+	
+	private static final long serialVersionUID = 1L;
+	
 	private String id;
 
 	@Id