Browse Source

Merge remote-tracking branch 'origin/master'

erp、
ling li 1 year ago
parent
commit
374c646a42
  1. 5
      log.path_IS_UNDEFINED/sys-user.log
  2. 8
      ruoyi-activiti/pom.xml
  3. 12
      smart-erp.iml

5
log.path_IS_UNDEFINED/sys-user.log

@ -1,5 +0,0 @@
11:47:36.657 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
15:56:03.944 [schedule-pool-12] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
16:12:42.082 [SpringContextShutdownHook] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
16:12:42.088 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
16:12:42.089 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====

8
ruoyi-activiti/pom.xml

@ -62,7 +62,13 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<!-- <dependency>-->
<dependency>
<groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId>
<version>3.5.6</version>
<scope>compile</scope>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.ruoyi</groupId>-->
<!-- <artifactId>ruoyi-system</artifactId>-->
<!-- </dependency>-->

12
smart-erp.iml

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
Loading…
Cancel
Save