Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

疯狂的狮子li

2020-06-29 f0bee6af6358e07b5426df16aab37f4259de52f6

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue


 Conflicts:

	ruoyi-ui/src/router/index.js

	ruoyi-ui/src/views/system/user/index.vue

	ruoyi-ui/src/views/system/user/profile/userAvatar.vue

	ruoyi-ui/src/views/tool/gen/editTable.vue

	ruoyi-ui/src/views/tool/gen/index.vue

	ruoyi/src/main/java/com/ruoyi/RuoYiApplication.java

	ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java

 ruoyi-ui/src/router/index.js

@@ -111,7 +111,7 @@
    hidden: true,
    children: [
      {
        path: 'edit',
        path: 'edit/:tableId(\\d+)',
        component: (resolve) => require(['@/views/tool/gen/editTable'], resolve),
        name: 'GenEdit',
        meta: { title: '修改生成配置' }

 ruoyi-ui/src/views/system/user/index.vue

@@ -211,6 +211,8 @@
              <treeselect v-model="form.deptId" :options="deptOptions" :disable-branch-nodes="true" :show-count="true" placeholder="请选择归属部门" />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="12">
            <el-form-item label="手机号码" prop="phonenumber">
              <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
@@ -221,6 +223,8 @@
              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="12">
            <el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
              <el-input v-model="form.userName" placeholder="请输入用户名称" />
@@ -231,6 +235,8 @@
              <el-input v-model="form.password" placeholder="请输入用户密码" type="password" />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="12">
            <el-form-item label="用户性别">
              <el-select v-model="form.sex" placeholder="请选择">
@@ -254,7 +260,8 @@
              </el-radio-group>
            </el-form-item>
          </el-col>

        </el-row>
        <el-row>
          <el-col :span="12">
            <el-form-item label="岗位">
              <el-select v-model="form.postIds" multiple placeholder="请选择">
@@ -281,6 +288,8 @@
              </el-select>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="24">
            <el-form-item label="备注">
              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>

 ruoyi-ui/src/views/system/user/profile/userAvatar.vue

@@ -1,7 +1,7 @@
<template>
  <div>
    <img v-bind:src="options.img" @click="editCropper()" title="点击上传头像" class="img-circle img-lg" />
    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body @opened="modalOpened">
      <el-row>
        <el-col :xs="24" :md="12" :style="{height: '350px'}">
          <vue-cropper
@@ -13,6 +13,7 @@
            :autoCropHeight="options.autoCropHeight"
            :fixedBox="options.fixedBox"
            @realTime="realTime"
            v-if="visible"
          />
        </el-col>
        <el-col :xs="24" :md="12" :style="{height: '350px'}">
@@ -67,6 +68,8 @@
    return {
      // æ˜¯å¦æ˜¾ç¤ºå¼¹å‡ºå±‚
      open: false,
      // æ˜¯å¦æ˜¾ç¤ºcropper
      visible: false,
      // å¼¹å‡ºå±‚标题
      title: "修改头像",
      options: {
@@ -83,6 +86,10 @@
    // ç¼–辑头像
    editCropper() {
      this.open = true;
    },
    // æ‰“开弹出层结束时的回调
    modalOpened() {
      this.visible = true;
    },
    // è¦†ç›–默认的上传行为
    requestUpload() {
@@ -121,9 +128,10 @@
          if (response.code === 200) {
            this.open = false;
            this.options.img = process.env.VUE_APP_BASE_API + response.imgUrl;
            store.commit('SET_AVATAR', this.options.img);
            this.msgSuccess("修改成功");
          }
          this.$refs.cropper.clearCrop();
          this.visible = false;
        });
      });
    },
@@ -133,4 +141,4 @@
    }
  }
};
</script>
</script>

 ruoyi-ui/src/views/tool/gen/editTable.vue

@@ -147,8 +147,8 @@
      info: {}
    };
  },
  beforeCreate() {
    const { tableId } = this.$route.query;
  created() {
    const tableId = this.$route.params && this.$route.params.tableId;
    if (tableId) {
      // èŽ·å–表详细信息
      getGenTable(tableId).then(res => {

 ruoyi-ui/src/views/tool/gen/index.vue

@@ -270,7 +270,7 @@
    /** ä¿®æ”¹æŒ‰é’®æ“ä½œ */
    handleEditTable(row) {
      const tableId = row.tableId || this.ids[0];
      this.$router.push({ path: "/gen/edit", query: { tableId: tableId } });
      this.$router.push("/gen/edit/" + tableId);
    },
    /** åˆ é™¤æŒ‰é’®æ“ä½œ */
    handleDelete(row) {
@@ -288,4 +288,4 @@
    }
  }
};
</script>
</script>

 ruoyi/src/main/java/com/ruoyi/RuoYiApplication.java

@@ -14,7 +14,7 @@
{
    public static void main(String[] args)
    {
//        System.setProperty("spring.devtools.restart.enabled", "false");
        System.setProperty("spring.devtools.restart.enabled", "false");
        SpringApplication.run(RuoYiApplication.class, args);
        System.out.println("(♥◠‿◠)ﾉﾞ  è‹¥ä¾å¯åŠ¨æˆåŠŸ   áƒš(´ڡ`ლ)ﾞ");
    }

 ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java

@@ -144,9 +144,9 @@
    public void importGenTable(List<GenTable> tableList)
    {
        String operName = SecurityUtils.getUsername();
        for (GenTable table : tableList)
        try
        {
            try
            for (GenTable table : tableList)
            {
                String tableName = table.getTableName();
                GenUtils.initTable(table, operName);
@@ -162,10 +162,10 @@
                    }
                }
            }
            catch (Exception e)
            {
                log.error("表名 " + table.getTableName() + " å¯¼å…¥å¤±è´¥ï¼š", e);
            }
        }
        catch (Exception e)
        {
            throw new CustomException("导入失败：" + e.getMessage());
        }
    }


 ruoyi/src/main/resources/META-INF/spring-devtools.properties

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1 @@
restart.include.json=/com.alibaba.fastjson.*.jar