Skip to content

C
cneeds-server
Commit d6b2d928 by zzrdark
Options

1.add 依赖 common-io

parent 9368d5ae
Showing with 37 additions and 100 deletions
.idea/workspace.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="58efcb75-622d-40c1-b8e0-10cd2fb456b4" name="Default Changelist" comment="1.修改不需要web服务 &#10;2.增加一个logupload"> <list default="true" id="58efcb75-622d-40c1-b8e0-10cd2fb456b4" name="Default Changelist" comment="1.增加持久层代码&#10;2.增加utils&#10;3.修改项目间依赖关系&#10;4.增加service、controller">
<change afterPath="$PROJECT_DIR$/cneeds-common-data/cneeds-common-data.iml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-data/pom.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/dao/DeviceInfoDao.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/dao/DeviceLogDao.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/dao/DeviceLogmediaDao.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/dao/DeviceLogsettingDao.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/dao/SysDeptDao.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/dao/SysFuncDao.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/dao/SysRoleDao.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/dao/SysRoleDeptDao.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/dao/SysRoleFuncDao.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/dao/SysUserDao.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/dao/SysUserRoleDao.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/entity/DeviceInfoEntity.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/entity/DeviceLogEntity.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/entity/DeviceLogmediaEntity.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/entity/DeviceLogsettingEntity.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/entity/SysDeptEntity.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/entity/SysFuncEntity.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/entity/SysRoleDeptEntity.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/entity/SysRoleEntity.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/entity/SysRoleFuncEntity.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/entity/SysUserEntity.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/entity/SysUserRoleEntity.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/resources/application.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/resources/mapper/DeviceInfoDao.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/resources/mapper/DeviceLogDao.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/resources/mapper/DeviceLogmediaDao.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/resources/mapper/DeviceLogsettingDao.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/resources/mapper/SysDeptDao.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/resources/mapper/SysFuncDao.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/resources/mapper/SysRoleDao.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/resources/mapper/SysRoleDeptDao.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/resources/mapper/SysRoleFuncDao.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/resources/mapper/SysUserDao.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/resources/mapper/SysUserRoleDao.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-utils/cneeds-common-utils.iml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-utils/pom.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-utils/src/main/java/com/mx/cneeds/common/exception/RRException.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-utils/src/main/java/com/mx/cneeds/common/pager/Constant.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-utils/src/main/java/com/mx/cneeds/common/pager/PageUtils.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-utils/src/main/java/com/mx/cneeds/common/pager/Query.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-utils/src/main/java/com/mx/cneeds/common/result/R.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-utils/src/main/java/com/mx/cneeds/common/validator/ValidatorUtils.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-utils/src/main/java/com/mx/cneeds/common/xss/HTMLFilter.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-utils/src/main/java/com/mx/cneeds/common/xss/SQLFilter.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-utils/src/main/java/com/mx/cneeds/common/xss/XssFilter.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-utils/src/main/java/com/mx/cneeds/common/xss/XssHttpServletRequestWrapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/application-dev.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/application-test.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/application.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/DeviceInfoService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/DeviceLogService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/DeviceLogmediaService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/DeviceLogsettingService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/impl/DeviceInfoServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/impl/DeviceLogServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/impl/DeviceLogmediaServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/impl/DeviceLogsettingServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/web/DeviceInfoController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/web/DeviceLogController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/web/DeviceLogmediaController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/web/DeviceLogsettingController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysDeptService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysFuncService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysRoleDeptService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysRoleFuncService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysRoleService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysUserRoleService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysUserService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysDeptServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysFuncServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysRoleDeptServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysRoleFuncServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysRoleServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysUserRoleServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysUserServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysDeptController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysFuncController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysRoleController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysRoleDeptController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysRoleFuncController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysUserController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysUserRoleController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/resources/application.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/pom.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cneeds-common-utils/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-utils/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/web/DatashowApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/DatashowApplication.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cneeds-common-utils/src/main/java/com/mx/cneeds/common/xss/SQLFilter.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-utils/src/main/java/com/mx/cneeds/common/xss/SQLFilter.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-device/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-device/pom.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/UserServerApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/UserServerApplication.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-eureka/target/classes/META-INF/cneeds-server-eureka.kotlin_module" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-eureka/target/classes/application.yml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-eureka/target/classes/com/mx/cneeds/server/eureka/EurekaServerApplication.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-user/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
...@@ -230,7 +138,7 @@ ...@@ -230,7 +138,7 @@
<workItem from="1578295009682" duration="4167000" /> <workItem from="1578295009682" duration="4167000" />
<workItem from="1578389632725" duration="4443000" /> <workItem from="1578389632725" duration="4443000" />
<workItem from="1578448455421" duration="3371000" /> <workItem from="1578448455421" duration="3371000" />
<workItem from="1578536666336" duration="8875000" /> <workItem from="1578536666336" duration="10353000" />
</task> </task>
<task id="LOCAL-00001" summary="1.修改不需要web服务 &#10;2.增加一个logupload"> <task id="LOCAL-00001" summary="1.修改不需要web服务 &#10;2.增加一个logupload">
<created>1578451117064</created> <created>1578451117064</created>
...@@ -239,7 +147,14 @@ ...@@ -239,7 +147,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1578451117064</updated> <updated>1578451117064</updated>
</task> </task>
<option name="localTasksCounter" value="2" /> <task id="LOCAL-00002" summary="1.增加持久层代码&#10;2.增加utils&#10;3.修改项目间依赖关系&#10;4.增加service、controller">
<created>1578559919076</created>
<option name="number" value="00002" />
<option name="presentableId" value="LOCAL-00002" />
<option name="project" value="LOCAL" />
<updated>1578559919076</updated>
</task>
<option name="localTasksCounter" value="3" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
...@@ -261,6 +176,7 @@ ...@@ -261,6 +176,7 @@
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" /> <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
<MESSAGE value="1.修改不需要web服务 &#10;2.增加一个logupload" /> <MESSAGE value="1.修改不需要web服务 &#10;2.增加一个logupload" />
<option name="LAST_COMMIT_MESSAGE" value="1.修改不需要web服务 &#10;2.增加一个logupload" /> <MESSAGE value="1.增加持久层代码&#10;2.增加utils&#10;3.修改项目间依赖关系&#10;4.增加service、controller" />
<option name="LAST_COMMIT_MESSAGE" value="1.增加持久层代码&#10;2.增加utils&#10;3.修改项目间依赖关系&#10;4.增加service、controller" />
</component> </component>
</project> </project>
\ No newline at end of file
cneeds-common-utils/pom.xml
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
<properties> <properties>
<mybatisplus.version>3.1.2</mybatisplus.version> <mybatisplus.version>3.1.2</mybatisplus.version>
<commons.lang.version>2.6</commons.lang.version> <commons.lang.version>2.6</commons.lang.version>
<commons.io.version>2.5</commons.io.version>
<swagger.version>2.7.0</swagger.version>
</properties> </properties>
<dependencies> <dependencies>
...@@ -34,5 +36,20 @@ ...@@ -34,5 +36,20 @@
<artifactId>commons-lang</artifactId> <artifactId>commons-lang</artifactId>
<version>${commons.lang.version}</version> <version>${commons.lang.version}</version>
</dependency> </dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons.io.version}</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<version>${swagger.version}</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
<version>${swagger.version}</version>
</dependency>
</dependencies> </dependencies>
</project> </project>
\ No newline at end of file
cneeds-common-utils/src/main/java/com/mx/cneeds/common/xss/SQLFilter.java
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
package com.mx.cneeds.common.xss; package com.mx.cneeds.common.xss;
import io.renren.common.exception.RRException; import com.mx.cneeds.common.exception.RRException;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
/** /**
......
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/UserServerApplication.java
...@@ -5,6 +5,7 @@ import org.springframework.boot.WebApplicationType; ...@@ -5,6 +5,7 @@ import org.springframework.boot.WebApplicationType;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.cloud.netflix.eureka.EnableEurekaClient; import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
/** /**
* @ClassName UserServerApplication * @ClassName UserServerApplication
...@@ -14,6 +15,7 @@ import org.springframework.cloud.netflix.eureka.EnableEurekaClient; ...@@ -14,6 +15,7 @@ import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
**/ **/
@SpringBootApplication @SpringBootApplication
@EnableEurekaClient @EnableEurekaClient
@EnableSwagger2
public class UserServerApplication { public class UserServerApplication {
public static void main(String[] args) { public static void main(String[] args) {
new SpringApplicationBuilder(UserServerApplication.class).web(WebApplicationType.NONE).run(args); new SpringApplicationBuilder(UserServerApplication.class).web(WebApplicationType.NONE).run(args);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment