一些调整

dgtis-api/pom.xml

@@ -3,7 +3,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>com.dgtis</groupId>
-        <artifactId>dgtis</artifactId>
+        <artifactId>dgtis-cloud</artifactId>
         <version>2.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>

dgtis-auth/pom.xml

@@ -3,7 +3,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>com.dgtis</groupId>
-        <artifactId>dgtis</artifactId>
+        <artifactId>dgtis-cloud</artifactId>
         <version>2.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>

dgtis-auth/src/main/resources/bootstrap.yml

@@ -1,5 +1,5 @@
 dgtis:
-  project-name: ShangHaiLife-ECIF
+  project-name: dgtis-cloud
   common-server-addr: 10.32.2.234
 # Tomcat
 server: 

dgtis-common/pom.xml

@@ -3,7 +3,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>com.dgtis</groupId>
-        <artifactId>dgtis</artifactId>
+        <artifactId>dgtis-cloud</artifactId>
         <version>2.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>

dgtis-gateway/pom.xml

@@ -3,11 +3,10 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>com.dgtis</groupId>
-        <artifactId>dgtis</artifactId>
+        <artifactId>dgtis-cloud</artifactId>
         <version>2.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-
     <artifactId>dgtis-gateway</artifactId>
 
     <description>

dgtis-gateway/src/main/resources/bootstrap.yml

@@ -1,5 +1,5 @@
 dgtis:
-  project-name: ShangHaiLife-ECIF
+  project-name: dgtis-cloud
   common-server-addr: 10.32.2.234
 # Tomcat
 server:

dgtis-modules/dgtis-modules-gen/src/main/resources/bootstrap.yml

@@ -1,5 +1,5 @@
 dgtis:
-  project-name: ShangHaiLife-ECIF
+  project-name: dgtis-cloud
   common-server-addr: 10.32.2.234
 # Tomcat
 server:

dgtis-modules/dgtis-modules-job/src/main/resources/bootstrap.yml

@@ -1,5 +1,5 @@
 dgtis:
-  project-name: ShangHaiLife-ECIF
+  project-name: dgtis-cloud
   common-server-addr: 10.32.2.234
 # Tomcat
 server:

dgtis-modules/dgtis-modules-system/src/main/resources/bootstrap.yml

@@ -1,5 +1,5 @@
 dgtis:
-  project-name: ShangHaiLife-ECIF
+  project-name: dgtis-cloud
   common-server-addr: 10.32.2.234
 # Tomcat
 server:

dgtis-modules/pom.xml

@@ -3,7 +3,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>com.dgtis</groupId>
-        <artifactId>dgtis</artifactId>
+        <artifactId>dgtis-cloud</artifactId>
         <version>2.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>

dgtis-ui/.env.development

@@ -1,7 +1,7 @@
 # 开发环境配置
 ENV = 'development'
 
-# 通誉管理系统/开发环境
+# 若依管理系统/开发环境
 VUE_APP_BASE_API = '/dev-api'
 
 # 路由懒加载

dgtis-ui/.env.production

@@ -1,5 +1,5 @@
 # 生产环境配置
 ENV = 'production'
 
-# 通誉管理系统/生产环境
+# 若依管理系统/生产环境
 VUE_APP_BASE_API = '/prod-api'

dgtis-ui/.env.staging

@@ -3,5 +3,5 @@ NODE_ENV = production
 # 测试环境配置
 ENV = 'staging'
 
-# 通誉管理系统/测试环境
+# 若依管理系统/测试环境
 VUE_APP_BASE_API = '/stage-api'

dgtis-ui/package.json

