From e16ef1d92e9c753422f04b4ea1b17cd38cd5bbd4 Mon Sep 17 00:00:00 2001 From: qiaowei Date: Sun, 28 Apr 2019 09:34:43 +0800 Subject: [PATCH] =?utf8?q?=E8=B0=83=E8=AF=95=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- config/application-devel-pg.properties | 3 ++- .../dlpay/consume/controller/consume_service.kt | 2 +- src/main/resources/db/migration/V1.0__init_data.sql | 12 ++++++------ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/config/application-devel-pg.properties b/config/application-devel-pg.properties index 594779e2..9b4ef799 100644 --- a/config/application-devel-pg.properties +++ b/config/application-devel-pg.properties @@ -8,6 +8,7 @@ spring.datasource.platform=postgresql spring.datasource.url=jdbc:postgresql://172.28.201.70:15432/payapi spring.datasource.username=payapi spring.datasource.password=123456 +database.dbtype=postgresql # Redis settings redis.server=172.28.201.101 redis.port=16379 @@ -17,4 +18,4 @@ redis.database=0 jwt.secret=Zj5taLomEbrM0lk+NMQZbHfSxaDU1wekjT+kiC3YzDw= # timeout seconds jwt.expiration=3600 -jwt.header=payapi +auth.password.bcrypt.seed= \ No newline at end of file diff --git a/src/main/kotlin/com/supwisdom/dlpay/consume/controller/consume_service.kt b/src/main/kotlin/com/supwisdom/dlpay/consume/controller/consume_service.kt index a8adc8ab..e6edad70 100644 --- a/src/main/kotlin/com/supwisdom/dlpay/consume/controller/consume_service.kt +++ b/src/main/kotlin/com/supwisdom/dlpay/consume/controller/consume_service.kt @@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RequestMapping import org.springframework.web.bind.annotation.RestController @RestController -@RequestMapping("/api") +@RequestMapping("/api/consume") class ConsumeController { @Autowired lateinit var accountUtilServcie: AccountUtilServcie diff --git a/src/main/resources/db/migration/V1.0__init_data.sql b/src/main/resources/db/migration/V1.0__init_data.sql index e7359519..0d0cc5eb 100644 --- a/src/main/resources/db/migration/V1.0__init_data.sql +++ b/src/main/resources/db/migration/V1.0__init_data.sql @@ -13,13 +13,13 @@ INSERT INTO tb_oper_role( VALUES ('1', 'LOR2IwRkbOjp+sVG9KR2BpHZbwGKepS4', 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs'); -- 功能表 -Insert into TB_FUNCTION (ID,PARENTID,NAME,ORDERNUM,MENUURL,MENUICON,ISLEAF) -values ('1','-1','系统中心',1,'#','layui-icon-set',0); -Insert into TB_FUNCTION (ID,PARENTID,NAME,ORDERNUM,MENUURL,MENUICON,ISLEAF) -values ('2','1','管理员维护',1,'#','layui-icon-set',1); +--Insert into TB_FUNCTION (ID,PARENTID,NAME,ORDERNUM,MENUURL,MENUICON,ISLEAF) +--values ('1','-1','系统中心',1,'#','layui-icon-set',0); +--Insert into TB_FUNCTION (ID,PARENTID,NAME,ORDERNUM,MENUURL,MENUICON,ISLEAF) +--values ('2','1','管理员维护',1,'#','layui-icon-set',1); -Insert into TB_ROLE_FUNCTION (ID,FUNCTIONID,ROLEID) values ('1','1','d1yctWs5+ks0iQN3m9bUvRHus6HbKbrs'); -Insert into TB_ROLE_FUNCTION (ID,FUNCTIONID,ROLEID) values ('2','2','d1yctWs5+ks0iQN3m9bUvRHus6HbKbrs'); +--Insert into TB_ROLE_FUNCTION (ID,FUNCTIONID,ROLEID) values ('1','1','d1yctWs5+ks0iQN3m9bUvRHus6HbKbrs'); +--Insert into TB_ROLE_FUNCTION (ID,FUNCTIONID,ROLEID) values ('2','2','d1yctWs5+ks0iQN3m9bUvRHus6HbKbrs'); Insert into TB_FUNCTION (ID,CREATETIME,ISLEAF,LASTSAVED,MENUICON,MENUURL,NAME,ORDERNUM,PARENTID) values ('1',null,0,null,'layui-icon-home','#','主页',1,'-1'); Insert into TB_FUNCTION (ID,CREATETIME,ISLEAF,LASTSAVED,MENUICON,MENUURL,NAME,ORDERNUM,PARENTID) values ('2',null,1,null,'layui-icon-home','/home/console','控制台',1,'1'); -- 2.17.1