From 240493b4471d1146f8614a46a79c1874d28735ea Mon Sep 17 00:00:00 2001 From: HuangHai <10402852@qq.com> Date: Thu, 24 Apr 2025 11:13:55 +0800 Subject: [PATCH] 'commit' --- .../Controller/LoginPersonController.java | 58 ++++++++----------- .../com/dsideal/base/UnitTest/TestMenu.java | 22 ------- 2 files changed, 23 insertions(+), 57 deletions(-) delete mode 100644 dsBase/src/main/java/com/dsideal/base/UnitTest/TestMenu.java diff --git a/dsBase/src/main/java/com/dsideal/base/LoginPerson/Controller/LoginPersonController.java b/dsBase/src/main/java/com/dsideal/base/LoginPerson/Controller/LoginPersonController.java index 0150b303..a33aaf27 100644 --- a/dsBase/src/main/java/com/dsideal/base/LoginPerson/Controller/LoginPersonController.java +++ b/dsBase/src/main/java/com/dsideal/base/LoginPerson/Controller/LoginPersonController.java @@ -24,51 +24,32 @@ public class LoginPersonController extends Controller { /** * 登录 + * * @param username 用户名 * @param password 密码 - * @param platform 平台 - * @param forVue 0:普通登录,1:vue登录 + * @param platform 平台,比如WEB,APP等 */ @Before({POST.class}) - public void doLogin(String username, String password, String platform, int forVue) { + public void doLogin(String username, String password, String platform) { JSONObject jo = lm.doLogin(username, password, platform, getResponse()); if (!jo.getBoolean("success")) { renderJson(RetKit.renderFail("用户名或密码错误,无法登录!")); return; } - int identity_id = jo.getInteger("identity_id"); String person_id = jo.getString("person_id"); String bureau_id = jo.getString("bureau_id"); String person_name = jo.getString("person_name"); - if (forVue == 0) { - if (identity_id <= 0 || identity_id > 4) { - renderJson(RetKit.renderFail("基础支撑平台只能是管理员登录访问,您的账号不是管理员!")); - return; - } - renderJson(jo); - } else { - if (identity_id != 5) { - renderJson(RetKit.renderFail("业务系统只支持真实人员登录!")); - return; - } - boolean success = jo.getBoolean("success"); - String msg = jo.getString("message"); - if (!success) { - renderJson(RetKit.renderFail(msg)); - return; - } - String jwt = jo.getString("jwt"); - Map map = new HashMap<>(); - map.put("identity_id", identity_id); - map.put("person_id", person_id); - map.put("bureau_id", bureau_id); - map.put("person_name", person_name); - map.put("jwt", jwt); - renderJson(RetKit.renderSuccess(msg, map)); - } + String jwt = jo.getString("jwt"); + Map map = new HashMap<>(); + map.put("identity_id", identity_id); + map.put("person_id", person_id); + map.put("bureau_id", bureau_id); + map.put("person_name", person_name); + map.put("jwt", jwt); + renderJson(RetKit.renderSuccess("登录成功", map)); } /** @@ -85,6 +66,7 @@ public class LoginPersonController extends Controller { /** * 重置密码 + * * @param person_id 被重置密码的人的ID */ @Before({POST.class}) @@ -103,6 +85,7 @@ public class LoginPersonController extends Controller { /** * 修改密码 + * * @param old_pwd 旧密码 * @param new_pwd 新密码 */ @@ -160,7 +143,8 @@ public class LoginPersonController extends Controller { /** * 获取市级管理员的原始帐号和原始密码 - * @param page 页码 + * + * @param page 页码 * @param limit 每页条数 */ @Before({GET.class}) @@ -195,7 +179,8 @@ public class LoginPersonController extends Controller { /** * 获取市级直属单位的帐号和原始密码 - * @param page 页码 + * + * @param page 页码 * @param limit 每页条数 */ @Before({GET.class}) @@ -230,7 +215,8 @@ public class LoginPersonController extends Controller { /** * 获取县区管理员的帐号和原始密码 - * @param page 页码 + * + * @param page 页码 * @param limit 每页条数 */ @Before({GET.class}) @@ -265,8 +251,9 @@ public class LoginPersonController extends Controller { /** * 获取县区下单位及学校的登录帐号和密码 - * @param page 页码 - * @param limit 每页条数 + * + * @param page 页码 + * @param limit 每页条数 * @param area_id 县区id */ @Before({GET.class}) @@ -281,6 +268,7 @@ public class LoginPersonController extends Controller { /** * 获取县区下单位及学校的登录帐号和密码(导出EXCEL) + * * @param area_id 县区id */ @Before({GET.class}) diff --git a/dsBase/src/main/java/com/dsideal/base/UnitTest/TestMenu.java b/dsBase/src/main/java/com/dsideal/base/UnitTest/TestMenu.java deleted file mode 100644 index fe348b78..00000000 --- a/dsBase/src/main/java/com/dsideal/base/UnitTest/TestMenu.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.dsideal.base.UnitTest; - -import com.alibaba.fastjson.JSONObject; -import com.dsideal.base.Plugin.YamlProp; -import com.jfinal.kit.Prop; -import com.jfinal.kit.StrKit; -import com.jfinal.plugin.hikaricp.HikariCpPlugin; - -public class TestMenu { - public static void main(String[] args) { - String configFile = "application_dev.yaml"; - Prop PropKit = new YamlProp(configFile); - HikariCpPlugin hp = new HikariCpPlugin(PropKit.get("mysql.jdbcUrl"), PropKit.get("mysql.user"), - PropKit.get("mysql.password").trim(), PropKit.get("mysql.driverClassName")); - hp.start(); - JSONObject jo=new JSONObject(); - jo.put("code",200); - jo.put("msg","成功"); - jo.put("data",null); - - } -}