'commit'

.gitignore

@@ -8,4 +8,5 @@
 /dsRes/lib/
 /dsGw/target/
 /dsGw/lib/
+/.idea/
 

.idea/workspace.xml

@@ -6,6 +6,7 @@
   <component name="ChangeListManager">
     <list default="true" id="8a61ce26-c938-4ad4-aa09-565c63cde7d7" name="更改" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/dsBase/src/main/java/com/dsideal/base/LoginPerson/Controller/LoginPersonController.java" beforeDir="false" afterPath="$PROJECT_DIR$/dsBase/src/main/java/com/dsideal/base/LoginPerson/Controller/LoginPersonController.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -25,14 +26,13 @@
     <option name="importingSettings">
       <MavenImportingSettings>
         <option name="vmOptionsForImporter" value="-Xms1024m -Xmx2048m" />
-        <option name="workspaceImportForciblyTurnedOn" value="true" />
       </MavenImportingSettings>
     </option>
   </component>
   <component name="ProjectColorInfo">{
-  &quot;customColor&quot;: &quot;&quot;,
+    &quot;customColor&quot;: &quot;&quot;,
-  &quot;associatedIndex&quot;: 4
+    &quot;associatedIndex&quot;: 4
-}</component>
+    }</component>
   <component name="ProjectId" id="2mbKcle5CV9u33bCPQuGNY1YxDQ" />
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
@@ -51,14 +51,15 @@
     "project.structure.last.edited": "模块",
     "project.structure.proportion": "0.0",
     "project.structure.side.proportion": "0.0",
-    "settings.editor.selected.configurable": "preferences.pluginManager",
+    "settings.editor.selected.configurable": "reference.settings.project.maven.importing",
     "vue.rearranger.settings.migration": "true",
-    "应用程序.BaseApplication.executor": "Run",
+    "应用程序.BaseApplication.executor": "Debug",
-    "应用程序.GwApplication.executor": "Run",
+    "应用程序.GwApplication.executor": "Debug",
-    "应用程序.ResApplication.executor": "Run"
+    "应用程序.Publish.executor": "Run",
+    "应用程序.ResApplication.executor": "Debug"
   }
 }]]></component>
-  <component name="RunManager" selected="应用程序.BaseApplication">
+  <component name="RunManager" selected="应用程序.Publish">
     <configuration name="BaseApplication" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="com.dsideal.base.BaseApplication" />
       <module name="dsBase" />
@@ -85,6 +86,13 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
+    <configuration name="Publish" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="Publish" />
+      <module name="dsBuild" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <configuration name="ResApplication" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="com.dsideal.resource.ResApplication" />
       <module name="dsRes" />
@@ -100,17 +108,18 @@
     </configuration>
     <recent_temporary>
       <list>
+        <item itemvalue="应用程序.Publish" />
         <item itemvalue="应用程序.BaseApplication" />
-        <item itemvalue="应用程序.GwApplication" />
         <item itemvalue="应用程序.ResApplication" />
+        <item itemvalue="应用程序.GwApplication" />
       </list>
     </recent_temporary>
   </component>
   <component name="SharedIndexes">
     <attachedChunks>
       <set>
-        <option value="bundled-jdk-9f38398b9061-39b83d9b5494-intellij.indexing.shared.core-IU-241.17011.79" />
+        <option value="bundled-jdk-9823dce3aa75-b114ca120d71-intellij.indexing.shared.core-IU-242.21829.142" />
-        <option value="bundled-js-predefined-1d06a55b98c1-0b3e54e931b4-JavaScript-IU-241.17011.79" />
+        <option value="bundled-js-predefined-d6986cc7102b-7c0b70fcd90d-JavaScript-IU-242.21829.142" />
       </set>
     </attachedChunks>
   </component>
@@ -124,7 +133,6 @@
       <updated>1727339918298</updated>
       <workItem from="1727339920435" duration="293000" />
       <workItem from="1727340224328" duration="3509000" />
-      <workItem from="1727399806173" duration="2515000" />
     </task>
     <servers />
   </component>

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<String, Object> map = new HashMap<>();
             map.put("identity_id", identity_id);