Merge pull request #161 from FederatedAI/develop-1.11.0

Develop 1.11.0
FederatedAI · Apr 11, 2023 · e778f31 · e778f31
2 parents 94da5f5 + 113e24d
commit e778f31
Show file tree

Hide file tree

Showing 7 changed files with 304 additions and 54 deletions.
diff --git a/RELEASE.md b/RELEASE.md
@@ -1,3 +1,11 @@
+# Release 1.11.0
+
+#### Major Features and Improvements
+**Major Features**
+
+* Binning component display optimization
+* Password configuration item allows encryption
+
 # Release 1.10.0
 
 #### Major Features and Improvements

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>fateboard</groupId>
     <artifactId>fateboard</artifactId>
-    <version>1.10.0</version>
+    <version>1.11.0</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>
@@ -21,7 +21,7 @@
 
     <properties>
         <druid.version>1.1.10</druid.version>
-        <druid.version>1.1.10</druid.version>
+<!--        <druid.version>1.1.10</druid.version>-->
         <lombok.version>1.18.24</lombok.version>
         <jasypt.version>2.0.0</jasypt.version>
 

diff --git a/resources-front-end/src/transform/fn/binningDataHandler.js b/resources-front-end/src/transform/fn/binningDataHandler.js
@@ -215,7 +215,7 @@ export default function(data, header, type, partyId, role, Currentrole, skipStat
         monotonicity: skipStatic ? '-' : (Currentrole === 'host' ? '-' : (data[key].isWoeMonotonic ? data[key].isWoeMonotonic.toString() : 'false')),
         partyid: partyId,
         role,
-        binning_count: data[key].splitPoints.length || data[key].ivArray.length
+        binning_count: parseFloat(data[key].binNums)
       })
       options.push({
         value: key,

diff --git a/resources-front-end/src/views/job-dashboard/log/Logs.vue b/resources-front-end/src/views/job-dashboard/log/Logs.vue
@@ -254,7 +254,7 @@ export default {
     getInstanceIdFromFlow() {
       return getInstanceId().then((res) => {
         const result = []
-        for (const [instance] of Object.entries(res.data)) {
+        for (const instance of Object.values(res.data)) {
           if (instance.host === window.location.host) {
             this.currentInstanceId = instance.instance_id
           }

diff --git a/src/main/java/com/webank/ai/fate/board/services/UserService.java b/src/main/java/com/webank/ai/fate/board/services/UserService.java
@@ -16,6 +16,8 @@
 package com.webank.ai.fate.board.services;
 
 import com.webank.ai.fate.board.pojo.UserDTO;
+import com.webank.ai.fate.board.utils.StandardRSAUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -63,6 +65,16 @@ public boolean checkUser(String username, String password) {
         updateConfig();
         String usernameValue = getValue("server.board.login.username");
         String passwordValue = getValue("server.board.login.password");
+        String privateKey = getValue("server.board.encrypt.private_key");
+        String encrypted = getValue("server.board.encrypt.enable");
+        if (StringUtils.isNotBlank(privateKey) && "true".equalsIgnoreCase(encrypted)) {
+            try {
+                passwordValue = StandardRSAUtils.decryptByPrivateKey(passwordValue, privateKey);
+            } catch (Exception e) {
+                logger.error("decrypt password error");
+                return false;
+            }
+        }
 
         if (!username.equals(usernameValue)) {
             return false;