dict增加英文支持

euler-web-authentication-impl/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>net.eulerframework</groupId>
     <artifactId>euler-framework</artifactId>
-    <version>0.3.4</version>
+    <version>0.3.5</version>
   </parent>
   <artifactId>euler-web-authentication-impl</artifactId>
   <name>Euler Web Authentication Implement</name>

euler-web-authentication/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>net.eulerframework</groupId>
         <artifactId>euler-framework</artifactId>
-        <version>0.3.4</version>
+        <version>0.3.5</version>
     </parent>
     <artifactId>euler-web-authentication</artifactId>
     <name>Euler Web Authentication</name>

euler-web-basic/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>net.eulerframework</groupId>
         <artifactId>euler-framework</artifactId>
-        <version>0.3.4</version>
+        <version>0.3.5</version>
     </parent>
     <artifactId>euler-web-basic</artifactId>
     <name>Euler Web Basic</name>

euler-web-basic/src/main/java/net/eulerframework/web/module/basic/dao/DictionaryDao.java

@@ -6,6 +6,8 @@
 import org.hibernate.criterion.MatchMode;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
+import org.springframework.util.Assert;
+import org.springframework.util.CollectionUtils;
 
 import net.eulerframework.common.util.StringUtils;
 import net.eulerframework.web.core.base.dao.impl.hibernate5.BaseDao;
@@ -61,5 +63,18 @@ public EasyUIPageResponse<Dictionary> findDictionaryByPage(QueryRequest queryReq
 
         return this.pageQuery(detachedCriteria, pageIndex, pageSize);
     }
+
+    /**
+     * @param key
+     * @return
+     */
+    public Dictionary findDictionaryByKey(String key) {
+        Assert.hasText(key);
+        DetachedCriteria detachedCriteria = DetachedCriteria.forClass(this.entityClass);
+        detachedCriteria.add(Restrictions.eq("key", key));
+        List<Dictionary> ret = this.query(detachedCriteria);
+
+        return CollectionUtils.isEmpty(ret) ? null : ret.get(0);
+    }
 
 }

euler-web-basic/src/main/java/net/eulerframework/web/module/basic/entity/Dictionary.java

@@ -22,7 +22,9 @@ public class Dictionary extends UUIDEntity<Dictionary> {
     @Column(name = "DICT_KEY", nullable = false)
     private String key;
     @Column(name = "DICT_VALUE")
-    private String value;   
+    private String value;  
+    @Column(name = "DICT_VALUE_ENUS")
+    private String valueEnUs;   
     @Column(name = "SHOW_ORDER", nullable = false)
     private Integer showOrder;
     public String getCode() {
@@ -43,6 +45,12 @@ public String getValue() {
     public void setValue(String value) {
         this.value = value;
     }
+    public String getValueEnUs() {
+        return valueEnUs;
+    }
+    public void setValueEnUs(String valueEnUs) {
+        this.valueEnUs = valueEnUs;
+    }
     public Integer getShowOrder() {
         return showOrder;
     }

euler-web-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>net.eulerframework</groupId>
         <artifactId>euler-framework</artifactId>
-        <version>0.3.4</version>
+        <version>0.3.5</version>
     </parent>
     <artifactId>euler-web-core</artifactId>
     <name>Euler Web Core</name>

pom.xml

@@ -11,7 +11,7 @@
     </parent>
 
     <artifactId>euler-framework</artifactId>
-    <version>0.3.4</version>
+    <version>0.3.5</version>
     <packaging>pom</packaging>
     <name>Euler Framework Parent Pom</name>
     <url>https://eulerproject.io/euler-framework</url>