upgrade simple line icons to 2.4.0

This commit is contained in:
thinkgem
2018-01-02 20:57:24 +08:00
parent 6f50be34e7
commit 684353c01b
13 changed files with 1672 additions and 2552 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

Before

Width:  |  Height:  |  Size: 175 KiB

After

Width:  |  Height:  |  Size: 233 KiB

File diff suppressed because it is too large Load Diff

View File

@@ -1,15 +1,15 @@
<li> <li>
<a href="javascript:" data-href="${ctx}/sys/online/list" data-title="在线人员" title="在线人员" <a href="javascript:" data-href="${ctx}/sys/online/list" data-title="在线人员" title="在线人员"
class="${hasPermi('sys:online:view') ? 'addTabPage' : ''}"> class="${hasPermi('sys:online:view') ? 'addTabPage' : ''}">
<i class="icon-users"></i><span id="onlineCount" class="label label-success">0</span> <i class="icon-people"></i><span id="onlineCount" class="label label-success">0</span>
</a> </a>
<script> <script>
function refreshOnlineCount(){ function refreshOnlineCount(){
$.get('${ctx}/sys/online/count?__notUpdateSession=true', function(data){ $.get('${ctx}/sys/online/count?__notUpdateSession=true', function(data){
try{$('#onlineCount').html(Number(data))}catch(e){} try{$('#onlineCount').html(Number(data))}catch(e){}
}) })
} }
refreshOnlineCount(); // 先执行一次 refreshOnlineCount(); // 先执行一次
setInterval(refreshOnlineCount, 180000); // 3分钟执行一次 setInterval(refreshOnlineCount, 180000); // 3分钟执行一次
</script> </script>
</li> </li>

View File

@@ -3,7 +3,7 @@
<div class="box box-main"> <div class="box box-main">
<div class="box-header"> <div class="box-header">
<div class="box-title"> <div class="box-title">
<i class="fa icon-users"></i> 用户授权数据权限 <i class="fa icon-people"></i> 用户授权数据权限
</div> </div>
<div class="box-tools pull-right"> <div class="box-tools pull-right">
<button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button> <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>

View File

@@ -3,7 +3,7 @@
<div class="box box-main"> <div class="box box-main">
<div class="box-header"> <div class="box-header">
<div class="box-title"> <div class="box-title">
<i class="fa icon-users"></i> 二级管理员管理数据权限 <i class="fa icon-people"></i> 二级管理员管理数据权限
</div> </div>
<div class="box-tools pull-right"> <div class="box-tools pull-right">
<button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button> <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>

View File

