Skip to content

C
cneeds-server
Commit a8972fd1 by zzrdark
Options

1.修改项目结构 

2.更改数据库连接
3.增加测试docker部署
parent dd03c0e1
Showing with 833 additions and 271 deletions
.idea/compiler.xml
......@@ -2,21 +2,25 @@
<project version="4">
<component name="CompilerConfiguration">
<annotationProcessing>
<profile default="true" name="Default" enabled="true" />
<profile name="Maven default annotation processors profile" enabled="true">
<sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" />
<module name="cneeds-server-advice_control" />
<module name="cneeds-common-utils" />
<module name="cneeds-server-datashow" />
<module name="cneeds-server-logupload" />
<module name="cneeds-common-utils" />
<module name="cneeds-common-data" />
<module name="cneeds-server-logupload" />
<module name="cneeds-server-eureka" />
<module name="cneeds-server-device_activate" />
<module name="cneeds-server-user" />
<module name="cneeds-server-device" />
<module name="cneeds-server-authorization" />
</profile>
</annotationProcessing>
<bytecodeTargetLevel>
<module name="cneeds-server-advice-control" target="1.8" />
<module name="cneeds-server.device_activate" target="1.8" />
<module name="cneedsservereureka" target="1.5" />
</bytecodeTargetLevel>
</component>
......@@ -24,13 +28,15 @@
<option name="ADDITIONAL_OPTIONS_OVERRIDE">
<module name="cneeds-common-data" 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-datashow" options="-parameters" />
<module name="cneeds-server-device" options="-parameters" />
<module name="cneeds-server-device_activate" options="-parameters" />
<module name="cneeds-server-eureka" options="-parameters" />
<module name="cneeds-server-logupload" options="-parameters" />
<module name="cneeds-server-user" options="-parameters" />
<module name="cneeds-server.device_activate" options="-parameters" />
</option>
</component>
</project>
\ No newline at end of file
.idea/encodings.xml
......@@ -3,13 +3,20 @@
<component name="Encoding">
<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/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/cneeds-common-utils" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/cneeds-server-advice_control" 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-datashow" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/cneeds-server-datashow/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/cneeds-server-device" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/cneeds-server-device_activate" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/cneeds-server-device/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/cneeds-server-eureka" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/cneeds-server-eureka/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/cneeds-server-eureka/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/cneeds-server-logupload" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/cneeds-server-logupload/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/cneeds-server-user" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/cneeds-server-user/src/main/java" charset="UTF-8" />
</component>
</project>
\ No newline at end of file
.idea/misc.xml
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="JavaScriptSettings">
<option name="languageLevel" value="ES6" />
</component>
<component name="MavenProjectsManager">
<option name="originalFiles">
<list>
......@@ -8,6 +11,11 @@
<option value="$PROJECT_DIR$/cneeds-server-advice_control/pom.xml" />
</list>
</option>
<option name="ignoredFiles">
<set>
<option value="$PROJECT_DIR$/cneeds-server-advice-control/pom.xml" />
</set>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
......
.idea/workspace.xml
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="58efcb75-622d-40c1-b8e0-10cd2fb456b4" name="Default Changelist" comment="1.增加持久层代码&#10;2.增加utils&#10;3.修改项目间依赖关系&#10;4.增加service、controller">
<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-server-authorization/cneeds-server-authorization.iml" 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/src/main/java/com/mx/cneeds/server/anthorization/config/OAuth2AuthorizationServer.java" 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/resources/application.properties" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-eureka/Dockerfile" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-eureka/build.sh" 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-user/Dockerfile" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-user/build.sh" 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/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$/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/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/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/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-utils/cneeds-common-utils.iml" beforeDir="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/src/main/java/com/mx/cneeds/common/xss/SQLFilter.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-utils/src/main/java/com/mx/cneeds/common/xss/SQLFilter.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-advice_control/cneeds-server-advice_control.iml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-advice_control/pom.xml" beforeDir="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-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/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-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/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/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/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/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/SysRoleFuncServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysRoleFuncServiceImpl.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/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$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
......@@ -52,28 +120,38 @@
<component name="ProjectLevelVcsManager" settingsEditedManually="true">
<ConfirmationsSetting value="2" id="Add" />
</component>
<component name="ProjectViewState">
<option name="showExcludedFiles" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent">
<property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
<property name="RequestMappingsPanelOrder0" value="0" />
<property name="RequestMappingsPanelOrder1" value="1" />
<property name="RequestMappingsPanelWidth0" value="75" />
<property name="RequestMappingsPanelWidth1" value="75" />
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/cneeds-server-user/src/main/resources" />
<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="project.structure.last.edited" value="Modules" />
<property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.2916053" />
<property name="settings.editor.selected.configurable" value="reference.settingsdialog.project.gradle" />
<property name="settings.editor.selected.configurable" value="reference.projectsettings.compiler.annotationProcessors" />
<property name="settings.editor.splitter.proportion" value="0.20898877" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="E:\mx_project\cneeds-server\cneeds-server-datashow\src\main\resources" />
<recent name="E:\mx_project\cneeds-server\cneeds-server-user\src\main\resources" />
<recent name="E:\mx_project\cneeds-server\cneeds-server-device\src\main\java\com\mx\cneeds\server\device\web" />
<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-device\src\main\java\com\mx\cneeds\server\device\service\impl" />
<recent name="E:\mx_project\cneeds-server\cneeds-server-user" />
<recent name="E:\mx_project\cneeds-server\cneeds-server-authorization\src\main\resources" />
<recent name="E:\mx_project\cneeds-server\cneeds-server-eureka" />
<recent name="E:\mx_project\cneeds-server\cneeds-server-datashow\src\main\java\com\mx\cneeds\server\datashow\web\device" />
</key>
<key name="CopyClassDialog.RECENTS_KEY">
<recent name="com.mx.cneeds.server.vo" />
<recent name="com.mx.cneeds.common.pager" />
<recent name="com.mx.cneeds.common.exception" />
<recent name="com.mx.cneeds.common.validator" />
......@@ -84,19 +162,7 @@
<recent name="E:\mx_project\cneeds-server\src" />
</key>
</component>
<component name="RunDashboard">
<option name="ruleStates">
<list>
<RuleState>
<option name="name" value="ConfigurationTypeDashboardGroupingRule" />
</RuleState>
<RuleState>
<option name="name" value="StatusDashboardGroupingRule" />
</RuleState>
</list>
</option>
</component>
<component name="RunManager" selected="Application.EurekaServerApplication">
<component name="RunManager" selected="Spring Boot.UserServerApplication">
<configuration name="EurekaServerApplication" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="com.mx.cneeds.server.eureka.EurekaServerApplication" />
<module name="cneeds-server-eureka" />
......@@ -104,6 +170,74 @@
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration default="true" type="JetRunConfigurationType" factoryName="Kotlin">
<module name="cneeds-server-advice-control" />
<option name="VM_PARAMETERS" />
<option name="PROGRAM_PARAMETERS" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="MAIN_CLASS_NAME" />
<option name="WORKING_DIRECTORY" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration default="true" type="KotlinStandaloneScriptRunConfigurationType" factoryName="Kotlin script">
<module name="cneeds-server-advice-control" />
<option name="filePath" />
<option name="vmParameters" />
<option name="alternativeJrePath" />
<option name="programParameters" />
<option name="passParentEnvs" value="true" />
<option name="workingDirectory" />
<option name="isAlternativeJrePathEnabled" value="false" />
<option name="VM_PARAMETERS" />
<option name="PROGRAM_PARAMETERS" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="MAIN_CLASS_NAME" />
<option name="WORKING_DIRECTORY" />
<option name="filePath" />
<option name="vmParameters" />
<option name="alternativeJrePath" />
<option name="programParameters" />
<option name="passParentEnvs" value="true" />
<option name="workingDirectory" />
<option name="isAlternativeJrePathEnabled" value="false" />
<option name="VM_PARAMETERS" />
<option name="PROGRAM_PARAMETERS" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="MAIN_CLASS_NAME" />
<option name="WORKING_DIRECTORY" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="AuthorizaitonApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<module name="cneeds-server-authorization" />
<option name="SPRING_BOOT_MAIN_CLASS" value="com.mx.cneeds.server.anthorization.AuthorizaitonApplication" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="DatashowApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<module name="cneeds-server-datashow" />
<option name="SPRING_BOOT_MAIN_CLASS" value="com.mx.cneeds.server.datashow.DatashowApplication" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="DeviceApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<module name="cneeds-server-device" />
<option name="SPRING_BOOT_MAIN_CLASS" value="com.mx.cneeds.server.device.DeviceApplication" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="EurekaServerApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<module name="cneeds-server-eureka" />
<option name="SPRING_BOOT_MAIN_CLASS" value="com.mx.cneeds.server.eureka.EurekaServerApplication" />
......@@ -124,6 +258,18 @@
</list>
</recent_temporary>
</component>
<component name="ServiceViewManager">
<option name="viewStates">
<list>
<serviceView>
<treeState>
<expand />
<select />
</treeState>
</serviceView>
</list>
</option>
</component>
<component name="SvnConfiguration">
<configuration />
</component>
......@@ -138,7 +284,14 @@
<workItem from="1578295009682" duration="4167000" />
<workItem from="1578389632725" duration="4443000" />
<workItem from="1578448455421" duration="3371000" />
<workItem from="1578536666336" duration="10353000" />
<workItem from="1578536666336" duration="10378000" />
<workItem from="1578624213190" duration="2610000" />
<workItem from="1582512403047" duration="1498000" />
<workItem from="1582612648587" duration="8644000" />
<workItem from="1582704963934" duration="3105000" />
<workItem from="1582874431918" duration="3123000" />
<workItem from="1583217548512" duration="3424000" />
<workItem from="1583221072963" duration="18615000" />
</task>
<task id="LOCAL-00001" summary="1.修改不需要web服务 &#10;2.增加一个logupload">
<created>1578451117064</created>
......@@ -154,7 +307,21 @@
<option name="project" value="LOCAL" />
<updated>1578559919076</updated>
</task>
<option name="localTasksCounter" value="3" />
<task id="LOCAL-00003" summary="1.add 依赖 common-io">
<created>1578576270648</created>
<option name="number" value="00003" />
<option name="presentableId" value="LOCAL-00003" />
<option name="project" value="LOCAL" />
<updated>1578576270648</updated>
</task>
<task id="LOCAL-00004" summary="添加数据库表文档">
<created>1583218011528</created>
<option name="number" value="00004" />
<option name="presentableId" value="LOCAL-00004" />
<option name="project" value="LOCAL" />
<updated>1583218011528</updated>
</task>
<option name="localTasksCounter" value="5" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
......@@ -177,6 +344,78 @@
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
<MESSAGE value="1.修改不需要web服务 &#10;2.增加一个logupload" />
<MESSAGE value="1.增加持久层代码&#10;2.增加utils&#10;3.修改项目间依赖关系&#10;4.增加service、controller" />
<option name="LAST_COMMIT_MESSAGE" value="1.增加持久层代码&#10;2.增加utils&#10;3.修改项目间依赖关系&#10;4.增加service、controller" />
<MESSAGE value="1.add 依赖 common-io" />
<MESSAGE value="添加数据库表文档" />
<option name="LAST_COMMIT_MESSAGE" value="添加数据库表文档" />
</component>
<component name="WindowStateProjectService">
<state x="552" y="178" key="#Project_Structure" timestamp="1583240344009">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="552" y="178" key="#Project_Structure/0.0.1920.1040@0.0.1920.1040" timestamp="1583240344009" />
<state x="640" y="246" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog" timestamp="1582697117117">
<screen x="0" y="0" width="1920" height="1040" />
</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="690" y="266" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog" timestamp="1583224455231">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<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">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="463" y="112" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1583218010684" />
<state width="1877" height="350" key="GridCell.Tab.0.bottom" timestamp="1583245732022">
<screen x="0" y="0" width="1920" height="1040" />
</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="350" key="GridCell.Tab.0.center" timestamp="1583245732021">
<screen x="0" y="0" width="1920" height="1040" />
</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="350" key="GridCell.Tab.0.left" timestamp="1583245732021">
<screen x="0" y="0" width="1920" height="1040" />
</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="350" key="GridCell.Tab.0.right" timestamp="1583245732022">
<screen x="0" y="0" width="1920" height="1040" />
</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="350" key="GridCell.Tab.1.bottom" timestamp="1583245732022">
<screen x="0" y="0" width="1920" height="1040" />
</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="350" key="GridCell.Tab.1.center" timestamp="1583245732022">
<screen x="0" y="0" width="1920" height="1040" />
</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="350" key="GridCell.Tab.1.left" timestamp="1583245732022">
<screen x="0" y="0" width="1920" height="1040" />
</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="350" key="GridCell.Tab.1.right" timestamp="1583245732022">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="350" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1583245732022" />
<state x="600" y="217" key="NewModule_or_Project.wizard" timestamp="1582699806601">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<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">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="461" y="162" width="1352" height="708" key="SettingsEditor/0.0.1920.1040@0.0.1920.1040" timestamp="1583226109675" />
<state x="552" y="253" key="Vcs.Push.Dialog.v2" timestamp="1583218012751">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="552" y="253" key="Vcs.Push.Dialog.v2/0.0.1920.1040@0.0.1920.1040" timestamp="1583218012751" />
<state x="511" y="210" key="new project wizard" timestamp="1583226107596">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="511" y="210" key="new project wizard/0.0.1920.1040@0.0.1920.1040" timestamp="1583226107596" />
<state x="616" y="173" width="670" height="676" key="search.everywhere.popup" timestamp="1583243281151">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="616" y="173" width="670" height="676" key="search.everywhere.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1583243281151" />
</component>
</project>
\ No newline at end of file
cneeds-common-data/pom.xml
......@@ -10,13 +10,14 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>cneeds-common-data</artifactId>
<packaging>jar</packaging>
<properties>
<mybatis.spring.boot.version>1.3.0</mybatis.spring.boot.version>
<pagehelper.spring.boot.version>1.2.5</pagehelper.spring.boot.version>
<mysql.version>8.0.16</mysql.version>
<mybatisplus.version>3.1.2</mybatisplus.version>
<druid.version>1.1.13</druid.version>
</properties>
<dependencies>
......@@ -41,11 +42,28 @@
</exclusion>
</exclusions>
</dependency>
<!--<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jdbc</artifactId>
</dependency>-->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
<version>${druid.version}</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
</dependency>
<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-data/src/main/java/com/mx/cneeds/server/entity/DeviceInfoEntity.java
......@@ -56,5 +56,19 @@ public class DeviceInfoEntity implements Serializable {
* 激活时间
*/
private Date activeTime;
/**
* 渠道商号
* 分隔符","
*/
public String channelNums;
/**
* 渠道号提示信息
*/
public String channelNumsMessage;
/**
* 0黑名单
* 1白名单
*/
public Integer channelRules;
}
cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/DeviceInfoService.java → cneeds-common-data/src/main/java/com/mx/cneeds/server/service/device/DeviceInfoService.java
package com.mx.cneeds.server.device.service;
package com.mx.cneeds.server.service.device;
import com.baomidou.mybatisplus.extension.service.IService;
import com.mx.cneeds.common.pager.PageUtils;
......
cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/DeviceLogService.java → cneeds-common-data/src/main/java/com/mx/cneeds/server/service/device/DeviceLogService.java
package com.mx.cneeds.server.device.service;
package com.mx.cneeds.server.service.device;
import com.baomidou.mybatisplus.extension.service.IService;
import com.mx.cneeds.common.pager.PageUtils;
......
cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/DeviceLogmediaService.java → cneeds-common-data/src/main/java/com/mx/cneeds/server/service/device/DeviceLogmediaService.java
package com.mx.cneeds.server.device.service;
package com.mx.cneeds.server.service.device;
import com.baomidou.mybatisplus.extension.service.IService;
import com.mx.cneeds.common.pager.PageUtils;
......
cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/DeviceLogsettingService.java → cneeds-common-data/src/main/java/com/mx/cneeds/server/service/device/DeviceLogsettingService.java
package com.mx.cneeds.server.device.service;
package com.mx.cneeds.server.service.device;
import com.baomidou.mybatisplus.extension.service.IService;
import com.mx.cneeds.common.pager.PageUtils;
......
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysDeptService.java → cneeds-common-data/src/main/java/com/mx/cneeds/server/service/user/SysDeptService.java
package com.mx.cneeds.server.user.service;
package com.mx.cneeds.server.service.user;
import com.baomidou.mybatisplus.extension.service.IService;
import com.mx.cneeds.common.pager.PageUtils;
......
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysFuncService.java → cneeds-common-data/src/main/java/com/mx/cneeds/server/service/user/SysFuncService.java
package com.mx.cneeds.server.user.service;
package com.mx.cneeds.server.service.user;
import com.baomidou.mybatisplus.extension.service.IService;
import com.mx.cneeds.common.pager.PageUtils;
......
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysRoleDeptService.java → cneeds-common-data/src/main/java/com/mx/cneeds/server/service/user/SysRoleDeptService.java
package com.mx.cneeds.server.user.service;
package com.mx.cneeds.server.service.user;
import com.baomidou.mybatisplus.extension.service.IService;
import com.mx.cneeds.common.pager.PageUtils;
......
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysRoleFuncService.java → cneeds-common-data/src/main/java/com/mx/cneeds/server/service/user/SysRoleFuncService.java
package com.mx.cneeds.server.user.service;
package com.mx.cneeds.server.service.user;
import com.baomidou.mybatisplus.extension.service.IService;
import com.mx.cneeds.common.pager.PageUtils;
......
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysRoleService.java → cneeds-common-data/src/main/java/com/mx/cneeds/server/service/user/SysRoleService.java
package com.mx.cneeds.server.user.service;
package com.mx.cneeds.server.service.user;
import com.baomidou.mybatisplus.extension.service.IService;
import com.mx.cneeds.common.pager.PageUtils;
......
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysUserRoleService.java → cneeds-common-data/src/main/java/com/mx/cneeds/server/service/user/SysUserRoleService.java
package com.mx.cneeds.server.user.service;
package com.mx.cneeds.server.service.user;
import com.baomidou.mybatisplus.extension.service.IService;
import com.mx.cneeds.common.pager.PageUtils;
......
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysUserService.java → cneeds-common-data/src/main/java/com/mx/cneeds/server/service/user/SysUserService.java
package com.mx.cneeds.server.user.service;
package com.mx.cneeds.server.service.user;
import com.baomidou.mybatisplus.extension.service.IService;
import com.mx.cneeds.common.pager.PageUtils;
......
cneeds-common-data/src/main/java/com/mx/cneeds/server/vo/UserVo.java 0 → 100644
package com.mx.cneeds.server.vo;
import lombok.Data;
import java.io.Serializable;
/**
* @ClassName SysUser
* @Author zzrdark
* @Date 2020-03-03 16:54
* @Description TODO
**/
@Data
public class UserVo implements Serializable {
private String username;
private String password;
}
cneeds-common-data/src/main/resources/application.yml
mybatis-plus:
mapper-locations: classpath:mapper/*.xml
#实体扫描，多个package用逗号或者分号分隔
typeAliasesPackage: com.mx.cneeds.server.entity
global-config:
#数据库相关配置
db-config:
#主键类型 AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
id-type: AUTO
#字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断"
field-strategy: NOT_NULL
#驼峰下划线转换
column-underline: true
logic-delete-value: -1
logic-not-delete-value: 0
banner: false
#原生配置
configuration:
map-underscore-to-camel-case: true
cache-enabled: false
call-setters-on-nulls: true
jdbc-type-for-null: 'null'
cneeds-common-data/src/main/resources/mapper/DeviceInfoDao.xml
......@@ -14,6 +14,9 @@
<result property="productSet" column="product_set"/>
<result property="createTime" column="create_time"/>
<result property="activeTime" column="active_time"/>
<result property="channelNums" column="channel_nums"/>
<result property="channelNumsMessage" column="channel_nums_message"/>
<result property="channelRules" column="channel_rules"/>
</resultMap>
......
cneeds-common-utils/pom.xml
......@@ -9,6 +9,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
<artifactId>cneeds-common-utils</artifactId>
<properties>
......
cneeds-server-advice_control/cneeds-server-advice_control.iml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4" />
\ No newline at end of file
cneeds-server-advice_control/pom.xml → cneeds-server-authorization/pom.xml
......@@ -9,18 +9,35 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cneeds-server-advice_control</artifactId>
<artifactId>cneeds-server-authorization</artifactId>
<packaging>jar</packaging>
<dependencies>
<!-- for Spring Security -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
</dependency>
</dependencies>
<!-- for OAuth 2.0 -->
<dependency>
<groupId>org.springframework.security.oauth</groupId>
<artifactId>spring-security-oauth2</artifactId>
<version>2.0.15.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-jwt</artifactId>
<version>1.0.8.RELEASE</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
\ No newline at end of file
cneeds-server-advice_control/src/main/java/com/mx/cneeds/server/advice/control/AdviceControlApplication.java → cneeds-server-authorization/src/main/java/com/mx/cneeds/server/anthorization/AuthorizaitonApplication.java
package com.mx.cneeds.server.advice.control;
package com.mx.cneeds.server.anthorization;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.WebApplicationType;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
/**
* @ClassName AdviceControlApplication
* @ClassName AuthorizaitonApplication
* @Author zzrdark
* @Date 2020-01-06 14:50
* @Date 2020-03-03 17:04
* @Description TODO
**/
@SpringBootApplication
@EnableEurekaClient
public class AdviceControlApplication {
public class AuthorizaitonApplication {
public static void main(String[] args) {
new SpringApplicationBuilder(AdviceControlApplication.class).web(WebApplicationType.NONE).run(args);
SpringApplication.run(AuthorizaitonApplication.class, args);
}
}
cneeds-server-authorization/src/main/java/com/mx/cneeds/server/anthorization/config/OAuth2AuthorizationServer.java 0 → 100644
package com.mx.cneeds.server.anthorization.config;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.security.oauth2.config.annotation.configurers.ClientDetailsServiceConfigurer;
import org.springframework.security.oauth2.config.annotation.web.configuration.AuthorizationServerConfigurerAdapter;
import org.springframework.security.oauth2.config.annotation.web.configuration.EnableAuthorizationServer;
import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerEndpointsConfigurer;
import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerSecurityConfigurer;
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
@EnableAuthorizationServer
public class OAuth2AuthorizationServer extends AuthorizationServerConfigurerAdapter {
/**
* 用户认证
*/
@Autowired
private AuthenticationManager authenticationManager;
@Autowired
private UserDetailsService myUserDetailsService;
@Autowired
private PasswordEncoder passwordEncoder;
@Override
public void configure(AuthorizationServerEndpointsConfigurer endpoints) throws Exception {
endpoints.authenticationManager(authenticationManager);
endpoints.userDetailsService(myUserDetailsService);
endpoints.tokenStore(jwtTokenStore()).accessTokenConverter(jwtAccessTokenConverter());
}
/**
* 下面两个Bean是配置JWT令牌的
* @return
*/
@Bean
public TokenStore jwtTokenStore() {
return new JwtTokenStore(jwtAccessTokenConverter());
}
@Bean
public JwtAccessTokenConverter jwtAccessTokenConverter(){
JwtAccessTokenConverter converter = new JwtAccessTokenConverter();
// 对JWT进行前面的key
converter.setSigningKey("imooc");
return converter;
}
@Override
public void configure(ClientDetailsServiceConfigurer clients) throws Exception {
clients.inMemory()
// Client 账号、密码。
.withClient("clientapp").
secret(passwordEncoder.encode("112233"))
//只有在authorization_code模式下需要
// 配置回调地址，选填。
.redirectUris("http://localhost:9001/callback")
.authorizedGrantTypes(/*"authorization_code",*/"password")
// 可授权的 Scope
.scopes("all");
}
@Override
public void configure(AuthorizationServerSecurityConfigurer security) throws Exception {
security.passwordEncoder(new BCryptPasswordEncoder());
}
}
\ No newline at end of file
cneeds-server-authorization/src/main/java/com/mx/cneeds/server/anthorization/service/MyUserDetailsService.java 0 → 100644
package com.mx.cneeds.server.anthorization.service;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.authority.AuthorityUtils;
import org.springframework.security.core.userdetails.User;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Component;
@Component
public class MyUserDetailsService implements UserDetailsService {
@Autowired
private PasswordEncoder passwordEncoder;
/** (non-Javadoc)
* @see UserDetailsService#loadUserByUsername(String)
*/
@Override
public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
return new User(username, passwordEncoder.encode("123456"),
AuthorityUtils.commaSeparatedStringToAuthorityList("ROLE_admin"));
}
}
\ No newline at end of file
cneeds-server-authorization/src/main/resources/application.properties 0 → 100644
server.port=8081
server.servlet.context-path=/server
spring.application.name= cneeds-server-authorization
\ No newline at end of file
cneeds-server-datashow/pom.xml
......@@ -10,7 +10,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>cneeds-server-datashow</artifactId>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
......@@ -21,7 +21,37 @@
<artifactId>cneeds-common-data</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.mx.cneeds</groupId>
<artifactId>cneeds-common-utils</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<!-- for Spring Security -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
</dependency>
<!-- for OAuth 2.0 -->
<dependency>
<groupId>org.springframework.security.oauth</groupId>
<artifactId>spring-security-oauth2</artifactId>
<version>2.0.15.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-jwt</artifactId>
<version>1.0.8.RELEASE</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
\ No newline at end of file
cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/DatashowApplication.java
......@@ -3,6 +3,7 @@ package com.mx.cneeds.server.datashow;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
/**
* @ClassName DatashowApplication
......@@ -12,6 +13,7 @@ import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
**/
@SpringBootApplication
@EnableEurekaClient
@EnableSwagger2
public class DatashowApplication {
public static void main(String[] args) {
SpringApplication.run(DatashowApplication.class);
......
cneeds-server-device/src/main/java/com/mx/cneeds/server/device/web/DeviceInfoController.java → cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/device/DeviceInfoController.java
package com.mx.cneeds.server.device.web;
package com.mx.cneeds.server.datashow.web.device;
import java.util.Arrays;
import java.util.Map;
//import org.apache.shiro.authz.annotation.RequiresPermissions;
import com.mx.cneeds.common.pager.PageUtils;
import com.mx.cneeds.common.result.R;
import com.mx.cneeds.common.validator.ValidatorUtils;
import com.mx.cneeds.server.device.service.DeviceInfoService;
import com.mx.cneeds.server.service.device.DeviceInfoService;
import com.mx.cneeds.server.entity.DeviceInfoEntity;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
import java.util.Map;
//import org.apache.shiro.authz.annotation.RequiresPermissions;
/**
......@@ -27,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
* @date 2020-01-09 15:09:01
*/
@RestController
@RequestMapping("sys/deviceinfo")
@RequestMapping("device/deviceinfo")
public class DeviceInfoController {
@Autowired
private DeviceInfoService deviceInfoService;
......@@ -89,4 +84,9 @@ public class DeviceInfoController {
return R.ok();
}
@RequestMapping("/getChannel_nums")
public void getChannel_nums(String imei){
//TODO 接口实现
}
}
cneeds-server-device/src/main/java/com/mx/cneeds/server/device/web/DeviceLogController.java → cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/device/DeviceLogController.java
package com.mx.cneeds.server.device.web;
package com.mx.cneeds.server.datashow.web.device;
import java.util.Arrays;
import java.util.Map;
//import org.apache.shiro.authz.annotation.RequiresPermissions;
import com.mx.cneeds.common.pager.PageUtils;
import com.mx.cneeds.common.result.R;
import com.mx.cneeds.common.validator.ValidatorUtils;
import com.mx.cneeds.server.device.service.DeviceLogService;
import com.mx.cneeds.server.service.device.DeviceLogService;
import com.mx.cneeds.server.entity.DeviceLogEntity;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
import java.util.Map;
//import org.apache.shiro.authz.annotation.RequiresPermissions;
/**
......@@ -27,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
* @date 2020-01-09 15:09:01
*/
@RestController
@RequestMapping("sys/devicelog")
@RequestMapping("device/devicelog")
public class DeviceLogController {
@Autowired
private DeviceLogService deviceLogService;
......
cneeds-server-device/src/main/java/com/mx/cneeds/server/device/web/DeviceLogmediaController.java → cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/device/DeviceLogmediaController.java
package com.mx.cneeds.server.device.web;
package com.mx.cneeds.server.datashow.web.device;
import java.util.Arrays;
import java.util.Map;
//import org.apache.shiro.authz.annotation.RequiresPermissions;
import com.mx.cneeds.common.pager.PageUtils;
import com.mx.cneeds.common.result.R;
import com.mx.cneeds.common.validator.ValidatorUtils;
import com.mx.cneeds.server.device.service.DeviceLogmediaService;
import com.mx.cneeds.server.service.device.DeviceLogmediaService;
import com.mx.cneeds.server.entity.DeviceLogmediaEntity;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
import java.util.Map;
//import org.apache.shiro.authz.annotation.RequiresPermissions;
/**
......@@ -27,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
* @date 2020-01-09 15:09:01
*/
@RestController
@RequestMapping("sys/devicelogmedia")
@RequestMapping("device/devicelogmedia")
public class DeviceLogmediaController {
@Autowired
private DeviceLogmediaService deviceLogmediaService;
......
cneeds-server-device/src/main/java/com/mx/cneeds/server/device/web/DeviceLogsettingController.java → cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/device/DeviceLogsettingController.java
package com.mx.cneeds.server.device.web;
package com.mx.cneeds.server.datashow.web.device;
import java.util.Arrays;
import java.util.Map;
//import org.apache.shiro.authz.annotation.RequiresPermissions;
import com.mx.cneeds.common.pager.PageUtils;
import com.mx.cneeds.common.result.R;
import com.mx.cneeds.common.validator.ValidatorUtils;
import com.mx.cneeds.server.device.service.DeviceLogsettingService;
import com.mx.cneeds.server.service.device.DeviceLogsettingService;
import com.mx.cneeds.server.entity.DeviceLogsettingEntity;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
import java.util.Map;
//import org.apache.shiro.authz.annotation.RequiresPermissions;
/**
......@@ -27,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
* @date 2020-01-09 15:09:01
*/
@RestController
@RequestMapping("sys/devicelogsetting")
@RequestMapping("device/devicelogsetting")
public class DeviceLogsettingController {
@Autowired
private DeviceLogsettingService deviceLogsettingService;
......
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysDeptController.java → cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/user/SysDeptController.java
package com.mx.cneeds.server.user.web;
import java.util.Arrays;
import java.util.Map;
package com.mx.cneeds.server.datashow.web.user;
import com.mx.cneeds.common.pager.PageUtils;
import com.mx.cneeds.common.result.R;
import com.mx.cneeds.common.validator.ValidatorUtils;
import com.mx.cneeds.server.entity.SysDeptEntity;
//import org.apache.shiro.authz.annotation.RequiresPermissions;
import com.mx.cneeds.server.user.service.SysDeptService;
import com.mx.cneeds.server.service.user.SysDeptService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
import java.util.Map;
//import org.apache.shiro.authz.annotation.RequiresPermissions;
/**
......@@ -27,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
* @date 2020-01-09 15:09:01
*/
@RestController
@RequestMapping("sys/sysdept")
@RequestMapping("sys/dept")
public class SysDeptController {
@Autowired
private SysDeptService sysDeptService;
......
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysFuncController.java → cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/user/SysFuncController.java
package com.mx.cneeds.server.user.web;
package com.mx.cneeds.server.datashow.web.user;
import java.util.Arrays;
import java.util.Map;
//import org.apache.shiro.authz.annotation.RequiresPermissions;
import com.mx.cneeds.common.pager.PageUtils;
import com.mx.cneeds.common.result.R;
import com.mx.cneeds.common.validator.ValidatorUtils;
import com.mx.cneeds.server.entity.SysFuncEntity;
import com.mx.cneeds.server.user.service.SysFuncService;
import com.mx.cneeds.server.service.user.SysFuncService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
import java.util.Map;
//import org.apache.shiro.authz.annotation.RequiresPermissions;
/**
......@@ -27,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
* @date 2020-01-09 15:09:01
*/
@RestController
@RequestMapping("sys/sysfunc")
@RequestMapping("sys/func")
public class SysFuncController {
@Autowired
private SysFuncService sysFuncService;
......
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysRoleController.java → cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/user/SysRoleController.java
package com.mx.cneeds.server.user.web;
package com.mx.cneeds.server.datashow.web.user;
import java.util.Arrays;
import java.util.Map;
//import org.apache.shiro.authz.annotation.RequiresPermissions;
import com.mx.cneeds.common.pager.PageUtils;
import com.mx.cneeds.common.result.R;
import com.mx.cneeds.common.validator.ValidatorUtils;
import com.mx.cneeds.server.entity.SysRoleEntity;
import com.mx.cneeds.server.user.service.SysRoleService;
import com.mx.cneeds.server.service.user.SysRoleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
import java.util.Map;
//import org.apache.shiro.authz.annotation.RequiresPermissions;
/**
......@@ -27,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
* @date 2020-01-09 15:09:01
*/
@RestController
@RequestMapping("sys/sysrole")
@RequestMapping("sys/role")
public class SysRoleController {
@Autowired
private SysRoleService sysRoleService;
......
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysRoleDeptController.java → cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/user/SysRoleDeptController.java
package com.mx.cneeds.server.user.web;
package com.mx.cneeds.server.datashow.web.user;
import java.util.Arrays;
import java.util.Map;
//import org.apache.shiro.authz.annotation.RequiresPermissions;
import com.mx.cneeds.common.pager.PageUtils;
import com.mx.cneeds.common.result.R;
import com.mx.cneeds.common.validator.ValidatorUtils;
import com.mx.cneeds.server.entity.SysRoleDeptEntity;
import com.mx.cneeds.server.user.service.SysRoleDeptService;
import com.mx.cneeds.server.service.user.SysRoleDeptService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
import java.util.Map;
//import org.apache.shiro.authz.annotation.RequiresPermissions;
/**
......@@ -27,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
* @date 2020-01-09 15:09:01
*/
@RestController
@RequestMapping("sys/sysroledept")
@RequestMapping("sys/roledept")
public class SysRoleDeptController {
@Autowired
private SysRoleDeptService sysRoleDeptService;
......
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysRoleFuncController.java → cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/user/SysRoleFuncController.java
package com.mx.cneeds.server.user.web;
package com.mx.cneeds.server.datashow.web.user;
import java.util.Arrays;
import java.util.Map;
//import org.apache.shiro.authz.annotation.RequiresPermissions;
import com.mx.cneeds.common.pager.PageUtils;
import com.mx.cneeds.common.result.R;
import com.mx.cneeds.common.validator.ValidatorUtils;
import com.mx.cneeds.server.entity.SysRoleFuncEntity;
import com.mx.cneeds.server.user.service.SysRoleFuncService;
import com.mx.cneeds.server.service.user.SysRoleFuncService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
import java.util.Map;
//import org.apache.shiro.authz.annotation.RequiresPermissions;
/**
......@@ -27,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
* @date 2020-01-09 15:09:01
*/
@RestController
@RequestMapping("sys/sysrolefunc")
@RequestMapping("sys/rolefunc")
public class SysRoleFuncController {
@Autowired
private SysRoleFuncService sysRoleFuncService;
......
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysUserController.java → cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/user/SysUserController.java
package com.mx.cneeds.server.user.web;
package com.mx.cneeds.server.datashow.web.user;
import java.util.Arrays;
import java.util.Map;
//import org.apache.shiro.authz.annotation.RequiresPermissions;
import com.mx.cneeds.common.pager.PageUtils;
import com.mx.cneeds.common.result.R;
import com.mx.cneeds.common.validator.ValidatorUtils;
import com.mx.cneeds.server.entity.SysUserEntity;
import com.mx.cneeds.server.user.service.SysUserService;
import com.mx.cneeds.server.service.user.SysUserService;
import com.mx.cneeds.server.vo.UserVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
import java.util.Map;
//import org.apache.shiro.authz.annotation.RequiresPermissions;
/**
......@@ -27,11 +23,19 @@ import org.springframework.web.bind.annotation.RestController;
* @date 2020-01-09 15:09:01
*/
@RestController
@RequestMapping("sys/sysuser")
@RequestMapping("sys/user")
public class SysUserController {
@Autowired
private SysUserService sysUserService;
public R Login(UserVo userVo){
return new R().put("user","");
}
/**
* 列表
*/
......
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysUserRoleController.java → cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/user/SysUserRoleController.java
package com.mx.cneeds.server.user.web;
package com.mx.cneeds.server.datashow.web.user;
import java.util.Arrays;
import java.util.Map;
//import org.apache.shiro.authz.annotation.RequiresPermissions;
import com.mx.cneeds.common.pager.PageUtils;
import com.mx.cneeds.common.result.R;
import com.mx.cneeds.common.validator.ValidatorUtils;
import com.mx.cneeds.server.entity.SysUserRoleEntity;
import com.mx.cneeds.server.user.service.SysUserRoleService;
import com.mx.cneeds.server.service.user.SysUserRoleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
import java.util.Map;
//import org.apache.shiro.authz.annotation.RequiresPermissions;
/**
......@@ -27,8 +22,9 @@ import org.springframework.web.bind.annotation.RestController;
* @date 2020-01-09 15:09:01
*/
@RestController
@RequestMapping("sys/sysuserrole")
@RequestMapping("sys/userrole")
public class SysUserRoleController {
@Autowired
private SysUserRoleService sysUserRoleService;
......
cneeds-server-datashow/src/main/resources/application-dev.yml
spring:
profiles:
active: dev
datasource:
hikari:
driver-class-name: com.mysql.cj.jdbc.Driver
......
cneeds-server-datashow/src/main/resources/application-test.yml
spring:
profiles:
active: dev
\ No newline at end of file
cneeds-server-device/pom.xml
......@@ -10,7 +10,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>cneeds-server-device</artifactId>
<packaging>jar</packaging>
<dependencies>
<dependency>
......@@ -29,4 +29,12 @@
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
\ No newline at end of file
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;
import com.mx.cneeds.common.pager.PageUtils;
import com.mx.cneeds.common.pager.Query;
import com.mx.cneeds.server.dao.DeviceInfoDao;
import com.mx.cneeds.server.device.service.DeviceInfoService;
import com.mx.cneeds.server.service.device.DeviceInfoService;
import com.mx.cneeds.server.entity.DeviceInfoEntity;
import org.springframework.stereotype.Service;
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;
import com.mx.cneeds.common.pager.PageUtils;
import com.mx.cneeds.common.pager.Query;
import com.mx.cneeds.server.dao.DeviceLogDao;
import com.mx.cneeds.server.device.service.DeviceLogService;
import com.mx.cneeds.server.service.device.DeviceLogService;
import com.mx.cneeds.server.entity.DeviceLogEntity;
import org.springframework.stereotype.Service;
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;
import com.mx.cneeds.common.pager.PageUtils;
import com.mx.cneeds.common.pager.Query;
import com.mx.cneeds.server.dao.DeviceLogmediaDao;
import com.mx.cneeds.server.device.service.DeviceLogmediaService;
import com.mx.cneeds.server.service.device.DeviceLogmediaService;
import com.mx.cneeds.server.entity.DeviceLogmediaEntity;
import org.springframework.stereotype.Service;
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;
import com.mx.cneeds.common.pager.PageUtils;
import com.mx.cneeds.common.pager.Query;
import com.mx.cneeds.server.dao.DeviceLogsettingDao;
import com.mx.cneeds.server.device.service.DeviceLogsettingService;
import com.mx.cneeds.server.service.device.DeviceLogsettingService;
import com.mx.cneeds.server.entity.DeviceLogsettingEntity;
import org.springframework.stereotype.Service;
import java.util.Map;
......
cneeds-server-device_activate/cneeds-server-device_activate.iml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4" />
\ No newline at end of file
cneeds-server-device_activate/pom.xml deleted 100644 → 0
<?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>
<artifactId>cneeds-server.device_activate</artifactId>
<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
</dependency>
</dependencies>
</project>
\ No newline at end of file
cneeds-server-device_activate/src/main/java/com/mx/cneeds/server/device/activate/DeviceActiveApplication.java deleted 100644 → 0
package com.mx.cneeds.server.device.activate;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.WebApplicationType;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
/**
* @ClassName DeviceActiveApplication
* @Author zzrdark
* @Date 2020-01-06 15:25
* @Description TODO
**/
@SpringBootApplication
@EnableEurekaClient
public class DeviceActiveApplication {
public static void main(String[] args) {
new SpringApplicationBuilder(DeviceActiveApplication.class).web(WebApplicationType.NONE).run(args);
}
}
cneeds-server-eureka/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-eureka/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-eureka/pom.xml
......@@ -10,7 +10,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>cneeds-server-eureka</artifactId>
<packaging>pom</packaging>
<packaging>jar</packaging>
......@@ -29,14 +29,14 @@
<!--<build>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>-->
</build>
</project>
\ No newline at end of file
cneeds-server-eureka/src/main/resources/application.yml
......@@ -3,7 +3,8 @@ eureka:
service-url:
#defaultZone: http://eureka2:8762/eureka/
defaultZone: http://localhost:8761/eureka/
# register-with-eureka: false
## 单机的时候开启
register-with-eureka: false
fetch-registry: 'false'

# server:
# enable-self-preservation: false
......
cneeds-server-logupload/pom.xml
......@@ -10,6 +10,14 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>cneeds-server-logupload</artifactId>
<packaging>jar</packaging>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
\ No newline at end of file
cneeds-server-logupload/src/main/java/com/mx/cneeds/server/logupload/LogUploadApplication.java 0 → 100644
package com.mx.cneeds.server.logupload;
import org.springframework.boot.SpringApplication;
/**
* @ClassName LogUploadApplication
* @Author zzrdark
* @Date 2020-03-03 20:59
* @Description TODO
**/
public class LogUploadApplication {
public static void main(String[] args) {
SpringApplication.run(LogUploadApplication.class, args);
}
}
cneeds-server-user/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-user/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-user/pom.xml
......@@ -10,7 +10,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>cneeds-server-user</artifactId>
<packaging>jar</packaging>
<dependencies>
<dependency>
......@@ -27,6 +27,20 @@
<artifactId>cneeds-common-data</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
\ No newline at end of file
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/UserServerApplication.java
package com.mx.cneeds.server.user;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.WebApplicationType;
import org.springframework.boot.autoconfigure.SpringBootApplication;
......@@ -15,9 +16,9 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
**/
@SpringBootApplication
@EnableEurekaClient
@EnableSwagger2
@MapperScan("com.mx.cneeds.server.dao")
public class UserServerApplication {
public static void main(String[] args) {
new SpringApplicationBuilder(UserServerApplication.class).web(WebApplicationType.NONE).run(args);
new SpringApplicationBuilder(UserServerApplication.class).web(WebApplicationType.SERVLET).run(args);
}
}
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;
import com.mx.cneeds.common.pager.Query;
import com.mx.cneeds.server.dao.SysDeptDao;
import com.mx.cneeds.server.entity.SysDeptEntity;
import com.mx.cneeds.server.user.service.SysDeptService;
import com.mx.cneeds.server.service.user.SysDeptService;
import org.springframework.stereotype.Service;
import java.util.Map;
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;
import com.mx.cneeds.common.pager.Query;
import com.mx.cneeds.server.dao.SysFuncDao;
import com.mx.cneeds.server.entity.SysFuncEntity;
import com.mx.cneeds.server.user.service.SysFuncService;
import com.mx.cneeds.server.service.user.SysFuncService;
import org.springframework.stereotype.Service;
import java.util.Map;
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;
import com.mx.cneeds.common.pager.Query;
import com.mx.cneeds.server.dao.SysRoleDeptDao;
import com.mx.cneeds.server.entity.SysRoleDeptEntity;
import com.mx.cneeds.server.user.service.SysRoleDeptService;
import com.mx.cneeds.server.service.user.SysRoleDeptService;
import org.springframework.stereotype.Service;
import java.util.Map;
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;
import com.mx.cneeds.common.pager.Query;
import com.mx.cneeds.server.dao.SysRoleFuncDao;
import com.mx.cneeds.server.entity.SysRoleFuncEntity;
import com.mx.cneeds.server.user.service.SysRoleFuncService;
import com.mx.cneeds.server.service.user.SysRoleFuncService;
import org.springframework.stereotype.Service;
import java.util.Map;
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;
import com.mx.cneeds.common.pager.Query;
import com.mx.cneeds.server.dao.SysRoleDao;
import com.mx.cneeds.server.entity.SysRoleEntity;
import com.mx.cneeds.server.user.service.SysRoleService;
import com.mx.cneeds.server.service.user.SysRoleService;
import org.springframework.stereotype.Service;
import java.util.Map;
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;
import com.mx.cneeds.common.pager.Query;
import com.mx.cneeds.server.dao.SysUserRoleDao;
import com.mx.cneeds.server.entity.SysUserRoleEntity;
import com.mx.cneeds.server.user.service.SysUserRoleService;
import com.mx.cneeds.server.service.user.SysUserRoleService;
import org.springframework.stereotype.Service;
import java.util.Map;
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;
import com.mx.cneeds.common.pager.Query;
import com.mx.cneeds.server.dao.SysUserDao;
import com.mx.cneeds.server.entity.SysUserEntity;
import com.mx.cneeds.server.user.service.SysUserService;
import com.mx.cneeds.server.service.user.SysUserService;
import org.springframework.stereotype.Service;
import java.util.Map;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
......
cneeds-server-user/src/main/resources/application.yml
spring:
application:
name: cneeds-server-user
datasource:
type: com.alibaba.druid.pool.DruidDataSource
druid:
driver-class-name: com.mysql.jdbc.Driver
url: jdbc:mysql://192.168.2.244:3306/cneeds_server?useUnicode=true&characterEncoding=UTF-8&useSSL=false
username: root
password: cneeds!QAZ1qaz
initial-size: 10
max-active: 100
min-idle: 10
max-wait: 60000
pool-prepared-statements: true
max-pool-prepared-statement-per-connection-size: 20
time-between-eviction-runs-millis: 60000
min-evictable-idle-time-millis: 300000
#Oracle需要打开注释
#validation-query: SELECT 1 FROM DUAL
test-while-idle: true
test-on-borrow: false
test-on-return: false
stat-view-servlet:
enabled: 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:
client:
service-url:
defaultZone: http://192.168.2.244:8761/eureka/
server:
port: 9999
pom.xml
......@@ -17,12 +17,11 @@
<module>cneeds-server-eureka</module>
<module>cneeds-server-user</module>
<module>cneeds-server-device</module>
<module>cneeds-server-device_activate</module>
<module>cneeds-server-advice_control</module>
<module>cneeds-server-datashow</module>
<module>cneeds-server-logupload</module>
<module>cneeds-common-data</module>
<module>cneeds-common-utils</module>
<module>cneeds-server-authorization</module>
</modules>
<properties>
......@@ -53,10 +52,14 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
</dependencies>
</project>
\ No newline at end of file
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