@@ -1,8 +1,8 @@
 {
-  "name": "dgtis",
-  "version": "2.1.0",
-  "description": "管理系统",
-  "author": "DGT",
+  "name": "ruoyi",
+  "version": "2.2.0",
+  "description": "若依管理系统",
+  "author": "若依",
   "license": "MIT",
   "scripts": {
     "dev": "vue-cli-service serve",

dgtis-ui/src/api/system/user.js

@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-import { praseStrEmpty } from "@/utils/dgtis";
+import { praseStrEmpty } from "@/utils/ruoyi";
 
 // 查询用户列表
 export function listUser(query) {

dgtis-ui/src/assets/styles/dgtis.scss

@@ -1,6 +1,6 @@
  /**
  * 通用css样式布局处理
- * Copyright (c) 2019 dgtis
+ * Copyright (c) 2019 ruoyi
  */
 
  /** 基础通用 **/
@@ -237,4 +237,4 @@
 .top-right-btn {
 	position: relative;
 	float: right;
-}
+}

dgtis-ui/src/directive/permission/hasPermi.js

@@ -1,8 +1,8 @@
  /**
  * 操作权限处理
- * Copyright (c) 2019 dgtis
+ * Copyright (c) 2019 ruoyi
  */
-
+ 
 import store from '@/store'
 
 export default {

dgtis-ui/src/directive/permission/hasRole.js

@@ -1,8 +1,8 @@
  /**
  * 角色权限处理
- * Copyright (c) 2019 dgtis
+ * Copyright (c) 2019 ruoyi
  */
-
+ 
 import store from '@/store'
 
 export default {

dgtis-ui/src/layout/components/Sidebar/Logo.vue

@@ -26,7 +26,7 @@ export default {
   },
   data() {
     return {
-      title: '通誉管理系统',
+      title: '若依管理系统',
       logo: logoImg
     }
   }

dgtis-ui/src/layout/components/TagsView/index.vue

@@ -160,7 +160,7 @@ export default {
     },
     closeAllTags(view) {
       this.$store.dispatch('tagsView/delAllViews').then(({ visitedViews }) => {
-        if (this.affixTags.some(tag => tag.path === view.path)) {
+        if (this.affixTags.some(tag => tag.path === this.$route.path)) {
           return
         }
         this.toLastView(visitedViews, view)

dgtis-ui/src/main.js

@@ -8,7 +8,7 @@ import Element from 'element-ui'
 import './assets/styles/element-variables.scss'
 
 import '@/assets/styles/index.scss' // global css
-import '@/assets/styles/dgtis.scss' // dgtis css
+import '@/assets/styles/ruoyi.scss' // ruoyi css
 import App from './App'
 import store from './store'
 import router from './router'
@@ -19,7 +19,7 @@ import './assets/icons' // icon
 import './permission' // permission control
 import { getDicts } from "@/api/system/dict/data";
 import { getConfigKey } from "@/api/system/config";
-import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/dgtis";
+import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/ruoyi";
 import Pagination from "@/components/Pagination";
 //自定义表格工具扩展
 import RightToolbar from "@/components/RightToolbar"

dgtis-ui/src/settings.js

@@ -1,5 +1,5 @@
 module.exports = {
-  title: '通誉管理系统',
+  title: '若依管理系统',
 
   /**
    * 是否系统布局配置

dgtis-ui/src/utils/generator/config.js

@@ -406,6 +406,21 @@ export const layoutComponents = [
     layoutTree: true,
     children: [],
     document: 'https://element.eleme.cn/#/zh-CN/component/layout'
+  },
+  {
+    layout: 'colFormItem',
+    label: '按钮',
+    changeTag: true,
+    labelWidth: null,
+    tag: 'el-button',
+    tagIcon: 'button',
+    span: 24,
+    default: '主要按钮',
+    type: 'primary',
+    icon: 'el-icon-search',
+    size: 'medium',
+    disabled: false,
+    document: 'https://element.eleme.cn/#/zh-CN/component/button'
   }
 ]
 

dgtis-ui/src/utils/generator/html.js

@@ -107,6 +107,18 @@ const layouts = {
 }
 
 const tags = {
+  'el-button': el => {
+    const {
+      tag, disabled
+    } = attrBuilder(el)
+    const type = el.type ? `type="${el.type}"` : ''
+    const icon = el.icon ? `icon="${el.icon}"` : ''
+    const size = el.size ? `size="${el.size}"` : ''
+    let child = buildElButtonChild(el)
+
+    if (child) child = `\n${child}\n` // 换行
+    return `<${el.tag} ${type} ${icon} ${size} ${disabled}>${child}</${el.tag}>`
+  },
   'el-input': el => {
     const {
       disabled, vModel, clearable, placeholder, width
@@ -272,6 +284,15 @@ function attrBuilder(el) {
   }
 }
 
+// el-buttin 子级
+function buildElButtonChild(conf) {
+  const children = []
+  if (conf.default) {
+    children.push(conf.default)
+  }
+  return children.join('\n')
+}
+
 // el-input innerHTML
 function buildElInputChild(conf) {
   const children = []

dgtis-ui/src/utils/generator/render.js

@@ -26,6 +26,11 @@ function vModel(self, dataObject, defaultValue) {
 }
 
 const componentChild = {
+  'el-button': {
+    default(h, conf, key) {
+      return conf[key]
+    },
+  },
   'el-input': {
     prepend(h, conf, key) {
       return <template slot="prepend">{conf[key]}</template>

dgtis-ui/src/utils/index.js

@@ -1,16 +1,16 @@
-import { parseTime } from './dgtis'
+import { parseTime } from './ruoyi'
 
 /**
  * 表格时间格式化
  */
 export function formatDate(cellValue) {
   if (cellValue == null || cellValue == "") return "";
-  var date = new Date(cellValue)
+  var date = new Date(cellValue) 
   var year = date.getFullYear()
   var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1
-  var day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate()
-  var hours = date.getHours() < 10 ? '0' + date.getHours() : date.getHours()
-  var minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
+  var day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate() 
+  var hours = date.getHours() < 10 ? '0' + date.getHours() : date.getHours() 
+  var minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes() 
   var seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
   return year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds
 }
@@ -330,7 +330,7 @@ export function makeMap(str, expectsLowerCase) {
     ? val => map[val.toLowerCase()]
     : val => map[val]
 }
-
+ 
 export const exportDefault = 'export default '
 
 export const beautifierConf = {
@@ -387,4 +387,4 @@ export function camelCase(str) {
 export function isNumberStr(str) {
   return /^[+-]?(0|([1-9]\d*))(\.\d+)?$/g.test(str)
 }
-
+ 

dgtis-ui/src/utils/request.js

@@ -3,7 +3,7 @@ import { Notification, MessageBox, Message } from 'element-ui'
 import store from '@/store'
 import { getToken } from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
-import { tansParams } from "@/utils/dgtis";
+import { tansParams } from "@/utils/ruoyi";
 
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 // 创建axios实例

dgtis-ui/src/utils/dgtis.js

@@ -1,6 +1,6 @@
 /**
  * 通用js方法封装处理
- * Copyright (c) 2019 dgtis
+ * Copyright (c) 2019 ruoyi
  */
 
 const baseURL = process.env.VUE_APP_BASE_API
@@ -59,8 +59,8 @@ export function addDateRange(params, dateRange) {
 	search.beginTime = "";
 	search.endTime = "";
 	if (null != dateRange && '' != dateRange) {
-		search.beginTime = this.dateRange[0];
-		search.endTime = this.dateRange[1];
+		search.beginTime = dateRange[0];
+		search.endTime = dateRange[1];
 	}
 	return search;
 }

dgtis-ui/src/views/login.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">通誉后台管理系统</h3>
+      <h3 class="title">若依后台管理系统</h3>
       <el-form-item prop="username">
         <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
@@ -48,7 +48,7 @@
     </el-form>
     <!--  底部  -->
     <div class="el-login-footer">
-      <span>Copyright © 2018-2019 dgtis All Rights Reserved.</span>
+      <span>Copyright © 2018-2019 ruoyi.vip All Rights Reserved.</span>
     </div>
   </div>
 </template>

dgtis-ui/src/views/monitor/job/index.vue

@@ -111,7 +111,7 @@
             type="text"
             icon="el-icon-caret-right"
             @click="handleRun(scope.row)"
-            v-hasPermi="['monitor:job:edit']"
+            v-hasPermi="['monitor:job:changeStatus']"
           >执行一次</el-button>
           <el-button
             size="mini"
@@ -160,7 +160,7 @@
                 <el-tooltip placement="top">
                   <div slot="content">
                     Bean调用示例：ryTask.ryParams('ry')
-                    <br />Class类调用示例：com.dgtis.quartz.task.RyTask.ryParams('ry')
+                    <br />Class类调用示例：com.ruoyi.quartz.task.RyTask.ryParams('ry')
                     <br />参数说明：支持字符串，布尔类型，长整型，浮点型，整型
                   </div>
                   <i class="el-icon-question"></i>
@@ -402,7 +402,7 @@ export default {
           return runJob(row.jobId, row.jobGroup);
         }).then(() => {
           this.msgSuccess("执行成功");
-        }).catch(function() {});
+        })
     },
     /** 任务详细信息 */
     handleView(row) {
@@ -437,19 +437,15 @@ export default {
         if (valid) {
           if (this.form.jobId != undefined) {
             updateJob(this.form).then(response => {
-              if (response.code === 200) {
-                this.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
-              }
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
             });
           } else {
             addJob(this.form).then(response => {
-              if (response.code === 200) {
-                this.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
-              }
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
             });
           }
         }
@@ -467,7 +463,7 @@ export default {
         }).then(() => {
           this.getList();
           this.msgSuccess("删除成功");
-        }).catch(function() {});
+        })
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -477,4 +473,4 @@ export default {
     }
   }
 };
-</script>
+</script>

dgtis-ui/src/views/monitor/job/log.vue

@@ -263,7 +263,7 @@ export default {
         }).then(() => {
           this.getList();
           this.msgSuccess("删除成功");
-        }).catch(function() {});
+        })
     },
     /** 清空按钮操作 */
     handleClean() {
@@ -276,7 +276,7 @@ export default {
         }).then(() => {
           this.getList();
           this.msgSuccess("清空成功");
-        }).catch(function() {});
+        })
     },
     /** 导出按钮操作 */
     handleExport() {

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

@@ -116,7 +116,7 @@ export default {
         }).then(() => {
           this.getList();
           this.msgSuccess("强退成功");
-        }).catch(function() {});
+        })
     }
   }
 };

