Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
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
fangxinjiang
yifu-mvp
Commits
a294ab85
Commit
a294ab85
authored
Jun 16, 2022
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
代码优化
parent
814c025c
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
4 additions
and
9 deletions
+4
-9
pom.xml
pom.xml
+1
-1
build-test.sh
yifu-upms/yifu-upms-biz/build-test.sh
+1
-1
DictController.java
...u.cloud.plus.v1/yifu/admin/controller/DictController.java
+2
-0
application.yml
yifu-upms/yifu-upms-biz/src/main/resources/application.yml
+0
-2
logback-spring.xml
...-upms/yifu-upms-biz/src/main/resources/logback-spring.xml
+0
-5
No files found.
pom.xml
View file @
a294ab85
...
@@ -258,7 +258,7 @@
...
@@ -258,7 +258,7 @@
<profiles.active>
dev
</profiles.active>
<profiles.active>
dev
</profiles.active>
<!-- 天翼云-->
<!-- 天翼云-->
<my.hub.host>
hub.yifucenter.com:5500
</my.hub.host>
<my.hub.host>
hub.yifucenter.com:5500
</my.hub.host>
<map.group.name>
dev
-mvp
</map.group.name>
<map.group.name>
qas
-mvp
</map.group.name>
<!-- 众多参数配置 -->
<!-- 众多参数配置 -->
</properties>
</properties>
</profile>
</profile>
...
...
yifu-upms/yifu-upms-biz/build-test.sh
View file @
a294ab85
#!/usr/bin/env bash
#!/usr/bin/env bash
mvn clean package
-Ptest
-Dmaven
.test.skip
=
true
docker:build
-DpushImage
mvn clean package
-Pdev
-Dmaven
.test.skip
=
true
docker:build
-DpushImage
\ No newline at end of file
\ No newline at end of file
yifu-upms/yifu-upms-biz/src/main/java/com/yifu.cloud.plus.v1/yifu/admin/controller/DictController.java
View file @
a294ab85
...
@@ -183,6 +183,7 @@ public class DictController {
...
@@ -183,6 +183,7 @@ public class DictController {
SysDictItem
item
=
sysDictItemService
.
getOne
(
Wrappers
.<
SysDictItem
>
query
().
lambda
()
SysDictItem
item
=
sysDictItemService
.
getOne
(
Wrappers
.<
SysDictItem
>
query
().
lambda
()
.
eq
(
SysDictItem:
:
getType
,
sysDictItem
.
getType
())
.
eq
(
SysDictItem:
:
getType
,
sysDictItem
.
getType
())
.
eq
(
SysDictItem:
:
getValue
,
sysDictItem
.
getValue
())
.
eq
(
SysDictItem:
:
getValue
,
sysDictItem
.
getValue
())
.
eq
(
SysDictItem:
:
getDelFlag
,
CommonConstants
.
ZERO_STRING
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
item
)){
if
(
Common
.
isNotNull
(
item
)){
return
R
.
failed
(
MsgUtils
.
getMessage
(
ErrorCodes
.
SYS_DICT_ITEM_ADD_VALUE_EXIST
));
return
R
.
failed
(
MsgUtils
.
getMessage
(
ErrorCodes
.
SYS_DICT_ITEM_ADD_VALUE_EXIST
));
...
@@ -202,6 +203,7 @@ public class DictController {
...
@@ -202,6 +203,7 @@ public class DictController {
.
eq
(
SysDictItem:
:
getType
,
sysDictItem
.
getType
())
.
eq
(
SysDictItem:
:
getType
,
sysDictItem
.
getType
())
.
ne
(
SysDictItem:
:
getId
,
sysDictItem
.
getDictId
())
.
ne
(
SysDictItem:
:
getId
,
sysDictItem
.
getDictId
())
.
eq
(
SysDictItem:
:
getValue
,
sysDictItem
.
getValue
())
.
eq
(
SysDictItem:
:
getValue
,
sysDictItem
.
getValue
())
.
eq
(
SysDictItem:
:
getDelFlag
,
CommonConstants
.
ZERO_STRING
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
item
)){
if
(
Common
.
isNotNull
(
item
)){
return
R
.
failed
(
MsgUtils
.
getMessage
(
ErrorCodes
.
SYS_DICT_ITEM_ADD_VALUE_EXIST
));
return
R
.
failed
(
MsgUtils
.
getMessage
(
ErrorCodes
.
SYS_DICT_ITEM_ADD_VALUE_EXIST
));
...
...
yifu-upms/yifu-upms-biz/src/main/resources/application.yml
View file @
a294ab85
...
@@ -97,7 +97,6 @@ springdoc:
...
@@ -97,7 +97,6 @@ springdoc:
#按包路径匹配
#按包路径匹配
packagesToScan
:
com.yifu.cloud.plus.v1.yifu.admin.controller
packagesToScan
:
com.yifu.cloud.plus.v1.yifu.admin.controller
---
---
spring
:
spring
:
config
:
config
:
activate
:
activate
:
...
@@ -114,7 +113,6 @@ spring:
...
@@ -114,7 +113,6 @@ spring:
#url: jdbc:mysql://127.0.0.1:3306/yifu_upms?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
#url: jdbc:mysql://127.0.0.1:3306/yifu_upms?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
url
:
jdbc:mysql://192.168.1.65:22306/yifu_upms?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
url
:
jdbc:mysql://192.168.1.65:22306/yifu_upms?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
---
---
spring
:
spring
:
mvc
:
mvc
:
pathmatch
:
pathmatch
:
...
...
yifu-upms/yifu-upms-biz/src/main/resources/logback-spring.xml
View file @
a294ab85
...
@@ -63,11 +63,6 @@
...
@@ -63,11 +63,6 @@
</filter>
</filter>
</appender>
</appender>
<!--nacos 心跳 INFO 屏蔽-->
<logger
name=
"com.alibaba.nacos"
level=
"OFF"
>
<appender-ref
ref=
"error"
/>
</logger>
<!-- Level: FATAL 0 ERROR 3 WARN 4 INFO 6 DEBUG 7 -->
<!-- Level: FATAL 0 ERROR 3 WARN 4 INFO 6 DEBUG 7 -->
<root
level=
"INFO"
>
<root
level=
"INFO"
>
<appender-ref
ref=
"console"
/>
<appender-ref
ref=
"console"
/>
...
...
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