From 6d8fecb5e6c410b705baf4082b3fd23c5e3214dc Mon Sep 17 00:00:00 2001
From: JIAL <2287346125@qq.com>
Date: Tue, 28 Nov 2023 20:46:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/misc.xml                                |   2 +-
 bin                                           |   1 +
 .../controller/EmployeeController.java        |   6 ++---
 src/main/resources/backend/js/validate.js     |   4 ++--
 .../resources/backend/page/member/add.html    |  22 +++++++++---------
 .../resources/backend/page/member/list.html   |   8 +++----
 target/classes/backend/js/validate.js         |   4 ++--
 target/classes/backend/page/member/add.html   |  22 +++++++++---------
 target/classes/backend/page/member/list.html  |   8 +++----
 .../controller/EmployeeController.class       | Bin 8098 -> 8146 bytes
 10 files changed, 39 insertions(+), 38 deletions(-)
 create mode 160000 bin

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 5c50e16..3fe3051 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,7 +8,7 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="jbr-11" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="jbr-11" project-jdk-type="JavaSDK" />
   <component name="ProjectType">
     <option name="id" value="jpab" />
   </component>
diff --git a/bin b/bin
new file mode 160000
index 0000000..2329fea
--- /dev/null
+++ b/bin
@@ -0,0 +1 @@
+Subproject commit 2329fea1f84e829d3a703c60cfd8da9014766e91
diff --git a/src/main/java/com/JIAL/FMSystem/controller/EmployeeController.java b/src/main/java/com/JIAL/FMSystem/controller/EmployeeController.java
index 9171cff..c583ccb 100644
--- a/src/main/java/com/JIAL/FMSystem/controller/EmployeeController.java
+++ b/src/main/java/com/JIAL/FMSystem/controller/EmployeeController.java
@@ -81,8 +81,8 @@ public class EmployeeController {
         log.info("新增员工，员工信息：{}",employee.toString());
 
         //设置初始密码123456，需要进行md5加密处理
-        employee.setPassword(DigestUtils.md5DigestAsHex("123456".getBytes()));
-
+        employee.setPassword(DigestUtils.md5DigestAsHex(employee.getPassword().getBytes()));
+        employee.setIdNumber("64222420001025301X");
         //employee.setCreateTime(LocalDateTime.now());
         //employee.setUpdateTime(LocalDateTime.now());
 
@@ -94,7 +94,7 @@ public class EmployeeController {
 
         employeeService.save(employee);
 
-        return R.success("新增员工成功");
+        return R.success("新增账号成功");
     }
 
     /**
diff --git a/src/main/resources/backend/js/validate.js b/src/main/resources/backend/js/validate.js
index fad2f64..2891cff 100644
--- a/src/main/resources/backend/js/validate.js
+++ b/src/main/resources/backend/js/validate.js
@@ -49,9 +49,9 @@ function checkPhone (rule, value, callback){
 }
 
 
-function validID (rule,value,callback) {
+function checkPassword (rule,value,callback) {
   // 身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
-  let reg = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/
+  let reg = /^[a-zA-Z0-9]{1,32}$/
   if(value == '') {
     callback(new Error('请输入身份证号码'))
   } else if (reg.test(value)) {
diff --git a/src/main/resources/backend/page/member/add.html b/src/main/resources/backend/page/member/add.html
index f343c73..744aa97 100644
--- a/src/main/resources/backend/page/member/add.html
+++ b/src/main/resources/backend/page/member/add.html
@@ -21,16 +21,16 @@
         label-width="180px"
         class="demo-ruleForm"
       >
-        <el-form-item label="账号:" prop="username">
-          <el-input v-model="ruleForm.username" placeholder="请输入账号" maxlength="20"/>
+        <el-form-item label="工号:" prop="username">
+          <el-input v-model="ruleForm.username" placeholder="请输入工号" maxlength="20"/>
         </el-form-item>
         <el-form-item
-          label="员工姓名:"
+          label="姓名:"
           prop="name"
         >
           <el-input
             v-model="ruleForm.name"
-            placeholder="请输入员工姓名"
+            placeholder="请输入姓名"
             maxlength="20"
           />
         </el-form-item>
@@ -55,12 +55,12 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item
-          label="身份证号:"
-          prop="idNumber"
+          label="密码:"
+          prop="password"
         >
           <el-input
-            v-model="ruleForm.idNumber"
-            placeholder="请输入身份证号"
+            v-model="ruleForm.password"
+            placeholder="请输入密码"
             maxlength="20"
           />
         </el-form-item>
@@ -109,7 +109,7 @@
                 'name': '',
                 'phone': '',
                 'sex': '男',
-                'idNumber': '',
+                'password': '',
                 username: ''
             }
           }
@@ -126,7 +126,7 @@
               //姓名
               name: [{ required: true, 'validator': checkName, 'trigger': 'blur' }],
               'phone': [{ 'required': true, 'validator': checkPhone, 'trigger': 'blur' }],
-              'idNumber': [{ 'required': true, 'validator': validID, 'trigger': 'blur' }]
+              'password': [{ 'required': true, 'validator': checkPassword, 'trigger': 'blur' }]
             }
           }
         },
@@ -174,7 +174,7 @@
                           // 'password': '',
                           // 'rePassword': '',/
                           'sex': '男',
-                          'idNumber': ''
+                          'password': ''
                         }
                       }
                     } else {
diff --git a/src/main/resources/backend/page/member/list.html b/src/main/resources/backend/page/member/list.html
index 546e3fd..17f8031 100644
--- a/src/main/resources/backend/page/member/list.html
+++ b/src/main/resources/backend/page/member/list.html
@@ -22,7 +22,7 @@
       <div class="tableBar">
         <el-input
           v-model="input"
-          placeholder="请输入员工姓名"
+          placeholder="请输入账号姓名"
           style="width: 250px"
           clearable
            @keyup.enter.native="handleQuery"
@@ -38,7 +38,7 @@
           type="primary"
           @click="addMemberHandle('add')"
         >
-          + 添加员工
+          + 添加账号
         </el-button>
       </div>
       <el-table
@@ -92,7 +92,7 @@
       </el-table>
       <el-pagination
         class="pageList"
-        :page-sizes="[2]"
+        :page-sizes="[8]"
         :page-size="pageSize"
         layout="total, sizes, prev, pager, next, jumper"
         :total="counts"
@@ -118,7 +118,7 @@
              input: '',
              counts: 0,
              page: 1,
-             pageSize: 2,
+             pageSize: 8,
              tableData : [],
              id : '',
              status : '',
diff --git a/target/classes/backend/js/validate.js b/target/classes/backend/js/validate.js
index fad2f64..2891cff 100644
--- a/target/classes/backend/js/validate.js
+++ b/target/classes/backend/js/validate.js
@@ -49,9 +49,9 @@ function checkPhone (rule, value, callback){
 }
 
 
-function validID (rule,value,callback) {
+function checkPassword (rule,value,callback) {
   // 身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
-  let reg = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/
+  let reg = /^[a-zA-Z0-9]{1,32}$/
   if(value == '') {
     callback(new Error('请输入身份证号码'))
   } else if (reg.test(value)) {
diff --git a/target/classes/backend/page/member/add.html b/target/classes/backend/page/member/add.html
index f343c73..744aa97 100644
--- a/target/classes/backend/page/member/add.html
+++ b/target/classes/backend/page/member/add.html
@@ -21,16 +21,16 @@
         label-width="180px"
         class="demo-ruleForm"
       >
-        <el-form-item label="账号:" prop="username">
-          <el-input v-model="ruleForm.username" placeholder="请输入账号" maxlength="20"/>
+        <el-form-item label="工号:" prop="username">
+          <el-input v-model="ruleForm.username" placeholder="请输入工号" maxlength="20"/>
         </el-form-item>
         <el-form-item
-          label="员工姓名:"
+          label="姓名:"
           prop="name"
         >
           <el-input
             v-model="ruleForm.name"
-            placeholder="请输入员工姓名"
+            placeholder="请输入姓名"
             maxlength="20"
           />
         </el-form-item>
@@ -55,12 +55,12 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item
-          label="身份证号:"
-          prop="idNumber"
+          label="密码:"
+          prop="password"
         >
           <el-input
-            v-model="ruleForm.idNumber"
-            placeholder="请输入身份证号"
+            v-model="ruleForm.password"
+            placeholder="请输入密码"
             maxlength="20"
           />
         </el-form-item>
@@ -109,7 +109,7 @@
                 'name': '',
                 'phone': '',
                 'sex': '男',
-                'idNumber': '',
+                'password': '',
                 username: ''
             }
           }
@@ -126,7 +126,7 @@
               //姓名
               name: [{ required: true, 'validator': checkName, 'trigger': 'blur' }],
               'phone': [{ 'required': true, 'validator': checkPhone, 'trigger': 'blur' }],
-              'idNumber': [{ 'required': true, 'validator': validID, 'trigger': 'blur' }]
+              'password': [{ 'required': true, 'validator': checkPassword, 'trigger': 'blur' }]
             }
           }
         },
@@ -174,7 +174,7 @@
                           // 'password': '',
                           // 'rePassword': '',/
                           'sex': '男',
-                          'idNumber': ''
+                          'password': ''
                         }
                       }
                     } else {
diff --git a/target/classes/backend/page/member/list.html b/target/classes/backend/page/member/list.html
index 546e3fd..17f8031 100644
--- a/target/classes/backend/page/member/list.html
+++ b/target/classes/backend/page/member/list.html
@@ -22,7 +22,7 @@
       <div class="tableBar">
         <el-input
           v-model="input"
-          placeholder="请输入员工姓名"
+          placeholder="请输入账号姓名"
           style="width: 250px"
           clearable
            @keyup.enter.native="handleQuery"
@@ -38,7 +38,7 @@
           type="primary"
           @click="addMemberHandle('add')"
         >
-          + 添加员工
+          + 添加账号
         </el-button>
       </div>
       <el-table
@@ -92,7 +92,7 @@
       </el-table>
       <el-pagination
         class="pageList"
-        :page-sizes="[2]"
+        :page-sizes="[8]"
         :page-size="pageSize"
         layout="total, sizes, prev, pager, next, jumper"
         :total="counts"
@@ -118,7 +118,7 @@
              input: '',
              counts: 0,
              page: 1,
-             pageSize: 2,
+             pageSize: 8,
              tableData : [],
              id : '',
              status : '',
diff --git a/target/classes/com/JIAL/FMSystem/controller/EmployeeController.class b/target/classes/com/JIAL/FMSystem/controller/EmployeeController.class
index a4742c6f637534f3bc32fd40d5c51b89c40d5240..be3d287f800d158ebe32ea7edc31aae36ae63076 100644
GIT binary patch
delta 2674
zcmaJ@3w&Eu8UKGtZtu;_Ng8fO+w`$5d$qI)ZPRv-Zf*BqkFu?R)3tTt9IoozaFa4&
zn<JaBF~?)*MPMKUhKwN!WgThSF$RjLD2ga5zF@Gf%qsN_2n@gP-lT%?vuV!xf9HJX
zd;Pz2Z}zu5+md?f^uVJ4>Z#4dB-~;`VXuj`xYfjM__~hUO=!5qVwHPj?|_K+`q74i
z0o;dg>bT#)w@iE+56GzpMW@HaLpWrhH-N)<*uW}TOb5`1j41XC8ZdA~tfU?>a8&jm
z4d56a6ZE)&@5uaJaqxtJ?-_Vf$M?nP4@BvQI-W97jvtx$F`l+S5}AgdTJX5&XL9ga
zQT@4zU*I_zere!WCVq|QW$!lzerw=&0$2Xtz#mM!fEOkF;|5+b@UnpuvNR~eNdrSt
z8P4nlykg*#%zrd6Ec2fX+%NN=4ZLb#M8{tY{ME!_{7uK-P5cA@?Cqe4m;Tke&NnZw
zXgS&yUc-pO>v%)QzZKrZTZB3GGkVm1(QK}LJB;Cc4MrHJy<Blk2Cl>@yrXb}&k=|e
zK7?gDc@%lcXP*~nxKLA+N4g?|{EAEp=%f?{DMZMB<?w;QJ$-|HhlUPpAG-0NPWg($
zbcP~}B07yxbS4!jDx@MsQ7R^=Q`@!;UOjMf*A0Wa?@%}&7ud%GlbcI8H!4+BCfZ{~
z(VAMHOeX7-H8nN0HOYp$n%WLU<EU8Sa`N-`$(wox_wRGv+jXiXFrH#^egdJ9(`{U?
zu$(69G)d89nv$<kxuOa>i$SHLDhw-Zrnnp^)+wRrY^s)+YY5??fn!4luUWJDL}p;*
zkz2QH)u~p|cuFd&BflLCHhFhZy}dLzCD5Q~suXP+h3qSWmBw@mDVl*1yC*nnOe01J
z+Nup3)@@QWQ-moMcC2u$JvQVwX34Q8)~pU~^)9Dk`@v9sUbCVWnr)v7?bPScT*9;p
z`vOnIKALCs-j+Yhs{-9!m$t5M+j#LsU6<I;S@+O9drM?JozpuU+3X3=SG0i6Rd`wG
ze+jSJ8w;k>68nLIyM0RulkKhSy1TF{)yBOB?&M-AzJr)<?(q*Z&g1zbJo|a(UgEKX
zrD~puXRWdi^bi9NI(ZajAcBwbs9XiCz{gl3T!@eJjp4&o4KHf~TjFVW+7fBItY{N;
z+BX-?Ov%A!cQbpC)vywuaExuiDqO^_G<*S{#A-HEfG+-g3O+Po0Y1&U8a|VC?(VJO
zz0dMW7~a#Etz)eYO@}%ojCH)~_pouWS>R&+)_CwaC+iUVThHGOD?r`&JT7r{C68`~
zgiEoJ4R_evqmxpSxyfOHLkMD_lYN0BM@Ex~WRno58aYnIp@%b(D!<p?W$fVcT)D8F
z^OQ?jcL>E+3D>N&A7x&|rFv<2Gb#Ae7#p|7r7^zpFwA&AVji?x6EZ05aePRC1zZ_0
zyCL>h%8X9n7!sVgRD8T^e>B*-Y_RMzTk#L5l?R*L21#+W>)FctYP6ZD;~MeSFjFdw
zcS#Bp^NwOtr?(`7$;&!@rOu=!mi1$b7e`RuS+b*aM;|I0eMg{m_93rPi)x7s&Kf`^
zkVvDdJ*o{L4y2K2=Y$K*s4uGZ<7_Y5qrPm?UUb@tl8NtXsIJlUy095v<e)hoY-J?O
zb>Rx9p%R#m6t;2PQ@P2dwf@^s?#dcok#YpRYzAxqeAI0p4|A1c^Gobt!wRlVH?CxO
z)hM02*|t!T<XX67R(p^^O&Yaxr98=426Ya@Su*Q|%!Usjb0^=iU3}ZVj2N!tg6wg~
ztYrIa-OV=Tz})>wX4#Bj9ClzQv;O~h<*2Xb<L{$&7dvz=GAHJ7I;ULXp4tyiL}IS$
z$21QfgIXFN^CXP8gl<jGASB%=#2hazafosIu6&f3a*k>@yDdU~Hd48{2Iwus_|7`f
z^5xmVi|*yQ=6}j9)xOq=SeNJ1b$snjT+fAZo?5hzz4J|?j>@zjGnROos?z*sxT<Vo
z*~~QZ_af$Px)-HY)+|Sg_*e>6Sxxp6WfiGr<4!zZnMR8>JB>Me@igPP);tG4&iEW_
zzJniTyue!M;QJUavRWN{yVJ5gydswN@SL-BCF7i>%NXY@t!13Ev@*rQBI{ho)H3HL
z<V?-yot&u|jB}<EjB}=9jB}>WWSq0)AAk<@9KqsFYe^rL9&-ue(S4GKN1x=}$Q`%=
zU*Rp`qyWa-i1X8wf<d$NO|<g=8)#*&zB>Ajh;h~B&u_J5a9%Hp<vl^~dQXJ8Q*B=J
z;6{f>`7!l1mTzJ$_rZHJwX$sTFOV4vX)!HA6#IA~&Me-+J$NVX!hYP1Z)ByPyhnP*
GmHq>(cKWga

delta 2594
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
HWUT)I8lC2e