dgtis-ui/src/views/system/config/index.vue

@@ -304,19 +304,15 @@ export default {
         if (valid) {
           if (this.form.configId != undefined) {
             updateConfig(this.form).then(response => {
-              if (response.code === 200) {
-                this.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
-              }
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
             });
           } else {
             addConfig(this.form).then(response => {
-              if (response.code === 200) {
-                this.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
-              }
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
             });
           }
         }
@@ -334,7 +330,7 @@ export default {
         }).then(() => {
           this.getList();
           this.msgSuccess("删除成功");
-        }).catch(function() {});
+        })
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -345,11 +341,7 @@ export default {
     /** 清理缓存按钮操作 */
     handleClearCache() {
       clearCache().then(response => {
-        if (response.code === 200) {
-          this.msgSuccess("清理成功");
-        } else {
-          this.msgError(response.msg);
-        }
+        this.msgSuccess("清理成功");
       });
     }
   }

dgtis-ui/src/views/system/dept/index.vue

@@ -284,19 +284,15 @@ export default {
         if (valid) {
           if (this.form.deptId != undefined) {
             updateDept(this.form).then(response => {
-              if (response.code === 200) {
-                this.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
-              }
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
             });
           } else {
             addDept(this.form).then(response => {
-              if (response.code === 200) {
-                this.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
-              }
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
             });
           }
         }
@@ -313,7 +309,7 @@ export default {
         }).then(() => {
           this.getList();
           this.msgSuccess("删除成功");
-        }).catch(function() {});
+        })
     }
   }
 };

