运行调整

pom.xml

@@ -3,7 +3,7 @@
          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>jeeplus</groupId>
     <artifactId>jeeplus</artifactId>
     <version>0.0.1-SNAPSHOT</version>
@@ -58,7 +58,6 @@
         <!-- environment setting -->
         <jdk.version>1.7</jdk.version>
         <tomcat.version>2.2</tomcat.version>
-        <jetty.version>7.6.14.v20131031</jetty.version>
         <webserver.port>8181</webserver.port>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <downloadSources>true</downloadSources>
@@ -79,31 +78,27 @@
                     <target>1.7</target>
                     <compilerArguments>
                         <bootclasspath>${java.home}/lib/rt.jar;${java.home}/lib/jce.jar</bootclasspath>
+                        <extdirs>${project.basedir}/src/main/webapp/WEB-INF/jar</extdirs>
                     </compilerArguments>
                 </configuration>
             </plugin>
             <plugin>
-                <groupId>org.mortbay.jetty</groupId>
-                <artifactId>jetty-maven-plugin</artifactId>
-                <version>${jetty.version}</version>
-                <configuration>
-                    <connectors>
-                        <connector
-                                implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
-                            <port>${webserver.port}</port>
-                        </connector>
-                    </connectors>
-                    <webAppConfig>
-                        <contextPath>/${project.artifactId}</contextPath>
-                    </webAppConfig>
-                    <systemProperties>
-                        <systemProperty>
-                            <name>org.mortbay.util.URI.charset</name>
-                            <value>${project.build.sourceEncoding}</value>
-                        </systemProperty>
-                    </systemProperties>
-                    <stopKey/>
-                </configuration>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>2.10</version>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/lib</outputDirectory>
+                            <includeScope>system</includeScope>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>
@@ -298,9 +293,9 @@
 
 
         <!--<dependency>-->
-            <!--<groupId>javax</groupId>-->
-            <!--<artifactId>javaee-api</artifactId>-->
-            <!--<version>7.0</version>-->
+        <!--<groupId>javax</groupId>-->
+        <!--<artifactId>javaee-api</artifactId>-->
+        <!--<version>7.0</version>-->
         <!--</dependency>-->
 
         <dependency>
