expert_management.git

RuoYi

2021-11-30 a2d3f987c04a2e5176a8686f1032f7f5bfee4af2

优化代码

已修改8个文件

	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java	15 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-ui/src/plugins/modal.js	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-ui/src/views/monitor/online/index.vue	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-ui/src/views/system/user/index.vue	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-ui/src/views/tool/gen/basicInfoForm.vue	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-ui/src/views/tool/gen/editTable.vue	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-ui/src/views/tool/gen/genInfoForm.vue	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java

@@ -72,7 +72,7 @@
                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))

        {

            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");

        }       
        }

        user.setUserId(sysUser.getUserId());

        user.setPassword(null);

        if (userService.updateUserProfile(user) > 0)


 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java

@@ -179,7 +179,7 @@
                router.setPath("/inner");
                List<RouterVo> childrenList = new ArrayList<RouterVo>();
                RouterVo children = new RouterVo();
                String routerPath = StringUtils.replaceEach(menu.getPath(), new String[] { Constants.HTTP, Constants.HTTPS }, new String[] { "", "" });
                String routerPath = innerLinkReplaceEach(menu.getPath());
                children.setPath(routerPath);
                children.setComponent(UserConstants.INNER_LINK);
                children.setName(StringUtils.capitalize(routerPath));
@@ -358,7 +358,7 @@
        // 内链打开外网方式
        if (menu.getParentId().intValue() != 0 && isInnerLink(menu))
        {
            routerPath = StringUtils.replaceEach(routerPath, new String[] { Constants.HTTP, Constants.HTTPS }, new String[] { "", "" });
            routerPath = innerLinkReplaceEach(routerPath);
        }
        // 非外链并且是一级目录（类型为目录）
        if (0 == menu.getParentId().intValue() && UserConstants.TYPE_DIR.equals(menu.getMenuType())
@@ -500,4 +500,15 @@
    {
        return getChildList(list, t).size() > 0 ? true : false;
    }

    /**
     * 内链域名特殊字符替换
     * 
     * @return
     */
    public String innerLinkReplaceEach(String path)
    {
        return StringUtils.replaceEach(path, new String[] { Constants.HTTP, Constants.HTTPS },
                new String[] { "", "" });
    }
}

 ruoyi-ui/src/plugins/modal.js