dgtis-ui/src/views/system/dict/data.vue

@@ -304,19 +304,15 @@ export default {
         if (valid) {
           if (this.form.dictCode != undefined) {
             updateData(this.form).then(response => {
-              if (response.code === 200) {
-                this.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
-              }
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
             });
           } else {
             addData(this.form).then(response => {
-              if (response.code === 200) {
-                this.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
-              }
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
             });
           }
         }
@@ -334,7 +330,7 @@ export default {
         }).then(() => {
           this.getList();
           this.msgSuccess("删除成功");
-        }).catch(function() {});
+        })
     },
     /** 导出按钮操作 */
     handleExport() {

dgtis-ui/src/views/system/dict/index.vue

@@ -308,19 +308,15 @@ export default {
         if (valid) {
           if (this.form.dictId != undefined) {
             updateType(this.form).then(response => {
-              if (response.code === 200) {
-                this.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
-              }
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
             });
           } else {
             addType(this.form).then(response => {
-              if (response.code === 200) {
-                this.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
-              }
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
             });
           }
         }
@@ -338,7 +334,7 @@ export default {
         }).then(() => {
           this.getList();
           this.msgSuccess("删除成功");
-        }).catch(function() {});
+        })
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -349,11 +345,7 @@ export default {
     /** 清理缓存按钮操作 */
     handleClearCache() {
       clearCache().then(response => {
-        if (response.code === 200) {
-          this.msgSuccess("清理成功");
-        } else {
-          this.msgError(response.msg);
-        }
+        this.msgSuccess("清理成功");
       });
     }
   }

