upgrade simple line icons to 2.4.0
This commit is contained in:
File diff suppressed because one or more lines are too long
Binary file not shown.
File diff suppressed because it is too large
Load Diff
|
Before Width: | Height: | Size: 175 KiB After Width: | Height: | Size: 233 KiB |
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
@@ -1,15 +1,15 @@
|
||||
<li>
|
||||
<a href="javascript:" data-href="${ctx}/sys/online/list" data-title="在线人员" title="在线人员"
|
||||
class="${hasPermi('sys:online:view') ? 'addTabPage' : ''}">
|
||||
<i class="icon-users"></i><span id="onlineCount" class="label label-success">0</span>
|
||||
</a>
|
||||
<script>
|
||||
function refreshOnlineCount(){
|
||||
$.get('${ctx}/sys/online/count?__notUpdateSession=true', function(data){
|
||||
try{$('#onlineCount').html(Number(data))}catch(e){}
|
||||
})
|
||||
}
|
||||
refreshOnlineCount(); // 先执行一次
|
||||
setInterval(refreshOnlineCount, 180000); // 3分钟执行一次
|
||||
</script>
|
||||
<li>
|
||||
<a href="javascript:" data-href="${ctx}/sys/online/list" data-title="在线人员" title="在线人员"
|
||||
class="${hasPermi('sys:online:view') ? 'addTabPage' : ''}">
|
||||
<i class="icon-people"></i><span id="onlineCount" class="label label-success">0</span>
|
||||
</a>
|
||||
<script>
|
||||
function refreshOnlineCount(){
|
||||
$.get('${ctx}/sys/online/count?__notUpdateSession=true', function(data){
|
||||
try{$('#onlineCount').html(Number(data))}catch(e){}
|
||||
})
|
||||
}
|
||||
refreshOnlineCount(); // 先执行一次
|
||||
setInterval(refreshOnlineCount, 180000); // 3分钟执行一次
|
||||
</script>
|
||||
</li>
|
||||
@@ -3,7 +3,7 @@
|
||||
<div class="box box-main">
|
||||
<div class="box-header">
|
||||
<div class="box-title">
|
||||
<i class="fa icon-users"></i> 用户授权数据权限
|
||||
<i class="fa icon-people"></i> 用户授权数据权限
|
||||
</div>
|
||||
<div class="box-tools pull-right">
|
||||
<button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<div class="box box-main">
|
||||
<div class="box-header">
|
||||
<div class="box-title">
|
||||
<i class="fa icon-users"></i> 二级管理员管理数据权限
|
||||
<i class="fa icon-people"></i> 二级管理员管理数据权限
|
||||
</div>
|
||||
<div class="box-tools pull-right">
|
||||
<button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
|
||||
|
||||
879
parent/pom.xml
879
parent/pom.xml
@@ -1,439 +1,440 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<groupId>com.jeesite</groupId>
|
||||
<artifactId>jeesite-parent</artifactId>
|
||||
<version>4.0-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<name>JeeSite Parent</name>
|
||||
<url>http://jeesite.com</url>
|
||||
<inceptionYear>2013-Now</inceptionYear>
|
||||
|
||||
<properties>
|
||||
|
||||
<!-- common version setting -->
|
||||
<commons-lang3.version>3.4</commons-lang3.version>
|
||||
<commons-io.version>2.5</commons-io.version>
|
||||
<commons-codec.version>1.9</commons-codec.version>
|
||||
<commons-fileupload.version>1.3.1</commons-fileupload.version>
|
||||
<commons-beanutils.version>1.9.2</commons-beanutils.version>
|
||||
<esotericsoftware-kryo.version>4.0.0</esotericsoftware-kryo.version>
|
||||
<codeartisans-json.version>20130603</codeartisans-json.version>
|
||||
<fasterxml-jackson.version>2.8.6</fasterxml-jackson.version>
|
||||
<dom4j.version>1.6.1</dom4j.version>
|
||||
<jaxen.version>1.1.6</jaxen.version>
|
||||
<json-lib.version>2.4</json-lib.version>
|
||||
<snakeyaml.version>1.17</snakeyaml.version>
|
||||
<dozer.version>5.5.1</dozer.version>
|
||||
<junit.version>4.12</junit.version>
|
||||
<poi.version>3.14</poi.version>
|
||||
|
||||
<!-- framework version setting -->
|
||||
<slf4j.version>1.7.25</slf4j.version>
|
||||
<logback.version>1.2.3</logback.version>
|
||||
<spring.version>4.3.13.RELEASE</spring.version>
|
||||
<aop-aspectj.version>1.7.4</aop-aspectj.version>
|
||||
<aop-cglib.version>3.1</aop-cglib.version>
|
||||
<mybatis.version>3.4.5</mybatis.version>
|
||||
<mybatis-spring.version>1.3.1</mybatis-spring.version>
|
||||
<druid.version>1.1.3</druid.version>
|
||||
<shiro.version>1.4.0</shiro.version>
|
||||
<beetl.version>2.7.11-SNAPSHOT</beetl.version>
|
||||
<ehcache.version>2.6.11</ehcache.version>
|
||||
<ehcache-web.version>2.0.4</ehcache-web.version>
|
||||
<validator.version>5.2.4.Final</validator.version>
|
||||
<jedis.version>2.9.0</jedis.version>
|
||||
<dbunit.version>2.5.2</dbunit.version>
|
||||
<quartz.version>2.2.3</quartz.version>
|
||||
|
||||
<!-- environment setting -->
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<jdk.version>1.7</jdk.version>
|
||||
<downloadSources>false</downloadSources>
|
||||
<downloadJavadocs>false</downloadJavadocs>
|
||||
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
|
||||
<!-- WEB begin -->
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
<version>3.1.0</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<!-- WEB end -->
|
||||
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
|
||||
<plugins>
|
||||
|
||||
<!-- Compiler 插件, 设定JDK版本 -->
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>3.7.0</version>
|
||||
<configuration>
|
||||
<source>${jdk.version}</source>
|
||||
<target>${jdk.version}</target>
|
||||
<showWarnings>true</showWarnings>
|
||||
<compilerArguments>
|
||||
<!-- <verbose /> 输出有关编译器正在执行的操作的消息 -->
|
||||
<bootclasspath>${JAVA_HOME}\jre\lib\rt.jar;${JAVA_HOME}\jre\lib\jce.jar</bootclasspath>
|
||||
</compilerArguments>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
||||
<!-- 打包jar文件时,配置manifest文件,加入lib包的jar依赖 -->
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-jar-plugin</artifactId>
|
||||
<version>3.0.2</version>
|
||||
<configuration>
|
||||
<encoding>${project.build.sourceEncoding}</encoding>
|
||||
<archive>
|
||||
<addMavenDescriptor>false</addMavenDescriptor>
|
||||
</archive>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<!-- <phase>prepare-package</phase>
|
||||
<goals>
|
||||
<goal>jar</goal>
|
||||
</goals> -->
|
||||
<configuration>
|
||||
<!-- <classesDirectory>${project.outputDirectory}</classesDirectory>
|
||||
<finalName>jeesite</finalName>
|
||||
<outputDirectory>${project.build.directory}/${project.artifactId}/WEB-INF/lib</outputDirectory>
|
||||
<includes>
|
||||
<include>com/thinkgem/jeesite/**</include>
|
||||
</includes> -->
|
||||
<archive>
|
||||
<manifest>
|
||||
<!-- caution: add directory entries -->
|
||||
<addClasspath>true</addClasspath>
|
||||
</manifest>
|
||||
</archive>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<!-- resource插件 -->
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-resources-plugin</artifactId>
|
||||
<version>3.0.2</version>
|
||||
</plugin>
|
||||
|
||||
<!-- install插件 -->
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-install-plugin</artifactId>
|
||||
<version>2.5.2</version>
|
||||
</plugin>
|
||||
|
||||
<!-- clean插件 -->
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-clean-plugin</artifactId>
|
||||
<version>3.0.0</version>
|
||||
</plugin>
|
||||
|
||||
<!-- ant插件 -->
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-antrun-plugin</artifactId>
|
||||
<version>1.8</version>
|
||||
</plugin>
|
||||
|
||||
<!-- dependency插件 -->
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-dependency-plugin</artifactId>
|
||||
<version>3.0.2</version>
|
||||
</plugin>
|
||||
|
||||
</plugins>
|
||||
|
||||
<pluginManagement>
|
||||
|
||||
<plugins>
|
||||
|
||||
<!-- 打包插件, war包名称不带版本号 -->
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-war-plugin</artifactId>
|
||||
<version>3.0.0</version>
|
||||
<configuration>
|
||||
<packagingExcludes></packagingExcludes>
|
||||
<warSourceExcludes></warSourceExcludes>
|
||||
<webappDirectory>${project.build.directory}/${project.artifactId}</webappDirectory>
|
||||
<!-- <webXml>${project.basedir}/target/jspweb.xml</webXml> -->
|
||||
<warName>${project.artifactId}</warName>
|
||||
<archive>
|
||||
<addMavenDescriptor>false</addMavenDescriptor>
|
||||
</archive>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
||||
<!-- Eclipse 插件 -->
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-eclipse-plugin</artifactId>
|
||||
<version>2.9</version>
|
||||
<configuration>
|
||||
<downloadSources>${downloadSources}</downloadSources>
|
||||
<downloadJavadocs>${downloadJavadocs}</downloadJavadocs>
|
||||
<wtpversion>2.0</wtpversion>
|
||||
<jeeversion>6.0</jeeversion>
|
||||
<additionalConfig>
|
||||
<file>
|
||||
<name>.settings/org.eclipse.core.resources.prefs</name>
|
||||
<content>
|
||||
<![CDATA[eclipse.preferences.version=1${line.separator}encoding/<project>=${project.build.sourceEncoding}${line.separator}]]>
|
||||
</content>
|
||||
</file>
|
||||
</additionalConfig>
|
||||
<additionalProjectnatures>
|
||||
<projectnature>org.springframework.ide.eclipse.core.springnature</projectnature>
|
||||
</additionalProjectnatures>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
||||
<!-- Java Document Generate -->
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
<version>2.10.4</version>
|
||||
<configuration>
|
||||
<aggregate>true</aggregate>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<phase>prepare-package</phase>
|
||||
<goals>
|
||||
<goal>jar</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<!-- YUI Compressor (CSS/JS压缩) -->
|
||||
<plugin>
|
||||
<groupId>net.alchim31.maven</groupId>
|
||||
<artifactId>yuicompressor-maven-plugin</artifactId>
|
||||
<version>1.5.1</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<phase>prepare-package</phase>
|
||||
<goals>
|
||||
<goal>compress</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
<configuration>
|
||||
<encoding>UTF-8</encoding>
|
||||
<jswarn>false</jswarn>
|
||||
<nosuffix>true</nosuffix>
|
||||
<linebreakpos>30000</linebreakpos>
|
||||
<force>true</force>
|
||||
<includes>
|
||||
<include>**/*.js</include>
|
||||
<include>**/*.css</include>
|
||||
</includes>
|
||||
<excludes>
|
||||
<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>
|
||||
|
||||
<!-- 这个插件的配置只用于存储Eclipse m2e设置。它没有影响Maven构建本身。 -->
|
||||
<plugin>
|
||||
<groupId>org.eclipse.m2e</groupId>
|
||||
<artifactId>lifecycle-mapping</artifactId>
|
||||
<version>1.0.0</version>
|
||||
<configuration>
|
||||
<lifecycleMappingMetadata>
|
||||
<pluginExecutions>
|
||||
<pluginExecution>
|
||||
<pluginExecutionFilter>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
<versionRange>[2.10.4,)</versionRange>
|
||||
<goals>
|
||||
<goal>jar</goal>
|
||||
</goals>
|
||||
</pluginExecutionFilter>
|
||||
<action>
|
||||
<ignore></ignore>
|
||||
</action>
|
||||
</pluginExecution>
|
||||
<pluginExecution>
|
||||
<pluginExecutionFilter>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-dependency-plugin</artifactId>
|
||||
<versionRange>[2.10,)</versionRange>
|
||||
<goals>
|
||||
<goal>
|
||||
copy-dependencies
|
||||
</goal>
|
||||
</goals>
|
||||
</pluginExecutionFilter>
|
||||
<action>
|
||||
<ignore></ignore>
|
||||
</action>
|
||||
</pluginExecution>
|
||||
</pluginExecutions>
|
||||
</lifecycleMappingMetadata>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
||||
</plugins>
|
||||
|
||||
</pluginManagement>
|
||||
|
||||
<!-- 资源文件配置 -->
|
||||
<resources>
|
||||
<resource>
|
||||
<directory>src/main/java</directory>
|
||||
<excludes>
|
||||
<exclude>**/*.java</exclude>
|
||||
</excludes>
|
||||
</resource>
|
||||
<resource>
|
||||
<directory>src/main/resources</directory>
|
||||
</resource>
|
||||
</resources>
|
||||
|
||||
</build>
|
||||
|
||||
<developers>
|
||||
<developer>
|
||||
<id>thinkgem</id>
|
||||
<name>WangZhen</name>
|
||||
<email>thinkgem at 163.com</email>
|
||||
<roles><role>Project lead</role></roles>
|
||||
<timezone>+8</timezone>
|
||||
</developer>
|
||||
</developers>
|
||||
|
||||
<organization>
|
||||
<name>JeeSite</name>
|
||||
<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>
|
||||
</pluginRepository>
|
||||
<pluginRepository>
|
||||
<id>sonatype-repos</id>
|
||||
<name>Sonatype Repository</name>
|
||||
<url>https://oss.sonatype.org/content/groups/public</url>
|
||||
</pluginRepository>
|
||||
|
||||
</pluginRepositories>
|
||||
|
||||
<profiles>
|
||||
|
||||
<!-- 打包项目 -->
|
||||
<profile>
|
||||
<id>package</id>
|
||||
<build>
|
||||
<plugins>
|
||||
<!-- Java Document Generate
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
</plugin> -->
|
||||
<!-- YUI Compressor (CSS/JS压缩) -->
|
||||
<plugin>
|
||||
<groupId>net.alchim31.maven</groupId>
|
||||
<artifactId>yuicompressor-maven-plugin</artifactId>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
|
||||
<!-- 部署项目 -->
|
||||
<profile>
|
||||
<id>deploy</id>
|
||||
<build>
|
||||
<plugins>
|
||||
<!-- Java Document Generate
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
</plugin> -->
|
||||
<!-- YUI Compressor (CSS/JS压缩) -->
|
||||
<plugin>
|
||||
<groupId>net.alchim31.maven</groupId>
|
||||
<artifactId>yuicompressor-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>
|
||||
</snapshotRepository>
|
||||
</distributionManagement>
|
||||
</profile>
|
||||
</profiles>
|
||||
|
||||
</project>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<groupId>com.jeesite</groupId>
|
||||
<artifactId>jeesite-parent</artifactId>
|
||||
<version>4.0-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<name>JeeSite Parent</name>
|
||||
<url>http://jeesite.com</url>
|
||||
<inceptionYear>2013-Now</inceptionYear>
|
||||
|
||||
<properties>
|
||||
|
||||
<!-- common version setting -->
|
||||
<commons-lang3.version>3.4</commons-lang3.version>
|
||||
<commons-io.version>2.5</commons-io.version>
|
||||
<commons-codec.version>1.9</commons-codec.version>
|
||||
<commons-fileupload.version>1.3.1</commons-fileupload.version>
|
||||
<commons-beanutils.version>1.9.2</commons-beanutils.version>
|
||||
<esotericsoftware-kryo.version>4.0.0</esotericsoftware-kryo.version>
|
||||
<codeartisans-json.version>20130603</codeartisans-json.version>
|
||||
<fasterxml-jackson.version>2.8.6</fasterxml-jackson.version>
|
||||
<dom4j.version>1.6.1</dom4j.version>
|
||||
<jaxen.version>1.1.6</jaxen.version>
|
||||
<json-lib.version>2.4</json-lib.version>
|
||||
<snakeyaml.version>1.17</snakeyaml.version>
|
||||
<dozer.version>5.5.1</dozer.version>
|
||||
<junit.version>4.12</junit.version>
|
||||
<poi.version>3.14</poi.version>
|
||||
|
||||
<!-- framework version setting -->
|
||||
<slf4j.version>1.7.25</slf4j.version>
|
||||
<logback.version>1.2.3</logback.version>
|
||||
<spring.version>4.3.13.RELEASE</spring.version>
|
||||
<aop-aspectj.version>1.7.4</aop-aspectj.version>
|
||||
<aop-cglib.version>3.1</aop-cglib.version>
|
||||
<mybatis.version>3.4.5</mybatis.version>
|
||||
<mybatis-spring.version>1.3.1</mybatis-spring.version>
|
||||
<druid.version>1.1.3</druid.version>
|
||||
<shiro.version>1.4.0</shiro.version>
|
||||
<beetl.version>2.7.11-SNAPSHOT</beetl.version>
|
||||
<ehcache.version>2.6.11</ehcache.version>
|
||||
<ehcache-web.version>2.0.4</ehcache-web.version>
|
||||
<validator.version>5.2.4.Final</validator.version>
|
||||
<jedis.version>2.9.0</jedis.version>
|
||||
<dbunit.version>2.5.2</dbunit.version>
|
||||
<quartz.version>2.2.3</quartz.version>
|
||||
|
||||
<!-- environment setting -->
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||
<java.version>1.7</java.version>
|
||||
<downloadSources>false</downloadSources>
|
||||
<downloadJavadocs>false</downloadJavadocs>
|
||||
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
|
||||
<!-- WEB begin -->
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
<version>3.1.0</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<!-- WEB end -->
|
||||
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
|
||||
<plugins>
|
||||
|
||||
<!-- Compiler 插件, 设定JDK版本 -->
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>3.7.0</version>
|
||||
<configuration>
|
||||
<source>${java.version}</source>
|
||||
<target>${java.version}</target>
|
||||
<showWarnings>true</showWarnings>
|
||||
<compilerArguments>
|
||||
<!-- <verbose /> 输出有关编译器正在执行的操作的消息 -->
|
||||
<bootclasspath>${JAVA_HOME}\jre\lib\rt.jar;${JAVA_HOME}\jre\lib\jce.jar</bootclasspath>
|
||||
</compilerArguments>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
||||
<!-- 打包jar文件时,配置manifest文件,加入lib包的jar依赖 -->
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-jar-plugin</artifactId>
|
||||
<version>3.0.2</version>
|
||||
<configuration>
|
||||
<encoding>${project.build.sourceEncoding}</encoding>
|
||||
<archive>
|
||||
<addMavenDescriptor>false</addMavenDescriptor>
|
||||
</archive>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<!-- <phase>prepare-package</phase>
|
||||
<goals>
|
||||
<goal>jar</goal>
|
||||
</goals> -->
|
||||
<configuration>
|
||||
<!-- <classesDirectory>${project.outputDirectory}</classesDirectory>
|
||||
<finalName>jeesite</finalName>
|
||||
<outputDirectory>${project.build.directory}/${project.artifactId}/WEB-INF/lib</outputDirectory>
|
||||
<includes>
|
||||
<include>com/thinkgem/jeesite/**</include>
|
||||
</includes> -->
|
||||
<archive>
|
||||
<manifest>
|
||||
<!-- caution: add directory entries -->
|
||||
<addClasspath>true</addClasspath>
|
||||
</manifest>
|
||||
</archive>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<!-- resource插件 -->
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-resources-plugin</artifactId>
|
||||
<version>3.0.2</version>
|
||||
</plugin>
|
||||
|
||||
<!-- install插件 -->
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-install-plugin</artifactId>
|
||||
<version>2.5.2</version>
|
||||
</plugin>
|
||||
|
||||
<!-- clean插件 -->
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-clean-plugin</artifactId>
|
||||
<version>3.0.0</version>
|
||||
</plugin>
|
||||
|
||||
<!-- ant插件 -->
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-antrun-plugin</artifactId>
|
||||
<version>1.8</version>
|
||||
</plugin>
|
||||
|
||||
<!-- dependency插件 -->
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-dependency-plugin</artifactId>
|
||||
<version>3.0.2</version>
|
||||
</plugin>
|
||||
|
||||
</plugins>
|
||||
|
||||
<pluginManagement>
|
||||
|
||||
<plugins>
|
||||
|
||||
<!-- 打包插件, war包名称不带版本号 -->
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-war-plugin</artifactId>
|
||||
<version>3.0.0</version>
|
||||
<configuration>
|
||||
<packagingExcludes></packagingExcludes>
|
||||
<warSourceExcludes></warSourceExcludes>
|
||||
<webappDirectory>${project.build.directory}/${project.artifactId}</webappDirectory>
|
||||
<!-- <webXml>${project.basedir}/target/jspweb.xml</webXml> -->
|
||||
<warName>${project.artifactId}</warName>
|
||||
<archive>
|
||||
<addMavenDescriptor>false</addMavenDescriptor>
|
||||
</archive>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
||||
<!-- Eclipse 插件 -->
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-eclipse-plugin</artifactId>
|
||||
<version>2.9</version>
|
||||
<configuration>
|
||||
<downloadSources>${downloadSources}</downloadSources>
|
||||
<downloadJavadocs>${downloadJavadocs}</downloadJavadocs>
|
||||
<wtpversion>2.0</wtpversion>
|
||||
<jeeversion>6.0</jeeversion>
|
||||
<additionalConfig>
|
||||
<file>
|
||||
<name>.settings/org.eclipse.core.resources.prefs</name>
|
||||
<content>
|
||||
<![CDATA[eclipse.preferences.version=1${line.separator}encoding/<project>=${project.build.sourceEncoding}${line.separator}]]>
|
||||
</content>
|
||||
</file>
|
||||
</additionalConfig>
|
||||
<additionalProjectnatures>
|
||||
<projectnature>org.springframework.ide.eclipse.core.springnature</projectnature>
|
||||
</additionalProjectnatures>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
||||
<!-- Java Document Generate -->
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
<version>2.10.4</version>
|
||||
<configuration>
|
||||
<aggregate>true</aggregate>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<phase>prepare-package</phase>
|
||||
<goals>
|
||||
<goal>jar</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<!-- YUI Compressor (CSS/JS压缩) -->
|
||||
<plugin>
|
||||
<groupId>net.alchim31.maven</groupId>
|
||||
<artifactId>yuicompressor-maven-plugin</artifactId>
|
||||
<version>1.5.1</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<phase>prepare-package</phase>
|
||||
<goals>
|
||||
<goal>compress</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
<configuration>
|
||||
<encoding>UTF-8</encoding>
|
||||
<jswarn>false</jswarn>
|
||||
<nosuffix>true</nosuffix>
|
||||
<linebreakpos>30000</linebreakpos>
|
||||
<force>true</force>
|
||||
<includes>
|
||||
<include>**/*.js</include>
|
||||
<include>**/*.css</include>
|
||||
</includes>
|
||||
<excludes>
|
||||
<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>
|
||||
|
||||
<!-- 这个插件的配置只用于存储Eclipse m2e设置。它没有影响Maven构建本身。 -->
|
||||
<plugin>
|
||||
<groupId>org.eclipse.m2e</groupId>
|
||||
<artifactId>lifecycle-mapping</artifactId>
|
||||
<version>1.0.0</version>
|
||||
<configuration>
|
||||
<lifecycleMappingMetadata>
|
||||
<pluginExecutions>
|
||||
<pluginExecution>
|
||||
<pluginExecutionFilter>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
<versionRange>[2.10.4,)</versionRange>
|
||||
<goals>
|
||||
<goal>jar</goal>
|
||||
</goals>
|
||||
</pluginExecutionFilter>
|
||||
<action>
|
||||
<ignore></ignore>
|
||||
</action>
|
||||
</pluginExecution>
|
||||
<pluginExecution>
|
||||
<pluginExecutionFilter>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-dependency-plugin</artifactId>
|
||||
<versionRange>[2.10,)</versionRange>
|
||||
<goals>
|
||||
<goal>
|
||||
copy-dependencies
|
||||
</goal>
|
||||
</goals>
|
||||
</pluginExecutionFilter>
|
||||
<action>
|
||||
<ignore></ignore>
|
||||
</action>
|
||||
</pluginExecution>
|
||||
</pluginExecutions>
|
||||
</lifecycleMappingMetadata>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
||||
</plugins>
|
||||
|
||||
</pluginManagement>
|
||||
|
||||
<!-- 资源文件配置 -->
|
||||
<resources>
|
||||
<resource>
|
||||
<directory>src/main/java</directory>
|
||||
<excludes>
|
||||
<exclude>**/*.java</exclude>
|
||||
</excludes>
|
||||
</resource>
|
||||
<resource>
|
||||
<directory>src/main/resources</directory>
|
||||
</resource>
|
||||
</resources>
|
||||
|
||||
</build>
|
||||
|
||||
<developers>
|
||||
<developer>
|
||||
<id>thinkgem</id>
|
||||
<name>WangZhen</name>
|
||||
<email>thinkgem at 163.com</email>
|
||||
<roles><role>Project lead</role></roles>
|
||||
<timezone>+8</timezone>
|
||||
</developer>
|
||||
</developers>
|
||||
|
||||
<organization>
|
||||
<name>JeeSite</name>
|
||||
<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>
|
||||
</pluginRepository>
|
||||
<pluginRepository>
|
||||
<id>sonatype-repos</id>
|
||||
<name>Sonatype Repository</name>
|
||||
<url>https://oss.sonatype.org/content/groups/public</url>
|
||||
</pluginRepository>
|
||||
|
||||
</pluginRepositories>
|
||||
|
||||
<profiles>
|
||||
|
||||
<!-- 打包项目 -->
|
||||
<profile>
|
||||
<id>package</id>
|
||||
<build>
|
||||
<plugins>
|
||||
<!-- Java Document Generate
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
</plugin> -->
|
||||
<!-- YUI Compressor (CSS/JS压缩) -->
|
||||
<plugin>
|
||||
<groupId>net.alchim31.maven</groupId>
|
||||
<artifactId>yuicompressor-maven-plugin</artifactId>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
|
||||
<!-- 部署项目 -->
|
||||
<profile>
|
||||
<id>deploy</id>
|
||||
<build>
|
||||
<plugins>
|
||||
<!-- Java Document Generate
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
</plugin> -->
|
||||
<!-- YUI Compressor (CSS/JS压缩) -->
|
||||
<plugin>
|
||||
<groupId>net.alchim31.maven</groupId>
|
||||
<artifactId>yuicompressor-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>
|
||||
</snapshotRepository>
|
||||
</distributionManagement>
|
||||
</profile>
|
||||
</profiles>
|
||||
|
||||
</project>
|
||||
|
||||
375
web/db/test.erm
375
web/db/test.erm
@@ -663,6 +663,38 @@
|
||||
<physical_name>test_checkbox</physical_name>
|
||||
<type>varchar(n)</type>
|
||||
</word>
|
||||
<word>
|
||||
<id>a5742c4c2c1fd5c201d5d34d977964f97f0fe2c4</id>
|
||||
<length>64</length>
|
||||
<decimal>null</decimal>
|
||||
<array>false</array>
|
||||
<array_dimension>null</array_dimension>
|
||||
<unsigned>false</unsigned>
|
||||
<zerofill>false</zerofill>
|
||||
<binary>false</binary>
|
||||
<args></args>
|
||||
<char_semantics>false</char_semantics>
|
||||
<description></description>
|
||||
<logical_name>公司选择</logical_name>
|
||||
<physical_name>test_company_code</physical_name>
|
||||
<type>varchar(n)</type>
|
||||
</word>
|
||||
<word>
|
||||
<id>d829e707316a49d39e5a11da5f5d36030a856b86</id>
|
||||
<length>64</length>
|
||||
<decimal>null</decimal>
|
||||
<array>false</array>
|
||||
<array_dimension>null</array_dimension>
|
||||
<unsigned>false</unsigned>
|
||||
<zerofill>false</zerofill>
|
||||
<binary>false</binary>
|
||||
<args></args>
|
||||
<char_semantics>false</char_semantics>
|
||||
<description></description>
|
||||
<logical_name>父表主键</logical_name>
|
||||
<physical_name>test_data_id</physical_name>
|
||||
<type>varchar(n)</type>
|
||||
</word>
|
||||
<word>
|
||||
<id>ffd84f2ff6d4918bb700605c5a46d3642eac6bcd</id>
|
||||
<length>null</length>
|
||||
@@ -695,22 +727,6 @@
|
||||
<physical_name>test_datetime</physical_name>
|
||||
<type>timestamp</type>
|
||||
</word>
|
||||
<word>
|
||||
<id>7e7a140b5d69e5c594108bb75e2d59b326b11c0b</id>
|
||||
<length>64</length>
|
||||
<decimal>null</decimal>
|
||||
<array>false</array>
|
||||
<array_dimension>null</array_dimension>
|
||||
<unsigned>false</unsigned>
|
||||
<zerofill>false</zerofill>
|
||||
<binary>false</binary>
|
||||
<args></args>
|
||||
<char_semantics>false</char_semantics>
|
||||
<description></description>
|
||||
<logical_name>用户员工选择</logical_name>
|
||||
<physical_name>test_emp_user</physical_name>
|
||||
<type>varchar(n)</type>
|
||||
</word>
|
||||
<word>
|
||||
<id>ac02f2d1fff63fa66db583735eb1c8e9b466872f</id>
|
||||
<length>200</length>
|
||||
@@ -727,6 +743,22 @@
|
||||
<physical_name>test_input</physical_name>
|
||||
<type>varchar(n)</type>
|
||||
</word>
|
||||
<word>
|
||||
<id>5d32d32e3e7a7e115fe0ec3dff297801019dcd78</id>
|
||||
<length>64</length>
|
||||
<decimal>null</decimal>
|
||||
<array>false</array>
|
||||
<array_dimension>null</array_dimension>
|
||||
<unsigned>false</unsigned>
|
||||
<zerofill>false</zerofill>
|
||||
<binary>false</binary>
|
||||
<args></args>
|
||||
<char_semantics>false</char_semantics>
|
||||
<description></description>
|
||||
<logical_name>部门选择</logical_name>
|
||||
<physical_name>test_office_code</physical_name>
|
||||
<type>varchar(n)</type>
|
||||
</word>
|
||||
<word>
|
||||
<id>791691b791efedc2d14867a152b4de58f4567326</id>
|
||||
<length>10</length>
|
||||
@@ -775,6 +807,22 @@
|
||||
<physical_name>test_select_multiple</physical_name>
|
||||
<type>varchar(n)</type>
|
||||
</word>
|
||||
<word>
|
||||
<id>ae103dc1fb50094552e56afd72015481271913db</id>
|
||||
<length>null</length>
|
||||
<decimal>null</decimal>
|
||||
<array>false</array>
|
||||
<array_dimension>null</array_dimension>
|
||||
<unsigned>false</unsigned>
|
||||
<zerofill>false</zerofill>
|
||||
<binary>false</binary>
|
||||
<args></args>
|
||||
<char_semantics>false</char_semantics>
|
||||
<description></description>
|
||||
<logical_name>排序号</logical_name>
|
||||
<physical_name>test_sort</physical_name>
|
||||
<type>integer</type>
|
||||
</word>
|
||||
<word>
|
||||
<id>68b1f859bfea8bf1733964c0ccaf826fc05f3b1f</id>
|
||||
<length>200</length>
|
||||
@@ -792,7 +840,7 @@
|
||||
<type>varchar(n)</type>
|
||||
</word>
|
||||
<word>
|
||||
<id>577aaa30e264c0599bf74be399f18ad2db387160</id>
|
||||
<id>2eda719a62fb7e1d3face62555046d938abddda9</id>
|
||||
<length>64</length>
|
||||
<decimal>null</decimal>
|
||||
<array>false</array>
|
||||
@@ -804,7 +852,7 @@
|
||||
<char_semantics>false</char_semantics>
|
||||
<description></description>
|
||||
<logical_name>用户选择</logical_name>
|
||||
<physical_name>test_user</physical_name>
|
||||
<physical_name>test_user_code</physical_name>
|
||||
<type>varchar(n)</type>
|
||||
</word>
|
||||
<word>
|
||||
@@ -939,6 +987,105 @@
|
||||
<tablespace_set>
|
||||
</tablespace_set>
|
||||
<contents>
|
||||
<table>
|
||||
<id>b7226377b79c26a490f7bf5789c1f74ed96e1b6f</id>
|
||||
<height>359</height>
|
||||
<width>323</width>
|
||||
<font_name>Segoe UI</font_name>
|
||||
<font_size>9</font_size>
|
||||
<x>756</x>
|
||||
<y>36</y>
|
||||
<color>
|
||||
<r>128</r>
|
||||
<g>128</g>
|
||||
<b>192</b>
|
||||
</color>
|
||||
<connections>
|
||||
</connections>
|
||||
<physical_name>test_tree</physical_name>
|
||||
<logical_name>test_tree</logical_name>
|
||||
<description></description>
|
||||
<constraint></constraint>
|
||||
<primary_key_name></primary_key_name>
|
||||
<option></option>
|
||||
<columns>
|
||||
<normal_column>
|
||||
<word_id>869fc70cf3a4e92e8056b40814df8e03f9f9efde</word_id>
|
||||
<id>c43aabb7788441b65957230fef18799d704e19b1</id>
|
||||
<description></description>
|
||||
<unique_key_name></unique_key_name>
|
||||
<logical_name></logical_name>
|
||||
<physical_name></physical_name>
|
||||
<type>varchar(n)</type>
|
||||
<constraint></constraint>
|
||||
<default_value></default_value>
|
||||
<auto_increment>false</auto_increment>
|
||||
<foreign_key>false</foreign_key>
|
||||
<not_null>true</not_null>
|
||||
<primary_key>true</primary_key>
|
||||
<unique_key>false</unique_key>
|
||||
<character_set></character_set>
|
||||
<collation></collation>
|
||||
<sequence>
|
||||
<name></name>
|
||||
<schema></schema>
|
||||
<increment></increment>
|
||||
<min_value></min_value>
|
||||
<max_value></max_value>
|
||||
<start></start>
|
||||
<cache></cache>
|
||||
<nocache>false</nocache>
|
||||
<cycle>false</cycle>
|
||||
<order>false</order>
|
||||
<description></description>
|
||||
<data_type></data_type>
|
||||
<decimal_size>0</decimal_size>
|
||||
</sequence>
|
||||
</normal_column>
|
||||
<column_group>a535b6c506004a7fdf4d48984c9ff2cfa59c157a</column_group>
|
||||
<normal_column>
|
||||
<word_id>a1ea53e86b9fdaedab01cfce6fe86c610d539368</word_id>
|
||||
<id>39f501890586173d229e83610cfbfaa6e3a85374</id>
|
||||
<description></description>
|
||||
<unique_key_name></unique_key_name>
|
||||
<logical_name></logical_name>
|
||||
<physical_name></physical_name>
|
||||
<type>nvarchar(n)</type>
|
||||
<constraint></constraint>
|
||||
<default_value></default_value>
|
||||
<auto_increment>false</auto_increment>
|
||||
<foreign_key>false</foreign_key>
|
||||
<not_null>true</not_null>
|
||||
<primary_key>false</primary_key>
|
||||
<unique_key>false</unique_key>
|
||||
<character_set></character_set>
|
||||
<collation></collation>
|
||||
<sequence>
|
||||
<name></name>
|
||||
<schema></schema>
|
||||
<increment></increment>
|
||||
<min_value></min_value>
|
||||
<max_value></max_value>
|
||||
<start></start>
|
||||
<cache></cache>
|
||||
<nocache>false</nocache>
|
||||
<cycle>false</cycle>
|
||||
<order>false</order>
|
||||
<description></description>
|
||||
<data_type></data_type>
|
||||
<decimal_size>0</decimal_size>
|
||||
</sequence>
|
||||
</normal_column>
|
||||
<column_group>35ae805d1da92afdb99b2fe8c536d1649356fccd</column_group>
|
||||
</columns>
|
||||
<indexes>
|
||||
</indexes>
|
||||
<complex_unique_key_list>
|
||||
</complex_unique_key_list>
|
||||
<table_properties>
|
||||
<schema></schema>
|
||||
</table_properties>
|
||||
</table>
|
||||
<table>
|
||||
<id>5435ef11ea53f170fe3491b199c113e47932e175</id>
|
||||
<height>401</height>
|
||||
@@ -1259,8 +1406,8 @@
|
||||
</sequence>
|
||||
</normal_column>
|
||||
<normal_column>
|
||||
<word_id>577aaa30e264c0599bf74be399f18ad2db387160</word_id>
|
||||
<id>b1fe1fa16a9245d23025a5ef70e8d94ab365a785</id>
|
||||
<word_id>2eda719a62fb7e1d3face62555046d938abddda9</word_id>
|
||||
<id>cfe3c330968a9a824c2cf933b227887d3e9615ac</id>
|
||||
<description></description>
|
||||
<unique_key_name></unique_key_name>
|
||||
<logical_name></logical_name>
|
||||
@@ -1292,8 +1439,41 @@
|
||||
</sequence>
|
||||
</normal_column>
|
||||
<normal_column>
|
||||
<word_id>7e7a140b5d69e5c594108bb75e2d59b326b11c0b</word_id>
|
||||
<id>e454dabc647abd4e3a6772dc484b2d4fb6e3f46b</id>
|
||||
<word_id>5d32d32e3e7a7e115fe0ec3dff297801019dcd78</word_id>
|
||||
<id>23041cb30875514136904ea11043c7ea1924f048</id>
|
||||
<description></description>
|
||||
<unique_key_name></unique_key_name>
|
||||
<logical_name></logical_name>
|
||||
<physical_name></physical_name>
|
||||
<type>varchar(n)</type>
|
||||
<constraint></constraint>
|
||||
<default_value></default_value>
|
||||
<auto_increment>false</auto_increment>
|
||||
<foreign_key>false</foreign_key>
|
||||
<not_null>false</not_null>
|
||||
<primary_key>false</primary_key>
|
||||
<unique_key>false</unique_key>
|
||||
<character_set></character_set>
|
||||
<collation></collation>
|
||||
<sequence>
|
||||
<name></name>
|
||||
<schema></schema>
|
||||
<increment></increment>
|
||||
<min_value></min_value>
|
||||
<max_value></max_value>
|
||||
<start></start>
|
||||
<cache></cache>
|
||||
<nocache>false</nocache>
|
||||
<cycle>false</cycle>
|
||||
<order>false</order>
|
||||
<description></description>
|
||||
<data_type></data_type>
|
||||
<decimal_size>0</decimal_size>
|
||||
</sequence>
|
||||
</normal_column>
|
||||
<normal_column>
|
||||
<word_id>a5742c4c2c1fd5c201d5d34d977964f97f0fe2c4</word_id>
|
||||
<id>463f8c1eeb29b2c87bebef4217202772169d1b67</id>
|
||||
<description></description>
|
||||
<unique_key_name></unique_key_name>
|
||||
<logical_name></logical_name>
|
||||
@@ -1335,8 +1515,8 @@
|
||||
</table_properties>
|
||||
</table>
|
||||
<table>
|
||||
<id>13e232e8745538ec21bbae7e4569bcda69d93131</id>
|
||||
<height>401</height>
|
||||
<id>fb11bc47b30b0d8e468d3cd16ed660bf57bc8863</id>
|
||||
<height>217</height>
|
||||
<width>320</width>
|
||||
<font_name>Segoe UI</font_name>
|
||||
<font_size>9</font_size>
|
||||
@@ -1389,6 +1569,72 @@
|
||||
<decimal_size>0</decimal_size>
|
||||
</sequence>
|
||||
</normal_column>
|
||||
<normal_column>
|
||||
<word_id>ae103dc1fb50094552e56afd72015481271913db</word_id>
|
||||
<id>ec8a047dffe3cf2e4d95ba3e26c3bac0382d95c9</id>
|
||||
<description></description>
|
||||
<unique_key_name></unique_key_name>
|
||||
<logical_name></logical_name>
|
||||
<physical_name></physical_name>
|
||||
<type>integer</type>
|
||||
<constraint></constraint>
|
||||
<default_value></default_value>
|
||||
<auto_increment>false</auto_increment>
|
||||
<foreign_key>false</foreign_key>
|
||||
<not_null>false</not_null>
|
||||
<primary_key>false</primary_key>
|
||||
<unique_key>false</unique_key>
|
||||
<character_set></character_set>
|
||||
<collation></collation>
|
||||
<sequence>
|
||||
<name></name>
|
||||
<schema></schema>
|
||||
<increment></increment>
|
||||
<min_value></min_value>
|
||||
<max_value></max_value>
|
||||
<start></start>
|
||||
<cache></cache>
|
||||
<nocache>false</nocache>
|
||||
<cycle>false</cycle>
|
||||
<order>false</order>
|
||||
<description></description>
|
||||
<data_type></data_type>
|
||||
<decimal_size>0</decimal_size>
|
||||
</sequence>
|
||||
</normal_column>
|
||||
<normal_column>
|
||||
<word_id>d829e707316a49d39e5a11da5f5d36030a856b86</word_id>
|
||||
<id>b095c44611ed08156277676d9a3a0ce52b9b05ef</id>
|
||||
<description></description>
|
||||
<unique_key_name></unique_key_name>
|
||||
<logical_name></logical_name>
|
||||
<physical_name></physical_name>
|
||||
<type>varchar(n)</type>
|
||||
<constraint></constraint>
|
||||
<default_value></default_value>
|
||||
<auto_increment>false</auto_increment>
|
||||
<foreign_key>false</foreign_key>
|
||||
<not_null>false</not_null>
|
||||
<primary_key>false</primary_key>
|
||||
<unique_key>false</unique_key>
|
||||
<character_set></character_set>
|
||||
<collation></collation>
|
||||
<sequence>
|
||||
<name></name>
|
||||
<schema></schema>
|
||||
<increment></increment>
|
||||
<min_value></min_value>
|
||||
<max_value></max_value>
|
||||
<start></start>
|
||||
<cache></cache>
|
||||
<nocache>false</nocache>
|
||||
<cycle>false</cycle>
|
||||
<order>false</order>
|
||||
<description></description>
|
||||
<data_type></data_type>
|
||||
<decimal_size>0</decimal_size>
|
||||
</sequence>
|
||||
</normal_column>
|
||||
<normal_column>
|
||||
<word_id>ac02f2d1fff63fa66db583735eb1c8e9b466872f</word_id>
|
||||
<id>78715aa66a10a9b190ad69b8ed792e9a2f4946e3</id>
|
||||
@@ -1654,8 +1900,8 @@
|
||||
</sequence>
|
||||
</normal_column>
|
||||
<normal_column>
|
||||
<word_id>577aaa30e264c0599bf74be399f18ad2db387160</word_id>
|
||||
<id>57d712a76c0dce4350a6f5ad29961ff39c5ded31</id>
|
||||
<word_id>2eda719a62fb7e1d3face62555046d938abddda9</word_id>
|
||||
<id>9f33d190101e56f93f5ece0fd7c5cdda3e704b4c</id>
|
||||
<description></description>
|
||||
<unique_key_name></unique_key_name>
|
||||
<logical_name></logical_name>
|
||||
@@ -1687,8 +1933,8 @@
|
||||
</sequence>
|
||||
</normal_column>
|
||||
<normal_column>
|
||||
<word_id>7e7a140b5d69e5c594108bb75e2d59b326b11c0b</word_id>
|
||||
<id>5656ef4015fd5f2e80bcc1f42f7060a55b660516</id>
|
||||
<word_id>5d32d32e3e7a7e115fe0ec3dff297801019dcd78</word_id>
|
||||
<id>16121b5aa08fc170883408ec2d0487281a132d9d</id>
|
||||
<description></description>
|
||||
<unique_key_name></unique_key_name>
|
||||
<logical_name></logical_name>
|
||||
@@ -1719,41 +1965,9 @@
|
||||
<decimal_size>0</decimal_size>
|
||||
</sequence>
|
||||
</normal_column>
|
||||
<column_group>35ae805d1da92afdb99b2fe8c536d1649356fccd</column_group>
|
||||
</columns>
|
||||
<indexes>
|
||||
</indexes>
|
||||
<complex_unique_key_list>
|
||||
</complex_unique_key_list>
|
||||
<table_properties>
|
||||
<schema></schema>
|
||||
</table_properties>
|
||||
</table>
|
||||
<table>
|
||||
<id>b7226377b79c26a490f7bf5789c1f74ed96e1b6f</id>
|
||||
<height>359</height>
|
||||
<width>323</width>
|
||||
<font_name>Segoe UI</font_name>
|
||||
<font_size>9</font_size>
|
||||
<x>756</x>
|
||||
<y>36</y>
|
||||
<color>
|
||||
<r>128</r>
|
||||
<g>128</g>
|
||||
<b>192</b>
|
||||
</color>
|
||||
<connections>
|
||||
</connections>
|
||||
<physical_name>test_tree</physical_name>
|
||||
<logical_name>test_tree</logical_name>
|
||||
<description></description>
|
||||
<constraint></constraint>
|
||||
<primary_key_name></primary_key_name>
|
||||
<option></option>
|
||||
<columns>
|
||||
<normal_column>
|
||||
<word_id>869fc70cf3a4e92e8056b40814df8e03f9f9efde</word_id>
|
||||
<id>c43aabb7788441b65957230fef18799d704e19b1</id>
|
||||
<word_id>a5742c4c2c1fd5c201d5d34d977964f97f0fe2c4</word_id>
|
||||
<id>fd675547aecaf4cab579decef6612af613c9fb55</id>
|
||||
<description></description>
|
||||
<unique_key_name></unique_key_name>
|
||||
<logical_name></logical_name>
|
||||
@@ -1763,41 +1977,7 @@
|
||||
<default_value></default_value>
|
||||
<auto_increment>false</auto_increment>
|
||||
<foreign_key>false</foreign_key>
|
||||
<not_null>true</not_null>
|
||||
<primary_key>true</primary_key>
|
||||
<unique_key>false</unique_key>
|
||||
<character_set></character_set>
|
||||
<collation></collation>
|
||||
<sequence>
|
||||
<name></name>
|
||||
<schema></schema>
|
||||
<increment></increment>
|
||||
<min_value></min_value>
|
||||
<max_value></max_value>
|
||||
<start></start>
|
||||
<cache></cache>
|
||||
<nocache>false</nocache>
|
||||
<cycle>false</cycle>
|
||||
<order>false</order>
|
||||
<description></description>
|
||||
<data_type></data_type>
|
||||
<decimal_size>0</decimal_size>
|
||||
</sequence>
|
||||
</normal_column>
|
||||
<column_group>a535b6c506004a7fdf4d48984c9ff2cfa59c157a</column_group>
|
||||
<normal_column>
|
||||
<word_id>a1ea53e86b9fdaedab01cfce6fe86c610d539368</word_id>
|
||||
<id>39f501890586173d229e83610cfbfaa6e3a85374</id>
|
||||
<description></description>
|
||||
<unique_key_name></unique_key_name>
|
||||
<logical_name></logical_name>
|
||||
<physical_name></physical_name>
|
||||
<type>nvarchar(n)</type>
|
||||
<constraint></constraint>
|
||||
<default_value></default_value>
|
||||
<auto_increment>false</auto_increment>
|
||||
<foreign_key>false</foreign_key>
|
||||
<not_null>true</not_null>
|
||||
<not_null>false</not_null>
|
||||
<primary_key>false</primary_key>
|
||||
<unique_key>false</unique_key>
|
||||
<character_set></character_set>
|
||||
@@ -1818,7 +1998,6 @@
|
||||
<decimal_size>0</decimal_size>
|
||||
</sequence>
|
||||
</normal_column>
|
||||
<column_group>35ae805d1da92afdb99b2fe8c536d1649356fccd</column_group>
|
||||
</columns>
|
||||
<indexes>
|
||||
</indexes>
|
||||
|
||||
Reference in New Issue
Block a user