From a295394709675f7a68a939dc713d3e8863d6f092 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Fri, 27 Sep 2024 09:44:13 +0800
Subject: [PATCH 1/5] 'commit'
---
.idea/workspace.xml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7559daf6..57674571 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,9 @@
-
+
+
+
@@ -90,7 +92,7 @@
1727339918298
-
+
From 4d6f03c8490f4f7f82861c8a9ac75ef4dc73e9ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Fri, 27 Sep 2024 09:44:52 +0800
Subject: [PATCH 2/5] 'commit'
---
.gitignore | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitignore b/.gitignore
index d52393f5..e0e4d0f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,5 @@
/dsRes/lib/
/dsGw/target/
/dsGw/lib/
+/.idea/
From 8b944d22aadd2bea2975a4ea421c49d8cb4fbeb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Fri, 27 Sep 2024 09:48:47 +0800
Subject: [PATCH 3/5] 'commit'
---
.idea/workspace.xml | 44 ++++++++++++++++++++++++++------------------
1 file changed, 26 insertions(+), 18 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 57674571..3772b4e4 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -37,25 +37,25 @@
- {
+ "keyToString": {
+ "RunOnceActivity.ShowReadmeOnStart": "true",
+ "git-widget-placeholder": "main",
+ "kotlin-language-version-configured": "true",
+ "node.js.detected.package.eslint": "true",
+ "node.js.detected.package.tslint": "true",
+ "node.js.selected.package.eslint": "(autodetect)",
+ "node.js.selected.package.tslint": "(autodetect)",
+ "nodejs_package_manager_path": "npm",
+ "project.structure.last.edited": "模块",
+ "project.structure.proportion": "0.0",
+ "project.structure.side.proportion": "0.0",
+ "settings.editor.selected.configurable": "reference.settings.project.maven.importing",
+ "vue.rearranger.settings.migration": "true",
+ "应用程序.GwApplication.executor": "Run"
}
-}]]>
-
+}
+
@@ -69,8 +69,16 @@
+
+
+
+
+
+
+
+
From c1cb7283fb18ce2bad91b5e1ef533449d2c32940 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Fri, 27 Sep 2024 09:52:12 +0800
Subject: [PATCH 4/5] 'commit'
---
.idea/workspace.xml | 74 ++++++++++++++-------------------------------
1 file changed, 22 insertions(+), 52 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b4604fce..ad541004 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,11 +5,8 @@
-<<<<<<< HEAD
-=======
-
->>>>>>> 5521982ae4d5e06a3e69ee4c8fe13fa6e869ef95
+
@@ -29,20 +26,18 @@
{
- "customColor": "",
- "associatedIndex": 4
-}
+ "customColor": "",
+ "associatedIndex": 4
+ }
-<<<<<<< HEAD
{
"keyToString": {
"RunOnceActivity.ShowReadmeOnStart": "true",
@@ -58,32 +53,12 @@
"project.structure.side.proportion": "0.0",
"settings.editor.selected.configurable": "reference.settings.project.maven.importing",
"vue.rearranger.settings.migration": "true",
- "应用程序.GwApplication.executor": "Run"
+ "应用程序.BaseApplication.executor": "Debug",
+ "应用程序.GwApplication.executor": "Debug",
+ "应用程序.ResApplication.executor": "Debug"
}
}
-
-=======
-
-
+
@@ -97,7 +72,6 @@
->>>>>>> 5521982ae4d5e06a3e69ee4c8fe13fa6e869ef95
@@ -111,11 +85,6 @@
-<<<<<<< HEAD
-
-
-
-=======
@@ -125,28 +94,23 @@
->>>>>>> 5521982ae4d5e06a3e69ee4c8fe13fa6e869ef95
-<<<<<<< HEAD
-
-
-
+
+
@@ -159,12 +123,7 @@
1727339918298
-<<<<<<< HEAD
-
-=======
-
->>>>>>> 5521982ae4d5e06a3e69ee4c8fe13fa6e869ef95
@@ -177,4 +136,15 @@
+
+
+
+
+ file://$PROJECT_DIR$/dsBase/src/main/java/com/dsideal/base/LoginPerson/Controller/LoginPersonController.java
+ 38
+
+
+
+
+
\ No newline at end of file
From 757166f75ad921c08637796f8853ef868fb1b283 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Fri, 27 Sep 2024 09:53:34 +0800
Subject: [PATCH 5/5] 'commit'
---
.idea/workspace.xml | 18 +++++++++++++-----
.../Controller/LoginPersonController.java | 18 ++++++++++--------
2 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ad541004..1bb36913 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,7 +6,7 @@
-
+
@@ -58,7 +58,7 @@
"应用程序.ResApplication.executor": "Debug"
}
}
-
+
@@ -85,6 +85,13 @@
+
+
+
+
+
+
+
@@ -100,8 +107,9 @@
-
@@ -141,8 +149,8 @@
file://$PROJECT_DIR$/dsBase/src/main/java/com/dsideal/base/LoginPerson/Controller/LoginPersonController.java
- 38
-
+ 27
+
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 e9db6213..ad7e7c5b 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
@@ -26,6 +26,15 @@ public class LoginPersonController extends Controller {
@Before({POST.class})
public void doLogin(String username, String password, String platform, int forVue) {
JSONObject jo = model.doLogin(username, password, platform, getResponse());
+
+ int identity_id = jo.getInteger("identity_id");
+ if (identity_id <= 0 || identity_id >= 4) {
+ renderJson(RetKit.renderFail("基础支撑平台只能是管理员登录访问，您的账号不是管理员！"));
+ return;
+ }
+ String person_id = jo.getString("person_id");
+ String bureau_id = jo.getString("bureau_id");
+ String person_name = jo.getString("person_name");
if (forVue == 0) {
renderJson(jo);
} else {
@@ -35,14 +44,7 @@ public class LoginPersonController extends Controller {
renderJson(RetKit.renderFail(msg));
return;
}
- int identity_id = jo.getInteger("identity_id");
- if (identity_id <= 0 || identity_id >= 4) {
- renderJson(RetKit.renderFail("基础支撑平台只能是管理员登录访问，您的账号不是管理员！"));
- return;
- }
- String person_id = jo.getString("person_id");
- String bureau_id = jo.getString("bureau_id");
- String person_name = jo.getString("person_name");
+
String jwt = jo.getString("jwt");
Map map = new HashMap<>();
map.put("identity_id", identity_id);