dgtis-ui/src/views/system/logininfor/index.vue

@@ -193,7 +193,7 @@ export default {
         }).then(() => {
           this.getList();
           this.msgSuccess("删除成功");
-        }).catch(function() {});
+        })
     },
     /** 清空按钮操作 */
     handleClean() {
@@ -206,7 +206,7 @@ export default {
         }).then(() => {
           this.getList();
           this.msgSuccess("清空成功");
-        }).catch(function() {});
+        })
     },
     /** 导出按钮操作 */
     handleExport() {

dgtis-ui/src/views/system/menu/index.vue

@@ -367,19 +367,15 @@ export default {
         if (valid) {
           if (this.form.menuId != undefined) {
             updateMenu(this.form).then(response => {
-              if (response.code === 200) {
-                this.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
-              }
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
             });
           } else {
             addMenu(this.form).then(response => {
-              if (response.code === 200) {
-                this.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
-              }
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
             });
           }
         }
@@ -396,7 +392,7 @@ export default {
         }).then(() => {
           this.getList();
           this.msgSuccess("删除成功");
-        }).catch(function() {});
+        })
     }
   }
 };

dgtis-ui/src/views/system/notice/index.vue

@@ -307,19 +307,15 @@ export default {
         if (valid) {
           if (this.form.noticeId != undefined) {
             updateNotice(this.form).then(response => {
-              if (response.code === 200) {
-                this.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
-              }
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
             });
           } else {
             addNotice(this.form).then(response => {
-              if (response.code === 200) {
-                this.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
-              }
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
             });
           }
         }
@@ -337,7 +333,7 @@ export default {
         }).then(() => {
           this.getList();
           this.msgSuccess("删除成功");
-        }).catch(function() {});
+        })
     }
   }
 };

dgtis-ui/src/views/system/operlog/index.vue

