skyline 2 سال پیش
والد
کامیت
e3c283b0a6

+ 2 - 2
miniapp/src/main/java/com/kym/miniapp/controller/UserController.java

@@ -2,9 +2,9 @@ package com.kym.miniapp.controller;
 
 import cn.dev33.satoken.stp.StpUtil;
 import com.alibaba.fastjson2.JSONObject;
-import com.github.pagehelper.PageInfo;
 import com.kym.common.R;
 import com.kym.common.utils.IDGenerator;
+import com.kym.entity.common.PageBean;
 import com.kym.entity.miniapp.User;
 import com.kym.entity.miniapp.params.WxLoginParams;
 import com.kym.entity.miniapp.vo.UserVo;
@@ -98,7 +98,7 @@ public class UserController {
      * @return
      */
     @GetMapping("listUser")
-    PageInfo<UserVo> listUser(@RequestParam int pageNum, @RequestParam int pageSize) {
+    PageBean<UserVo> listUser(@RequestParam int pageNum, @RequestParam int pageSize) {
         return userService.listUserVo(pageNum, pageSize);
     }
 

+ 4 - 0
miniapp/src/main/resources/application.yml

@@ -144,4 +144,8 @@ oss:
   keySecret: HjlRw844NVP894jAzZna45Vns6axes
   bucket: kym-static
   prefix: http://static.kuaiyuman.cn  # 前端访问拼接为 prefix+uuid,例 http://static.kuaiyuman.cn /b2ee8dbd259d4f44a63a8e36c8121f89.vue
+password:
+  privateKey: MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAM1zhmu+TcTSZSQ7w0541g45o8ji4ugEC4O31GnS6tfvLTCru+9DPK2/DNdd4z1enz2PuDhktHuoEsEKPdA08fRJSMTXLL0pUEp2OQ+t7tZP6mVLvizasnP+HKAqIndXFr5nXm/okQfL/f/6L2Bben9sItoxC28Z6Y28NfAJPAg1AgMBAAECgYAKOdvQ9RHt4AMEwKzB9SXCY4AReamNntXr4nSCJ+tkgBUhvQqHqDMW+tFqztOGtHT8nXCv7eNF3GHClf3ppRj91utk8zAwZPVAVlRoNcWs60nyKRUO2uhwAV8AE+9UKDoVui7L7UaMcIkssKqQbFGIRXUjjSoPJu0yoHCdp5/3QQJBAOZTbfgmFXVgRSH4IMXJ3aZOqz+Wy3EmvNatYz8NYLBFgLJTWWXtR7URw82R7jL6F9ettfCityhAmXEZnZsEsokCQQDkWkYwFZlUYJ2ctdNEmipXw8tjpCrzQRaZnydXbjviwbSpOvOo5nrxSG5BtL9QDwiy9DL7YLBVJPykAkJm3m1NAkBn2SQTJ7CzLIXfLA4yv7LFYmEKGcZ+rRWlwaWm7zQyJhRB0xzSvSqAtJLRJEP/Dg4j+7m11te4OXA1s3QBShvpAkEAq50gpKCG5D/cE9seVK9b5SuTnmXRlZE0D+3pXi7NOOSFBq30UtosSUs6+YyCPwOdcQhPjFYlD0hFymicSL0e/QJBAOMQaABh/6BcVimWP284x/WxBQ83zzVhcl7fUyqcFvfAw1JeMmRxvm2CWYKQ9MIhQ/9ptFotRCSwMAdJTZceWys=
+  publicKey: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDNc4Zrvk3E0mUkO8NOeNYOOaPI4uLoBAuDt9Rp0urX7y0wq7vvQzytvwzXXeM9Xp89j7g4ZLR7qBLBCj3QNPH0SUjE1yy9KVBKdjkPre7WT+plS74s2rJz/hygKiJ3Vxa+Z15v6JEHy/3/+i9gW3p/bCLaMQtvGemNvDXwCTwINQIDAQAB
+