@@ -394,23 +389,7 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
             <version>${slf4j.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <version>${slf4j.version}</version>
-        </dependency>
-        <!-- common-logging 实际调用slf4j -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jcl-over-slf4j</artifactId>
-            <version>${slf4j.version}</version>
-        </dependency>
-        <!-- java.util.logging 实际调用slf4j -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jul-to-slf4j</artifactId>
-            <version>${slf4j.version}</version>
+            <scope>compile</scope>
         </dependency>
         <!-- LOGGING end -->
 
@@ -571,11 +550,11 @@
 
 
         <!-- 中文分词 -->
-        <dependency>
-            <groupId>org.wltea</groupId>
-            <artifactId>analyzer</artifactId>
-            <version>2012_u6</version>
-        </dependency>
+        <!--<dependency>-->
+        <!--<groupId>org.wltea</groupId>-->
+        <!--<artifactId>analyzer</artifactId>-->
+        <!--<version>2012_u6</version>-->
+        <!--</dependency>-->
         <!-- GENERAL UTILS end -->
 
         <dependency>
@@ -594,30 +573,38 @@
         <dependency>
             <groupId>com.ckfinder</groupId>
             <artifactId>apache-ant-zip</artifactId>
-            <version>${ckfinder.version}</version>
+            <version>2.3</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/src/main/webapp/WEB-INF/jar/apache-ant-zip-2.3.jar</systemPath>
         </dependency>
         <dependency>
             <groupId>com.ckfinder</groupId>
             <artifactId>ckfinder</artifactId>
             <version>${ckfinder.version}</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/src/main/webapp/WEB-INF/jar/ckfinder-2.3.jar</systemPath>
         </dependency>
         <dependency>
             <groupId>com.ckfinder</groupId>
             <artifactId>ckfinderplugin-fileeditor</artifactId>
             <version>${ckfinder.version}</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/src/main/webapp/WEB-INF/jar/ckfinderplugin-fileeditor-2.3.jar</systemPath>
         </dependency>
         <dependency>
             <groupId>com.ckfinder</groupId>
             <artifactId>ckfinderplugin-imageresize</artifactId>
             <version>${ckfinder.version}</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/src/main/webapp/WEB-INF/jar/ckfinderplugin-imageresize-2.3.jar</systemPath>
         </dependency>
         <!-- CKFinder end -->
 
-        <dependency>
-            <groupId>org.jeeframework</groupId>
-            <artifactId>gencode</artifactId>
-            <version>1.5</version>
-        </dependency>
+        <!--<dependency>-->
+        <!--<groupId>org.jeeframework</groupId>-->
+        <!--<artifactId>gencode</artifactId>-->
+        <!--<version>1.5</version>-->
+        <!--</dependency>-->
 
 
         <!-- TEST begin -->
@@ -667,6 +654,8 @@
             <groupId>QRCoder</groupId>
             <artifactId>QRCoder</artifactId>
             <version>1.0</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/src/main/webapp/WEB-INF/jar/QRCode.jar</systemPath>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/com.github.abel533/ECharts -->
@@ -693,9 +682,9 @@
 
         <!--&lt;!&ndash; https://mvnrepository.com/artifact/javax.activation/activation &ndash;&gt;-->
         <!--<dependency>-->
-            <!--<groupId>javax.activation</groupId>-->
-            <!--<artifactId>activation</artifactId>-->
-            <!--<version>1.1.1</version>-->
+        <!--<groupId>javax.activation</groupId>-->
+        <!--<artifactId>activation</artifactId>-->
+        <!--<version>1.1.1</version>-->
         <!--</dependency>-->
         <!-- https://mvnrepository.com/artifact/org.activiti/activiti-bpmn-converter -->
         <dependency>
@@ -826,11 +815,6 @@
         </dependency>
         <!-- 新增jar包 -->
         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.12</version>
-        </dependency>
-        <dependency>
             <groupId>fr.opensagres.xdocreport</groupId>
             <artifactId>org.apache.poi.xwpf.converter.pdf</artifactId>
             <version>1.0.4</version>
@@ -877,31 +861,54 @@
             <version>${pdfbox.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>www.ssrh</groupId>
-            <artifactId>DBstep</artifactId>
-            <version>1.0</version>
-        </dependency>
+        <!--<dependency>-->
+        <!--<groupId>www.ssrh</groupId>-->
+        <!--<artifactId>DBstep</artifactId>-->
+        <!--<version>1.0</version>-->
+        <!--</dependency>-->
 
+        <!--<dependency>-->
+        <!--<groupId>www.ssrh</groupId>-->
+        <!--<artifactId>jodconverter</artifactId>-->
+        <!--<version>2.2.2</version>-->
+        <!--</dependency>-->
         <dependency>
             <groupId>www.ssrh</groupId>
             <artifactId>jodconverter</artifactId>
             <version>2.2.2</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/src/main/webapp/WEB-INF/jar/jodconverter-2.2.2.jar</systemPath>
         </dependency>
+
+        <!--<dependency>-->
+        <!--<groupId>www.ssrh</groupId>-->
+        <!--<artifactId>jodconverter-cli</artifactId>-->
+        <!--<version>2.2.2</version>-->
+        <!--</dependency>-->
+
         <dependency>
             <groupId>www.ssrh</groupId>
             <artifactId>jodconverter-cli</artifactId>
             <version>2.2.2</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/src/main/webapp/WEB-INF/jar/jodconverter-cli-2.2.2.jar</systemPath>
         </dependency>
+
         <dependency>
             <groupId>fakepath</groupId>
             <artifactId>jurt</artifactId>
-            <version>2.3.0</version>
+            <!--<version>2.3.0</version>-->
+            <version>3.0.1</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/src/main/webapp/WEB-INF/jar/jurt-3.0.1.jar</systemPath>
         </dependency>
         <dependency>
             <groupId>fakepath</groupId>
             <artifactId>juh</artifactId>
-            <version>2.3.0</version>
+            <version>3.0.1</version>
+            <!--<version>2.3.0</version>-->
+            <scope>system</scope>
+            <systemPath>${project.basedir}/src/main/webapp/WEB-INF/jar/juh-3.0.1.jar</systemPath>
         </dependency>
 
         <dependency>

src/main/java/com/jeeplus/modules/isignature/service/ISignatureDocumentService.java

@@ -3,7 +3,7 @@
  */
 package com.jeeplus.modules.isignature.service;
 
-import DBstep.iMsgServer2000;
+//import DBstep.iMsgServer2000;
 import com.jeeplus.common.config.Global;
 import com.jeeplus.common.oss.OSSClientUtil;
 import com.jeeplus.common.persistence.Page;
@@ -68,41 +68,41 @@ public class ISignatureDocumentService extends CrudService<ISignatureDocumentDao
 	 * 更新签章文档
 	 * @param iMsgBody
 	 */
-	@Transactional(readOnly = false)
-	public void update(iMsgServer2000 iMsgBody){
-		String id = iMsgBody.GetMsgByName("RECORDID");//取得文档编号
-		String filename = iMsgBody.GetMsgByName("FILENAME");//取得文档名称
-//		String filetype = iMsgBody.GetMsgByName("FILETYPE");//取得文档类型
-		String filepath = iMsgBody.GetMsgByName("FILEPATH");//取得文档存储路径
-		byte[] bytes = iMsgBody.MsgFileBody();
-		logger.info("保存签章文档，文档号：{}，文档名称：{}",id,filename);
-
-		OSSClientUtil ossClientUtil = new OSSClientUtil();
-		ByteArrayInputStream byteArrayInputStream = null;
-		ByteArrayOutputStream imageOutputStream = null;
-		ByteArrayInputStream imageInputStream = null;
-		byteArrayInputStream = new ByteArrayInputStream(bytes);
-		imageInputStream = new ByteArrayInputStream(bytes);
-		String pathString = getPathString(filepath, filename);
-		pathString = pathString.replace(filename,"");
-		logger.info("文档保存路径：{}",pathString);
-		ossClientUtil.uploadFile2OSS(byteArrayInputStream, pathString, filename);
-		logger.info("成功保存签章文档");
-		//转图片保存 文件大会慢，之后转异步处理
-		new Thread(new ImageConvertThread(imageInputStream,pathString,filename,ossClientUtil)).start();
-
-//		filepath = Global.getAliyunUrl() + "/" + Global.getISignature() + filename;
-		String imagePath = Office2PdfUtil.convertPdfFileName(filepath);
-		ISignatureDocument iSignatureDocument = new ISignatureDocument(id);
-		iSignatureDocument.setFilePath(filepath);
-		iSignatureDocument.setFileName(filename);
-		iSignatureDocument.setUpdateBy(UserUtils.getUser());
-		iSignatureDocument.setUpdateDate(new Date());
-		iSignatureDocument.setImagePath(imagePath);
-        iSignatureDocument.setIsignatureStatus("0");
-		dao.updateSelective(iSignatureDocument);
-		return;
-	}
+//	@Transactional(readOnly = false)
+//	public void update(iMsgServer2000 iMsgBody){
+//		String id = iMsgBody.GetMsgByName("RECORDID");//取得文档编号
+//		String filename = iMsgBody.GetMsgByName("FILENAME");//取得文档名称
+////		String filetype = iMsgBody.GetMsgByName("FILETYPE");//取得文档类型
+//		String filepath = iMsgBody.GetMsgByName("FILEPATH");//取得文档存储路径
+//		byte[] bytes = iMsgBody.MsgFileBody();
+//		logger.info("保存签章文档，文档号：{}，文档名称：{}",id,filename);
+//
+//		OSSClientUtil ossClientUtil = new OSSClientUtil();
+//		ByteArrayInputStream byteArrayInputStream = null;
+//		ByteArrayOutputStream imageOutputStream = null;
+//		ByteArrayInputStream imageInputStream = null;
+//		byteArrayInputStream = new ByteArrayInputStream(bytes);
+//		imageInputStream = new ByteArrayInputStream(bytes);
+//		String pathString = getPathString(filepath, filename);
+//		pathString = pathString.replace(filename,"");
+//		logger.info("文档保存路径：{}",pathString);
+//		ossClientUtil.uploadFile2OSS(byteArrayInputStream, pathString, filename);
+//		logger.info("成功保存签章文档");
+//		//转图片保存 文件大会慢，之后转异步处理
+//		new Thread(new ImageConvertThread(imageInputStream,pathString,filename,ossClientUtil)).start();
+//
+////		filepath = Global.getAliyunUrl() + "/" + Global.getISignature() + filename;
+//		String imagePath = Office2PdfUtil.convertPdfFileName(filepath);
+//		ISignatureDocument iSignatureDocument = new ISignatureDocument(id);
+//		iSignatureDocument.setFilePath(filepath);
+//		iSignatureDocument.setFileName(filename);
+//		iSignatureDocument.setUpdateBy(UserUtils.getUser());
+//		iSignatureDocument.setUpdateDate(new Date());
+//		iSignatureDocument.setImagePath(imagePath);
+//        iSignatureDocument.setIsignatureStatus("0");
+//		dao.updateSelective(iSignatureDocument);
+//		return;
+//	}
 
 	/**
 	 * 创建待签章文档

src/main/java/com/jeeplus/modules/isignature/web/ISignatureDocumentController.java

@@ -3,7 +3,7 @@
  */
 package com.jeeplus.modules.isignature.web;
 
-import DBstep.iMsgServer2000;
+//import DBstep.iMsgServer2000;
 import com.jeeplus.common.config.Global;
 import com.jeeplus.common.oss.OSSClientUtil;
 import com.jeeplus.common.persistence.Page;
@@ -137,40 +137,40 @@ public class ISignatureDocumentController extends BaseController {
 	 */
 	@RequestMapping(value = "save")
 	public void save(HttpServletRequest request,HttpServletResponse response) throws Exception{
-		iMsgServer2000 iMsgBody = new iMsgServer2000();
-		iMsgBody.Load(request);
-		iSignatureDocumentService.update(iMsgBody);
-//		addMessage(redirectAttributes, "保存电子签章信息成功");
-		iMsgBody.MsgTextClear();
-		iMsgBody.MsgFileClear();
-		iMsgBody.Send(response);
+//		iMsgServer2000 iMsgBody = new iMsgServer2000();
+//		iMsgBody.Load(request);
+//		iSignatureDocumentService.update(iMsgBody);
+////		addMessage(redirectAttributes, "保存电子签章信息成功");
+//		iMsgBody.MsgTextClear();
+//		iMsgBody.MsgFileClear();
+//		iMsgBody.Send(response);
 	}
 
 	@RequestMapping(value = "load")
 	public void load(HttpServletRequest request,HttpServletResponse response) throws Exception{
-		iMsgServer2000 iMsgBody = new iMsgServer2000();
-		iMsgBody.Load(request);
-		String id = iMsgBody.GetMsgByName("RECORDID");
-		String filePath = iMsgBody.GetMsgByName("FILEPATH");
-		String fileName = iMsgBody.GetMsgByName("FILENAME");
-		logger.info("电子签章插件加载文档信息，文档号：{}，文件路径：{}，文件名：{}",id,filePath,fileName);
-		byte [] bytes = null;
-		bytes = iSignatureDocumentService.load(filePath,fileName);
-		//测试代码开始---->
-//		FileInputStream inputStream = null;
-//		try{
-//			File file = new File("C:\\Users\\ssrh\\Desktop\\userTest7.pdf");
-//			inputStream =new FileInputStream(file);
-//			bytes = new byte[(int) file.length()];
-//			inputStream.read(bytes);
-//		}finally {
-//			inputStream.close();
-//		}
-		//<----测试代码结束
-		iMsgBody.SetMsgByName("FILENAME",fileName);
-		iMsgBody.MsgFileBody(bytes);					//将文件信息打包
-		iMsgBody.SetMsgByName("STATUS", "打开成功!");			//设置状态信息
-		iMsgBody.Send(response);
+//		iMsgServer2000 iMsgBody = new iMsgServer2000();
+//		iMsgBody.Load(request);
+//		String id = iMsgBody.GetMsgByName("RECORDID");
+//		String filePath = iMsgBody.GetMsgByName("FILEPATH");
+//		String fileName = iMsgBody.GetMsgByName("FILENAME");
+//		logger.info("电子签章插件加载文档信息，文档号：{}，文件路径：{}，文件名：{}",id,filePath,fileName);
+//		byte [] bytes = null;
+//		bytes = iSignatureDocumentService.load(filePath,fileName);
+//		//测试代码开始---->
+////		FileInputStream inputStream = null;
+////		try{
+////			File file = new File("C:\\Users\\ssrh\\Desktop\\userTest7.pdf");
+////			inputStream =new FileInputStream(file);
+////			bytes = new byte[(int) file.length()];
+////			inputStream.read(bytes);
+////		}finally {
+////			inputStream.close();
+////		}
+//		//<----测试代码结束
+//		iMsgBody.SetMsgByName("FILENAME",fileName);
+//		iMsgBody.MsgFileBody(bytes);					//将文件信息打包
+//		iMsgBody.SetMsgByName("STATUS", "打开成功!");			//设置状态信息
+//		iMsgBody.Send(response);
 	}
 
 	@RequestMapping("seeFile")

src/main/java/com/jeeplus/modules/workexample/web/WorkExampleIndicesController.java

@@ -3,16 +3,17 @@
  */
 package com.jeeplus.modules.workexample.web;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.ConstraintViolationException;
-
+import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.jeeplus.common.config.Global;
 import com.jeeplus.common.json.AjaxJson;
+import com.jeeplus.common.persistence.Page;
+import com.jeeplus.common.utils.DateUtils;
+import com.jeeplus.common.utils.MyBeanUtils;
+import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.common.utils.excel.ExportExcel;
+import com.jeeplus.common.utils.excel.ImportExcel;
+import com.jeeplus.common.web.BaseController;
 import com.jeeplus.modules.exampleeconomics.entity.ExampleEconomics;
 import com.jeeplus.modules.exampleeconomics.service.ExampleEconomicsService;
 import com.jeeplus.modules.exampleexpend.entity.ExampleExpend;
@@ -21,14 +22,11 @@ import com.jeeplus.modules.exampleproject.entity.ExampleProject;
 import com.jeeplus.modules.exampleproject.service.ExampleProjectService;
 import com.jeeplus.modules.examplesingle.entity.ExampleSingle;
 import com.jeeplus.modules.examplesingle.service.ExampleSingleService;
-import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.workexample.entity.WorkExample;
-import com.jeeplus.modules.workexample.entity.WorkExampleInfo;
-import groovy.util.IFileNameFinder;
-import javafx.beans.value.WritableListValue;
-import org.apache.shiro.authz.annotation.Logical;
+import com.jeeplus.modules.workexample.entity.WorkExampleIndices;
+import com.jeeplus.modules.workexample.service.WorkExampleIndicesService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -37,17 +35,12 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
-import com.google.common.collect.Lists;
-import com.jeeplus.common.utils.DateUtils;
-import com.jeeplus.common.utils.MyBeanUtils;
-import com.jeeplus.common.config.Global;
-import com.jeeplus.common.persistence.Page;
-import com.jeeplus.common.web.BaseController;
-import com.jeeplus.common.utils.StringUtils;
-import com.jeeplus.common.utils.excel.ExportExcel;
-import com.jeeplus.common.utils.excel.ImportExcel;
-import com.jeeplus.modules.workexample.entity.WorkExampleIndices;
-import com.jeeplus.modules.workexample.service.WorkExampleIndicesService;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.ConstraintViolationException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 指标项目字典Controller

src/main/resources/jeeplus.properties

@@ -19,7 +19,7 @@ db.name=ruihuaoa-activity-data
 #jdbc.url=jdbc:mysql://106.14.207.143:3306/ruihuaoa-activity?useUnicode=true&characterEncoding=utf-8
 #jdbc.username=root
 #jdbc.password=xyc@2017
-jdbc.url=jdbc:mysql://116.62.246.213:3306/ruihuaoa-activity-info?useUnicode=true&characterEncoding=utf-8
+jdbc.url=jdbc:mysql://192.168.2.4:3306/ruihuaoa-activity-info?useUnicode=true&characterEncoding=utf-8
 #jdbc.url=jdbc:mysql://101.37.149.85:3306/ruihuaoa-jeeplus-info?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
 #jdbc.url=jdbc:mysql://127.0.0.1:3306/ruihuaoa-activity-testenv?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
 #jdbc.url=jdbc:mysql://192.168.110.61:3306/ruihuaoa-activity-data?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
@@ -31,7 +31,7 @@ jdbc.url=jdbc:mysql://116.62.246.213:3306/ruihuaoa-activity-info?useUnicode=true
 #jdbc.username=root
 jdbc.username=root
 #jdbc.password=123456
-jdbc.password=gangwan123
+jdbc.password=root
 #jdbc.password=Ruihua666
 #jdbc.url=jdbc:mysql://120.26.207.193:3306/ruihuaoa-activity?useUnicode=true&characterEncoding=utf-8
 #jdbc.username=root
@@ -56,9 +56,9 @@ jdbc.testSql=SELECT 'x' FROM DUAL
 redis.keyPrefix=jeeplus
 #redis.host=172.16.182.241
 #redis.host=101.37.149.85
-redis.host=127.0.0.1
+redis.host=192.168.2.4
 #redis.host=192.168.110.61
-redis.port=6379
+redis.port=6380
 
 #============================#
 #===== System settings ======#

src/main/resources/mappings/modules/gen/GenDataBaseDictDao.xml

@@ -2,82 +2,82 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jeeplus.modules.gen.dao.GenDataBaseDictDao">
     
-	<select id="findTableList" resultType="GenTable">
-		<if test="dbName == 'oracle'">
-			SELECT 
-				t.TABLE_NAME AS name, 
-				c.COMMENTS AS comments
-			FROM user_tables t, user_tab_comments c 
-			WHERE t.table_name = c.table_name
-			<if test="name != null and name != ''">
-				AND t.TABLE_NAME = upper(#{name})
-			</if>
-			ORDER BY t.TABLE_NAME
-		</if>
-		<if test="dbName == 'mysql'">			
-			SELECT t.table_name AS name,t.TABLE_COMMENT AS comments 
-			FROM information_schema.`TABLES` t 
-			WHERE t.TABLE_SCHEMA = (select database())
-			<if test="name != null and name != ''">
-				AND t.TABLE_NAME = upper(#{name})
-			</if>
-			ORDER BY t.TABLE_NAME
-		</if>
-	</select>
-	
-	<select id="findTableColumnList" resultType="GenTableColumn">
-		<if test="dbName == 'oracle'">
-			SELECT
-				t.COLUMN_NAME AS name,<!-- 
-				t.DATA_TYPE,
-				t.DATA_LENGTH,
-				t.DATA_PRECISION,
-				t.DATA_SCALE, -->
-				(CASE WHEN t.NULLABLE = 'Y' THEN '1' ELSE '0' END) AS isNull,
-				(t.COLUMN_ID * 10) AS sort,
-				c.COMMENTS AS comments,
-				decode(t.DATA_TYPE,'DATE',t.DATA_TYPE || '(' || t.DATA_LENGTH || ')',
-					'VARCHAR2', t.DATA_TYPE || '(' || t.DATA_LENGTH || ')',
-					'VARCHAR', t.DATA_TYPE || '(' || t.DATA_LENGTH || ')',
-					'NVARCHAR2', t.DATA_TYPE || '(' || t.DATA_LENGTH/2 || ')',
-					'CHAR', t.DATA_TYPE || '(' || t.DATA_LENGTH || ')',
-					'NUMBER',t.DATA_TYPE || (nvl2(t.DATA_PRECISION,nvl2(decode(t.DATA_SCALE,0,null,t.DATA_SCALE),
-						'(' || t.DATA_PRECISION || ',' || t.DATA_SCALE || ')', 
-						'(' || t.DATA_PRECISION || ')'),'(18)')),t.DATA_TYPE) AS jdbcType 
-			FROM user_tab_columns t, user_col_comments c 
-			WHERE t.TABLE_NAME = c.table_name 
-				AND t.COLUMN_NAME = c.column_name 
-			<if test="name != null and name != ''">
-				AND t.TABLE_NAME = upper(#{name})
-			</if>
-			ORDER BY t.COLUMN_ID
-		</if>
-		<if test="dbName == 'mysql'">	
-			SELECT t.COLUMN_NAME AS name, (CASE WHEN t.IS_NULLABLE = 'YES' THEN '1' ELSE '0' END) AS isNull,
-				(t.ORDINAL_POSITION * 10) AS sort,t.COLUMN_COMMENT AS comments,t.COLUMN_TYPE AS jdbcType 
-			FROM information_schema.`COLUMNS` t 
-			WHERE t.TABLE_SCHEMA = (select database())
-			<if test="name != null and name != ''">
-				AND t.TABLE_NAME = upper(#{name})
-			</if>
-			ORDER BY t.ORDINAL_POSITION
-		</if>
-	</select>
-	
-	<select id="findTablePK" resultType="string">
-		<if test="dbName == 'oracle'">
-			SELECT lower(cu.COLUMN_NAME) AS columnName
-			FROM user_cons_columns cu, user_constraints au
-			WHERE cu.constraint_name = au.constraint_name
-				AND au.constraint_type = 'P'
-				AND au.table_name = upper(#{name})
-		</if>
-		<if test="dbName == 'mysql'">
-			SELECT lower(au.COLUMN_NAME) AS columnName 
-			FROM information_schema.`COLUMNS` au
-			WHERE au.TABLE_SCHEMA = (select database()) 
-			AND au.COLUMN_KEY='PRI' AND au.TABLE_NAME = upper(#{name})
-		</if>
-	</select>
-	
+	<!--<select id="findTableList" resultType="GenTable">-->
+		<!--<if test="dbName == 'oracle'">-->
+			<!--SELECT -->
+				<!--t.TABLE_NAME AS name, -->
+				<!--c.COMMENTS AS comments-->
+			<!--FROM user_tables t, user_tab_comments c -->
+			<!--WHERE t.table_name = c.table_name-->
+			<!--<if test="name != null and name != ''">-->
+				<!--AND t.TABLE_NAME = upper(#{name})-->
+			<!--</if>-->
+			<!--ORDER BY t.TABLE_NAME-->
+		<!--</if>-->
+		<!--<if test="dbName == 'mysql'">			-->
+			<!--SELECT t.table_name AS name,t.TABLE_COMMENT AS comments -->
+			<!--FROM information_schema.`TABLES` t -->
+			<!--WHERE t.TABLE_SCHEMA = (select database())-->
+			<!--<if test="name != null and name != ''">-->
+				<!--AND t.TABLE_NAME = upper(#{name})-->
+			<!--</if>-->
+			<!--ORDER BY t.TABLE_NAME-->
+		<!--</if>-->
+	<!--</select>-->
+	<!---->
+	<!--<select id="findTableColumnList" resultType="GenTableColumn">-->
+		<!--<if test="dbName == 'oracle'">-->
+			<!--SELECT-->
+				<!--t.COLUMN_NAME AS name,&lt;!&ndash; -->
+				<!--t.DATA_TYPE,-->
+				<!--t.DATA_LENGTH,-->
+				<!--t.DATA_PRECISION,-->
+				<!--t.DATA_SCALE, &ndash;&gt;-->
+				<!--(CASE WHEN t.NULLABLE = 'Y' THEN '1' ELSE '0' END) AS isNull,-->
+				<!--(t.COLUMN_ID * 10) AS sort,-->
+				<!--c.COMMENTS AS comments,-->
+				<!--decode(t.DATA_TYPE,'DATE',t.DATA_TYPE || '(' || t.DATA_LENGTH || ')',-->
+					<!--'VARCHAR2', t.DATA_TYPE || '(' || t.DATA_LENGTH || ')',-->
+					<!--'VARCHAR', t.DATA_TYPE || '(' || t.DATA_LENGTH || ')',-->
+					<!--'NVARCHAR2', t.DATA_TYPE || '(' || t.DATA_LENGTH/2 || ')',-->
+					<!--'CHAR', t.DATA_TYPE || '(' || t.DATA_LENGTH || ')',-->
+					<!--'NUMBER',t.DATA_TYPE || (nvl2(t.DATA_PRECISION,nvl2(decode(t.DATA_SCALE,0,null,t.DATA_SCALE),-->
+						<!--'(' || t.DATA_PRECISION || ',' || t.DATA_SCALE || ')', -->
+						<!--'(' || t.DATA_PRECISION || ')'),'(18)')),t.DATA_TYPE) AS jdbcType -->
+			<!--FROM user_tab_columns t, user_col_comments c -->
+			<!--WHERE t.TABLE_NAME = c.table_name -->
+				<!--AND t.COLUMN_NAME = c.column_name -->
+			<!--<if test="name != null and name != ''">-->
+				<!--AND t.TABLE_NAME = upper(#{name})-->
+			<!--</if>-->
+			<!--ORDER BY t.COLUMN_ID-->
+		<!--</if>-->
+		<!--<if test="dbName == 'mysql'">	-->
+			<!--SELECT t.COLUMN_NAME AS name, (CASE WHEN t.IS_NULLABLE = 'YES' THEN '1' ELSE '0' END) AS isNull,-->
+				<!--(t.ORDINAL_POSITION * 10) AS sort,t.COLUMN_COMMENT AS comments,t.COLUMN_TYPE AS jdbcType -->
+			<!--FROM information_schema.`COLUMNS` t -->
+			<!--WHERE t.TABLE_SCHEMA = (select database())-->
+			<!--<if test="name != null and name != ''">-->
+				<!--AND t.TABLE_NAME = upper(#{name})-->
+			<!--</if>-->
+			<!--ORDER BY t.ORDINAL_POSITION-->
+		<!--</if>-->
+	<!--</select>-->
+	<!---->
+	<!--<select id="findTablePK" resultType="string">-->
+		<!--<if test="dbName == 'oracle'">-->
+			<!--SELECT lower(cu.COLUMN_NAME) AS columnName-->
+			<!--FROM user_cons_columns cu, user_constraints au-->
+			<!--WHERE cu.constraint_name = au.constraint_name-->
+				<!--AND au.constraint_type = 'P'-->
+				<!--AND au.table_name = upper(#{name})-->
+		<!--</if>-->
+		<!--<if test="dbName == 'mysql'">-->
+			<!--SELECT lower(au.COLUMN_NAME) AS columnName -->
+			<!--FROM information_schema.`COLUMNS` au-->
+			<!--WHERE au.TABLE_SCHEMA = (select database()) -->
+			<!--AND au.COLUMN_KEY='PRI' AND au.TABLE_NAME = upper(#{name})-->
+		<!--</if>-->
+	<!--</select>-->
+	<!---->
 </mapper>

src/main/resources/mappings/modules/gen/GenSchemeDao.xml

@@ -1,121 +1,121 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jeeplus.modules.gen.dao.GenSchemeDao">
-    
-    <sql id="genSchemeColumns">
-		a.*,
-		a.gen_table_id AS "genTable.id"
-	</sql>
-	
-	<sql id="genSchemeJoins">
-		
-    </sql>
-    
-    <select id="get" resultType="GenScheme">
-		SELECT 
-			<include refid="genSchemeColumns"/>
-		FROM gen_scheme a
-		<include refid="genSchemeJoins"/>
-		WHERE a.id = #{id}
-	</select>
-	
-	<select id="findList" resultType="GenScheme">
-		SELECT 
-			<include refid="genSchemeColumns"/>
-		FROM gen_scheme a
-		<include refid="genSchemeJoins"/>
-		WHERE a.del_flag = #{DEL_FLAG_NORMAL} 
-		<if test="name != null and name != ''">
-			AND a.name LIKE 
-				<if test="dbName == 'oracle'">'%'||#{name}||'%'</if>
-				<if test="dbName == 'mssql'">'%'+#{name}+'%'</if>
-				<if test="dbName == 'mysql'">concat('%',#{name},'%')</if>
-		</if>
-		ORDER BY a.update_date DESC
-	</select>
-	
-	<select id="findAllList" resultType="GenScheme">
-		SELECT 
-			<include refid="genSchemeColumns"/>
-		FROM gen_scheme a
-		<include refid="genSchemeJoins"/>
-		WHERE a.del_flag = #{DEL_FLAG_NORMAL} 
-		ORDER BY a.update_date DESC
-	</select>
-	
-	<insert id="insert">
-		INSERT INTO gen_scheme(
-			id, 
-			name, 
-			category, 
-			package_name, 
-			module_name, 
-			sub_module_name, 
-			function_name, 
-			function_name_simple, 
-			function_author, 
-			gen_table_id, 
-			create_by, 
-			create_date, 
-			update_by, 
-			update_date, 
-			remarks, 
-			del_flag
-		) VALUES (
-			#{id}, 
-			#{name}, 
-			#{category},  
-			#{packageName},  
-			#{moduleName},  
-			#{subModuleName},  
-			#{functionName},  
-			#{functionNameSimple},  
-			#{functionAuthor},  
-			#{genTable.id},  
-			#{createBy.id}, 
-			#{createDate}, 
-			#{updateBy.id}, 
-			#{updateDate}, 
-			#{remarks}, 
-			#{delFlag}
-		)
-	</insert>
-	
-	<update id="update">
-		UPDATE gen_scheme SET 
-			name = #{name}, 
-			category = #{category},  
-			package_name = #{packageName},  
-			module_name = #{moduleName},  
-			sub_module_name = #{subModuleName},  
-			function_name = #{functionName},  
-			function_name_simple = #{functionNameSimple},  
-			function_author = #{functionAuthor},  
-			gen_table_id = #{genTable.id},  
-			update_by = #{updateBy.id}, 
-			update_date = #{updateDate}, 
-			remarks = #{remarks}
-		WHERE id = #{id}
-	</update>
-	
-	<update id="delete">
-		DELETE FROM gen_scheme
-		WHERE id = #{id}
-	</update>
-	
-	<update id="deleteByLogic">
-		UPDATE gen_scheme SET 
-			del_flag = #{DEL_FLAG_DELETE}
-		WHERE id = #{id}
-	</update>
-	
-	<!-- 根据实体名称和字段名称和字段值获取唯一记录 -->
-	<select id="findUniqueByProperty" resultType="GenScheme" statementType="STATEMENT">
-		SELECT 
-			<include refid="genSchemeColumns"/>
-		FROM gen_scheme a
-		<include refid="genSchemeJoins"/>  where ${propertyName} = '${value}'
-	</select>
-	
+    <!---->
+    <!--<sql id="genSchemeColumns">-->
+		<!--a.*,-->
+		<!--a.gen_table_id AS "genTable.id"-->
+	<!--</sql>-->
+	<!---->
+	<!--<sql id="genSchemeJoins">-->
+		<!---->
+    <!--</sql>-->
+    <!---->
+    <!--<select id="get" resultType="GenScheme">-->
+		<!--SELECT -->
+			<!--<include refid="genSchemeColumns"/>-->
+		<!--FROM gen_scheme a-->
+		<!--<include refid="genSchemeJoins"/>-->
+		<!--WHERE a.id = #{id}-->
+	<!--</select>-->
+	<!---->
+	<!--<select id="findList" resultType="GenScheme">-->
+		<!--SELECT -->
+			<!--<include refid="genSchemeColumns"/>-->
+		<!--FROM gen_scheme a-->
+		<!--<include refid="genSchemeJoins"/>-->
+		<!--WHERE a.del_flag = #{DEL_FLAG_NORMAL} -->
+		<!--<if test="name != null and name != ''">-->
+			<!--AND a.name LIKE -->
+				<!--<if test="dbName == 'oracle'">'%'||#{name}||'%'</if>-->
+				<!--<if test="dbName == 'mssql'">'%'+#{name}+'%'</if>-->
+				<!--<if test="dbName == 'mysql'">concat('%',#{name},'%')</if>-->
+		<!--</if>-->
+		<!--ORDER BY a.update_date DESC-->
+	<!--</select>-->
+	<!---->
+	<!--<select id="findAllList" resultType="GenScheme">-->
+		<!--SELECT -->
+			<!--<include refid="genSchemeColumns"/>-->
+		<!--FROM gen_scheme a-->
+		<!--<include refid="genSchemeJoins"/>-->
+		<!--WHERE a.del_flag = #{DEL_FLAG_NORMAL} -->
+		<!--ORDER BY a.update_date DESC-->
+	<!--</select>-->
+	<!---->
+	<!--<insert id="insert">-->
+		<!--INSERT INTO gen_scheme(-->
+			<!--id, -->
+			<!--name, -->
+			<!--category, -->
+			<!--package_name, -->
+			<!--module_name, -->
+			<!--sub_module_name, -->
+			<!--function_name, -->
+			<!--function_name_simple, -->
+			<!--function_author, -->
+			<!--gen_table_id, -->
+			<!--create_by, -->
+			<!--create_date, -->
+			<!--update_by, -->
+			<!--update_date, -->
+			<!--remarks, -->
+			<!--del_flag-->
+		<!--) VALUES (-->
+			<!--#{id}, -->
+			<!--#{name}, -->
+			<!--#{category},  -->
+			<!--#{packageName},  -->
+			<!--#{moduleName},  -->
+			<!--#{subModuleName},  -->
+			<!--#{functionName},  -->
+			<!--#{functionNameSimple},  -->
+			<!--#{functionAuthor},  -->
+			<!--#{genTable.id},  -->
+			<!--#{createBy.id}, -->
+			<!--#{createDate}, -->
+			<!--#{updateBy.id}, -->
+			<!--#{updateDate}, -->
+			<!--#{remarks}, -->
+			<!--#{delFlag}-->
+		<!--)-->
+	<!--</insert>-->
+	<!---->
+	<!--<update id="update">-->
+		<!--UPDATE gen_scheme SET -->
+			<!--name = #{name}, -->
+			<!--category = #{category},  -->
+			<!--package_name = #{packageName},  -->
+			<!--module_name = #{moduleName},  -->
+			<!--sub_module_name = #{subModuleName},  -->
+			<!--function_name = #{functionName},  -->
+			<!--function_name_simple = #{functionNameSimple},  -->
+			<!--function_author = #{functionAuthor},  -->
+			<!--gen_table_id = #{genTable.id},  -->
+			<!--update_by = #{updateBy.id}, -->
+			<!--update_date = #{updateDate}, -->
+			<!--remarks = #{remarks}-->
+		<!--WHERE id = #{id}-->
+	<!--</update>-->
+	<!---->
+	<!--<update id="delete">-->
+		<!--DELETE FROM gen_scheme-->
+		<!--WHERE id = #{id}-->
+	<!--</update>-->
+	<!---->
+	<!--<update id="deleteByLogic">-->
+		<!--UPDATE gen_scheme SET -->
+			<!--del_flag = #{DEL_FLAG_DELETE}-->
+		<!--WHERE id = #{id}-->
+	<!--</update>-->
+	<!---->
+	<!--&lt;!&ndash; 根据实体名称和字段名称和字段值获取唯一记录 &ndash;&gt;-->
+	<!--<select id="findUniqueByProperty" resultType="GenScheme" statementType="STATEMENT">-->
+		<!--SELECT -->
+			<!--<include refid="genSchemeColumns"/>-->
+		<!--FROM gen_scheme a-->
+		<!--<include refid="genSchemeJoins"/>  where ${propertyName} = '${value}'-->
+	<!--</select>-->
+	<!---->
 	
 </mapper>

src/main/resources/mappings/modules/gen/GenTableColumnDao.xml

@@ -1,185 +1,185 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jeeplus.modules.gen.dao.GenTableColumnDao">
-    
-    <sql id="genTableColumnColumns">
-		a.*,
-		b.id AS "genTable.id",
-		b.name AS "genTable.name",
-		b.comments AS "genTable.comments",
-		b.class_name AS "genTable.className",
-		b.parent_table AS "genTable.parentTable",
-		b.parent_table_fk AS "genTable.parentTableFk"
-	</sql>
-	
-	<sql id="genTableColumnJoins">
-		JOIN gen_table b ON b.id = a.gen_table_id
-    </sql>
-    
-    <select id="get" resultType="GenTableColumn">
-		SELECT 
-			<include refid="genTableColumnColumns"/>
-		FROM gen_table_column a
-		<include refid="genTableColumnJoins"/>
-		WHERE a.id = #{id}
-	</select>
-	
-	<select id="findList" resultType="GenTableColumn">
-		SELECT 
-			<include refid="genTableColumnColumns"/>
-		FROM gen_table_column a
-		<include refid="genTableColumnJoins"/>
-		WHERE a.del_flag = #{DEL_FLAG_NORMAL} 
-		<if test="name != null and name != ''">
-			AND a.name LIKE 
-				<if test="dbName == 'oracle'">'%'||#{name}||'%'</if>
-				<if test="dbName == 'mssql'">'%'+#{name}+'%'</if>
-				<if test="dbName == 'mysql'">concat('%',#{name},'%')</if>
-		</if>
-		<if test="genTable != null and genTable.id != null and genTable.id != ''">
-			AND a.gen_table_id = #{genTable.id}
-		</if>
-		ORDER BY a.sort ASC
-	</select>
-	
-	<select id="findAllList" resultType="GenTableColumn">
-		SELECT 
-			<include refid="genTableColumnColumns"/>
-		FROM gen_table_column a
-		<include refid="genTableColumnJoins"/>
-		WHERE a.del_flag = #{DEL_FLAG_NORMAL} 
-		ORDER BY a.sort ASC
-	</select>
-	
-	<insert id="insert">
-		INSERT INTO gen_table_column(
-			id, 
-			gen_table_id, 
-			name, 
-			comments, 
-			jdbc_type, 
-			java_type, 
-			java_field, 
-			is_pk, 
-			is_null, 
-			is_insert, 
-			is_edit, 
-			is_form,
-			is_list, 
-			is_query, 
-			query_type, 
-			show_type, 
-			dict_type, 
-			sort, 
-			create_by, 
-			create_date, 
-			update_by, 
-			update_date, 
-			remarks, 
-			del_flag,
-			tableName,
-			fieldLabels,
-			fieldKeys,
-			searchLabel,
-			searchKey,
-			validateType,
-			min_length,
-			max_length,
-			min_value,
-			max_value
-			
-		) VALUES (
-			#{id}, 
-			#{genTable.id}, 
-			#{name}, 
-			#{comments}, 
-			#{jdbcType}, 
-			#{javaType}, 
-			#{javaField}, 
-			#{isPk}, 
-			#{isNull}, 
-			#{isInsert}, 
-			#{isEdit}, 
-			#{isForm}, 
-			#{isList}, 
-			#{isQuery}, 
-			#{queryType}, 
-			#{showType}, 
-			#{dictType}, 
-			#{sort}, 
-			#{createBy.id}, 
-			#{createDate}, 
-			#{updateBy.id}, 
-			#{updateDate}, 
-			#{remarks}, 
-			#{delFlag},
-			#{tableName},
-			#{fieldLabels},
-			#{fieldKeys},
-			#{searchLabel},
-			#{searchKey},
-			#{validateType},
-			#{minLength},
-			#{maxLength},
-			#{minValue},
-			#{maxValue}
-		)
-	</insert>
-	
-	<update id="update">
-		UPDATE gen_table_column SET 
-			comments = #{comments}, 
-			jdbc_type = #{jdbcType}, 
-			java_type = #{javaType}, 
-			java_field = #{javaField}, 
-			is_pk = #{isPk}, 
-			is_null = #{isNull}, 
-			is_insert = #{isInsert}, 
-			is_edit = #{isEdit}, 
-			is_list = #{isList}, 
-			is_query = #{isQuery}, 
-			query_type = #{queryType}, 
-			show_type = #{showType}, 
-			dict_type = #{dictType}, 
-			sort = #{sort}, 
-			update_by = #{updateBy.id}, 
-			update_date = #{updateDate}, 
-			remarks = #{remarks},
-			del_flag = #{delFlag},
-			tableName = #{tableName},
-			fieldLabels = #{fieldLabels},
-			fieldKeys = #{fieldKeys},
-			searchLabel = #{searchLabel},
-			searchKey = #{searchKey},
-			validateType = #{validateType},
-			min_length = #{minLength},
-			max_length = #{maxLength},
-			min_value = #{minValue},
-			max_value = #{maxValue}
-			
-		WHERE id = #{id}
-	</update>
-	
-	<update id="delete">
-		DELETE FROM gen_table_column 
-		WHERE id = #{id}
-	</update>
-	
-	<update id="deleteByLogic">
-		UPDATE gen_table_column SET 
-			del_flag = #{DEL_FLAG_DELETE}
-		WHERE id = #{id}
-	</update>
-	
-	<update id="deleteByGenTable">
-		DELETE FROM gen_table_column 
-		WHERE gen_table_id = #{id}
-	</update>
-	
-	<update id="deleteByGenTableByLogic">
-		UPDATE gen_table_column SET 
-			del_flag = '1'
-		WHERE gen_table_id = #{id}
-	</update>
-	
+    <!---->
+    <!--<sql id="genTableColumnColumns">-->
+		<!--a.*,-->
+		<!--b.id AS "genTable.id",-->
+		<!--b.name AS "genTable.name",-->
+		<!--b.comments AS "genTable.comments",-->
+		<!--b.class_name AS "genTable.className",-->
+		<!--b.parent_table AS "genTable.parentTable",-->
+		<!--b.parent_table_fk AS "genTable.parentTableFk"-->
+	<!--</sql>-->
+	<!---->
+	<!--<sql id="genTableColumnJoins">-->
+		<!--JOIN gen_table b ON b.id = a.gen_table_id-->
+    <!--</sql>-->
+    <!---->
+    <!--<select id="get" resultType="GenTableColumn">-->
+		<!--SELECT -->
+			<!--<include refid="genTableColumnColumns"/>-->
+		<!--FROM gen_table_column a-->
+		<!--<include refid="genTableColumnJoins"/>-->
+		<!--WHERE a.id = #{id}-->
+	<!--</select>-->
+	<!---->
+	<!--<select id="findList" resultType="GenTableColumn">-->
+		<!--SELECT -->
+			<!--<include refid="genTableColumnColumns"/>-->
+		<!--FROM gen_table_column a-->
+		<!--<include refid="genTableColumnJoins"/>-->
+		<!--WHERE a.del_flag = #{DEL_FLAG_NORMAL} -->
+		<!--<if test="name != null and name != ''">-->
+			<!--AND a.name LIKE -->
+				<!--<if test="dbName == 'oracle'">'%'||#{name}||'%'</if>-->
+				<!--<if test="dbName == 'mssql'">'%'+#{name}+'%'</if>-->
+				<!--<if test="dbName == 'mysql'">concat('%',#{name},'%')</if>-->
+		<!--</if>-->
+		<!--<if test="genTable != null and genTable.id != null and genTable.id != ''">-->
+			<!--AND a.gen_table_id = #{genTable.id}-->
+		<!--</if>-->
+		<!--ORDER BY a.sort ASC-->
+	<!--</select>-->
+	<!---->
+	<!--<select id="findAllList" resultType="GenTableColumn">-->
+		<!--SELECT -->
+			<!--<include refid="genTableColumnColumns"/>-->
+		<!--FROM gen_table_column a-->
+		<!--<include refid="genTableColumnJoins"/>-->
+		<!--WHERE a.del_flag = #{DEL_FLAG_NORMAL} -->
+		<!--ORDER BY a.sort ASC-->
+	<!--</select>-->
+	<!---->
+	<!--<insert id="insert">-->
+		<!--INSERT INTO gen_table_column(-->
+			<!--id, -->
+			<!--gen_table_id, -->
+			<!--name, -->
+			<!--comments, -->
+			<!--jdbc_type, -->
+			<!--java_type, -->
+			<!--java_field, -->
+			<!--is_pk, -->
+			<!--is_null, -->
+			<!--is_insert, -->
+			<!--is_edit, -->
+			<!--is_form,-->
+			<!--is_list, -->
+			<!--is_query, -->
+			<!--query_type, -->
+			<!--show_type, -->
+			<!--dict_type, -->
+			<!--sort, -->
+			<!--create_by, -->
+			<!--create_date, -->
+			<!--update_by, -->
+			<!--update_date, -->
+			<!--remarks, -->
+			<!--del_flag,-->
+			<!--tableName,-->
+			<!--fieldLabels,-->
+			<!--fieldKeys,-->
+			<!--searchLabel,-->
+			<!--searchKey,-->
+			<!--validateType,-->
+			<!--min_length,-->
+			<!--max_length,-->
+			<!--min_value,-->
+			<!--max_value-->
+			<!---->
+		<!--) VALUES (-->
+			<!--#{id}, -->
+			<!--#{genTable.id}, -->
+			<!--#{name}, -->
+			<!--#{comments}, -->
+			<!--#{jdbcType}, -->
+			<!--#{javaType}, -->
+			<!--#{javaField}, -->
+			<!--#{isPk}, -->
+			<!--#{isNull}, -->
+			<!--#{isInsert}, -->
+			<!--#{isEdit}, -->
+			<!--#{isForm}, -->
+			<!--#{isList}, -->
+			<!--#{isQuery}, -->
+			<!--#{queryType}, -->
+			<!--#{showType}, -->
+			<!--#{dictType}, -->
+			<!--#{sort}, -->
+			<!--#{createBy.id}, -->
+			<!--#{createDate}, -->
+			<!--#{updateBy.id}, -->
+			<!--#{updateDate}, -->
+			<!--#{remarks}, -->
+			<!--#{delFlag},-->
+			<!--#{tableName},-->
+			<!--#{fieldLabels},-->
+			<!--#{fieldKeys},-->
+			<!--#{searchLabel},-->
+			<!--#{searchKey},-->
+			<!--#{validateType},-->
+			<!--#{minLength},-->
+			<!--#{maxLength},-->
+			<!--#{minValue},-->
+			<!--#{maxValue}-->
+		<!--)-->
+	<!--</insert>-->
+	<!---->
+	<!--<update id="update">-->
+		<!--UPDATE gen_table_column SET -->
+			<!--comments = #{comments}, -->
+			<!--jdbc_type = #{jdbcType}, -->
+			<!--java_type = #{javaType}, -->
+			<!--java_field = #{javaField}, -->
+			<!--is_pk = #{isPk}, -->
+			<!--is_null = #{isNull}, -->
+			<!--is_insert = #{isInsert}, -->
+			<!--is_edit = #{isEdit}, -->
+			<!--is_list = #{isList}, -->
+			<!--is_query = #{isQuery}, -->
+			<!--query_type = #{queryType}, -->
+			<!--show_type = #{showType}, -->
+			<!--dict_type = #{dictType}, -->
+			<!--sort = #{sort}, -->
+			<!--update_by = #{updateBy.id}, -->
+			<!--update_date = #{updateDate}, -->
+			<!--remarks = #{remarks},-->
+			<!--del_flag = #{delFlag},-->
+			<!--tableName = #{tableName},-->
+			<!--fieldLabels = #{fieldLabels},-->
+			<!--fieldKeys = #{fieldKeys},-->
+			<!--searchLabel = #{searchLabel},-->
+			<!--searchKey = #{searchKey},-->
+			<!--validateType = #{validateType},-->
+			<!--min_length = #{minLength},-->
+			<!--max_length = #{maxLength},-->
+			<!--min_value = #{minValue},-->
+			<!--max_value = #{maxValue}-->
+			<!---->
+		<!--WHERE id = #{id}-->
+	<!--</update>-->
+	<!---->
+	<!--<update id="delete">-->
+		<!--DELETE FROM gen_table_column -->
+		<!--WHERE id = #{id}-->
+	<!--</update>-->
+	<!---->
+	<!--<update id="deleteByLogic">-->
+		<!--UPDATE gen_table_column SET -->
+			<!--del_flag = #{DEL_FLAG_DELETE}-->
+		<!--WHERE id = #{id}-->
+	<!--</update>-->
+	<!---->
+	<!--<update id="deleteByGenTable">-->
+		<!--DELETE FROM gen_table_column -->
+		<!--WHERE gen_table_id = #{id}-->
+	<!--</update>-->
+	<!---->
+	<!--<update id="deleteByGenTableByLogic">-->
+		<!--UPDATE gen_table_column SET -->
+			<!--del_flag = '1'-->
+		<!--WHERE gen_table_id = #{id}-->
+	<!--</update>-->
+	<!---->
 </mapper>

src/main/resources/mappings/modules/gen/GenTableDao.xml

@@ -1,139 +1,139 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jeeplus.modules.gen.dao.GenTableDao">
-    
-    <sql id="genTableColumns">
-		a.*
-	</sql>
-	
-	<sql id="genTableJoins">
-		
-    </sql>
-    
-    <select id="get" resultType="GenTable">
-		SELECT 
-			<include refid="genTableColumns"/>
-		FROM gen_table a
-		<include refid="genTableJoins"/>
-		WHERE a.id = #{id}
-	</select>
-	
-	<select id="findList" resultType="GenTable">
-		SELECT 
-			<include refid="genTableColumns"/>
-		FROM gen_table a
-		<include refid="genTableJoins"/>
-		WHERE a.del_flag = #{DEL_FLAG_NORMAL} 
-		<if test="name != null and name != ''">
-			AND a.name = #{name}
-		</if>
-		<if test="nameLike != null and nameLike != ''">
-			AND a.name LIKE 
-				<if test="dbName == 'oracle'">'%'||#{nameLike}||'%'</if>
-				<if test="dbName == 'mssql'">'%'+#{nameLike}+'%'</if>
-				<if test="dbName == 'mysql'">concat('%',#{nameLike},'%')</if>
-		</if>
-		<if test="comments != null and comments != ''">
-			AND a.comments LIKE 
-				<if test="dbName == 'oracle'">'%'||#{comments}||'%'</if>
-				<if test="dbName == 'mssql'">'%'+#{comments}+'%'</if>
-				<if test="dbName == 'mysql'">concat('%',#{comments},'%')</if>
-		</if>
-		<if test="parentTable != null and parentTable != ''">
-			AND a.parent_table = #{parentTable}
-		</if>
-		<choose>
-			<when test="page.orderBy != null and page.orderBy != ''">
-				ORDER BY ${page.orderBy}
-			</when>
-			<otherwise>
-				ORDER BY a.name ASC
-			</otherwise>
-		</choose>
-	</select>
-	<select id="findAllList" resultType="GenTable">
-		SELECT 
-			<include refid="genTableColumns"/>
-		FROM gen_table a
-		<include refid="genTableJoins"/>
-		WHERE a.del_flag = #{DEL_FLAG_NORMAL}
-		<choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-				ORDER BY ${page.orderBy}
-			</when>
-			<otherwise>
-				ORDER BY a.name ASC
-			</otherwise>
-		</choose>
-	</select>
-	
-	<insert id="insert">
-		INSERT INTO gen_table(
-			id, 
-			name, 
-			comments, 
-			table_type,
-			class_name, 
-			parent_table, 
-			parent_table_fk, 
-			create_by, 
-			create_date, 
-			update_by, 
-			update_date, 
-			remarks, 
-			del_flag,
-			issync
-		) VALUES (
-			#{id}, 
-			#{name}, 
-			#{comments},
-			#{tableType}, 
-			#{className}, 
-			#{parentTable}, 
-			#{parentTableFk}, 
-			#{createBy.id}, 
-			#{createDate}, 
-			#{updateBy.id}, 
-			#{updateDate}, 
-			#{remarks}, 
-			#{delFlag},
-			#{isSync}
-		)
-	</insert>
-	
-	<update id="update">
-		UPDATE gen_table SET <!-- 
-			name = #{name},  -->
-			comments = #{comments}, 
-			table_type = #{tableType},
-			class_name = #{className}, 
-			parent_table = #{parentTable}, 
-			parent_table_fk = #{parentTableFk}, 
-			update_by = #{updateBy.id}, 
-			update_date = #{updateDate}, 
-			remarks = #{remarks},
-			issync = #{isSync}
-		WHERE id = #{id}
-	</update>
-	
-	<update id="delete">
-		DELETE FROM gen_table 
-		WHERE id = #{id}
-	</update>
-	
-	<update id="deleteByLogic">
-		UPDATE gen_table SET 
-			del_flag = #{DEL_FLAG_DELETE}
-		WHERE id = #{id}
-	</update>
-	
-	<update id="buildTable" statementType="STATEMENT">  
-		${sql}
-	</update>
-	
-	<!-- 根据实体名称和字段名称和字段值获取唯一记录 -->
-	<select id="findUniqueByProperty" resultType="GenTable" statementType="STATEMENT">
-		select * FROM gen_table  where ${propertyName} = '${value}'
-	</select>
-	
+    <!---->
+    <!--<sql id="genTableColumns">-->
+		<!--a.*-->
+	<!--</sql>-->
+	<!---->
+	<!--<sql id="genTableJoins">-->
+		<!---->
+    <!--</sql>-->
+    <!---->
+    <!--<select id="get" resultType="GenTable">-->
+		<!--SELECT -->
+			<!--<include refid="genTableColumns"/>-->
+		<!--FROM gen_table a-->
+		<!--<include refid="genTableJoins"/>-->
+		<!--WHERE a.id = #{id}-->
+	<!--</select>-->
+	<!---->
+	<!--<select id="findList" resultType="GenTable">-->
+		<!--SELECT -->
+			<!--<include refid="genTableColumns"/>-->
+		<!--FROM gen_table a-->
+		<!--<include refid="genTableJoins"/>-->
+		<!--WHERE a.del_flag = #{DEL_FLAG_NORMAL} -->
+		<!--<if test="name != null and name != ''">-->
+			<!--AND a.name = #{name}-->
+		<!--</if>-->
+		<!--<if test="nameLike != null and nameLike != ''">-->
+			<!--AND a.name LIKE -->
+				<!--<if test="dbName == 'oracle'">'%'||#{nameLike}||'%'</if>-->
+				<!--<if test="dbName == 'mssql'">'%'+#{nameLike}+'%'</if>-->
+				<!--<if test="dbName == 'mysql'">concat('%',#{nameLike},'%')</if>-->
+		<!--</if>-->
+		<!--<if test="comments != null and comments != ''">-->
+			<!--AND a.comments LIKE -->
+				<!--<if test="dbName == 'oracle'">'%'||#{comments}||'%'</if>-->
+				<!--<if test="dbName == 'mssql'">'%'+#{comments}+'%'</if>-->
+				<!--<if test="dbName == 'mysql'">concat('%',#{comments},'%')</if>-->
+		<!--</if>-->
+		<!--<if test="parentTable != null and parentTable != ''">-->
+			<!--AND a.parent_table = #{parentTable}-->
+		<!--</if>-->
+		<!--<choose>-->
+			<!--<when test="page.orderBy != null and page.orderBy != ''">-->
+				<!--ORDER BY ${page.orderBy}-->
+			<!--</when>-->
+			<!--<otherwise>-->
+				<!--ORDER BY a.name ASC-->
+			<!--</otherwise>-->
+		<!--</choose>-->
+	<!--</select>-->
+	<!--<select id="findAllList" resultType="GenTable">-->
+		<!--SELECT -->
+			<!--<include refid="genTableColumns"/>-->
+		<!--FROM gen_table a-->
+		<!--<include refid="genTableJoins"/>-->
+		<!--WHERE a.del_flag = #{DEL_FLAG_NORMAL}-->
+		<!--<choose>-->
+			<!--<when test="page !=null and page.orderBy != null and page.orderBy != ''">-->
+				<!--ORDER BY ${page.orderBy}-->
+			<!--</when>-->
+			<!--<otherwise>-->
+				<!--ORDER BY a.name ASC-->
+			<!--</otherwise>-->
+		<!--</choose>-->
+	<!--</select>-->
+	<!---->
+	<!--<insert id="insert">-->
+		<!--INSERT INTO gen_table(-->
+			<!--id, -->
+			<!--name, -->
+			<!--comments, -->
+			<!--table_type,-->
+			<!--class_name, -->
+			<!--parent_table, -->
+			<!--parent_table_fk, -->
+			<!--create_by, -->
+			<!--create_date, -->
+			<!--update_by, -->
+			<!--update_date, -->
+			<!--remarks, -->
+			<!--del_flag,-->
+			<!--issync-->
+		<!--) VALUES (-->
+			<!--#{id}, -->
+			<!--#{name}, -->
+			<!--#{comments},-->
+			<!--#{tableType}, -->
+			<!--#{className}, -->
+			<!--#{parentTable}, -->
+			<!--#{parentTableFk}, -->
+			<!--#{createBy.id}, -->
+			<!--#{createDate}, -->
+			<!--#{updateBy.id}, -->
+			<!--#{updateDate}, -->
+			<!--#{remarks}, -->
+			<!--#{delFlag},-->
+			<!--#{isSync}-->
+		<!--)-->
+	<!--</insert>-->
+	<!---->
+	<!--<update id="update">-->
+		<!--UPDATE gen_table SET &lt;!&ndash; -->
+			<!--name = #{name},  &ndash;&gt;-->
+			<!--comments = #{comments}, -->
+			<!--table_type = #{tableType},-->
+			<!--class_name = #{className}, -->
+			<!--parent_table = #{parentTable}, -->
+			<!--parent_table_fk = #{parentTableFk}, -->
+			<!--update_by = #{updateBy.id}, -->
+			<!--update_date = #{updateDate}, -->
+			<!--remarks = #{remarks},-->
+			<!--issync = #{isSync}-->
+		<!--WHERE id = #{id}-->
+	<!--</update>-->
+	<!---->
+	<!--<update id="delete">-->
+		<!--DELETE FROM gen_table -->
+		<!--WHERE id = #{id}-->
+	<!--</update>-->
+	<!---->
+	<!--<update id="deleteByLogic">-->
+		<!--UPDATE gen_table SET -->
+			<!--del_flag = #{DEL_FLAG_DELETE}-->
+		<!--WHERE id = #{id}-->
+	<!--</update>-->
+	<!---->
+	<!--<update id="buildTable" statementType="STATEMENT">  -->
+		<!--${sql}-->
+	<!--</update>-->
+	<!---->
+	<!--&lt;!&ndash; 根据实体名称和字段名称和字段值获取唯一记录 &ndash;&gt;-->
+	<!--<select id="findUniqueByProperty" resultType="GenTable" statementType="STATEMENT">-->
+		<!--select * FROM gen_table  where ${propertyName} = '${value}'-->
+	<!--</select>-->
+	<!---->
 </mapper>

src/main/resources/mappings/modules/gen/GenTemplateDao.xml

@@ -1,105 +1,105 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jeeplus.modules.gen.dao.GenTemplateDao">
-    
-    <sql id="genTemplateColumns">
-		a.*
-	</sql>
-	
-	<sql id="genTemplateJoins">
-		
-    </sql>
-    
-    <select id="get" resultType="GenTemplate">
-		SELECT 
-			<include refid="genTemplateColumns"/>
-		FROM gen_template a
-		<include refid="genTemplateJoins"/>
-		WHERE a.id = #{id}
-	</select>
-	
-	<select id="findList" resultType="GenTemplate">
-		SELECT 
-			<include refid="genTemplateColumns"/>
-		FROM gen_template a
-		<include refid="genTemplateJoins"/>
-		WHERE a.del_flag = #{DEL_FLAG_NORMAL} 
-		<if test="name != null and name != ''">
-			AND a.name LIKE 
-				<if test="dbName == 'oracle'">'%'||#{name}||'%'</if>
-				<if test="dbName == 'mssql'">'%'+#{name}+'%'</if>
-				<if test="dbName == 'mysql'">concat('%',#{name},'%')</if>
-		</if>
-		<if test="category != null and category != ''">
-			AND a.category LIKE 
-				<if test="dbName == 'oracle'">'%'||#{category}||'%'</if>
-				<if test="dbName == 'mssql'">'%'+#{category}+'%'</if>
-				<if test="dbName == 'mysql'">concat('%',#{category},'%')</if>
-		</if>
-		ORDER BY a.name, a.update_date DESC
-	</select>
-	
-	<select id="findAllList" resultType="GenTemplate">
-		SELECT 
-			<include refid="genTemplateColumns"/>
-		FROM gen_template a
-		<include refid="genTemplateJoins"/>
-		WHERE a.del_flag = #{DEL_FLAG_NORMAL} 
-		ORDER BY a.name, a.update_date DESC
-	</select>
-	
-	<insert id="insert">
-		INSERT INTO gen_template(
-			id, 
-			name, 
-			category, 
-			file_path, 
-			file_name, 
-			content, 
-			create_by, 
-			create_date, 
-			update_by, 
-			update_date, 
-			remarks, 
-			del_flag
-		) VALUES (
-			#{id}, 
-			#{name}, 
-			#{category},  
-			#{filePath},  
-			#{fileName},  
-			#{content},  
-			#{createBy.id}, 
-			#{createDate}, 
-			#{updateBy.id}, 
-			#{updateDate}, 
-			#{remarks}, 
-			#{delFlag}
-		)
-	</insert>
-	
-	<update id="update">
-		UPDATE gen_template SET 
-			name = #{name}, 
-			category = #{category},  
-			file_path = #{filePath},  
-			file_name = #{fileName},  
-			content = #{content},  
-			update_by = #{updateBy.id}, 
-			update_date = #{updateDate}, 
-			remarks = #{remarks}
-		WHERE id = #{id}
-	</update>
-	
-	<update id="delete">
-		DELETE FROM gen_template 
-		WHERE id = #{id}
-	</update>
-	
-	<update id="deleteByLogic">
-		UPDATE gen_template SET 
-			del_flag = #{DEL_FLAG_DELETE}
-		WHERE id = #{id}
-	</update>
-	
+    <!---->
+    <!--<sql id="genTemplateColumns">-->
+		<!--a.*-->
+	<!--</sql>-->
+	<!---->
+	<!--<sql id="genTemplateJoins">-->
+		<!---->
+    <!--</sql>-->
+    <!---->
+    <!--<select id="get" resultType="GenTemplate">-->
+		<!--SELECT -->
+			<!--<include refid="genTemplateColumns"/>-->
+		<!--FROM gen_template a-->
+		<!--<include refid="genTemplateJoins"/>-->
+		<!--WHERE a.id = #{id}-->
+	<!--</select>-->
+	<!---->
+	<!--<select id="findList" resultType="GenTemplate">-->
+		<!--SELECT -->
+			<!--<include refid="genTemplateColumns"/>-->
+		<!--FROM gen_template a-->
+		<!--<include refid="genTemplateJoins"/>-->
+		<!--WHERE a.del_flag = #{DEL_FLAG_NORMAL} -->
+		<!--<if test="name != null and name != ''">-->
+			<!--AND a.name LIKE -->
+				<!--<if test="dbName == 'oracle'">'%'||#{name}||'%'</if>-->
+				<!--<if test="dbName == 'mssql'">'%'+#{name}+'%'</if>-->
+				<!--<if test="dbName == 'mysql'">concat('%',#{name},'%')</if>-->
+		<!--</if>-->
+		<!--<if test="category != null and category != ''">-->
+			<!--AND a.category LIKE -->
+				<!--<if test="dbName == 'oracle'">'%'||#{category}||'%'</if>-->
+				<!--<if test="dbName == 'mssql'">'%'+#{category}+'%'</if>-->
+				<!--<if test="dbName == 'mysql'">concat('%',#{category},'%')</if>-->
+		<!--</if>-->
+		<!--ORDER BY a.name, a.update_date DESC-->
+	<!--</select>-->
+	<!---->
+	<!--<select id="findAllList" resultType="GenTemplate">-->
+		<!--SELECT -->
+			<!--<include refid="genTemplateColumns"/>-->
+		<!--FROM gen_template a-->
+		<!--<include refid="genTemplateJoins"/>-->
+		<!--WHERE a.del_flag = #{DEL_FLAG_NORMAL} -->
+		<!--ORDER BY a.name, a.update_date DESC-->
+	<!--</select>-->
+	<!---->
+	<!--<insert id="insert">-->
+		<!--INSERT INTO gen_template(-->
+			<!--id, -->
+			<!--name, -->
+			<!--category, -->
+			<!--file_path, -->
+			<!--file_name, -->
+			<!--content, -->
+			<!--create_by, -->
+			<!--create_date, -->
+			<!--update_by, -->
+			<!--update_date, -->
+			<!--remarks, -->
+			<!--del_flag-->
+		<!--) VALUES (-->
+			<!--#{id}, -->
+			<!--#{name}, -->
+			<!--#{category},  -->
+			<!--#{filePath},  -->
+			<!--#{fileName},  -->
+			<!--#{content},  -->
+			<!--#{createBy.id}, -->
+			<!--#{createDate}, -->
+			<!--#{updateBy.id}, -->
+			<!--#{updateDate}, -->
+			<!--#{remarks}, -->
+			<!--#{delFlag}-->
+		<!--)-->
+	<!--</insert>-->
+	<!---->
+	<!--<update id="update">-->
+		<!--UPDATE gen_template SET -->
+			<!--name = #{name}, -->
+			<!--category = #{category},  -->
+			<!--file_path = #{filePath},  -->
+			<!--file_name = #{fileName},  -->
+			<!--content = #{content},  -->
+			<!--update_by = #{updateBy.id}, -->
+			<!--update_date = #{updateDate}, -->
+			<!--remarks = #{remarks}-->
+		<!--WHERE id = #{id}-->
+	<!--</update>-->
+	<!---->
+	<!--<update id="delete">-->
+		<!--DELETE FROM gen_template -->
+		<!--WHERE id = #{id}-->
+	<!--</update>-->
+	<!---->
+	<!--<update id="deleteByLogic">-->
+		<!--UPDATE gen_template SET -->
+			<!--del_flag = #{DEL_FLAG_DELETE}-->
+		<!--WHERE id = #{id}-->
+	<!--</update>-->
+	<!---->
 </mapper>