@@ -283,7 +283,7 @@ export default {
         }).then(() => {
           this.getList();
           this.msgSuccess("删除成功");
-        }).catch(function() {});
+        })
     },
     /** 清空按钮操作 */
     handleClean() {
@@ -296,7 +296,7 @@ export default {
         }).then(() => {
           this.getList();
           this.msgSuccess("清空成功");
-        }).catch(function() {});
+        })
     },
     /** 导出按钮操作 */
     handleExport() {

dgtis-ui/src/views/system/post/index.vue

@@ -276,19 +276,15 @@ export default {
         if (valid) {
           if (this.form.postId != undefined) {
             updatePost(this.form).then(response => {
-              if (response.code === 200) {
-                this.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
-              }
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
             });
           } else {
             addPost(this.form).then(response => {
-              if (response.code === 200) {
-                this.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
-              }
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
             });
           }
         }
@@ -306,7 +302,7 @@ export default {
         }).then(() => {
           this.getList();
           this.msgSuccess("删除成功");
-        }).catch(function() {});
+        })
     },
     /** 导出按钮操作 */
     handleExport() {

dgtis-ui/src/views/system/role/index.vue

@@ -368,18 +368,18 @@ export default {
     // 所有菜单节点数据
     getMenuAllCheckedKeys() {
       // 目前被选中的菜单节点
-      let checkedKeys = this.$refs.menu.getHalfCheckedKeys();
+      let checkedKeys = this.$refs.menu.getCheckedKeys();
       // 半选中的菜单节点
-      let halfCheckedKeys = this.$refs.menu.getCheckedKeys();
+      let halfCheckedKeys = this.$refs.menu.getHalfCheckedKeys();
       checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
       return checkedKeys;
     },
     // 所有部门节点数据
     getDeptAllCheckedKeys() {
       // 目前被选中的部门节点
-      let checkedKeys = this.$refs.dept.getHalfCheckedKeys();
+      let checkedKeys = this.$refs.dept.getCheckedKeys();
       // 半选中的部门节点
-      let halfCheckedKeys = this.$refs.dept.getCheckedKeys();
+      let halfCheckedKeys = this.$refs.dept.getHalfCheckedKeys();
       checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
       return checkedKeys;
     },
@@ -537,20 +537,16 @@ export default {
           if (this.form.roleId != undefined) {
             this.form.menuIds = this.getMenuAllCheckedKeys();
             updateRole(this.form).then(response => {
-              if (response.code === 200) {
-                this.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
-              }
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
             });
           } else {
             this.form.menuIds = this.getMenuAllCheckedKeys();
             addRole(this.form).then(response => {
-              if (response.code === 200) {
-                this.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
-              }
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
             });
           }
         }
@@ -561,11 +557,9 @@ export default {
       if (this.form.roleId != undefined) {
         this.form.deptIds = this.getDeptAllCheckedKeys();
         dataScope(this.form).then(response => {
-          if (response.code === 200) {
-            this.msgSuccess("修改成功");
-            this.openDataScope = false;
-            this.getList();
-          }
+          this.msgSuccess("修改成功");
+          this.openDataScope = false;
+          this.getList();
         });
       }
     },
@@ -581,7 +575,7 @@ export default {
         }).then(() => {
           this.getList();
           this.msgSuccess("删除成功");
-        }).catch(function() {});
+        })
     },
     /** 导出按钮操作 */
     handleExport() {

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

@@ -582,9 +582,7 @@ export default {
         cancelButtonText: "取消"
       }).then(({ value }) => {
           resetUserPwd(row.userId, value).then(response => {
-            if (response.code === 200) {
-              this.msgSuccess("修改成功，新密码是：" + value);
-            }
+            this.msgSuccess("修改成功，新密码是：" + value);
           });
         }).catch(() => {});
     },
@@ -594,19 +592,15 @@ export default {
         if (valid) {
           if (this.form.userId != undefined) {
             updateUser(this.form).then(response => {
-              if (response.code === 200) {
-                this.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
-              }
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
             });
           } else {
             addUser(this.form).then(response => {
-              if (response.code === 200) {
-                this.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
-              }
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
             });
           }
         }
@@ -624,7 +618,7 @@ export default {
         }).then(() => {
           this.getList();
           this.msgSuccess("删除成功");
-        }).catch(function() {});
+        })
     },
     /** 导出按钮操作 */
     handleExport() {

dgtis-ui/src/views/system/user/profile/resetPwd.vue

@@ -57,9 +57,7 @@ export default {
         if (valid) {
           updateUserPwd(this.user.oldPassword, this.user.newPassword).then(
             response => {
-              if (response.code === 200) {
-                this.msgSuccess("修改成功");
-              }
+              this.msgSuccess("修改成功");
             }
           );
         }

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

@@ -125,12 +125,10 @@ export default {
         let formData = new FormData();
         formData.append("avatarfile", data);
         uploadAvatar(formData).then(response => {
-          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.open = false;
+          this.options.img = process.env.VUE_APP_BASE_API + response.imgUrl;
+          store.commit('SET_AVATAR', this.options.img);
+          this.msgSuccess("修改成功");
           this.visible = false;
         });
       });

dgtis-ui/src/views/system/user/profile/userInfo.vue

@@ -62,9 +62,7 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           updateUserProfile(this.user).then(response => {
-            if (response.code === 200) {
-              this.msgSuccess("修改成功");
-            }
+            this.msgSuccess("修改成功");
           });
         }
       });

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

