diff --git a/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/api/isv/IsvApi.java b/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/api/isv/IsvApi.java index 2db914fd..27755aa8 100644 --- a/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/api/isv/IsvApi.java +++ b/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/api/isv/IsvApi.java @@ -10,6 +10,7 @@ import com.gitee.easyopen.doc.annotation.ApiDocMethod; import com.gitee.easyopen.util.CopyUtil; import com.gitee.fastmybatis.core.PageInfo; import com.gitee.fastmybatis.core.query.Query; +import com.gitee.fastmybatis.core.query.Sort; import com.gitee.fastmybatis.core.util.MapperUtil; import com.gitee.sop.adminserver.api.IdParam; import com.gitee.sop.adminserver.api.isv.param.IsvInfoFormAdd; @@ -82,6 +83,7 @@ public class IsvApi { }) PageInfo pageIsv(IsvPageParam param) { Query query = Query.build(param); + query.orderby("id", Sort.DESC); PageInfo pageInfo = MapperUtil.query(isvInfoMapper, query); List list = pageInfo.getList(); @@ -165,6 +167,7 @@ public class IsvApi { } IsvKeysGenVO isvKeysGenVO = this.createIsvKeys(); IsvKeys isvKeys = new IsvKeys(); + isvKeys.setAppKey(appKey); CopyUtil.copyPropertiesIgnoreNull(isvKeysGenVO, isvKeys); isvKeysMapper.saveIgnoreNull(isvKeys); diff --git a/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/entity/IsvInfo.java b/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/entity/IsvInfo.java index 873dacb3..4b749092 100644 --- a/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/entity/IsvInfo.java +++ b/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/entity/IsvInfo.java @@ -28,6 +28,8 @@ public class IsvInfo { /** appKey, 数据库字段:app_key */ private String appKey; + private String secret = ""; + /** 1启用,2禁用, 数据库字段:status */ private Byte status;