Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
fzm-joying
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
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
lei
fzm-joying
Commits
b8ca93b7
Commit
b8ca93b7
authored
Jul 12, 2021
by
tangtuo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改mysql地址
parent
def699a0
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
12 additions
and
16 deletions
+12
-16
application-dev.yml
joying-admin/src/main/resources/application-dev.yml
+2
-2
application-local.yml
joying-admin/src/main/resources/application-local.yml
+2
-2
application-test.yml
joying-admin/src/main/resources/application-test.yml
+2
-2
GlobalExceptionHandler.java
.../fzm/common/exception/handler/GlobalExceptionHandler.java
+0
-4
application-dev.yml
joying-portal/src/main/resources/application-dev.yml
+2
-2
application-local.yml
joying-portal/src/main/resources/application-local.yml
+2
-2
application-test.yml
joying-portal/src/main/resources/application-test.yml
+2
-2
No files found.
joying-admin/src/main/resources/application-dev.yml
View file @
b8ca93b7
...
@@ -6,9 +6,9 @@ spring:
...
@@ -6,9 +6,9 @@ spring:
main
:
main
:
allow-bean-definition-overriding
:
true
#当遇到同样名字的时候,是否允许覆盖注册
allow-bean-definition-overriding
:
true
#当遇到同样名字的时候,是否允许覆盖注册
datasource
:
datasource
:
url
:
jdbc:mysql://172.16.101.13
5
:3306/fzm_joying?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8
url
:
jdbc:mysql://172.16.101.13
6
:3306/fzm_joying?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8
username
:
root
username
:
root
password
:
123456
password
:
Joying@
123456
platform
:
mysql
platform
:
mysql
type
:
com.alibaba.druid.pool.DruidDataSource
type
:
com.alibaba.druid.pool.DruidDataSource
driver-class-name
:
com.mysql.cj.jdbc.Driver
driver-class-name
:
com.mysql.cj.jdbc.Driver
...
...
joying-admin/src/main/resources/application-local.yml
View file @
b8ca93b7
...
@@ -6,9 +6,9 @@ spring:
...
@@ -6,9 +6,9 @@ spring:
main
:
main
:
allow-bean-definition-overriding
:
true
#当遇到同样名字的时候,是否允许覆盖注册
allow-bean-definition-overriding
:
true
#当遇到同样名字的时候,是否允许覆盖注册
datasource
:
datasource
:
url
:
jdbc:mysql://172.16.101.13
5
:3306/fzm_joying?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8
url
:
jdbc:mysql://172.16.101.13
6
:3306/fzm_joying?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8
username
:
root
username
:
root
password
:
123456
password
:
Joying@
123456
platform
:
mysql
platform
:
mysql
type
:
com.alibaba.druid.pool.DruidDataSource
type
:
com.alibaba.druid.pool.DruidDataSource
driver-class-name
:
com.mysql.cj.jdbc.Driver
driver-class-name
:
com.mysql.cj.jdbc.Driver
...
...
joying-admin/src/main/resources/application-test.yml
View file @
b8ca93b7
...
@@ -6,9 +6,9 @@ spring:
...
@@ -6,9 +6,9 @@ spring:
main
:
main
:
allow-bean-definition-overriding
:
true
#当遇到同样名字的时候,是否允许覆盖注册
allow-bean-definition-overriding
:
true
#当遇到同样名字的时候,是否允许覆盖注册
datasource
:
datasource
:
url
:
jdbc:mysql://172.16.101.13
5
:3306/fzm_joying_test?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8
url
:
jdbc:mysql://172.16.101.13
6
:3306/fzm_joying_test?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8
username
:
root
username
:
root
password
:
123456
password
:
Joying@
123456
platform
:
mysql
platform
:
mysql
type
:
com.alibaba.druid.pool.DruidDataSource
type
:
com.alibaba.druid.pool.DruidDataSource
driver-class-name
:
com.mysql.cj.jdbc.Driver
driver-class-name
:
com.mysql.cj.jdbc.Driver
...
...
joying-common/src/main/java/com/fzm/common/exception/handler/GlobalExceptionHandler.java
View file @
b8ca93b7
...
@@ -41,21 +41,18 @@ public class GlobalExceptionHandler {
...
@@ -41,21 +41,18 @@ public class GlobalExceptionHandler {
@ExceptionHandler
(
value
=
GlobalException
.
class
)
@ExceptionHandler
(
value
=
GlobalException
.
class
)
public
ResponseModel
<
String
>
handlerGlobalException
(
GlobalException
globalException
)
{
public
ResponseModel
<
String
>
handlerGlobalException
(
GlobalException
globalException
)
{
log
.
error
(
globalException
.
getMessage
(),
globalException
);
log
.
error
(
globalException
.
getMessage
(),
globalException
);
response
.
setStatus
(
HttpStatus
.
HTTP_INTERNAL_ERROR
);
return
ResponseModel
.
fail
(
globalException
.
getErrorCode
(),
globalException
.
getMessage
());
return
ResponseModel
.
fail
(
globalException
.
getErrorCode
(),
globalException
.
getMessage
());
}
}
@ExceptionHandler
(
value
=
Exception
.
class
)
@ExceptionHandler
(
value
=
Exception
.
class
)
public
ResponseModel
<
String
>
handlerException
(
Exception
exception
)
{
public
ResponseModel
<
String
>
handlerException
(
Exception
exception
)
{
log
.
error
(
exception
.
getMessage
(),
exception
);
log
.
error
(
exception
.
getMessage
(),
exception
);
response
.
setStatus
(
HttpStatus
.
HTTP_INTERNAL_ERROR
);
return
ResponseModel
.
fail
(
exception
);
return
ResponseModel
.
fail
(
exception
);
}
}
@ExceptionHandler
(
value
=
SaTokenException
.
class
)
@ExceptionHandler
(
value
=
SaTokenException
.
class
)
public
ResponseModel
<
String
>
handlerNotLoginException
(
SaTokenException
exception
)
{
public
ResponseModel
<
String
>
handlerNotLoginException
(
SaTokenException
exception
)
{
log
.
error
(
exception
.
getMessage
(),
exception
);
log
.
error
(
exception
.
getMessage
(),
exception
);
response
.
setStatus
(
HttpStatus
.
HTTP_INTERNAL_ERROR
);
if
(
exception
instanceof
NotLoginException
)
{
if
(
exception
instanceof
NotLoginException
)
{
if
(
exception
.
getMessage
().
contains
(
"token已被顶下线"
))
{
if
(
exception
.
getMessage
().
contains
(
"token已被顶下线"
))
{
// 获取已过期的token
// 获取已过期的token
...
@@ -88,7 +85,6 @@ public class GlobalExceptionHandler {
...
@@ -88,7 +85,6 @@ public class GlobalExceptionHandler {
@ExceptionHandler
(
value
=
{
MethodArgumentNotValidException
.
class
})
@ExceptionHandler
(
value
=
{
MethodArgumentNotValidException
.
class
})
public
ResponseModel
<
String
>
handleMethodArgumentNotValidException
(
MethodArgumentNotValidException
e
)
{
public
ResponseModel
<
String
>
handleMethodArgumentNotValidException
(
MethodArgumentNotValidException
e
)
{
log
.
error
(
e
.
getMessage
(),
e
);
log
.
error
(
e
.
getMessage
(),
e
);
response
.
setStatus
(
HttpStatus
.
HTTP_INTERNAL_ERROR
);
List
<
ObjectError
>
allErrors
=
e
.
getBindingResult
().
getAllErrors
();
List
<
ObjectError
>
allErrors
=
e
.
getBindingResult
().
getAllErrors
();
String
errorMsg
=
allErrors
.
String
errorMsg
=
allErrors
.
stream
().
stream
().
...
...
joying-portal/src/main/resources/application-dev.yml
View file @
b8ca93b7
...
@@ -4,9 +4,9 @@ spring:
...
@@ -4,9 +4,9 @@ spring:
main
:
main
:
allow-bean-definition-overriding
:
true
#当遇到同样名字的时候,是否允许覆盖注册
allow-bean-definition-overriding
:
true
#当遇到同样名字的时候,是否允许覆盖注册
datasource
:
datasource
:
url
:
jdbc:mysql://172.16.101.13
5
:3306/fzm_joying?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8
url
:
jdbc:mysql://172.16.101.13
6
:3306/fzm_joying?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8
username
:
root
username
:
root
password
:
123456
password
:
Joying@
123456
platform
:
mysql
platform
:
mysql
type
:
com.alibaba.druid.pool.DruidDataSource
type
:
com.alibaba.druid.pool.DruidDataSource
driver-class-name
:
com.mysql.cj.jdbc.Driver
driver-class-name
:
com.mysql.cj.jdbc.Driver
...
...
joying-portal/src/main/resources/application-local.yml
View file @
b8ca93b7
...
@@ -4,9 +4,9 @@ spring:
...
@@ -4,9 +4,9 @@ spring:
main
:
main
:
allow-bean-definition-overriding
:
true
#当遇到同样名字的时候,是否允许覆盖注册
allow-bean-definition-overriding
:
true
#当遇到同样名字的时候,是否允许覆盖注册
datasource
:
datasource
:
url
:
jdbc:mysql://172.16.101.13
5
:3306/fzm_joying?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8
url
:
jdbc:mysql://172.16.101.13
6
:3306/fzm_joying?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8
username
:
root
username
:
root
password
:
123456
password
:
Joying@
123456
platform
:
mysql
platform
:
mysql
type
:
com.alibaba.druid.pool.DruidDataSource
type
:
com.alibaba.druid.pool.DruidDataSource
driver-class-name
:
com.mysql.cj.jdbc.Driver
driver-class-name
:
com.mysql.cj.jdbc.Driver
...
...
joying-portal/src/main/resources/application-test.yml
View file @
b8ca93b7
...
@@ -4,9 +4,9 @@ spring:
...
@@ -4,9 +4,9 @@ spring:
main
:
main
:
allow-bean-definition-overriding
:
true
#当遇到同样名字的时候,是否允许覆盖注册
allow-bean-definition-overriding
:
true
#当遇到同样名字的时候,是否允许覆盖注册
datasource
:
datasource
:
url
:
jdbc:mysql://172.16.101.13
5
:3306/fzm_joying_test?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8
url
:
jdbc:mysql://172.16.101.13
6
:3306/fzm_joying_test?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8
username
:
root
username
:
root
password
:
123456
password
:
Joying@
123456
platform
:
mysql
platform
:
mysql
type
:
com.alibaba.druid.pool.DruidDataSource
type
:
com.alibaba.druid.pool.DruidDataSource
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