@@ -15,7 +15,7 @@
         <el-form-item prop="packageName">
           <span slot="label">
             生成包路径
-            <el-tooltip content="生成在哪个java包下，例如 com.dgtis.system" placement="top">
+            <el-tooltip content="生成在哪个java包下，例如 com.ruoyi.system" placement="top">
               <i class="el-icon-question"></i>
             </el-tooltip>
           </span>

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

@@ -256,7 +256,7 @@ export default {
           this.msgSuccess("成功生成到自定义路径：" + row.genPath);
         });
       } else {
-          downLoadZip("/code/gen/batchGenCode?tables=" + tableNames, "dgtis");
+          downLoadZip("/code/gen/batchGenCode?tables=" + tableNames, "ruoyi");
       }
     },
     /** 同步数据库操作 */
@@ -270,7 +270,7 @@ export default {
           return synchDb(tableName);
       }).then(() => {
           this.msgSuccess("同步成功");
-      }).catch(function() {});
+      })
     },
     /** 打开导入表弹窗 */
     openImportTable() {
@@ -313,8 +313,8 @@ export default {
       }).then(() => {
           this.getList();
           this.msgSuccess("删除成功");
-      }).catch(function() {});
+      })
     }
   }
 };
-</script>
+</script>

dgtis-ui/vue.config.js

@@ -6,7 +6,7 @@ function resolve(dir) {
   return path.join(__dirname, dir)
 }
 
-const name = defaultSettings.title || '通誉管理系统' // 标题
+const name = defaultSettings.title || '若依管理系统' // 标题
 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
 
@@ -16,7 +16,7 @@ const port = process.env.port || process.env.npm_config_port || 80 // 端口
 module.exports = {
   // 部署生产环境和开发环境下的URL。
   // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
-  // 例如 https://www.dgtis.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.dgtis.vip/admin/，则设置 baseUrl 为 /admin/。
+  // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
   publicPath: process.env.NODE_ENV === "production" ? "/" : "/",
   // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
   outputDir: 'dist',

dgtis-visual/dgtis-visual-monitor/src/main/resources/bootstrap.yml

@@ -1,5 +1,5 @@
 dgtis:
-  project-name: ShangHaiLife-ECIF
+  project-name: dgtis-cloud
   common-server-addr: 10.32.2.234
 # Tomcat
 server:

dgtis-visual/pom.xml

@@ -3,7 +3,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>com.dgtis</groupId>
-        <artifactId>dgtis</artifactId>
+        <artifactId>dgtis-cloud</artifactId>
         <version>2.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>

pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.dgtis</groupId>
-    <artifactId>dgtis-cloudd</artifactId>
+    <artifactId>dgtis-cloud</artifactId>
     <version>2.2.0</version>
 
     <name>dgtis-cloud</name>
@@ -226,10 +226,10 @@
                 <version>1.0.0</version>
                 <configuration>
                     <!--指定生成的镜像名-->
-                    <imageName>${project.artifactId}</imageName>
+                    <imageName>${project.name}-${project.artifactId}</imageName>
                     <!--指定标签-->
                     <imageTags>
-                        <imageTag>latest</imageTag>
+                        <imageTag>${project.name}</imageTag>
                     </imageTags>
                     <!-- 指定 Dockerfile 路径-->
                     <dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory>
@@ -253,6 +253,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.3.2</version>
                 <configuration>
                     <source>${java.version}</source>
                     <target>${java.version}</target>