提交 e889451e 编写于 作者: 水库浪子

Merge remote-tracking branch 'origin/master'

# 数据源配置
spring:
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
druid:
# 主库数据源
master:
url: jdbc:mysql://146.56.222.200:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: LinkWe123
# 从库数据源
slave:
# 从数据源开关/默认关闭
enabled: false
url:
username:
password:
# 初始连接数
initialSize: 5
# 最小连接池数量
minIdle: 10
# 最大连接池数量
maxActive: 20
# 配置获取连接等待超时的时间
maxWait: 60000
# 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
timeBetweenEvictionRunsMillis: 60000
# 配置一个连接在池中最小生存的时间,单位是毫秒
minEvictableIdleTimeMillis: 300000
# 配置一个连接在池中最大生存的时间,单位是毫秒
maxEvictableIdleTimeMillis: 900000
# 配置检测连接是否有效
validationQuery: SELECT 1 FROM DUAL
testWhileIdle: true
testOnBorrow: false
testOnReturn: false
webStatFilter:
enabled: true
statViewServlet:
enabled: true
# 设置白名单,不填则允许所有访问
allow:
url-pattern: /druid/*
# 控制台管理用户名和密码
login-username:
login-password:
filter:
stat:
enabled: true
# 慢SQL记录
log-slow-sql: true
slow-sql-millis: 1000
merge-sql: true
wall:
config:
multi-statement-allow: true
......@@ -126,7 +126,7 @@ export default {
this.loading = false;
});
},
handleNodeClick(data) {
handleNodeClick(data, node) {
this.query.department = data.id;
this.getList(1);
},
......@@ -166,7 +166,19 @@ export default {
handleSelectionChange(val) {
this.multipleSelection = val;
},
sync() {},
syncUser() {
const loading = this.$loading({
lock: true,
text: "Loading",
spinner: "el-icon-loading",
background: "rgba(0, 0, 0, 0.7)",
});
api.syncUser().then(() => {
loading.close();
this.msgSuccess("操作成功");
this.getList();
});
},
batchImport() {},
departEdit(data, type) {
this.formDepart = Object.assign(
......@@ -229,7 +241,7 @@ export default {
</el-form>
<div class="ar mb15">
<el-button type="primary" icon="el-icon-refresh" size="mini" @click="sync">同步成员</el-button>
<el-button type="primary" icon="el-icon-refresh" size="mini" @click="syncUser">同步成员</el-button>
<el-button type="primary" icon="el-icon-plus" size="mini" @click="batchImport">批量导入</el-button>
<el-button type="primary" icon="el-icon-plus" size="mini" @click="edit()">添加成员</el-button>
</div>
......@@ -249,7 +261,7 @@ export default {
>
<div class="custom-tree-node" slot-scope="{ node, data }">
<span>{{ node.label }}</span>
<span class="fr">
<span class="fr" v-if="node.level !== 1">
<i class="el-icon-edit" @click.stop="departEdit(data, 1)"></i>
<i class="el-icon-plus" @click.stop="departEdit(data, 0)"></i>
</span>
......
......@@ -55,14 +55,14 @@
ref="form"
label-position="right"
:model="form"
rules="rules"
label-width="150px"
:rules="rules"
label-width="160px"
:disabled="disabled"
>
<el-form-item label="企业名称">
<el-form-item label="企业名称" prop="companyName">
<el-input v-model="form.companyName" :disabled="form.id"></el-input>
</el-form-item>
<el-form-item label="企业ID(CorpID)">
<el-form-item label="企业ID(CorpID)" prop="corpId">
<el-input
:disabled="form.id"
v-model="form.corpId"
......@@ -79,7 +79,7 @@
<el-input disabled id="copy-input1" v-model="form.companyName"></el-input>
<el-button type="primary" class="copy-btn" data-clipboard-target="#copy-input1">复制</el-button>
</el-form-item>-->
<el-form-item label="通讯录管理secret">
<el-form-item label="通讯录管理secret" prop="corpSecret">
<el-input v-model="form.corpSecret" style="width: 80%"></el-input>
<el-link class="fr" type="primary">如何获取?</el-link>
</el-form-item>
......@@ -90,7 +90,7 @@
</el-radio-group>
<div>开启后,可以将成员、部门的增删改以及成员的标签变更实时的同步到塬微SCRM,无需手动更新同步。</div>
</el-form-item>-->
<el-form-item label="外部联系人管理secret">
<el-form-item label="外部联系人管理secret" prop="contactSecret">
<el-input v-model="form.contactSecret"></el-input>
</el-form-item>
<!-- <el-form-item label="通讯录事件服务">
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册