From 8e7d07c15ab171b19980efb91367ef4287703295 Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Thu, 3 Aug 2023 09:20:14 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE=E7=BC=96=E5=8F=B7=E5=92=8C?=
 =?UTF-8?q?=E5=9C=B0=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pmapi/projectlib/manage/ProjectLibManage.java  |  6 +++++
 .../projectlib/model/vo/ProjectLibListItemVO.java  | 12 +++++++---
 .../ningdatech/pmapi/password/PasswordTest.java    | 26 ++++++++++++++++++++++
 3 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 pmapi/src/test/java/com/ningdatech/pmapi/password/PasswordTest.java

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java
index 551c517..559ab06 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java
@@ -126,6 +126,9 @@ public class ProjectLibManage {
             ProjectLibListItemVO item = new ProjectLibListItemVO();
             item.setId(w.getId());
             item.setProjectName(w.getProjectName());
+            item.setProjectCode(w.getProjectCode());
+            item.setArea(w.getArea());
+            item.setAreaCode(w.getAreaCode());
             item.setCreateOn(w.getCreateOn());
             item.setDeclaredAmount(w.getDeclareAmount());
             item.setStage(w.getStage());
@@ -157,6 +160,9 @@ public class ProjectLibManage {
             ProjectLibListItemVO item = new ProjectLibListItemVO();
             item.setId(w.getId());
             item.setProjectName(w.getProjectName());
+            item.setProjectCode(w.getProjectCode());
+            item.setArea(w.getArea());
+            item.setAreaCode(w.getAreaCode());
             item.setCreateOn(w.getCreateOn());
             item.setDeclaredAmount(w.getDeclareAmount());
             item.setStage(w.getStage());
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectLibListItemVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectLibListItemVO.java
index 375dc13..20bd972 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectLibListItemVO.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectLibListItemVO.java
@@ -39,6 +39,15 @@ public class ProjectLibListItemVO {
     @ApiModelProperty("项目ID")
     private Long id;
 
+    @ApiModelProperty("项目编号")
+    private String projectCode;
+
+    @ApiModelProperty("区域")
+    private String area;
+
+    @ApiModelProperty("区域Code")
+    private String areaCode;
+
     @ApiModelProperty("项目名称")
     private String projectName;
 
@@ -127,9 +136,6 @@ public class ProjectLibListItemVO {
     @ApiModelProperty("能否被预审申报")
     private Boolean canPreDeclared = Boolean.FALSE;
 
-    @ApiModelProperty("21位项目编号")
-    private String projectCode;
-
     @ApiModelProperty("是否有上级条线主管部门 0没有 1有")
     private Integer isHigherSuperOrg;
 
diff --git a/pmapi/src/test/java/com/ningdatech/pmapi/password/PasswordTest.java b/pmapi/src/test/java/com/ningdatech/pmapi/password/PasswordTest.java
new file mode 100644
index 0000000..dc34917
--- /dev/null
+++ b/pmapi/src/test/java/com/ningdatech/pmapi/password/PasswordTest.java
@@ -0,0 +1,26 @@
+package com.ningdatech.pmapi.password;
+
+import org.junit.Test;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
+
+/**
+ * @Classname PasswordTest
+ * @Description
+ * @Date 2023/8/2 17:39
+ * @Author PoffyZhang
+ */
+public class PasswordTest {
+
+    @Test
+    public void password(){
+        String mingwen = "ELgaCeHteZA8VJK8";
+
+        String miwen = "$2a$10$MT82RbInrIkRVL/GRS01Vew8AO6ICngOpbAGbdkWgSnYFhog5n8.q";
+
+        String encode = new BCryptPasswordEncoder().encode(mingwen);
+        boolean matches = new BCryptPasswordEncoder().matches(mingwen, encode);
+        System.out.println(encode);
+        System.out.println(matches);
+    }
+}