@@ -59,6 +59,14 @@
      type: "warning",

    })

  },

  // 提交内容

  prompt(content) {

    return MessageBox.prompt(content, "系统提示", {

      confirmButtonText: '确定',

      cancelButtonText: '取消',

      type: "warning",

    })

  },

  // 打开遮罩层

  loading(content) {

    loadingInstance = Loading.service({


 ruoyi-ui/src/views/monitor/online/index.vue

@@ -111,7 +111,7 @@
    },

    /** 强退按钮操作 */

    handleForceLogout(row) {

      this.$modal.confirm('是否确认强退名称为"' + row.userName + '"的数据项？').then(function() {

      this.$modal.confirm('是否确认强退名称为"' + row.userName + '"的用户？').then(function() {

        return forceLogout(row.tokenId);

      }).then(() => {

        this.getList();


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

@@ -596,7 +596,7 @@
        cancelButtonText: "取消",

        closeOnClickModal: false,

        inputPattern: /^.{5,20}$/,

        inputErrorMessage: "用户密码长度必须介于 5 和 20 之间",

        inputErrorMessage: "用户密码长度必须介于 5 和 20 之间"

      }).then(({ value }) => {

          resetUserPwd(row.userId, value).then(response => {

            this.$modal.msgSuccess("修改成功，新密码是：" + value);


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

@@ -11,7 +11,6 @@
          <el-input placeholder="请输入" v-model="info.tableComment" />

        </el-form-item>

      </el-col>



      <el-col :span="12">

        <el-form-item label="实体类名称" prop="className">

          <el-input placeholder="请输入" v-model="info.className" />

@@ -30,9 +29,9 @@
    </el-row>

  </el-form>

</template>



<script>

export default {

  name: "BasicInfoForm",

  props: {

    info: {

      type: Object,


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

@@ -124,6 +124,7 @@
    </el-form>
  </el-card>
</template>

<script>
import { getGenTable, updateGenTable } from "@/api/tool/gen";
import { optionselect as getDictOptionselect } from "@/api/system/dict/type";

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

@@ -11,7 +11,6 @@
          </el-select>

        </el-form-item>

      </el-col>



      <el-col :span="12">

        <el-form-item prop="packageName">

          <span slot="label">

@@ -213,12 +212,12 @@
    </el-row>

  </el-form>

</template>



<script>

import Treeselect from "@riophae/vue-treeselect";

import "@riophae/vue-treeselect/dist/vue-treeselect.css";



export default {

  name: "BasicInfoForm",

  components: { Treeselect },

  props: {

    info: {

			@@ -72,7 +72,7 @@
			&& UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
			{
			return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
			}
			}
			user.setUserId(sysUser.getUserId());
			user.setPassword(null);
			if (userService.updateUserProfile(user) > 0)

			@@ -179,7 +179,7 @@
			router.setPath("/inner");
			List<RouterVo> childrenList = new ArrayList<RouterVo>();
			RouterVo children = new RouterVo();
			String routerPath = StringUtils.replaceEach(menu.getPath(), new String[] { Constants.HTTP, Constants.HTTPS }, new String[] { "", "" });
			String routerPath = innerLinkReplaceEach(menu.getPath());
			children.setPath(routerPath);
			children.setComponent(UserConstants.INNER_LINK);
			children.setName(StringUtils.capitalize(routerPath));
			@@ -358,7 +358,7 @@
			// 内链打开外网方式
			if (menu.getParentId().intValue() != 0 && isInnerLink(menu))
			{
			routerPath = StringUtils.replaceEach(routerPath, new String[] { Constants.HTTP, Constants.HTTPS }, new String[] { "", "" });
			routerPath = innerLinkReplaceEach(routerPath);
			}
			// 非外链并且是一级目录（类型为目录）
			if (0 == menu.getParentId().intValue() && UserConstants.TYPE_DIR.equals(menu.getMenuType())
			@@ -500,4 +500,15 @@
			{
			return getChildList(list, t).size() > 0 ? true : false;
			}

			/**
			* 内链域名特殊字符替换
			*
			* @return
			*/
			public String innerLinkReplaceEach(String path)
			{
			return StringUtils.replaceEach(path, new String[] { Constants.HTTP, Constants.HTTPS },
			new String[] { "", "" });
			}
			}

			@@ -59,6 +59,14 @@
			type: "warning",
			})
			},
			// 提交内容
			prompt(content) {
			return MessageBox.prompt(content, "系统提示", {
			confirmButtonText: '确定',
			cancelButtonText: '取消',
			type: "warning",
			})
			},
			// 打开遮罩层
			loading(content) {
			loadingInstance = Loading.service({

			@@ -111,7 +111,7 @@
			},
			/** 强退按钮操作 */
			handleForceLogout(row) {
			this.$modal.confirm('是否确认强退名称为"' + row.userName + '"的数据项？').then(function() {
			this.$modal.confirm('是否确认强退名称为"' + row.userName + '"的用户？').then(function() {
			return forceLogout(row.tokenId);
			}).then(() => {
			this.getList();

			@@ -596,7 +596,7 @@
			cancelButtonText: "取消",
			closeOnClickModal: false,
			inputPattern: /^.{5,20}$/,
			inputErrorMessage: "用户密码长度必须介于 5 和 20 之间",
			inputErrorMessage: "用户密码长度必须介于 5 和 20 之间"
			}).then(({ value }) => {
			resetUserPwd(row.userId, value).then(response => {
			this.$modal.msgSuccess("修改成功，新密码是：" + value);

			@@ -11,7 +11,6 @@
			<el-input placeholder="请输入" v-model="info.tableComment" />
			</el-form-item>
			</el-col>

			<el-col :span="12">
			<el-form-item label="实体类名称" prop="className">
			<el-input placeholder="请输入" v-model="info.className" />
			@@ -30,9 +29,9 @@
			</el-row>
			</el-form>
			</template>

			<script>
			export default {
			name: "BasicInfoForm",
			props: {
			info: {
			type: Object,

			@@ -124,6 +124,7 @@
			</el-form>
			</el-card>
			</template>

			<script>
			import { getGenTable, updateGenTable } from "@/api/tool/gen";
			import { optionselect as getDictOptionselect } from "@/api/system/dict/type";

			@@ -11,7 +11,6 @@
			</el-select>
			</el-form-item>
			</el-col>

			<el-col :span="12">
			<el-form-item prop="packageName">
			<span slot="label">
			@@ -213,12 +212,12 @@
			</el-row>
			</el-form>
			</template>

			<script>
			import Treeselect from "@riophae/vue-treeselect";
			import "@riophae/vue-treeselect/dist/vue-treeselect.css";

			export default {
			name: "BasicInfoForm",
			components: { Treeselect },
			props: {
			info: {