huanghai
/
dsProject
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

'commit'

Browse Source
main
HuangHai 10 months ago
parent fd14f8dd1c 03fd2c3282
commit dfc1c89e75
9 changed files with 2 additions and 273 deletions
Show Stats Download Patch File Download Diff File

24
.idea/compiler.xml
Unescape View File

@ -1,24 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<annotationProcessing>
<profile default="true" name="Default" enabled="true" />
<profile name="Maven default annotation processors profile" enabled="true">
<sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" />
<module name="dsBase" />
<module name="dsGw" />
<module name="dsBuild" />
<module name="dsRes" />
</profile>
</annotationProcessing>
</component>
<component name="JavacSettings">
<option name="ADDITIONAL_OPTIONS_OVERRIDE">
<module name="dsBase" options="-parameters" />
<module name="dsBuild" options="-parameters" />
<module name="dsRes" options="-parameters" />
</option>
</component>
</project>

15
.idea/encodings.xml
Unescape View File

@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding">
<file url="file://$PROJECT_DIR$/dsBase/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/dsBase/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/dsBuild/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/dsBuild/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/dsGw/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/dsGw/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/dsRes/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/dsRes/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
</component>
</project>

25
.idea/jarRepositories.xml
Unescape View File

@ -1,25 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RemoteRepositoriesConfiguration">
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Central Repository" />
<option name="url" value="https://repo.maven.apache.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="ali-maven" />
<option name="name" value="ali-maven" />
<option name="url" value="https://maven.aliyun.com/nexus/content/groups/public" />
</remote-repository>
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Maven Central repository" />
<option name="url" value="https://repo1.maven.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="jboss.community" />
<option name="name" value="JBoss Community repository" />
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
</remote-repository>
</component>
</project>

12
.idea/misc.xml
Unescape View File

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="MavenProjectsManager">
<option name="originalFiles">
<list>
<option value="$PROJECT_DIR$/pom.xml" />
</list>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="21" project-jdk-type="JavaSDK" />
</project>

11
.idea/modules.xml
Unescape View File

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/dsBase/dsBase.iml" filepath="$PROJECT_DIR$/dsBase/dsBase.iml" />
<module fileurl="file://$PROJECT_DIR$/dsBuild/dsBuild.iml" filepath="$PROJECT_DIR$/dsBuild/dsBuild.iml" />
<module fileurl="file://$PROJECT_DIR$/dsGw/dsGw.iml" filepath="$PROJECT_DIR$/dsGw/dsGw.iml" />
<module fileurl="file://$PROJECT_DIR$/dsRes/dsRes.iml" filepath="$PROJECT_DIR$/dsRes/dsRes.iml" />
</modules>
</component>
</project>

6
.idea/vcs.xml
Unescape View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>

175
.idea/workspace.xml
Unescape View File