@@ -1,439 +1,440 @@
<?xml version="1.0" encoding="UTF-8"?> <?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" <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>
<groupId>com.jeesite</groupId> <groupId>com.jeesite</groupId>
<artifactId>jeesite-parent</artifactId> <artifactId>jeesite-parent</artifactId>
<version>4.0-SNAPSHOT</version> <version>4.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>JeeSite Parent</name> <name>JeeSite Parent</name>
<url>http://jeesite.com</url> <url>http://jeesite.com</url>
<inceptionYear>2013-Now</inceptionYear> <inceptionYear>2013-Now</inceptionYear>
<properties> <properties>
<!-- common version setting --> <!-- common version setting -->
<commons-lang3.version>3.4</commons-lang3.version> <commons-lang3.version>3.4</commons-lang3.version>
<commons-io.version>2.5</commons-io.version> <commons-io.version>2.5</commons-io.version>
<commons-codec.version>1.9</commons-codec.version> <commons-codec.version>1.9</commons-codec.version>
<commons-fileupload.version>1.3.1</commons-fileupload.version> <commons-fileupload.version>1.3.1</commons-fileupload.version>
<commons-beanutils.version>1.9.2</commons-beanutils.version> <commons-beanutils.version>1.9.2</commons-beanutils.version>
<esotericsoftware-kryo.version>4.0.0</esotericsoftware-kryo.version> <esotericsoftware-kryo.version>4.0.0</esotericsoftware-kryo.version>
<codeartisans-json.version>20130603</codeartisans-json.version> <codeartisans-json.version>20130603</codeartisans-json.version>
<fasterxml-jackson.version>2.8.6</fasterxml-jackson.version> <fasterxml-jackson.version>2.8.6</fasterxml-jackson.version>
<dom4j.version>1.6.1</dom4j.version> <dom4j.version>1.6.1</dom4j.version>
<jaxen.version>1.1.6</jaxen.version> <jaxen.version>1.1.6</jaxen.version>
<json-lib.version>2.4</json-lib.version> <json-lib.version>2.4</json-lib.version>
<snakeyaml.version>1.17</snakeyaml.version> <snakeyaml.version>1.17</snakeyaml.version>
<dozer.version>5.5.1</dozer.version> <dozer.version>5.5.1</dozer.version>
<junit.version>4.12</junit.version> <junit.version>4.12</junit.version>
<poi.version>3.14</poi.version> <poi.version>3.14</poi.version>
<!-- framework version setting --> <!-- framework version setting -->
<slf4j.version>1.7.25</slf4j.version> <slf4j.version>1.7.25</slf4j.version>
<logback.version>1.2.3</logback.version> <logback.version>1.2.3</logback.version>
<spring.version>4.3.13.RELEASE</spring.version> <spring.version>4.3.13.RELEASE</spring.version>
<aop-aspectj.version>1.7.4</aop-aspectj.version> <aop-aspectj.version>1.7.4</aop-aspectj.version>
<aop-cglib.version>3.1</aop-cglib.version> <aop-cglib.version>3.1</aop-cglib.version>
<mybatis.version>3.4.5</mybatis.version> <mybatis.version>3.4.5</mybatis.version>
<mybatis-spring.version>1.3.1</mybatis-spring.version> <mybatis-spring.version>1.3.1</mybatis-spring.version>
<druid.version>1.1.3</druid.version> <druid.version>1.1.3</druid.version>
<shiro.version>1.4.0</shiro.version> <shiro.version>1.4.0</shiro.version>
<beetl.version>2.7.11-SNAPSHOT</beetl.version> <beetl.version>2.7.11-SNAPSHOT</beetl.version>
<ehcache.version>2.6.11</ehcache.version> <ehcache.version>2.6.11</ehcache.version>
<ehcache-web.version>2.0.4</ehcache-web.version> <ehcache-web.version>2.0.4</ehcache-web.version>
<validator.version>5.2.4.Final</validator.version> <validator.version>5.2.4.Final</validator.version>
<jedis.version>2.9.0</jedis.version> <jedis.version>2.9.0</jedis.version>
<dbunit.version>2.5.2</dbunit.version> <dbunit.version>2.5.2</dbunit.version>
<quartz.version>2.2.3</quartz.version> <quartz.version>2.2.3</quartz.version>
<!-- environment setting --> <!-- environment setting -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jdk.version>1.7</jdk.version> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<downloadSources>false</downloadSources> <java.version>1.7</java.version>
<downloadJavadocs>false</downloadJavadocs> <downloadSources>false</downloadSources>
<downloadJavadocs>false</downloadJavadocs>
</properties>
</properties>
<dependencies>
<dependencies>
<!-- WEB begin -->
<dependency> <!-- WEB begin -->
<groupId>javax.servlet</groupId> <dependency>
<artifactId>javax.servlet-api</artifactId> <groupId>javax.servlet</groupId>
<version>3.1.0</version> <artifactId>javax.servlet-api</artifactId>
<scope>provided</scope> <version>3.1.0</version>
</dependency> <scope>provided</scope>
<!-- WEB end --> </dependency>
<!-- WEB end -->
</dependencies>
</dependencies>
<build>
<build>
<plugins>
<plugins>
<!-- Compiler 插件, 设定JDK版本 -->
<plugin> <!-- Compiler 插件, 设定JDK版本 -->
<groupId>org.apache.maven.plugins</groupId> <plugin>
<artifactId>maven-compiler-plugin</artifactId> <groupId>org.apache.maven.plugins</groupId>
<version>3.7.0</version> <artifactId>maven-compiler-plugin</artifactId>
<configuration> <version>3.7.0</version>
<source>${jdk.version}</source> <configuration>
<target>${jdk.version}</target> <source>${java.version}</source>
<showWarnings>true</showWarnings> <target>${java.version}</target>
<compilerArguments> <showWarnings>true</showWarnings>
<!-- <verbose /> 输出有关编译器正在执行的操作的消息 --> <compilerArguments>
<bootclasspath>${JAVA_HOME}\jre\lib\rt.jar;${JAVA_HOME}\jre\lib\jce.jar</bootclasspath> <!-- <verbose /> 输出有关编译器正在执行的操作的消息 -->
</compilerArguments> <bootclasspath>${JAVA_HOME}\jre\lib\rt.jar;${JAVA_HOME}\jre\lib\jce.jar</bootclasspath>
</configuration> </compilerArguments>
</plugin> </configuration>
</plugin>
<!-- 打包jar文件时配置manifest文件加入lib包的jar依赖 -->
<plugin> <!-- 打包jar文件时配置manifest文件加入lib包的jar依赖 -->
<groupId>org.apache.maven.plugins</groupId> <plugin>
<artifactId>maven-jar-plugin</artifactId> <groupId>org.apache.maven.plugins</groupId>
<version>3.0.2</version> <artifactId>maven-jar-plugin</artifactId>
<configuration> <version>3.0.2</version>
<encoding>${project.build.sourceEncoding}</encoding> <configuration>
<archive> <encoding>${project.build.sourceEncoding}</encoding>
<addMavenDescriptor>false</addMavenDescriptor> <archive>
</archive> <addMavenDescriptor>false</addMavenDescriptor>
</configuration> </archive>
<executions> </configuration>
<execution> <executions>
<!-- <phase>prepare-package</phase> <execution>
<goals> <!-- <phase>prepare-package</phase>
<goal>jar</goal> <goals>
</goals> --> <goal>jar</goal>
<configuration> </goals> -->
<!-- <classesDirectory>${project.outputDirectory}</classesDirectory> <configuration>
<finalName>jeesite</finalName> <!-- <classesDirectory>${project.outputDirectory}</classesDirectory>
<outputDirectory>${project.build.directory}/${project.artifactId}/WEB-INF/lib</outputDirectory> <finalName>jeesite</finalName>
<includes> <outputDirectory>${project.build.directory}/${project.artifactId}/WEB-INF/lib</outputDirectory>
<include>com/thinkgem/jeesite/**</include> <includes>
</includes> --> <include>com/thinkgem/jeesite/**</include>
<archive> </includes> -->
<manifest> <archive>
<!-- caution: add directory entries --> <manifest>
<addClasspath>true</addClasspath> <!-- caution: add directory entries -->
</manifest> <addClasspath>true</addClasspath>
</archive> </manifest>
</configuration> </archive>
</execution> </configuration>
</executions> </execution>
</plugin> </executions>
</plugin>
<!-- resource插件 -->
<plugin> <!-- resource插件 -->
<groupId>org.apache.maven.plugins</groupId> <plugin>
<artifactId>maven-resources-plugin</artifactId> <groupId>org.apache.maven.plugins</groupId>
<version>3.0.2</version> <artifactId>maven-resources-plugin</artifactId>
</plugin> <version>3.0.2</version>
</plugin>
<!-- install插件 -->
<plugin> <!-- install插件 -->
<groupId>org.apache.maven.plugins</groupId> <plugin>
<artifactId>maven-install-plugin</artifactId> <groupId>org.apache.maven.plugins</groupId>
<version>2.5.2</version> <artifactId>maven-install-plugin</artifactId>
</plugin> <version>2.5.2</version>
</plugin>
<!-- clean插件 -->
<plugin> <!-- clean插件 -->
<groupId>org.apache.maven.plugins</groupId> <plugin>
<artifactId>maven-clean-plugin</artifactId> <groupId>org.apache.maven.plugins</groupId>
<version>3.0.0</version> <artifactId>maven-clean-plugin</artifactId>
</plugin> <version>3.0.0</version>
</plugin>
<!-- ant插件 -->
<plugin> <!-- ant插件 -->
<groupId>org.apache.maven.plugins</groupId> <plugin>
<artifactId>maven-antrun-plugin</artifactId> <groupId>org.apache.maven.plugins</groupId>
<version>1.8</version> <artifactId>maven-antrun-plugin</artifactId>
</plugin> <version>1.8</version>
</plugin>
<!-- dependency插件 -->
<plugin> <!-- dependency插件 -->
<groupId>org.apache.maven.plugins</groupId> <plugin>
<artifactId>maven-dependency-plugin</artifactId> <groupId>org.apache.maven.plugins</groupId>
<version>3.0.2</version> <artifactId>maven-dependency-plugin</artifactId>
</plugin> <version>3.0.2</version>
</plugin>
</plugins>
</plugins>
<pluginManagement>
<pluginManagement>
<plugins>
<plugins>
<!-- 打包插件, war包名称不带版本号 -->
<plugin> <!-- 打包插件, war包名称不带版本号 -->
<groupId>org.apache.maven.plugins</groupId> <plugin>
<artifactId>maven-war-plugin</artifactId> <groupId>org.apache.maven.plugins</groupId>
<version>3.0.0</version> <artifactId>maven-war-plugin</artifactId>
<configuration> <version>3.0.0</version>
<packagingExcludes></packagingExcludes> <configuration>
<warSourceExcludes></warSourceExcludes> <packagingExcludes></packagingExcludes>
<webappDirectory>${project.build.directory}/${project.artifactId}</webappDirectory> <warSourceExcludes></warSourceExcludes>
<!-- <webXml>${project.basedir}/target/jspweb.xml</webXml> --> <webappDirectory>${project.build.directory}/${project.artifactId}</webappDirectory>
<warName>${project.artifactId}</warName> <!-- <webXml>${project.basedir}/target/jspweb.xml</webXml> -->
<archive> <warName>${project.artifactId}</warName>
<addMavenDescriptor>false</addMavenDescriptor> <archive>
</archive> <addMavenDescriptor>false</addMavenDescriptor>
</configuration> </archive>
</plugin> </configuration>
</plugin>
<!-- Eclipse 插件 -->
<plugin> <!-- Eclipse 插件 -->
<groupId>org.apache.maven.plugins</groupId> <plugin>
<artifactId>maven-eclipse-plugin</artifactId> <groupId>org.apache.maven.plugins</groupId>
<version>2.9</version> <artifactId>maven-eclipse-plugin</artifactId>
<configuration> <version>2.9</version>
<downloadSources>${downloadSources}</downloadSources> <configuration>
<downloadJavadocs>${downloadJavadocs}</downloadJavadocs> <downloadSources>${downloadSources}</downloadSources>
<wtpversion>2.0</wtpversion> <downloadJavadocs>${downloadJavadocs}</downloadJavadocs>
<jeeversion>6.0</jeeversion> <wtpversion>2.0</wtpversion>
<additionalConfig> <jeeversion>6.0</jeeversion>
<file> <additionalConfig>
<name>.settings/org.eclipse.core.resources.prefs</name> <file>
<content> <name>.settings/org.eclipse.core.resources.prefs</name>
<![CDATA[eclipse.preferences.version=1${line.separator}encoding/<project>=${project.build.sourceEncoding}${line.separator}]]> <content>
</content> <![CDATA[eclipse.preferences.version=1${line.separator}encoding/<project>=${project.build.sourceEncoding}${line.separator}]]>
</file> </content>
</additionalConfig> </file>
<additionalProjectnatures> </additionalConfig>
<projectnature>org.springframework.ide.eclipse.core.springnature</projectnature> <additionalProjectnatures>
</additionalProjectnatures> <projectnature>org.springframework.ide.eclipse.core.springnature</projectnature>
</configuration> </additionalProjectnatures>
</plugin> </configuration>
</plugin>
<!-- Java Document Generate -->
<plugin> <!-- Java Document Generate -->
<groupId>org.apache.maven.plugins</groupId> <plugin>
<artifactId>maven-javadoc-plugin</artifactId> <groupId>org.apache.maven.plugins</groupId>
<version>2.10.4</version> <artifactId>maven-javadoc-plugin</artifactId>
<configuration> <version>2.10.4</version>
<aggregate>true</aggregate> <configuration>
</configuration> <aggregate>true</aggregate>
<executions> </configuration>
<execution> <executions>
<phase>prepare-package</phase> <execution>
<goals> <phase>prepare-package</phase>
<goal>jar</goal> <goals>
</goals> <goal>jar</goal>
</execution> </goals>
</executions> </execution>
</plugin> </executions>
</plugin>
<!-- YUI Compressor (CSS/JS压缩) -->
<plugin> <!-- YUI Compressor (CSS/JS压缩) -->
<groupId>net.alchim31.maven</groupId> <plugin>
<artifactId>yuicompressor-maven-plugin</artifactId> <groupId>net.alchim31.maven</groupId>
<version>1.5.1</version> <artifactId>yuicompressor-maven-plugin</artifactId>
<executions> <version>1.5.1</version>
<execution> <executions>
<phase>prepare-package</phase> <execution>
<goals> <phase>prepare-package</phase>
<goal>compress</goal> <goals>
</goals> <goal>compress</goal>
</execution> </goals>
</executions> </execution>
<configuration> </executions>
<encoding>UTF-8</encoding> <configuration>
<jswarn>false</jswarn> <encoding>UTF-8</encoding>
<nosuffix>true</nosuffix> <jswarn>false</jswarn>
<linebreakpos>30000</linebreakpos> <nosuffix>true</nosuffix>
<force>true</force> <linebreakpos>30000</linebreakpos>
<includes> <force>true</force>
<include>**/*.js</include> <includes>
<include>**/*.css</include> <include>**/*.js</include>
</includes> <include>**/*.css</include>
<excludes> </includes>
<exclude>**/*.min.js</exclude> <excludes>
<exclude>**/*.min.css</exclude> <exclude>**/*.min.js</exclude>
</excludes> <exclude>**/*.min.css</exclude>
<!-- <aggregations> --> </excludes>
<!-- <aggregation> --> <!-- <aggregations> -->
<!-- <removeIncluded>true</removeIncluded> --> <!-- <aggregation> -->
<!-- <insertNewLine>true</insertNewLine> --> <!-- <removeIncluded>true</removeIncluded> -->
<!-- <inputDir>${project.build.directory}/${project.build.finalName}</inputDir> --> <!-- <insertNewLine>true</insertNewLine> -->
<!-- <output>${project.build.directory}/${project.build.finalName}/app/js/app.pack.js</output> --> <!-- <inputDir>${project.build.directory}/${project.build.finalName}</inputDir> -->
<!-- <includes> --> <!-- <output>${project.build.directory}/${project.build.finalName}/app/js/app.pack.js</output> -->
<!-- <include>app/js/app*.js</include> --> <!-- <includes> -->
<!-- </includes> --> <!-- <include>app/js/app*.js</include> -->
<!-- <excludes> --> <!-- </includes> -->
<!-- <exclude>**/**min.js</exclude> --> <!-- <excludes> -->
<!-- </excludes> --> <!-- <exclude>**/**min.js</exclude> -->
<!-- </aggregation> --> <!-- </excludes> -->
<!-- </aggregations> --> <!-- </aggregation> -->
</configuration> <!-- </aggregations> -->
</plugin> </configuration>
</plugin>
<!-- 这个插件的配置只用于存储Eclipse m2e设置。它没有影响Maven构建本身。 -->
<plugin> <!-- 这个插件的配置只用于存储Eclipse m2e设置。它没有影响Maven构建本身。 -->
<groupId>org.eclipse.m2e</groupId> <plugin>
<artifactId>lifecycle-mapping</artifactId> <groupId>org.eclipse.m2e</groupId>
<version>1.0.0</version> <artifactId>lifecycle-mapping</artifactId>
<configuration> <version>1.0.0</version>
<lifecycleMappingMetadata> <configuration>
<pluginExecutions> <lifecycleMappingMetadata>
<pluginExecution> <pluginExecutions>
<pluginExecutionFilter> <pluginExecution>
<groupId>org.apache.maven.plugins</groupId> <pluginExecutionFilter>
<artifactId>maven-javadoc-plugin</artifactId> <groupId>org.apache.maven.plugins</groupId>
<versionRange>[2.10.4,)</versionRange> <artifactId>maven-javadoc-plugin</artifactId>
<goals> <versionRange>[2.10.4,)</versionRange>
<goal>jar</goal> <goals>
</goals> <goal>jar</goal>
</pluginExecutionFilter> </goals>
<action> </pluginExecutionFilter>
<ignore></ignore> <action>
</action> <ignore></ignore>
</pluginExecution> </action>
<pluginExecution> </pluginExecution>
<pluginExecutionFilter> <pluginExecution>
<groupId>org.apache.maven.plugins</groupId> <pluginExecutionFilter>
<artifactId>maven-dependency-plugin</artifactId> <groupId>org.apache.maven.plugins</groupId>
<versionRange>[2.10,)</versionRange> <artifactId>maven-dependency-plugin</artifactId>
<goals> <versionRange>[2.10,)</versionRange>
<goal> <goals>
copy-dependencies <goal>
</goal> copy-dependencies
</goals> </goal>
</pluginExecutionFilter> </goals>
<action> </pluginExecutionFilter>
<ignore></ignore> <action>
</action> <ignore></ignore>
</pluginExecution> </action>
</pluginExecutions> </pluginExecution>
</lifecycleMappingMetadata> </pluginExecutions>
</configuration> </lifecycleMappingMetadata>
</plugin> </configuration>
</plugin>
</plugins>
</plugins>
</pluginManagement>
</pluginManagement>
<!-- 资源文件配置 -->
<resources> <!-- 资源文件配置 -->
<resource> <resources>
<directory>src/main/java</directory> <resource>
<excludes> <directory>src/main/java</directory>
<exclude>**/*.java</exclude> <excludes>
</excludes> <exclude>**/*.java</exclude>
</resource> </excludes>
<resource> </resource>
<directory>src/main/resources</directory> <resource>
</resource> <directory>src/main/resources</directory>
</resources> </resource>
</resources>
</build>
</build>
<developers>
<developer> <developers>
<id>thinkgem</id> <developer>
<name>WangZhen</name> <id>thinkgem</id>
<email>thinkgem at 163.com</email> <name>WangZhen</name>
<roles><role>Project lead</role></roles> <email>thinkgem at 163.com</email>
<timezone>+8</timezone> <roles><role>Project lead</role></roles>
</developer> <timezone>+8</timezone>
</developers> </developer>
</developers>
<organization>
<name>JeeSite</name> <organization>
<url>http://jeesite.com</url> <name>JeeSite</name>
</organization> <url>http://jeesite.com</url>
</organization>
<repositories>
<repositories>
<repository>
<id>aliyun-repos</id> <repository>
<name>Aliyun Repository</name> <id>aliyun-repos</id>
<url>http://maven.aliyun.com/nexus/content/groups/public</url> <name>Aliyun Repository</name>
<releases><enabled>true</enabled></releases> <url>http://maven.aliyun.com/nexus/content/groups/public</url>
<snapshots><enabled>false</enabled></snapshots> <releases><enabled>true</enabled></releases>
</repository> <snapshots><enabled>false</enabled></snapshots>
<repository> </repository>
<id>sonatype-repos</id> <repository>
<name>Sonatype Repository</name> <id>sonatype-repos</id>
<url>https://oss.sonatype.org/content/groups/public</url> <name>Sonatype Repository</name>
<releases><enabled>true</enabled></releases> <url>https://oss.sonatype.org/content/groups/public</url>
<snapshots><enabled>false</enabled></snapshots> <releases><enabled>true</enabled></releases>
</repository> <snapshots><enabled>false</enabled></snapshots>
<repository> </repository>
<id>sonatype-repos-s</id> <repository>
<name>Sonatype Repository</name> <id>sonatype-repos-s</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url> <name>Sonatype Repository</name>
<releases><enabled>false</enabled></releases> <url>https://oss.sonatype.org/content/repositories/snapshots</url>
<snapshots><enabled>true</enabled></snapshots> <releases><enabled>false</enabled></releases>
</repository> <snapshots><enabled>true</enabled></snapshots>
</repository>
</repositories>
</repositories>
<pluginRepositories>
<pluginRepositories>
<pluginRepository>
<id>aliyun-repos</id> <pluginRepository>
<name>Aliyun Repository</name> <id>aliyun-repos</id>
<url>http://maven.aliyun.com/nexus/content/groups/public</url> <name>Aliyun Repository</name>
</pluginRepository> <url>http://maven.aliyun.com/nexus/content/groups/public</url>
<pluginRepository> </pluginRepository>
<id>sonatype-repos</id> <pluginRepository>
<name>Sonatype Repository</name> <id>sonatype-repos</id>
<url>https://oss.sonatype.org/content/groups/public</url> <name>Sonatype Repository</name>
</pluginRepository> <url>https://oss.sonatype.org/content/groups/public</url>
</pluginRepository>
</pluginRepositories>
</pluginRepositories>
<profiles>
<profiles>
<!-- 打包项目 -->
<profile> <!-- 打包项目 -->
<id>package</id> <profile>
<build> <id>package</id>
<plugins> <build>
<!-- Java Document Generate <plugins>
<plugin> <!-- Java Document Generate
<groupId>org.apache.maven.plugins</groupId> <plugin>
<artifactId>maven-javadoc-plugin</artifactId> <groupId>org.apache.maven.plugins</groupId>
</plugin> --> <artifactId>maven-javadoc-plugin</artifactId>
<!-- YUI Compressor (CSS/JS压缩) --> </plugin> -->
<plugin> <!-- YUI Compressor (CSS/JS压缩) -->
<groupId>net.alchim31.maven</groupId> <plugin>
<artifactId>yuicompressor-maven-plugin</artifactId> <groupId>net.alchim31.maven</groupId>
</plugin> <artifactId>yuicompressor-maven-plugin</artifactId>
</plugins> </plugin>
</build> </plugins>
</profile> </build>
</profile>
<!-- 部署项目 -->
<profile> <!-- 部署项目 -->
<id>deploy</id> <profile>
<build> <id>deploy</id>
<plugins> <build>
<!-- Java Document Generate <plugins>
<plugin> <!-- Java Document Generate
<groupId>org.apache.maven.plugins</groupId> <plugin>
<artifactId>maven-javadoc-plugin</artifactId> <groupId>org.apache.maven.plugins</groupId>
</plugin> --> <artifactId>maven-javadoc-plugin</artifactId>
<!-- YUI Compressor (CSS/JS压缩) --> </plugin> -->
<plugin> <!-- YUI Compressor (CSS/JS压缩) -->
<groupId>net.alchim31.maven</groupId> <plugin>
<artifactId>yuicompressor-maven-plugin</artifactId> <groupId>net.alchim31.maven</groupId>
</plugin> <artifactId>yuicompressor-maven-plugin</artifactId>
</plugins> </plugin>
</build> </plugins>
<distributionManagement> </build>
<repository> <distributionManagement>
<id>sonatype-repos</id> <repository>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url> <id>sonatype-repos</id>
</repository> <url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
<snapshotRepository> </repository>
<id>sonatype-repos-s</id> <snapshotRepository>
<url>https://oss.sonatype.org/content/repositories/snapshots</url> <id>sonatype-repos-s</id>
</snapshotRepository> <url>https://oss.sonatype.org/content/repositories/snapshots</url>
</distributionManagement> </snapshotRepository>
</profile> </distributionManagement>
</profiles> </profile>
</profiles>
</project>
</project>

View File

@@ -663,6 +663,38 @@
<physical_name>test_checkbox</physical_name> <physical_name>test_checkbox</physical_name>
<type>varchar(n)</type> <type>varchar(n)</type>
</word> </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> <word>
<id>ffd84f2ff6d4918bb700605c5a46d3642eac6bcd</id> <id>ffd84f2ff6d4918bb700605c5a46d3642eac6bcd</id>
<length>null</length> <length>null</length>
@@ -695,22 +727,6 @@
<physical_name>test_datetime</physical_name> <physical_name>test_datetime</physical_name>
<type>timestamp</type> <type>timestamp</type>
</word> </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> <word>
<id>ac02f2d1fff63fa66db583735eb1c8e9b466872f</id> <id>ac02f2d1fff63fa66db583735eb1c8e9b466872f</id>
<length>200</length> <length>200</length>
@@ -727,6 +743,22 @@
<physical_name>test_input</physical_name> <physical_name>test_input</physical_name>
<type>varchar(n)</type> <type>varchar(n)</type>
</word> </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> <word>
<id>791691b791efedc2d14867a152b4de58f4567326</id> <id>791691b791efedc2d14867a152b4de58f4567326</id>
<length>10</length> <length>10</length>
@@ -775,6 +807,22 @@
<physical_name>test_select_multiple</physical_name> <physical_name>test_select_multiple</physical_name>
<type>varchar(n)</type> <type>varchar(n)</type>
</word> </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> <word>
<id>68b1f859bfea8bf1733964c0ccaf826fc05f3b1f</id> <id>68b1f859bfea8bf1733964c0ccaf826fc05f3b1f</id>
<length>200</length> <length>200</length>
@@ -792,7 +840,7 @@
<type>varchar(n)</type> <type>varchar(n)</type>
</word> </word>
<word> <word>
<id>577aaa30e264c0599bf74be399f18ad2db387160</id> <id>2eda719a62fb7e1d3face62555046d938abddda9</id>
<length>64</length> <length>64</length>
<decimal>null</decimal> <decimal>null</decimal>
<array>false</array> <array>false</array>
@@ -804,7 +852,7 @@
<char_semantics>false</char_semantics> <char_semantics>false</char_semantics>
<description></description> <description></description>
<logical_name>用户选择</logical_name> <logical_name>用户选择</logical_name>
<physical_name>test_user</physical_name> <physical_name>test_user_code</physical_name>
<type>varchar(n)</type> <type>varchar(n)</type>
</word> </word>
<word> <word>
@@ -939,6 +987,105 @@
<tablespace_set> <tablespace_set>
</tablespace_set> </tablespace_set>
<contents> <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> <table>
<id>5435ef11ea53f170fe3491b199c113e47932e175</id> <id>5435ef11ea53f170fe3491b199c113e47932e175</id>
<height>401</height> <height>401</height>
@@ -1259,8 +1406,8 @@
</sequence> </sequence>
</normal_column> </normal_column>
<normal_column> <normal_column>
<word_id>577aaa30e264c0599bf74be399f18ad2db387160</word_id> <word_id>2eda719a62fb7e1d3face62555046d938abddda9</word_id>
<id>b1fe1fa16a9245d23025a5ef70e8d94ab365a785</id> <id>cfe3c330968a9a824c2cf933b227887d3e9615ac</id>
<description></description> <description></description>
<unique_key_name></unique_key_name> <unique_key_name></unique_key_name>
<logical_name></logical_name> <logical_name></logical_name>
@@ -1292,8 +1439,41 @@
</sequence> </sequence>
</normal_column> </normal_column>
<normal_column> <normal_column>
<word_id>7e7a140b5d69e5c594108bb75e2d59b326b11c0b</word_id> <word_id>5d32d32e3e7a7e115fe0ec3dff297801019dcd78</word_id>
<id>e454dabc647abd4e3a6772dc484b2d4fb6e3f46b</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> <description></description>
<unique_key_name></unique_key_name> <unique_key_name></unique_key_name>
<logical_name></logical_name> <logical_name></logical_name>
@@ -1335,8 +1515,8 @@
</table_properties> </table_properties>
</table> </table>
<table> <table>
<id>13e232e8745538ec21bbae7e4569bcda69d93131</id> <id>fb11bc47b30b0d8e468d3cd16ed660bf57bc8863</id>
<height>401</height> <height>217</height>
<width>320</width> <width>320</width>
<font_name>Segoe UI</font_name> <font_name>Segoe UI</font_name>
<font_size>9</font_size> <font_size>9</font_size>
@@ -1389,6 +1569,72 @@
<decimal_size>0</decimal_size> <decimal_size>0</decimal_size>
</sequence> </sequence>
</normal_column> </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> <normal_column>
<word_id>ac02f2d1fff63fa66db583735eb1c8e9b466872f</word_id> <word_id>ac02f2d1fff63fa66db583735eb1c8e9b466872f</word_id>
<id>78715aa66a10a9b190ad69b8ed792e9a2f4946e3</id> <id>78715aa66a10a9b190ad69b8ed792e9a2f4946e3</id>
@@ -1654,8 +1900,8 @@
</sequence> </sequence>
</normal_column> </normal_column>
<normal_column> <normal_column>
<word_id>577aaa30e264c0599bf74be399f18ad2db387160</word_id> <word_id>2eda719a62fb7e1d3face62555046d938abddda9</word_id>
<id>57d712a76c0dce4350a6f5ad29961ff39c5ded31</id> <id>9f33d190101e56f93f5ece0fd7c5cdda3e704b4c</id>
<description></description> <description></description>
<unique_key_name></unique_key_name> <unique_key_name></unique_key_name>
<logical_name></logical_name> <logical_name></logical_name>
@@ -1687,8 +1933,8 @@
</sequence> </sequence>
</normal_column> </normal_column>
<normal_column> <normal_column>
<word_id>7e7a140b5d69e5c594108bb75e2d59b326b11c0b</word_id> <word_id>5d32d32e3e7a7e115fe0ec3dff297801019dcd78</word_id>
<id>5656ef4015fd5f2e80bcc1f42f7060a55b660516</id> <id>16121b5aa08fc170883408ec2d0487281a132d9d</id>
<description></description> <description></description>
<unique_key_name></unique_key_name> <unique_key_name></unique_key_name>
<logical_name></logical_name> <logical_name></logical_name>
@@ -1719,41 +1965,9 @@
<decimal_size>0</decimal_size> <decimal_size>0</decimal_size>
</sequence> </sequence>
</normal_column> </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> <normal_column>
<word_id>869fc70cf3a4e92e8056b40814df8e03f9f9efde</word_id> <word_id>a5742c4c2c1fd5c201d5d34d977964f97f0fe2c4</word_id>
<id>c43aabb7788441b65957230fef18799d704e19b1</id> <id>fd675547aecaf4cab579decef6612af613c9fb55</id>
<description></description> <description></description>
<unique_key_name></unique_key_name> <unique_key_name></unique_key_name>
<logical_name></logical_name> <logical_name></logical_name>
@@ -1763,41 +1977,7 @@
<default_value></default_value> <default_value></default_value>
<auto_increment>false</auto_increment> <auto_increment>false</auto_increment>
<foreign_key>false</foreign_key> <foreign_key>false</foreign_key>
<not_null>true</not_null> <not_null>false</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> <primary_key>false</primary_key>
<unique_key>false</unique_key> <unique_key>false</unique_key>
<character_set></character_set> <character_set></character_set>
@@ -1818,7 +1998,6 @@
<decimal_size>0</decimal_size> <decimal_size>0</decimal_size>
</sequence> </sequence>
</normal_column> </normal_column>
<column_group>35ae805d1da92afdb99b2fe8c536d1649356fccd</column_group>
</columns> </columns>
<indexes> <indexes>
</indexes> </indexes>