Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
8
8timerapiv200
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
8timerv2
8timerapiv200
Commits
974e20b2
Commit
974e20b2
authored
Mar 26, 2020
by
邓实川
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
application数据库地址配置更新,企业讯息bug优化
parent
7c68173f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
4 deletions
+10
-4
src/main/java/cn/timer/api/controller/qyxx/CmsController.java
+4
-1
src/main/java/cn/timer/api/controller/yggl/YgglController.java
+1
-0
src/main/resources/application-pro.yml
+5
-3
No files found.
src/main/java/cn/timer/api/controller/qyxx/CmsController.java
View file @
974e20b2
...
@@ -158,7 +158,9 @@ public class CmsController {
...
@@ -158,7 +158,9 @@ public class CmsController {
@ApiOperation
(
value
=
"获取分类"
,
httpMethod
=
"GET"
,
notes
=
"接口发布说明"
)
@ApiOperation
(
value
=
"获取分类"
,
httpMethod
=
"GET"
,
notes
=
"接口发布说明"
)
public
Result
<
Object
>
getxxfl
(
@CurrentUser
UserBean
userBean
)
{
public
Result
<
Object
>
getxxfl
(
@CurrentUser
UserBean
userBean
)
{
return
ResultUtil
.
data
(
CmsContentModular
.
builder
().
build
().
selectList
(
return
ResultUtil
.
data
(
CmsContentModular
.
builder
().
build
().
selectList
(
new
QueryWrapper
<
CmsContentModular
>().
eq
(
"organization_id"
,
userBean
.
getOrgCode
()).
eq
(
"is_open"
,
0
)),
new
QueryWrapper
<
CmsContentModular
>()
// .eq("organization_id", userBean.getOrgCode())
.
eq
(
"is_open"
,
0
)),
"查询分类成功!"
);
"查询分类成功!"
);
}
}
...
@@ -351,6 +353,7 @@ public class CmsController {
...
@@ -351,6 +353,7 @@ public class CmsController {
// 查询条件
// 查询条件
QueryWrapper
<
CmsContent
>
queryWrapper
=
new
QueryWrapper
<>();
QueryWrapper
<
CmsContent
>
queryWrapper
=
new
QueryWrapper
<>();
queryWrapper
queryWrapper
.
eq
(
"organization_id"
,
userBean
.
getOrgCode
())
.
select
(
"id"
,
"auditopinion"
,
"modularid"
,
"status"
,
"title"
,
"releasetime"
,
"addeddate"
,
"author"
,
.
select
(
"id"
,
"auditopinion"
,
"modularid"
,
"status"
,
"title"
,
"releasetime"
,
"addeddate"
,
"author"
,
"summary"
,
"releasetype"
,
"fmtpath"
)
"summary"
,
"releasetype"
,
"fmtpath"
)
.
ne
(
"status"
,
1
).
eq
(
t
!=
null
&&
t
>
-
1
,
"modularid"
,
t
)
.
ne
(
"status"
,
1
).
eq
(
t
!=
null
&&
t
>
-
1
,
"modularid"
,
t
)
...
...
src/main/java/cn/timer/api/controller/yggl/YgglController.java
View file @
974e20b2
...
@@ -33,6 +33,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
...
@@ -33,6 +33,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper
;
import
com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper
;
import
com.baomidou.mybatisplus.extension.service.additional.update.impl.LambdaUpdateChainWrapper
;
import
cn.hutool.core.bean.BeanUtil
;
import
cn.hutool.core.bean.BeanUtil
;
import
cn.hutool.core.util.StrUtil
;
import
cn.hutool.core.util.StrUtil
;
...
...
src/main/resources/application-pro.yml
View file @
974e20b2
...
@@ -24,12 +24,14 @@ spring:
...
@@ -24,12 +24,14 @@ spring:
ddl-auto
:
update
ddl-auto
:
update
show-sql
:
true
show-sql
:
true
datasource
:
datasource
:
username
:
root
# username: root
password
:
youlingHR73!
# password: youlingHR73!
username
:
youling8timer
password
:
(!0YouLing8Timer0!)
# username: tang
# username: tang
# password: Tang123456!
# password: Tang123456!
# url: jdbc:mysql://120.24.172.51:3306/youlingrc_tang?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
# url: jdbc:mysql://120.24.172.51:3306/youlingrc_tang?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
url
:
jdbc:mysql://1
14.115.168.73:3306/youlingrc_8timer201
?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
url
:
jdbc:mysql://1
20.24.24.239:3306/8timer_test
?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
# url: jdbc:mysql://192.168.172.200:3306/youlingrc_8timer201?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
# url: jdbc:mysql://192.168.172.200:3306/youlingrc_8timer201?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
# url: jdbc:mysql://db.hhlsz.com:3306/youlingrc_8timer201?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
# url: jdbc:mysql://db.hhlsz.com:3306/youlingrc_8timer201?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
driver-class-name
:
com.mysql.cj.jdbc.Driver
driver-class-name
:
com.mysql.cj.jdbc.Driver
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment