Merge pull request #167 from FederatedAI/develop-1.11.2

Develop 1.11.2
FederatedAI · Sep 8, 2023 · a5a52ab · a5a52ab
2 parents f4db190 + b1597d6
commit a5a52ab
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 14 deletions.
diff --git a/RELEASE.md b/RELEASE.md
@@ -1,3 +1,11 @@
+# Release 1.11.2
+
+#### Major Features and Improvements
+**Major Features**
+
+* Dependencies updated
+* Display details optimization
+
 # Release 1.11.1
 
 #### Major Features and Improvements

diff --git a/pom.xml b/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>fateboard</groupId>
     <artifactId>fateboard</artifactId>
-    <version>1.11.1</version>
+    <version>1.11.2</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.4</version>
+        <version>2.7.10</version>
         <relativePath/>
     </parent>
 
@@ -93,7 +93,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>31.1-jre</version>
+            <version>32.0.1-android</version>
         </dependency>
 
         <dependency>
@@ -186,7 +186,7 @@
             <dependency>
                 <groupId>org.yaml</groupId>
                 <artifactId>snakeyaml</artifactId>
-                <version>1.33</version>
+                <version>2.0</version>
             </dependency>
             <dependency>
                 <groupId>org.springframework.cloud</groupId>

diff --git a/resources-front-end/index.html b/resources-front-end/index.html
@@ -8,5 +8,6 @@
   <body>
     <div id="app"></div>
     <!-- built files will be auto injected -->
+    <script src="./static/jsencrypt.min.js"></script>
   </body>
 </html>
diff --git a/resources-front-end/package.json b/resources-front-end/package.json
@@ -22,9 +22,7 @@
     "file-saver": "^2.0.1",
     "hmac_sha1": "^0.1.1",
     "js-cookie": "2.2.0",
-    "jsencrypt": "^3.2.1",
-    "jsencrypter": "^1.2.1",
-    "jszip": "^3.7.1",
+    "jszip": "^3.8.0",
     "lodash": "^4.17.21",
     "mockjs": "1.0.1-beta3",
     "normalize.css": "7.0.0",

diff --git a/resources-front-end/src/utils/encrypt.js b/resources-front-end/src/utils/encrypt.js
@@ -1,7 +1,9 @@
-import { JSEncrypt } from 'jsencrypt'
-
-export default function rsa(publicKet, origin) {
-  const jsencrypt = new JSEncrypt()
-  jsencrypt.setPublicKey(publicKet)
-  return jsencrypt.encrypt(origin)
-}
+export default function rsa(publicKet, origin) {
+  if (window.JSEncrypt) {
+    const jsencrypt = new window.JSEncrypt()
+    jsencrypt.setPublicKey(publicKet)
+    return jsencrypt.encrypt(origin)
+  } else {
+    return origin
+  }
+}
diff --git a/resources-front-end/static/jsencrypt.min.js b/resources-front-end/static/jsencrypt.min.js