update: user create check

deploy/start_env/deploy.sh

-#!/usr/bin/env bash
-
-SERVICE_DIR="camel" # 修改为正确的服务的名称
-
-
-cp ./${SERVICE_DIR}/bin/${SERVICE_DIR}.tar.gz ./
-
-tar zxf ${SERVICE_DIR}.tar.gz -C ./
-
-npm run prod
-
-mkdir ../logs
-
-touch ../logs/warmup.done
-touch ../logs/start_script.done
-
-chown nobody:nobody -R /home/services/${SERVICE_DIR}/logs
-chmod 777 -R /home/services/${SERVICE_DIR}/logs
-while true;do
-sleep 30;done

deploy_ci/deploy_configs/deploy-prod-config.sh

 #!/usr/bin/env bash
 
 # Start commands for each container, one cmd a line
-START_CMDS="tar zxf webui_opwebservice_package.tar.gz -C opservice.yidianzixun.com/htdocs && cd opservice.yidianzixun.com && ${start_cmd}"
+START_CMDS="tar zxf webui_opwebservice_package.tar.gz -C opservice.yidian-inc.com/htdocs && cd opservice.yidian-inc.com && ${start_cmd}"
 
 # Container names for each container, one name a line, same order with $start_cmds
 CONTAINER_NAMES="webui-opwebservice-${env}"
@@ -17,7 +17,7 @@ webui-opwebservice
 
 # Volumn maps for each container, one map a line, same order with $start_cmds
 DOCKER_VOLUMN_MAPS="
-~/_logs/webui-opwebservice-${env}:/home/worker/opservice.yidianzixun.com/logs
+~/_logs/webui-opwebservice-${env}:/home/worker/opservice.yidian-inc.com/logs
 "
 
 # Other docker run options

deploy_ci/dockerfile/assemble-yidian-config.sh

@@ -2,7 +2,7 @@
 
 DIST_FILE_NAME="webui_opwebservice_package.tar.gz"
 
-PROJECT_DIR="opservice.yidianzixun.com"
+PROJECT_DIR="opservice.yidian-inc.com"
 
 START_SCRIPT="./start_env/${PROJECT_DIR}/start.sh"
 

deploy_ci/start_env/opservice.yidianzixun.com/pm2.json

@@ -4,11 +4,11 @@
       "name": "opwebservice",
       "script": "app.js",
       "log_date_format": "YYYY-MM-DD HH:mm Z",
-      "cwd": "/home/worker/opservice.yidianzixun.com/htdocs",
+      "cwd": "/home/worker/opservice.yidian-inc.com/htdocs",
       "exec_mode": "cluster",
       "instances": 0,
