Commit e2c7c49a by 吴迪

【修改】修改配置

parent e9339239
...@@ -47,17 +47,18 @@ spring: ...@@ -47,17 +47,18 @@ spring:
min-idle: 5 # 连接池中的最小空闲连接 min-idle: 5 # 连接池中的最小空闲连接
##多数据源的配置 ##多数据源的配置
#dynamic: dynamic:
# datasource: datasource:
# slave1: slave1:
# driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
# url: jdbc:sqlserver://localhost:1433;DatabaseName=renren_security url: jdbc:sqlserver://192.168.0.77:1433;DatabaseName=gs108
# username: sa username: test1
# password: 123456 password: test1
# slave2: slave2:
# driver-class-name: org.postgresql.Driver driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
# url: jdbc:postgresql://localhost:5432/renren_security url: jdbc:sqlserver://192.168.0.77:1433;DatabaseName=gs108
# username: renren username: test1
password: test1
server: server:
port: 9091 port: 9091
# password: 123456 # password: 123456
......
...@@ -14,7 +14,7 @@ spring: ...@@ -14,7 +14,7 @@ spring:
name: GS1OfficeWebSit name: GS1OfficeWebSit
# 环境 dev|test|prod # 环境 dev|test|prod
profiles: profiles:
active: dev active: test
# jackson时间格式化 # jackson时间格式化
jackson: jackson:
time-zone: GMT+8 time-zone: GMT+8
......
...@@ -59,9 +59,9 @@ ...@@ -59,9 +59,9 @@
</select> </select>
<select id="findPage" resultType="io.office.modules.manage.entity.ProductEntity" parameterType="string"> <select id="findPage" resultType="io.office.modules.manage.entity.ProductEntity" parameterType="string">
select * from product where levels > 0 and categoryid=1 select * from product where levels > 0 and categoryid=1
<if test=""> <if test="id!=null and id !=''">
and id =#{id} and id =#{id}
</if>> </if>
ORDER BY levels DESC, adddate DESC ORDER BY levels DESC, adddate DESC
</select> </select>
</mapper> </mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment