Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
T
tianjin-cement
Project
Project
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
竹天卫
tianjin-cement
Commits
5dead76d
Commit
5dead76d
authored
Nov 11, 2020
by
竹天卫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
准备演示版本111111
parent
893ef321
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
9 deletions
+7
-9
WeiXinController.java
.../wise/sc/cement/business/controller/WeiXinController.java
+4
-4
PrecipriceServiceImpl.java
...c/cement/business/service/impl/PrecipriceServiceImpl.java
+1
-3
application.yml
cement-business/src/main/resources/application.yml
+2
-2
No files found.
cement-business/src/main/java/cn/wise/sc/cement/business/controller/WeiXinController.java
View file @
5dead76d
...
...
@@ -36,9 +36,9 @@ public class WeiXinController {
log
.
debug
(
"============================================="
);
try
{
//测试服务器
return
weiXinService
.
getTestToken
(
code
);
//
return weiXinService.getTestToken(code);
//正式服务器
//
return weiXinService.getToken(code, "APP");
return
weiXinService
.
getToken
(
code
,
"APP"
);
}
catch
(
Exception
e
)
{
log
.
debug
(
"获取登录token{}"
,
e
);
}
...
...
@@ -50,9 +50,9 @@ public class WeiXinController {
public
BaseResponse
getPCToken
(
String
code
)
{
try
{
//测试服务器
return
weiXinService
.
getTestToken
(
code
);
//
return weiXinService.getTestToken(code);
//正式服务器
//
return weiXinService.getToken(code, "PC");
return
weiXinService
.
getToken
(
code
,
"PC"
);
}
catch
(
Exception
e
)
{
log
.
debug
(
"获取登录token{}"
,
e
);
}
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/PrecipriceServiceImpl.java
View file @
5dead76d
...
...
@@ -224,8 +224,6 @@ public class PrecipriceServiceImpl extends ServiceImpl<PrecipriceMapper, Precipr
@Override
public
BaseResponse
<
List
<
NormProductionStatistics
>>
normProductionStatistics
(
Long
start
,
Long
end
,
String
name
,
Integer
groupId
)
{
//曲解、心有灵犀、捧着、不争论、心态口才策略
//统计分样处理的详情
List
<
NormProduction
.
NormProductionDetail
>
normProductionDetails
=
normProductionDetails
(
null
,
start
,
end
);
...
...
@@ -260,7 +258,7 @@ public class PrecipriceServiceImpl extends ServiceImpl<PrecipriceMapper, Precipr
SysUser
sysUser
=
users
.
stream
()
.
filter
(
arg
->
arg
.
getId
().
intValue
()
==
userId
)
.
findFirst
().
orElse
(
null
);
SysGroup
sysGroup
=
sysGroups
.
stream
().
filter
(
arg
->
arg
.
getId
().
intValue
()
==
userId
)
SysGroup
sysGroup
=
sysGroups
.
stream
().
filter
(
arg
->
arg
.
getId
().
intValue
()
==
sysUser
.
getGroupId
()
)
.
findFirst
().
orElse
(
null
);
if
(
sysUser
==
null
)
{
continue
;
...
...
cement-business/src/main/resources/application.yml
View file @
5dead76d
...
...
@@ -7,8 +7,8 @@ spring:
active
:
dev
datasource
:
# 192.168.110.85 admin!@#123
url
:
jdbc:mysql://192.168.110.85:3306/sinoma_tcdri?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false
#
url: jdbc:mysql://47.93.148.213:3306/sinoma_tcdri?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false
#
url: jdbc:mysql://192.168.110.85:3306/sinoma_tcdri?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false
url
:
jdbc:mysql://47.93.148.213:3306/sinoma_tcdri?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false
username
:
root
password
:
admin!@#123
driverClassName
:
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