WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

标签管理修改

Browse Source
This commit is contained in:
caoyang
2022-03-21 14:09:52 +08:00
parent c1a912f6e0
commit 579229d23f
6 changed files with 45 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml
+14 -10
View File
@@ -131,14 +131,22 @@ spring:
connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
datasource:
master:
url: jdbc:mysql://121.36.69.172:3307/laws_weilai?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false
username: root
password: hzwlsoft.com
driver-class-name: com.mysql.cj.jdbc.Driver
# url: jdbc:mysql://10.10.10.44/ laws_weilai_test?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false
# url: jdbc:mysql://121.36.69.172:3307/laws_weilai_zhn?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false
# username: root
# password: hzwlsoft.com
# driver-class-name: com.mysql.cj.jdbc.Driver
# url: jdbc:mysql://10.0.3.44:3306/jero-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
# url: jdbc:mysql://10.10.10.44:3306/laws_weilai_test?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false
# username: root
# password: 123456
# driver-class-name: com.mysql.cj.jdbc.Driver
# url: jdbc:mysql://121.36.69.172:3307/laws_weilai?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false
url: jdbc:mysql://121.36.69.172:3307/laws_weilai?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
username: root
password: hzwlsoft.com
driver-class-name: com.mysql.cj.jdbc.Driver
# 多数据源配置
#multi-datasource1:
#url: jdbc:mysql://localhost:3306/jero-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
@@ -184,7 +192,7 @@ jero :
uploadType: local
path :
#文件上传根目录 设置
upload: E://opt//upFiles
upload: D://opt//upFiles
#webapp文件路径
webapp: D://opt//webapp
shiro:
@@ -197,10 +205,6 @@ jero :
bucketName: jeroos
staticDomain: ??
# ElasticSearch 6设置
# elasticsearch:
# cluster-name: jero-ES
# cluster-nodes: 127.0.0.1:9200
# check-enabled: false
elasticsearch:
cluster-name: elasticsearch
cluster-nodes: 121.36.69.172:9200
jero-web/src/views/documentManage/tags/dialog/DicList.vue
+6 -6
View File
@@ -185,10 +185,10 @@
}
})
}else if(this.dictVal=='tree'){
//sys/category/queryBySysName
//sys/category/queryBySysDictId
getAction(`sys/category/queryBySysDictId`,{
// ...this.queryParams,
// sys/category/queryPageList
postAction(`sys/category/queryPageList`,{
...this.queryParams,
// name:this.queryParams.itemText,
id:this.record.id,
isTagDict:1
@@ -378,7 +378,7 @@
async () => {
//sys/dictItem/logicDelete
// sys/dictItem/delete
deleteAction(`sys/dictItem/logicDelete`, params).then(res => {
getAction(`sys/dictItem/logicDelete`, params).then(res => {
if(res.success) {
this.$message.success(this.$t('OperationSuccessful'));
this.reFresh()
@@ -415,7 +415,7 @@
async () => {
if(this.dictVal=='list'){
// sys/dictItem/logicDeleteBatch
deleteAction(`sys/dictItem/logicDeleteBatch`, params).then(res => {
getAction(`sys/dictItem/logicDeleteBatch`, params).then(res => {
if(res.success){
this.$message.success(this.$t('OperationSuccessful'))
this.reFresh()
@@ -432,7 +432,7 @@
// sys/category/deleteBatch
// sys/category/logicDeleteBatch
deleteAction(`sys/category/logicDeleteBatch`, params).then(res => {
getAction(`sys/category/logicDeleteBatch`, params).then(res => {
if(res.success){
this.queryParams.pageNo=1
this.loadData()
jero-web/src/views/documentManage/tags/dialog/TreeTable.vue
+1 -1
View File
@@ -133,7 +133,7 @@
async () => {
// sys/category/delete
// sys/category/logicDelete
deleteAction(`sys/category/logicDelete`, { id: val.id }).then((res) => {
getAction(`sys/category/logicDelete`, { id: val.id }).then((res) => {
if (res.success) {
this.$message.success(this.$t('OperationSuccessful'));
this.$emit('ok',this.queryParams)
jero-web/src/views/documentManage/tags/tabs/TagContent.vue
+4 -3
View File
@@ -5,7 +5,7 @@
<a-row :gutter="24">
<a-col :md="6" :sm="12">
<a-form-item :label="$t('LabeItemName')">
<j-input :placeholder="$t('PleaseEnterLabelName')" v-model="queryParams.dictName"></j-input>
<a-input :placeholder="$t('PleaseEnterLabelName')" v-model="queryParams.dictName"></a-input>
</a-form-item>
</a-col>
<a-col :md="6" :sm="8">
@@ -121,6 +121,7 @@
dataIndex: 'dictName',
key: 'dictName',
align: "center",
ellipsis: true,
width: 100,
},
{
@@ -287,7 +288,7 @@
content: '',
onOk:
async () => {
deleteAction(`sys/dict/logicDelete`, param).then(res => {
getAction(`sys/dict/logicDelete`, param).then(res => {
if (res.success) {
this.$message.success(this.$t('OperationSuccessful'))
this.reFresh()
@@ -319,7 +320,7 @@
content: '',
onOk:
async () => {
deleteAction(`sys/dict/logicDeleteBatch`, params).then(res => {
getAction(`sys/dict/logicDeleteBatch`, params).then(res => {
if (res.success) {
this.$message.success(this.$t('OperationSuccessful'))
this.reFresh()
jero-web/src/views/documentManage/tags/tabs/TagItem.vue
+2 -2
View File
@@ -284,7 +284,7 @@
content: '',
onOk:
async () => {
deleteAction(`tag/onlCgformTag/delete`, params).then(res => {
getAction(`tag/onlCgformTag/delete`, params).then(res => {
if (res.success) {
if (this.key == 1) {
this.$message.success(this.$t('OperationSuccessful'))
@@ -323,7 +323,7 @@
content: '',
onOk:
async () => {
deleteAction(`tag/onlCgformTag/logicDeleteBatch`, params).then(res => {
getAction(`tag/onlCgformTag/logicDeleteBatch`, params).then(res => {
if (res.success) {
if (this.key == 1) {
this.$message.success(this.$t('OperationSuccessful'))
jero-web/src/views/user/Login.vue
+18 -3
View File
@@ -59,12 +59,16 @@
</a-row>
<a-row style="margin-bottom: 2%;">
<a-col :span="3"></a-col>
<a-col :span="7">
<a-col :span="11">
<a-form-item>
<a-checkbox v-decorator="['rememberMe', {initialValue: true, valuePropName: 'checked'}]">自动登录</a-checkbox>
</a-form-item>
</a-col>
<a-col :span="6"></a-col>
<a-col :span="6">
<a-form-item>
<a-button type="primary" @click="ssoLogin">SSO登录</a-button>
</a-form-item>
</a-col>
<!-- <a-col :span="5" style="text-align: right;color: #1891FF;">-->
<!-- <a-form-item>-->
<!-- <router-link :to="{ name: 'alteration'}" class="forge-password" style="float: right;">-->
@@ -149,7 +153,13 @@
<a-checkbox v-decorator="['rememberMe', {initialValue: true, valuePropName: 'checked'}]">自动登录</a-checkbox>
</a-form-item>
</a-col>
<a-col :span="4"></a-col>
<a-col :span="4">
<!-- <a-form-item>-->
<!-- <a-button>sso登录</a-button>-->
<!-- </a-form-item>-->
</a-col>
<!-- <a-col :span="9" style="text-align: right;color: #1891FF;">-->
<!-- <a-form-item>-->
<!-- <router-link :to="{ name: 'alteration'}" class="forge-password" style="float: right;">-->
@@ -391,6 +401,11 @@
})
}
})
},
//sso登录跳转
ssoLogin(){
window.open('https://signin-test.nio.com/oauth2/authorize?client_id=100679&redirect_uri=http%3A%2F%2F139.9.235.66%3A8008%2Fjero-boot%2Fopensso%2Fcallback&response_type=code', '_blank')
}
}
}