Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gogirl-miniapp-backend
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
huluobin
gogirl-miniapp-backend
Commits
98e5a2b6
Commit
98e5a2b6
authored
Apr 10, 2020
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
客户评论参数校验
parent
1d78be03
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
36 additions
and
4 deletions
+36
-4
OrderManageController.java
.../gogirl/interfaces/order/serve/OrderManageController.java
+2
-2
application-pre.yml
src/main/resources/application-pre.yml
+2
-2
deploy-miniapp-pre.sh
src/shell/deploy-miniapp-pre.sh
+16
-0
deploy-miniapp-prod.sh
src/shell/deploy-miniapp-prod.sh
+16
-0
No files found.
src/main/java/com/gogirl/interfaces/order/serve/OrderManageController.java
View file @
98e5a2b6
...
@@ -237,9 +237,9 @@ public class OrderManageController {
...
@@ -237,9 +237,9 @@ public class OrderManageController {
@RequestParam
Integer
pageSize
,
@RequestParam
Integer
pageSize
,
@RequestHeader
String
token
,
@RequestHeader
String
token
,
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@RequestParam
LocalDateTime
startTime
,
@RequestParam
(
required
=
false
)
LocalDateTime
startTime
,
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@RequestParam
LocalDateTime
endTime
)
{
@RequestParam
(
required
=
false
)
LocalDateTime
endTime
)
{
Integer
technicianId
=
SessionUtils
.
getTechnicianId
();
Integer
technicianId
=
SessionUtils
.
getTechnicianId
();
Page
<
OrderComment
>
page
=
new
Page
<>(
pageNum
,
pageSize
);
Page
<
OrderComment
>
page
=
new
Page
<>(
pageNum
,
pageSize
);
IPage
<
OrderComment
>
orderCommentIPage
=
orderCommentMapper
.
queryMyCommentForPage
(
page
,
technicianId
,
startTime
,
endTime
);
IPage
<
OrderComment
>
orderCommentIPage
=
orderCommentMapper
.
queryMyCommentForPage
(
page
,
technicianId
,
startTime
,
endTime
);
...
...
src/main/resources/application-pre.yml
View file @
98e5a2b6
...
@@ -91,4 +91,4 @@ wx:
...
@@ -91,4 +91,4 @@ wx:
keyPath
:
"
/usr/local/src/gogirl/gogirl-payment/apiclient_cert.p12"
keyPath
:
"
/usr/local/src/gogirl/gogirl-payment/apiclient_cert.p12"
server
:
server
:
port
:
5444
port
:
5555
\ No newline at end of file
\ No newline at end of file
src/shell/deploy-miniapp-pre.sh
0 → 100644
View file @
98e5a2b6
# shellcheck disable=SC2164
cd
/gogirl/gogirl-miniapp-backend
git pull
# 拉取开发分支代码
git checkout branch
#打包
mvn clean package
-Dmaven
.test.skip
=
true
-Dmaven
.compile.fork
=
true
# kill测试进程
# shellcheck disable=SC2009
ps
-ef
|
grep
miniapp |
grep
-v
grep
|
grep
pre | awk
'{print $2}'
| xargs
kill
-9
# 运行
nohup java
-Xms1024m
-Xmx2048m
-Xss2m
-jar
-Dspring
.profiles.active
=
pre /gogirl/gogirl-miniapp-backend/target/gogirl-miniapp-backend-0.0.1-SNAPSHOT.jar &
\
src/shell/deploy-miniapp-prod.sh
0 → 100644
View file @
98e5a2b6
# shellcheck disable=SC2164
# 更更新代码
cd
/gogirl/gogirl-miniapp-backend
git pull
# 检出master分支
git checkout master
# 打包
mvn clean package
-Dmaven
.test.skip
=
true
-Dmaven
.compile.fork
=
true
# 关闭正在运行
# shellcheck disable=SC2009
ps
-ef
|
grep
miniapp |
grep
-v
grep
|
grep
prod | awk
'{print $2}'
| xargs
kill
-9
# 启动
nohup java
-Xms1024m
-Xmx2048m
-Xss2m
-jar
-Dspring
.profiles.active
=
prod /gogirl/gogirl-miniapp-backend/target/gogirl-miniapp-backend-0.0.1-SNAPSHOT.jar &
\
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