--no commit message

app/file/.settings/org.eclipse.jdt.core.prefs

 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.methodParameters=generate
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled

app/file/Dockerfile

-FROM java:8
+FROM anapsix/alpine-java:8_server-jre
 VOLUME /tmp
-ADD file-5.0.0.jar /app.jar  
+ADD target/file-5.0.0.jar /app.jar
 RUN bash -c 'touch /app.jar'
+RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+RUN echo 'Asia/Shanghai' >/etc/timezone
 #EXPOSE 80
-ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","app.jar"]
\ No newline at end of file
+ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","app.jar"]
+
+

app/file/src/main/java/com/zrqx/file/commons/model/ArticleLibrary.java

@@ -13,7 +13,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 @Data
 @ApiModel(value="ArticleLibrary",description="文章库")
-@Table(name = "res_Article_Library")
+@Table(name = "res_article_library")
 public class ArticleLibrary {
 	@Id
 	@GeneratedValue(strategy =GenerationType.IDENTITY, generator = "SELECT REPLACE (UUID(), '-', '')")

app/file/src/main/java/com/zrqx/file/commons/model/ImageLibrary.java

@@ -14,7 +14,7 @@ import javax.persistence.Table;
 import lombok.Data;
 @Data
 @ApiModel(value="ImageLibrary",description="图片库")
-@Table(name = "res_Image_Library")
+@Table(name = "res_image_library")
 public class ImageLibrary {
 	@Id
 	@GeneratedValue(strategy =GenerationType.IDENTITY, generator = "SELECT REPLACE (UUID(), '-', '')")

app/file/src/main/java/com/zrqx/file/commons/model/PdfLibrary.java

@@ -13,7 +13,7 @@ import javax.persistence.Table;
 import lombok.Data;
 @Data
 @ApiModel(value="PdfLibrary",description="PDF库")
-@Table(name = "res_Pdf_Library")
+@Table(name = "res_pdf_library")
 public class PdfLibrary {
 	@Id
 	@GeneratedValue(generator="JDBC")

app/member/Dockerfile

+FROM anapsix/alpine-java:8_server-jre
+VOLUME /tmp
+ADD target/member-5.0.0.jar /app.jar
+RUN bash -c 'touch /app.jar'
+RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+RUN echo 'Asia/Shanghai' >/etc/timezone
+#EXPOSE 80
+ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","app.jar"]
\ No newline at end of file

app/member/pom.xml

@@ -40,7 +40,7 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
-			<!-- <plugin>
+			<plugin>
 				<groupId>com.spotify</groupId>
 				<artifactId>dockerfile-maven-plugin</artifactId>
 				<version>1.4.13</version>
@@ -61,7 +61,7 @@
 						<JAR_FILE>${project.build.finalName}.jar</JAR_FILE>
 					</buildArgs>
 				</configuration>
-			</plugin> -->
+			</plugin>
 		</plugins>
 	</build>
 </project>
\ No newline at end of file

app/member/src/main/java/com/zrqx/member/bg/emember/mapper/ExpertMemberMapper.java

@@ -9,8 +9,8 @@ import com.zrqx.member.commons.vo.bg.member.EMemberVO;
 
 public interface ExpertMemberMapper extends BaseMapper<ExpertMember>{
 	@Select("<script>"
-			+ " select m.id,account,nickName,phone,status,email,remark,authorId,name,organName,sex,img from m_Member m "
-			+ " left join m_Expert_Member em "
+			+ " select m.id,account,nickName,phone,status,email,remark,authorId,name,organName,sex,img from m_member m "
+			+ " left join m_expert_member em "
 			+ " on m.id = em.id "
 			+ " where 1=1 "
 			+ " eq(m.id,id) "

app/member/src/main/java/com/zrqx/member/bg/omember/mapper/OrganMemberMapper.java

@@ -15,10 +15,10 @@ import com.zrqx.member.commons.vo.bg.member.OrganMemberVO;
 public interface OrganMemberMapper extends BaseMapper<OrganMember>{
 	
 	
-	String DEFAULT_PARAM = " SELECT om.uuid,mp.orderType,m.phone,m.id,m.account,m.status,o.name,m.createTime,o.endTime from m_Organ_Member om "
+	String DEFAULT_PARAM = " SELECT om.uuid,mp.orderType,m.phone,m.id,m.account,m.status,o.name,m.createTime,o.endTime from m_organ_member om "
 			+ " left join m_member m "
 			+ " on m.id = om.id "
-			+ " left join m_Organ o "
+			+ " left join m_organ o "
 			+ " on om.oid = o.id "
 			+ " left join m_personal_member mp "
 			+ " on mp.id = m.id "
@@ -44,10 +44,10 @@ public interface OrganMemberMapper extends BaseMapper<OrganMember>{
 	
 	
 	@Select("<script>"
-			+ " select m.id,account,mp.orderType,m.status,o.name,DATE_FORMAT(m.createTime,'%Y-%m-%d %H:%i:%s') createTime,relatedResourceTypes from m_Member m "
-			+ " left join m_Organ_Member om "
+			+ " select m.id,account,mp.orderType,m.status,o.name,DATE_FORMAT(m.createTime,'%Y-%m-%d %H:%i:%s') createTime,relatedResourceTypes from m_member m "
+			+ " left join m_organ_member om "
 			+ " on m.id = om.id "
-			+ " left join m_Organ o "
+			+ " left join m_organ o "
 			+ " on om.oid = o.id "
 			+ " left join m_personal_member mp "
 			+ " on mp.id = m.id "
@@ -58,7 +58,7 @@ public interface OrganMemberMapper extends BaseMapper<OrganMember>{
 	public OrganMemberVO getById(@Param("id")Integer id);
 	
 	@Select("<script>"
-			+ " select * from m_Organ_Member m "
+			+ " select * from m_organ_member m "
 			+ " where 1=1 "
 			+ " eq(m.id,id) "
 			+ "</script>")

app/member/src/main/java/com/zrqx/member/bg/pmember/mapper/PersonalMemberMapper.java

@@ -15,8 +15,8 @@ public interface PersonalMemberMapper extends BaseMapper<PersonalMember>{
 	
 	@Select("<script>"
 			+ " select m.id,account,nickName,phone,status,email,college,remark,academic,name,organName,sex,m.img,password "
-			+ " from m_Member m "
-			+ " left join m_Personal_Member pm "
+			+ " from m_member m "
+			+ " left join m_personal_member pm "
 			+ " on m.id = pm.id "
 			+ " where 1=1 "
 			+ " eq(m.id,id) "

app/member/src/main/java/com/zrqx/member/bg/task/mapper/TaskImageMapper.java

@@ -13,7 +13,7 @@ import com.zrqx.member.commons.model.task.TaskImage;
 public interface TaskImageMapper extends BaseMapper<TaskImage>{
 
 	@Select("<script>" 
-			+ "SELECT image from m_task_Image where 1=1"
+			+ "SELECT image from m_task_image where 1=1"
 			+"<if test='taskId!=null'>"
 			+" and taskId = #{taskId}"
 			+"</if>"

app/member/src/main/java/com/zrqx/member/commons/model/ExpertMember.java

@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
-@Table(name = "m_Expert_Member")
+@Table(name = "m_expert_member")
 @ApiModel(value = "ExpertMember", description = "专家用户信息")
 public class ExpertMember {
 	@Id

app/member/src/main/java/com/zrqx/member/commons/model/Member.java

@@ -13,7 +13,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
-@Table(name = "m_Member")
+@Table(name = "m_member")
 @ApiModel(value = "Member", description = "用户基础信息")
 public class Member {
 	@Id

app/member/src/main/java/com/zrqx/member/commons/model/Organ.java

@@ -14,7 +14,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
-@Table(name = "m_Organ")
+@Table(name = "m_organ")
 @ApiModel(value = "Organ", description = "机构")
 public class Organ {
 	@Id

app/member/src/main/java/com/zrqx/member/commons/model/OrganMember.java

@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
-@Table(name = "m_Organ_Member")
+@Table(name = "m_organ_member")
 @ApiModel(value = "OrganMember", description = "机构用户信息")
 public class OrganMember {
 	@Id

app/member/src/main/java/com/zrqx/member/commons/model/PersonalMember.java

@@ -12,7 +12,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
-@Table(name = "m_Personal_Member")
+@Table(name = "m_personal_member")
 @ApiModel(value = "PersonalMember", description = "个人用户信息")
 public class PersonalMember {
 	@Id

app/member/src/main/java/com/zrqx/member/commons/model/task/TaskImage.java

@@ -12,7 +12,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 @Data
 @ApiModel(value="TaskImage",description="老师批判作业任务表")
-@Table(name = "m_task_Image")
+@Table(name = "m_task_image")
 public class TaskImage {
 	
 	@Id

app/member/src/main/java/com/zrqx/member/fg/personalcenter/PersonalCenterConteroller.java

@@ -164,7 +164,7 @@ public class PersonalCenterConteroller {
 		//判断是否是专家用户
 		Member member = new Member();
 		member.setId(memberInfo.getId());
-		memberInfo.setImg(img);
+		memberInfo.setImg(img); 
 		//判断是否是普通用户
 		if(memberInfo.getLevel().equals(LevelEnum.PERSONAL.getCode())) {
 			PersonalMember pm = new PersonalMember();

app/member/src/main/java/com/zrqx/member/fg/task/mapper/FgTaskImageMapper.java

@@ -13,7 +13,7 @@ import com.zrqx.member.commons.model.task.TaskImage;
 public interface FgTaskImageMapper extends BaseMapper<TaskImage>{
 
 	@Select("<script>" 
-			+ "SELECT image from m_task_Image where 1=1"
+			+ "SELECT image from m_task_image where 1=1"
 			+"<if test='taskId!=null'>"
 			+" and taskId = #{taskId}"
 			+"</if>"

app/order/src/main/java/com/zrqx/order/fg/mapper/FgOrderMapper.java

@@ -85,10 +85,8 @@ public interface FgOrderMapper extends BaseMapper<Order>{
 	 */
 	@Select("<script>"
 			+ " select id,code,payment,createTime,orderType,creater,createrName,status "
-			+ " from "
-			+ " ord_order  "
-			+ " where 1=1 "
-			+ " eq(code,code) "
+			+ " from ord_order where 1=1 "
+			+ " and code=#{code}"
 			+ "</script>")
 	OrderPayVo getOrderPayVo(@Param("code")String code);
 

app/resource/src/main/java/com/zrqx/resource/bg/controller/task/DatabaseController.java

@@ -210,7 +210,7 @@ public class DatabaseController {
 			try (Connection conn = DriverManager.getConnection(url, userName, password)) {
 				if (codes.contains(",")) {
 					String[] codeStr = codes.split(",");
-					String sql = "select r.id from res_audio_Library r inner join res_audio_Library_diy_type rt on r.id =rt.audioid where";
+					String sql = "select r.id from res_audio_library r inner join res_audio_library_diy_type rt on r.id =rt.audioid where";
 					String sql1 = "";
 					for (String code : codeStr) {
 						sql += " rt.code like '" + code + "%' or";
@@ -224,7 +224,7 @@ public class DatabaseController {
 							ids.append("'").append(resultSet.getString("id")).append("',");
 						}
 					}
-					String cmdannextype = command + resource + " res_audio_Library_diy_type --where \"" + sql1
+					String cmdannextype = command + resource + " res_audio_library_diy_type --where \"" + sql1
 							+ "\"  > " + path + "audiotype.sql";
 					process = Runtime.getRuntime().exec(new String[] { "/bin/sh", "-c", cmdannextype });
 					process.waitFor();
@@ -265,7 +265,7 @@ public class DatabaseController {
 			try (Connection conn = DriverManager.getConnection(url, userName, password)) {
 				if (codes.contains(",")) {
 					String[] codeStr = codes.split(",");
-					String sql = "select r.id from res_image_Library r inner join res_image_Library_diy_type rt on r.id =rt.ilid where";
+					String sql = "select r.id from res_image_library r inner join res_image_library_diy_type rt on r.id =rt.ilid where";
 					String sql1 = "";
 					for (String code : codeStr) {
 						sql += " rt.code like '" + code + "%' or";
@@ -279,13 +279,13 @@ public class DatabaseController {
 							ids.append("'").append(resultSet.getString("id")).append("',");
 						}
 					}
-					String cmdannextype = command + resource + " res_image_Library_diy_type --where \"" + sql1
+					String cmdannextype = command + resource + " res_image_library_diy_type --where \"" + sql1
 							+ "\"  > " + path + "audiotype.sql";
 					process = Runtime.getRuntime().exec(new String[] { "/bin/sh", "-c", cmdannextype });
 					process.waitFor();
 				} else {
 					try (PreparedStatement ps = conn.prepareStatement(
-							"select r.id from res_image_Library r inner join res_image_Library_diy_type rt on r.id =rt.ilid where rt.code like '"
+							"select r.id from res_image_library r inner join res_image_library_diy_type rt on r.id =rt.ilid where rt.code like '"
 									+ codes + "%'")) {
 						ResultSet resultSet = ps.executeQuery();
 						while (resultSet.next()) {
@@ -293,7 +293,7 @@ public class DatabaseController {
 						}
 
 					}
-					String cmdannextype = command + resource + " res_image_Library_diy_type --where \"code like '"
+					String cmdannextype = command + resource + " res_image_library_diy_type --where \"code like '"
 							+ codes + "%'\"  > " + path + "imagetype.sql";
 					process = Runtime.getRuntime().exec(new String[] { "/bin/sh", "-c", cmdannextype });
 					process.waitFor();
@@ -302,12 +302,12 @@ public class DatabaseController {
 			}
 			if (ids.length() > 0) {
 				ids = ids.deleteCharAt(ids.length() - 1);
-				String cmdannex = command + resource + " res_image_Library --where \"id in (" + ids + ")\"  > " + path
+				String cmdannex = command + resource + " res_image_library --where \"id in (" + ids + ")\"  > " + path
 						+ "image.sql";
 				process = Runtime.getRuntime().exec(new String[] { "/bin/sh", "-c", cmdannex });
 				process.waitFor();
 				String cmdannexcontent = command + resource
-						+ " res_image_Library_label_content_diy_type --where \"imageId in (" + ids + ")\"  > " + path
+						+ " res_image_library_label_content_diy_type --where \"imageId in (" + ids + ")\"  > " + path
 						+ "imagecontent.sql";
 				process = Runtime.getRuntime().exec(new String[] { "/bin/sh", "-c", cmdannexcontent });
 				process.waitFor();
@@ -320,7 +320,7 @@ public class DatabaseController {
 			try (Connection conn = DriverManager.getConnection(url, userName, password)) {
 				if (codes.contains(",")) {
 					String[] codeStr = codes.split(",");
-					String sql = "select r.id from res_pdf_Library r inner join res_pdf_Library_diy_type rt on r.id =rt.plid where";
+					String sql = "select r.id from res_pdf_library r inner join res_pdf_library_diy_type rt on r.id =rt.plid where";
 					String sql1 = "";
 					for (String code : codeStr) {
 						sql += " rt.code like '" + code + "%' or";
@@ -334,13 +334,13 @@ public class DatabaseController {
 							ids.append("'").append(resultSet.getString("id")).append("',");
 						}
 					}
-					String cmdannextype = command + resource + " res_pdf_Library_diy_type --where \"" + sql1 + "\"  > "
+					String cmdannextype = command + resource + " res_pdf_library_diy_type --where \"" + sql1 + "\"  > "
 							+ path + "pdftype.sql";
 					process = Runtime.getRuntime().exec(new String[] { "/bin/sh", "-c", cmdannextype });
 					process.waitFor();
 				} else {
 					try (PreparedStatement ps = conn.prepareStatement(
-							"select r.id from res_pdf_Library r inner join res_pdf_Library_diy_type rt on r.id =rt.plid where rt.code like '"
+							"select r.id from res_pdf_library r inner join res_pdf_library_diy_type rt on r.id =rt.plid where rt.code like '"
 									+ codes + "%'")) {
 						ResultSet resultSet = ps.executeQuery();
 						while (resultSet.next()) {
@@ -348,7 +348,7 @@ public class DatabaseController {
 						}
 
 					}
-					String cmdannextype = command + resource + " res_pdf_Library_diy_type --where \"code like '" + codes
+					String cmdannextype = command + resource + " res_pdf_library_diy_type --where \"code like '" + codes
 							+ "%'\"  > " + path + "pdftype.sql";
 					process = Runtime.getRuntime().exec(new String[] { "/bin/sh", "-c", cmdannextype });
 					process.waitFor();
@@ -370,7 +370,7 @@ public class DatabaseController {
 			try (Connection conn = DriverManager.getConnection(url, userName, password)) {
 				if (codes.contains(",")) {
 					String[] codeStr = codes.split(",");
-					String sql = "select r.id from res_video_Library r inner join res_video_Library_diy_type rt on r.id =rt.vlid where";
+					String sql = "select r.id from res_video_library r inner join res_video_library_diy_type rt on r.id =rt.vlid where";
 					String sql1 = "";
 					for (String code : codeStr) {
 						sql += " rt.code like '" + code + "%' or";
@@ -384,7 +384,7 @@ public class DatabaseController {
 							ids.append("'").append(resultSet.getString("id")).append("',");
 						}
 					}
-					String cmdannextype = command + resource + " res_video_Library_diy_type --where \"" + sql1
+					String cmdannextype = command + resource + " res_video_library_diy_type --where \"" + sql1
 							+ "\"  > " + path + "videotype.sql";
 					process = Runtime.getRuntime().exec(new String[] { "/bin/sh", "-c", cmdannextype });
 					process.waitFor();
@@ -480,7 +480,7 @@ public class DatabaseController {
 			try (Connection conn = DriverManager.getConnection(url, userName, password)) {
 				if (codes.contains(",")) {
 					String[] codeStr = codes.split(",");
-					String sql = "select r.id from res_article_Library r inner join res_article_Library_diy_type rt on r.id =rt.alid where";
+					String sql = "select r.id from res_article_library r inner join res_article_library_diy_type rt on r.id =rt.alid where";
 					String sql1 = "";
 					for (String code : codeStr) {
 						sql += " rt.code like '" + code + "%' or";
@@ -494,7 +494,7 @@ public class DatabaseController {
 							ids.append("'").append(resultSet.getString("id")).append("',");
 						}
 					}
-					String cmdannextype = command + resource + " res_article_Library_diy_type --where \"" + sql1
+					String cmdannextype = command + resource + " res_article_library_diy_type --where \"" + sql1
 							+ "\"  > " + path + "articletype.sql";
 					process = Runtime.getRuntime().exec(new String[] { "/bin/sh", "-c", cmdannextype });
 					process.waitFor();
@@ -680,7 +680,7 @@ public class DatabaseController {
 		if (resourceType == null || resourceType.contains(AllResourceTypeEnum.AUDIO.getCode().toString())) {
 			try (Connection conn = DriverManager.getConnection(url, userName, password)) {
 				try (PreparedStatement ps = conn.prepareStatement(
-						"select r.audio,r.cover from res_audio_Library r inner join res_audio_library_diy_type rt on r.id =rt.audioid where rt.code like '"
+						"select r.audio,r.cover from res_audio_library r inner join res_audio_library_diy_type rt on r.id =rt.audioid where rt.code like '"
 								+ code + "%'")) {
 					ResultSet resultSet = ps.executeQuery();
 					while (resultSet.next()) {

app/resource/src/main/java/com/zrqx/resource/bg/mapper/annexlibrary/AnnexLibraryMapper.java

@@ -17,7 +17,7 @@ import com.zrqx.resource.commons.vo.bg.annexlibrary.AnnexLibraryListVO;
 public interface AnnexLibraryMapper extends BaseMapper<AnnexLibrary> {
 	@Select("<script>" 
 			+ "select a.id,a.name,a.source,a.bookName,a.realprice,a.timeLength,a.size,a.uploadTime,a.status "
-			+ "from res_annex_library a left join res_annex_library_Diy_Type ad "
+			+ "from res_annex_library a left join res_annex_library_diy_type ad "
 			+ "on a.id = ad.annexid "
 			+ "where 1=1 "
 			
@@ -41,7 +41,7 @@ public interface AnnexLibraryMapper extends BaseMapper<AnnexLibrary> {
 	
 	@Select("<script>" 
 			+ "select a.id,a.name,a.author,a.source,a.bookName,a.realprice,a.timeLength,a.size,a.uploadTime,a.status "
-			+ "from res_annex_library a left join res_annex_library_Diy_Type ad "
+			+ "from res_annex_library a left join res_annex_library_diy_type ad "
 			+ "on a.id = ad.annexid "
 			+ "where 1=1 and a.status = 1 "
 			

app/resource/src/main/java/com/zrqx/resource/bg/mapper/articlelibrary/ArticleLibraryMapper.java

@@ -22,7 +22,7 @@ public interface ArticleLibraryMapper extends BaseMapper<ArticleLibrary> {
 	 */
 	@Select("<script>" 
 			+ "select a.id,a.name,a.author,a.source,a.bookName,a.price,a.realPrice,a.uploadTime,a.status,a.nationsType,a.resourceType "
-			+ "from res_Article_Library a left join res_Article_Library_Diy_Type ad "
+			+ "from res_article_library a left join res_article_library_diy_type ad "
 			+ "on a.id = ad.alid "
 			+ "where 1=1 "
 			
@@ -46,7 +46,7 @@ public interface ArticleLibraryMapper extends BaseMapper<ArticleLibrary> {
 	
 	@Select("<script>" 
 			+ " select a.id,a.name,a.author,a.source,a.bookName,a.price,a.realPrice,a.uploadTime,a.status,a.img,a.resourceType "
-			+ " from res_Article_Library a left join res_Article_Library_Diy_Type ad "
+			+ " from res_article_library a left join res_article_library_diy_type ad "
 			+ " on a.id = ad.alid "
 			+ " where 1=1 and a.status = 1 "
 			

app/resource/src/main/java/com/zrqx/resource/bg/mapper/audiolibrary/AudioLibraryMapper.java

@@ -17,7 +17,7 @@ import com.zrqx.resource.commons.vo.bg.audiolibrary.AudioLibraryListVO;
 public interface AudioLibraryMapper extends BaseMapper<AudioLibrary> {
 	@Select("<script>" 
 			+ "select a.id,a.name,a.source,a.realprice,a.uploadTime,a.timeLength,a.size,a.status "
-			+ "from res_Audio_Library a left join res_Audio_Library_Diy_Type ad "
+			+ "from res_audio_library a left join res_audio_library_diy_type ad "
 			+ "on a.id = ad.audioid "
 			+ "where 1=1 "
 			+ " eq(a.nationsType,form.nationsType) "
@@ -47,7 +47,7 @@ public interface AudioLibraryMapper extends BaseMapper<AudioLibrary> {
 	
 	@Select("<script>" 
 			+ "select a.id,a.name,a.author,a.source,a.realprice,a.uploadTime,a.timeLength,a.size,a.status,a.cover "
-			+ "from res_Audio_Library a left join res_Audio_Library_Diy_Type ad "
+			+ "from res_audio_library a left join res_audio_library_diy_type ad "
 			+ "on a.id = ad.audioid "
 			+ "where 1=1 and a.status = 1 "
 			

app/resource/src/main/java/com/zrqx/resource/bg/mapper/diytype/DiyTypeMapper.java

@@ -25,7 +25,7 @@ public interface DiyTypeMapper extends BaseMapper<DiyType> {
 	 * 
 	 * @return
 	 */
-	@Select("select sort from res_Diy_Type where parentId = #{id} ")
+	@Select("select sort from res_diy_type where parentId = #{id} ")
 	Integer getMaxOrderNum(Integer id);
 
 	/**
@@ -33,7 +33,7 @@ public interface DiyTypeMapper extends BaseMapper<DiyType> {
 	 * 
 	 * @return
 	 */
-	@Update("update res_Diy_Type set sort = #{sort}  where parentId = #{id}")
+	@Update("update res_diy_type set sort = #{sort}  where parentId = #{id}")
 	Integer updateSortByPrimaryKey(@Param("sort") Integer sort, @Param("id") Integer id);
 
 	/**

app/resource/src/main/java/com/zrqx/resource/bg/mapper/imagelibrary/ImageLibraryMapper.java

@@ -17,7 +17,7 @@ import com.zrqx.resource.commons.vo.bg.imagelibrary.ImageLibraryListVO;
 public interface ImageLibraryMapper extends BaseMapper<ImageLibrary> {
 	@Select("<script>" 
 			+ "select a.id,a.name,a.bookName,a.source,a.realprice,a.image,a.uploadTime,a.status "
-			+ "from res_Image_Library a left join res_Image_Library_Diy_Type ad "
+			+ "from res_image_library a left join res_image_library_diy_type ad "
 			+ "on a.id = ad.ilid "
 			+ "where 1=1 "
 			
@@ -61,7 +61,7 @@ public interface ImageLibraryMapper extends BaseMapper<ImageLibrary> {
 	
 	@Select("<script>" 
 			+ "select a.id,a.name,a.bookName,a.author,a.price,a.uploadTime,a.status "
-			+ "from res_Image_Library a left join res_Image_Library_Diy_Type ad "
+			+ "from res_image_library a left join res_image_library_diy_type ad "
 			+ "on a.id = ad.ilid "
 			+ "where 1=1 and a.status = 1 "
 			+ " like(ad.code,form.diyTypeCode) "

app/resource/src/main/java/com/zrqx/resource/bg/mapper/label/LabelContentDiyTypeMapper.java

@@ -22,7 +22,7 @@ public interface  LabelContentDiyTypeMapper extends BaseMapper<LabelContentDiyTy
 	 */
 	@Select("<script>" 
 			+ "select * "
-			+ "from  res_Label_Content_Diy_Type a "
+			+ "from  res_label_content_diy_type a "
 			+ "where a.id in "
 			+ " <foreach collection=\"ids\" index=\"index\" item=\"id\" open=\"(\" separator=\",\" close=\")\">" 
 			+ "#{id}" 
@@ -37,7 +37,7 @@ public interface  LabelContentDiyTypeMapper extends BaseMapper<LabelContentDiyTy
 	 */
 	@Select("<script>" 
 			+ "select a.id, a.labelId, a.labelContent, a.parentId, a.englishName, a.sort, a.code, a.createTime, a.oldCode "
-			+ "from  res_Label_Content_Diy_Type a "
+			+ "from  res_label_content_diy_type a "
 			+ "where a.labelId = #{labelId} "
 			+ "and a.status = 1 "
 		    + "</script>")
@@ -50,7 +50,7 @@ public interface  LabelContentDiyTypeMapper extends BaseMapper<LabelContentDiyTy
 	 */
 	@Select("<script>" 
 			+ "select distinct a.id "
-			+ "from  res_Label_Content_Diy_Type a "
+			+ "from  res_label_content_diy_type a "
 			+ "where a.labelContent = #{form.labelContent} "
 			+ "and a.parentId = #{form.parentId} "
 			+ "and a.status = 1 "
@@ -64,7 +64,7 @@ public interface  LabelContentDiyTypeMapper extends BaseMapper<LabelContentDiyTy
 	 */
 	@Select("<script>" 
 			+ "select a.id, a.code "
-			+ "from  res_Label_Content_Diy_Type a "
+			+ "from  res_label_content_diy_type a "
 			+ "where a.parentId = #{form.parentId} "
 			+ "and a.labelId = #{form.labelId} "
 		    + "</script>")
@@ -77,7 +77,7 @@ public interface  LabelContentDiyTypeMapper extends BaseMapper<LabelContentDiyTy
 	 */
 	@Delete("<script>" 
 			+ "delete "
-			+ "from  res_Label_Content_Diy_Type "
+			+ "from  res_label_content_diy_type "
 			+ "where labelId in  "
 			+ " <foreach collection=\"labelIds\" index=\"index\" item=\"id\" open=\"(\" separator=\",\" close=\")\">" 
 			+ "#{id}" 
@@ -92,7 +92,7 @@ public interface  LabelContentDiyTypeMapper extends BaseMapper<LabelContentDiyTy
 	 */
 	@Delete("<script>" 
 			+ "delete "
-			+ "from  res_Label_Content_Diy_Type "
+			+ "from  res_label_content_diy_type "
 			+ "where labelId = #{labelContentDiyType.labelId} "
 			+ "and code like \"${labelContentDiyType.code}%\" "
 		    + "</script>")
@@ -105,7 +105,7 @@ public interface  LabelContentDiyTypeMapper extends BaseMapper<LabelContentDiyTy
 	 * @return
 	 */
 	@Update("<script>" 
-			+"update res_Label_Content_Diy_Type "
+			+"update res_label_content_diy_type "
 			+ "set status = 0  "
 			+ "where labelId = #{labelContentDiyType.labelId} "
 			+ " like(code,labelContentDiyType.code) "

app/resource/src/main/java/com/zrqx/resource/bg/mapper/label/LabelDataTypeMapper.java

@@ -20,7 +20,7 @@ public interface  LabelDataTypeMapper extends BaseMapper<LabelDataType> {
 	 */
 	@Select("<script>" 
 			+ "select ad.id, ad.labelId, ad.dataType, ad.dataTypeSort "
-			+ "from  res_Label_Data_Type ad "
+			+ "from  res_label_data_type ad "
 			+ "where 1=1 "
 			+ "and ad.labelId = #{labelId} "
 		    + "</script>")
@@ -33,7 +33,7 @@ public interface  LabelDataTypeMapper extends BaseMapper<LabelDataType> {
 	 */
 	@Delete("<script>" 
 			+ "delete "
-			+ "from  res_Label_Data_Type "
+			+ "from  res_label_data_type "
 			+ "where labelId in  "
 			+ " <foreach collection=\"labelIds\" index=\"index\" item=\"id\" open=\"(\" separator=\",\" close=\")\">" 
 			+ "#{id}" 

app/resource/src/main/java/com/zrqx/resource/bg/mapper/label/LabelMapper.java

@@ -20,7 +20,7 @@ public interface LabelMapper extends BaseMapper<Label> {
 	 */
 	@Select("<script>" 
 			+ "select a.id,a.name,a.englishName , createTime "
-			+ "from res_Label a  "
+			+ "from res_label a  "
 			+ "where 1=1 "
 			+ " eq(a.nationsType,nationsType) "
 			+ "</script>")
@@ -33,7 +33,7 @@ public interface LabelMapper extends BaseMapper<Label> {
 	 */
 	@Delete("<script>" 
 			+ "delete "
-			+ "from  res_Label "
+			+ "from  res_label "
 			+ "where id in  "
 			+ " <foreach collection=\"ids\" index=\"index\" item=\"id\" open=\"(\" separator=\",\" close=\")\">" 
 			+ "#{id}" 
@@ -48,7 +48,7 @@ public interface LabelMapper extends BaseMapper<Label> {
 	 */
 	@Select("<script>" 
 			+ "select a.id,a.name,a.englishName , createTime "
-			+ "from res_Label a  "
+			+ "from res_label a  "
 			+ "where 1=1 "
 			+ "and id in  "
 			+ " <foreach collection=\"ids\" index=\"index\" item=\"id\" open=\"(\" separator=\",\" close=\")\">" 
@@ -64,7 +64,7 @@ public interface LabelMapper extends BaseMapper<Label> {
 	 */
 	@Select("<script>" 
 			+ "select a.id,a.name,a.englishName , createTime "
-			+ "from res_Label a  "
+			+ "from res_label a  "
 			+ "where 1=1 "
 			+ "<if test='" + NOTBLANK + "(name)' >"  
 			+ "and a.name = #{name} "

app/resource/src/main/java/com/zrqx/resource/bg/mapper/pdffilelibrary/PdfLibraryMapper.java

@@ -16,7 +16,7 @@ import com.zrqx.resource.commons.vo.bg.pdffilelibrary.PdfLibraryListVO;
 public interface PdfLibraryMapper extends BaseMapper<PdfLibrary> {
 	@Select("<script>" 
 			+ "select a.id,a.name,a.author,a.source,a.pdf,a.price,a.uploadTime,a.status "
-			+ "from res_Pdf_Library a left join res_Pdf_Library_Diy_Type ad "
+			+ "from res_pdf_library a left join res_pdf_library_diy_type ad "
 			+ "on a.id = ad.plid "
 			+ "where 1=1 "
 			

app/resource/src/main/java/com/zrqx/resource/bg/mapper/projectlibrary/ProjectLibraryMapper.java

@@ -18,7 +18,7 @@ public interface ProjectLibraryMapper extends BaseMapper<ProjectLibrary> {
 
 	@Select("<script>" 
 			+ "select a.id,a.name,a.uploadTime,a.updateTime,a.status,a.author,a.cover "
-			+ "from res_Project_Library a "
+			+ "from res_project_library a "
 			+ "where 1=1 "
 			+ "<if test='"+ NOTBLANK +"(form.nai)'>"
 			+ " AND (a.name like concat('%',#{form.nai},'%')  OR a.author like concat('%',#{form.nai},'%')) "
@@ -39,7 +39,7 @@ public interface ProjectLibraryMapper extends BaseMapper<ProjectLibrary> {
 
 	@Select("<script>"
 			+ "select a.id,a.name,a.cover,a.status,uploadTime "
-			+ "FROM res_Project_Library a "
+			+ "FROM res_project_library a "
 			+ " where 1 = 1 and a.status = 1 "
 			+ " like(a.name,form.name) "
 			+ "<if test='form.ids != null and form.ids.size > 0'>"  

app/resource/src/main/java/com/zrqx/resource/bg/mapper/recommend/RecommendMapper.java

@@ -17,7 +17,7 @@ public interface RecommendMapper extends BaseMapper<Recommend> {
 	 * @date: 2018年12月4日 下午5:42:44
 	 */
 	@Update("<script>" 
-			+"update res_Recommend "
+			+"update res_recommend "
 			+ "set img = #{recommend.img} ,  "
 			+ "descriptions = #{recommend.descriptions} , status = #{recommend.status} , "
 			+ "updateTime = #{recommend.updateTime} "

app/resource/src/main/java/com/zrqx/resource/bg/mapper/thesislibrary/ThesisLibraryMapper.java

@@ -16,7 +16,7 @@ import com.zrqx.resource.commons.vo.bg.thesislibrary.ThesisLibraryListVO;
 public interface ThesisLibraryMapper extends BaseMapper<ThesisLibrary> {
 	@Select("<script>" 
 			+ "select distinct a.id,a.title,a.author,a.journal,a.price,DATE_FORMAT(a.uploadTime,'%Y-%m-%d') uploadTime,a.status "
-			+ "from res_Thesis_Library a left join res_Thesis_Library_Diy_Type ad "
+			+ "from res_thesis_library a left join res_thesis_library_diy_type ad "
 			+ "on a.id = ad.tlid "
 			+ "where 1=1 "
 			

app/resource/src/main/java/com/zrqx/resource/commons/model/annexlibrary/AnnexLibraryDiyType.java

@@ -10,7 +10,7 @@ import lombok.Data;
 
 @Data
 @ApiModel(value="AnnexLibraryDiyType",description="附件与自定义分类关系表")
-@Table(name = "res_Annex_Library_Diy_Type")
+@Table(name = "res_annex_library_diy_type")
 public class AnnexLibraryDiyType {
 	@Id
 	@GeneratedValue(generator="JDBC")

app/resource/src/main/java/com/zrqx/resource/commons/model/articlelibrary/ArticleLibrary.java

@@ -13,7 +13,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 @Data
 @ApiModel(value="ArticleLibrary",description="文章库")
-@Table(name = "res_Article_Library")
+@Table(name = "res_article_library")
 public class ArticleLibrary {
 	@Id
 	@GeneratedValue(strategy =GenerationType.IDENTITY, generator = "SELECT REPLACE (UUID(), '-', '')")

app/resource/src/main/java/com/zrqx/resource/commons/model/articlelibrary/ArticleLibraryDiyType.java

@@ -11,7 +11,7 @@ import lombok.Data;
 
 @Data
 @ApiModel(value="ArticleLibraryDiyType",description="文章与自定义分类关系表")
-@Table(name = "res_Article_Library_Diy_Type")
+@Table(name = "res_article_library_diy_type")
 public class ArticleLibraryDiyType {
 	@Id
 	@GeneratedValue(generator="JDBC")

app/resource/src/main/java/com/zrqx/resource/commons/model/articlelibrary/ArticleLibraryLabelContentDiyType.java

@@ -10,7 +10,7 @@ import lombok.Data;
 
 @Data
 @ApiModel(value="ArticleLibraryLabelContentDiyType",description="文章与标签关系表")
-@Table(name = "res_Article_Library_Label_Content_Diy_Type")
+@Table(name = "res_article_library_Label_Content_Diy_Type")
 public class ArticleLibraryLabelContentDiyType {
 	@Id
 	@GeneratedValue(generator="JDBC")

app/resource/src/main/java/com/zrqx/resource/commons/model/audiolibrary/AudioLibrary.java

@@ -14,7 +14,7 @@ import javax.persistence.Table;
 import lombok.Data;
 @Data
 @ApiModel(value="audioLibrary",description="音频库")
-@Table(name = "res_audio_Library")
+@Table(name = "res_audio_library")
 public class AudioLibrary {
 	@Id
 	@GeneratedValue(strategy =GenerationType.IDENTITY, generator = "SELECT REPLACE (UUID(), '-', '')")

app/resource/src/main/java/com/zrqx/resource/commons/model/audiolibrary/AudioLibraryDiyType.java

@@ -10,7 +10,7 @@ import lombok.Data;
 
 @Data
 @ApiModel(value="audioLibraryDiyTypeRelation",description="音频与自定义分类关系表")
-@Table(name = "res_audio_Library_Diy_Type")
+@Table(name = "res_audio_library_diy_type")
 public class AudioLibraryDiyType {
 	@Id
 	@GeneratedValue(generator="JDBC")

app/resource/src/main/java/com/zrqx/resource/commons/model/audiolibrary/AudioLibraryLabelContentDiyType.java

@@ -10,7 +10,7 @@ import lombok.Data;
 
 @Data
 @ApiModel(value="AudioLibraryLabelContentDiyType",description="音频与标签关系表")
-@Table(name = "res_Audio_Library_Label_Content_Diy_Type")
+@Table(name = "res_audio_library_Label_Content_Diy_Type")
 public class AudioLibraryLabelContentDiyType {
 	@Id
 	@GeneratedValue(generator="JDBC")

app/resource/src/main/java/com/zrqx/resource/commons/model/authorLibrary/AuthorLibrary.java

@@ -15,7 +15,7 @@ import javax.persistence.Transient;
 import lombok.Data;
 
 @Data
-@Table(name = "res_author_Library")
+@Table(name = "res_author_library")
 @ApiModel(value="AuthorLibrary",description="作者库")
 public class AuthorLibrary {
 	@Id

app/resource/src/main/java/com/zrqx/resource/commons/model/authorLibrary/AuthorLibraryLabelContentDiyType.java

@@ -10,7 +10,7 @@ import lombok.Data;
 
 @Data
 @ApiModel(value="AuthorLibraryLabelContentDiyType",description="作者与标签关系表")
-@Table(name = "res_Author_Library_Label_Content_Diy_Type")
+@Table(name = "res_author_library_Label_Content_Diy_Type")
 public class AuthorLibraryLabelContentDiyType {
 	@Id
 	@GeneratedValue(generator="JDBC")

app/resource/src/main/java/com/zrqx/resource/commons/model/courcelibrary/CourseLibraryDiyType.java

@@ -13,7 +13,7 @@ import lombok.Data;
 
 @Data
 @ApiModel(value="CourseLibraryDiyType",description="课程与自定义分类关系表")
-@Table(name = "res_course_Library_Diy_Type")
+@Table(name = "res_course_library_diy_type")
 public class CourseLibraryDiyType {
 	@Id
 	@GeneratedValue(generator="JDBC")

app/resource/src/main/java/com/zrqx/resource/commons/model/courcelibrary/CourseLibraryLabelContentDiyType.java

@@ -11,7 +11,7 @@ import lombok.Data;
 
 @Data
 @ApiModel(value="CourseLibraryLabelContentDiyType",description="课程与标签关系表")
-@Table(name = "res_Course_Library_Label_Content_Diy_Type")
+@Table(name = "res_course_library_Label_Content_Diy_Type")
 public class CourseLibraryLabelContentDiyType {
 	@Id
 	@GeneratedValue(generator="JDBC")

app/resource/src/main/java/com/zrqx/resource/commons/model/diytype/DiyType.java

@@ -15,7 +15,7 @@ import lombok.Data;
 
 @Data
 @ApiModel(value="DiyType",description="自定义分类")
-@Table(name = "res_Diy_Type")
+@Table(name = "res_diy_type")
 public class DiyType {
 	@Id
 	@GeneratedValue(generator="JDBC")

app/resource/src/main/java/com/zrqx/resource/commons/model/imagelibrary/ImageLibrary.java

@@ -14,7 +14,7 @@ import javax.persistence.Table;
 import lombok.Data;
 @Data
 @ApiModel(value="ImageLibrary",description="图片库")
-@Table(name = "res_Image_Library")
+@Table(name = "res_image_library")
 public class ImageLibrary {
 	@Id
 	@GeneratedValue(strategy =GenerationType.IDENTITY, generator = "SELECT REPLACE (UUID(), '-', '')")

app/resource/src/main/java/com/zrqx/resource/commons/model/imagelibrary/ImageLibraryDiyType.java

@@ -10,7 +10,7 @@ import lombok.Data;
 
 @Data
 @ApiModel(value="ImageLibraryDiyType",description="图片与自定义分类关系表")
-@Table(name = "res_Image_Library_Diy_Type")
+@Table(name = "res_image_library_diy_type")
 public class ImageLibraryDiyType {
 	@Id
 	@GeneratedValue(generator="JDBC")

app/resource/src/main/java/com/zrqx/resource/commons/model/imagelibrary/ImageLibraryLabelContentDiyType.java

@@ -10,7 +10,7 @@ import lombok.Data;
 
 @Data
 @ApiModel(value="ImageLibraryLabelContentDiyType",description="图片与标签关系表")
-@Table(name = "res_Image_Library_Label_Content_Diy_Type")
+@Table(name = "res_image_library_Label_Content_Diy_Type")
 public class ImageLibraryLabelContentDiyType {
 	@Id
 	@GeneratedValue(generator="JDBC")

app/resource/src/main/java/com/zrqx/resource/commons/model/label/Label.java

@@ -12,7 +12,7 @@ import javax.persistence.Table;
 import lombok.Data;
 @Data
 @ApiModel(value="LabelLibrary",description="标签库")
-@Table(name = "res_Label")
+@Table(name = "res_label")
 public class Label {
 	@Id
 	@GeneratedValue(generator="JDBC")

app/resource/src/main/java/com/zrqx/resource/commons/model/label/LabelContentDiyType.java

@@ -16,7 +16,7 @@ import lombok.Data;
 
 @Data
 @ApiModel(value="LabelContentDiyType",description="标签内容分类")
-@Table(name = "res_Label_Content_Diy_Type")
+@Table(name = "res_label_content_diy_type")
 public class LabelContentDiyType {
 	@Id
 	@GeneratedValue(generator="JDBC")

app/resource/src/main/java/com/zrqx/resource/commons/model/label/LabelDataType.java

@@ -11,7 +11,7 @@ import lombok.Data;
 
 @Data
 @ApiModel(value="LabelDataType",description="标签库数据类型")
-@Table(name = "res_Label_Data_Type")
+@Table(name = "res_label_data_type")
 public class LabelDataType {
 	@Id
 	@GeneratedValue(generator="JDBC")

app/resource/src/main/java/com/zrqx/resource/commons/model/pdffilelibrary/PdfLibrary.java

@@ -13,7 +13,7 @@ import javax.persistence.Table;
 import lombok.Data;
 @Data
 @ApiModel(value="PdfLibrary",description="PDF库")
-@Table(name = "res_Pdf_Library")
+@Table(name = "res_pdf_library")
 public class PdfLibrary {
 	@Id
 	@GeneratedValue(generator="JDBC")

app/resource/src/main/java/com/zrqx/resource/commons/model/pdffilelibrary/PdfLibraryDiyType.java

@@ -10,7 +10,7 @@ import lombok.Data;
 
 @Data
 @ApiModel(value="PdfLibraryDiyType",description="PDF与自定义分类关系表")
-@Table(name = "res_Pdf_Library_Diy_Type")
+@Table(name = "res_pdf_library_diy_type")
 public class PdfLibraryDiyType {
 	@Id
 	@GeneratedValue(generator="JDBC")

app/resource/src/main/java/com/zrqx/resource/commons/model/projectlibrary/ProjectLibraryDiyType.java

@@ -11,7 +11,7 @@ import lombok.Data;
 
 @Data
 @ApiModel(value="ProjectLibraryDiyType",description="专题与自定义分类关系表")
-@Table(name = "res_project_Library_Diy_Type")
+@Table(name = "res_project_library_Diy_Type")
 public class ProjectLibraryDiyType {
 	@Id
 	@GeneratedValue(generator="JDBC")

app/resource/src/main/java/com/zrqx/resource/commons/model/projectlibrary/ProjectLibraryLabelContentDiyType.java

@@ -11,7 +11,7 @@ import lombok.Data;
 
 @Data
 @ApiModel(value="ProjectLibraryLabelContentDiyType",description="专题与标签关系表")
-@Table(name = "res_Course_Library_Label_Content_Diy_Type")
+@Table(name = "res_course_library_Label_Content_Diy_Type")
 public class ProjectLibraryLabelContentDiyType {
 	@Id
 	@GeneratedValue(generator="JDBC")

app/resource/src/main/java/com/zrqx/resource/commons/model/recommend/Recommend.java

@@ -13,8 +13,8 @@ import javax.persistence.Transient;
 import lombok.Data;
 
 @Data
-@ApiModel(value="res_Recommend",description="推荐位")
-@Table(name = "res_Recommend")
+@ApiModel(value="res_recommend",description="推荐位")
+@Table(name = "res_recommend")
 public class Recommend {
 	@Id
 	@GeneratedValue(generator="JDBC")

app/resource/src/main/java/com/zrqx/resource/commons/model/thesislibrary/ThesisLibrary.java

@@ -13,7 +13,7 @@ import javax.persistence.Table;
 import lombok.Data;
 @Data
 @ApiModel(value="ThesisLibrary",description="论文库")
-@Table(name = "res_Thesis_Library")
+@Table(name = "res_thesis_library")
 public class ThesisLibrary {
 	@Id
 	@GeneratedValue(generator="JDBC")

app/resource/src/main/java/com/zrqx/resource/commons/model/thesislibrary/ThesisLibraryDiyType.java

@@ -10,7 +10,7 @@ import lombok.Data;
 
 @Data
 @ApiModel(value="ThesisLibraryDiyTypeRelation",description="论文与自定义分类关系表")
-@Table(name = "res_Thesis_Library_Diy_Type")
+@Table(name = "res_thesis_library_diy_type")
 public class ThesisLibraryDiyType {
 	@Id
 	@GeneratedValue(generator="JDBC")

app/resource/src/main/java/com/zrqx/resource/commons/model/videolibrary/VideoLibrary.java

@@ -14,7 +14,7 @@ import lombok.Data;
 import scala.collection.generic.BitOperations.Int;
 @Data
 @ApiModel(value="VideoLibrary",description="视频库")
-@Table(name = "res_Video_Library")
+@Table(name = "res_video_library")
 public class VideoLibrary {
 	//封面、视频名称、评论人数、讲师、上传时间、资源大小、播放次数、时长
 	@Id

app/resource/src/main/java/com/zrqx/resource/commons/model/videolibrary/VideoLibraryDiyType.java

@@ -12,7 +12,7 @@ import lombok.Data;
 
 @Data
 @ApiModel(value="VideoLibraryDiyType",description="视频与自定义分类关系表")
-@Table(name = "res_Video_Library_Diy_Type")
+@Table(name = "res_video_library_diy_type")
 public class VideoLibraryDiyType {
 	@Id
 	@GeneratedValue(generator="JDBC")

app/resource/src/main/java/com/zrqx/resource/commons/model/videolibrary/VideoLibraryLabelContentDiyType.java

@@ -10,7 +10,7 @@ import lombok.Data;
 
 @Data
 @ApiModel(value="VideoLibraryLabelContentDiyType",description="视频与标签关系表")
-@Table(name = "res_Video_Library_Label_Content_Diy_Type")
+@Table(name = "res_video_library_Label_Content_Diy_Type")
 public class VideoLibraryLabelContentDiyType {
 	@Id
 	@GeneratedValue(generator="JDBC")

app/resource/src/main/java/com/zrqx/resource/fg/mapper/articlelibrary/FgArticleLibraryDiyTypeMapper.java

@@ -15,9 +15,9 @@ public interface FgArticleLibraryDiyTypeMapper extends BaseMapper<ArticleLibrary
 
 	@Select("<script>"
 			+ "select dt.id, dt.parentId, dt.sort, dt.showName, dt.code "
-			+ "from res_Article_Library a "
-			+ "left join res_Article_Library_Diy_Type ad on a.id = ad.alid "
-			+ "left join res_Diy_Type dt on ad.code = dt.code "
+			+ "from res_article_library a "
+			+ "left join res_article_library_diy_type ad on a.id = ad.alid "
+			+ "left join res_diy_type dt on ad.code = dt.code "
 			+ "where 1=1 "
 			+ "and a.status = 1 and dt.status = 1 "	
 			+ "<if test='" +LIST_NOT_EMPTY + "(ids)'>"  

app/resource/src/main/java/com/zrqx/resource/fg/mapper/articlelibrary/FgArticleLibraryMapper.java

@@ -20,7 +20,7 @@ public interface FgArticleLibraryMapper extends BaseMapper<ArticleLibrary> {
 	 */
 	@Select("<script>" 
 			+ "select a.id,a.name,a.synopsis,a.text,a.bookId,a.bookName,a.uploadTime,a.resourceType,a.browseNum,a.goodsType "
-			+ "from res_Article_Library a  "
+			+ "from res_article_library a  "
 			+ "where a.status = 1 "
 			/*+ "<if test='form.resourceType != null' >"
 			+ "and a.resourceType = #{form.resourceType}"
@@ -40,7 +40,7 @@ public interface FgArticleLibraryMapper extends BaseMapper<ArticleLibrary> {
 	 */
 	@Select("<script>" 
 			+ "select a.id,a.name,a.keywords,a.synopsis,a.author,a.bookName,a.price,a.realPrice,DATE_FORMAT(a.uploadTime,'%Y-%m-%d') uploadTime,a.img,a.nationsType,a.resourceType,a.browseNum,a.goodsType,a.text "
-			+ "from res_Article_Library a  "
+			+ "from res_article_library a  "
 			+ "where a.status = 1 "
 			+ "<if test='ids != null and ids.size > 0' >"
 			+ "and id not in  "
@@ -57,7 +57,7 @@ public interface FgArticleLibraryMapper extends BaseMapper<ArticleLibrary> {
 	 */
 	@Select("<script>" 
 			+ "select  a.* "
-			+ "from res_Article_Library a  "
+			+ "from res_article_library a  "
 			+ "where a.status = 1 "
 			+ "<if test='form.resourceType != null' >"
 			+ "and a.resourceType = #{form.resourceType}"
@@ -83,7 +83,7 @@ public interface FgArticleLibraryMapper extends BaseMapper<ArticleLibrary> {
 	 */
 	@Select("<script>" 
 			+ "select a.id,a.name,a.keywords,a.synopsis,a.author,a.bookName,a.price,a.realPrice,DATE_FORMAT(a.uploadTime,'%Y-%m-%d') uploadTime,a.img,a.nationsType,a.resourceType,a.browseNum,a.goodsType "
-			+ "from res_Article_Library a  "
+			+ "from res_article_library a  "
 			+ "where a.status = 1 "
 			+ "<if test='ids != null and ids.size > 0' >"
 			+ "and id in  "
@@ -103,8 +103,8 @@ public interface FgArticleLibraryMapper extends BaseMapper<ArticleLibrary> {
 			+ "select a.id,a.name,a.authorId,a.author,a.source,a.keywords,a.synopsis,a.bookId,"
 			+ "a.bookName,a.price,a.realPrice,DATE_FORMAT(a.uploadTime,'%Y-%m-%d') uploadTime,"
 			+ "a.img,a.readTextPower,a.nationsType,a.resourceType,a.browseNum,a.goodsType "
-			+ "from res_Article_Library a "
-			+ "left join res_Article_Library_Diy_Type ad on a.id = ad.alid "
+			+ "from res_article_library a "
+			+ "left join res_article_library_diy_type ad on a.id = ad.alid "
 			+ "left join res_article_library_label_content_diy_type al on a.id = al.alId "
 			+ "where 1=1 and a.status = 1 "
 			

app/resource/src/main/java/com/zrqx/resource/fg/mapper/audiolibrary/FgAudioLibraryMapper.java

@@ -19,7 +19,7 @@ public interface FgAudioLibraryMapper extends BaseMapper<AudioLibrary> {
 	 */
 	@Select("<script>" 
 			+ "select a.* "
-			+ "from res_audio_Library a  "
+			+ "from res_audio_library a  "
 			+ "where a.status = 1 "
 			+ "<if test='form.resourceType != null' >"
 			+ "and a.resourceType = #{form.resourceType}"
@@ -46,7 +46,7 @@ public interface FgAudioLibraryMapper extends BaseMapper<AudioLibrary> {
 	 */
 	@Select("<script>" 
 			+ "select a.* "
-			+ "from res_audio_Library a  "
+			+ "from res_audio_library a  "
 			+ "where a.status = 1 "
 			+ " eq(a.resourceType,form.resourceType) "
 			+ "<if test='form.ids != null and form.ids.size > 0' >"

app/resource/src/main/java/com/zrqx/resource/fg/mapper/authorlibrary/FgAuthorLibraryDiytypeMapper.java

@@ -12,9 +12,9 @@ import com.zrqx.resource.commons.vo.fg.diytype.FgDiyTypeVo;
 public interface FgAuthorLibraryDiytypeMapper extends BaseMapper<AuthorLibraryDiytype> {
 	@Select("<script>"
 			+ "select dt.id, dt.parentId, dt.sort, dt.showName, dt.code "
-			+ "from res_Author_Library a "
-			+ "left join res_Author_Library_Diy_Type ad on a.id = ad.authorlibraryid "
-			+ "left join res_Diy_Type dt on ad.code = dt.code "
+			+ "from res_author_library a "
+			+ "left join res_author_library_diy_type ad on a.id = ad.authorlibraryid "
+			+ "left join res_diy_type dt on ad.code = dt.code "
 			+ "where 1=1 "
 			+ "and a.status = 1 and dt.status = 1 "
 			+ "<if test='" +LIST_NOT_EMPTY + "(ids)'>"  

app/resource/src/main/java/com/zrqx/resource/fg/mapper/authorlibrary/FgAuthorLibraryMapper.java

@@ -112,7 +112,7 @@ public interface FgAuthorLibraryMapper extends BaseMapper<AuthorLibrary> {
 	 */
 	@Select("<script>" 
 			+ "select distinct a.* "
-			+ "from res_Author_Library a  "
+			+ "from res_author_library a  "
 			+ "where a.status = 1 "
 			+ "<if test='form.ids != null and form.ids.size > 0' >"
 			+ "and id in  "
@@ -135,7 +135,7 @@ public interface FgAuthorLibraryMapper extends BaseMapper<AuthorLibrary> {
 	 */
 	@Select("<script>" 
 			+ "select a.* "
-			+ "from res_Author_Library a  "
+			+ "from res_author_library a  "
 			+ "where a.status = 1 "
 			+ "<if test='form.ids != null and form.ids.size > 0' >"
 			+ "and id not in  "

app/resource/src/main/java/com/zrqx/resource/fg/mapper/courselibrary/FgCourseLibraryMapper.java

@@ -49,7 +49,7 @@ public interface FgCourseLibraryMapper extends BaseMapper<CourseLibrary> {
 	 */
 	@Select("<script>" 
 			+ "select b.uploadTime,b.id,b.name,b.img,b.synopsis,b.resourceType,b.realPrice,b.defaultImg,b.adSlogan,b.priceOption "
-			+ "from res_Course_Library b  "
+			+ "from res_course_library b  "
 			+ "where b.status = 1 "
 			+ "<if test='form.ids != null and form.ids.size > 0' >"
 			+ "and id not in  "
@@ -59,7 +59,7 @@ public interface FgCourseLibraryMapper extends BaseMapper<CourseLibrary> {
 			+ "</if>"
 			+ "union "
 			+ "select b.uploadTime,b.id,b.name,b.img,b.synopsis,b.resourceType,b.realPrice,b.defaultImg,b.adSlogan,b.priceOption "
-			+ "from res_video_Library b "
+			+ "from res_video_library b "
 			+ "where b.status = 1 and b.salesType = 1 "
 			+ "<if test='form.ids != null and form.ids.size > 0' >"
 			+ "and id not in  "
@@ -138,7 +138,7 @@ public interface FgCourseLibraryMapper extends BaseMapper<CourseLibrary> {
 	 */
 	@Select("<script>" 
 			+ "select b.uploadTime,b.id,b.name,b.img,b.synopsis,b.resourceType,b.realPrice,b.price,b.browseNum,b.totalPeriods,b.defaultImg,priceOption "
-			+ "from res_Course_Library b inner join res_course_library_diy_type c on b.id = c.courseLibraryId "
+			+ "from res_course_library b inner join res_course_library_diy_type c on b.id = c.courseLibraryId "
 			+ " where b.status = 1 "
 			+ "<if test='form.ids != null and form.ids.size > 0' >"
 			+ "and b.id not in  "
@@ -149,7 +149,7 @@ public interface FgCourseLibraryMapper extends BaseMapper<CourseLibrary> {
 			+ " eq(c.code,form.diyTypeCode)"
 			+ "union "
 			+ "select b.uploadTime,b.id,b.name,b.img,b.synopsis,b.resourceType,b.realPrice,b.price,b.browseNum,b.totalPeriods,b.defaultImg,priceOption "
-			+ "from res_video_Library b inner join res_video_library_diy_type c on b.id = c.vlid"
+			+ "from res_video_library b inner join res_video_library_diy_type c on b.id = c.vlid"
 			+ " where b.status = 1 and b.salesType = 1 "
 			+ "<if test='form.ids != null and form.ids.size > 0' >"
 			+ "and b.id not in  "
@@ -248,8 +248,9 @@ public interface FgCourseLibraryMapper extends BaseMapper<CourseLibrary> {
 	
 	//查询课程推荐资源
 		@Select("<script>"
-				+ "select li.id , li.salesType,li.name resName,li.resourceType resourceType, li.img resImg,ifnull(li.price,0) price,li.realPrice,li.clickNum,li.priceOption,li.uploadTime,li.browseNum,(select count(*) from res_courseorvideo_study where resourceId =li.id and resourceType =li.resourceType) studyNum,"
-				+ " (SELECT COUNT(*) FROM `szsy-order`.ord_orderinfo a LEFT JOIN `szsy-order`.ord_order b ON a.orderId = b.id WHERE b.status = 6 AND a.goodsid = li.id) salesTolume   from "
+				+ "select li.id , li.salesType,li.name resName,li.resourceType resourceType, li.img resImg,ifnull(li.price,0) price,li.realPrice,li.clickNum,li.priceOption,li.uploadTime,li.browseNum,"
+				+ "(select count(*) from res_courseorvideo_study where resourceId =li.id and resourceType =li.resourceType) studyNum,"
+				+ " (SELECT COUNT(*) FROM `szsyxy-order`.ord_orderinfo a LEFT JOIN `szsyxy-order`.ord_order b ON a.orderId = b.id WHERE b.status = 6 AND a.goodsid = li.id) salesTolume   from "
 				+ "res_video_library li "
                 + " LEFT JOIN res_video_library_diy_type bdt ON li.id = bdt.vlid"
 				+ " where 1 = 1 and li.status = 1 and salesType =1"
@@ -258,8 +259,9 @@ public interface FgCourseLibraryMapper extends BaseMapper<CourseLibrary> {
 				+ " like(name,keywords)"
 				+ " eq(li.salesType,salesType)" 
 				+ " union "
-				+ " select li.id , null salesType,li.name resName,li.resourceType , li.img resImg,ifnull(li.price,0) price,li.realPrice,li.clickNum,li.priceOption,li.uploadTime,li.browseNum,(select count(*) from res_courseorvideo_study where resourceId =li.id and resourceType =li.resourceType)  studyNum,"
-				+ " (SELECT COUNT(*) FROM `szsy-order`.ord_orderinfo a LEFT JOIN `szsy-order`.ord_order b ON a.orderId = b.id WHERE b.status = 6 AND a.goodsid = li.id) salesTolume   from "
+				+ " select li.id , null salesType,li.name resName,li.resourceType , li.img resImg,ifnull(li.price,0) price,li.realPrice,li.clickNum,li.priceOption,li.uploadTime,li.browseNum,"
+				+ "(select count(*) from res_courseorvideo_study where resourceId =li.id and resourceType =li.resourceType)  studyNum,"
+				+ " (SELECT COUNT(*) FROM `szsyxy-order`.ord_orderinfo a LEFT JOIN `szsyxy-order`.ord_order b ON a.orderId = b.id WHERE b.status = 6 AND a.goodsid = li.id) salesTolume   from "
 				+ " res_course_library li  "
 				+ " LEFT JOIN res_course_library_diy_type bdt ON li.id = bdt.courseLibraryId"
 				+ " where 1 = 1 and li.status = 1 "

app/resource/src/main/java/com/zrqx/resource/fg/mapper/diytype/FgDiyTypeMapper.java

@@ -35,7 +35,7 @@ public interface FgDiyTypeMapper extends BaseMapper<DiyType>{
 	 */
 	@Select("<script>"
 			+ "select dt.id, dt.parentId, dt.sort, dt.showName, dt.code " 
-			+ "from res_Diy_Type dt "
+			+ "from res_diy_type dt "
 			+ "where 1=1 and dt.status = 1 "
 			+ "<if test='" +LIST_NOT_EMPTY + "(codes)'>"  
 			+ "and dt.code in "

app/resource/src/main/java/com/zrqx/resource/fg/mapper/ebook/FgEbookDiyTypeMapper.java

@@ -20,7 +20,7 @@ public interface FgEbookDiyTypeMapper extends BaseMapper<EbookDiyType> {
 			+ "FROM res_book bb "  
 			+ "LEFT JOIN res_ebook be ON bb.id = be.id "  
 			+ "left join res_ebook_diy_type bdt on be.id = bdt.ebookId "
-			+ "left join res_Diy_Type dt on bdt.code = dt.code "
+			+ "left join res_diy_type dt on bdt.code = dt.code "
 			+ "where 1=1 "
 			+ "and be.bookStatus = 4 and dt.status = 1 "
 			+ "<if test='" +LIST_NOT_EMPTY + "(ids)'>"  
@@ -39,7 +39,7 @@ public interface FgEbookDiyTypeMapper extends BaseMapper<EbookDiyType> {
 	 */
 	@Select("<script>"
 			+ "select rdt.id, rdt.parentId, rdt.sort, rdt.showName, rdt.code "
-			+ "FROM res_Diy_Type rdt "    
+			+ "FROM res_diy_type rdt "    
 			+ "left join res_ebook_diy_type redt on rdt.id = redt.diyTypeId "
 			+ "where redt.ebookId = #{oid}"
 			+ "</script>")

app/resource/src/main/java/com/zrqx/resource/fg/mapper/ebook/FgEbookMapper.java

@@ -29,8 +29,11 @@ public interface FgEbookMapper extends BaseMapper<Ebook>{
 	 * @date 2018年12月20日 下午2:33:32
 	 */
 	@Select("<script>"
-			+ "select DISTINCT bb.id, bb.name, bb.authorId, bb.author, bb.translatorId, bb.translator,(SELECT COUNT(*) FROM `szsyxy-order`.ord_orderinfo a LEFT JOIN `szsyxy-order`.ord_order b ON a.orderId = b.id WHERE b.status = 6 AND a.goodsid = bb.id) salesTolume, "
-			+ "bb.publishTime, bb.status, bb.resourceType, be.priceOption, be.realPrice,be.price,be.img bookCover, be.synopsis summary, be.bookStatus, be.browseNum ,be.isContainEntity, be.entityRealPrice, be.entityPrice,be.preType "
+			+ "select DISTINCT bb.id, bb.name, bb.authorId, bb.author, bb.translatorId, bb.translator,"
+			+ "(SELECT COUNT(*) FROM `szsyxy-order`.ord_orderinfo a LEFT JOIN `szsyxy-order`.ord_order b ON a.orderId = b.id "
+			+ "WHERE b.status = 6 AND a.goodsid = bb.id) salesTolume,bb.publishTime, bb.status, bb.resourceType,"
+			+ " be.priceOption, be.realPrice,be.price,be.img bookCover, be.synopsis summary, be.bookStatus, "
+			+ "be.browseNum ,be.isContainEntity, be.entityRealPrice, be.entityPrice,be.preType "
 			+ "FROM res_book bb "  
 	        + "LEFT JOIN res_ebook be ON bb.id = be.id " 
 	        + "LEFT JOIN res_ebook_diy_type diy ON be.id = diy.ebookId " 
@@ -77,7 +80,8 @@ public interface FgEbookMapper extends BaseMapper<Ebook>{
 	 */
 	@Select("<script>"
 			+ "select DISTINCT bb.id, bb.name, bb.authorId, bb.author, bb.translatorId, bb.translator, "
-			+ "bb.publishTime, bb.status, bb.resourceType, be.priceOption, be.price,be.realPrice, be.img bookCover, be.synopsis summary, be.bookStatus, be.browseNum,be.isContainEntity, be.entityRealPrice, be.entityPrice "
+			+ "bb.publishTime, bb.status, bb.resourceType, be.priceOption, be.price,be.realPrice, be.img bookCover, "
+			+ "be.synopsis summary, be.bookStatus, be.browseNum,be.isContainEntity, be.entityRealPrice, be.entityPrice "
 			+ "FROM res_book bb "  
 	        + "LEFT JOIN res_ebook be ON bb.id = be.id "
 	        + "LEFT JOIN res_ebook_diy_type diy ON be.id = diy.ebookId "  
@@ -131,8 +135,10 @@ public interface FgEbookMapper extends BaseMapper<Ebook>{
 	 */
 	@Select("<script>"
 			+ "select DISTINCT bb.id, bb.name, bb.authorId, bb.author, bb.translatorId, bb.translator, "
-			+ "bb.publishTime, bb.status,bb.bookSeries, be.realPrice, be.priceOption, be.price, be.img bookCover, be.synopsis, be.bookStatus, be.browseNum, be.goodsType,be.preType, "
-			+ " (SELECT COUNT(*) FROM `szsyxy-order`.ord_orderinfo a LEFT JOIN `szsyxy-order`.ord_order b ON a.orderId = b.id WHERE b.status = 6 AND a.goodsid = bb.id) salesTolume   from "
+			+ "bb.publishTime, bb.status,bb.bookSeries, be.realPrice, be.priceOption, be.price, be.img bookCover,"
+			+ " be.synopsis, be.bookStatus, be.browseNum, be.goodsType,be.preType, "
+			+ " (SELECT COUNT(*) FROM `szsyxy-order`.ord_orderinfo a LEFT JOIN `szsyxy-order`.ord_order b "
+			+ "ON a.orderId = b.id WHERE b.status = 6 AND a.goodsid = bb.id) salesTolume   from "
 			+ "res_book bb "  
 	        + "LEFT JOIN res_ebook be ON bb.id = be.id "  
 	        + "LEFT JOIN res_ebook_diy_type bdt ON be.id = bdt.ebookId "

app/resource/src/main/java/com/zrqx/resource/fg/mapper/projectlibrary/FgProjectLibraryMapper.java

@@ -20,7 +20,7 @@ public interface FgProjectLibraryMapper extends BaseMapper<ProjectLibrary> {
 	 */
 	@Select("<script>" 
 			+ "select a.* "
-			+ "from res_Project_Library a  "
+			+ "from res_project_library a  "
 			+ "where a.status = 1 "
 			+ "<if test='form.resourceType != null' >"
 			+ "and a.resourceType = #{form.resourceType}"
@@ -47,7 +47,7 @@ public interface FgProjectLibraryMapper extends BaseMapper<ProjectLibrary> {
 	 */
 	@Select("<script>" 
 			+ "select a.* "
-			+ "from res_Project_Library a  "
+			+ "from res_project_library a  "
 			+ "where a.status = 1 "
 			+ "<if test='form.resourceType != null' >"
 			+ "and a.resourceType = #{form.resourceType}"

app/resource/src/main/java/com/zrqx/resource/fg/mapper/publish/FgPublishMapper.java

@@ -19,7 +19,7 @@ public interface FgPublishMapper extends BaseMapper<Publish> {
 
 	@Select("<script>" 
 			+ "select a.id,a.name,a.uploadTime,a.updateTime,a.status,a.author,a.cover "
-			+ "from res_Project_Library a "
+			+ "from res_project_library a "
 			+ "where 1=1 "
 			+ "<if test='"+ NOTBLANK +"(form.nai)'>"
 			+ " AND (a.name like concat('%',#{form.nai},'%')  OR a.author like concat('%',#{form.nai},'%')) "
@@ -40,7 +40,7 @@ public interface FgPublishMapper extends BaseMapper<Publish> {
 
 	@Select("<script>"
 			+ "select a.id,a.name,a.cover,a.status,uploadTime "
-			+ "FROM res_Project_Library a "
+			+ "FROM res_project_library a "
 			+ " where 1 = 1 and a.status = 1 "
 			+ " like(a.name,form.name) "
 			+ "<if test='form.ids != null and form.ids.size > 0'>"  

app/resource/src/main/java/com/zrqx/resource/fg/mapper/videolibrary/FgVideoLibraryMapper.java

@@ -22,7 +22,7 @@ public interface FgVideoLibraryMapper extends BaseMapper<VideoLibrary> {
 	 */
 	@Select("<script>" 
 			+ "select a.* "
-			+ "from res_video_Library a  "
+			+ "from res_video_library a  "
 			+ "where a.status = 1 "
 			+ "<if test='form.resourceType != null' >"
 			+ "and a.resourceType = #{form.resourceType}"
@@ -49,7 +49,7 @@ public interface FgVideoLibraryMapper extends BaseMapper<VideoLibrary> {
 	 */
 	@Select("<script>" 
 			+ "select a.* "
-			+ "from res_video_Library a  "
+			+ "from res_video_library a  "
 			+ "where a.status = 1 "
 			+ "<if test='form.resourceType != null' >"
 			+ "and a.resourceType = #{form.resourceType}"
@@ -69,7 +69,7 @@ public interface FgVideoLibraryMapper extends BaseMapper<VideoLibrary> {
 	 * @param id
 	 * @return
 	 */
-	@Select("select count(id) from res_video_Library where courseId = #{id} and status = 1")
+	@Select("select count(id) from res_video_library where courseId = #{id} and status = 1")
 	Integer selectUpdatePeriods(String id);
 
 	/**

app/statistics/src/main/resources/bootstrap.yml

 spring:
   cloud:
     config:
-      uri: http://localhost:8186 #配置中心地址
+      #uri: http://localhost:8186 #配置中心地址
+       uri: http://szsyxymp-config-svc:8186 #配置中心地址
       name: statistics
       profile: prod
       label: master
\ No newline at end of file

app/sysuser/Dockerfile

-FROM java:8
+FROM anapsix/alpine-java:8_server-jre
 VOLUME /tmp
-ADD sysuser-5.0.0.jar /app.jar  
+ADD target/sysuser-5.0.0.jar /app.jar  
 RUN bash -c 'touch /app.jar'
+RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+RUN echo 'Asia/Shanghai' >/etc/timezone
 #EXPOSE 80
 ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","app.jar"]
\ No newline at end of file

app/sysuser/pom.xml

@@ -14,7 +14,7 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
-			<!-- <plugin>
+			<plugin>
 				<groupId>com.spotify</groupId>
 				<artifactId>dockerfile-maven-plugin</artifactId>
 				<version>1.4.13</version>
@@ -35,7 +35,7 @@
 						<JAR_FILE>${project.build.finalName}.jar</JAR_FILE>
 					</buildArgs>
 				</configuration>
-			</plugin> -->
+			</plugin>
 		</plugins>
 	</build>
 </project>
\ No newline at end of file

app/sysuser/src/main/java/com/zrqx/sysuser/bg/mapper/ad/AdspaceMapper.java

@@ -14,7 +14,7 @@ public interface AdspaceMapper extends BaseMapper<Adspace> {
 	 * @return
 	 */
 	@Select("<script>"
-			+ " select sort from sys_Adspace a "
+			+ " select sort from sys_adspace a "
 			+ " where 1=1 "
 			+ " eq(a.adsignId,adsignId) "
 			+ "</script>")

app/sysuser/src/main/java/com/zrqx/sysuser/bg/mapper/area/AreaMapper.java

 package com.zrqx.sysuser.bg.mapper.area;
 
-import java.util.List;
-
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
 
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.sysuser.commons.model.area.Area;

app/sysuser/src/main/java/com/zrqx/sysuser/bg/mapper/bulletin/BulletinContentMapper.java

@@ -16,7 +16,7 @@ public interface BulletinContentMapper extends BaseMapper<BulletinContent> {
 
 	@Select("<script>" 
 			+ "select t.id,t.title,m.name,t.source,DATE_FORMAT(t.releaserTime,'%Y-%m-%d')releaserTime,t.releaser,t.topStatus,t.status "
-			+ "from sys_bulletin_Content t left join sys_bulletin_Column m on t.columnId = m.id "
+			+ "from sys_bulletin_content t left join sys_bulletin_column m on t.columnId = m.id "
 			+ "where 1=1 "
 			
 			+ " like(t.title,form.title) "

app/sysuser/src/main/java/com/zrqx/sysuser/bg/mapper/modulepower/ModulepowerMapper.java

@@ -38,7 +38,7 @@ public interface ModulepowerMapper extends BaseMapper<Modulepower> {
 	 */
 	@Select("select m.url from sys_module_power m left join sys_role_module_relation dm "
 			+ "on m.mpId = dm.moduleId "
-			+ "left join sys_Role d "
+			+ "left join sys_role d "
 			+ "on dm.roleId = d.id "
 			+ "left join sys_role_user_relation ud "
 			+ "on d.id = ud.roleId "

app/sysuser/src/main/java/com/zrqx/sysuser/bg/mapper/role/RoleMapper.java

@@ -15,12 +15,12 @@ import com.zrqx.sysuser.commons.vo.bg.role.RoleVO;
 public interface RoleMapper extends BaseMapper<Role> {
 	String DEFAULT_ORDER_BY = "sort asc, createTime desc";
 
-	@Select(" select me.* from sys_Role me "
+	@Select(" select me.* from sys_role me "
 			+ " left join sys_role_user_relation mr on me.id = mr.roleId "
 			+ " where mr.userId = #{id} ")
 	List<Role> listByMemberId(@Param("id")String id);
 	
-	@Select(" select me.name from sys_Role me "
+	@Select(" select me.name from sys_role me "
 			+ " left join sys_role_user_relation mr on me.id = mr.roleId "
 			+ " where mr.userId = #{id} ")
 	List<String> listRoleName(@Param("id")Integer id);
@@ -34,7 +34,7 @@ public interface RoleMapper extends BaseMapper<Role> {
 	 */
 	@Select(" <script> "
 			+ " select * "
-			+ " FROM sys_Role s  "
+			+ " FROM sys_role s  "
 			+ " </script> ")
 	List<RoleVO> page();
 	
@@ -45,7 +45,7 @@ public interface RoleMapper extends BaseMapper<Role> {
 	 * @date: 2019年4月2日 下午5:10:48
 	 */
 	@Select(" <script> "
-			+ " SELECT IFNULL(MAX(sort),0) FROM sys_Role s "
+			+ " SELECT IFNULL(MAX(sort),0) FROM sys_role s "
 			+ " </script> ")
 	Integer getMaxOrderNum();
 	
@@ -56,7 +56,7 @@ public interface RoleMapper extends BaseMapper<Role> {
 	 * @author zzg
 	 * @date: 2019年4月8日 上午10:40:27
 	 */
-	@Select(" select me.name from sys_Role me "
+	@Select(" select me.name from sys_role me "
 			+ " left join sys_role_user_relation mr on me.id = mr.roleId "
 			+ " where mr.userId = #{id} ")
 	List<String> getNameList(@Param("id")String id);

app/sysuser/src/main/java/com/zrqx/sysuser/bg/mapper/user/UserDepartmentRelationMapper.java

@@ -32,10 +32,10 @@ public interface UserDepartmentRelationMapper extends BaseMapper<UserDepartmentR
 	 *//*
 	@Insert("insert into sys_UserDepartmentRelation(departmentid,userid) value(#{departmentId},#{userId})")
 	int addDepartmentToUser(@Param("userId")String userId,@Param("departmentId") Integer departmentId);*/
-	@Delete("delete from sys_User_Department where userid = #{userId}")
+	@Delete("delete from sys_user_department where userid = #{userId}")
 	int deleteDepartmentToUser(String userId);
 	
-	@Select("select * from sys_User_Department where userid = #{userId}")
+	@Select("select * from sys_user_department where userid = #{userId}")
 	@Results({   
         @Result(property="dept",column="departmentId",one=@One(select="com.zrqx.sysuser.bg.mapper.dept.DepartmentMapper.get"))   
     })  

app/sysuser/src/main/java/com/zrqx/sysuser/bg/mapper/user/UserMapper.java

@@ -35,7 +35,7 @@ public interface UserMapper extends BaseMapper<User> {
 	 * @param userId
 	 * @return
 	 */
-	@Select("select distinct o.* from sys_Operate_power o , sys_role_operate_power rp where o.opid = rp.opid and rp.roleid in "
+	@Select("select distinct o.* from sys_operate_power o , sys_role_operate_power rp where o.opid = rp.opid and rp.roleid in "
 			+ "(select roleid from sys_user_role where userid = #{userId} )")
 	public List<Operatepower> getListByUserId(String userId);
 	/**

app/sysuser/src/main/java/com/zrqx/sysuser/commons/model/role/Role.java

@@ -16,7 +16,7 @@ import lombok.Data;
  */
 @Data
 @ApiModel(value="Role",description="角色")
-@Table(name = "sys_Role")
+@Table(name = "sys_role")
 public class Role {
 	@Id
 	@GeneratedValue(generator="JDBC")

app/sysuser/src/main/java/com/zrqx/sysuser/commons/model/user/UserDepartmentRelation.java

@@ -10,7 +10,7 @@ import lombok.Data;
  * 
  */
 @Data
-@Table(name = "sys_User_Department")
+@Table(name = "sys_user_department")
 public class UserDepartmentRelation {
 	@Id
 	@GeneratedValue(generator = "JDBC")

app/sysuser/src/main/java/com/zrqx/sysuser/fg/mapper/bulletin/FgBulletinContentMapper.java

@@ -28,7 +28,7 @@ public interface FgBulletinContentMapper extends BaseMapper<BulletinContent> {
 	 */
 	@Select("<script>" 
 			+ " select t.id,t.title,t.columnId,m.name,t.content,t.source,releaserTime,t.releaser,t.topStatus,t.browseNum "
-			+ " from sys_bulletin_Content t left join sys_bulletin_Column m on t.columnId = m.id "
+			+ " from sys_bulletin_content t left join sys_bulletin_column m on t.columnId = m.id "
 			+ " where 1 = 1 and DATE(t.releaserTime) &lt;= DATE(NOW()) "
 			+ " eq(t.columnId,form.id)"
 			+ " like(t.title,form.name) "
@@ -43,7 +43,7 @@ public interface FgBulletinContentMapper extends BaseMapper<BulletinContent> {
 	 */
 	@Select("<script>" 
 			+ " select t.id,t.title,t.columnId,t.content,t.source,t.releaserTime,t.releaser,t.topStatus,t.browseNum "
-			+ " from sys_bulletin_Content t where DATE(t.releaserTime) &lt;= DATE(NOW()) "
+			+ " from sys_bulletin_content t where DATE(t.releaserTime) &lt;= DATE(NOW()) "
 		    + " order by browseNum desc "
 		    + " limit 6 "
 		    + "</script>")