Browse Source

慧用工签约方面的整理

skyfffire 1 tháng trước cách đây
mục cha
commit
4d0e1e672e

+ 3 - 1
src/main/java/common/handler/AllCorsHandler.java

@@ -20,10 +20,12 @@ public class AllCorsHandler extends Handler {
         
         // 从请求头中获取 Origin
         String origin = request.getHeader("Origin");
+
         if (StrKit.notBlank(origin)) {
              // 可以在这里添加白名单校验,例如:
              if (origin.equals(ALLOWED_ORIGIN) 
-                     || origin.equals(ALLOWED_ORIGIN + ":9000")) {
+                     || origin.equals(ALLOWED_ORIGIN + ":9000")
+                     || origin.contains(":7777")) {
                  response.setHeader("Access-Control-Allow-Origin", origin);
              } else {
                  // 拒绝不认识的 Origin

+ 1 - 1
src/main/java/modules/nftt/NfttController.java

@@ -351,7 +351,7 @@ public class NfttController extends MyController {
         }
 
         // 最终结果封装
-        List<Nftt> nftts = service.nftts(pageNumberInt, pageSizeInt);
+        List<Nftt> nftts = service.nfttList(pageNumberInt, pageSizeInt);
         Integer totalNftts = service.count();
 
         Map<String, Object> response = new HashMap<>();

+ 9 - 1
src/main/java/modules/nftt/NfttService.java

@@ -24,7 +24,15 @@ public class NfttService {
         return Db.queryInt(sql);
     }
 
-    public List<Nftt> nftts(int pageNumber, int pageSize) {
+    public List<Nftt> nfttListByUser() {
+        String sql = "SELECT COUNT(1) FROM t_nftt";
+        String columns = "*";
+        String baseSql = "select " + columns + " from t_nftt order by buying_start_time desc limit 0, 10";
+
+        return Nftt.dao.find(baseSql);
+    }
+
+    public List<Nftt> nfttList(int pageNumber, int pageSize) {
         // limit 的第一个参数是偏移量,第二个参数是查询数量
         // 正确的 limit 是 LIMIT offset, count
         // offset = (pageNumber - 1) * pageSize

+ 37 - 1
src/main/java/modules/user/UserController.java

@@ -181,12 +181,48 @@ public class UserController extends MyController {
     // 慧用工免登请求地址,用来换取手机号
     public void tokenToMobileNumber() {
         String token = getPara("token");
+        
+        // 顶层 Map 用于封装整个 JSON 结构
+        Map<String, Object> responseJson = new HashMap<>();
+        // data Map 用于封装 workerMobile 等信息
+        Map<String, String> data = new HashMap<>();
 
         if (StrKit.notBlank(token)) {
+            String mobileNumber = service.findMobileNumberByToken(token);
+
+            if (StrKit.notBlank(mobileNumber)) {
+                // 成功获取手机号
+                responseJson.put("statusCode", "000000");
+                responseJson.put("statusText", "获取手机号成功");
+
+                data.put("workerMobile", mobileNumber);
+                data.put("workerName", ""); // 示例中为空,根据实际业务填充
+                data.put("idCard", "");     // 示例中为空,根据实际业务填充
+
+                responseJson.put("data", data);
+            } else {
+                responseJson.put("statusCode", "100001"); // 或 STATUS_CODE_TOKEN_EXPIRED
+                responseJson.put("statusText", "token无效或已过期,未找到匹配的手机号");
+
+                data.put("workerMobile", "");
+                data.put("workerName", "");
+                data.put("idCard", "");
+                responseJson.put("data", data);
+            }
+            
             renderText(service.findMobileNumberByToken(token));
         } else {
-            renderText("");
+            // token 为空
+            responseJson.put("statusCode", "100001");
+            responseJson.put("statusText", "token不能为空");
+
+            data.put("workerMobile", "");
+            data.put("workerName", "");
+            data.put("idCard", "");
+            responseJson.put("data", data);
         }
+
+        renderJson(responseJson);
     }
 
     // 慧用工签约回调地址