@ -1,175 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="AutoImportSettings">
<option name="autoReloadType" value="SELECTIVE" />
</component>
<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" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
<option value="Class" />
</list>
</option>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="MavenImportPreferences">
<option name="generalSettings">
<MavenGeneralSettings>
<option name="customMavenHome" value="D:\apache-maven" />
<option name="mavenHomeTypeForPersistence" value="CUSTOM" />
</MavenGeneralSettings>
</option>
<option name="importingSettings">
<MavenImportingSettings>
<option name="vmOptionsForImporter" value="-Xms1024m -Xmx2048m" />
</MavenImportingSettings>
</option>
</component>
<component name="ProjectColorInfo">{
&quot;customColor&quot;: &quot;&quot;,
&quot;associatedIndex&quot;: 4
}</component>
<component name="ProjectId" id="2mbKcle5CV9u33bCPQuGNY1YxDQ" />
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent"><![CDATA[{
"keyToString": {
"RunOnceActivity.ShowReadmeOnStart": "true",
"git-widget-placeholder": "main",
"kotlin-language-version-configured": "true",
"last_opened_file_path": "D:/dsWork/dsProject/dsRes/src/main/resource/Sql",
"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",
"应用程序.BaseApplication.executor": "Run",
"应用程序.GwApplication.executor": "Debug",
"应用程序.Publish.executor": "Run",
"应用程序.ResApplication.executor": "Run",
"应用程序.TestMenu.executor": "Run"
}
}]]></component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="D:\dsWork\dsProject\dsRes\src\main\resource\Sql" />
</key>
</component>
<component name="RunManager" selected="应用程序.ResApplication">
<configuration name="BaseApplication" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="com.dsideal.base.BaseApplication" />
<module name="dsBase" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="com.dsideal.base.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="GwApplication" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="com.dsideal.gw.GwApplication" />
<module name="dsGw" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="com.dsideal.gw.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<method v="2">
<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" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="com.dsideal.resource.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="testDb" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="com.dsideal.resource.Test.testDb" />
<module name="dsRes" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="com.dsideal.resource.Test.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<recent_temporary>
<list>
<item itemvalue="应用程序.ResApplication" />
<item itemvalue="应用程序.BaseApplication" />
<item itemvalue="应用程序.testDb" />
<item itemvalue="应用程序.Publish" />
<item itemvalue="应用程序.GwApplication" />
</list>
</recent_temporary>
</component>
<component name="SharedIndexes">
<attachedChunks>
<set>
<option value="bundled-jdk-9823dce3aa75-b114ca120d71-intellij.indexing.shared.core-IU-242.21829.142" />
<option value="bundled-js-predefined-d6986cc7102b-7c0b70fcd90d-JavaScript-IU-242.21829.142" />
</set>
</attachedChunks>
</component>
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" />
<component name="TaskManager">
<task active="true" id="Default" summary="默认任务">
<changelist id="8a61ce26-c938-4ad4-aa09-565c63cde7d7" name="更改" comment="" />
<created>1727339918298</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1727339918298</updated>
<workItem from="1727339920435" duration="293000" />
<workItem from="1727340224328" duration="3509000" />
</task>
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="3" />
</component>
<component name="UnknownFeatures">
<option featureType="dependencySupport" implementationName="java:jakarta.ws.rs:jakarta.ws.rs-api" />
<option featureType="dependencySupport" implementationName="javascript:npm:vue" />
<option featureType="dependencySupport" implementationName="java:org.projectlombok:lombok" />
<option featureType="dependencySupport" implementationName="java:org.wiremock:wiremock" />
</component>
</project>

1
dsBase/src/main/java/com/dsideal/base/Menu/Controller/MenuController.java
Unescape View File

@ -252,7 +252,6 @@ public class MenuController extends Controller {
for (Record record : recordList) {
menuIdSet.add(record.getInt("menu_id"));
}
//需要根据所有可见菜单，递归处理，生成树形菜单
List<MenuModel.Menu> menuList = model.fetchMenu(1, menuIdSet);
renderJson(RetKit.renderSuccess(JSONUtil.parseArray(menuList)));

6
dsBase/src/main/java/com/dsideal/base/Menu/Model/MenuModel.java
Unescape View File

@ -350,21 +350,19 @@ public class MenuModel {
* @return 此父节点下所有的子菜单
*/
public List<Menu> fetchMenu(int parent_id, Set<Integer> menuIdSet) {
String sql = "select * from t_base_menu where parent_id = ? order by sort_id";
List<Record> list = Db.find(sql, parent_id);
List<Menu> res = new ArrayList<>();
for (Record rs : list) {
if (rs == null) return null;
int menu_id = rs.getInt("menu_id");
if (!menuIdSet.contains(menu_id)) {
return null;
continue;
}
Menu sMenu = new Menu();
String url = rs.getStr("url");
sMenu.setPath(url);
sMenu.setComponent(url);
Meta meta = new Meta();

Write Preview
Loading…
Cancel
Save