Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/etl/assets/dashboard/OverallAssetStructure.vue
#	src/views/etl/assets/dashboard/OverallAssets.vue
#	src/views/etl/assets/dashboard/OverallSpecificAssets.vue
#	src/views/etl/assets/index.vue

src/api/etl/source.js

@@ -0,0 +1,93 @@
+import request from '@/utils/request'
+
+// 查询【请填写功能名称】列表
+export function listSource(query) {
+  return request({
+    url: '/etl/source/list',
+    method: 'get',
+    params: query
+  })
+}
+
+export function dataAssetList(data) {
+  return request({
+    url: '/etl/source/DataAssetList',
+    method: 'post',
+    data
+  })
+}
+
+export function assetModelList(data) {
+  return request({
+    url: '/etl/source/AssetModelList',
+    method: 'post',
+    data
+  })
+}
+
+export function assetsList(data) {
+  return request({
+    url: '/etl/source/AssetsList',
+    method: 'post',
+    data
+  })
+}
+
+export function synchronousData(data) {
+  return request({
+    url: '/etl/source/SynchronousData',
+    method: 'post',
+    data
+  })
+}
+
+export function structureList(data) {
+  return request({
+    url: '/etl/source/StructureList',
+    method: 'post',
+    data
+  })
+}
+
+// 查询【请填写功能名称】详细
+export function getSource(id) {
+  return request({
+    url: '/etl/source/' + id,
+    method: 'get'
+  })
+}
+
+// 新增【请填写功能名称】
+export function addSource(data) {
+  return request({
+    url: '/etl/source',
+    method: 'post',
+    data: data
+  })
+}
+
+// 测试连接
+export function testConnection(data) {
+  return request({
+    url: '/etl/source/TestConnection',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改【请填写功能名称】
+export function updateSource(data) {
+  return request({
+    url: '/etl/source',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除【请填写功能名称】
+export function delSource(id) {
+  return request({
+    url: '/etl/source/' + id,
+    method: 'delete'
+  })
+}

src/views/etl/source/index.vue

@@ -0,0 +1,523 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="数据源名称" prop="dataSourceName" label-width="100px">
+        <el-input
+          v-model="queryParams.dataSourceName"
+          placeholder="请输入数据源名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="数据源链接地址" prop="linkAddress" label-width="120px">
+        <el-input
+          v-model="queryParams.linkAddress"
+          placeholder="请输入数据源链接地址"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:source:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['system:source:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:source:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['system:source:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="sourceList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="编号" align="center" prop="id" />
+      <el-table-column label="数据源名称" align="center" prop="dataSourceName" />
+      <el-table-column label="数据源连接地址" align="center" prop="linkAddress" />
+      <el-table-column label="数据源连接端口" align="center" prop="port" />
+      <el-table-column label="数据库名称" align="center" prop="databaseName" />
+      <el-table-column label="连接用户名" align="center" prop="username" />
+      <el-table-column label="连接密码" align="center" prop="password" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="testConnection(scope.row)"
+          >测试连接</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="synchronousData(scope.row)"
+          >同步资产</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:source:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:source:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改【请填写功能名称】对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="1150px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="140px">
+        <el-card>
+          <div slot="header" class="clearfix">
+            <span>基础配置信息</span>
+          </div>
+          <el-row>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="接入源名称" prop="dataSourceName">
+                <el-input v-model="form.dataSourceName" placeholder="请输入接入源名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="数据来源系统名称" prop="systemName">
+                <el-input v-model="form.systemName" placeholder="请输入数据来源系统名称" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="主机IP" prop="linkAddress">
+                <el-input v-model="form.linkAddress" placeholder="请输入主机地址" />
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="主机地址" prop="port">
+                <el-input v-model="form.port" placeholder="请输入主机地址" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="数据接入类型" prop="type">
+                <el-select style="width: 100%" v-model="form.type">
+                  <el-option label="MySql" value="MySql">MySql</el-option>
+                  <el-option label="Oracle" value="Oracle">Oracle</el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="数据库名称" prop="databaseName">
+                <el-input v-model="form.databaseName" placeholder="请输入数据库名称" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="连接用户名" prop="username">
+                <el-input v-model="form.username" placeholder="请输入连接用户名" />
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="连接密码" prop="password">
+                <el-input v-model="form.password" placeholder="请输入连接密码" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-card>
+              <div slot="header" class="clearfix">
+                <span>数据连接参数</span>
+              </div>
+              <el-col :sm="24">
+                <el-form-item label="数据连接参数" prop="connectionParam">
+                  <el-input v-model="form.connectionParam" placeholder="请输入内容" />
+                </el-form-item>
+              </el-col>
+              <el-row :gutter="10" style="margin: 10px 0">
+                <el-col :span="2">
+                  <el-button type="primary" @click="addParam()">新增参数</el-button>
+                </el-col>
+                <el-col :span="2">
+                  <el-button type="danger" @click="deleteParam(null)">清空参数</el-button>
+                </el-col>
+              </el-row>
+              <el-row :gutter="10">
+                <el-col :md="8" :xs="12" style="margin: 10px 0" v-for="(dataSourceParam, dataSourceParamIndex) in dataSourceParamList">
+                  <el-col :span="10">
+                    <el-input v-model="dataSourceParam.name" placeholder="请输入参数键" @keyup.native="processParam"/>
+                  </el-col>
+                  <el-col :span="1"><span style="font-size: 28px; margin: 0 3px 0 0;">:</span></el-col>
+                  <el-col :span="10">
+                    <el-input v-model="dataSourceParam.val" placeholder="请输入参数值" @keyup.native="processParam"/>
+                  </el-col>
+                  <el-col :span="3">
+                    <el-button type="danger" @click="deleteParam(dataSourceParamIndex)">删除</el-button>
+                  </el-col>
+                </el-col>
+              </el-row>
+            </el-card>
+          </el-row>
+        </el-card>
+        <el-card style="margin-top: 20px">
+          <div slot="header" class="clearfix">
+            <span>连接池配置</span>
+          </div>
+          <el-row>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="初始连接数量" prop="initNum">
+                <el-input v-model="form.initNum" placeholder="请输入初始连接数量" />
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="最大连接数量" prop="maxNum">
+                <el-input v-model="form.maxNum" placeholder="请输入最大连接数量" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="最大等待时间" prop="maxWaitTime">
+                <el-input v-model="form.maxWaitTime" placeholder="请输入最大等待时间" />
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="最大等待次数" prop="maxWaitSize">
+                <el-input v-model="form.maxWaitSize" placeholder="请输入最大等待次数" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-card>
+
+        <el-card style="margin-top: 20px">
+          <div slot="header" class="clearfix">
+            <span>其他信息</span>
+          </div>
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+          </el-form-item>
+        </el-card>
+      </el-form>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+
+
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSource, getSource, delSource, addSource, updateSource, testConnection, synchronousData } from "@/api/etl/source";
+
+export default {
+  name: "Source",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 数据源表格数据
+      sourceList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        dataSourceName: null,
+        linkAddress: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        dataSourceName: [
+          {required: true, message: "接入源名称不能为空", trigger: "blur"}
+        ],
+        systemName: [
+          {required: true, message: "数据来源系统名称不能为空", trigger: "blur"}
+        ],
+        type: [
+          {required: true, message: "数据接入类型不能为空", trigger: "blur"}
+        ],
+        host: [
+          {required: true, message: "主机地址不能为空", trigger: "blur"}
+        ],
+        port: [
+          {required: true, message: "主机地址不能为空", trigger: "blur"}
+        ],
+        databaseName: [
+          {required: true, message: "数据库名称不能为空", trigger: "blur"}
+        ],
+        connectionParam: [
+          {required: true, message: "数据连接参数不能为空", trigger: "blur"}
+        ],
+        initNum: [
+          {required: true, message: "初始连接数量不能为空", trigger: "blur"}
+        ],
+        maxNum: [
+          {required: true, message: "最大连接数量不能为空", trigger: "blur"}
+        ],
+        maxWaitTime: [
+          {required: true, message: "最大等待时间不能为空", trigger: "blur"}
+        ],
+        maxWaitSize: [
+          {required: true, message: "最大等待次数不能为空", trigger: "blur"}
+        ]
+      },
+      dataSourceParamList: [
+        {
+          name: null,
+          val: null
+        }
+      ]
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    synchronousData(data) {
+      synchronousData(data).then(res => {
+        if (res.code === 200) {
+          this.$message({
+            message: "同步成功",
+            type: "success"
+          });
+        } else {
+          this.$message({
+            message: "同步失败",
+            type: "error"
+          });
+        }
+      })
+    },
+    // 添加参数
+    addParam(){
+      this.dataSourceParamList.push({
+        name: null,
+        val: null
+      })
+    },
+    // 删除参数
+    deleteParam(index){
+      if (index != null){
+        this.dataSourceParamList.splice(index, 1);
+      }else {
+        this.dataSourceParamList = []
+      }
+      this.processParam();
+    },
+    // 处理参数
+    processParam(){
+      this.form.connectionParam = this.dataSourceParamList
+        .filter(item => item.name != null || item.val != null)
+        .map(item => {
+          return item.name + "=" + item.val;
+        }).join("&")
+      console.log(this.form.connectionParam)
+    },
+    /** 测试连接 */
+    testConnection(row) {
+      testConnection(row).then(res => {
+        if (res.code === 200) {
+          this.$message({
+            message: "连接成功",
+            type: "success"
+          });
+        } else {
+          this.$message({
+            message: "连接失败",
+            type: "error"
+          });
+        }
+      })
+    },
+    /** 查询数据源列表 */
+    getList() {
+      this.loading = true;
+      listSource(this.queryParams).then(response => {
+        this.sourceList = response.data.rows;
+        this.total = response.data.total;
+        console.log(this.sourceList)
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        dataSourceName: null,
+        type: null,
+        systemName: null,
+        username: null,
+        password: null,
+        linkAddress: null,
+        port: null,
+        databaseName: null,
+        connectionParam: null,
+        initNum: null,
+        maxNum: null,
+        maxWaitTime: null,
+        maxWaitSize: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        remark: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.dataSourceParamList = [];
+      this.title = "添加数据接入";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getSource(id).then(response => {
+        this.form = response.data;
+        console.log(this.form)
+        this.dataSourceParamList = [];
+        this.form.connectionParam.split("&").forEach(param => {
+          let paramArr = param.split("=");
+          this.dataSourceParamList.push({
+            name: paramArr[0],
+            val: paramArr[1]
+          })
+        })
+        this.open = true;
+        this.title = "修改数据接入";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateSource(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSource(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除【请填写功能名称】编号为"' + ids + '"的数据项？').then(function() {
+        return delSource(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/source/export', {
+        ...this.queryParams
+      }, `source_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/login.vue

@@ -6,7 +6,7 @@
         <el-input
           v-model="loginForm.username"
           auto-complete="off"
-          placeholder="账号"
+          placeholder="账号/邮箱"
           type="text"
         >
           <svg-icon slot="prefix" class="el-input__icon input-icon" icon-class="user"/>
@@ -80,7 +80,7 @@ export default {
       },
       loginRules: {
         username: [
-          {required: true, trigger: "blur", message: "请输入您的账号"}
+          {required: true, trigger: "blur", message: "请输入您的账号/邮箱"}
         ],
         password: [
           {required: true, trigger: "blur", message: "请输入您的密码"}

src/views/register.vue

@@ -3,7 +3,7 @@
     <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
       <h3 class="title">若依后台管理系统</h3>
       <el-form-item prop="username">
-        <el-input v-model="registerForm.username" auto-complete="off" placeholder="账号" type="text">
+        <el-input v-model="registerForm.username" auto-complete="off" placeholder="账号/邮箱" type="text">
           <svg-icon slot="prefix" class="el-input__icon input-icon" icon-class="user"/>
         </el-input>
       </el-form-item>
@@ -90,7 +90,7 @@ export default {
       },
       registerRules: {
         username: [
-          {required: true, trigger: "blur", message: "请输入您的账号"},
+          {required: true, trigger: "blur", message: "请输入您的账号/邮箱"},
           {min: 2, max: 20, message: '用户账号长度必须介于 2 和 20 之间', trigger: 'blur'}
         ],
         password: [

src/views/system/user/index.vue

@@ -371,9 +371,12 @@ import {
   resetUserPwd,
   updateUser
 } from "@/api/system/user";
+
+import {forceLogout,list} from '@/api/monitor/online';
 import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import userInfo from '@/views/system/user/profile/userInfo.vue'
 
 export default {
   name: "User",
@@ -381,6 +384,10 @@ export default {
   components: {Treeselect},
   data() {
     return {
+      queryParam: {
+        ipaddr: undefined,
+        userName: undefined
+      },
       // 遮罩层
       loading: true,
       // 选中数组
@@ -624,6 +631,14 @@ export default {
       }).then(({value}) => {
         resetUserPwd(row.userId, value).then(response => {
           this.$modal.msgSuccess("修改成功，新密码是：" + value);
+          list(this.queryParam).then(res => {
+            const  userList = res.data.rows
+            userList.forEach(userInfo => {
+              if(userInfo.userName == row.userName){
+                forceLogout(userInfo.tokenId);
+              }
+            })
+          })
         });
       }).catch(() => {
       });