多数据源切换,tomcat安全版本升级配置

src/main/java/com/gyee/frame/model/auto/GyeeorganExample.java

@@ -1,8 +1,6 @@
 package com.gyee.frame.model.auto;
 
-import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -255,73 +253,73 @@ public class GyeeorganExample {
         }
         
 			
-        public Criteria andDescribesIsNull() {
-            addCriterion("describes is null");
+        public Criteria andDescrIsNull() {
+            addCriterion("descr is null");
             return (Criteria) this;
         }
 
-        public Criteria andDescribesIsNotNull() {
-            addCriterion("describes is not null");
+        public Criteria andDescrIsNotNull() {
+            addCriterion("descr is not null");
             return (Criteria) this;
         }
 
-        public Criteria andDescribesEqualTo(String value) {
-            addCriterion("describes =", value, "describes");
+        public Criteria andDescrEqualTo(String value) {
+            addCriterion("descr =", value, "descr");
             return (Criteria) this;
         }
 
-        public Criteria andDescribesNotEqualTo(String value) {
-            addCriterion("describes <>", value, "describes");
+        public Criteria andDescrNotEqualTo(String value) {
+            addCriterion("descr <>", value, "descr");
             return (Criteria) this;
         }
 
-        public Criteria andDescribesGreaterThan(String value) {
-            addCriterion("describes >", value, "describes");
+        public Criteria andDescrGreaterThan(String value) {
+            addCriterion("descr >", value, "descr");
             return (Criteria) this;
         }
 
-        public Criteria andDescribesGreaterThanOrEqualTo(String value) {
-            addCriterion("describes >=", value, "describes");
+        public Criteria andDescrGreaterThanOrEqualTo(String value) {
+            addCriterion("descr >=", value, "descr");
             return (Criteria) this;
         }
 
-        public Criteria andDescribesLessThan(String value) {
-            addCriterion("describes <", value, "describes");
+        public Criteria andDescrLessThan(String value) {
+            addCriterion("descr <", value, "descr");
             return (Criteria) this;
         }
 
-        public Criteria andDescribesLessThanOrEqualTo(String value) {
-            addCriterion("describes <=", value, "describes");
+        public Criteria andDescrLessThanOrEqualTo(String value) {
+            addCriterion("descr <=", value, "descr");
             return (Criteria) this;
         }
 
-        public Criteria andDescribesLike(String value) {
-            addCriterion("describes like", value, "describes");
+        public Criteria andDescrLike(String value) {
+            addCriterion("descr like", value, "descr");
             return (Criteria) this;
         }
 
-        public Criteria andDescribesNotLike(String value) {
-            addCriterion("describes not like", value, "describes");
+        public Criteria andDescrNotLike(String value) {
+            addCriterion("descr not like", value, "descr");
             return (Criteria) this;
         }
 
-        public Criteria andDescribesIn(List<String> values) {
-            addCriterion("describes in", values, "describes");
+        public Criteria andDescrIn(List<String> values) {
+            addCriterion("descr in", values, "descr");
             return (Criteria) this;
         }
 
-        public Criteria andDescribesNotIn(List<String> values) {
-            addCriterion("describes not in", values, "describes");
+        public Criteria andDescrNotIn(List<String> values) {
+            addCriterion("descr not in", values, "descr");
             return (Criteria) this;
         }
 
-        public Criteria andDescribesBetween(String value1, String value2) {
-            addCriterion("describes between", value1, value2, "describes");
+        public Criteria andDescrBetween(String value1, String value2) {
+            addCriterion("descr between", value1, value2, "descr");
             return (Criteria) this;
         }
 
-        public Criteria andDescribesNotBetween(String value1, String value2) {
-            addCriterion("describes not between", value1, value2, "describes");
+        public Criteria andDescrNotBetween(String value1, String value2) {
+            addCriterion("descr not between", value1, value2, "descr");
             return (Criteria) this;
         }
         

src/main/java/com/gyee/frame/model/auto/Gyeepermission.java

@@ -49,9 +49,16 @@ private String parent;
 	/**  **/
 	@ApiModelProperty(value = "") 
 private String isable;
-		
-		
-	public String getId() {
+
+    public String getDescr() {
+        return descr;
+    }
+
+    public void setDescr(String descr) {
+        this.descr = descr;
+    }
+
+    public String getId() {
         return id;
     }
 

src/main/java/com/gyee/frame/model/auto/GyeepermissionExample.java

@@ -1,8 +1,6 @@
 package com.gyee.frame.model.auto;
 
-import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -326,73 +324,73 @@ public class GyeepermissionExample {
         }
         
 			
-        public Criteria andDescribesIsNull() {
-            addCriterion("describes is null");
+        public Criteria andDescrIsNull() {
+            addCriterion("descr is null");
             return (Criteria) this;
         }
 
-        public Criteria andDescribesIsNotNull() {
-            addCriterion("describes is not null");
+        public Criteria andDescrIsNotNull() {
+            addCriterion("descr is not null");
             return (Criteria) this;
         }
 
-        public Criteria andDescribesEqualTo(String value) {
-            addCriterion("describes =", value, "describes");
+        public Criteria andDescrEqualTo(String value) {
+            addCriterion("descr =", value, "descr");
             return (Criteria) this;
         }
 
-        public Criteria andDescribesNotEqualTo(String value) {
-            addCriterion("describes <>", value, "describes");
+        public Criteria andDescrNotEqualTo(String value) {
+            addCriterion("descr <>", value, "descr");
             return (Criteria) this;
         }
 
-        public Criteria andDescribesGreaterThan(String value) {
-            addCriterion("describes >", value, "describes");
+        public Criteria andDescrGreaterThan(String value) {
+            addCriterion("descr >", value, "descr");
             return (Criteria) this;
         }
 
-        public Criteria andDescribesGreaterThanOrEqualTo(String value) {
-            addCriterion("describes >=", value, "describes");
+        public Criteria andDescrGreaterThanOrEqualTo(String value) {
+            addCriterion("descr >=", value, "descr");
             return (Criteria) this;
         }
 
-        public Criteria andDescribesLessThan(String value) {
-            addCriterion("describes <", value, "describes");
+        public Criteria andDescrLessThan(String value) {
+            addCriterion("descr <", value, "descr");
             return (Criteria) this;
         }
 
-        public Criteria andDescribesLessThanOrEqualTo(String value) {
-            addCriterion("describes <=", value, "describes");
+        public Criteria andDescrLessThanOrEqualTo(String value) {
+            addCriterion("descr <=", value, "descr");
             return (Criteria) this;
         }
 
-        public Criteria andDescribesLike(String value) {
-            addCriterion("describes like", value, "describes");
+        public Criteria andDescrLike(String value) {
+            addCriterion("descr like", value, "descr");
             return (Criteria) this;
         }
 
-        public Criteria andDescribesNotLike(String value) {
-            addCriterion("describes not like", value, "describes");
+        public Criteria andDescrNotLike(String value) {
+            addCriterion("descr not like", value, "descr");
             return (Criteria) this;
         }
 
-        public Criteria andDescribesIn(List<String> values) {
-            addCriterion("describes in", values, "describes");
+        public Criteria andDescrIn(List<String> values) {
+            addCriterion("descr in", values, "descr");
             return (Criteria) this;
         }
 
-        public Criteria andDescribesNotIn(List<String> values) {
-            addCriterion("describes not in", values, "describes");
+        public Criteria andDescrNotIn(List<String> values) {
+            addCriterion("descr not in", values, "descr");
             return (Criteria) this;
         }
 
-        public Criteria andDescribesBetween(String value1, String value2) {
-            addCriterion("describes between", value1, value2, "describes");
+        public Criteria andDescrBetween(String value1, String value2) {
+            addCriterion("descr between", value1, value2, "descr");
             return (Criteria) this;
         }
 
-        public Criteria andDescribesNotBetween(String value1, String value2) {
-            addCriterion("describes not between", value1, value2, "describes");
+        public Criteria andDescrNotBetween(String value1, String value2) {
+            addCriterion("descr not between", value1, value2, "descr");
             return (Criteria) this;
         }
         

src/main/java/com/gyee/frame/model/auto/GyeepermissionView.java

@@ -1,9 +1,9 @@
 package com.gyee.frame.model.auto;
 
-import java.util.List;
-
 import io.swagger.annotations.ApiModelProperty;
 
+import java.util.List;
+
 public class GyeepermissionView {
 	/**  **/
 	@ApiModelProperty(value = "") 
@@ -64,11 +64,11 @@ private List<GyeepermissionView> GyeePermissionList;
 		this.permisssionname = permisssionname;
 	}
 
-	public String getDescribes() {
+	public String getDescr() {
 		return describes;
 	}
 
-	public void setDescribes(String describes) {
+	public void setDescr(String describes) {
 		this.describes = describes;
 	}
 

src/main/java/com/gyee/frame/service/GyeeorganService.java

@@ -1,9 +1,5 @@
 package com.gyee.frame.service;
 
-import java.util.List;
-import java.util.Arrays;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.gyee.frame.common.base.BaseService;
@@ -13,6 +9,10 @@ import com.gyee.frame.model.auto.Gyeeorgan;
 import com.gyee.frame.model.auto.GyeeorganExample;
 import com.gyee.frame.model.custom.Tablepar;
 import com.gyee.frame.util.SnowflakeIdWorker;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
 
 /**
  *  GyeeorganService
@@ -24,21 +24,19 @@ import com.gyee.frame.util.SnowflakeIdWorker;
  **/
 @Service
 public class GyeeorganService implements BaseService<Gyeeorgan, GyeeorganExample>{
-	@Autowired
+	@Resource
 	private GyeeorganMapper gyeeorganMapper;
 	
       	   	      	      	      	      	
 	/**
 	 * 分页查询
-	 * @param pageNum
-	 * @param pageSize
 	 * @return
 	 */
 	 public PageInfo<Gyeeorgan> list(Tablepar tablepar,String name){
 	        GyeeorganExample testExample=new GyeeorganExample();
 	        testExample.setOrderByClause("id ASC");
 	        if(name!=null&&!"".equals(name)){
-	        	testExample.createCriteria().andDescribesLike("%"+name+"%");
+	        	testExample.createCriteria().andDescrLike("%"+name+"%");
 	        }
 
 	        PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize());
@@ -127,7 +125,7 @@ public class GyeeorganService implements BaseService<Gyeeorgan, GyeeorganExample
 	 */
 	public int checkNameUnique(Gyeeorgan gyeeorgan){
 		GyeeorganExample example=new GyeeorganExample();
-		example.createCriteria().andDescribesEqualTo(gyeeorgan.getDescribes());
+		example.createCriteria().andDescrEqualTo(gyeeorgan.getDescr());
 		List<Gyeeorgan> list=gyeeorganMapper.selectByExample(example);
 		return list.size();
 	}

src/main/java/com/gyee/frame/service/GyeepermissionService.java

@@ -1,10 +1,5 @@
 package com.gyee.frame.service;
 
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Arrays;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.gyee.frame.common.base.BaseService;
@@ -15,6 +10,11 @@ import com.gyee.frame.model.auto.GyeepermissionExample;
 import com.gyee.frame.model.auto.GyeepermissionView;
 import com.gyee.frame.model.custom.Tablepar;
 import com.gyee.frame.util.SnowflakeIdWorker;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  *  GyeepermissionService
@@ -26,14 +26,12 @@ import com.gyee.frame.util.SnowflakeIdWorker;
  **/
 @Service
 public class GyeepermissionService implements BaseService<Gyeepermission, GyeepermissionExample>{
-	@Autowired
+	@Resource
 	private GyeepermissionMapper gyeepermissionMapper;
 	
       	   	      	      	      	      	      	      	      	      	
 	/**
 	 * 分页查询
-	 * @param pageNum
-	 * @param pageSize
 	 * @return
 	 */
 	 public PageInfo<Gyeepermission> list(Tablepar tablepar,String name){
@@ -156,7 +154,7 @@ public class GyeepermissionService implements BaseService<Gyeepermission, Gyeepe
 				gyeePermissionView.setId(allList.get(i).getId());
 				gyeePermissionView.setPermisssionlevel(allList.get(i).getPermisssionlevel());
 				gyeePermissionView.setPermisssionname(allList.get(i).getPermisssionname());
-				gyeePermissionView.setDescribes(allList.get(i).getDescribes());
+				gyeePermissionView.setDescr(allList.get(i).getDescr());
 				gyeePermissionView.setRemark1(allList.get(i).getRemark1());
 				gyeePermissionView.setRemark2(allList.get(i).getRemark2());
 				gyeePermissionView.setParent(allList.get(i).getParent());
@@ -192,7 +190,7 @@ public class GyeepermissionService implements BaseService<Gyeepermission, Gyeepe
 				gyeePermissionView.setId(allList.get(i).getId());
 				gyeePermissionView.setPermisssionlevel(allList.get(i).getPermisssionlevel());
 				gyeePermissionView.setPermisssionname(allList.get(i).getPermisssionname());
-				gyeePermissionView.setDescribes(allList.get(i).getDescribes());
+				gyeePermissionView.setDescr(allList.get(i).getDescr());
 				gyeePermissionView.setRemark1(allList.get(i).getRemark1());
 				gyeePermissionView.setRemark2(allList.get(i).getRemark2());
 				gyeePermissionView.setParent(allList.get(i).getParent());