Merge commit '081f922ee61334f2f6895b01d3ed3ff5d3252b8e'

tiwater · May 29, 2024 · 4fa0ef5 · 4fa0ef5
2 parents 6dd3caf + 081f922
commit 4fa0ef5
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -38,4 +38,4 @@ volumes:
 
 networks:
   ragflow:
-    driver: bridge
+    driver: bridge
diff --git a/docker/service_conf.yaml b/docker/service_conf.yaml
@@ -42,4 +42,4 @@ authentication:
 permission:
   switch: false
   component: false
-  dataset: false
+  dataset: false
diff --git a/requirements.txt b/requirements.txt
@@ -134,4 +134,4 @@ yarl==1.9.4
 zhipuai==2.0.1
 BCEmbedding
 loguru==0.7.2
-PyJWT==2.8.0
+PyJWT==2.8.0
diff --git a/requirements_dev.txt b/requirements_dev.txt
@@ -122,4 +122,4 @@ BCEmbedding
 loguru==0.7.2
 ollama==0.1.8
 redis==5.0.4
-PyJWT==2.8.0
+PyJWT==2.8.0
diff --git a/web/src/pages/login/index.tsx b/web/src/pages/login/index.tsx
@@ -37,10 +37,14 @@ const Login = () => {
     try {
       const params = await form.validateFields();
 
+<<<<<<< HEAD
       // const rsaPassWord = rsaPsw(params.password) as string;
 
       // Integrate with Penless, don't need to encrypt
       const rsaPassWord = params.password;
+=======
+      const rsaPassWord = rsaPsw(params.password) as string;
+>>>>>>> 081f922ee61334f2f6895b01d3ed3ff5d3252b8e
 
       if (title === 'login') {
         const retcode = await login({