Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Z
zhny
Project
Project
Details
Activity
Releases
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
王夏晖
zhny
Commits
2348e964
Commit
2348e964
authored
Dec 14, 2018
by
jichao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更改配置,更改冲突的访问路径
parent
69786df7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
13 deletions
+13
-13
application-dev.yml
src/main/resources/application-dev.yml
+4
-4
application-prod.yml
src/main/resources/application-prod.yml
+7
-7
logback-spring.xml
src/main/resources/logback-spring.xml
+2
-2
No files found.
src/main/resources/application-dev.yml
View file @
2348e964
...
...
@@ -13,9 +13,9 @@ server:
# org.springframework.web: DEBUG
druid
:
url
:
jdbc:mysql://1
92.168.0.198:330
6/zhny?useUnicode=true&characterEncoding=UTF-8&useSSL=false&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
url
:
jdbc:mysql://1
39.199.98.105:333
6/zhny?useUnicode=true&characterEncoding=UTF-8&useSSL=false&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
username
:
root
password
:
root
password
:
root
bdx
initial-size
:
1
min-idle
:
1
max-active
:
20
...
...
@@ -111,11 +111,11 @@ wechat:
aesKey
:
BPhPqaGgl40uy7LuVe4SkMsqGXp9MjVeVVJMIrqTIW9
filepath
:
analysis
:
D:\zhny\filepath\analys
i
s\
analysis
:
D:\zhny\filepath\analys
e
s\
equipment
:
D:\zhny\filepath\equipment\
devicetp
:
D:\zhny\filepath\devicetp\
topologynode
:
D:\zhny\filepath\topologynode\
loginimg
:
D:\zhny\filepath\loginimg\
qrcode
:
D:\zhny\filepath\qrcode\
serverimgurl
:
127.0.0.1:9000/
\ No newline at end of file
serverimgurl
:
10.150.0.224/
\ No newline at end of file
src/main/resources/application-prod.yml
View file @
2348e964
...
...
@@ -14,7 +14,7 @@ server:
druid
:
url
:
jdbc:mysql://127.0.0.1:3336/zhny?useUnicode=true&characterEncoding=UTF-8&useSSL=false&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
username
:
root
password
:
root
password
:
root
bdx
initial-size
:
1
min-idle
:
1
max-active
:
20
...
...
@@ -98,14 +98,14 @@ global:
student
:
ROLE_1003
filepath
:
analysis
:
/
home/zhny/filepath/analysi
s/
equipment
:
/
home/
zhny/filepath/equipment/
analysis
:
/
zhny/filepath/analyse
s/
equipment
:
/zhny/filepath/equipment/
# devicetp: /home/zhny/dist/devicetp/
# topologynode: /home/zhny/dist/topologynode/
devicetp
:
/
home/
zhny/filepath/devicetp/
topologynode
:
/
home/
zhny/filepath/topologynode/
loginimg
:
/
home/
zhny/filepath/loginimg/
qrcode
:
/
home/
zhny/filepath/qrcode/
devicetp
:
/zhny/filepath/devicetp/
topologynode
:
/zhny/filepath/topologynode/
loginimg
:
/zhny/filepath/loginimg/
qrcode
:
/zhny/filepath/qrcode/
#serverimgurl: 139.199.98.105:9000/
serverimgurl
:
www.renew-cloud.com/
...
...
src/main/resources/logback-spring.xml
View file @
2348e964
...
...
@@ -24,7 +24,7 @@
<!--滚动策略-->
<rollingPolicy
class=
"ch.qos.logback.core.rolling.TimeBasedRollingPolicy"
>
<!--路径-->
<fileNamePattern>
/
home/
zhny/logs/info.%d.log
</fileNamePattern>
<fileNamePattern>
/zhny/logs/info.%d.log
</fileNamePattern>
</rollingPolicy>
</appender>
...
...
@@ -45,7 +45,7 @@
<!--滚动策略-->
<rollingPolicy
class=
"ch.qos.logback.core.rolling.TimeBasedRollingPolicy"
>
<!--路径-->
<fileNamePattern>
/
home/
zhny/logs/error.%d.log
</fileNamePattern>
<fileNamePattern>
/zhny/logs/error.%d.log
</fileNamePattern>
</rollingPolicy>
</appender>
<!--
...
...
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