'123123'
This commit is contained in:
parent
71437c1796
commit
e6ba51ee10
|
|
@ -4,6 +4,7 @@
|
||||||
<option name="originalFiles">
|
<option name="originalFiles">
|
||||||
<list>
|
<list>
|
||||||
<option value="$PROJECT_DIR$/pom.xml" />
|
<option value="$PROJECT_DIR$/pom.xml" />
|
||||||
|
<option value="$PROJECT_DIR$/ruoyi-common/pom.xml" />
|
||||||
</list>
|
</list>
|
||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
|
|
|
||||||
|
|
@ -2,13 +2,26 @@
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="1ea72584-8a6e-4fb7-9928-17671c0b6e92" name="Default Changelist" comment="">
|
<list default="true" id="1ea72584-8a6e-4fb7-9928-17671c0b6e92" name="Default Changelist" comment="">
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-admin/ruoyi-admin.iml" beforeDir="false" />
|
<change beforePath="$PROJECT_DIR$/ABAP_AS_WITH_POOL.jcoDestination" beforeDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/authorize/AuthorizeController.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/authorize/AuthorizeController.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-common/ruoyi-common.iml" beforeDir="false" />
|
<change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bid/BidController.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bid/BidController.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-framework/ruoyi-framework.iml" beforeDir="false" />
|
<change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/registeredCompany/RegisteredCompanyController.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/registeredCompany/RegisteredCompanyController.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-generator/ruoyi-generator.iml" beforeDir="false" />
|
<change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zgys/ZgysController.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zgys/ZgysController.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/ruoyi-quartz.iml" beforeDir="false" />
|
<change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/utils/SapHana/SapHanaUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/utils/SapHana/SapHanaUtils.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-system/ruoyi-system.iml" beforeDir="false" />
|
<change beforePath="$PROJECT_DIR$/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Base64.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Base64.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/bid/domain/Bid.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/bid/domain/Bid.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/registeredCompany/service/IRegisteredCompanyService.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/registeredCompany/service/IRegisteredCompanyService.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/registeredCompany/service/impl/RegisteredCompanyServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/registeredCompany/service/impl/RegisteredCompanyServiceImpl.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/authorize/AuthorizeMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/authorize/AuthorizeMapper.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/bid/BidMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/bid/BidMapper.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/registeredCompany/RegisteredCompanyMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/registeredCompany/RegisteredCompanyMapper.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/zgys/ZgysMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/zgys/ZgysMapper.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/ruoyi-ui/src/api/authorize/authorize.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-ui/src/api/authorize/authorize.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/ruoyi-ui/src/api/zgys/zgys.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-ui/src/api/zgys/zgys.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/ruoyi-ui/src/views/authorize/authorize/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-ui/src/views/authorize/authorize/index.vue" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/ruoyi-ui/src/views/bid/bid/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-ui/src/views/bid/bid/index.vue" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/ruoyi-ui/src/views/registeredCompany/registeredCompany/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-ui/src/views/registeredCompany/registeredCompany/index.vue" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/ruoyi-ui/src/views/zgys/zgys/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-ui/src/views/zgys/zgys/index.vue" afterDir="false" />
|
||||||
</list>
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
|
|
@ -35,18 +48,37 @@
|
||||||
<option name="showLibraryContents" value="true" />
|
<option name="showLibraryContents" value="true" />
|
||||||
</component>
|
</component>
|
||||||
<component name="PropertiesComponent">
|
<component name="PropertiesComponent">
|
||||||
|
<property name="RequestMappingsPanelOrder0" value="0" />
|
||||||
|
<property name="RequestMappingsPanelOrder1" value="1" />
|
||||||
|
<property name="RequestMappingsPanelWidth0" value="75" />
|
||||||
|
<property name="RequestMappingsPanelWidth1" value="75" />
|
||||||
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
|
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
|
||||||
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
|
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
|
||||||
<property name="WebServerToolWindowFactoryState" value="false" />
|
<property name="WebServerToolWindowFactoryState" value="false" />
|
||||||
<property name="android.sdk.path" value="$PROJECT_DIR$/../../Android" />
|
<property name="android.sdk.path" value="$PROJECT_DIR$/../../Android" />
|
||||||
<property name="aspect.path.notification.shown" value="true" />
|
<property name="aspect.path.notification.shown" value="true" />
|
||||||
<property name="last_opened_file_path" value="D:/xxl-job-master" />
|
<property name="last_opened_file_path" value="$PROJECT_DIR$/ruoyi-common" />
|
||||||
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
|
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
|
||||||
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
|
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
|
||||||
<property name="project.structure.last.edited" value="Modules" />
|
<property name="project.structure.last.edited" value="Modules" />
|
||||||
<property name="project.structure.proportion" value="0.0" />
|
<property name="project.structure.proportion" value="0.0" />
|
||||||
<property name="project.structure.side.proportion" value="0.0" />
|
<property name="project.structure.side.proportion" value="0.0" />
|
||||||
<property name="settings.editor.selected.configurable" value="preferences.fileTypes" />
|
<property name="settings.editor.selected.configurable" value="reference.projectsettings.compiler.javacompiler" />
|
||||||
|
</component>
|
||||||
|
<component name="ReactorSettings">
|
||||||
|
<option name="notificationShown" value="true" />
|
||||||
|
</component>
|
||||||
|
<component name="RecentsManager">
|
||||||
|
<key name="CopyClassDialog.RECENTS_KEY">
|
||||||
|
<recent name="com.ruoyi.registeredCompany.service.impl" />
|
||||||
|
<recent name="com.ruoyi.registeredCompany.service" />
|
||||||
|
<recent name="com.ruoyi.web.controller.registeredCompany" />
|
||||||
|
</key>
|
||||||
|
<key name="CopyFile.RECENT_KEYS">
|
||||||
|
<recent name="E:\myproject\JNBusinessTest\ruoyi-common" />
|
||||||
|
<recent name="E:\myproject\JNBusinessTest\ruoyi-ui\src\views\registeredCompany\registeredCompany" />
|
||||||
|
<recent name="E:\myproject\JNBusinessTest\ruoyi-system\src\main\resources\mapper\registeredCompany" />
|
||||||
|
</key>
|
||||||
</component>
|
</component>
|
||||||
<component name="RunManager">
|
<component name="RunManager">
|
||||||
<configuration name="RuoYiApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
|
<configuration name="RuoYiApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
|
||||||
|
|
@ -67,7 +99,8 @@
|
||||||
<option name="number" value="Default" />
|
<option name="number" value="Default" />
|
||||||
<option name="presentableId" value="Default" />
|
<option name="presentableId" value="Default" />
|
||||||
<updated>1722589212788</updated>
|
<updated>1722589212788</updated>
|
||||||
<workItem from="1722589222190" duration="959000" />
|
<workItem from="1722589222190" duration="1283000" />
|
||||||
|
<workItem from="1722816827706" duration="8874000" />
|
||||||
</task>
|
</task>
|
||||||
<servers />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
|
|
@ -79,9 +112,108 @@
|
||||||
<screen x="1920" y="0" width="1440" height="900" />
|
<screen x="1920" y="0" width="1440" height="900" />
|
||||||
</state>
|
</state>
|
||||||
<state x="2120" y="23" key="#Project_Structure/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722590259734" />
|
<state x="2120" y="23" key="#Project_Structure/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722590259734" />
|
||||||
<state x="2141" y="81" key="SettingsEditor" timestamp="1722589328632">
|
<state x="765" y="203" key="#com.intellij.ide.util.MemberChooser" timestamp="1722822113728">
|
||||||
|
<screen x="0" y="0" width="1920" height="1040" />
|
||||||
|
</state>
|
||||||
|
<state x="765" y="203" key="#com.intellij.ide.util.MemberChooser/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722822113728" />
|
||||||
|
<state x="2215" y="10" key="CommitChangelistDialog2" timestamp="1722590562023">
|
||||||
<screen x="1920" y="0" width="1440" height="900" />
|
<screen x="1920" y="0" width="1440" height="900" />
|
||||||
</state>
|
</state>
|
||||||
<state x="2141" y="81" key="SettingsEditor/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722589328632" />
|
<state x="2215" y="10" key="CommitChangelistDialog2/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722590562023" />
|
||||||
|
<state width="360" height="466" key="DebuggerActiveHint" timestamp="1722820599424">
|
||||||
|
<screen x="1920" y="0" width="1440" height="900" />
|
||||||
|
</state>
|
||||||
|
<state width="360" height="466" key="DebuggerActiveHint/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722820599424" />
|
||||||
|
<state width="1876" height="251" key="GridCell.Tab.0.bottom" timestamp="1722825677652">
|
||||||
|
<screen x="0" y="0" width="1920" height="1040" />
|
||||||
|
</state>
|
||||||
|
<state width="1876" height="251" key="GridCell.Tab.0.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722825677652" />
|
||||||
|
<state width="1396" height="286" key="GridCell.Tab.0.bottom/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722820740425" />
|
||||||
|
<state width="1876" height="251" key="GridCell.Tab.0.center" timestamp="1722825677652">
|
||||||
|
<screen x="0" y="0" width="1920" height="1040" />
|
||||||
|
</state>
|
||||||
|
<state width="1876" height="251" key="GridCell.Tab.0.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722825677652" />
|
||||||
|
<state width="1396" height="286" key="GridCell.Tab.0.center/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722820740425" />
|
||||||
|
<state width="1876" height="251" key="GridCell.Tab.0.left" timestamp="1722825677652">
|
||||||
|
<screen x="0" y="0" width="1920" height="1040" />
|
||||||
|
</state>
|
||||||
|
<state width="1876" height="251" key="GridCell.Tab.0.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722825677652" />
|
||||||
|
<state width="1396" height="286" key="GridCell.Tab.0.left/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722820740425" />
|
||||||
|
<state width="1876" height="251" key="GridCell.Tab.0.right" timestamp="1722825677652">
|
||||||
|
<screen x="0" y="0" width="1920" height="1040" />
|
||||||
|
</state>
|
||||||
|
<state width="1876" height="251" key="GridCell.Tab.0.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722825677652" />
|
||||||
|
<state width="1396" height="286" key="GridCell.Tab.0.right/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722820740425" />
|
||||||
|
<state width="1876" height="251" key="GridCell.Tab.1.bottom" timestamp="1722825677652">
|
||||||
|
<screen x="0" y="0" width="1920" height="1040" />
|
||||||
|
</state>
|
||||||
|
<state width="1876" height="251" key="GridCell.Tab.1.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722825677652" />
|
||||||
|
<state width="1396" height="286" key="GridCell.Tab.1.bottom/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722820780803" />
|
||||||
|
<state width="1876" height="251" key="GridCell.Tab.1.center" timestamp="1722825677652">
|
||||||
|
<screen x="0" y="0" width="1920" height="1040" />
|
||||||
|
</state>
|
||||||
|
<state width="1876" height="251" key="GridCell.Tab.1.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722825677652" />
|
||||||
|
<state width="1396" height="286" key="GridCell.Tab.1.center/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722820780802" />
|
||||||
|
<state width="1876" height="251" key="GridCell.Tab.1.left" timestamp="1722825677652">
|
||||||
|
<screen x="0" y="0" width="1920" height="1040" />
|
||||||
|
</state>
|
||||||
|
<state width="1876" height="251" key="GridCell.Tab.1.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722825677652" />
|
||||||
|
<state width="1396" height="286" key="GridCell.Tab.1.left/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722820780802" />
|
||||||
|
<state width="1876" height="251" key="GridCell.Tab.1.right" timestamp="1722825677652">
|
||||||
|
<screen x="0" y="0" width="1920" height="1040" />
|
||||||
|
</state>
|
||||||
|
<state width="1876" height="251" key="GridCell.Tab.1.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722825677652" />
|
||||||
|
<state width="1396" height="286" key="GridCell.Tab.1.right/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722820780803" />
|
||||||
|
<state width="1876" height="286" key="GridCell.Tab.2.bottom" timestamp="1722823960494">
|
||||||
|
<screen x="0" y="0" width="1920" height="1040" />
|
||||||
|
</state>
|
||||||
|
<state width="1876" height="286" key="GridCell.Tab.2.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722823960494" />
|
||||||
|
<state width="1396" height="286" key="GridCell.Tab.2.bottom/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722820740244" />
|
||||||
|
<state width="1876" height="286" key="GridCell.Tab.2.center" timestamp="1722823960494">
|
||||||
|
<screen x="0" y="0" width="1920" height="1040" />
|
||||||
|
</state>
|
||||||
|
<state width="1876" height="286" key="GridCell.Tab.2.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722823960494" />
|
||||||
|
<state width="1396" height="286" key="GridCell.Tab.2.center/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722820740244" />
|
||||||
|
<state width="1876" height="286" key="GridCell.Tab.2.left" timestamp="1722823960494">
|
||||||
|
<screen x="0" y="0" width="1920" height="1040" />
|
||||||
|
</state>
|
||||||
|
<state width="1876" height="286" key="GridCell.Tab.2.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722823960494" />
|
||||||
|
<state width="1396" height="286" key="GridCell.Tab.2.left/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722820740244" />
|
||||||
|
<state width="1876" height="286" key="GridCell.Tab.2.right" timestamp="1722823960494">
|
||||||
|
<screen x="0" y="0" width="1920" height="1040" />
|
||||||
|
</state>
|
||||||
|
<state width="1876" height="286" key="GridCell.Tab.2.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722823960494" />
|
||||||
|
<state width="1396" height="286" key="GridCell.Tab.2.right/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722820740244" />
|
||||||
|
<state x="2203" y="104" key="Maven.ArtifactSearchDialog" timestamp="1722820075785">
|
||||||
|
<screen x="1920" y="0" width="1440" height="900" />
|
||||||
|
</state>
|
||||||
|
<state x="2203" y="104" key="Maven.ArtifactSearchDialog/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722820075785" />
|
||||||
|
<state x="2378" y="150" key="RollbackChangesDialog" timestamp="1722820179295">
|
||||||
|
<screen x="1920" y="0" width="1440" height="900" />
|
||||||
|
</state>
|
||||||
|
<state x="2378" y="150" key="RollbackChangesDialog/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722820179295" />
|
||||||
|
<state x="2141" y="81" key="SettingsEditor" timestamp="1722819924883">
|
||||||
|
<screen x="1920" y="0" width="1440" height="900" />
|
||||||
|
</state>
|
||||||
|
<state x="2141" y="81" key="SettingsEditor/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722819924883" />
|
||||||
|
<state x="753" y="432" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1722823330683">
|
||||||
|
<screen x="0" y="0" width="1920" height="1040" />
|
||||||
|
</state>
|
||||||
|
<state x="753" y="432" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722823330683" />
|
||||||
|
<state x="2342" y="158" width="596" height="584" key="find.popup" timestamp="1722820196104">
|
||||||
|
<screen x="1920" y="0" width="1440" height="900" />
|
||||||
|
</state>
|
||||||
|
<state x="2342" y="158" width="596" height="584" key="find.popup/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722820196104" />
|
||||||
|
</component>
|
||||||
|
<component name="XDebuggerManager">
|
||||||
|
<breakpoint-manager>
|
||||||
|
<breakpoints>
|
||||||
|
<line-breakpoint enabled="true" type="java-line">
|
||||||
|
<url>file://$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java</url>
|
||||||
|
<line>760</line>
|
||||||
|
<option name="timeStamp" value="1" />
|
||||||
|
</line-breakpoint>
|
||||||
|
</breakpoints>
|
||||||
|
</breakpoint-manager>
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
|
|
@ -1,11 +0,0 @@
|
||||||
#for tests only !
|
|
||||||
#Fri Aug 02 13:09:29 CST 2024
|
|
||||||
jco.destination.pool_capacity=10
|
|
||||||
jco.client.lang=ZH
|
|
||||||
jco.client.ashost=172.19.0.125
|
|
||||||
jco.client.saprouter=
|
|
||||||
jco.client.user=RFC
|
|
||||||
jco.client.sysnr=00
|
|
||||||
jco.destination.peak_limit=10
|
|
||||||
jco.client.passwd=uyRgl++dZqA;l2c6j$SeZel?R;j?8Y)0^$A1gin]7Q8fi=-L
|
|
||||||
jco.client.client=800
|
|
||||||
|
|
@ -6,6 +6,7 @@ import javax.servlet.http.HttpServletResponse;
|
||||||
import com.ruoyi.authorize.domain.AuthorizeFile;
|
import com.ruoyi.authorize.domain.AuthorizeFile;
|
||||||
import com.ruoyi.authorize.domain.SysOaAuthorize;
|
import com.ruoyi.authorize.domain.SysOaAuthorize;
|
||||||
import com.ruoyi.authorize.service.IAuthorizeFileService;
|
import com.ruoyi.authorize.service.IAuthorizeFileService;
|
||||||
|
import com.ruoyi.bid.domain.Bid;
|
||||||
import com.ruoyi.common.core.domain.entity.SysDept;
|
import com.ruoyi.common.core.domain.entity.SysDept;
|
||||||
import com.ruoyi.common.utils.DateUtils;
|
import com.ruoyi.common.utils.DateUtils;
|
||||||
import com.ruoyi.common.utils.SecurityUtils;
|
import com.ruoyi.common.utils.SecurityUtils;
|
||||||
|
|
@ -149,6 +150,16 @@ public class AuthorizeController extends BaseController
|
||||||
@DeleteMapping("/{doaIds}")
|
@DeleteMapping("/{doaIds}")
|
||||||
public AjaxResult remove(@PathVariable String[] doaIds)
|
public AjaxResult remove(@PathVariable String[] doaIds)
|
||||||
{
|
{
|
||||||
|
for(String doaId:doaIds){
|
||||||
|
Authorize authorize = authorizeService.selectAuthorizeByDoaId(doaId);
|
||||||
|
if("1".equals(authorize.getDoaApprovalStatus())){
|
||||||
|
return error("授权备案:"+authorize.getDoaCode()+" 已提交，无法删除");
|
||||||
|
}else if("2".equals(authorize.getDoaApprovalStatus())){
|
||||||
|
return error("授权备案:"+authorize.getDoaCode()+" 已完成，无法删除");
|
||||||
|
}else if("3".equals(authorize.getDoaApprovalStatus())){
|
||||||
|
return error("授权备案:"+authorize.getDoaCode()+" 已被驳回，无法删除");
|
||||||
|
}
|
||||||
|
}
|
||||||
return toAjax(authorizeService.deleteAuthorizeByDoaIds(doaIds));
|
return toAjax(authorizeService.deleteAuthorizeByDoaIds(doaIds));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -297,6 +308,25 @@ public class AuthorizeController extends BaseController
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 投标驳回
|
||||||
|
*/
|
||||||
|
@PreAuthorize("@ss.hasPermi('authorize:authorize:reject')")
|
||||||
|
@ChangeRecordLog(serviceImplclass = "com.ruoyi.authorize.service.impl.AuthorizeServiceImpl",
|
||||||
|
serviceImplMethod="selectAuthorizeByDoaId",
|
||||||
|
tableId = "doaId",codeName = "doaCode",title = "投标办驳回")
|
||||||
|
@PostMapping("/rejectBid")
|
||||||
|
public AjaxResult rejectBid(@RequestBody Authorize authorize)
|
||||||
|
{
|
||||||
|
String doa_rejection_reasons = authorize.getDoaRejectionReasons();
|
||||||
|
if(StringUtils.isEmpty(doa_rejection_reasons)){
|
||||||
|
return error("授权备案-驳回原因不能为空");
|
||||||
|
}
|
||||||
|
authorize.setDoaApprovalStatus("3");
|
||||||
|
authorizeService.updateAuthorize(authorize);
|
||||||
|
return success();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 上传授权备案附件
|
* 上传授权备案附件
|
||||||
* @param file 文件对象
|
* @param file 文件对象
|
||||||
|
|
|
||||||
|
|
@ -578,10 +578,10 @@ public class BidController extends BaseController
|
||||||
public AjaxResult rejectBid(@RequestBody Bid bid)
|
public AjaxResult rejectBid(@RequestBody Bid bid)
|
||||||
{
|
{
|
||||||
|
|
||||||
/* String bid_returnRemark = bid.getBidReturnRemark();
|
String bid_returnRemark = bid.getBidReturnRemark();
|
||||||
if(StringUtils.isEmpty(bid_returnRemark)){
|
if(StringUtils.isEmpty(bid_returnRemark)){
|
||||||
return error("投标-反馈说明不能为空");
|
return error("投标-驳回原因不能为空");
|
||||||
}*/
|
}
|
||||||
bid.setBidApprovalStatus("3");
|
bid.setBidApprovalStatus("3");
|
||||||
bidService.updateBid(bid);
|
bidService.updateBid(bid);
|
||||||
return success();
|
return success();
|
||||||
|
|
|
||||||
|
|
@ -1,25 +1,20 @@
|
||||||
package com.ruoyi.web.controller.registeredCompany;
|
package com.ruoyi.web.controller.registeredCompany;
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import javax.servlet.http.HttpServletResponse;
|
|
||||||
import org.springframework.security.access.prepost.PreAuthorize;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
|
||||||
import org.springframework.web.bind.annotation.PutMapping;
|
|
||||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
|
||||||
import org.springframework.web.bind.annotation.PathVariable;
|
|
||||||
import org.springframework.web.bind.annotation.RequestBody;
|
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
|
||||||
import com.ruoyi.common.annotation.Log;
|
import com.ruoyi.common.annotation.Log;
|
||||||
import com.ruoyi.common.core.controller.BaseController;
|
import com.ruoyi.common.core.controller.BaseController;
|
||||||
import com.ruoyi.common.core.domain.AjaxResult;
|
import com.ruoyi.common.core.domain.AjaxResult;
|
||||||
|
import com.ruoyi.common.core.page.TableDataInfo;
|
||||||
import com.ruoyi.common.enums.BusinessType;
|
import com.ruoyi.common.enums.BusinessType;
|
||||||
|
import com.ruoyi.common.utils.poi.ExcelUtil;
|
||||||
|
import com.ruoyi.common.utils.uuid.UUID;
|
||||||
import com.ruoyi.registeredCompany.domain.RegisteredCompany;
|
import com.ruoyi.registeredCompany.domain.RegisteredCompany;
|
||||||
import com.ruoyi.registeredCompany.service.IRegisteredCompanyService;
|
import com.ruoyi.registeredCompany.service.IRegisteredCompanyService;
|
||||||
import com.ruoyi.common.utils.poi.ExcelUtil;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import com.ruoyi.common.core.page.TableDataInfo;
|
import org.springframework.security.access.prepost.PreAuthorize;
|
||||||
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 经营部注册公司Controller
|
* 经营部注册公司Controller
|
||||||
|
|
@ -81,6 +76,9 @@ public class RegisteredCompanyController extends BaseController
|
||||||
{
|
{
|
||||||
return error("创建注册公司失败,税号已存在");
|
return error("创建注册公司失败,税号已存在");
|
||||||
}
|
}
|
||||||
|
registeredCompany.setRegId(UUID.fastUUID().toString());
|
||||||
|
registeredCompany.setCreateBy(getUsername());
|
||||||
|
registeredCompany.setUpdateBy(getUsername());
|
||||||
return toAjax(registeredCompanyService.insertRegisteredCompany(registeredCompany));
|
return toAjax(registeredCompanyService.insertRegisteredCompany(registeredCompany));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -96,6 +94,7 @@ public class RegisteredCompanyController extends BaseController
|
||||||
{
|
{
|
||||||
return error("修改注册公司失败,税号已存在");
|
return error("修改注册公司失败,税号已存在");
|
||||||
}
|
}
|
||||||
|
registeredCompany.setUpdateBy(getUsername());
|
||||||
return toAjax(registeredCompanyService.updateRegisteredCompany(registeredCompany));
|
return toAjax(registeredCompanyService.updateRegisteredCompany(registeredCompany));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,7 @@ import java.util.Collection;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
|
||||||
|
import com.ruoyi.authorize.domain.Authorize;
|
||||||
import com.ruoyi.common.core.domain.entity.SysDept;
|
import com.ruoyi.common.core.domain.entity.SysDept;
|
||||||
import com.ruoyi.common.core.domain.entity.SysRole;
|
import com.ruoyi.common.core.domain.entity.SysRole;
|
||||||
import com.ruoyi.common.utils.DateUtils;
|
import com.ruoyi.common.utils.DateUtils;
|
||||||
|
|
@ -263,6 +264,25 @@ public class ZgysController extends BaseController
|
||||||
return success();
|
return success();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 投标驳回
|
||||||
|
*/
|
||||||
|
@PreAuthorize("@ss.hasPermi('zgys:zgys:reject')")
|
||||||
|
@ChangeRecordLog(serviceImplclass = "com.ruoyi.zgys.service.impl.ZgysServiceImpl",
|
||||||
|
serviceImplMethod="selectZgysByPqId",
|
||||||
|
tableId = "pqId",codeName = "pqCode",title = "投标办驳回")
|
||||||
|
@PostMapping("/rejectBid")
|
||||||
|
public AjaxResult rejectBid(@RequestBody Zgys zgys)
|
||||||
|
{
|
||||||
|
String pq_returnRemark = zgys.getPqReturnRemark();
|
||||||
|
if(StringUtils.isEmpty(pq_returnRemark)){
|
||||||
|
return error("资格预审-驳回原因不能为空");
|
||||||
|
}
|
||||||
|
zgys.setPqApprovalStatus("3");
|
||||||
|
zgysService.updateZgys(zgys);
|
||||||
|
return success();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 删除资格预审
|
* 删除资格预审
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -57,7 +57,6 @@ public class SapHanaUtils {
|
||||||
StringBuffer sf = new StringBuffer();
|
StringBuffer sf = new StringBuffer();
|
||||||
|
|
||||||
if(StringUtils.isNotEmpty(quotCustomerBm)){
|
if(StringUtils.isNotEmpty(quotCustomerBm)){
|
||||||
quotCustomerBm = quotCustomerBm.replaceAll("^(0+)", "");
|
|
||||||
sf.append(" select top 1 BAHNS from SAPHANADB.KNA1 ");
|
sf.append(" select top 1 BAHNS from SAPHANADB.KNA1 ");
|
||||||
sf.append(" where 1=1 and KUNNR = '"+quotCustomerBm+"' ");
|
sf.append(" where 1=1 and KUNNR = '"+quotCustomerBm+"' ");
|
||||||
rs = HanaDB.executeQuery(conn, String.valueOf(sf));
|
rs = HanaDB.executeQuery(conn, String.valueOf(sf));
|
||||||
|
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -1 +0,0 @@
|
||||||
restart.include.json=/com.alibaba.fastjson2.*.jar
|
|
||||||
|
|
@ -1,131 +0,0 @@
|
||||||
# 数据源配置
|
|
||||||
spring:
|
|
||||||
datasource:
|
|
||||||
type: com.alibaba.druid.pool.DruidDataSource
|
|
||||||
druid:
|
|
||||||
# 主库数据源
|
|
||||||
master:
|
|
||||||
driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
|
|
||||||
url: jdbc:sqlserver://192.168.9.210:1433;DatabaseName=jn_business
|
|
||||||
username: sa
|
|
||||||
password: Itcenter110-
|
|
||||||
# 红本数据库数据源
|
|
||||||
redbook:
|
|
||||||
# 从数据源开关/默认关闭
|
|
||||||
enabled: true
|
|
||||||
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
|
|
||||||
url: jdbc:sqlserver://172.19.6.3:1433;DatabaseName=RedBook
|
|
||||||
username: sa
|
|
||||||
password: Itcenter110-
|
|
||||||
# 红本数据库-OA单点登录数据源
|
|
||||||
oaredbook:
|
|
||||||
# 从数据源开关/默认关闭
|
|
||||||
enabled: true
|
|
||||||
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
|
|
||||||
url: jdbc:sqlserver://192.168.9.90:1433;DatabaseName=RedBook
|
|
||||||
username: sa
|
|
||||||
password: Itcenter110-
|
|
||||||
# 江南全要素报价数据库数据源
|
|
||||||
quot:
|
|
||||||
# 从数据源开关/默认关闭
|
|
||||||
enabled: true
|
|
||||||
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
|
|
||||||
# 测试数据库
|
|
||||||
# url: jdbc:sqlserver://192.168.9.130:1433;DatabaseName=jn_quot
|
|
||||||
# 正式数据库
|
|
||||||
url: jdbc:sqlserver://192.168.9.99:1433;DatabaseName=jn_quot
|
|
||||||
username: sa
|
|
||||||
password: Itcenter110-
|
|
||||||
# 江南erp数据库数据源
|
|
||||||
jnerp:
|
|
||||||
# 从数据源开关/默认关闭
|
|
||||||
enabled: true
|
|
||||||
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
|
|
||||||
url: jdbc:sqlserver://192.168.9.2:1433;DatabaseName=jn_erp
|
|
||||||
username: sa
|
|
||||||
password: it12345
|
|
||||||
# 车间库位管理数据库数据源
|
|
||||||
storage:
|
|
||||||
# 从数据源开关/默认关闭
|
|
||||||
enabled: true
|
|
||||||
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
|
|
||||||
# 正式数据库
|
|
||||||
url: jdbc:sqlserver://192.168.9.99:1433;DatabaseName=jn_storage
|
|
||||||
username: sa
|
|
||||||
password: Itcenter110-
|
|
||||||
#order:
|
|
||||||
# 从数据源开关/默认关闭
|
|
||||||
#enabled: true
|
|
||||||
#driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
|
|
||||||
# 正式数据库
|
|
||||||
#url: jdbc:sqlserver://192.168.9.2:1433;DatabaseName=jn_web
|
|
||||||
#username: sa
|
|
||||||
#password: it12345
|
|
||||||
# OA数据库数据源
|
|
||||||
oa:
|
|
||||||
# 从数据源开关/默认关闭
|
|
||||||
enabled: true
|
|
||||||
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
|
|
||||||
# 正式数据库
|
|
||||||
url: jdbc:sqlserver://192.168.9.182:1433;DatabaseName=ecology
|
|
||||||
username: sa
|
|
||||||
password: Itcenter110-
|
|
||||||
# 初始连接数
|
|
||||||
initialSize: 10
|
|
||||||
# 最小连接池数量
|
|
||||||
minIdle: 20
|
|
||||||
# 最大连接池数量
|
|
||||||
maxActive: 200
|
|
||||||
# 配置获取连接等待超时的时间
|
|
||||||
maxWait: 60000
|
|
||||||
# 配置连接超时时间
|
|
||||||
connectTimeout: 30000
|
|
||||||
# 配置网络超时时间
|
|
||||||
socketTimeout: 60000
|
|
||||||
# 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
|
|
||||||
timeBetweenEvictionRunsMillis: 60000
|
|
||||||
# 配置一个连接在池中最小生存的时间，单位是毫秒
|
|
||||||
minEvictableIdleTimeMillis: 300000
|
|
||||||
# 配置一个连接在池中最大生存的时间，单位是毫秒
|
|
||||||
maxEvictableIdleTimeMillis: 900000
|
|
||||||
# 配置检测连接是否有效
|
|
||||||
validationQuery: SELECT 1
|
|
||||||
testWhileIdle: true
|
|
||||||
testOnBorrow: true
|
|
||||||
testOnReturn: false
|
|
||||||
# 缓存游标，默认false
|
|
||||||
poolPreparedStatements: true
|
|
||||||
# 缓存游标最大数量，默认-1（不缓存）
|
|
||||||
max-open-prepared-statements: 50
|
|
||||||
webStatFilter:
|
|
||||||
enabled: true
|
|
||||||
statViewServlet:
|
|
||||||
enabled: true
|
|
||||||
# 设置白名单，不填则允许所有访问
|
|
||||||
allow:
|
|
||||||
url-pattern: /druid/*
|
|
||||||
# 控制台管理用户名和密码
|
|
||||||
login-username: ruoyi
|
|
||||||
login-password: 123456
|
|
||||||
filter:
|
|
||||||
stat:
|
|
||||||
enabled: true
|
|
||||||
# 慢SQL记录
|
|
||||||
log-slow-sql: true
|
|
||||||
slow-sql-millis: 2000
|
|
||||||
merge-sql: true
|
|
||||||
wall:
|
|
||||||
config:
|
|
||||||
multi-statement-allow: true
|
|
||||||
#连接出错后再尝试连接三次
|
|
||||||
connection-error-retry-attempts: 3
|
|
||||||
#超过时间限制是否回收
|
|
||||||
remove-abandoned: true
|
|
||||||
#超时时间；单位为秒。180秒=3分钟
|
|
||||||
remove-abandoned-timeout: 20
|
|
||||||
#关闭abanded连接时输出错误日志
|
|
||||||
log-abandoned: false
|
|
||||||
#默认为false。因此，如果想让数据库和网络故障恢复之后，pool能继续请求正常资源必须把此项配置设为false）
|
|
||||||
break-after-acquire-failure: false
|
|
||||||
fail-fast: true
|
|
||||||
time-between-connect-error-millis: 10000
|
|
||||||
|
|
@ -1,211 +0,0 @@
|
||||||
# 项目相关配置
|
|
||||||
ruoyi:
|
|
||||||
# 名称
|
|
||||||
name: RuoYi
|
|
||||||
# 版本
|
|
||||||
version: 3.8.7
|
|
||||||
# 版权年份
|
|
||||||
copyrightYear: 2024
|
|
||||||
# 实例演示开关
|
|
||||||
demoEnabled: true
|
|
||||||
# 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
|
|
||||||
profile: D:/ruoyi/uploadPath
|
|
||||||
# 获取ip地址开关
|
|
||||||
addressEnabled: false
|
|
||||||
# 验证码类型 math 数字计算 char 字符验证
|
|
||||||
captchaType: math
|
|
||||||
|
|
||||||
# 开发环境配置
|
|
||||||
server:
|
|
||||||
# 服务器的HTTP端口，默认为8080
|
|
||||||
port: 3334
|
|
||||||
compression:
|
|
||||||
#默认大于1KB的数据进行压缩
|
|
||||||
min-response-size: 1024
|
|
||||||
enabled: true
|
|
||||||
servlet:
|
|
||||||
# 应用的访问路径
|
|
||||||
context-path: /
|
|
||||||
tomcat:
|
|
||||||
# tomcat的URI编码
|
|
||||||
uri-encoding: UTF-8
|
|
||||||
# 连接数满后的排队数，默认为100
|
|
||||||
accept-count: 1000
|
|
||||||
connection-timeout: 600s
|
|
||||||
threads:
|
|
||||||
# tomcat最大线程数，默认为200
|
|
||||||
max: 800
|
|
||||||
# Tomcat启动初始化的线程数，默认值10
|
|
||||||
min-spare: 100
|
|
||||||
#最大连接数
|
|
||||||
max-connections: 10000
|
|
||||||
# POST请求响应大小
|
|
||||||
max-http-form-post-size: -1
|
|
||||||
|
|
||||||
# 日志配置
|
|
||||||
logging:
|
|
||||||
level:
|
|
||||||
com.ruoyi: debug
|
|
||||||
org.springframework: warn
|
|
||||||
|
|
||||||
# 用户配置
|
|
||||||
user:
|
|
||||||
password:
|
|
||||||
# 密码最大错误次数
|
|
||||||
maxRetryCount: 5
|
|
||||||
# 密码锁定时间（默认10分钟）
|
|
||||||
lockTime: 10
|
|
||||||
|
|
||||||
# Spring配置
|
|
||||||
spring:
|
|
||||||
# 资源信息
|
|
||||||
messages:
|
|
||||||
# 国际化资源文件路径
|
|
||||||
basename: i18n/messages
|
|
||||||
profiles:
|
|
||||||
# 数据源配置
|
|
||||||
active: druid
|
|
||||||
# 文件上传
|
|
||||||
servlet:
|
|
||||||
multipart:
|
|
||||||
# 单个文件大小
|
|
||||||
max-file-size: 512MB
|
|
||||||
# 设置总上传的文件大小
|
|
||||||
max-request-size: 1024MB
|
|
||||||
# 服务模块
|
|
||||||
devtools:
|
|
||||||
restart:
|
|
||||||
# 热部署开关
|
|
||||||
enabled: true
|
|
||||||
# redis 配置
|
|
||||||
redis:
|
|
||||||
# 地址
|
|
||||||
host: 192.168.9.210
|
|
||||||
# 端口，默认为6379
|
|
||||||
port: 6379
|
|
||||||
# 数据库索引
|
|
||||||
database: 15
|
|
||||||
# 密码
|
|
||||||
password:
|
|
||||||
# 连接超时时间
|
|
||||||
timeout: 60s
|
|
||||||
lettuce:
|
|
||||||
pool:
|
|
||||||
# 连接池中的最小空闲连接
|
|
||||||
min-idle: 10
|
|
||||||
# 连接池中的最大空闲连接
|
|
||||||
max-idle: 100
|
|
||||||
# 连接池的最大数据库连接数
|
|
||||||
max-active: 500
|
|
||||||
# #连接池最大阻塞等待时间（使用负值表示没有限制）
|
|
||||||
max-wait: -1ms
|
|
||||||
# 关闭超时时间
|
|
||||||
shutdown-timeout: 1000
|
|
||||||
# token配置
|
|
||||||
token:
|
|
||||||
# 是否允许账户多终端同时登录（true允许 false不允许）
|
|
||||||
soloLogin: true
|
|
||||||
# 令牌自定义标识
|
|
||||||
header: Authorization
|
|
||||||
# 令牌密钥
|
|
||||||
secret: abcdefghijklmnopqrstuvwxyz
|
|
||||||
# 令牌有效期（默认30分钟）
|
|
||||||
expireTime: 120
|
|
||||||
|
|
||||||
# MyBatis配置
|
|
||||||
mybatis:
|
|
||||||
# 搜索指定包别名
|
|
||||||
typeAliasesPackage: com.ruoyi.**.domain
|
|
||||||
# 配置mapper的扫描，找到所有的mapper.xml映射文件
|
|
||||||
mapperLocations: classpath*:mapper/**/*Mapper.xml
|
|
||||||
# 加载全局的配置文件
|
|
||||||
configLocation: classpath:mybatis/mybatis-config.xml
|
|
||||||
|
|
||||||
# PageHelper分页插件
|
|
||||||
pagehelper:
|
|
||||||
# 明确数据源时使用
|
|
||||||
helperDialect: sqlserver
|
|
||||||
reasonable: true
|
|
||||||
supportMethodsArguments: true
|
|
||||||
params: count=countSql
|
|
||||||
# 运行时自动识别数据源-与helperDialect互斥——>多数据源分页时使用
|
|
||||||
# auto-runtime-dialect: true
|
|
||||||
|
|
||||||
# Swagger配置
|
|
||||||
swagger:
|
|
||||||
# 是否开启swagger
|
|
||||||
enabled: true
|
|
||||||
# 请求前缀
|
|
||||||
pathMapping: /dev-api
|
|
||||||
|
|
||||||
# 防止XSS攻击
|
|
||||||
xss:
|
|
||||||
# 过滤开关
|
|
||||||
enabled: true
|
|
||||||
# 排除链接（多个用逗号分隔）
|
|
||||||
excludes: /system/notice
|
|
||||||
# 匹配链接
|
|
||||||
urlPatterns: /system/*,/monitor/*,/tool/*
|
|
||||||
|
|
||||||
#CAS
|
|
||||||
cas:
|
|
||||||
server:
|
|
||||||
host:
|
|
||||||
#CAS服务地址
|
|
||||||
url: http://localhost:8443/cas
|
|
||||||
#CAS服务登录地址
|
|
||||||
login_url: ${cas.server.host.url}/login
|
|
||||||
#CAS服务登出地址
|
|
||||||
logout_url: ${cas.server.host.url}/logout?service=${app.server.host.url}
|
|
||||||
# 应用访问地址
|
|
||||||
app:
|
|
||||||
#开启cas
|
|
||||||
casEnable: false
|
|
||||||
server:
|
|
||||||
host:
|
|
||||||
url: http://localhost:${server.port}
|
|
||||||
#应用登录地址 /casLogin
|
|
||||||
#login_url: /casLogin
|
|
||||||
login_url: /
|
|
||||||
#应用登出地址 /casLogout
|
|
||||||
#logout_url: /casLogout
|
|
||||||
logout_url: /logout
|
|
||||||
#前端登入地址 这里添加了指定的串casUI
|
|
||||||
#web_url: http://localhost/casUI
|
|
||||||
web_url: http://localhost/index
|
|
||||||
|
|
||||||
magic-api:
|
|
||||||
security:
|
|
||||||
username: admin
|
|
||||||
password: magic-api.S
|
|
||||||
web: /magic/web
|
|
||||||
show-sql: true #配置打印SQL
|
|
||||||
show-url: false
|
|
||||||
response-code:
|
|
||||||
success: 200 #执行成功的code值
|
|
||||||
invalid: 400 #参数验证未通过的code值
|
|
||||||
exception: 500 #执行出现异常的code值
|
|
||||||
#存储设置
|
|
||||||
resource:
|
|
||||||
type: database # 配置接口存储方式，这里选择存在数据库中
|
|
||||||
table-name: magic_api_file # 数据库中的表名
|
|
||||||
prefix: /magic-api # 前缀
|
|
||||||
#代码备份的设置
|
|
||||||
backup:
|
|
||||||
enable: true
|
|
||||||
max-history: 7
|
|
||||||
table-name: magic_api_backup
|
|
||||||
debug:
|
|
||||||
timeout: 600
|
|
||||||
|
|
||||||
# Minio配置-分布式存储
|
|
||||||
minio:
|
|
||||||
useEnable: true
|
|
||||||
url: http://192.168.9.210:3336
|
|
||||||
accessKey: minio-admin
|
|
||||||
secretKey: minio-jndlitzx
|
|
||||||
bucketName: system
|
|
||||||
|
|
||||||
# OA单点登录key
|
|
||||||
OA:
|
|
||||||
KEY: uy4MbH
|
|
||||||
|
|
@ -1,24 +0,0 @@
|
||||||
Application Version: ${ruoyi.version}
|
|
||||||
Spring Boot Version: ${spring-boot.version}
|
|
||||||
////////////////////////////////////////////////////////////////////
|
|
||||||
// _ooOoo_ //
|
|
||||||
// o8888888o //
|
|
||||||
// 88" . "88 //
|
|
||||||
// (| ^_^ |) //
|
|
||||||
// O\ = /O //
|
|
||||||
// ____/`---'\____ //
|
|
||||||
// .' \\| |// `. //
|
|
||||||
// / \\||| : |||// \ //
|
|
||||||
// / _||||| -:- |||||- \ //
|
|
||||||
// | | \\\ - /// | | //
|
|
||||||
// | \_| ''\---/'' | | //
|
|
||||||
// \ .-\__ `-` ___/-. / //
|
|
||||||
// ___`. .' /--.--\ `. . ___ //
|
|
||||||
// ."" '< `.___\_<|>_/___.' >'"". //
|
|
||||||
// | | : `- \`.;`\ _ /`;.`/ - ` : | | //
|
|
||||||
// \ \ `-. \_ __\ /__ _/ .-` / / //
|
|
||||||
// ========`-.____`-.___\_____/___.-`____.-'======== //
|
|
||||||
// `=---=' //
|
|
||||||
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ //
|
|
||||||
// 佛祖保佑 永不宕机 永无BUG //
|
|
||||||
////////////////////////////////////////////////////////////////////
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -1,28 +0,0 @@
|
||||||
# 远程下单提交时间范围
|
|
||||||
order.commitDateBeginAm: 08:00:00
|
|
||||||
order.commitDateEndAm: 12:00:00
|
|
||||||
order.commitDateBeginPm: 12:00:00
|
|
||||||
order.commitDateEndPm: 20:00:00
|
|
||||||
|
|
||||||
# sapWebservice
|
|
||||||
sapWebservice.host: poprd
|
|
||||||
sapWebservice.user: PO_USER
|
|
||||||
sapWebservice.psw: QAZ54321
|
|
||||||
|
|
||||||
# 企查查
|
|
||||||
qichacha.key: 824936f8e78c4f4788978da38b26d488
|
|
||||||
qichacha.secretKey: 8B9EB102FD17E0CF2EDEC0FB507DEC1E
|
|
||||||
qichacha.serviceName: https://api.qichacha.com/FuzzySearch/GetList
|
|
||||||
qichacha.serviceNameGetInfo: https://api.qichacha.com/ECIIndustryVerify/GetInfo
|
|
||||||
qichacha.serviceNameVerifyInfo: https://api.qichacha.com/EnterpriseInfo/Verify
|
|
||||||
|
|
||||||
# SAP-RFC函数
|
|
||||||
sapRfc.ashost: 172.19.0.125 #服务器
|
|
||||||
sapRfc.sysnr: 00 #系统编号
|
|
||||||
sapRfc.client: 800 #集团
|
|
||||||
sapRfc.user: RFC #用户名
|
|
||||||
sapRfc.passwd: 654321 #密码
|
|
||||||
sapRfc.lang: ZH #登录语言
|
|
||||||
sapRfc.pool_capacity: 10 #最大连接数
|
|
||||||
sapRfc.peak_limit: 10 #最大连接线程
|
|
||||||
sapRfc.saprouter: #路由
|
|
||||||
|
|
@ -1,40 +0,0 @@
|
||||||
#错误消息
|
|
||||||
not.null=* 必须填写
|
|
||||||
user.jcaptcha.error=验证码错误
|
|
||||||
user.jcaptcha.expire=验证码已失效
|
|
||||||
user.not.exists=用户不存在/密码错误
|
|
||||||
user.format.not.match=用户名不符合要求
|
|
||||||
password.format.not.match=密码不符合要求
|
|
||||||
user.password.not.match=用户不存在/密码错误
|
|
||||||
user.password.retry.limit.count=密码输入错误{0}次
|
|
||||||
user.password.retry.limit.exceed=密码输入错误{0}次，帐户锁定{1}分钟
|
|
||||||
user.password.delete=对不起，您的账号已被删除
|
|
||||||
user.blocked=用户已封禁，请联系管理员
|
|
||||||
role.blocked=角色已封禁，请联系管理员
|
|
||||||
login.blocked=很遗憾，访问IP已被列入系统黑名单
|
|
||||||
user.logout.success=退出成功
|
|
||||||
|
|
||||||
length.not.valid=长度必须在{min}到{max}个字符之间
|
|
||||||
|
|
||||||
user.username.not.valid=* 2到20个汉字、字母、数字或下划线组成，且必须以非数字开头
|
|
||||||
user.password.not.valid=* 5-50个字符
|
|
||||||
|
|
||||||
user.email.not.valid=邮箱格式错误
|
|
||||||
user.mobile.phone.number.not.valid=手机号格式错误
|
|
||||||
user.login.success=登录成功
|
|
||||||
user.register.success=注册成功
|
|
||||||
user.notfound=请重新登录
|
|
||||||
user.forcelogout=管理员强制退出，请重新登录
|
|
||||||
user.unknown.error=未知错误，请重新登录
|
|
||||||
|
|
||||||
##文件上传消息
|
|
||||||
upload.exceed.maxSize=上传的文件大小超出限制的文件大小！<br/>允许的文件最大大小是：{0}MB！
|
|
||||||
upload.filename.exceed.length=上传的文件名最长{0}个字符
|
|
||||||
|
|
||||||
##权限
|
|
||||||
no.permission=您没有数据的权限，请联系管理员添加权限 [{0}]
|
|
||||||
no.create.permission=您没有创建数据的权限，请联系管理员添加权限 [{0}]
|
|
||||||
no.update.permission=您没有修改数据的权限，请联系管理员添加权限 [{0}]
|
|
||||||
no.delete.permission=您没有删除数据的权限，请联系管理员添加权限 [{0}]
|
|
||||||
no.export.permission=您没有导出数据的权限，请联系管理员添加权限 [{0}]
|
|
||||||
no.view.permission=您没有查看数据的权限，请联系管理员添加权限 [{0}]
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 15 KiB |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -1,93 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<configuration>
|
|
||||||
<!-- 日志存放路径 -->
|
|
||||||
<property name="log.path" value="D:/ruoyi/logs" />
|
|
||||||
<!-- 日志输出格式 -->
|
|
||||||
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
|
|
||||||
|
|
||||||
<!-- 控制台输出 -->
|
|
||||||
<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
|
|
||||||
<encoder>
|
|
||||||
<pattern>${log.pattern}</pattern>
|
|
||||||
</encoder>
|
|
||||||
</appender>
|
|
||||||
|
|
||||||
<!-- 系统日志输出 -->
|
|
||||||
<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
|
||||||
<file>${log.path}/sys-info.log</file>
|
|
||||||
<!-- 循环政策：基于时间创建日志文件 -->
|
|
||||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
|
||||||
<!-- 日志文件名格式 -->
|
|
||||||
<fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
|
|
||||||
<!-- 日志最大的历史 60天 -->
|
|
||||||
<maxHistory>60</maxHistory>
|
|
||||||
</rollingPolicy>
|
|
||||||
<encoder>
|
|
||||||
<pattern>${log.pattern}</pattern>
|
|
||||||
</encoder>
|
|
||||||
<filter class="ch.qos.logback.classic.filter.LevelFilter">
|
|
||||||
<!-- 过滤的级别 -->
|
|
||||||
<level>INFO</level>
|
|
||||||
<!-- 匹配时的操作：接收（记录） -->
|
|
||||||
<onMatch>ACCEPT</onMatch>
|
|
||||||
<!-- 不匹配时的操作：拒绝（不记录） -->
|
|
||||||
<onMismatch>DENY</onMismatch>
|
|
||||||
</filter>
|
|
||||||
</appender>
|
|
||||||
|
|
||||||
<appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
|
||||||
<file>${log.path}/sys-error.log</file>
|
|
||||||
<!-- 循环政策：基于时间创建日志文件 -->
|
|
||||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
|
||||||
<!-- 日志文件名格式 -->
|
|
||||||
<fileNamePattern>${log.path}/sys-error.%d{yyyy-MM-dd}.log</fileNamePattern>
|
|
||||||
<!-- 日志最大的历史 60天 -->
|
|
||||||
<maxHistory>60</maxHistory>
|
|
||||||
</rollingPolicy>
|
|
||||||
<encoder>
|
|
||||||
<pattern>${log.pattern}</pattern>
|
|
||||||
</encoder>
|
|
||||||
<filter class="ch.qos.logback.classic.filter.LevelFilter">
|
|
||||||
<!-- 过滤的级别 -->
|
|
||||||
<level>ERROR</level>
|
|
||||||
<!-- 匹配时的操作：接收（记录） -->
|
|
||||||
<onMatch>ACCEPT</onMatch>
|
|
||||||
<!-- 不匹配时的操作：拒绝（不记录） -->
|
|
||||||
<onMismatch>DENY</onMismatch>
|
|
||||||
</filter>
|
|
||||||
</appender>
|
|
||||||
|
|
||||||
<!-- 用户访问日志输出 -->
|
|
||||||
<appender name="sys-user" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
|
||||||
<file>${log.path}/sys-user.log</file>
|
|
||||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
|
||||||
<!-- 按天回滚 daily -->
|
|
||||||
<fileNamePattern>${log.path}/sys-user.%d{yyyy-MM-dd}.log</fileNamePattern>
|
|
||||||
<!-- 日志最大的历史 60天 -->
|
|
||||||
<maxHistory>60</maxHistory>
|
|
||||||
</rollingPolicy>
|
|
||||||
<encoder>
|
|
||||||
<pattern>${log.pattern}</pattern>
|
|
||||||
</encoder>
|
|
||||||
</appender>
|
|
||||||
|
|
||||||
<!-- 系统模块日志级别控制 -->
|
|
||||||
<logger name="com.ruoyi" level="info" />
|
|
||||||
<!-- Spring日志级别控制 -->
|
|
||||||
<logger name="org.springframework" level="warn" />
|
|
||||||
|
|
||||||
<root level="info">
|
|
||||||
<appender-ref ref="console" />
|
|
||||||
</root>
|
|
||||||
|
|
||||||
<!--系统操作日志-->
|
|
||||||
<root level="info">
|
|
||||||
<appender-ref ref="file_info" />
|
|
||||||
<appender-ref ref="file_error" />
|
|
||||||
</root>
|
|
||||||
|
|
||||||
<!--系统用户操作日志-->
|
|
||||||
<logger name="sys-user" level="info">
|
|
||||||
<appender-ref ref="sys-user"/>
|
|
||||||
</logger>
|
|
||||||
</configuration>
|
|
||||||
|
|
@ -1,20 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
|
||||||
<!DOCTYPE configuration
|
|
||||||
PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
|
|
||||||
"http://mybatis.org/dtd/mybatis-3-config.dtd">
|
|
||||||
<configuration>
|
|
||||||
<!-- 全局参数 -->
|
|
||||||
<settings>
|
|
||||||
<!-- 使全局的映射器启用或禁用缓存 -->
|
|
||||||
<setting name="cacheEnabled" value="true" />
|
|
||||||
<!-- 允许JDBC 支持自动生成主键 -->
|
|
||||||
<setting name="useGeneratedKeys" value="true" />
|
|
||||||
<!-- 配置默认的执行器.SIMPLE就是普通执行器;REUSE执行器会重用预处理语句(prepared statements);BATCH执行器将重用语句并执行批量更新 -->
|
|
||||||
<setting name="defaultExecutorType" value="SIMPLE" />
|
|
||||||
<!-- 指定 MyBatis 所用日志的具体实现 -->
|
|
||||||
<setting name="logImpl" value="SLF4J" />
|
|
||||||
<!-- 使用驼峰命名法转换字段 -->
|
|
||||||
<!-- <setting name="mapUnderscoreToCamelCase" value="true"/> -->
|
|
||||||
</settings>
|
|
||||||
|
|
||||||
</configuration>
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 7.1 KiB |
|
|
@ -1,10 +0,0 @@
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
#Generated by Maven
|
|
||||||
#Fri Aug 02 16:42:44 CST 2024
|
|
||||||
version=3.8.7
|
|
||||||
groupId=com.ruoyi
|
|
||||||
>>>>>>> 5198921374dd01664dbc898956e7868edc9d8ecf
|
|
||||||
artifactId=ruoyi-admin
|
|
||||||
groupId=com.ruoyi
|
|
||||||
version=3.8.7
|
|
||||||
|
|
@ -1,70 +0,0 @@
|
||||||
com\ruoyi\web\utils\IdUtils.class
|
|
||||||
com\ruoyi\web\controller\common\CaptchaController.class
|
|
||||||
com\ruoyi\web\controller\system\SysDictDataController.class
|
|
||||||
com\ruoyi\web\controller\monitor\SysOperlogController.class
|
|
||||||
com\ruoyi\web\utils\rbExcel\excelUtil.class
|
|
||||||
com\ruoyi\web\controller\common\CommonController.class
|
|
||||||
com\ruoyi\web\controller\common\SapRfcController.class
|
|
||||||
com\ruoyi\web\controller\priceVerification\BidHjController.class
|
|
||||||
com\ruoyi\web\controller\system\SysMenuController.class
|
|
||||||
com\ruoyi\web\utils\SapHana\SapHanaUtils.class
|
|
||||||
com\ruoyi\web\controller\system\SysPostController.class
|
|
||||||
com\ruoyi\web\controller\mobile\quoteMobile\QuoteMobileController.class
|
|
||||||
com\ruoyi\web\controller\system\SsoLoginController.class
|
|
||||||
com\ruoyi\web\controller\technicalConfirm\QuotJsqrController.class
|
|
||||||
com\ruoyi\web\controller\monitor\ServerController.class
|
|
||||||
com\ruoyi\web\controller\monitor\SysUserOnlineController.class
|
|
||||||
com\ruoyi\web\controller\tool\quot\quotModel.class
|
|
||||||
com\ruoyi\web\utils\SapFunction\RfcResult.class
|
|
||||||
com\ruoyi\web\controller\bid\BidController.class
|
|
||||||
com\ruoyi\web\controller\sysSapUser\SysSapUserController.class
|
|
||||||
com\ruoyi\web\controller\monitor\CacheController.class
|
|
||||||
com\ruoyi\web\controller\registeredCompany\RegisteredCompanyController.class
|
|
||||||
com\ruoyi\web\utils\JDBCBatch.class
|
|
||||||
com\ruoyi\web\utils\qcc\HttpHelper.class
|
|
||||||
com\ruoyi\web\controller\tool\quot\quotJswController.class
|
|
||||||
com\ruoyi\web\controller\technicalConfirm\BidJsqrController.class
|
|
||||||
com\ruoyi\web\utils\qcc\QiChaChaUtil$HttpCodeRegex.class
|
|
||||||
com\ruoyi\web\utils\SapHana\HanaDB.class
|
|
||||||
com\ruoyi\web\controller\clMaterial\CYlMaterialController.class
|
|
||||||
com\ruoyi\web\controller\system\SysProfileController.class
|
|
||||||
com\ruoyi\web\controller\system\UserController.class
|
|
||||||
com\ruoyi\web\utils\SendNotice\NoticeUtil.class
|
|
||||||
com\ruoyi\web\controller\system\SysConfigController.class
|
|
||||||
com\ruoyi\web\controller\zgys\ZgysController.class
|
|
||||||
com\ruoyi\web\controller\tool\TestController.class
|
|
||||||
com\ruoyi\web\core\config\SwaggerConfig.class
|
|
||||||
com\ruoyi\web\controller\system\SysChangeRecordController.class
|
|
||||||
com\ruoyi\RuoYiServletInitializer.class
|
|
||||||
com\ruoyi\web\controller\material\CMaterialController.class
|
|
||||||
com\ruoyi\web\controller\system\SysIndexController.class
|
|
||||||
com\ruoyi\RuoYiApplication.class
|
|
||||||
com\ruoyi\web\controller\quot\QuotController.class
|
|
||||||
com\ruoyi\web\controller\priceVerification\QuotHjController.class
|
|
||||||
com\ruoyi\web\utils\SapFunction\SapRfcUtils.class
|
|
||||||
com\ruoyi\web\controller\system\SysRegisterController.class
|
|
||||||
com\ruoyi\web\controller\authorize\AuthorizeController.class
|
|
||||||
com\ruoyi\web\controller\tool\UserEntity.class
|
|
||||||
com\ruoyi\web\controller\system\SysNoticeController$1.class
|
|
||||||
com\ruoyi\web\utils\SapFunction\ConnectToSAP.class
|
|
||||||
com\ruoyi\web\utils\qcc\QiChaChaUtil.class
|
|
||||||
com\ruoyi\web\controller\monitor\SysLogininforController.class
|
|
||||||
com\ruoyi\web\controller\system\SysLoginController.class
|
|
||||||
com\ruoyi\web\controller\system\LoginController.class
|
|
||||||
com\ruoyi\web\controller\hainanOrder\HaiNanOrderController.class
|
|
||||||
com\ruoyi\web\utils\ListSplitUtil.class
|
|
||||||
com\ruoyi\web\controller\redBook\RedBookController.class
|
|
||||||
com\ruoyi\web\controller\system\SysNoticeController.class
|
|
||||||
com\ruoyi\web\utils\DateRangeUtils.class
|
|
||||||
com\ruoyi\web\controller\storageLocation\storageLocationController.class
|
|
||||||
com\ruoyi\web\controller\system\SysDictTypeController.class
|
|
||||||
com\ruoyi\web\utils\qcc\HttpHelper$1.class
|
|
||||||
com\ruoyi\web\controller\customer\CustomerController.class
|
|
||||||
com\ruoyi\web\controller\system\SysDeptController.class
|
|
||||||
com\ruoyi\web\controller\tool\quot\quotMaterialModel.class
|
|
||||||
com\ruoyi\web\controller\quote\QuoteController.class
|
|
||||||
com\ruoyi\web\controller\expenses\ExpensesController.class
|
|
||||||
com\ruoyi\web\controller\system\SysUserController.class
|
|
||||||
com\ruoyi\web\controller\system\SysRoleController.class
|
|
||||||
com\ruoyi\web\controller\factory\CFactoryController.class
|
|
||||||
com\ruoyi\web\controller\materialType\CMaterialTypeController.class
|
|
||||||
|
|
@ -1,134 +0,0 @@
|
||||||
<<<<<<< HEAD
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\priceVerification\BidHjController.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\redBook\RedBookController.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\system\SysUserController.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\utils\SapHana\HanaDB.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\system\SysRoleController.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\system\SysNoticeController.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\utils\JDBCBatch.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\system\SysConfigController.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\utils\SendNotice\NoticeUtil.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\materialType\CMaterialTypeController.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\common\CommonController.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\system\UserController.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\tool\quot\quotModel.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\utils\SapFunction\SapRfcUtils.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\clMaterial\CYlMaterialController.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\quot\QuotController.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\system\SysRegisterController.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\utils\ListSplitUtil.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\system\SysProfileController.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\mobile\quoteMobile\QuoteMobileController.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\monitor\SysUserOnlineController.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\system\SysDeptController.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\tool\quot\quotMaterialModel.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\system\SysDictDataController.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\utils\rbExcel\excelUtil.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\material\CMaterialController.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\common\CaptchaController.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\monitor\CacheController.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\sysSapUser\SysSapUserController.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\technicalConfirm\BidJsqrController.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\hainanOrder\HaiNanOrderController.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\technicalConfirm\QuotJsqrController.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\system\SysLoginController.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\monitor\ServerController.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\monitor\SysLogininforController.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\utils\DateRangeUtils.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\utils\SapHana\SapHanaUtils.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\tool\TestController.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\system\SysPostController.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\utils\IdUtils.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\RuoYiApplication.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\RuoYiServletInitializer.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\system\SysChangeRecordController.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\utils\qcc\QiChaChaUtil.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\system\SysIndexController.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\utils\SapFunction\RfcResult.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\tool\SwaggerController.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\bid\BidController.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\zgys\ZgysController.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\system\SysDictTypeController.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\priceVerification\QuotHjController.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\storageLocation\storageLocationController.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\customer\CustomerController.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\core\config\SwaggerConfig.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\utils\SapFunction\ConnectToSAP.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\system\LoginController.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\utils\qcc\HttpHelper.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\tool\quot\quotJswController.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\system\SsoLoginController.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\quote\QuoteController.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\system\SysMenuController.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\common\SapRfcController.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\monitor\SysOperlogController.java
|
|
||||||
D:\IdeaProject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\factory\CFactoryController.java
|
|
||||||
=======
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\tool\TestController.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\utils\SapFunction\ConnectToSAP.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\clMaterial\CYlMaterialController.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\system\UserController.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\bid\BidController.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\technicalConfirm\BidJsqrController.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\mobile\quoteMobile\QuoteMobileController.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\system\SysMenuController.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\material\CMaterialController.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\utils\SapFunction\SapRfcUtils.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\authorize\AuthorizeController.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\redBook\RedBookController.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\tool\SwaggerController.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\monitor\SysOperlogController.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\expenses\ExpensesController.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\priceVerification\BidHjController.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\system\SysUserController.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\utils\SapHana\SapHanaUtils.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\factory\CFactoryController.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\system\SysLoginController.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\utils\rbExcel\excelUtil.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\system\SysProfileController.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\hainanOrder\HaiNanOrderController.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\system\SysRegisterController.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\utils\qcc\HttpHelper.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\system\SysDictTypeController.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\common\CommonController.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\system\SysDictDataController.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\tool\quot\quotMaterialModel.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\utils\DateRangeUtils.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\utils\SapFunction\RfcResult.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\system\SysPostController.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\utils\qcc\QiChaChaUtil.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\system\SysNoticeController.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\system\SysDeptController.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\quot\QuotController.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\system\SysRoleController.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\common\SapRfcController.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\system\SysChangeRecordController.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\monitor\SysUserOnlineController.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\RuoYiApplication.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\system\SsoLoginController.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\materialType\CMaterialTypeController.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\common\CaptchaController.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\core\config\SwaggerConfig.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\tool\quot\quotJswController.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\RuoYiServletInitializer.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\storageLocation\storageLocationController.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\utils\SendNotice\NoticeUtil.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\monitor\ServerController.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\tool\quot\quotModel.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\system\SysIndexController.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\customer\CustomerController.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\quote\QuoteController.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\monitor\CacheController.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\system\LoginController.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\monitor\SysLogininforController.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\technicalConfirm\QuotJsqrController.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\utils\ListSplitUtil.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\registeredCompany\RegisteredCompanyController.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\system\SysConfigController.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\utils\JDBCBatch.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\sysSapUser\SysSapUserController.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\priceVerification\QuotHjController.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\zgys\ZgysController.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\utils\SapHana\HanaDB.java
|
|
||||||
E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\utils\IdUtils.java
|
|
||||||
>>>>>>> 5198921374dd01664dbc898956e7868edc9d8ecf
|
|
||||||
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue