Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gs1-office-web-sit
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
吴迪
gs1-office-web-sit
Commits
e2c7c49a
Commit
e2c7c49a
authored
Jun 12, 2022
by
吴迪
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
【修改】修改配置
parent
e9339239
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
14 deletions
+16
-14
application-test.yml
src/main/resources/application-test.yml
+12
-11
application.yml
src/main/resources/application.yml
+1
-1
ProductDao.xml
src/main/resources/mapper/manage/ProductDao.xml
+3
-2
No files found.
src/main/resources/application-test.yml
View file @
e2c7c49a
...
...
@@ -47,17 +47,18 @@ spring:
min-idle
:
5
# 连接池中的最小空闲连接
##多数据源的配置
#dynamic:
# datasource:
# slave1:
# driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
# url: jdbc:sqlserver://localhost:1433;DatabaseName=renren_security
# username: sa
# password: 123456
# slave2:
# driver-class-name: org.postgresql.Driver
# url: jdbc:postgresql://localhost:5432/renren_security
# username: renren
dynamic
:
datasource
:
slave1
:
driver-class-name
:
com.microsoft.sqlserver.jdbc.SQLServerDriver
url
:
jdbc:sqlserver://192.168.0.77:1433;DatabaseName=gs108
username
:
test1
password
:
test1
slave2
:
driver-class-name
:
com.microsoft.sqlserver.jdbc.SQLServerDriver
url
:
jdbc:sqlserver://192.168.0.77:1433;DatabaseName=gs108
username
:
test1
password
:
test1
server
:
port
:
9091
# password: 123456
...
...
src/main/resources/application.yml
View file @
e2c7c49a
...
...
@@ -14,7 +14,7 @@ spring:
name
:
GS1OfficeWebSit
# 环境 dev|test|prod
profiles
:
active
:
dev
active
:
test
# jackson时间格式化
jackson
:
time-zone
:
GMT+8
...
...
src/main/resources/mapper/manage/ProductDao.xml
View file @
e2c7c49a
...
...
@@ -59,9 +59,9 @@
</select>
<select
id=
"findPage"
resultType=
"io.office.modules.manage.entity.ProductEntity"
parameterType=
"string"
>
select * from product where levels > 0 and categoryid=1
<if
test=
""
>
<if
test=
"
id!=null and id !=''
"
>
and id =#{id}
</if>
>
</if>
ORDER BY levels DESC, adddate DESC
</select>
</mapper>
\ No newline at end of file
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