-      "error_file": "/home/worker/opservice.yidianzixun.com/logs/opwebservice.err.log",
-      "out_file": "/home/worker/opservice.yidianzixun.com/logs/opwebservice.out.log",
+      "error_file": "/home/worker/opservice.yidian-inc.com/logs/opwebservice.err.log",
+      "out_file": "/home/worker/opservice.yidian-inc.com/logs/opwebservice.out.log",
       "max_memory_restart": "1G",
       "env": {
         "NODE_ENV": "production",

deploy_ci/start_env/opservice.yidianzixun.com/start.sh

-rm /home/worker/opservice.yidianzixun.com/logs/start_script.done
-cd /home/worker/opservice.yidianzixun.com/htdocs/
-mv /opt/project_lib/node_modules /home/worker/opservice.yidianzixun.com/htdocs/
+rm /home/worker/opservice.yidian-inc.com/logs/start_script.done
+cd /home/worker/opservice.yidian-inc.com/htdocs/
+mv /opt/project_lib/node_modules /home/worker/opservice.yidian-inc.com/htdocs/
 
 env=$1
 port=$2
@@ -15,7 +15,7 @@ if [ X"$port" = X];then
     $port=8055
 fi
 
-cd /home/worker/opservice.yidianzixun.com/htdocs/
+cd /home/worker/opservice.yidian-inc.com/htdocs/
 
 if [ X"$env" = X"prod" ];then
     echo "{\"pm2-logrotate\":{\"max_size\":\"524288000\",\"interval\":\"7\",\"retain\":\"10\"},\"module-db\":{\"pm2-logrotate\":true}}" > /root/.pm2/module_conf.json
@@ -34,6 +34,6 @@ while true; do
     sleep 10;
 done
 
-touch /home/worker/opservice.yidianzixun.com/logs/start_script.done
+touch /home/worker/opservice.yidian-inc.com/logs/start_script.done
 while true;do
 sleep 30;done

src/pages/User/userList/components/UserInfoEditModal.vue

@@ -20,7 +20,7 @@
         <el-form-item label="姓名" :label-width="formLabelWidth">
           <el-input class="form-val" v-model="userInfo.user_name" disabled></el-input>
         </el-form-item>
-        <el-form-item label="账号" :label-width="formLabelWidth">
+        <el-form-item label="邮箱" :label-width="formLabelWidth" required>
           <el-input class="form-val" v-model="userInfo.user_email" disabled></el-input>
         </el-form-item>
         <el-form-item label="手机号" :label-width="formLabelWidth">
@@ -29,7 +29,7 @@
         <el-form-item label="所属组织" :label-width="formLabelWidth">
           <el-input class="form-val" v-model="userInfo.organization" disabled></el-input>
         </el-form-item>
-        <el-form-item label="授权角色信息" :label-width="formLabelWidth">
+        <el-form-item label="授权角色信息" :label-width="formLabelWidth" required>
           <el-select v-model="userInfo.roles" multiple placeholder="请选择" class="form-val">
             <el-option
               v-for="item in roles"
@@ -106,6 +106,26 @@ export default {
       this.roles = result;
     },
     confirm() {
+      const checkConditions = {
+        user_email: {
+          check: val => val.trim() !== '',
+          tip: "请输入邮箱！"
+        },
+        roles: {
+          check: val => val.length !== 0,
+          tip: "请添加角色！"
+        },
+      };
+
+      const keys = Object.keys(checkConditions);
+      for (let i = 0; i < keys.length; i++) {
+        const field = keys[i];
+        if (!checkConditions[field].check(this.userInfo[field])) {
+          ElMessage.error(checkConditions[field].tip);
+          return;
+        }
+      }
+
       this.$emit('confirm', this.userInfo);
     },
     cancel() {

src/pages/User/userList/components/UserInfoNewModal.vue

@@ -17,7 +17,7 @@
         <el-form-item label="姓名" :label-width="formLabelWidth">
           <el-input class="form-val" v-model="userInfo.user_name"></el-input>
         </el-form-item>
-        <el-form-item label="邮箱" :label-width="formLabelWidth">
+        <el-form-item label="邮箱" :label-width="formLabelWidth" required>
           <el-input class="form-val" v-model="userInfo.user_email"></el-input>
         </el-form-item>
         <el-form-item label="手机号" :label-width="formLabelWidth">
@@ -26,7 +26,7 @@
         <el-form-item label="所属组织" :label-width="formLabelWidth">
           <el-input class="form-val" v-model="userInfo.organization"></el-input>
         </el-form-item>
-        <el-form-item label="授权角色" :label-width="formLabelWidth">
+        <el-form-item label="授权角色" :label-width="formLabelWidth" required>
           <el-select v-model="userInfo.roles" multiple placeholder="请选择" class="form-val">
             <el-option
               v-for="item in roles"
@@ -108,6 +108,26 @@ export default {
       this.roles = result;
     },
     confirm() {
+      const checkConditions = {
+        user_email: {
+          check: val => val.trim() !== '',
+          tip: "请输入邮箱！"
+        },
+        roles: {
+          check: val => val.length !== 0,
+          tip: "请添加角色！"
+        },
+      };
+
+      const keys = Object.keys(checkConditions);
+      for (let i = 0; i < keys.length; i++) {
+        const field = keys[i];
+        if (!checkConditions[field].check(this.userInfo[field])) {
+          ElMessage.error(checkConditions[field].tip);
+          return;
+        }
+      }
+
       this.$emit('confirm', this.userInfo);
     },
     cancel() {