Skip to content

C
cneeds-server
Commit bde8517c by zzrdark
Options

1.修改项目结构 

2.登陆
3.等等
parent a8972fd1
Showing with 648 additions and 208 deletions
.idea/compiler.xml
...@@ -10,12 +10,13 @@ ...@@ -10,12 +10,13 @@
<module name="cneeds-server-datashow" /> <module name="cneeds-server-datashow" />
<module name="cneeds-common-utils" /> <module name="cneeds-common-utils" />
<module name="cneeds-common-data" /> <module name="cneeds-common-data" />
<module name="cneeds-server-logupload" />
<module name="cneeds-server-eureka" /> <module name="cneeds-server-eureka" />
<module name="cneeds-common-pojo" />
<module name="cneeds-server-device_activate" /> <module name="cneeds-server-device_activate" />
<module name="cneeds-server-authorization" />
<module name="cneeds-server-user" /> <module name="cneeds-server-user" />
<module name="cneeds-server-logupload" />
<module name="cneeds-server-device" /> <module name="cneeds-server-device" />
<module name="cneeds-server-authorization" />
</profile> </profile>
</annotationProcessing> </annotationProcessing>
<bytecodeTargetLevel> <bytecodeTargetLevel>
...@@ -27,6 +28,7 @@ ...@@ -27,6 +28,7 @@
<component name="JavacSettings"> <component name="JavacSettings">
<option name="ADDITIONAL_OPTIONS_OVERRIDE"> <option name="ADDITIONAL_OPTIONS_OVERRIDE">
<module name="cneeds-common-data" options="-parameters" /> <module name="cneeds-common-data" options="-parameters" />
<module name="cneeds-common-pojo" options="-parameters" />
<module name="cneeds-common-utils" options="-parameters" /> <module name="cneeds-common-utils" options="-parameters" />
<module name="cneeds-server-advice-control" options="-parameters" /> <module name="cneeds-server-advice-control" options="-parameters" />
<module name="cneeds-server-authorization" options="-parameters" /> <module name="cneeds-server-authorization" options="-parameters" />
......
.idea/encodings.xml
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
<file url="file://$PROJECT_DIR$" charset="UTF-8" /> <file url="file://$PROJECT_DIR$" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/cneeds-common-data" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/cneeds-common-data" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/cneeds-common-data/src/main/java" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/cneeds-common-data/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/cneeds-common-pojo/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/cneeds-common-utils" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/cneeds-common-utils" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/cneeds-common-utils/src/main/java" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/cneeds-common-utils/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/cneeds-server-authorization/src/main/java" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/cneeds-server-authorization/src/main/java" charset="UTF-8" />
......
.idea/misc.xml
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
<option name="ignoredFiles"> <option name="ignoredFiles">
<set> <set>
<option value="$PROJECT_DIR$/cneeds-server-advice-control/pom.xml" /> <option value="$PROJECT_DIR$/cneeds-server-advice-control/pom.xml" />
<option value="$PROJECT_DIR$/cneeds-server-pojo/pom.xml" />
</set> </set>
</option> </option>
</component> </component>
......
.idea/workspace.xml
...@@ -2,63 +2,59 @@ ...@@ -2,63 +2,59 @@
<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=""> <list default="true" id="58efcb75-622d-40c1-b8e0-10cd2fb456b4" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/vo/UserVo.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/cneeds-common-pojo/pom.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-authorization/cneeds-server-authorization.iml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/cneeds-common-pojo/src/main/java/com/mx/cneeds/common/dto/JwtToken.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-authorization/src/main/java/com/mx/cneeds/server/anthorization/AuthorizaitonApplication.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/cneeds-server-authorization/Dockerfile" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-authorization/src/main/java/com/mx/cneeds/server/anthorization/config/OAuth2AuthorizationServer.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/cneeds-server-authorization/build.sh" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-authorization/src/main/java/com/mx/cneeds/server/anthorization/service/MyUserDetailsService.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/cneeds-server-authorization/src/main/java/com/mx/cneeds/server/anthorization/config/SecurityConfig.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-authorization/src/main/resources/application.properties" afterDir="false" /> <change afterPath="$PROJECT_DIR$/cneeds-server-datashow/Dockerfile" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-eureka/Dockerfile" afterDir="false" /> <change afterPath="$PROJECT_DIR$/cneeds-server-datashow/build.sh" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-eureka/build.sh" afterDir="false" /> <change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/common/converter/RequestParamterConverter.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-logupload/src/main/java/com/mx/cneeds/server/logupload/LogUploadApplication.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/client/AuthorizationClient.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-user/Dockerfile" afterDir="false" /> <change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/config/FeignConfig.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-user/build.sh" afterDir="false" /> <change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/config/OAuth2ResourceServer.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/user/UserController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/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/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.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-common-data/cneeds-common-data.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/cneeds-server.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-common-data/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-data/pom.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cneeds-common-data/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-data/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/entity/DeviceInfoEntity.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/entity/DeviceInfoEntity.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/service/device/DeviceInfoService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/DeviceInfoService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-common-data/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/resources/application.yml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/service/device/DeviceLogService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/DeviceLogService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-common-data/src/main/resources/mapper/DeviceInfoDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/resources/mapper/DeviceInfoDao.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/service/device/DeviceLogmediaService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/DeviceLogmediaService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-common-utils/cneeds-common-utils.iml" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/service/device/DeviceLogsettingService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/DeviceLogsettingService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/service/user/SysDeptService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysDeptService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/service/user/SysFuncService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysFuncService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/service/user/SysRoleDeptService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysRoleDeptService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/service/user/SysRoleFuncService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysRoleFuncService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/service/user/SysRoleService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysRoleService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/service/user/SysUserRoleService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysUserRoleService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/service/user/SysUserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysUserService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/vo/UserVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-pojo/src/main/java/com/mx/cneeds/common/vo/UserVo.java" 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-common-utils/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-utils/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-advice_control/cneeds-server-advice_control.iml" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/cneeds-server-authorization/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-authorization/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-advice_control/pom.xml" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/cneeds-server-authorization/src/main/java/com/mx/cneeds/server/anthorization/AuthorizaitonApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-authorization/src/main/java/com/mx/cneeds/server/anthorization/AuthorizaitonApplication.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-advice_control/src/main/java/com/mx/cneeds/server/advice/control/AdviceControlApplication.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/cneeds-server-authorization/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-authorization/src/main/resources/application.properties" 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-server-datashow/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/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-server-datashow/src/main/java/com/mx/cneeds/server/datashow/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-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/device/DeviceInfoController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/web/DeviceInfoController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/device/DeviceLogController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/web/DeviceLogController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/device/DeviceLogmediaController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/web/DeviceLogmediaController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/device/DeviceLogsettingController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/web/DeviceLogsettingController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/user/SysDeptController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysDeptController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/user/SysFuncController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysFuncController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/user/SysRoleController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysRoleController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/user/SysRoleDeptController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysRoleDeptController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/user/SysRoleFuncController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysRoleFuncController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/user/SysUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysUserController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/user/SysUserRoleController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysUserRoleController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/application-dev.yml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/application-dev.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/application-test.yml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/application-test.yml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/application.yml" 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-device/src/main/java/com/mx/cneeds/server/device/service/DeviceInfoService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/service/device/DeviceInfoService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/DeviceLogService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/service/device/DeviceLogService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/DeviceLogmediaService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/service/device/DeviceLogmediaService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/DeviceLogsettingService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/service/device/DeviceLogsettingService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/impl/DeviceInfoServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/impl/DeviceInfoServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/impl/DeviceInfoServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/impl/DeviceInfoServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/impl/DeviceLogServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/impl/DeviceLogServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/impl/DeviceLogServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/impl/DeviceLogServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/impl/DeviceLogmediaServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/impl/DeviceLogmediaServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/impl/DeviceLogmediaServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/impl/DeviceLogmediaServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/impl/DeviceLogsettingServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/impl/DeviceLogsettingServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/impl/DeviceLogsettingServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/impl/DeviceLogsettingServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/web/DeviceInfoController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/device/DeviceInfoController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/web/DeviceLogController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/device/DeviceLogController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/web/DeviceLogmediaController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/device/DeviceLogmediaController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/web/DeviceLogsettingController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/device/DeviceLogsettingController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-device_activate/cneeds-server-device_activate.iml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-device_activate/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-authorization/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-device_activate/src/main/java/com/mx/cneeds/server/device/activate/DeviceActiveApplication.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-eureka/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-eureka/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-eureka/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-eureka/src/main/resources/application.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-logupload/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-logupload/pom.xml" afterDir="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$/cneeds-server-user/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/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-user/src/main/java/com/mx/cneeds/server/user/service/SysDeptService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/service/user/SysDeptService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysFuncService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/service/user/SysFuncService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysRoleDeptService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/service/user/SysRoleDeptService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysRoleFuncService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/service/user/SysRoleFuncService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysRoleService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/service/user/SysRoleService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysUserRoleService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/service/user/SysUserRoleService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysUserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/service/user/SysUserService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysDeptServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysDeptServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysDeptServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysDeptServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysFuncServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysFuncServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysFuncServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysFuncServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysRoleDeptServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysRoleDeptServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysRoleDeptServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysRoleDeptServiceImpl.java" afterDir="false" />
...@@ -66,13 +62,6 @@ ...@@ -66,13 +62,6 @@
<change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysRoleServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysRoleServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysRoleServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysRoleServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysUserRoleServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysUserRoleServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysUserRoleServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysUserRoleServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysUserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysUserServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysUserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysUserServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysDeptController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/user/SysDeptController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysFuncController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/user/SysFuncController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysRoleController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/user/SysRoleController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysRoleDeptController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/user/SysRoleDeptController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysRoleFuncController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/user/SysRoleFuncController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/user/SysUserController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysUserRoleController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/user/SysUserRoleController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/resources/application.yml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/resources/application.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
</list> </list>
...@@ -133,7 +122,7 @@ ...@@ -133,7 +122,7 @@
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" /> <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" /> <property name="aspect.path.notification.shown" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/cneeds-server-user/src/main/resources" /> <property name="last_opened_file_path" value="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service" />
<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" />
...@@ -144,25 +133,27 @@ ...@@ -144,25 +133,27 @@
</component> </component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS"> <key name="CopyFile.RECENT_KEYS">
<recent name="E:\mx_project\cneeds-server\cneeds-server-user\src\main\resources" /> <recent name="E:\mx_project\cneeds-server\cneeds-server-user\src\main\java\com\mx\cneeds\server\user\service" />
<recent name="E:\mx_project\cneeds-server\cneeds-server-user" /> <recent name="E:\mx_project\cneeds-server\cneeds-server-device\src\main\java\com\mx\cneeds\server\device\service" />
<recent name="E:\mx_project\cneeds-server\cneeds-server-authorization\src\main\resources" /> <recent name="E:\mx_project\cneeds-server\cneeds-common-pojo\src\main\java" />
<recent name="E:\mx_project\cneeds-server\cneeds-server-eureka" /> <recent name="E:\mx_project\cneeds-server\cneeds-server-datashow" />
<recent name="E:\mx_project\cneeds-server\cneeds-server-datashow\src\main\java\com\mx\cneeds\server\datashow\web\device" /> <recent name="E:\mx_project\cneeds-server\cneeds-server-device\src\main\java\com\mx\cneeds\server\device\web" />
</key> </key>
<key name="CopyClassDialog.RECENTS_KEY"> <key name="CopyClassDialog.RECENTS_KEY">
<recent name="com.mx.cneeds.common.converter" />
<recent name="com.mx.cneeds.server.datashow.config" />
<recent name="com.mx.cneeds.server.anthorization.config" />
<recent name="com.mx.cneeds.server.vo" /> <recent name="com.mx.cneeds.server.vo" />
<recent name="com.mx.cneeds.common.pager" /> <recent name="com.mx.cneeds.common.pager" />
<recent name="com.mx.cneeds.common.exception" />
<recent name="com.mx.cneeds.common.validator" />
<recent name="com.mx.cneeds.server.eureka" />
</key> </key>
<key name="MoveFile.RECENT_KEYS"> <key name="MoveFile.RECENT_KEYS">
<recent name="E:\mx_project\cneeds-server\cneeds-server-datashow\src\main\java\com\mx\cneeds" />
<recent name="E:\mx_project\cneeds-server\cneeds-server-datashow\src\main\resources" />
<recent name="E:\mx_project\cneeds-server" /> <recent name="E:\mx_project\cneeds-server" />
<recent name="E:\mx_project\cneeds-server\src" /> <recent name="E:\mx_project\cneeds-server\src" />
</key> </key>
</component> </component>
<component name="RunManager" selected="Spring Boot.UserServerApplication"> <component name="RunManager" selected="Spring Boot.DatashowApplication">
<configuration name="EurekaServerApplication" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true"> <configuration name="EurekaServerApplication" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="com.mx.cneeds.server.eureka.EurekaServerApplication" /> <option name="MAIN_CLASS_NAME" value="com.mx.cneeds.server.eureka.EurekaServerApplication" />
<module name="cneeds-server-eureka" /> <module name="cneeds-server-eureka" />
...@@ -170,6 +161,19 @@ ...@@ -170,6 +161,19 @@
<option name="Make" enabled="true" /> <option name="Make" enabled="true" />
</method> </method>
</configuration> </configuration>
<configuration name="RequestParamterConverter" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="com.mx.cneeds.common.converter.RequestParamterConverter" />
<module name="cneeds-common-utils" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="com.mx.cneeds.common.converter.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration default="true" type="JetRunConfigurationType" factoryName="Kotlin"> <configuration default="true" type="JetRunConfigurationType" factoryName="Kotlin">
<module name="cneeds-server-advice-control" /> <module name="cneeds-server-advice-control" />
<option name="VM_PARAMETERS" /> <option name="VM_PARAMETERS" />
...@@ -254,6 +258,7 @@ ...@@ -254,6 +258,7 @@
</configuration> </configuration>
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="Application.RequestParamterConverter" />
<item itemvalue="Application.EurekaServerApplication" /> <item itemvalue="Application.EurekaServerApplication" />
</list> </list>
</recent_temporary> </recent_temporary>
...@@ -291,7 +296,9 @@ ...@@ -291,7 +296,9 @@
<workItem from="1582704963934" duration="3105000" /> <workItem from="1582704963934" duration="3105000" />
<workItem from="1582874431918" duration="3123000" /> <workItem from="1582874431918" duration="3123000" />
<workItem from="1583217548512" duration="3424000" /> <workItem from="1583217548512" duration="3424000" />
<workItem from="1583221072963" duration="18615000" /> <workItem from="1583221072963" duration="19391000" />
<workItem from="1583305927585" duration="13084000" />
<workItem from="1583320312435" duration="4771000" />
</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>
...@@ -321,7 +328,14 @@ ...@@ -321,7 +328,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1583218011528</updated> <updated>1583218011528</updated>
</task> </task>
<option name="localTasksCounter" value="5" /> <task id="LOCAL-00005" summary="1.修改项目结构&#10;2.更改数据库连接&#10;3.增加测试docker部署">
<created>1583245888747</created>
<option name="number" value="00005" />
<option name="presentableId" value="LOCAL-00005" />
<option name="project" value="LOCAL" />
<updated>1583245888747</updated>
</task>
<option name="localTasksCounter" value="6" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
...@@ -346,76 +360,126 @@ ...@@ -346,76 +360,126 @@
<MESSAGE value="1.增加持久层代码&#10;2.增加utils&#10;3.修改项目间依赖关系&#10;4.增加service、controller" /> <MESSAGE value="1.增加持久层代码&#10;2.增加utils&#10;3.修改项目间依赖关系&#10;4.增加service、controller" />
<MESSAGE value="1.add 依赖 common-io" /> <MESSAGE value="1.add 依赖 common-io" />
<MESSAGE value="添加数据库表文档" /> <MESSAGE value="添加数据库表文档" />
<option name="LAST_COMMIT_MESSAGE" value="添加数据库表文档" /> <MESSAGE value="1.修改项目结构&#10;2.更改数据库连接&#10;3.增加测试docker部署" />
<option name="LAST_COMMIT_MESSAGE" value="1.修改项目结构&#10;2.更改数据库连接&#10;3.增加测试docker部署" />
</component> </component>
<component name="WindowStateProjectService"> <component name="WindowStateProjectService">
<state x="552" y="178" key="#Project_Structure" timestamp="1583240344009"> <state x="552" y="178" key="#Project_Structure" timestamp="1583316360973">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="552" y="178" key="#Project_Structure/0.0.1920.1040@0.0.1920.1040" timestamp="1583240344009" /> <state x="552" y="178" key="#Project_Structure/0.0.1920.1040@0.0.1920.1040" timestamp="1583316360973" />
<state x="765" y="229" key="#com.intellij.ide.util.MemberChooser" timestamp="1583313991391">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="765" y="229" key="#com.intellij.ide.util.MemberChooser/0.0.1920.1040@0.0.1920.1040" timestamp="1583313991391" />
<state x="640" y="246" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog" timestamp="1582697117117"> <state x="640" y="246" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog" timestamp="1582697117117">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="640" y="246" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1582697117117" /> <state x="640" y="246" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1582697117117" />
<state x="598" y="445" key="#com.intellij.refactoring.move.MoveHandler.SelectRefactoringDialog" timestamp="1583319176856">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="598" y="445" key="#com.intellij.refactoring.move.MoveHandler.SelectRefactoringDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1583319176856" />
<state x="690" y="266" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog" timestamp="1583224455231"> <state x="690" y="266" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog" timestamp="1583224455231">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="690" y="266" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1583224455231" /> <state x="690" y="266" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1583224455231" />
<state x="463" y="112" key="CommitChangelistDialog2" timestamp="1583218010684"> <state x="463" y="112" key="CommitChangelistDialog2" timestamp="1583325311583">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="463" y="112" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1583218010684" /> <state x="463" y="112" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1583325311583" />
<state width="1877" height="350" key="GridCell.Tab.0.bottom" timestamp="1583245732022"> <state width="1877" height="300" key="GridCell.Tab.0.bottom" timestamp="1583325311694">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="350" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1583245732022" /> <state width="1877" height="300" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1583325311694" />
<state width="1877" height="350" key="GridCell.Tab.0.center" timestamp="1583245732021"> <state width="1877" height="300" key="GridCell.Tab.0.center" timestamp="1583325311694">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="350" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1583245732021" /> <state width="1877" height="300" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1583325311694" />
<state width="1877" height="350" key="GridCell.Tab.0.left" timestamp="1583245732021"> <state width="1877" height="300" key="GridCell.Tab.0.left" timestamp="1583325311694">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="350" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1583245732021" /> <state width="1877" height="300" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1583325311694" />
<state width="1877" height="350" key="GridCell.Tab.0.right" timestamp="1583245732022"> <state width="1877" height="300" key="GridCell.Tab.0.right" timestamp="1583325311694">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="350" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1583245732022" /> <state width="1877" height="300" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1583325311694" />
<state width="1877" height="350" key="GridCell.Tab.1.bottom" timestamp="1583245732022"> <state width="1877" height="242" key="GridCell.Tab.1.bottom" timestamp="1583324623547">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="350" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1583245732022" /> <state width="1877" height="242" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1583324623547" />
<state width="1877" height="350" key="GridCell.Tab.1.center" timestamp="1583245732022"> <state width="1877" height="242" key="GridCell.Tab.1.center" timestamp="1583324623547">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="350" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1583245732022" /> <state width="1877" height="242" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1583324623547" />
<state width="1877" height="350" key="GridCell.Tab.1.left" timestamp="1583245732022"> <state width="1877" height="242" key="GridCell.Tab.1.left" timestamp="1583324623547">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="350" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1583245732022" /> <state width="1877" height="242" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1583324623547" />
<state width="1877" height="350" key="GridCell.Tab.1.right" timestamp="1583245732022"> <state width="1877" height="242" key="GridCell.Tab.1.right" timestamp="1583324623547">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="350" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1583245732022" /> <state width="1877" height="242" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1583324623547" />
<state width="1877" height="242" key="GridCell.Tab.2.bottom" timestamp="1583324623548">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="242" key="GridCell.Tab.2.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1583324623548" />
<state width="1877" height="242" key="GridCell.Tab.2.center" timestamp="1583324623547">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="242" key="GridCell.Tab.2.center/0.0.1920.1040@0.0.1920.1040" timestamp="1583324623547" />
<state width="1877" height="242" key="GridCell.Tab.2.left" timestamp="1583324623547">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="242" key="GridCell.Tab.2.left/0.0.1920.1040@0.0.1920.1040" timestamp="1583324623547" />
<state width="1877" height="242" key="GridCell.Tab.2.right" timestamp="1583324623548">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="242" key="GridCell.Tab.2.right/0.0.1920.1040@0.0.1920.1040" timestamp="1583324623548" />
<state x="490" y="175" key="Maven.ArtifactSearchDialog" timestamp="1583320014926">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="490" y="175" key="Maven.ArtifactSearchDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1583320014926" />
<state x="600" y="217" key="NewModule_or_Project.wizard" timestamp="1582699806601"> <state x="600" y="217" key="NewModule_or_Project.wizard" timestamp="1582699806601">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="600" y="217" key="NewModule_or_Project.wizard/0.0.1920.1040@0.0.1920.1040" timestamp="1582699806601" /> <state x="600" y="217" key="NewModule_or_Project.wizard/0.0.1920.1040@0.0.1920.1040" timestamp="1582699806601" />
<state x="461" y="162" width="1352" height="708" key="SettingsEditor" timestamp="1583226109675"> <state x="461" y="162" width="1352" height="708" key="SettingsEditor" timestamp="1583319986831">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="461" y="162" width="1352" height="708" key="SettingsEditor/0.0.1920.1040@0.0.1920.1040" timestamp="1583226109675" /> <state x="461" y="162" width="1352" height="708" key="SettingsEditor/0.0.1920.1040@0.0.1920.1040" timestamp="1583319986831" />
<state x="552" y="253" key="Vcs.Push.Dialog.v2" timestamp="1583218012751"> <state x="552" y="253" key="Vcs.Push.Dialog.v2" timestamp="1583245901787">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="552" y="253" key="Vcs.Push.Dialog.v2/0.0.1920.1040@0.0.1920.1040" timestamp="1583218012751" /> <state x="552" y="253" key="Vcs.Push.Dialog.v2/0.0.1920.1040@0.0.1920.1040" timestamp="1583245901787" />
<state x="511" y="210" key="new project wizard" timestamp="1583226107596"> <state x="511" y="210" key="new project wizard" timestamp="1583318693876">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="511" y="210" key="new project wizard/0.0.1920.1040@0.0.1920.1040" timestamp="1583226107596" /> <state x="511" y="210" key="new project wizard/0.0.1920.1040@0.0.1920.1040" timestamp="1583318693876" />
<state x="616" y="173" width="670" height="676" key="search.everywhere.popup" timestamp="1583243281151"> <state x="616" y="173" width="672" height="676" key="search.everywhere.popup" timestamp="1583314608796">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="616" y="173" width="670" height="676" key="search.everywhere.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1583243281151" /> <state x="616" y="173" width="672" height="676" key="search.everywhere.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1583314608796" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<breakpoints>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/user/UserController.java</url>
<line>29</line>
<option name="timeStamp" value="1" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/config/FeignConfig.java</url>
<line>26</line>
<option name="timeStamp" value="2" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
<watches-manager>
<configuration name="SpringBootApplicationConfigurationType">
<watch expression="request.getRequestURL().toString()" language="JAVA" />
</configuration>
</watches-manager>
</component> </component>
</project> </project>
\ No newline at end of file
cneeds-common-data/pom.xml
...@@ -47,11 +47,11 @@ ...@@ -47,11 +47,11 @@
<artifactId>spring-boot-starter-jdbc</artifactId> <artifactId>spring-boot-starter-jdbc</artifactId>
</dependency>--> </dependency>-->
<dependency> <!--<dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId> <artifactId>druid-spring-boot-starter</artifactId>
<version>${druid.version}</version> <version>${druid.version}</version>
</dependency> </dependency>-->
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
......
cneeds-common-pojo/pom.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>cneeds-server</artifactId>
<groupId>com.mx.cneeds</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
<artifactId>cneeds-common-pojo</artifactId>
<!--<dependencies>
<dependency>
<groupId>com.mx.cneeds</groupId>
<artifactId>cneeds-common-utils</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>-->
</project>
\ No newline at end of file
cneeds-common-pojo/src/main/java/com/mx/cneeds/common/dto/JwtToken.java 0 → 100644
package com.mx.cneeds.common.dto;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import java.io.Serializable;
/**
* @ClassName JwtToken
* @Author zzrdark
* @Date 2020-03-04 17:35
* @Description TODO
**/
@Data
public class JwtToken implements Serializable {
@JsonProperty("access_token")
private String accessToken;
@JsonProperty("token_type")
private String tokenType;
@JsonProperty("expires_in")
private String expiresIn;
private String scope;
private String jti;
}
cneeds-common-data/src/main/java/com/mx/cneeds/server/vo/UserVo.java → cneeds-common-pojo/src/main/java/com/mx/cneeds/common/vo/UserVo.java
package com.mx.cneeds.server.vo; package com.mx.cneeds.common.vo;
import lombok.Data; import lombok.Data;
......
cneeds-common-utils/pom.xml
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
<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> <commons.io.version>2.5</commons.io.version>
<swagger.version>2.7.0</swagger.version>
</properties> </properties>
<dependencies> <dependencies>
...@@ -24,6 +23,7 @@ ...@@ -24,6 +23,7 @@
<groupId>com.baomidou</groupId> <groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId> <artifactId>mybatis-plus-boot-starter</artifactId>
<version>${mybatisplus.version}</version> <version>${mybatisplus.version}</version>
<scope>provided</scope>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>com.baomidou</groupId> <groupId>com.baomidou</groupId>
...@@ -42,15 +42,6 @@ ...@@ -42,15 +42,6 @@
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>
<version>${commons.io.version}</version> <version>${commons.io.version}</version>
</dependency> </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-server-authorization/Dockerfile 0 → 100644
FROM hub.c.163.com/library/java:8-alpine
MAINTAINER XXX XXX@imooc.com
ADD target/*.jar app.jar
# ADD *.jar app.jar
EXPOSE 8761
ENTRYPOINT ["java", "-jar", "/app.jar"]
\ No newline at end of file
cneeds-server-authorization/build.sh 0 → 100644
#!/usr/bin/env bash
mvn clean package -Dmaven.test.skip=true -U
#docker build -t hub.c.163.com/springcloud/eureka .
#docker push hub.c.163.com/springcloud/eureka
docker build -t zzrdark/eureka .
docker push zzrdark/eureka
# docker build -t 192.168.2.244:5000/eureka .
# docker push 192.168.2.244:5000/eureka
\ No newline at end of file
cneeds-server-authorization/pom.xml
...@@ -8,11 +8,18 @@ ...@@ -8,11 +8,18 @@
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>cneeds-server-authorization</artifactId> <artifactId>cneeds-server-authorization</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<dependencies> <dependencies>
<!-- eureka-client -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
</dependency>
<!-- for Spring Security --> <!-- for Spring Security -->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
......
cneeds-server-authorization/src/main/java/com/mx/cneeds/server/anthorization/AuthorizaitonApplication.java
...@@ -2,6 +2,7 @@ package com.mx.cneeds.server.anthorization; ...@@ -2,6 +2,7 @@ package com.mx.cneeds.server.anthorization;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
/** /**
* @ClassName AuthorizaitonApplication * @ClassName AuthorizaitonApplication
...@@ -10,6 +11,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; ...@@ -10,6 +11,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
* @Description TODO * @Description TODO
**/ **/
@SpringBootApplication @SpringBootApplication
@EnableEurekaClient
public class AuthorizaitonApplication { public class AuthorizaitonApplication {
public static void main(String[] args) { public static void main(String[] args) {
......
cneeds-server-authorization/src/main/java/com/mx/cneeds/server/anthorization/config/SecurityConfig.java 0 → 100644
package com.mx.cneeds.server.anthorization.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.crypto.password.PasswordEncoder;
@Configuration
public class SecurityConfig extends WebSecurityConfigurerAdapter {
@Bean
@Override
public AuthenticationManager authenticationManagerBean() throws Exception {
AuthenticationManager manager = super.authenticationManagerBean();
return manager;
}
@Bean
public PasswordEncoder passwordEncoder() {
return new BCryptPasswordEncoder();
}
@Override
protected void configure(HttpSecurity http) throws Exception {
/*http
.formLogin().and()
.authorizeRequests()
.anyRequest()
.permitAll()
.and()
.csrf().disable();*/
http.formLogin().disable();
}
}
\ No newline at end of file
cneeds-server-authorization/src/main/resources/application.properties
server.port=8081 server.port=8861
server.servlet.context-path=/server server.servlet.context-path=/
spring.application.name= cneeds-server-authorization spring.application.name= cneeds-server-authorization
\ No newline at end of file
eureka.client.service-url.defaultZone= http://192.168.2.244:8761/eureka/
eureka.instance.prefer-ip-address=true
\ No newline at end of file
cneeds-server-datashow/Dockerfile 0 → 100644
FROM hub.c.163.com/library/java:8-alpine
MAINTAINER XXX XXX@imooc.com
ADD target/*.jar app.jar
# ADD *.jar app.jar
EXPOSE 8761
ENTRYPOINT ["java", "-jar", "/app.jar"]
\ No newline at end of file
cneeds-server-datashow/build.sh 0 → 100644
#!/usr/bin/env bash
mvn clean package -Dmaven.test.skip=true -U
#docker build -t hub.c.163.com/springcloud/eureka .
#docker push hub.c.163.com/springcloud/eureka
docker build -t zzrdark/eureka .
docker push zzrdark/eureka
# docker build -t 192.168.2.244:5000/eureka .
# docker push 192.168.2.244:5000/eureka
\ No newline at end of file
cneeds-server-datashow/pom.xml
...@@ -12,18 +12,20 @@ ...@@ -12,18 +12,20 @@
<artifactId>cneeds-server-datashow</artifactId> <artifactId>cneeds-server-datashow</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId> <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
</dependency> </dependency>
<dependency> <!--<dependency>
<groupId>com.mx.cneeds</groupId> <groupId>com.mx.cneeds</groupId>
<artifactId>cneeds-common-data</artifactId> <artifactId>cneeds-common-utils</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
</dependency> </dependency>-->
<dependency> <dependency>
<groupId>com.mx.cneeds</groupId> <groupId>com.mx.cneeds</groupId>
<artifactId>cneeds-common-utils</artifactId> <artifactId>cneeds-common-pojo</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
</dependency> </dependency>
......
cneeds-server-datashow/src/main/java/com/mx/cneeds/common/converter/RequestParamterConverter.java 0 → 100644
package com.mx.cneeds.common.converter;
import javax.xml.bind.DatatypeConverter;
/**
* @ClassName RequestParamterConverter
* @Author zzrdark
* @Date 2020-03-04 17:54
* @Description TODO
**/
public class RequestParamterConverter {
public static String authorizationConverter(String username, String password){
StringBuilder sb = new StringBuilder();
sb.append(username+":");
sb.append(password);
String encoding = DatatypeConverter.printBase64Binary(sb.toString().getBytes());
sb = new StringBuilder();
sb.append("Basic ");
sb.append(encoding);
return sb.toString();
}
public static void main(String[] args) {
System.out.println(authorizationConverter("clientapp", "112233"));
}
}
cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/DatashowApplication.java
...@@ -3,6 +3,7 @@ package com.mx.cneeds.server.datashow; ...@@ -3,6 +3,7 @@ package com.mx.cneeds.server.datashow;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.netflix.eureka.EnableEurekaClient; import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
import org.springframework.cloud.openfeign.EnableFeignClients;
import springfox.documentation.swagger2.annotations.EnableSwagger2; import springfox.documentation.swagger2.annotations.EnableSwagger2;
/** /**
...@@ -14,8 +15,10 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; ...@@ -14,8 +15,10 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
@SpringBootApplication @SpringBootApplication
@EnableEurekaClient @EnableEurekaClient
@EnableSwagger2 @EnableSwagger2
@EnableFeignClients
public class DatashowApplication { public class DatashowApplication {
public static void main(String[] args) { public static void main(String[] args) {
SpringApplication.run(DatashowApplication.class); SpringApplication.run(DatashowApplication.class);
} }
} }
cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/client/AuthorizationClient.java 0 → 100644
package com.mx.cneeds.server.datashow.client;
import com.mx.cneeds.common.dto.JwtToken;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestParam;
/**
* @ClassName authorizationClient
* @Author zzrdark
* @Date 2020-03-04 17:33
* @Description TODO
**/
@FeignClient(name = "CNEEDS-SERVER-AUTHORIZATION")
public interface AuthorizationClient {
@PostMapping("/oauth/token")
JwtToken getToken(@RequestParam("grant_type") String grant_type,
@RequestParam("username") String username,
@RequestParam("password") String password,
@RequestParam("scope") String scope);
}
cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/config/FeignConfig.java 0 → 100644
package com.mx.cneeds.server.datashow.config;
import com.mx.cneeds.common.converter.RequestParamterConverter;
import feign.RequestInterceptor;
import feign.RequestTemplate;
import lombok.extern.slf4j.Slf4j;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
/**
* @ClassName FeignConfig
* @Author zzrdark
* @Date 2020-03-04 17:26
* @Description TODO
**/
@Configuration
@Slf4j
public class FeignConfig implements RequestInterceptor {
@Override
public void apply(RequestTemplate requestTemplate) {
//只支持 servlet
ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
if(requestAttributes == null){
return;
}
HttpServletRequest request = requestAttributes.getRequest();
if (request.getRequestURL().toString().contains("/user/login")){
String authString = RequestParamterConverter.authorizationConverter("clientapp","112233");
requestTemplate.header("Authorization",authString);
System.out.println(authString);
}
}
}
cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/config/OAuth2ResourceServer.java 0 → 100644
package com.mx.cneeds.server.datashow.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer;
import org.springframework.security.oauth2.config.annotation.web.configuration.ResourceServerConfigurerAdapter;
import org.springframework.security.oauth2.config.annotation.web.configurers.ResourceServerSecurityConfigurer;
import org.springframework.security.oauth2.provider.token.TokenStore;
import org.springframework.security.oauth2.provider.token.store.JwtAccessTokenConverter;
import org.springframework.security.oauth2.provider.token.store.JwtTokenStore;
// 资源服务配置
@Configuration
@EnableResourceServer
public class OAuth2ResourceServer extends ResourceServerConfigurerAdapter {
@Override
public void configure(HttpSecurity http) throws Exception {
http.authorizeRequests()
.antMatchers("/user/login")
.permitAll()
// 开启认证
.anyRequest()
.authenticated()
.and();
}
@Override
public void configure(ResourceServerSecurityConfigurer resources) throws Exception {
resources.stateless(true);
resources.tokenStore(jwtTokenStore());
}
@Bean
public TokenStore jwtTokenStore() {
return new JwtTokenStore(jwtAccessTokenConverter());
}
@Bean
public JwtAccessTokenConverter jwtAccessTokenConverter(){
JwtAccessTokenConverter converter = new JwtAccessTokenConverter();
// 对JWT进行前面的key
converter.setSigningKey("imooc");
return converter;
}
}
\ No newline at end of file
cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/user/UserController.java 0 → 100644
package com.mx.cneeds.server.datashow.web.user;
import com.mx.cneeds.server.datashow.client.AuthorizationClient;
import com.mx.cneeds.common.dto.JwtToken;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.logging.Logger;
/**
* @ClassName UserController
* @Author zzrdark
* @Date 2020-03-04 18:09
* @Description TODO
**/
@RestController
@Slf4j
@RequestMapping("/user")
public class UserController {
@Autowired
private AuthorizationClient authenticatorClient;
@GetMapping("/login")
public JwtToken login(String username, String password){
JwtToken token = authenticatorClient.getToken("password", username, password, "all");
log.info(token.toString());
return token;
}
}
cneeds-server-datashow/src/main/resources/application-dev.yml
spring: eureka:
datasource: client:
hikari: service-url:
driver-class-name: com.mysql.cj.jdbc.Driver defaultZone: http://192.168.2.244:8761/eureka/
jdbc-url: jdbc:mysql://192.168.2.244:3306/cneeds_server?useUnicode=true&characterEncoding=UTF-8 instance:
username: root prefer-ip-address: true
password: cneeds!QAZ1qaz
cneeds-server-datashow/src/main/resources/application.yml
spring: spring:
profiles: profiles:
active: dev active: dev
\ No newline at end of file application:
name: cneeds-server-datashow
server:
port: 9000
servlet:
context-path: /
\ No newline at end of file
cneeds-common-data/src/main/java/com/mx/cneeds/server/service/device/DeviceInfoService.java → cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/DeviceInfoService.java
package com.mx.cneeds.server.service.device; package com.mx.cneeds.server.device.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.mx.cneeds.common.pager.PageUtils; import com.mx.cneeds.common.pager.PageUtils;
......
cneeds-common-data/src/main/java/com/mx/cneeds/server/service/device/DeviceLogService.java → cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/DeviceLogService.java
package com.mx.cneeds.server.service.device; package com.mx.cneeds.server.device.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.mx.cneeds.common.pager.PageUtils; import com.mx.cneeds.common.pager.PageUtils;
......
cneeds-common-data/src/main/java/com/mx/cneeds/server/service/device/DeviceLogmediaService.java → cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/DeviceLogmediaService.java
package com.mx.cneeds.server.service.device; package com.mx.cneeds.server.device.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.mx.cneeds.common.pager.PageUtils; import com.mx.cneeds.common.pager.PageUtils;
......
cneeds-common-data/src/main/java/com/mx/cneeds/server/service/device/DeviceLogsettingService.java → cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/DeviceLogsettingService.java
package com.mx.cneeds.server.service.device; package com.mx.cneeds.server.device.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.mx.cneeds.common.pager.PageUtils; import com.mx.cneeds.common.pager.PageUtils;
......
cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/impl/DeviceInfoServiceImpl.java
...@@ -3,7 +3,7 @@ package com.mx.cneeds.server.device.service.impl; ...@@ -3,7 +3,7 @@ package com.mx.cneeds.server.device.service.impl;
import com.mx.cneeds.common.pager.PageUtils; import com.mx.cneeds.common.pager.PageUtils;
import com.mx.cneeds.common.pager.Query; import com.mx.cneeds.common.pager.Query;
import com.mx.cneeds.server.dao.DeviceInfoDao; import com.mx.cneeds.server.dao.DeviceInfoDao;
import com.mx.cneeds.server.service.device.DeviceInfoService; import com.mx.cneeds.server.device.service.DeviceInfoService;
import com.mx.cneeds.server.entity.DeviceInfoEntity; import com.mx.cneeds.server.entity.DeviceInfoEntity;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Map; import java.util.Map;
......
cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/impl/DeviceLogServiceImpl.java
...@@ -3,7 +3,7 @@ package com.mx.cneeds.server.device.service.impl; ...@@ -3,7 +3,7 @@ package com.mx.cneeds.server.device.service.impl;
import com.mx.cneeds.common.pager.PageUtils; import com.mx.cneeds.common.pager.PageUtils;
import com.mx.cneeds.common.pager.Query; import com.mx.cneeds.common.pager.Query;
import com.mx.cneeds.server.dao.DeviceLogDao; import com.mx.cneeds.server.dao.DeviceLogDao;
import com.mx.cneeds.server.service.device.DeviceLogService; import com.mx.cneeds.server.device.service.DeviceLogService;
import com.mx.cneeds.server.entity.DeviceLogEntity; import com.mx.cneeds.server.entity.DeviceLogEntity;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Map; import java.util.Map;
......
cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/impl/DeviceLogmediaServiceImpl.java
...@@ -3,7 +3,7 @@ package com.mx.cneeds.server.device.service.impl; ...@@ -3,7 +3,7 @@ package com.mx.cneeds.server.device.service.impl;
import com.mx.cneeds.common.pager.PageUtils; import com.mx.cneeds.common.pager.PageUtils;
import com.mx.cneeds.common.pager.Query; import com.mx.cneeds.common.pager.Query;
import com.mx.cneeds.server.dao.DeviceLogmediaDao; import com.mx.cneeds.server.dao.DeviceLogmediaDao;
import com.mx.cneeds.server.service.device.DeviceLogmediaService; import com.mx.cneeds.server.device.service.DeviceLogmediaService;
import com.mx.cneeds.server.entity.DeviceLogmediaEntity; import com.mx.cneeds.server.entity.DeviceLogmediaEntity;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Map; import java.util.Map;
......
cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/impl/DeviceLogsettingServiceImpl.java
...@@ -3,7 +3,7 @@ package com.mx.cneeds.server.device.service.impl; ...@@ -3,7 +3,7 @@ package com.mx.cneeds.server.device.service.impl;
import com.mx.cneeds.common.pager.PageUtils; import com.mx.cneeds.common.pager.PageUtils;
import com.mx.cneeds.common.pager.Query; import com.mx.cneeds.common.pager.Query;
import com.mx.cneeds.server.dao.DeviceLogsettingDao; import com.mx.cneeds.server.dao.DeviceLogsettingDao;
import com.mx.cneeds.server.service.device.DeviceLogsettingService; import com.mx.cneeds.server.device.service.DeviceLogsettingService;
import com.mx.cneeds.server.entity.DeviceLogsettingEntity; import com.mx.cneeds.server.entity.DeviceLogsettingEntity;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Map; import java.util.Map;
......
cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/device/DeviceInfoController.java → cneeds-server-device/src/main/java/com/mx/cneeds/server/device/web/DeviceInfoController.java
package com.mx.cneeds.server.datashow.web.device; package com.mx.cneeds.server.device.web;
import com.mx.cneeds.common.pager.PageUtils; import com.mx.cneeds.common.pager.PageUtils;
import com.mx.cneeds.common.result.R; import com.mx.cneeds.common.result.R;
import com.mx.cneeds.common.validator.ValidatorUtils; import com.mx.cneeds.common.validator.ValidatorUtils;
import com.mx.cneeds.server.service.device.DeviceInfoService;
import com.mx.cneeds.server.entity.DeviceInfoEntity; import com.mx.cneeds.server.entity.DeviceInfoEntity;
import com.mx.cneeds.server.device.service.DeviceInfoService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
......
cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/device/DeviceLogController.java → cneeds-server-device/src/main/java/com/mx/cneeds/server/device/web/DeviceLogController.java
package com.mx.cneeds.server.datashow.web.device; package com.mx.cneeds.server.device.web;
import com.mx.cneeds.common.pager.PageUtils; import com.mx.cneeds.common.pager.PageUtils;
import com.mx.cneeds.common.result.R; import com.mx.cneeds.common.result.R;
import com.mx.cneeds.common.validator.ValidatorUtils; import com.mx.cneeds.common.validator.ValidatorUtils;
import com.mx.cneeds.server.service.device.DeviceLogService;
import com.mx.cneeds.server.entity.DeviceLogEntity; import com.mx.cneeds.server.entity.DeviceLogEntity;
import com.mx.cneeds.server.device.service.DeviceLogService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
......
cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/device/DeviceLogmediaController.java → cneeds-server-device/src/main/java/com/mx/cneeds/server/device/web/DeviceLogmediaController.java
package com.mx.cneeds.server.datashow.web.device; package com.mx.cneeds.server.device.web;
import com.mx.cneeds.common.pager.PageUtils; import com.mx.cneeds.common.pager.PageUtils;
import com.mx.cneeds.common.result.R; import com.mx.cneeds.common.result.R;
import com.mx.cneeds.common.validator.ValidatorUtils; import com.mx.cneeds.common.validator.ValidatorUtils;
import com.mx.cneeds.server.service.device.DeviceLogmediaService;
import com.mx.cneeds.server.entity.DeviceLogmediaEntity; import com.mx.cneeds.server.entity.DeviceLogmediaEntity;
import com.mx.cneeds.server.device.service.DeviceLogmediaService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
......
cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/device/DeviceLogsettingController.java → cneeds-server-device/src/main/java/com/mx/cneeds/server/device/web/DeviceLogsettingController.java
package com.mx.cneeds.server.datashow.web.device; package com.mx.cneeds.server.device.web;
import com.mx.cneeds.common.pager.PageUtils; import com.mx.cneeds.common.pager.PageUtils;
import com.mx.cneeds.common.result.R; import com.mx.cneeds.common.result.R;
import com.mx.cneeds.common.validator.ValidatorUtils; import com.mx.cneeds.common.validator.ValidatorUtils;
import com.mx.cneeds.server.service.device.DeviceLogsettingService;
import com.mx.cneeds.server.entity.DeviceLogsettingEntity; import com.mx.cneeds.server.entity.DeviceLogsettingEntity;
import com.mx.cneeds.server.device.service.DeviceLogsettingService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
......
cneeds-server-user/pom.xml
...@@ -24,14 +24,14 @@ ...@@ -24,14 +24,14 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.mx.cneeds</groupId> <groupId>com.mx.cneeds</groupId>
<artifactId>cneeds-common-data</artifactId> <artifactId>cneeds-common-pojo</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>com.mx.cneeds</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>cneeds-common-data</artifactId>
<version>${mysql.version}</version> <version>1.0-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
......
cneeds-common-data/src/main/java/com/mx/cneeds/server/service/user/SysDeptService.java → cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysDeptService.java
package com.mx.cneeds.server.service.user; package com.mx.cneeds.server.user.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.mx.cneeds.common.pager.PageUtils; import com.mx.cneeds.common.pager.PageUtils;
......
cneeds-common-data/src/main/java/com/mx/cneeds/server/service/user/SysFuncService.java → cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysFuncService.java
package com.mx.cneeds.server.service.user; package com.mx.cneeds.server.user.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.mx.cneeds.common.pager.PageUtils; import com.mx.cneeds.common.pager.PageUtils;
......
cneeds-common-data/src/main/java/com/mx/cneeds/server/service/user/SysRoleDeptService.java → cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysRoleDeptService.java
package com.mx.cneeds.server.service.user; package com.mx.cneeds.server.user.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.mx.cneeds.common.pager.PageUtils; import com.mx.cneeds.common.pager.PageUtils;
......
cneeds-common-data/src/main/java/com/mx/cneeds/server/service/user/SysRoleFuncService.java → cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysRoleFuncService.java
package com.mx.cneeds.server.service.user; package com.mx.cneeds.server.user.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.mx.cneeds.common.pager.PageUtils; import com.mx.cneeds.common.pager.PageUtils;
......
cneeds-common-data/src/main/java/com/mx/cneeds/server/service/user/SysRoleService.java → cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysRoleService.java
package com.mx.cneeds.server.service.user; package com.mx.cneeds.server.user.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.mx.cneeds.common.pager.PageUtils; import com.mx.cneeds.common.pager.PageUtils;
......
cneeds-common-data/src/main/java/com/mx/cneeds/server/service/user/SysUserRoleService.java → cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysUserRoleService.java
package com.mx.cneeds.server.service.user; package com.mx.cneeds.server.user.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.mx.cneeds.common.pager.PageUtils; import com.mx.cneeds.common.pager.PageUtils;
......
cneeds-common-data/src/main/java/com/mx/cneeds/server/service/user/SysUserService.java → cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysUserService.java
package com.mx.cneeds.server.service.user; package com.mx.cneeds.server.user.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.mx.cneeds.common.pager.PageUtils; import com.mx.cneeds.common.pager.PageUtils;
......
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysDeptServiceImpl.java
...@@ -4,7 +4,7 @@ import com.mx.cneeds.common.pager.PageUtils; ...@@ -4,7 +4,7 @@ import com.mx.cneeds.common.pager.PageUtils;
import com.mx.cneeds.common.pager.Query; import com.mx.cneeds.common.pager.Query;
import com.mx.cneeds.server.dao.SysDeptDao; import com.mx.cneeds.server.dao.SysDeptDao;
import com.mx.cneeds.server.entity.SysDeptEntity; import com.mx.cneeds.server.entity.SysDeptEntity;
import com.mx.cneeds.server.service.user.SysDeptService; import com.mx.cneeds.server.user.service.SysDeptService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Map; import java.util.Map;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
......
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysFuncServiceImpl.java
...@@ -4,7 +4,7 @@ import com.mx.cneeds.common.pager.PageUtils; ...@@ -4,7 +4,7 @@ import com.mx.cneeds.common.pager.PageUtils;
import com.mx.cneeds.common.pager.Query; import com.mx.cneeds.common.pager.Query;
import com.mx.cneeds.server.dao.SysFuncDao; import com.mx.cneeds.server.dao.SysFuncDao;
import com.mx.cneeds.server.entity.SysFuncEntity; import com.mx.cneeds.server.entity.SysFuncEntity;
import com.mx.cneeds.server.service.user.SysFuncService; import com.mx.cneeds.server.user.service.SysFuncService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Map; import java.util.Map;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
......
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysRoleDeptServiceImpl.java
...@@ -4,7 +4,7 @@ import com.mx.cneeds.common.pager.PageUtils; ...@@ -4,7 +4,7 @@ import com.mx.cneeds.common.pager.PageUtils;
import com.mx.cneeds.common.pager.Query; import com.mx.cneeds.common.pager.Query;
import com.mx.cneeds.server.dao.SysRoleDeptDao; import com.mx.cneeds.server.dao.SysRoleDeptDao;
import com.mx.cneeds.server.entity.SysRoleDeptEntity; import com.mx.cneeds.server.entity.SysRoleDeptEntity;
import com.mx.cneeds.server.service.user.SysRoleDeptService; import com.mx.cneeds.server.user.service.SysRoleDeptService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Map; import java.util.Map;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
......
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysRoleFuncServiceImpl.java
...@@ -4,7 +4,7 @@ import com.mx.cneeds.common.pager.PageUtils; ...@@ -4,7 +4,7 @@ import com.mx.cneeds.common.pager.PageUtils;
import com.mx.cneeds.common.pager.Query; import com.mx.cneeds.common.pager.Query;
import com.mx.cneeds.server.dao.SysRoleFuncDao; import com.mx.cneeds.server.dao.SysRoleFuncDao;
import com.mx.cneeds.server.entity.SysRoleFuncEntity; import com.mx.cneeds.server.entity.SysRoleFuncEntity;
import com.mx.cneeds.server.service.user.SysRoleFuncService; import com.mx.cneeds.server.user.service.SysRoleFuncService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Map; import java.util.Map;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
......
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysRoleServiceImpl.java
...@@ -4,7 +4,7 @@ import com.mx.cneeds.common.pager.PageUtils; ...@@ -4,7 +4,7 @@ import com.mx.cneeds.common.pager.PageUtils;
import com.mx.cneeds.common.pager.Query; import com.mx.cneeds.common.pager.Query;
import com.mx.cneeds.server.dao.SysRoleDao; import com.mx.cneeds.server.dao.SysRoleDao;
import com.mx.cneeds.server.entity.SysRoleEntity; import com.mx.cneeds.server.entity.SysRoleEntity;
import com.mx.cneeds.server.service.user.SysRoleService; import com.mx.cneeds.server.user.service.SysRoleService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Map; import java.util.Map;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
......
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysUserRoleServiceImpl.java
...@@ -4,7 +4,7 @@ import com.mx.cneeds.common.pager.PageUtils; ...@@ -4,7 +4,7 @@ import com.mx.cneeds.common.pager.PageUtils;
import com.mx.cneeds.common.pager.Query; import com.mx.cneeds.common.pager.Query;
import com.mx.cneeds.server.dao.SysUserRoleDao; import com.mx.cneeds.server.dao.SysUserRoleDao;
import com.mx.cneeds.server.entity.SysUserRoleEntity; import com.mx.cneeds.server.entity.SysUserRoleEntity;
import com.mx.cneeds.server.service.user.SysUserRoleService; import com.mx.cneeds.server.user.service.SysUserRoleService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Map; import java.util.Map;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
......
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysUserServiceImpl.java
...@@ -4,7 +4,7 @@ import com.mx.cneeds.common.pager.PageUtils; ...@@ -4,7 +4,7 @@ import com.mx.cneeds.common.pager.PageUtils;
import com.mx.cneeds.common.pager.Query; import com.mx.cneeds.common.pager.Query;
import com.mx.cneeds.server.dao.SysUserDao; import com.mx.cneeds.server.dao.SysUserDao;
import com.mx.cneeds.server.entity.SysUserEntity; import com.mx.cneeds.server.entity.SysUserEntity;
import com.mx.cneeds.server.service.user.SysUserService; import com.mx.cneeds.server.user.service.SysUserService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Map; import java.util.Map;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
......
cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/user/SysDeptController.java → cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysDeptController.java
package com.mx.cneeds.server.datashow.web.user; package com.mx.cneeds.server.user.web;
import com.mx.cneeds.common.pager.PageUtils; import com.mx.cneeds.common.pager.PageUtils;
import com.mx.cneeds.common.result.R; import com.mx.cneeds.common.result.R;
import com.mx.cneeds.common.validator.ValidatorUtils; import com.mx.cneeds.common.validator.ValidatorUtils;
import com.mx.cneeds.server.entity.SysDeptEntity; import com.mx.cneeds.server.entity.SysDeptEntity;
import com.mx.cneeds.server.service.user.SysDeptService; import com.mx.cneeds.server.user.service.SysDeptService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
......
cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/user/SysFuncController.java → cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysFuncController.java
package com.mx.cneeds.server.datashow.web.user; package com.mx.cneeds.server.user.web;
import com.mx.cneeds.common.pager.PageUtils; import com.mx.cneeds.common.pager.PageUtils;
import com.mx.cneeds.common.result.R; import com.mx.cneeds.common.result.R;
import com.mx.cneeds.common.validator.ValidatorUtils; import com.mx.cneeds.common.validator.ValidatorUtils;
import com.mx.cneeds.server.entity.SysFuncEntity; import com.mx.cneeds.server.entity.SysFuncEntity;
import com.mx.cneeds.server.service.user.SysFuncService; import com.mx.cneeds.server.user.service.SysFuncService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
......
cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/user/SysRoleController.java → cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysRoleController.java
package com.mx.cneeds.server.datashow.web.user; package com.mx.cneeds.server.user.web;
import com.mx.cneeds.common.pager.PageUtils; import com.mx.cneeds.common.pager.PageUtils;
import com.mx.cneeds.common.result.R; import com.mx.cneeds.common.result.R;
import com.mx.cneeds.common.validator.ValidatorUtils; import com.mx.cneeds.common.validator.ValidatorUtils;
import com.mx.cneeds.server.entity.SysRoleEntity; import com.mx.cneeds.server.entity.SysRoleEntity;
import com.mx.cneeds.server.service.user.SysRoleService; import com.mx.cneeds.server.user.service.SysRoleService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
......
cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/user/SysRoleDeptController.java → cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysRoleDeptController.java
package com.mx.cneeds.server.datashow.web.user; package com.mx.cneeds.server.user.web;
import com.mx.cneeds.common.pager.PageUtils; import com.mx.cneeds.common.pager.PageUtils;
import com.mx.cneeds.common.result.R; import com.mx.cneeds.common.result.R;
import com.mx.cneeds.common.validator.ValidatorUtils; import com.mx.cneeds.common.validator.ValidatorUtils;
import com.mx.cneeds.server.entity.SysRoleDeptEntity; import com.mx.cneeds.server.entity.SysRoleDeptEntity;
import com.mx.cneeds.server.service.user.SysRoleDeptService; import com.mx.cneeds.server.user.service.SysRoleDeptService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
......
cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/user/SysRoleFuncController.java → cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysRoleFuncController.java
package com.mx.cneeds.server.datashow.web.user; package com.mx.cneeds.server.user.web;
import com.mx.cneeds.common.pager.PageUtils; import com.mx.cneeds.common.pager.PageUtils;
import com.mx.cneeds.common.result.R; import com.mx.cneeds.common.result.R;
import com.mx.cneeds.common.validator.ValidatorUtils; import com.mx.cneeds.common.validator.ValidatorUtils;
import com.mx.cneeds.server.entity.SysRoleFuncEntity; import com.mx.cneeds.server.entity.SysRoleFuncEntity;
import com.mx.cneeds.server.service.user.SysRoleFuncService; import com.mx.cneeds.server.user.service.SysRoleFuncService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
......
cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/user/SysUserController.java → cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysUserController.java
package com.mx.cneeds.server.datashow.web.user; package com.mx.cneeds.server.user.web;
import com.mx.cneeds.common.pager.PageUtils; import com.mx.cneeds.common.pager.PageUtils;
import com.mx.cneeds.common.result.R; import com.mx.cneeds.common.result.R;
import com.mx.cneeds.common.validator.ValidatorUtils; import com.mx.cneeds.common.validator.ValidatorUtils;
import com.mx.cneeds.common.vo.UserVo;
import com.mx.cneeds.server.entity.SysUserEntity; import com.mx.cneeds.server.entity.SysUserEntity;
import com.mx.cneeds.server.service.user.SysUserService; import com.mx.cneeds.server.user.service.SysUserService;
import com.mx.cneeds.server.vo.UserVo;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
......
cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/user/SysUserRoleController.java → cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysUserRoleController.java
package com.mx.cneeds.server.datashow.web.user; package com.mx.cneeds.server.user.web;
import com.mx.cneeds.common.pager.PageUtils; import com.mx.cneeds.common.pager.PageUtils;
import com.mx.cneeds.common.result.R; import com.mx.cneeds.common.result.R;
import com.mx.cneeds.common.validator.ValidatorUtils; import com.mx.cneeds.common.validator.ValidatorUtils;
import com.mx.cneeds.server.entity.SysUserRoleEntity; import com.mx.cneeds.server.entity.SysUserRoleEntity;
import com.mx.cneeds.server.service.user.SysUserRoleService; import com.mx.cneeds.server.user.service.SysUserRoleService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
......
cneeds-server-user/src/main/resources/application.yml
...@@ -2,43 +2,57 @@ spring: ...@@ -2,43 +2,57 @@ spring:
application: application:
name: cneeds-server-user name: cneeds-server-user
datasource: datasource:
type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.jdbc.Driver
druid: url: jdbc:mysql://192.168.2.244:3306/cneeds_server?useUnicode=true&characterEncoding=UTF-8&useSSL=false
driver-class-name: com.mysql.jdbc.Driver password: cneeds!QAZ1qaz
url: jdbc:mysql://192.168.2.244:3306/cneeds_server?useUnicode=true&characterEncoding=UTF-8&useSSL=false username: root
username: root # hikari:
password: cneeds!QAZ1qaz # driver-class-name: com.mysql.jdbc.Driver
initial-size: 10 # url: jdbc:mysql://192.168.2.244:3306/cneeds_server?useUnicode=true&characterEncoding=UTF-8&useSSL=false
max-active: 100 # username: root
min-idle: 10 # password: cneeds!QAZ1qaz
max-wait: 60000 # datasource:
pool-prepared-statements: true # type: com.alibaba.druid.pool.DruidDataSource
max-pool-prepared-statement-per-connection-size: 20 # druid:
time-between-eviction-runs-millis: 60000 # driver-class-name: com.mysql.jdbc.Driver
min-evictable-idle-time-millis: 300000 # url: jdbc:mysql://192.168.2.244:3306/cneeds_server?useUnicode=true&characterEncoding=UTF-8&useSSL=false
#Oracle需要打开注释 # username: root
#validation-query: SELECT 1 FROM DUAL # password: cneeds!QAZ1qaz
test-while-idle: true # initial-size: 10
test-on-borrow: false # max-active: 100
test-on-return: false # min-idle: 10
stat-view-servlet: # max-wait: 60000
enabled: true # pool-prepared-statements: true
url-pattern: /druid/* # max-pool-prepared-statement-per-connection-size: 20
#login-username: admin # time-between-eviction-runs-millis: 60000
#login-password: admin # min-evictable-idle-time-millis: 300000
filter: # #Oracle需要打开注释
stat: # #validation-query: SELECT 1 FROM DUAL
log-slow-sql: true # test-while-idle: true
slow-sql-millis: 1000 # test-on-borrow: false
merge-sql: false # test-on-return: false
wall: # stat-view-servlet:
config: # enabled: true
multi-statement-allow: true # url-pattern: /druid/*
# #login-username: admin
# #login-password: admin
# filter:
# stat:
# log-slow-sql: true
# slow-sql-millis: 1000
# merge-sql: false
# wall:
# config:
# multi-statement-allow: true
eureka: eureka:
client: client:
service-url: service-url:
defaultZone: http://192.168.2.244:8761/eureka/ defaultZone: http://192.168.2.244:8761/eureka/
instance:
prefer-ip-address: true
server: server:
port: 9999 port: 9001
servlet:
context-path: /
pom.xml
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
<module>cneeds-common-data</module> <module>cneeds-common-data</module>
<module>cneeds-common-utils</module> <module>cneeds-common-utils</module>
<module>cneeds-server-authorization</module> <module>cneeds-server-authorization</module>
<module>cneeds-common-pojo</module>
</modules> </modules>
<properties> <properties>
...@@ -29,6 +30,7 @@ ...@@ -29,6 +30,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<spring-cloud.version>Finchley.SR2</spring-cloud.version> <spring-cloud.version>Finchley.SR2</spring-cloud.version>
<swagger.version>2.7.0</swagger.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
...@@ -58,6 +60,22 @@ ...@@ -58,6 +60,22 @@
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId>
</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>
......
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