diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index d9d3722..0bcc71b 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -6,7 +6,7 @@
<sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" />
- <module name="WMSV1" />
+ <module name="wms2" />
<module name="huaheng" />
</profile>
</annotationProcessing>
@@ -15,6 +15,7 @@
<option name="ADDITIONAL_OPTIONS_OVERRIDE">
<module name="WMSV1" options="-parameters" />
<module name="huaheng" options="-parameters" />
+ <module name="wms2" options="-parameters" />
</option>
</component>
</project>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index b26911b..f20d44b 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
- <component name="Encoding">
+ <component name="Encoding" native2AsciiForPropertiesFiles="true" defaultCharsetForPropertiesFiles="UTF-8">
<file url="file://$PROJECT_DIR$" charset="UTF-8" />
+ <file url="PROJECT" charset="UTF-8" />
</component>
</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 4b661a5..3ccb27b 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
+ <component name="JavaScriptSettings">
+ <option name="languageLevel" value="ES6" />
+ </component>
<component name="MavenProjectsManager">
<option name="originalFiles">
<list>
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 340c810..d4d5f1d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,15 +2,10 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="9ff7b25e-dc1a-4859-8a0c-00039489e359" name="Default Changelist" comment="">
- <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/userWarehouse/domain/SysUserWarehouse.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/userWarehouse/mapper/SysUserWarehouseMapper.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/userWarehouse/service/SysUserWarehouseService.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/userWarehouse/service/SysUserWarehouseServiceImpl.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/controller/MaterialController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/controller/MaterialController.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/resources/templates/general/material/material.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/general/material/material.html" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
</list>
+ <ignored path="$PROJECT_DIR$/target/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -28,32 +23,41 @@
<option name="HIDDEN_KINDS">
<set />
</option>
- <expand>
- <path>
- <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
- <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
- </path>
- <path>
- <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
- <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
- <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
- </path>
- <path>
- <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
- <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
- <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
- <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
- </path>
- <path>
- <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
- <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
- <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
- <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
- <item name="material: table" type="285a2a93:MysqlImplModel$Table" />
- </path>
- </expand>
+ <expand />
<select />
</component>
+ <component name="FileEditorManager">
+ <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+ <file pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/pom.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="152">
+ <caret line="31" column="68" selection-start-line="31" selection-start-column="68" selection-end-line="31" selection-end-column="68" />
+ </state>
+ </provider>
+ <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
+ </entry>
+ </file>
+ <file pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/HuaHengApplication.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="88">
+ <caret line="11" column="3" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/application-druid.properties">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="140">
+ <caret line="7" selection-start-line="7" selection-end-line="7" />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ </leaf>
+ </component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
@@ -69,6 +73,18 @@
</map>
</option>
</component>
+ <component name="IdeDocumentHistory">
+ <option name="CHANGED_PATHS">
+ <list>
+ <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
+ <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/IndexController.java" />
+ <option value="$PROJECT_DIR$/src/main/java/com/huaheng/HuaHengApplication.java" />
+ <option value="$PROJECT_DIR$/src/main/resources/templates/system/dict/data/data.html" />
+ <option value="$PROJECT_DIR$/src/main/resources/application-druid.properties" />
+ <option value="$PROJECT_DIR$/pom.xml" />
+ </list>
+ </option>
+ </component>
<component name="IgnoredFileRootStore">
<option name="generatedRoots">
<set>
@@ -76,15 +92,152 @@
</set>
</option>
</component>
+ <component name="MavenImportPreferences">
+ <option name="importingSettings">
+ <MavenImportingSettings>
+ <option name="importAutomatically" value="true" />
+ </MavenImportingSettings>
+ </option>
+ </component>
+ <component name="MavenProjectNavigator">
+ <treeState>
+ <expand>
+ <path>
+ <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
+ <item name="huaheng" type="9519ce18:MavenProjectsStructure$ProjectNode" />
+ </path>
+ <path>
+ <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
+ <item name="huaheng" type="9519ce18:MavenProjectsStructure$ProjectNode" />
+ <item name="Lifecycle" type="58874e2:MavenProjectsStructure$LifecycleNode" />
+ </path>
+ </expand>
+ <select />
+ </treeState>
+ </component>
+ <component name="MavenRunner">
+ <option name="skipTests" value="true" />
+ </component>
<component name="ProjectFrameBounds" extendedState="6">
- <option name="x" value="470" />
- <option name="width" value="980" />
- <option name="height" value="1030" />
+ <option name="x" value="-1928" />
+ <option name="y" value="-8" />
+ <option name="width" value="1936" />
+ <option name="height" value="1056" />
</component>
<component name="ProjectId" id="1P5Ngjh73HToCarlEZkqMxrL7pm" />
<component name="ProjectLevelVcsManager">
<ConfirmationsSetting value="2" id="Add" />
</component>
+ <component name="ProjectView">
+ <navigator proportions="" version="1">
+ <foldersAlwaysOnTop value="true" />
+ </navigator>
+ <panes>
+ <pane id="ProjectPane">
+ <subPane>
+ <expand>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="java" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="java" type="462c0819:PsiDirectoryNode" />
+ <item name="com" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="java" type="462c0819:PsiDirectoryNode" />
+ <item name="com" type="462c0819:PsiDirectoryNode" />
+ <item name="huaheng" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="java" type="462c0819:PsiDirectoryNode" />
+ <item name="com" type="462c0819:PsiDirectoryNode" />
+ <item name="huaheng" type="462c0819:PsiDirectoryNode" />
+ <item name="pc" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="resources" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="resources" type="462c0819:PsiDirectoryNode" />
+ <item name="templates" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="resources" type="462c0819:PsiDirectoryNode" />
+ <item name="templates" type="462c0819:PsiDirectoryNode" />
+ <item name="system" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="resources" type="462c0819:PsiDirectoryNode" />
+ <item name="templates" type="462c0819:PsiDirectoryNode" />
+ <item name="system" type="462c0819:PsiDirectoryNode" />
+ <item name="dict" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="resources" type="462c0819:PsiDirectoryNode" />
+ <item name="templates" type="462c0819:PsiDirectoryNode" />
+ <item name="system" type="462c0819:PsiDirectoryNode" />
+ <item name="dict" type="462c0819:PsiDirectoryNode" />
+ <item name="data" type="462c0819:PsiDirectoryNode" />
+ </path>
+ </expand>
+ <select />
+ </subPane>
+ </pane>
+ <pane id="Scope" />
+ <pane id="PackagesPane" />
+ </panes>
+ </component>
<component name="PropertiesComponent">
<property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
<property name="DatabaseDriversLRU" value="mysql" />
@@ -125,9 +278,10 @@
</component>
<component name="RunManager">
<configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
- <module name="huaheng" />
+ <module name="wms2" />
<option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
- <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
+ <option name="ALTERNATIVE_JRE_PATH" value="C:\Program Files\Java\jdk1.8.0_202\jre" />
<option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />
<option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
<method v="2">
@@ -203,6 +357,46 @@
<option name="localTasksCounter" value="5" />
<servers />
</component>
+ <component name="ToolWindowManager">
+ <frame x="-1928" y="-8" width="1936" height="1056" extended-state="6" />
+ <editor active="true" />
+ <layout>
+ <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.4967462" visible="true" weight="0.16897655" />
+ <window_info id="Structure" order="1" sideWeight="0.5032538" side_tool="true" weight="0.1673774" />
+ <window_info id="Designer" order="2" />
+ <window_info id="UI Designer" order="3" />
+ <window_info id="Favorites" order="4" side_tool="true" />
+ <window_info id="Capture Tool" order="5" />
+ <window_info id="Web" order="6" side_tool="true" />
+ <window_info id="Image Layers" order="7" />
+ <window_info anchor="bottom" id="Message" order="0" />
+ <window_info anchor="bottom" id="Find" order="1" />
+ <window_info anchor="bottom" id="Run" order="2" />
+ <window_info anchor="bottom" id="Debug" order="3" visible="true" weight="0.54989153" />
+ <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+ <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+ <window_info anchor="bottom" id="TODO" order="6" />
+ <window_info anchor="bottom" id="Spring" order="7" />
+ <window_info anchor="bottom" id="Terminal" order="8" />
+ <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" />
+ <window_info anchor="bottom" id="Java Enterprise" order="10" />
+ <window_info anchor="bottom" id="Database Changes" order="11" />
+ <window_info anchor="bottom" id="Version Control" order="12" weight="0.1637744" />
+ <window_info anchor="bottom" id="Docker" order="13" show_stripe_button="false" />
+ <window_info anchor="bottom" id="Messages" order="14" weight="0.329718" />
+ <window_info anchor="bottom" id="MyBatis Log" order="15" />
+ <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
+ <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+ <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+ <window_info anchor="right" id="Maven" order="3" weight="0.22334754" />
+ <window_info anchor="right" id="Palette" order="4" />
+ <window_info anchor="right" id="Capture Analysis" order="5" />
+ <window_info anchor="right" id="Database" order="6" weight="0.32995737" />
+ <window_info anchor="right" id="Palette	" order="7" />
+ <window_info anchor="right" id="Theme Preview" order="8" />
+ <window_info anchor="right" id="Bean Validation" order="9" weight="0.32995737" />
+ </layout>
+ </component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
</component>
@@ -212,7 +406,20 @@
<entry key="MAIN">
<value>
<State>
- <option name="COLUMN_ORDER" />
+ <option name="RECENTLY_FILTERED_USER_GROUPS">
+ <collection />
+ </option>
+ <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
+ <collection />
+ </option>
+ <option name="COLUMN_ORDER">
+ <list>
+ <option value="0" />
+ <option value="1" />
+ <option value="2" />
+ <option value="3" />
+ </list>
+ </option>
</State>
</value>
</entry>
@@ -238,7 +445,9 @@
<MESSAGE value="添加入库、出库表实体类 添加客户、供应商增删改查接口 添加库位、容器、供应商页面" />
<MESSAGE value="修改库区service" />
<MESSAGE value="Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop # Conflicts: #	.idea/workspace.xml" />
- <option name="LAST_COMMIT_MESSAGE" value="Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop # Conflicts: #	.idea/workspace.xml" />
+ <MESSAGE value="配置文件更新修改" />
+ <MESSAGE value="修复页面字典明细报错" />
+ <option name="LAST_COMMIT_MESSAGE" value="修复页面字典明细报错" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
@@ -246,9 +455,81 @@
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/controller/MaterialController.java</url>
<line>78</line>
+ <properties />
<option name="timeStamp" value="1" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
</component>
+ <component name="editorHistoryManager">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/common/redis/RedisConfig.java" />
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/HuaHengServletInitializer.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="180">
+ <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/common/redis/serviceimpl/RedisServiceImpl.java" />
+ <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-272">
+ <caret line="17" column="17" selection-start-line="17" selection-start-column="17" selection-end-line="17" selection-end-column="17" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/report/excelReport/service/ExcelReportService.java">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/domain/User.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="113">
+ <caret line="147" column="39" selection-start-line="147" selection-start-column="39" selection-end-line="147" selection-end-column="39" />
+ <folding>
+ <element signature="e#3376#3377#0" expanded="true" />
+ <element signature="e#3415#3416#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/IndexController.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="372">
+ <caret line="311" column="16" selection-start-line="311" selection-start-column="16" selection-end-line="311" selection-end-column="16" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/templates/system/dict/data/data.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="2980">
+ <caret line="149" column="10" selection-start-line="149" selection-start-column="10" selection-end-line="149" selection-end-column="10" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/HuaHengApplication.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="88">
+ <caret line="11" column="3" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/application-druid.properties">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="140">
+ <caret line="7" selection-start-line="7" selection-end-line="7" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/pom.xml">
+ <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="152">
+ <caret line="31" column="68" selection-start-line="31" selection-start-column="68" selection-end-line="31" selection-end-column="68" />
+ </state>
+ </provider>
+ </entry>
+ </component>
</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 97596a1..5e3deb0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,16 +5,16 @@
<groupId>com.huaheng</groupId>
<artifactId>huaheng</artifactId>
- <version>2.3.0</version>
+ <version>4.0.0</version>
<packaging>jar</packaging>
<name>huaheng</name>
- <description>华恒管理系统</description>
+ <description>华恒WMS管理系统</description>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>2.0.3.RELEASE</version>
+ <version>2.1.3.RELEASE</version>
<relativePath />
</parent>
@@ -22,20 +22,20 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
- <shiro.version>1.4.0</shiro.version>
+ <shiro.version>1.4.1</shiro.version>
<thymeleaf.extras.shiro.version>2.0.0</thymeleaf.extras.shiro.version>
<!--<mybatis.spring.boot.starter.version>1.3.2</mybatis.spring.boot.starter.version>-->
<pagehelper.spring.boot.starter.version>1.2.12</pagehelper.spring.boot.starter.version>
- <fastjson.version>1.2.47</fastjson.version>
- <druid.version>1.1.10</druid.version>
- <commons.io.version>2.2</commons.io.version>
+ <fastjson.version>1.2.59</fastjson.version>
+ <druid.version>1.1.18</druid.version>
+ <commons.io.version>2.5</commons.io.version>
<commons.fileupload.version>1.4</commons.fileupload.version>
- <bitwalker.version>1.19</bitwalker.version>
+ <bitwalker.version>1.21</bitwalker.version>
<lombok.version>1.18.8</lombok.version>
<velocity.version>1.7</velocity.version>
<kaptcha.version>2.3.2</kaptcha.version>
- <swagger.version>2.7.0</swagger.version>
- <jsoup.version>1.11.3</jsoup.version>
+ <swagger.version>2.9.2</swagger.version>
+ <jsoup.version>1.12.1</jsoup.version>
<maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format>
</properties>
@@ -114,16 +114,10 @@
</dependency>
<!--阿里数据库连接池 -->
-<!-- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>druid-spring-boot-starter</artifactId>
- <version>${druid.version}</version>
- </dependency>-->
-
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
- <version>1.1.17</version>
+ <version>${druid.version}</version>
</dependency>
<!--常用工具类 -->
@@ -199,12 +193,12 @@
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
<version>2.3.1</version>
- <exclusions>
+ <!--<exclusions>
<exclusion>
<groupId>com.mchange</groupId>
<artifactId>c3p0</artifactId>
</exclusion>
- </exclusions>
+ </exclusions>-->
</dependency>
<!--velocity代码生成使用模板 -->
@@ -262,51 +256,13 @@
<!--<version>6.0.0</version>-->
<!--</dependency>-->
- <!--共享Session-spring-session-data-redis分布式系统中-->
- <dependency>
- <groupId>org.springframework.session</groupId>
- <artifactId>spring-session-data-redis</artifactId>
- </dependency>
- <!-- Spring Boot Redis依赖 -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-data-redis</artifactId>
- <!-- 1.5的版本默认采用的连接池技术是jedis 2.0以上版本默认连接池是lettuce, 在这里采用jedis，所以需要排除lettuce的jar -->
- <exclusions>
- <exclusion>
- <groupId>redis.clients</groupId>
- <artifactId>jedis</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.lettuce</groupId>
- <artifactId>lettuce-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <!-- 添加jedis客户端 -->
- <dependency>
- <groupId>redis.clients</groupId>
- <artifactId>jedis</artifactId>
- </dependency>
-
- <!--spring2.0集成redis所需common-pool2-->
- <!-- 必须加上，jedis依赖此 -->
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-pool2</artifactId>
- <version>2.5.0</version>
- </dependency>
-
- <!-- 将作为Redis对象序列化器 -->
+ <!--json库-->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
- <version>1.2.47</version>
+ <version>${fastjson.version}</version>
</dependency>
-
-
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
@@ -317,25 +273,29 @@
<artifactId>httpcore</artifactId>
</dependency>
-
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-mail</artifactId>
</dependency>
-
-
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.2</version>
</dependency>
- <dependency>
+<!-- <dependency>
<groupId>com.huaheng.soft</groupId>
<artifactId>echarts</artifactId>
<version>1.1</version>
- </dependency>
+ </dependency>-->
+
+ <dependency>
+ <groupId>com.github.abel533</groupId>
+ <artifactId>ECharts</artifactId>
+ <version>3.0.0.5</version>
+ </dependency>
+
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
@@ -392,6 +352,38 @@
</plugins>
</build>
+ <!--阿里maven地址-->
+ <!--<repositories>
+ <repository>
+ <id>nexus-aliyun</id>
+ <name>Nexus aliyun</name>
+ <layout>default</layout>
+ <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </repositories>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>nexus-aliyun</id>
+ <name>Nexus aliyun</name>
+ <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </pluginRepository>
+ </pluginRepositories>-->
+
+ <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpcore -->
+
<repositories>
<repository>
<id>nexus</id>
diff --git a/src/main/java/com/huaheng/HuaHengApplication.java b/src/main/java/com/huaheng/HuaHengApplication.java
index 5338a38..1e88eca 100644
--- a/src/main/java/com/huaheng/HuaHengApplication.java
+++ b/src/main/java/com/huaheng/HuaHengApplication.java
@@ -10,8 +10,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
*
* @author huaheng
*/
-//@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
-@MapperScan("com.huaheng.pc.**.**.mapper")
+@MapperScan({"com.huaheng.pc.**.**.mapper","com.huaheng.common.**.**.mapper"})
//添加SecurityAutoConfiguration.class，防止报java.lang.ArrayStoreException错
@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
public class HuaHengApplication
@@ -20,7 +19,7 @@ public class HuaHengApplication
{
// System.setProperty("spring.devtools.restart.enabled", "false");
SpringApplication.run(HuaHengApplication.class, args);
- System.out.println("(♥◠‿◠)ﾉﾞ 华恒启动成功 ლ(´ڡ`ლ)ﾞ \n" +
+ System.out.println("*************** 华恒WMS启动成功 ***************\n" +
" .-------. ____ __ \n" +
" | _ _ \\ \\ \\ / / \n" +
" | ( ' ) | \\ _. / ' \n" +
diff --git a/src/main/java/com/huaheng/common/redis/RedisConfig.java b/src/main/java/com/huaheng/common/redis/RedisConfig.java
deleted file mode 100644
index f978d0d..0000000
--- a/src/main/java/com/huaheng/common/redis/RedisConfig.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.huaheng.common.redis;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.core.*;
-import org.springframework.data.redis.serializer.JdkSerializationRedisSerializer;
-import org.springframework.data.redis.serializer.StringRedisSerializer;
-
-@Configuration
-public class RedisConfig {
-
- /**
- * 注入 RedisConnectionFactory
- */
- @Autowired
- RedisConnectionFactory redisConnectionFactory;
-
- /**
- * 实例化 RedisTemplate 对象
- *
- * @return
- */
- @Bean
- public RedisTemplate<String, Object> functionDomainRedisTemplate() {
- RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
- initDomainRedisTemplate(redisTemplate, redisConnectionFactory);
- return redisTemplate;
- }
-
- /**
- * 设置数据存入 redis 的序列化方式
- *
- * @param redisTemplate
- * @param factory
- */
- private void initDomainRedisTemplate(RedisTemplate<String, Object> redisTemplate, RedisConnectionFactory factory) {
- redisTemplate.setKeySerializer(new StringRedisSerializer());
- redisTemplate.setHashKeySerializer(new StringRedisSerializer());
- redisTemplate.setHashValueSerializer(new JdkSerializationRedisSerializer());
- redisTemplate.setValueSerializer(new JdkSerializationRedisSerializer());
- redisTemplate.setConnectionFactory(factory);
- }
-
- /**
- * 实例化 HashOperations 对象,可以使用 Hash 类型操作
- *
- * @param redisTemplate
- * @return
- */
- @Bean
- public HashOperations<String, String, Object> hashOperations(RedisTemplate<String, Object> redisTemplate) {
- return redisTemplate.opsForHash();
- }
-
- /**
- * 实例化 ValueOperations 对象,可以使用 String 操作
- *
- * @param redisTemplate
- * @return
- */
- @Bean
- public ValueOperations<String, Object> valueOperations(RedisTemplate<String, Object> redisTemplate) {
- return redisTemplate.opsForValue();
- }
-
- /**
- * 实例化 ListOperations 对象,可以使用 List 操作
- *
- * @param redisTemplate
- * @return
- */
- @Bean
- public ListOperations<String, Object> listOperations(RedisTemplate<String, Object> redisTemplate) {
- return redisTemplate.opsForList();
- }
-
- /**
- * 实例化 SetOperations 对象,可以使用 Set 操作
- *
- * @param redisTemplate
- * @return
- */
- @Bean
- public SetOperations<String, Object> setOperations(RedisTemplate<String, Object> redisTemplate) {
- return redisTemplate.opsForSet();
- }
-
- /**
- * 实例化 ZSetOperations 对象,可以使用 ZSet 操作
- *
- * @param redisTemplate
- * @return
- */
- @Bean
- public ZSetOperations<String, Object> zSetOperations(RedisTemplate<String, Object> redisTemplate) {
- return redisTemplate.opsForZSet();
- }
-}
\ No newline at end of file
diff --git a/src/main/java/com/huaheng/common/redis/controller/RedisController.java b/src/main/java/com/huaheng/common/redis/controller/RedisController.java
deleted file mode 100644
index e8e7c5e..0000000
--- a/src/main/java/com/huaheng/common/redis/controller/RedisController.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.huaheng.common.redis.controller;
-
-import com.huaheng.common.redis.model.RedisModel;
-import com.huaheng.common.redis.serviceimpl.RedisServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-
-@Controller
-public class RedisController {
-
- @Autowired
- private RedisServiceImpl service;
-
- //添加
-// @RequestMapping(value = "/add", method = RequestMethod.GET)
- public void test() {
- System.out.println("start.....");
- RedisModel m = new RedisModel();
- m.setName("张三");
- m.setTel("1111");
- m.setAddress("长沙");
- m.setRedisKey("zhangsanKey01");
- service.put(m.getRedisKey(), m, -1);
-
- RedisModel m2 = new RedisModel();
- m2.setName("张三2");
- m2.setTel("2222");
- m2.setAddress("长沙2");
- m2.setRedisKey("zhangsanKey02");
- service.put(m2.getRedisKey(), m2, -1);
-
- RedisModel m3 = new RedisModel();
- m3.setName("张三3");
- m3.setTel("2222");
- m3.setAddress("长沙3");
- m3.setRedisKey("zhangsanKey03");
- service.put(m3.getRedisKey(), m3, -1);
-
- System.out.println("add success end...");
- }
-
- //查询所有对象
-// @RequestMapping(value = "/getAll", method = RequestMethod.GET)
-// @ResponseBody
- public Object getAll() {
- return service.getAll();
- }
-
- //查询所有key
-// @RequestMapping(value = "/getKeys", method = RequestMethod.GET)
-// @ResponseBody
- public Object getKeys() {
- return service.getKeys();
- }
-
- //根据key查询
-// @RequestMapping(value = "/get", method = RequestMethod.GET)
- public Object get(String key) {
- RedisModel m = new RedisModel();
- m.setRedisKey(key);
- return service.get(m.getRedisKey());
- }
-
- //删除
-// @RequestMapping(value = "/remove", method = RequestMethod.GET)
-// @ResponseBody
- public void remove() {
- RedisModel m = new RedisModel();
- m.setRedisKey("zhangsanKey01");
- service.remove(m.getRedisKey());
- }
-
- //判断key是否存在
-// @RequestMapping(value = "/isKeyExists", method = RequestMethod.GET)
-// @ResponseBody
- public void isKeyExists() {
- RedisModel m = new RedisModel();
- m.setRedisKey("zhangsanKey01");
- boolean flag = service.isKeyExists(m.getRedisKey());
- System.out.println("zhangsanKey01 是否存在: "+flag);
- }
-
- //查询当前缓存的数量
-// @RequestMapping(value = "/count", method = RequestMethod.GET)
-// @ResponseBody
- public Object count() {
- return service.count();
- }
-
- //清空所有key
-// @RequestMapping(value = "/empty", method = RequestMethod.GET)
-// @ResponseBody
- public void empty() {
- service.empty();
- }
-}
\ No newline at end of file
diff --git a/src/main/java/com/huaheng/common/redis/model/RedisModel.java b/src/main/java/com/huaheng/common/redis/model/RedisModel.java
deleted file mode 100644
index 6c6a26e..0000000
--- a/src/main/java/com/huaheng/common/redis/model/RedisModel.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.huaheng.common.redis.model;
-
-import java.io.Serializable;
-
-public class RedisModel implements Serializable {
-
-
- private String redisKey;//redis中的key
- private String name;//姓名
- private String tel;//电话
- private String address;//住址
-
- public String getRedisKey() {
- return redisKey;
- }
-
- public void setRedisKey(String redisKey) {
- this.redisKey = redisKey;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getTel() {
- return tel;
- }
-
- public void setTel(String tel) {
- this.tel = tel;
- }
-
- public String getAddress() {
- return address;
- }
-
- public void setAddress(String address) {
- this.address = address;
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/huaheng/common/redis/service/IRedisService.java b/src/main/java/com/huaheng/common/redis/service/IRedisService.java
deleted file mode 100644
index b9f1a95..0000000
--- a/src/main/java/com/huaheng/common/redis/service/IRedisService.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.huaheng.common.redis.service;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.HashOperations;
-import org.springframework.data.redis.core.RedisTemplate;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
-public abstract class IRedisService<T> {
-
-
- @Autowired
- protected RedisTemplate<String, Object> redisTemplate;
- @Resource
- protected HashOperations<String, String, T> hashOperations;
-
- /**
- * 存入redis中的key
- *
- * @return
- */
- protected abstract String getRedisKey();
-
-
- /**
- * 添加
- *
- * @param key key
- * @param doamin 对象
- * @param expire 过期时间(单位:秒),传入 -1 时表示不设置过期时间
- */
- public void put(String key, T doamin, long expire) {
- hashOperations.put(getRedisKey(), key, doamin);
- if (expire != -1) {
- redisTemplate.expire(getRedisKey(), expire, TimeUnit.SECONDS);
- }
- }
-
- /**
- * 删除
- *
- * @param key 传入key的名称
- */
- public void remove(String key) {
- hashOperations.delete(getRedisKey(), key);
- }
-
- /**
- * 查询
- *
- * @param key 查询的key
- * @return
- */
- public T get(String key) {
- return hashOperations.get(getRedisKey(), key);
- }
-
- /**
- * 获取当前redis库下所有对象
- *
- * @return
- */
- public List<T> getAll() {
- return hashOperations.values(getRedisKey());
- }
-
- /**
- * 查询查询当前redis库下所有key
- *
- * @return
- */
- public Set<String> getKeys() {
- return hashOperations.keys(getRedisKey());
- }
-
- /**
- * 判断key是否存在redis中
- *
- * @param key 传入key的名称
- * @return
- */
- public boolean isKeyExists(String key) {
- return hashOperations.hasKey(getRedisKey(), key);
- }
-
- /**
- * 查询当前key下缓存数量
- *
- * @return
- */
- public long count() {
- return hashOperations.size(getRedisKey());
- }
-
- /**
- * 清空redis
- */
- public void empty() {
- Set<String> set = hashOperations.keys(getRedisKey());
- set.stream().forEach(key -> hashOperations.delete(getRedisKey(), key));
- }
-}
\ No newline at end of file
diff --git a/src/main/java/com/huaheng/common/redis/serviceimpl/RedisServiceImpl.java b/src/main/java/com/huaheng/common/redis/serviceimpl/RedisServiceImpl.java
deleted file mode 100644
index 09a7297..0000000
--- a/src/main/java/com/huaheng/common/redis/serviceimpl/RedisServiceImpl.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.huaheng.common.redis.serviceimpl;
-
-import com.huaheng.common.redis.model.RedisModel;
-import com.huaheng.common.redis.service.IRedisService;
-import org.springframework.stereotype.Service;
-
-@Service
-public class RedisServiceImpl extends IRedisService<RedisModel> {
-
- private static final String REDIS_KEY = "TEST_REDIS_KEY";
-
- @Override
- protected String getRedisKey() {
-
-
- return this.REDIS_KEY;
- }
-}
diff --git a/src/main/java/com/huaheng/pc/system/user/controller/IndexController.java b/src/main/java/com/huaheng/pc/system/user/controller/IndexController.java
index a172a96..44d8b4d 100644
--- a/src/main/java/com/huaheng/pc/system/user/controller/IndexController.java
+++ b/src/main/java/com/huaheng/pc/system/user/controller/IndexController.java
@@ -6,10 +6,7 @@ import com.github.abel533.echarts.Option;
import com.github.abel533.echarts.axis.Axis;
import com.github.abel533.echarts.axis.CategoryAxis;
import com.github.abel533.echarts.axis.ValueAxis;
-import com.github.abel533.echarts.code.Orient;
-import com.github.abel533.echarts.code.PointerType;
-import com.github.abel533.echarts.code.SeriesType;
-import com.github.abel533.echarts.code.Trigger;
+import com.github.abel533.echarts.code.*;
import com.github.abel533.echarts.json.GsonUtil;
import com.github.abel533.echarts.series.Line;
import com.github.abel533.echarts.series.Pie;
@@ -76,7 +73,7 @@ public class IndexController extends BaseController
pie.itemStyle().emphasis().setShadowBlur(10);
pie.itemStyle().emphasis().setShadowOffsetX(0);
pie.itemStyle().emphasis().setShadowColor("rgba(0, 0, 0, 0.4)");
- String sql = "SELECT d.dictLabel '状态', i.qty '库存' FROM (SELECT status ,SUM(qty) qty FROM inventory WHERE warehouseCode = " + ShiroUtils.getWarehouseCode() + " GROUP BY status) i INNER JOIN sys_dict_data d ON i.status= d.dictValue AND d.warehouseCode = '" + ShiroUtils.getWarehouseCode()+"'";
+ String sql = "SELECT d.dictLabel '状态', i.qty '库存' FROM (SELECT status ,SUM(qty) qty FROM inventory WHERE warehouseCode = " + ShiroUtils.getWarehouseCode() + " GROUP BY status) i INNER JOIN sys_dict_data d ON i.status= d.dictValue AND d.warehouseCode = ' " + ShiroUtils.getWarehouseCode()+"' ;";
List<LinkedHashMap<String, Object>> results = mapper.selectCommon(sql);
for(LinkedHashMap<String, Object> item : results){
ChartData chartData = new ChartData();
@@ -226,7 +223,8 @@ public class IndexController extends BaseController
option.legend().setTop(10);
option.legend().setBottom(10);
option.legend().setData(new ArrayList<String>());
- option.legend().setType("scroll");
+ option.legend().setType(LegendType.scroll);
+ // option.legend().setType("scroll");
Pie pie = new Pie();
pie.setName("库存");
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 39e9539..fbbb31b 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -2,7 +2,7 @@
#\u540D\u79F0
huaheng.name=huaheng
#\u7248\u672C
-huaheng.version=2.6.0
+huaheng.version=4.0.0
#\u7248\u6743\u5E74\u4EFD
huaheng.copyrightYear=2018
#\u5934\u50CF\u4E0A\u4F20\u8DEF\u5F84
@@ -107,31 +107,5 @@ gen.autoRemovePre=false
# \u8868\u524D\u7F00(\u7C7B\u540D\u4E0D\u4F1A\u5305\u542B\u8868\u524D\u7F00)
gen.tablePrefix=sys_
-# default-store in spring session. it will be set in redis only outside.
-spring.session.store-type=none
-# REDIS (RedisProperties)
-# Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
-spring.redis.database=0
-# Redis\u670D\u52A1\u5668\u5730\u5740
-spring.redis.host=127.0.0.1
-# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u7AEF\u53E3
-spring.redis.port=6379
-# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09
-spring.redis.password=
-# \u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
-#spring.redis.pool.max-active=8
-spring.redis.jedis.pool.max-active=8
-# \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
-#spring.redis.pool.max-wait=-1
-spring.redis.jedis.pool.max-wait=-1ms
-# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5
-#spring.redis.pool.max-idle=8
-spring.redis.jedis.pool.max-idle=8
-# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5
-#spring.redis.pool.min-idle=0
-spring.redis.jedis.pool.min-idle= 0
-# \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09
-spring.redis.timeout= 0
-spring.redis.lettuce.shutdown-timeout=0ms
diff --git a/src/main/resources/templates/system/dict/data/data.html b/src/main/resources/templates/system/dict/data/data.html
index d980910..2369264 100644
--- a/src/main/resources/templates/system/dict/data/data.html
+++ b/src/main/resources/templates/system/dict/data/data.html
@@ -54,7 +54,7 @@
<!--</div>-->
<div class="btn-group hidden-xs" id="toolbar" role="group">
- <a class="btn btn-outline btn-success btn-rounded" th:onclick="'javascript:$.operate.add(\''+${dict.dictType}+'\')'"
+ <a class="btn btn-outline btn-success btn-rounded" th:value="${dict.dictType}" onclick="add()" id="add"
shiro:hasPermission="system:dict:add">
<i class="fa fa-plus"></i> 新增
</a>
@@ -149,6 +149,12 @@
dictType: $("#dictType").val()
};
}
+
+ function add() {
+ let id=$("#add").attr('value');
+ $.operate.add(id);
+ }
+
</script>
</body>
</html>
\ No newline at end of file