From 2cf3ac80b51f98307de8cdac629412860501e27f Mon Sep 17 00:00:00 2001 From: yidao620 Date: Tue, 27 Feb 2018 16:38:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=9010=E4=B8=AA=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app-manage-api/README.md | 16 +- .../jwt/Application.java | 2 +- .../jwt/api/ExceptionController.java | 4 +- .../jwt/api/LoginController.java | 14 +- .../jwt/api/NotifyController.java | 8 +- .../jwt/api/PublicController.java | 12 +- .../jwt/api/model/BaseResponse.java | 2 +- .../jwt/api/model/BindParam.java | 2 +- .../jwt/api/model/JoinBindResponse.java | 2 +- .../jwt/api/model/LoginParam.java | 4 +- .../jwt/api/model/PosParam.java | 4 +- .../jwt/api/model/ReportParam.java | 2 +- .../jwt/api/model/UnbindParam.java | 2 +- .../jwt/api/model/VersionParam.java | 4 +- .../jwt/api/model/VersionResult.java | 4 +- .../jwt/common/ServerRunner.java | 2 +- .../jwt/common/constant/ConstantsList.java | 2 +- .../jwt/common/constant/DictMap.java | 2 +- .../jwt/common/dao/entity/App.java | 2 +- .../jwt/common/dao/entity/AppPublish.java | 2 +- .../jwt/common/dao/entity/Manager.java | 2 +- .../jwt/common/dao/entity/ManagerRole.java | 2 +- .../jwt/common/dao/entity/OperationLog.java | 2 +- .../jwt/common/dao/entity/Permission.java | 2 +- .../jwt/common/dao/entity/Pos.java | 2 +- .../jwt/common/dao/entity/PosHistory.java | 2 +- .../jwt/common/dao/entity/PosMonitor.java | 2 +- .../jwt/common/dao/entity/Project.java | 2 +- .../jwt/common/dao/entity/ProjectUser.java | 2 +- .../jwt/common/dao/entity/Role.java | 2 +- .../jwt/common/dao/entity/RolePermission.java | 2 +- .../jwt/common/dao/repository/AppMapper.java | 4 +- .../dao/repository/AppPublishMapper.java | 4 +- .../common/dao/repository/ManagerMapper.java | 4 +- .../dao/repository/ManagerRoleMapper.java | 4 +- .../dao/repository/OperationLogMapper.java | 4 +- .../dao/repository/PermissionMapper.java | 4 +- .../dao/repository/PosHistoryMapper.java | 4 +- .../jwt}/common/dao/repository/PosMapper.java | 4 +- .../dao/repository/PosMonitorMapper.java | 4 +- .../common/dao/repository/ProjectMapper.java | 4 +- .../dao/repository/ProjectUserMapper.java | 4 +- .../jwt/common/dao/repository/RoleMapper.java | 4 +- .../dao/repository/RolePermissionMapper.java | 4 +- .../jwt/common/util/CommonUtil.java | 2 +- .../jwt/common/util/DateUtil.java | 2 +- .../jwt/common/util/JWTUtil.java | 2 +- .../jwt/common/util/JsonConverter.java | 2 +- .../jwt/config/MybatisPlusConfig.java | 8 +- .../jwt/config/NettySocketConfig.java | 14 +- .../jwt/config/ShiroConfig.java | 6 +- .../jwt/config/Swagger2Config.java | 4 +- .../jwt/config/WebConfig.java | 4 +- .../config/properties/DruidProperties.java | 2 +- .../jwt/config/properties/MyProperties.java | 4 +- .../jwt/dao/entity/AppInfo.java | 6 +- .../jwt}/dao/entity/AppVersionInfo.java | 2 +- .../jwt/dao/entity/FileInfo.java | 2 +- .../jwt/dao/entity/ManagerInfo.java | 6 +- .../xncoding/jwt}/dao/entity/MonitorInfo.java | 8 +- .../jwt/dao/entity/PosGroupInfo.java | 6 +- .../com/xncoding/jwt}/dao/entity/PosInfo.java | 8 +- .../jwt}/dao/entity/PublishParam.java | 2 +- .../xncoding/jwt}/dao/entity/SearchApp.java | 2 +- .../jwt}/dao/entity/SearchMonitor.java | 2 +- .../jwt/dao/entity/SearchPos.java | 2 +- .../jwt/dao/entity/SearchUser.java | 2 +- .../com/xncoding/jwt}/dao/entity/SysRole.java | 6 +- .../jwt/dao/repository/ApiDao.java | 6 +- .../jwt}/dao/repository/ManagerInfoDao.java | 8 +- .../jwt/dao/repository/mapping/ApiDao.xml | 2 +- .../dao/repository/mapping/ManagerInfoDao.xml | 2 +- .../jwt/exception/ForbiddenUserException.java | 2 +- .../jwt/exception/UnauthorizedException.java | 2 +- .../jwt/handler/MessageEventHandler.java | 12 +- .../jwt/service/ApiService.java | 30 +-- .../jwt/service/ManagerInfoService.java | 22 +- .../jwt/shiro/JWTFilter.java | 2 +- .../jwt/shiro/JWTToken.java | 2 +- .../jwt/shiro/MyShiroRealm.java | 12 +- .../jwt/shiro/ShiroKit.java | 4 +- .../src/main/resources/application.yml | 26 +- .../src/main/resources/sql/generate_mapper.py | 8 +- .../jwt/ApplicationTests.java | 2 +- .../jwt/FTPClientTest.java | 2 +- .../{enzhico => xncoding}/jwt/SimpleTest.java | 6 +- .../jwt/Swagger2MarkupTest.java | 2 +- .../jwt/common/util/CommonUtilTest.java | 2 +- .../jwt/socket/client/SocketClient.java | 8 +- .../jwt/socket/client/SocketClient2.java | 12 +- .../jwt/socket/client/html/ack-index.html | 0 .../client/html/binary-event-index.html | 0 .../jwt/socket/client/html/bootstrap.css | 0 .../jwt/socket/client/html/event-index.html | 0 .../jwt/socket/client/html/index.html | 0 .../socket/client/html/js/jquery-1.7.2.min.js | 0 .../jwt/socket/client/html/js/moment.min.js | 0 .../client/html/js/socket.io/socket.io.js | 0 .../socket/client/html/namespace-index.html | 0 .../socket/client/html/ssl-event-index.html | 0 .../jwt/socket/model/ChatMessage.java | 2 +- .../jwt/socket/model/LoginRequest.java | 2 +- .../jwt/socket/server/AckChatLauncher.java | 2 +- .../socket/server/BinaryEventLauncher.java | 2 +- .../jwt/socket/server/ChatLauncher.java | 2 +- .../jwt/socket/server/ChatObject.java | 2 +- .../jwt/socket/server/EventChatLauncher.java | 2 +- .../socket/server/NamespaceChatLauncher.java | 2 +- .../socket/server/NamespaceSocketServer.java | 4 +- .../server/SocketExceptionListener.java | 2 +- .../jwt/socket/server/SocketServer.java | 6 +- .../jwt/socket/server/SslChatLauncher.java | 2 +- app-manage/README.md | 2 +- app-manage/pom.xml | 2 +- .../java/com/xncoding/pos}/Application.java | 2 +- .../pos/async/AsyncException.java | 2 +- .../pos/async/AsyncExceptionHandler.java | 2 +- .../pos/async/AsyncTask.java | 14 +- .../pos/common/constant/ConstantsList.java | 2 +- .../pos/common/constant/DictMap.java | 2 +- .../pos/common/dao/entity/App.java | 2 +- .../pos/common/dao/entity/AppPublish.java | 2 +- .../pos/common/dao/entity/Manager.java | 2 +- .../pos/common/dao/entity/ManagerRole.java | 2 +- .../pos/common/dao/entity/OperationLog.java | 2 +- .../pos/common/dao/entity/Permission.java | 2 +- .../pos/common/dao/entity/Pos.java | 2 +- .../pos/common/dao/entity/PosHistory.java | 2 +- .../pos/common/dao/entity/PosMonitor.java | 2 +- .../pos/common/dao/entity/Project.java | 2 +- .../pos/common/dao/entity/ProjectUser.java | 2 +- .../pos/common/dao/entity/Role.java | 2 +- .../pos/common/dao/entity/RolePermission.java | 2 +- .../pos/common/dao/repository/AppMapper.java | 4 +- .../dao/repository/AppPublishMapper.java | 4 +- .../common/dao/repository/ManagerMapper.java | 4 +- .../dao/repository/ManagerRoleMapper.java | 4 +- .../dao/repository/OperationLogMapper.java | 4 +- .../dao/repository/PermissionMapper.java | 4 +- .../dao/repository/PosHistoryMapper.java | 4 +- .../pos}/common/dao/repository/PosMapper.java | 4 +- .../dao/repository/PosMonitorMapper.java | 4 +- .../common/dao/repository/ProjectMapper.java | 4 +- .../dao/repository/ProjectUserMapper.java | 4 +- .../pos/common/dao/repository/RoleMapper.java | 4 +- .../dao/repository/RolePermissionMapper.java | 4 +- .../pos/common/util/AnalysisApk.java | 2 +- .../pos/common/util/CommonUtil.java | 2 +- .../pos/common/util/DateUtil.java | 2 +- .../pos/common/util/JsonConverter.java | 2 +- .../pos/config/AsyncConfig.java | 4 +- .../pos/config/MybatisPlusConfig.java | 8 +- .../pos/config/RestClientConfig.java | 2 +- .../pos/config/ScheduleConfig.java | 2 +- .../pos/config/ShiroConfig.java | 8 +- .../pos/config/WebConfig.java | 4 +- .../config/properties/DruidProperties.java | 2 +- .../pos/config/properties/MyProperties.java | 4 +- .../pos/controller/AppController.java | 24 +- .../pos/controller/DeviceController.java | 16 +- .../pos/controller/LoginController.java | 16 +- .../pos/controller/MonitorController.java | 12 +- .../pos/controller/ProjectController.java | 12 +- .../pos/controller/UserController.java | 12 +- .../pos/dao/entity/AppInfo.java | 6 +- .../pos}/dao/entity/AppVersionInfo.java | 2 +- .../pos/dao/entity/FileInfo.java | 2 +- .../pos/dao/entity/ManagerInfo.java | 6 +- .../xncoding/pos}/dao/entity/MonitorInfo.java | 8 +- .../pos/dao/entity/PosGroupInfo.java | 6 +- .../com/xncoding/pos}/dao/entity/PosInfo.java | 8 +- .../pos}/dao/entity/PublishParam.java | 2 +- .../xncoding/pos}/dao/entity/SearchApp.java | 2 +- .../pos}/dao/entity/SearchMonitor.java | 2 +- .../pos/dao/entity/SearchPos.java | 2 +- .../pos/dao/entity/SearchUser.java | 2 +- .../com/xncoding/pos}/dao/entity/SysRole.java | 6 +- .../pos/dao/repository/AppInfoDao.java | 14 +- .../pos}/dao/repository/ManagerInfoDao.java | 8 +- .../pos/dao/repository/PosInfoDao.java | 8 +- .../pos/dao/repository/SysRoleDao.java | 4 +- .../pos/dao/repository/mapping/AppInfoDao.xml | 2 +- .../dao/repository/mapping/ManagerInfoDao.xml | 2 +- .../pos/dao/repository/mapping/PosInfoDao.xml | 2 +- .../pos/dao/repository/mapping/SysRoleDao.xml | 2 +- .../pos/exception/ForbiddenUserException.java | 2 +- .../pos/http/CustomResponseErrorHandler.java | 2 +- .../pos/http/HttpBaseResponse.java | 2 +- .../pos/http/LoginParam.java | 2 +- .../pos/http/TokenRequestInterceptor.java | 2 +- .../pos/http/UnbindParam.java | 2 +- .../pos/jobs/HeartbeatJob.java | 4 +- .../pos/model/BaseResponse.java | 2 +- .../pos/service/AppService.java | 18 +- .../pos/service/DeviceService.java | 34 +-- .../pos/service/ManagerInfoService.java | 22 +- .../pos/service/MonitorService.java | 14 +- .../pos/service/ProjectService.java | 18 +- .../shiro/CaptchaUsernamePasswordToken.java | 2 +- .../pos/shiro/IncorrectCaptchaException.java | 2 +- .../pos/shiro/KaptchaFilter.java | 4 +- .../pos/shiro/MyExceptionResolver.java | 2 +- .../pos/shiro/MyShiroRealm.java | 10 +- .../pos/shiro/RoleFilter.java | 2 +- .../pos/shiro/ShiroKit.java | 4 +- app-manage/src/main/resources/application.yml | 30 +-- .../src/main/resources/sql/generate_mapper.py | 8 +- .../pos/ApplicationTests.java | 4 +- .../{enzhico => xncoding}/pos/SimpleTest.java | 4 +- .../pos/common/util/CommonUtilTest.java | 2 +- .../pos/crypto/asymmetric/RSAUtil.java | 2 +- .../pos/crypto/symmetric/AESUtil.java | 2 +- .../pos/crypto/symmetric/DESTripleUtil.java | 2 +- .../pos/crypto/symmetric/DESUtil.java | 2 +- springboot-aop/pom.xml | 2 +- .../java/com/xncoding/aop}/Application.java | 2 +- .../aop/aspect/LogAspect.java | 4 +- .../aop/aspect/UserAccess.java | 2 +- .../aop/aspect/UserAccessAspect.java | 4 +- .../aop/controller/UserController.java | 4 +- .../src/main/resources/application.yml | 11 +- springboot-batch/pom.xml | 2 +- .../trans/Application.java | 2 +- .../trans/config/MybatisPlusConfig.java | 7 +- .../config/properties/CommonProperties.java | 2 +- .../config/properties/DruidProperties.java | 2 +- .../trans/dao/entity/User.java | 2 +- .../trans/dao/repository/UserMapper.java | 4 +- .../trans/modules/MyBatchConfig.java | 2 +- .../trans/modules/MyBeanValidator.java | 2 +- .../modules/MyBeanWrapperFieldSetMapper.java | 4 +- .../trans/modules/MyJobListener.java | 2 +- .../trans/modules/canton/Canton.java | 2 +- .../trans/modules/canton/CantonConfig.java | 6 +- .../trans/modules/common/CommonConfig.java | 10 +- .../trans/modules/common/DateUtil.java | 2 +- .../trans/modules/common/anno/TableName.java | 2 +- .../trans/modules/common/vo/BscCanton.java | 4 +- .../trans/modules/common/vo/BscExeOffice.java | 4 +- .../modules/common/vo/BscOfficeExeItem.java | 4 +- .../trans/modules/common/vo/BscTollItem.java | 4 +- .../common/vo/BscTollSpecialShare.java | 4 +- .../trans/modules/vtoll/BudgetVtoll.java | 2 +- .../modules/vtoll/BudgetVtollConfig.java | 6 +- .../trans/modules/zapp/App.java | 4 +- .../trans/modules/zapp/AppConfig.java | 6 +- .../trans/modules/zlog/Log.java | 2 +- .../trans/modules/zlog/LogConfig.java | 6 +- .../trans/service/CsvService.java | 14 +- .../trans/start/StartRunner.java | 4 +- .../src/main/resources/application.yml | 10 +- .../service/BatchServiceTest.java | 20 +- .../service/SimpleTest.java | 2 +- springboot-cache/README.md | 8 + springboot-cache/pom.xml | 2 +- .../java/com/xncoding/trans/Application.java | 12 + .../trans/config/DruidProperties.java | 2 +- .../trans/config/MybatisPlusConfig.java | 5 +- .../trans/config/RedisCacheConfig.java | 4 +- .../trans/dao/entity/User.java | 2 +- .../trans/dao/repository/UserMapper.java | 4 +- .../trans/service/UserService.java | 6 +- .../src/main/resources/application.yml | 13 +- .../src/main/resources/sql/t_user.sql | 32 +++ .../service/UserServiceTest.java | 8 +- springboot-echarts/README.md | 12 +- springboot-echarts/pom.xml | 2 +- .../java/com/enzhico/echarts/Application.java | 11 - .../benchmark/common/ResultExporter.java | 6 +- .../benchmark/first/FirstBenchmark.java | 2 +- .../json/JsonDeserializeBenchmark.java | 16 +- .../json/JsonSerializeBenchmark.java | 24 +- .../benchmark/json/model/FullName.java | 2 +- .../benchmark/json/model/Person.java | 2 +- .../benchmark/json/util/FastJsonUtil.java | 2 +- .../benchmark/json/util/GsonUtil.java | 2 +- .../benchmark/json/util/JacksonUtil.java | 2 +- .../benchmark/json/util/JsonLibUtil.java | 2 +- .../string/StringBuilderBenchmark.java | 2 +- .../benchmark/sum/SecondBenchmark.java | 10 +- .../benchmark/sum/calc/Calculator.java | 2 +- .../sum/calc/impl/MultithreadCalculator.java | 4 +- .../sum/calc/impl/SinglethreadCalculator.java | 4 +- .../com/xncoding/echarts/Application.java | 11 + .../echarts/api/PublicController.java | 10 +- .../echarts/api/model/BaseResponse.java | 2 +- .../echarts/api/model/EchartsData.java | 2 +- .../echarts/api/model/PicRequest.java | 2 +- .../echarts/api/model/jmh/AxisPointer.java | 2 +- .../echarts/api/model/jmh/Feature.java | 2 +- .../echarts/api/model/jmh/Grid.java | 2 +- .../echarts/api/model/jmh/Label.java | 2 +- .../echarts/api/model/jmh/Legend.java | 2 +- .../echarts/api/model/jmh/Normal.java | 2 +- .../echarts/api/model/jmh/Option.java | 2 +- .../echarts/api/model/jmh/SaveAsImage.java | 2 +- .../echarts/api/model/jmh/Serie.java | 2 +- .../echarts/api/model/jmh/Title.java | 2 +- .../echarts/api/model/jmh/Toolbox.java | 2 +- .../echarts/api/model/jmh/Tooltip.java | 2 +- .../echarts/api/model/jmh/XAxis.java | 2 +- .../echarts/api/model/jmh/YAxis.java | 2 +- .../echarts/api/model/jmh/YAxisLabel.java | 2 +- .../echarts/common/ServerRunner.java | 4 +- .../echarts/common/constants/MsgType.java | 2 +- .../echarts/common/util/CommonUtil.java | 2 +- .../echarts/common/util/ExportPngUtil.java | 4 +- .../echarts/config/NettySocketConfig.java | 6 +- .../config/properties/MyProperties.java | 4 +- .../echarts/controller/IndexController.java | 2 +- .../echarts/handler/MessageEventHandler.java | 8 +- .../echarts/service/ApiService.java | 4 +- .../src/main/resources/application.yml | 10 +- .../echarts/common/util/CommonUtilTest.java | 8 +- springboot-mybatis/.gitignore | 10 + springboot-mybatis/LICENSE | 20 ++ springboot-mybatis/README.md | 28 ++ springboot-mybatis/pom.xml | 114 ++++++++ springboot-mybatis/run.sh | 72 +++++ .../java/com/xncoding/pos}/Application.java | 2 +- .../xncoding/pos/common/dao/entity/User.java | 249 ++++++++++++++++++ .../pos/common/dao/repository/UserMapper.java | 15 ++ .../pos/config/MybatisPlusConfig.java | 46 ++++ .../config/properties/DruidProperties.java | 249 ++++++++++++++++++ .../com/xncoding/pos/service/UserService.java | 52 ++++ .../src/main/resources/application.yml | 70 +++++ .../src/main/resources/banner.txt | 23 ++ .../src/main/resources/sql/schema.sql | 24 ++ .../com/xncoding/pos/ApplicationTests.java | 56 ++++ springboot-redis/README.md | 8 + springboot-redis/pom.xml | 2 +- .../java/com/enzhico/trans/Application.java | 12 - .../java/com/xncoding/pos/Application.java | 12 + .../pos}/config/DruidProperties.java | 2 +- .../pos}/config/MybatisPlusConfig.java | 6 +- .../pos}/config/RedisConfig.java | 2 +- .../pos}/dao/entity/User.java | 2 +- .../pos}/dao/repository/UserMapper.java | 4 +- .../pos}/service/UserService.java | 11 +- .../src/main/resources/application.yml | 18 +- .../src/main/resources/sql/t_user.sql | 32 +++ .../service/UserServiceTest.java | 8 +- .../src/main/resources/application.yml | 4 +- springboot-transaction/pom.xml | 2 +- .../java/com/enzhico/trans/Application.java | 12 - .../java/com/xncoding/trans/Application.java | 12 + .../trans/config/DruidProperties.java | 2 +- .../trans/config/MybatisPlusConfig.java | 6 +- .../trans/controller/UserController.java | 6 +- .../trans/dao/entity/User.java | 2 +- .../trans/dao/repository/UserMapper.java | 4 +- .../trans/exception/MyException.java | 2 +- .../trans/service/UserService.java | 8 +- .../src/main/resources/application.yml | 10 +- 354 files changed, 1907 insertions(+), 822 deletions(-) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/Application.java (91%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/api/ExceptionController.java (95%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/api/LoginController.java (92%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/api/NotifyController.java (92%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/api/PublicController.java (98%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/api/model/BaseResponse.java (97%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/api/model/BindParam.java (96%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/api/model/JoinBindResponse.java (97%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/api/model/LoginParam.java (94%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/api/model/PosParam.java (97%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/api/model/ReportParam.java (96%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/api/model/UnbindParam.java (96%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/api/model/VersionParam.java (90%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/api/model/VersionResult.java (95%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/common/ServerRunner.java (96%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/common/constant/ConstantsList.java (95%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/common/constant/DictMap.java (98%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/common/dao/entity/App.java (99%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/common/dao/entity/AppPublish.java (98%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/common/dao/entity/Manager.java (98%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/common/dao/entity/ManagerRole.java (98%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/common/dao/entity/OperationLog.java (98%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/common/dao/entity/Permission.java (98%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/common/dao/entity/Pos.java (99%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/common/dao/entity/PosHistory.java (98%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/common/dao/entity/PosMonitor.java (98%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/common/dao/entity/Project.java (98%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/common/dao/entity/ProjectUser.java (98%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/common/dao/entity/Role.java (98%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/common/dao/entity/RolePermission.java (98%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/common/dao/repository/AppMapper.java (66%) rename {app-manage/src/main/java/com/enzhico/pos => app-manage-api/src/main/java/com/xncoding/jwt}/common/dao/repository/AppPublishMapper.java (67%) rename {app-manage/src/main/java/com/enzhico/pos => app-manage-api/src/main/java/com/xncoding/jwt}/common/dao/repository/ManagerMapper.java (68%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/common/dao/repository/ManagerRoleMapper.java (68%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/common/dao/repository/OperationLogMapper.java (67%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/common/dao/repository/PermissionMapper.java (67%) rename {app-manage/src/main/java/com/enzhico/pos => app-manage-api/src/main/java/com/xncoding/jwt}/common/dao/repository/PosHistoryMapper.java (68%) rename {app-manage/src/main/java/com/enzhico/pos => app-manage-api/src/main/java/com/xncoding/jwt}/common/dao/repository/PosMapper.java (67%) rename {app-manage/src/main/java/com/enzhico/pos => app-manage-api/src/main/java/com/xncoding/jwt}/common/dao/repository/PosMonitorMapper.java (67%) rename {app-manage/src/main/java/com/enzhico/pos => app-manage-api/src/main/java/com/xncoding/jwt}/common/dao/repository/ProjectMapper.java (67%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/common/dao/repository/ProjectUserMapper.java (68%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/common/dao/repository/RoleMapper.java (67%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/common/dao/repository/RolePermissionMapper.java (68%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/common/util/CommonUtil.java (96%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/common/util/DateUtil.java (99%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/common/util/JWTUtil.java (99%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/common/util/JsonConverter.java (97%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/config/MybatisPlusConfig.java (85%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/config/NettySocketConfig.java (88%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/config/ShiroConfig.java (98%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/config/Swagger2Config.java (94%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/config/WebConfig.java (97%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/config/properties/DruidProperties.java (99%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/config/properties/MyProperties.java (93%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/dao/entity/AppInfo.java (92%) rename {app-manage/src/main/java/com/enzhico/pos => app-manage-api/src/main/java/com/xncoding/jwt}/dao/entity/AppVersionInfo.java (94%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/dao/entity/FileInfo.java (91%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/dao/entity/ManagerInfo.java (93%) rename {app-manage/src/main/java/com/enzhico/pos => app-manage-api/src/main/java/com/xncoding/jwt}/dao/entity/MonitorInfo.java (84%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/dao/entity/PosGroupInfo.java (83%) rename {app-manage/src/main/java/com/enzhico/pos => app-manage-api/src/main/java/com/xncoding/jwt}/dao/entity/PosInfo.java (81%) rename {app-manage/src/main/java/com/enzhico/pos => app-manage-api/src/main/java/com/xncoding/jwt}/dao/entity/PublishParam.java (97%) rename {app-manage/src/main/java/com/enzhico/pos => app-manage-api/src/main/java/com/xncoding/jwt}/dao/entity/SearchApp.java (98%) rename {app-manage/src/main/java/com/enzhico/pos => app-manage-api/src/main/java/com/xncoding/jwt}/dao/entity/SearchMonitor.java (97%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/dao/entity/SearchPos.java (97%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/dao/entity/SearchUser.java (97%) rename {app-manage/src/main/java/com/enzhico/pos => app-manage-api/src/main/java/com/xncoding/jwt}/dao/entity/SysRole.java (78%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/dao/repository/ApiDao.java (74%) rename {app-manage/src/main/java/com/enzhico/pos => app-manage-api/src/main/java/com/xncoding/jwt}/dao/repository/ManagerInfoDao.java (64%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/dao/repository/mapping/ApiDao.xml (94%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/dao/repository/mapping/ManagerInfoDao.xml (98%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/exception/ForbiddenUserException.java (85%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/exception/UnauthorizedException.java (89%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/handler/MessageEventHandler.java (98%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/service/ApiService.java (90%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/service/ManagerInfoService.java (90%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/shiro/JWTFilter.java (99%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/shiro/JWTToken.java (92%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/shiro/MyShiroRealm.java (94%) rename app-manage-api/src/main/java/com/{enzhico => xncoding}/jwt/shiro/ShiroKit.java (98%) rename app-manage-api/src/test/java/com/{enzhico => xncoding}/jwt/ApplicationTests.java (91%) rename app-manage-api/src/test/java/com/{enzhico => xncoding}/jwt/FTPClientTest.java (98%) rename app-manage-api/src/test/java/com/{enzhico => xncoding}/jwt/SimpleTest.java (92%) rename app-manage-api/src/test/java/com/{enzhico => xncoding}/jwt/Swagger2MarkupTest.java (99%) rename app-manage-api/src/test/java/com/{enzhico => xncoding}/jwt/common/util/CommonUtilTest.java (93%) rename app-manage-api/src/test/java/com/{enzhico => xncoding}/jwt/socket/client/SocketClient.java (95%) rename app-manage-api/src/test/java/com/{enzhico => xncoding}/jwt/socket/client/SocketClient2.java (92%) rename app-manage-api/src/test/java/com/{enzhico => xncoding}/jwt/socket/client/html/ack-index.html (100%) rename app-manage-api/src/test/java/com/{enzhico => xncoding}/jwt/socket/client/html/binary-event-index.html (100%) rename app-manage-api/src/test/java/com/{enzhico => xncoding}/jwt/socket/client/html/bootstrap.css (100%) rename app-manage-api/src/test/java/com/{enzhico => xncoding}/jwt/socket/client/html/event-index.html (100%) rename app-manage-api/src/test/java/com/{enzhico => xncoding}/jwt/socket/client/html/index.html (100%) rename app-manage-api/src/test/java/com/{enzhico => xncoding}/jwt/socket/client/html/js/jquery-1.7.2.min.js (100%) rename app-manage-api/src/test/java/com/{enzhico => xncoding}/jwt/socket/client/html/js/moment.min.js (100%) rename app-manage-api/src/test/java/com/{enzhico => xncoding}/jwt/socket/client/html/js/socket.io/socket.io.js (100%) rename app-manage-api/src/test/java/com/{enzhico => xncoding}/jwt/socket/client/html/namespace-index.html (100%) rename app-manage-api/src/test/java/com/{enzhico => xncoding}/jwt/socket/client/html/ssl-event-index.html (100%) rename app-manage-api/src/test/java/com/{enzhico => xncoding}/jwt/socket/model/ChatMessage.java (92%) rename app-manage-api/src/test/java/com/{enzhico => xncoding}/jwt/socket/model/LoginRequest.java (94%) rename app-manage-api/src/test/java/com/{enzhico => xncoding}/jwt/socket/server/AckChatLauncher.java (98%) rename app-manage-api/src/test/java/com/{enzhico => xncoding}/jwt/socket/server/BinaryEventLauncher.java (96%) rename app-manage-api/src/test/java/com/{enzhico => xncoding}/jwt/socket/server/ChatLauncher.java (95%) rename app-manage-api/src/test/java/com/{enzhico => xncoding}/jwt/socket/server/ChatObject.java (93%) rename app-manage-api/src/test/java/com/{enzhico => xncoding}/jwt/socket/server/EventChatLauncher.java (96%) rename app-manage-api/src/test/java/com/{enzhico => xncoding}/jwt/socket/server/NamespaceChatLauncher.java (97%) rename app-manage-api/src/test/java/com/{enzhico => xncoding}/jwt/socket/server/NamespaceSocketServer.java (98%) rename app-manage-api/src/test/java/com/{enzhico => xncoding}/jwt/socket/server/SocketExceptionListener.java (92%) rename app-manage-api/src/test/java/com/{enzhico => xncoding}/jwt/socket/server/SocketServer.java (97%) rename app-manage-api/src/test/java/com/{enzhico => xncoding}/jwt/socket/server/SslChatLauncher.java (96%) rename {springboot-aop/src/main/java/com/enzhico/aop => app-manage/src/main/java/com/xncoding/pos}/Application.java (91%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/async/AsyncException.java (94%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/async/AsyncExceptionHandler.java (96%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/async/AsyncTask.java (91%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/common/constant/ConstantsList.java (95%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/common/constant/DictMap.java (98%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/common/dao/entity/App.java (99%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/common/dao/entity/AppPublish.java (98%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/common/dao/entity/Manager.java (98%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/common/dao/entity/ManagerRole.java (98%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/common/dao/entity/OperationLog.java (98%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/common/dao/entity/Permission.java (98%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/common/dao/entity/Pos.java (99%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/common/dao/entity/PosHistory.java (98%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/common/dao/entity/PosMonitor.java (98%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/common/dao/entity/Project.java (98%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/common/dao/entity/ProjectUser.java (98%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/common/dao/entity/Role.java (98%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/common/dao/entity/RolePermission.java (98%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/common/dao/repository/AppMapper.java (66%) rename {app-manage-api/src/main/java/com/enzhico/jwt => app-manage/src/main/java/com/xncoding/pos}/common/dao/repository/AppPublishMapper.java (67%) rename {app-manage-api/src/main/java/com/enzhico/jwt => app-manage/src/main/java/com/xncoding/pos}/common/dao/repository/ManagerMapper.java (68%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/common/dao/repository/ManagerRoleMapper.java (68%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/common/dao/repository/OperationLogMapper.java (67%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/common/dao/repository/PermissionMapper.java (67%) rename {app-manage-api/src/main/java/com/enzhico/jwt => app-manage/src/main/java/com/xncoding/pos}/common/dao/repository/PosHistoryMapper.java (68%) rename {app-manage-api/src/main/java/com/enzhico/jwt => app-manage/src/main/java/com/xncoding/pos}/common/dao/repository/PosMapper.java (67%) rename {app-manage-api/src/main/java/com/enzhico/jwt => app-manage/src/main/java/com/xncoding/pos}/common/dao/repository/PosMonitorMapper.java (67%) rename {app-manage-api/src/main/java/com/enzhico/jwt => app-manage/src/main/java/com/xncoding/pos}/common/dao/repository/ProjectMapper.java (67%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/common/dao/repository/ProjectUserMapper.java (68%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/common/dao/repository/RoleMapper.java (67%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/common/dao/repository/RolePermissionMapper.java (68%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/common/util/AnalysisApk.java (99%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/common/util/CommonUtil.java (96%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/common/util/DateUtil.java (99%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/common/util/JsonConverter.java (97%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/config/AsyncConfig.java (93%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/config/MybatisPlusConfig.java (85%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/config/RestClientConfig.java (98%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/config/ScheduleConfig.java (96%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/config/ShiroConfig.java (98%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/config/WebConfig.java (97%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/config/properties/DruidProperties.java (99%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/config/properties/MyProperties.java (97%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/controller/AppController.java (94%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/controller/DeviceController.java (89%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/controller/LoginController.java (93%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/controller/MonitorController.java (93%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/controller/ProjectController.java (94%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/controller/UserController.java (94%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/dao/entity/AppInfo.java (92%) rename {app-manage-api/src/main/java/com/enzhico/jwt => app-manage/src/main/java/com/xncoding/pos}/dao/entity/AppVersionInfo.java (94%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/dao/entity/FileInfo.java (91%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/dao/entity/ManagerInfo.java (93%) rename {app-manage-api/src/main/java/com/enzhico/jwt => app-manage/src/main/java/com/xncoding/pos}/dao/entity/MonitorInfo.java (84%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/dao/entity/PosGroupInfo.java (83%) rename {app-manage-api/src/main/java/com/enzhico/jwt => app-manage/src/main/java/com/xncoding/pos}/dao/entity/PosInfo.java (81%) rename {app-manage-api/src/main/java/com/enzhico/jwt => app-manage/src/main/java/com/xncoding/pos}/dao/entity/PublishParam.java (97%) rename {app-manage-api/src/main/java/com/enzhico/jwt => app-manage/src/main/java/com/xncoding/pos}/dao/entity/SearchApp.java (98%) rename {app-manage-api/src/main/java/com/enzhico/jwt => app-manage/src/main/java/com/xncoding/pos}/dao/entity/SearchMonitor.java (97%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/dao/entity/SearchPos.java (97%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/dao/entity/SearchUser.java (97%) rename {app-manage-api/src/main/java/com/enzhico/jwt => app-manage/src/main/java/com/xncoding/pos}/dao/entity/SysRole.java (78%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/dao/repository/AppInfoDao.java (75%) rename {app-manage-api/src/main/java/com/enzhico/jwt => app-manage/src/main/java/com/xncoding/pos}/dao/repository/ManagerInfoDao.java (64%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/dao/repository/PosInfoDao.java (87%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/dao/repository/SysRoleDao.java (65%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/dao/repository/mapping/AppInfoDao.xml (98%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/dao/repository/mapping/ManagerInfoDao.xml (98%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/dao/repository/mapping/PosInfoDao.xml (98%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/dao/repository/mapping/SysRoleDao.xml (67%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/exception/ForbiddenUserException.java (85%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/http/CustomResponseErrorHandler.java (93%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/http/HttpBaseResponse.java (96%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/http/LoginParam.java (96%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/http/TokenRequestInterceptor.java (96%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/http/UnbindParam.java (94%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/jobs/HeartbeatJob.java (94%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/model/BaseResponse.java (97%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/service/AppService.java (93%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/service/DeviceService.java (80%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/service/ManagerInfoService.java (90%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/service/MonitorService.java (87%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/service/ProjectService.java (82%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/shiro/CaptchaUsernamePasswordToken.java (95%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/shiro/IncorrectCaptchaException.java (94%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/shiro/KaptchaFilter.java (97%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/shiro/MyExceptionResolver.java (96%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/shiro/MyShiroRealm.java (95%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/shiro/RoleFilter.java (96%) rename app-manage/src/main/java/com/{enzhico => xncoding}/pos/shiro/ShiroKit.java (98%) rename app-manage/src/test/java/com/{enzhico => xncoding}/pos/ApplicationTests.java (93%) rename app-manage/src/test/java/com/{enzhico => xncoding}/pos/SimpleTest.java (95%) rename app-manage/src/test/java/com/{enzhico => xncoding}/pos/common/util/CommonUtilTest.java (93%) rename app-manage/src/test/java/com/{enzhico => xncoding}/pos/crypto/asymmetric/RSAUtil.java (99%) rename app-manage/src/test/java/com/{enzhico => xncoding}/pos/crypto/symmetric/AESUtil.java (98%) rename app-manage/src/test/java/com/{enzhico => xncoding}/pos/crypto/symmetric/DESTripleUtil.java (98%) rename app-manage/src/test/java/com/{enzhico => xncoding}/pos/crypto/symmetric/DESUtil.java (98%) rename {app-manage/src/main/java/com/enzhico/pos => springboot-aop/src/main/java/com/xncoding/aop}/Application.java (91%) rename springboot-aop/src/main/java/com/{enzhico => xncoding}/aop/aspect/LogAspect.java (95%) rename springboot-aop/src/main/java/com/{enzhico => xncoding}/aop/aspect/UserAccess.java (90%) rename springboot-aop/src/main/java/com/{enzhico => xncoding}/aop/aspect/UserAccessAspect.java (87%) rename springboot-aop/src/main/java/com/{enzhico => xncoding}/aop/controller/UserController.java (86%) rename springboot-batch/src/main/java/com/{enzhico => xncoding}/trans/Application.java (92%) rename {springboot-cache/src/main/java/com/enzhico => springboot-batch/src/main/java/com/xncoding}/trans/config/MybatisPlusConfig.java (83%) rename springboot-batch/src/main/java/com/{enzhico => xncoding}/trans/config/properties/CommonProperties.java (97%) rename springboot-batch/src/main/java/com/{enzhico => xncoding}/trans/config/properties/DruidProperties.java (99%) rename springboot-batch/src/main/java/com/{enzhico => xncoding}/trans/dao/entity/User.java (96%) rename {springboot-redis/src/main/java/com/enzhico => springboot-batch/src/main/java/com/xncoding}/trans/dao/repository/UserMapper.java (56%) rename springboot-batch/src/main/java/com/{enzhico => xncoding}/trans/modules/MyBatchConfig.java (98%) rename springboot-batch/src/main/java/com/{enzhico => xncoding}/trans/modules/MyBeanValidator.java (97%) rename springboot-batch/src/main/java/com/{enzhico => xncoding}/trans/modules/MyBeanWrapperFieldSetMapper.java (93%) rename springboot-batch/src/main/java/com/{enzhico => xncoding}/trans/modules/MyJobListener.java (96%) rename springboot-batch/src/main/java/com/{enzhico => xncoding}/trans/modules/canton/Canton.java (98%) rename springboot-batch/src/main/java/com/{enzhico => xncoding}/trans/modules/canton/CantonConfig.java (98%) rename springboot-batch/src/main/java/com/{enzhico => xncoding}/trans/modules/common/CommonConfig.java (96%) rename springboot-batch/src/main/java/com/{enzhico => xncoding}/trans/modules/common/DateUtil.java (97%) rename springboot-batch/src/main/java/com/{enzhico => xncoding}/trans/modules/common/anno/TableName.java (85%) rename springboot-batch/src/main/java/com/{enzhico => xncoding}/trans/modules/common/vo/BscCanton.java (97%) rename springboot-batch/src/main/java/com/{enzhico => xncoding}/trans/modules/common/vo/BscExeOffice.java (97%) rename springboot-batch/src/main/java/com/{enzhico => xncoding}/trans/modules/common/vo/BscOfficeExeItem.java (94%) rename springboot-batch/src/main/java/com/{enzhico => xncoding}/trans/modules/common/vo/BscTollItem.java (98%) rename springboot-batch/src/main/java/com/{enzhico => xncoding}/trans/modules/common/vo/BscTollSpecialShare.java (97%) rename springboot-batch/src/main/java/com/{enzhico => xncoding}/trans/modules/vtoll/BudgetVtoll.java (98%) rename springboot-batch/src/main/java/com/{enzhico => xncoding}/trans/modules/vtoll/BudgetVtollConfig.java (98%) rename springboot-batch/src/main/java/com/{enzhico => xncoding}/trans/modules/zapp/App.java (85%) rename springboot-batch/src/main/java/com/{enzhico => xncoding}/trans/modules/zapp/AppConfig.java (97%) rename springboot-batch/src/main/java/com/{enzhico => xncoding}/trans/modules/zlog/Log.java (93%) rename springboot-batch/src/main/java/com/{enzhico => xncoding}/trans/modules/zlog/LogConfig.java (97%) rename springboot-batch/src/main/java/com/{enzhico => xncoding}/trans/service/CsvService.java (87%) rename springboot-batch/src/main/java/com/{enzhico => xncoding}/trans/start/StartRunner.java (89%) rename springboot-batch/src/test/java/com/{enzhico => xncoding}/service/BatchServiceTest.java (92%) rename springboot-batch/src/test/java/com/{enzhico => xncoding}/service/SimpleTest.java (95%) create mode 100644 springboot-cache/src/main/java/com/xncoding/trans/Application.java rename {springboot-transaction/src/main/java/com/enzhico => springboot-cache/src/main/java/com/xncoding}/trans/config/DruidProperties.java (99%) rename {springboot-batch/src/main/java/com/enzhico => springboot-cache/src/main/java/com/xncoding}/trans/config/MybatisPlusConfig.java (86%) rename springboot-cache/src/main/java/com/{enzhico => xncoding}/trans/config/RedisCacheConfig.java (89%) rename springboot-cache/src/main/java/com/{enzhico => xncoding}/trans/dao/entity/User.java (96%) rename springboot-cache/src/main/java/com/{enzhico => xncoding}/trans/dao/repository/UserMapper.java (56%) rename springboot-cache/src/main/java/com/{enzhico => xncoding}/trans/service/UserService.java (95%) create mode 100644 springboot-cache/src/main/resources/sql/t_user.sql rename springboot-cache/src/test/java/com/{enzhico => xncoding}/service/UserServiceTest.java (90%) delete mode 100644 springboot-echarts/src/main/java/com/enzhico/echarts/Application.java rename springboot-echarts/src/main/java/com/{enzhico => xncoding}/benchmark/common/ResultExporter.java (91%) rename springboot-echarts/src/main/java/com/{enzhico => xncoding}/benchmark/first/FirstBenchmark.java (96%) rename springboot-echarts/src/main/java/com/{enzhico => xncoding}/benchmark/json/JsonDeserializeBenchmark.java (88%) rename springboot-echarts/src/main/java/com/{enzhico => xncoding}/benchmark/json/JsonSerializeBenchmark.java (80%) rename springboot-echarts/src/main/java/com/{enzhico => xncoding}/benchmark/json/model/FullName.java (96%) rename springboot-echarts/src/main/java/com/{enzhico => xncoding}/benchmark/json/model/Person.java (97%) rename springboot-echarts/src/main/java/com/{enzhico => xncoding}/benchmark/json/util/FastJsonUtil.java (89%) rename springboot-echarts/src/main/java/com/{enzhico => xncoding}/benchmark/json/util/GsonUtil.java (94%) rename springboot-echarts/src/main/java/com/{enzhico => xncoding}/benchmark/json/util/JacksonUtil.java (95%) rename springboot-echarts/src/main/java/com/{enzhico => xncoding}/benchmark/json/util/JsonLibUtil.java (92%) rename springboot-echarts/src/main/java/com/{enzhico => xncoding}/benchmark/string/StringBuilderBenchmark.java (97%) rename springboot-echarts/src/main/java/com/{enzhico => xncoding}/benchmark/sum/SecondBenchmark.java (86%) rename springboot-echarts/src/main/java/com/{enzhico => xncoding}/benchmark/sum/calc/Calculator.java (89%) rename springboot-echarts/src/main/java/com/{enzhico => xncoding}/benchmark/sum/calc/impl/MultithreadCalculator.java (95%) rename springboot-echarts/src/main/java/com/{enzhico => xncoding}/benchmark/sum/calc/impl/SinglethreadCalculator.java (80%) create mode 100644 springboot-echarts/src/main/java/com/xncoding/echarts/Application.java rename springboot-echarts/src/main/java/com/{enzhico => xncoding}/echarts/api/PublicController.java (95%) rename springboot-echarts/src/main/java/com/{enzhico => xncoding}/echarts/api/model/BaseResponse.java (95%) rename springboot-echarts/src/main/java/com/{enzhico => xncoding}/echarts/api/model/EchartsData.java (94%) rename springboot-echarts/src/main/java/com/{enzhico => xncoding}/echarts/api/model/PicRequest.java (89%) rename springboot-echarts/src/main/java/com/{enzhico => xncoding}/echarts/api/model/jmh/AxisPointer.java (89%) rename springboot-echarts/src/main/java/com/{enzhico => xncoding}/echarts/api/model/jmh/Feature.java (91%) rename springboot-echarts/src/main/java/com/{enzhico => xncoding}/echarts/api/model/jmh/Grid.java (88%) rename springboot-echarts/src/main/java/com/{enzhico => xncoding}/echarts/api/model/jmh/Label.java (89%) rename springboot-echarts/src/main/java/com/{enzhico => xncoding}/echarts/api/model/jmh/Legend.java (90%) rename springboot-echarts/src/main/java/com/{enzhico => xncoding}/echarts/api/model/jmh/Normal.java (93%) rename springboot-echarts/src/main/java/com/{enzhico => xncoding}/echarts/api/model/jmh/Option.java (97%) rename springboot-echarts/src/main/java/com/{enzhico => xncoding}/echarts/api/model/jmh/SaveAsImage.java (89%) rename springboot-echarts/src/main/java/com/{enzhico => xncoding}/echarts/api/model/jmh/Serie.java (94%) rename springboot-echarts/src/main/java/com/{enzhico => xncoding}/echarts/api/model/jmh/Title.java (85%) rename springboot-echarts/src/main/java/com/{enzhico => xncoding}/echarts/api/model/jmh/Toolbox.java (93%) rename springboot-echarts/src/main/java/com/{enzhico => xncoding}/echarts/api/model/jmh/Tooltip.java (93%) rename springboot-echarts/src/main/java/com/{enzhico => xncoding}/echarts/api/model/jmh/XAxis.java (92%) rename springboot-echarts/src/main/java/com/{enzhico => xncoding}/echarts/api/model/jmh/YAxis.java (96%) rename springboot-echarts/src/main/java/com/{enzhico => xncoding}/echarts/api/model/jmh/YAxisLabel.java (89%) rename springboot-echarts/src/main/java/com/{enzhico => xncoding}/echarts/common/ServerRunner.java (94%) rename springboot-echarts/src/main/java/com/{enzhico => xncoding}/echarts/common/constants/MsgType.java (81%) rename springboot-echarts/src/main/java/com/{enzhico => xncoding}/echarts/common/util/CommonUtil.java (96%) rename springboot-echarts/src/main/java/com/{enzhico => xncoding}/echarts/common/util/ExportPngUtil.java (96%) rename springboot-echarts/src/main/java/com/{enzhico => xncoding}/echarts/config/NettySocketConfig.java (92%) rename springboot-echarts/src/main/java/com/{enzhico => xncoding}/echarts/config/properties/MyProperties.java (94%) rename springboot-echarts/src/main/java/com/{enzhico => xncoding}/echarts/controller/IndexController.java (89%) rename springboot-echarts/src/main/java/com/{enzhico => xncoding}/echarts/handler/MessageEventHandler.java (93%) rename springboot-echarts/src/main/java/com/{enzhico => xncoding}/echarts/service/ApiService.java (96%) rename springboot-echarts/src/test/java/com/{enzhico => xncoding}/echarts/common/util/CommonUtilTest.java (88%) create mode 100644 springboot-mybatis/.gitignore create mode 100644 springboot-mybatis/LICENSE create mode 100644 springboot-mybatis/README.md create mode 100644 springboot-mybatis/pom.xml create mode 100644 springboot-mybatis/run.sh rename {springboot-cache/src/main/java/com/enzhico/trans => springboot-mybatis/src/main/java/com/xncoding/pos}/Application.java (91%) create mode 100644 springboot-mybatis/src/main/java/com/xncoding/pos/common/dao/entity/User.java create mode 100644 springboot-mybatis/src/main/java/com/xncoding/pos/common/dao/repository/UserMapper.java create mode 100644 springboot-mybatis/src/main/java/com/xncoding/pos/config/MybatisPlusConfig.java create mode 100644 springboot-mybatis/src/main/java/com/xncoding/pos/config/properties/DruidProperties.java create mode 100644 springboot-mybatis/src/main/java/com/xncoding/pos/service/UserService.java create mode 100644 springboot-mybatis/src/main/resources/application.yml create mode 100644 springboot-mybatis/src/main/resources/banner.txt create mode 100644 springboot-mybatis/src/main/resources/sql/schema.sql create mode 100644 springboot-mybatis/src/test/java/com/xncoding/pos/ApplicationTests.java delete mode 100644 springboot-redis/src/main/java/com/enzhico/trans/Application.java create mode 100644 springboot-redis/src/main/java/com/xncoding/pos/Application.java rename springboot-redis/src/main/java/com/{enzhico/trans => xncoding/pos}/config/DruidProperties.java (99%) rename springboot-redis/src/main/java/com/{enzhico/trans => xncoding/pos}/config/MybatisPlusConfig.java (83%) rename springboot-redis/src/main/java/com/{enzhico/trans => xncoding/pos}/config/RedisConfig.java (98%) rename springboot-redis/src/main/java/com/{enzhico/trans => xncoding/pos}/dao/entity/User.java (96%) rename {springboot-batch/src/main/java/com/enzhico/trans => springboot-redis/src/main/java/com/xncoding/pos}/dao/repository/UserMapper.java (56%) rename springboot-redis/src/main/java/com/{enzhico/trans => xncoding/pos}/service/UserService.java (86%) create mode 100644 springboot-redis/src/main/resources/sql/t_user.sql rename springboot-redis/src/test/java/com/{enzhico => xncoding}/service/UserServiceTest.java (89%) delete mode 100644 springboot-transaction/src/main/java/com/enzhico/trans/Application.java create mode 100644 springboot-transaction/src/main/java/com/xncoding/trans/Application.java rename {springboot-cache/src/main/java/com/enzhico => springboot-transaction/src/main/java/com/xncoding}/trans/config/DruidProperties.java (99%) rename springboot-transaction/src/main/java/com/{enzhico => xncoding}/trans/config/MybatisPlusConfig.java (83%) rename springboot-transaction/src/main/java/com/{enzhico => xncoding}/trans/controller/UserController.java (86%) rename springboot-transaction/src/main/java/com/{enzhico => xncoding}/trans/dao/entity/User.java (96%) rename springboot-transaction/src/main/java/com/{enzhico => xncoding}/trans/dao/repository/UserMapper.java (56%) rename springboot-transaction/src/main/java/com/{enzhico => xncoding}/trans/exception/MyException.java (82%) rename springboot-transaction/src/main/java/com/{enzhico => xncoding}/trans/service/UserService.java (85%) diff --git a/app-manage-api/README.md b/app-manage-api/README.md index 8baa929..2ed4d14 100644 --- a/app-manage-api/README.md +++ b/app-manage-api/README.md @@ -23,21 +23,21 @@ Sockt.io官网： ### WebSocket js客户端测试 ``` -com.enzhico.pos.socket.server.ChatLauncher - /client/html/index.html -com.enzhico.pos.socket.server.EventChatLauncher - /client/html/event-index.html -com.enzhico.pos.socket.server.SslChatLauncher - /client/html/ssl-event-index.html -com.enzhico.pos.socket.server.NamespaceChatLauncher - /client/html/namespace-index.html -com.enzhico.pos.socket.server.AckChatLauncher - /client/html/ack-index.html -com.enzhico.pos.socket.server.BinaryEventLauncher - /client/html/binary-event-index.html +com.xncoding.pos.socket.server.ChatLauncher - /client/html/index.html +com.xncoding.pos.socket.server.EventChatLauncher - /client/html/event-index.html +com.xncoding.pos.socket.server.SslChatLauncher - /client/html/ssl-event-index.html +com.xncoding.pos.socket.server.NamespaceChatLauncher - /client/html/namespace-index.html +com.xncoding.pos.socket.server.AckChatLauncher - /client/html/ack-index.html +com.xncoding.pos.socket.server.BinaryEventLauncher - /client/html/binary-event-index.html ``` ### WebSocket Java客户端测试 ``` 服务器： -com.enzhico.pos.socket.server.SocketServer +com.xncoding.pos.socket.server.SocketServer 客户端： -com.enzhico.pos.socket.client.SocketClient +com.xncoding.pos.socket.client.SocketClient ``` ### 广播消息中的namespace和room diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/Application.java b/app-manage-api/src/main/java/com/xncoding/jwt/Application.java similarity index 91% rename from app-manage-api/src/main/java/com/enzhico/jwt/Application.java rename to app-manage-api/src/main/java/com/xncoding/jwt/Application.java index b515027..e180aef 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/Application.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/Application.java @@ -1,4 +1,4 @@ -package com.enzhico.jwt; +package com.xncoding.jwt; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/api/ExceptionController.java b/app-manage-api/src/main/java/com/xncoding/jwt/api/ExceptionController.java similarity index 95% rename from app-manage-api/src/main/java/com/enzhico/jwt/api/ExceptionController.java rename to app-manage-api/src/main/java/com/xncoding/jwt/api/ExceptionController.java index 41492d8..b35354d 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/api/ExceptionController.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/api/ExceptionController.java @@ -1,6 +1,6 @@ -package com.enzhico.jwt.api; +package com.xncoding.jwt.api; -import com.enzhico.jwt.api.model.BaseResponse; +import com.xncoding.jwt.api.model.BaseResponse; import io.swagger.annotations.Api; import org.apache.shiro.ShiroException; import org.apache.shiro.authc.AuthenticationException; diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/api/LoginController.java b/app-manage-api/src/main/java/com/xncoding/jwt/api/LoginController.java similarity index 92% rename from app-manage-api/src/main/java/com/enzhico/jwt/api/LoginController.java rename to app-manage-api/src/main/java/com/xncoding/jwt/api/LoginController.java index 4be0b6e..f8a996d 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/api/LoginController.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/api/LoginController.java @@ -1,11 +1,11 @@ -package com.enzhico.jwt.api; +package com.xncoding.jwt.api; -import com.enzhico.jwt.api.model.BaseResponse; -import com.enzhico.jwt.api.model.LoginParam; -import com.enzhico.jwt.common.util.JWTUtil; -import com.enzhico.jwt.dao.entity.ManagerInfo; -import com.enzhico.jwt.service.ManagerInfoService; -import com.enzhico.jwt.shiro.ShiroKit; +import com.xncoding.jwt.api.model.BaseResponse; +import com.xncoding.jwt.api.model.LoginParam; +import com.xncoding.jwt.common.util.JWTUtil; +import com.xncoding.jwt.dao.entity.ManagerInfo; +import com.xncoding.jwt.service.ManagerInfoService; +import com.xncoding.jwt.shiro.ShiroKit; import io.swagger.annotations.*; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authz.UnauthorizedException; diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/api/NotifyController.java b/app-manage-api/src/main/java/com/xncoding/jwt/api/NotifyController.java similarity index 92% rename from app-manage-api/src/main/java/com/enzhico/jwt/api/NotifyController.java rename to app-manage-api/src/main/java/com/xncoding/jwt/api/NotifyController.java index 4aee320..c01cabb 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/api/NotifyController.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/api/NotifyController.java @@ -1,8 +1,8 @@ -package com.enzhico.jwt.api; +package com.xncoding.jwt.api; -import com.enzhico.jwt.api.model.BaseResponse; -import com.enzhico.jwt.api.model.UnbindParam; -import com.enzhico.jwt.service.ApiService; +import com.xncoding.jwt.api.model.BaseResponse; +import com.xncoding.jwt.api.model.UnbindParam; +import com.xncoding.jwt.service.ApiService; import io.swagger.annotations.*; import org.apache.shiro.authz.annotation.RequiresUser; import org.slf4j.Logger; diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/api/PublicController.java b/app-manage-api/src/main/java/com/xncoding/jwt/api/PublicController.java similarity index 98% rename from app-manage-api/src/main/java/com/enzhico/jwt/api/PublicController.java rename to app-manage-api/src/main/java/com/xncoding/jwt/api/PublicController.java index e447f68..94839a0 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/api/PublicController.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/api/PublicController.java @@ -1,10 +1,10 @@ -package com.enzhico.jwt.api; +package com.xncoding.jwt.api; -import com.enzhico.jwt.api.model.*; -import com.enzhico.jwt.common.dao.entity.Pos; -import com.enzhico.jwt.common.dao.entity.Project; -import com.enzhico.jwt.service.ApiService; -import com.enzhico.jwt.service.ManagerInfoService; +import com.xncoding.jwt.api.model.*; +import com.xncoding.jwt.common.dao.entity.Pos; +import com.xncoding.jwt.common.dao.entity.Project; +import com.xncoding.jwt.service.ApiService; +import com.xncoding.jwt.service.ManagerInfoService; import io.swagger.annotations.*; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authz.annotation.RequiresUser; diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/api/model/BaseResponse.java b/app-manage-api/src/main/java/com/xncoding/jwt/api/model/BaseResponse.java similarity index 97% rename from app-manage-api/src/main/java/com/enzhico/jwt/api/model/BaseResponse.java rename to app-manage-api/src/main/java/com/xncoding/jwt/api/model/BaseResponse.java index cd33c20..1415107 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/api/model/BaseResponse.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/api/model/BaseResponse.java @@ -1,4 +1,4 @@ -package com.enzhico.jwt.api.model; +package com.xncoding.jwt.api.model; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/api/model/BindParam.java b/app-manage-api/src/main/java/com/xncoding/jwt/api/model/BindParam.java similarity index 96% rename from app-manage-api/src/main/java/com/enzhico/jwt/api/model/BindParam.java rename to app-manage-api/src/main/java/com/xncoding/jwt/api/model/BindParam.java index 2c2d772..06b2abf 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/api/model/BindParam.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/api/model/BindParam.java @@ -1,4 +1,4 @@ -package com.enzhico.jwt.api.model; +package com.xncoding.jwt.api.model; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/api/model/JoinBindResponse.java b/app-manage-api/src/main/java/com/xncoding/jwt/api/model/JoinBindResponse.java similarity index 97% rename from app-manage-api/src/main/java/com/enzhico/jwt/api/model/JoinBindResponse.java rename to app-manage-api/src/main/java/com/xncoding/jwt/api/model/JoinBindResponse.java index ff82259..4e92720 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/api/model/JoinBindResponse.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/api/model/JoinBindResponse.java @@ -1,4 +1,4 @@ -package com.enzhico.jwt.api.model; +package com.xncoding.jwt.api.model; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/api/model/LoginParam.java b/app-manage-api/src/main/java/com/xncoding/jwt/api/model/LoginParam.java similarity index 94% rename from app-manage-api/src/main/java/com/enzhico/jwt/api/model/LoginParam.java rename to app-manage-api/src/main/java/com/xncoding/jwt/api/model/LoginParam.java index 5bfe8f1..7ad9928 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/api/model/LoginParam.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/api/model/LoginParam.java @@ -1,4 +1,4 @@ -package com.enzhico.jwt.api.model; +package com.xncoding.jwt.api.model; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -25,7 +25,7 @@ public class LoginParam { /** * Application ID */ - @ApiModelProperty(value = "Application ID", name = "appid", example = "com.enzhico.xzpay", required = false) + @ApiModelProperty(value = "Application ID", name = "appid", example = "com.xncoding.xzpay", required = false) private String appid; /** * IMEI码 diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/api/model/PosParam.java b/app-manage-api/src/main/java/com/xncoding/jwt/api/model/PosParam.java similarity index 97% rename from app-manage-api/src/main/java/com/enzhico/jwt/api/model/PosParam.java rename to app-manage-api/src/main/java/com/xncoding/jwt/api/model/PosParam.java index 2b7d2f3..9c2577e 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/api/model/PosParam.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/api/model/PosParam.java @@ -1,4 +1,4 @@ -package com.enzhico.jwt.api.model; +package com.xncoding.jwt.api.model; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -56,7 +56,7 @@ public class PosParam { * 应用ID */ @ApiModelProperty(value = "APP应用ID（长度1-64位），每个APP都有唯一的Application Id，并且这个应用ID必须已经存在于系统之中", - name = "applicationId", dataType = "String", example = "com.enzhico.xzpay", required = true) + name = "applicationId", dataType = "String", example = "com.xncoding.xzpay", required = true) private String applicationId; public String getImei() { diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/api/model/ReportParam.java b/app-manage-api/src/main/java/com/xncoding/jwt/api/model/ReportParam.java similarity index 96% rename from app-manage-api/src/main/java/com/enzhico/jwt/api/model/ReportParam.java rename to app-manage-api/src/main/java/com/xncoding/jwt/api/model/ReportParam.java index 314ff07..d99a499 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/api/model/ReportParam.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/api/model/ReportParam.java @@ -1,4 +1,4 @@ -package com.enzhico.jwt.api.model; +package com.xncoding.jwt.api.model; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/api/model/UnbindParam.java b/app-manage-api/src/main/java/com/xncoding/jwt/api/model/UnbindParam.java similarity index 96% rename from app-manage-api/src/main/java/com/enzhico/jwt/api/model/UnbindParam.java rename to app-manage-api/src/main/java/com/xncoding/jwt/api/model/UnbindParam.java index b86eb02..14f8bc7 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/api/model/UnbindParam.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/api/model/UnbindParam.java @@ -1,4 +1,4 @@ -package com.enzhico.jwt.api.model; +package com.xncoding.jwt.api.model; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/api/model/VersionParam.java b/app-manage-api/src/main/java/com/xncoding/jwt/api/model/VersionParam.java similarity index 90% rename from app-manage-api/src/main/java/com/enzhico/jwt/api/model/VersionParam.java rename to app-manage-api/src/main/java/com/xncoding/jwt/api/model/VersionParam.java index ee13ba8..dab0db9 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/api/model/VersionParam.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/api/model/VersionParam.java @@ -1,4 +1,4 @@ -package com.enzhico.jwt.api.model; +package com.xncoding.jwt.api.model; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -20,7 +20,7 @@ public class VersionParam { /** * 应用ID */ - @ApiModelProperty(value = "APP应用ID，每个APP都有唯一的Application Id", name = "applicationId", example = "com.enzhico.xzpay", required = true) + @ApiModelProperty(value = "APP应用ID，每个APP都有唯一的Application Id", name = "applicationId", example = "com.xncoding.xzpay", required = true) private String applicationId; /** * 当前版本号 diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/api/model/VersionResult.java b/app-manage-api/src/main/java/com/xncoding/jwt/api/model/VersionResult.java similarity index 95% rename from app-manage-api/src/main/java/com/enzhico/jwt/api/model/VersionResult.java rename to app-manage-api/src/main/java/com/xncoding/jwt/api/model/VersionResult.java index d6ea017..60b3aa5 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/api/model/VersionResult.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/api/model/VersionResult.java @@ -1,4 +1,4 @@ -package com.enzhico.jwt.api.model; +package com.xncoding.jwt.api.model; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -43,7 +43,7 @@ public class VersionResult { /** * 新版本下载地址 */ - @ApiModelProperty(value = "新版本下载地址", name = "downloadUrl", example = "http://enzhico.net/files/行政收费_1.3.0.apk") + @ApiModelProperty(value = "新版本下载地址", name = "downloadUrl", example = "http://xncoding.net/files/行政收费_1.3.0.apk") private String downloadUrl; public boolean isFindNew() { diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/common/ServerRunner.java b/app-manage-api/src/main/java/com/xncoding/jwt/common/ServerRunner.java similarity index 96% rename from app-manage-api/src/main/java/com/enzhico/jwt/common/ServerRunner.java rename to app-manage-api/src/main/java/com/xncoding/jwt/common/ServerRunner.java index 907856e..3fbe88c 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/common/ServerRunner.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/common/ServerRunner.java @@ -1,4 +1,4 @@ -package com.enzhico.jwt.common; +package com.xncoding.jwt.common; import com.corundumstudio.socketio.SocketIOServer; import org.slf4j.Logger; diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/common/constant/ConstantsList.java b/app-manage-api/src/main/java/com/xncoding/jwt/common/constant/ConstantsList.java similarity index 95% rename from app-manage-api/src/main/java/com/enzhico/jwt/common/constant/ConstantsList.java rename to app-manage-api/src/main/java/com/xncoding/jwt/common/constant/ConstantsList.java index 5316c70..cbca0e3 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/common/constant/ConstantsList.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/common/constant/ConstantsList.java @@ -1,4 +1,4 @@ -package com.enzhico.jwt.common.constant; +package com.xncoding.jwt.common.constant; import java.util.ArrayList; import java.util.List; diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/common/constant/DictMap.java b/app-manage-api/src/main/java/com/xncoding/jwt/common/constant/DictMap.java similarity index 98% rename from app-manage-api/src/main/java/com/enzhico/jwt/common/constant/DictMap.java rename to app-manage-api/src/main/java/com/xncoding/jwt/common/constant/DictMap.java index 5ade1dc..bc914ae 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/common/constant/DictMap.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/common/constant/DictMap.java @@ -1,4 +1,4 @@ -package com.enzhico.jwt.common.constant; +package com.xncoding.jwt.common.constant; import java.util.HashMap; import java.util.Map; diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/common/dao/entity/App.java b/app-manage-api/src/main/java/com/xncoding/jwt/common/dao/entity/App.java similarity index 99% rename from app-manage-api/src/main/java/com/enzhico/jwt/common/dao/entity/App.java rename to app-manage-api/src/main/java/com/xncoding/jwt/common/dao/entity/App.java index ef6ce45..5fc7ffd 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/common/dao/entity/App.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/common/dao/entity/App.java @@ -1,4 +1,4 @@ -package com.enzhico.jwt.common.dao.entity; +package com.xncoding.jwt.common.dao.entity; import java.util.Date; diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/common/dao/entity/AppPublish.java b/app-manage-api/src/main/java/com/xncoding/jwt/common/dao/entity/AppPublish.java similarity index 98% rename from app-manage-api/src/main/java/com/enzhico/jwt/common/dao/entity/AppPublish.java rename to app-manage-api/src/main/java/com/xncoding/jwt/common/dao/entity/AppPublish.java index 832398a..9acc75b 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/common/dao/entity/AppPublish.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/common/dao/entity/AppPublish.java @@ -1,4 +1,4 @@ -package com.enzhico.jwt.common.dao.entity; +package com.xncoding.jwt.common.dao.entity; import java.util.Date; diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/common/dao/entity/Manager.java b/app-manage-api/src/main/java/com/xncoding/jwt/common/dao/entity/Manager.java similarity index 98% rename from app-manage-api/src/main/java/com/enzhico/jwt/common/dao/entity/Manager.java rename to app-manage-api/src/main/java/com/xncoding/jwt/common/dao/entity/Manager.java index 2109a7a..ef00254 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/common/dao/entity/Manager.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/common/dao/entity/Manager.java @@ -1,4 +1,4 @@ -package com.enzhico.jwt.common.dao.entity; +package com.xncoding.jwt.common.dao.entity; import java.util.Date; diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/common/dao/entity/ManagerRole.java b/app-manage-api/src/main/java/com/xncoding/jwt/common/dao/entity/ManagerRole.java similarity index 98% rename from app-manage-api/src/main/java/com/enzhico/jwt/common/dao/entity/ManagerRole.java rename to app-manage-api/src/main/java/com/xncoding/jwt/common/dao/entity/ManagerRole.java index d6ad29c..44953b8 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/common/dao/entity/ManagerRole.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/common/dao/entity/ManagerRole.java @@ -1,4 +1,4 @@ -package com.enzhico.jwt.common.dao.entity; +package com.xncoding.jwt.common.dao.entity; import java.util.Date; diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/common/dao/entity/OperationLog.java b/app-manage-api/src/main/java/com/xncoding/jwt/common/dao/entity/OperationLog.java similarity index 98% rename from app-manage-api/src/main/java/com/enzhico/jwt/common/dao/entity/OperationLog.java rename to app-manage-api/src/main/java/com/xncoding/jwt/common/dao/entity/OperationLog.java index e8ca1ea..074f7b0 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/common/dao/entity/OperationLog.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/common/dao/entity/OperationLog.java @@ -1,4 +1,4 @@ -package com.enzhico.jwt.common.dao.entity; +package com.xncoding.jwt.common.dao.entity; import java.util.Date; diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/common/dao/entity/Permission.java b/app-manage-api/src/main/java/com/xncoding/jwt/common/dao/entity/Permission.java similarity index 98% rename from app-manage-api/src/main/java/com/enzhico/jwt/common/dao/entity/Permission.java rename to app-manage-api/src/main/java/com/xncoding/jwt/common/dao/entity/Permission.java index e9acf4e..f92186b 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/common/dao/entity/Permission.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/common/dao/entity/Permission.java @@ -1,4 +1,4 @@ -package com.enzhico.jwt.common.dao.entity; +package com.xncoding.jwt.common.dao.entity; import java.util.Date; diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/common/dao/entity/Pos.java b/app-manage-api/src/main/java/com/xncoding/jwt/common/dao/entity/Pos.java similarity index 99% rename from app-manage-api/src/main/java/com/enzhico/jwt/common/dao/entity/Pos.java rename to app-manage-api/src/main/java/com/xncoding/jwt/common/dao/entity/Pos.java index 64fbc39..41040cf 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/common/dao/entity/Pos.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/common/dao/entity/Pos.java @@ -1,4 +1,4 @@ -package com.enzhico.jwt.common.dao.entity; +package com.xncoding.jwt.common.dao.entity; import java.util.Date; diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/common/dao/entity/PosHistory.java b/app-manage-api/src/main/java/com/xncoding/jwt/common/dao/entity/PosHistory.java similarity index 98% rename from app-manage-api/src/main/java/com/enzhico/jwt/common/dao/entity/PosHistory.java rename to app-manage-api/src/main/java/com/xncoding/jwt/common/dao/entity/PosHistory.java index bfbb81b..18fe2d1 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/common/dao/entity/PosHistory.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/common/dao/entity/PosHistory.java @@ -1,4 +1,4 @@ -package com.enzhico.jwt.common.dao.entity; +package com.xncoding.jwt.common.dao.entity; import java.util.Date; diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/common/dao/entity/PosMonitor.java b/app-manage-api/src/main/java/com/xncoding/jwt/common/dao/entity/PosMonitor.java similarity index 98% rename from app-manage-api/src/main/java/com/enzhico/jwt/common/dao/entity/PosMonitor.java rename to app-manage-api/src/main/java/com/xncoding/jwt/common/dao/entity/PosMonitor.java index aee870e..8a06e23 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/common/dao/entity/PosMonitor.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/common/dao/entity/PosMonitor.java @@ -1,4 +1,4 @@ -package com.enzhico.jwt.common.dao.entity; +package com.xncoding.jwt.common.dao.entity; import java.util.Date; diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/common/dao/entity/Project.java b/app-manage-api/src/main/java/com/xncoding/jwt/common/dao/entity/Project.java similarity index 98% rename from app-manage-api/src/main/java/com/enzhico/jwt/common/dao/entity/Project.java rename to app-manage-api/src/main/java/com/xncoding/jwt/common/dao/entity/Project.java index 9f9a3e7..147f5e8 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/common/dao/entity/Project.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/common/dao/entity/Project.java @@ -1,4 +1,4 @@ -package com.enzhico.jwt.common.dao.entity; +package com.xncoding.jwt.common.dao.entity; import java.util.Date; diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/common/dao/entity/ProjectUser.java b/app-manage-api/src/main/java/com/xncoding/jwt/common/dao/entity/ProjectUser.java similarity index 98% rename from app-manage-api/src/main/java/com/enzhico/jwt/common/dao/entity/ProjectUser.java rename to app-manage-api/src/main/java/com/xncoding/jwt/common/dao/entity/ProjectUser.java index 33877e6..d17447e 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/common/dao/entity/ProjectUser.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/common/dao/entity/ProjectUser.java @@ -1,4 +1,4 @@ -package com.enzhico.jwt.common.dao.entity; +package com.xncoding.jwt.common.dao.entity; import java.util.Date; diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/common/dao/entity/Role.java b/app-manage-api/src/main/java/com/xncoding/jwt/common/dao/entity/Role.java similarity index 98% rename from app-manage-api/src/main/java/com/enzhico/jwt/common/dao/entity/Role.java rename to app-manage-api/src/main/java/com/xncoding/jwt/common/dao/entity/Role.java index d0a549a..60a055d 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/common/dao/entity/Role.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/common/dao/entity/Role.java @@ -1,4 +1,4 @@ -package com.enzhico.jwt.common.dao.entity; +package com.xncoding.jwt.common.dao.entity; import java.util.Date; diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/common/dao/entity/RolePermission.java b/app-manage-api/src/main/java/com/xncoding/jwt/common/dao/entity/RolePermission.java similarity index 98% rename from app-manage-api/src/main/java/com/enzhico/jwt/common/dao/entity/RolePermission.java rename to app-manage-api/src/main/java/com/xncoding/jwt/common/dao/entity/RolePermission.java index 1c628c5..05acbdc 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/common/dao/entity/RolePermission.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/common/dao/entity/RolePermission.java @@ -1,4 +1,4 @@ -package com.enzhico.jwt.common.dao.entity; +package com.xncoding.jwt.common.dao.entity; import java.util.Date; diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/common/dao/repository/AppMapper.java b/app-manage-api/src/main/java/com/xncoding/jwt/common/dao/repository/AppMapper.java similarity index 66% rename from app-manage-api/src/main/java/com/enzhico/jwt/common/dao/repository/AppMapper.java rename to app-manage-api/src/main/java/com/xncoding/jwt/common/dao/repository/AppMapper.java index cabf548..4227e79 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/common/dao/repository/AppMapper.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/common/dao/repository/AppMapper.java @@ -1,6 +1,6 @@ -package com.enzhico.jwt.common.dao.repository; +package com.xncoding.jwt.common.dao.repository; -import com.enzhico.jwt.common.dao.entity.App; +import com.xncoding.jwt.common.dao.entity.App; import com.baomidou.mybatisplus.mapper.BaseMapper; /** diff --git a/app-manage/src/main/java/com/enzhico/pos/common/dao/repository/AppPublishMapper.java b/app-manage-api/src/main/java/com/xncoding/jwt/common/dao/repository/AppPublishMapper.java similarity index 67% rename from app-manage/src/main/java/com/enzhico/pos/common/dao/repository/AppPublishMapper.java rename to app-manage-api/src/main/java/com/xncoding/jwt/common/dao/repository/AppPublishMapper.java index e927dd7..757ce35 100644 --- a/app-manage/src/main/java/com/enzhico/pos/common/dao/repository/AppPublishMapper.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/common/dao/repository/AppPublishMapper.java @@ -1,6 +1,6 @@ -package com.enzhico.pos.common.dao.repository; +package com.xncoding.jwt.common.dao.repository; -import com.enzhico.pos.common.dao.entity.AppPublish; +import com.xncoding.jwt.common.dao.entity.AppPublish; import com.baomidou.mybatisplus.mapper.BaseMapper; /** diff --git a/app-manage/src/main/java/com/enzhico/pos/common/dao/repository/ManagerMapper.java b/app-manage-api/src/main/java/com/xncoding/jwt/common/dao/repository/ManagerMapper.java similarity index 68% rename from app-manage/src/main/java/com/enzhico/pos/common/dao/repository/ManagerMapper.java rename to app-manage-api/src/main/java/com/xncoding/jwt/common/dao/repository/ManagerMapper.java index b9c0e16..53d1f92 100644 --- a/app-manage/src/main/java/com/enzhico/pos/common/dao/repository/ManagerMapper.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/common/dao/repository/ManagerMapper.java @@ -1,6 +1,6 @@ -package com.enzhico.pos.common.dao.repository; +package com.xncoding.jwt.common.dao.repository; -import com.enzhico.pos.common.dao.entity.Manager; +import com.xncoding.jwt.common.dao.entity.Manager; import com.baomidou.mybatisplus.mapper.BaseMapper; /** diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/common/dao/repository/ManagerRoleMapper.java b/app-manage-api/src/main/java/com/xncoding/jwt/common/dao/repository/ManagerRoleMapper.java similarity index 68% rename from app-manage-api/src/main/java/com/enzhico/jwt/common/dao/repository/ManagerRoleMapper.java rename to app-manage-api/src/main/java/com/xncoding/jwt/common/dao/repository/ManagerRoleMapper.java index fa6a16e..779de3a 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/common/dao/repository/ManagerRoleMapper.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/common/dao/repository/ManagerRoleMapper.java @@ -1,6 +1,6 @@ -package com.enzhico.jwt.common.dao.repository; +package com.xncoding.jwt.common.dao.repository; -import com.enzhico.jwt.common.dao.entity.ManagerRole; +import com.xncoding.jwt.common.dao.entity.ManagerRole; import com.baomidou.mybatisplus.mapper.BaseMapper; /** diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/common/dao/repository/OperationLogMapper.java b/app-manage-api/src/main/java/com/xncoding/jwt/common/dao/repository/OperationLogMapper.java similarity index 67% rename from app-manage-api/src/main/java/com/enzhico/jwt/common/dao/repository/OperationLogMapper.java rename to app-manage-api/src/main/java/com/xncoding/jwt/common/dao/repository/OperationLogMapper.java index 590864e..211bf8a 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/common/dao/repository/OperationLogMapper.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/common/dao/repository/OperationLogMapper.java @@ -1,6 +1,6 @@ -package com.enzhico.jwt.common.dao.repository; +package com.xncoding.jwt.common.dao.repository; -import com.enzhico.jwt.common.dao.entity.OperationLog; +import com.xncoding.jwt.common.dao.entity.OperationLog; import com.baomidou.mybatisplus.mapper.BaseMapper; /** diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/common/dao/repository/PermissionMapper.java b/app-manage-api/src/main/java/com/xncoding/jwt/common/dao/repository/PermissionMapper.java similarity index 67% rename from app-manage-api/src/main/java/com/enzhico/jwt/common/dao/repository/PermissionMapper.java rename to app-manage-api/src/main/java/com/xncoding/jwt/common/dao/repository/PermissionMapper.java index e4bf460..2a9e6d2 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/common/dao/repository/PermissionMapper.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/common/dao/repository/PermissionMapper.java @@ -1,6 +1,6 @@ -package com.enzhico.jwt.common.dao.repository; +package com.xncoding.jwt.common.dao.repository; -import com.enzhico.jwt.common.dao.entity.Permission; +import com.xncoding.jwt.common.dao.entity.Permission; import com.baomidou.mybatisplus.mapper.BaseMapper; /** diff --git a/app-manage/src/main/java/com/enzhico/pos/common/dao/repository/PosHistoryMapper.java b/app-manage-api/src/main/java/com/xncoding/jwt/common/dao/repository/PosHistoryMapper.java similarity index 68% rename from app-manage/src/main/java/com/enzhico/pos/common/dao/repository/PosHistoryMapper.java rename to app-manage-api/src/main/java/com/xncoding/jwt/common/dao/repository/PosHistoryMapper.java index 20994e8..3d769c3 100644 --- a/app-manage/src/main/java/com/enzhico/pos/common/dao/repository/PosHistoryMapper.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/common/dao/repository/PosHistoryMapper.java @@ -1,6 +1,6 @@ -package com.enzhico.pos.common.dao.repository; +package com.xncoding.jwt.common.dao.repository; -import com.enzhico.pos.common.dao.entity.PosHistory; +import com.xncoding.jwt.common.dao.entity.PosHistory; import com.baomidou.mybatisplus.mapper.BaseMapper; /** diff --git a/app-manage/src/main/java/com/enzhico/pos/common/dao/repository/PosMapper.java b/app-manage-api/src/main/java/com/xncoding/jwt/common/dao/repository/PosMapper.java similarity index 67% rename from app-manage/src/main/java/com/enzhico/pos/common/dao/repository/PosMapper.java rename to app-manage-api/src/main/java/com/xncoding/jwt/common/dao/repository/PosMapper.java index 56f786a..eb24f82 100644 --- a/app-manage/src/main/java/com/enzhico/pos/common/dao/repository/PosMapper.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/common/dao/repository/PosMapper.java @@ -1,6 +1,6 @@ -package com.enzhico.pos.common.dao.repository; +package com.xncoding.jwt.common.dao.repository; -import com.enzhico.pos.common.dao.entity.Pos; +import com.xncoding.jwt.common.dao.entity.Pos; import com.baomidou.mybatisplus.mapper.BaseMapper; /** diff --git a/app-manage/src/main/java/com/enzhico/pos/common/dao/repository/PosMonitorMapper.java b/app-manage-api/src/main/java/com/xncoding/jwt/common/dao/repository/PosMonitorMapper.java similarity index 67% rename from app-manage/src/main/java/com/enzhico/pos/common/dao/repository/PosMonitorMapper.java rename to app-manage-api/src/main/java/com/xncoding/jwt/common/dao/repository/PosMonitorMapper.java index 00429d8..bcfd26e 100644 --- a/app-manage/src/main/java/com/enzhico/pos/common/dao/repository/PosMonitorMapper.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/common/dao/repository/PosMonitorMapper.java @@ -1,6 +1,6 @@ -package com.enzhico.pos.common.dao.repository; +package com.xncoding.jwt.common.dao.repository; -import com.enzhico.pos.common.dao.entity.PosMonitor; +import com.xncoding.jwt.common.dao.entity.PosMonitor; import com.baomidou.mybatisplus.mapper.BaseMapper; /** diff --git a/app-manage/src/main/java/com/enzhico/pos/common/dao/repository/ProjectMapper.java b/app-manage-api/src/main/java/com/xncoding/jwt/common/dao/repository/ProjectMapper.java similarity index 67% rename from app-manage/src/main/java/com/enzhico/pos/common/dao/repository/ProjectMapper.java rename to app-manage-api/src/main/java/com/xncoding/jwt/common/dao/repository/ProjectMapper.java index fe7d157..f2f4345 100644 --- a/app-manage/src/main/java/com/enzhico/pos/common/dao/repository/ProjectMapper.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/common/dao/repository/ProjectMapper.java @@ -1,6 +1,6 @@ -package com.enzhico.pos.common.dao.repository; +package com.xncoding.jwt.common.dao.repository; -import com.enzhico.pos.common.dao.entity.Project; +import com.xncoding.jwt.common.dao.entity.Project; import com.baomidou.mybatisplus.mapper.BaseMapper; /** diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/common/dao/repository/ProjectUserMapper.java b/app-manage-api/src/main/java/com/xncoding/jwt/common/dao/repository/ProjectUserMapper.java similarity index 68% rename from app-manage-api/src/main/java/com/enzhico/jwt/common/dao/repository/ProjectUserMapper.java rename to app-manage-api/src/main/java/com/xncoding/jwt/common/dao/repository/ProjectUserMapper.java index acdd5c5..c249717 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/common/dao/repository/ProjectUserMapper.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/common/dao/repository/ProjectUserMapper.java @@ -1,6 +1,6 @@ -package com.enzhico.jwt.common.dao.repository; +package com.xncoding.jwt.common.dao.repository; -import com.enzhico.jwt.common.dao.entity.ProjectUser; +import com.xncoding.jwt.common.dao.entity.ProjectUser; import com.baomidou.mybatisplus.mapper.BaseMapper; /** diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/common/dao/repository/RoleMapper.java b/app-manage-api/src/main/java/com/xncoding/jwt/common/dao/repository/RoleMapper.java similarity index 67% rename from app-manage-api/src/main/java/com/enzhico/jwt/common/dao/repository/RoleMapper.java rename to app-manage-api/src/main/java/com/xncoding/jwt/common/dao/repository/RoleMapper.java index 73ea167..b0e80b7 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/common/dao/repository/RoleMapper.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/common/dao/repository/RoleMapper.java @@ -1,6 +1,6 @@ -package com.enzhico.jwt.common.dao.repository; +package com.xncoding.jwt.common.dao.repository; -import com.enzhico.jwt.common.dao.entity.Role; +import com.xncoding.jwt.common.dao.entity.Role; import com.baomidou.mybatisplus.mapper.BaseMapper; /** diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/common/dao/repository/RolePermissionMapper.java b/app-manage-api/src/main/java/com/xncoding/jwt/common/dao/repository/RolePermissionMapper.java similarity index 68% rename from app-manage-api/src/main/java/com/enzhico/jwt/common/dao/repository/RolePermissionMapper.java rename to app-manage-api/src/main/java/com/xncoding/jwt/common/dao/repository/RolePermissionMapper.java index eed6052..c3e3bb2 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/common/dao/repository/RolePermissionMapper.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/common/dao/repository/RolePermissionMapper.java @@ -1,6 +1,6 @@ -package com.enzhico.jwt.common.dao.repository; +package com.xncoding.jwt.common.dao.repository; -import com.enzhico.jwt.common.dao.entity.RolePermission; +import com.xncoding.jwt.common.dao.entity.RolePermission; import com.baomidou.mybatisplus.mapper.BaseMapper; /** diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/common/util/CommonUtil.java b/app-manage-api/src/main/java/com/xncoding/jwt/common/util/CommonUtil.java similarity index 96% rename from app-manage-api/src/main/java/com/enzhico/jwt/common/util/CommonUtil.java rename to app-manage-api/src/main/java/com/xncoding/jwt/common/util/CommonUtil.java index d440cb4..6b28c11 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/common/util/CommonUtil.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/common/util/CommonUtil.java @@ -1,4 +1,4 @@ -package com.enzhico.jwt.common.util; +package com.xncoding.jwt.common.util; /** * 常用工具类，字符串、数字相关 diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/common/util/DateUtil.java b/app-manage-api/src/main/java/com/xncoding/jwt/common/util/DateUtil.java similarity index 99% rename from app-manage-api/src/main/java/com/enzhico/jwt/common/util/DateUtil.java rename to app-manage-api/src/main/java/com/xncoding/jwt/common/util/DateUtil.java index b5c4285..120de61 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/common/util/DateUtil.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/common/util/DateUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.enzhico.jwt.common.util; +package com.xncoding.jwt.common.util; import java.sql.Timestamp; import java.text.DateFormat; diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/common/util/JWTUtil.java b/app-manage-api/src/main/java/com/xncoding/jwt/common/util/JWTUtil.java similarity index 99% rename from app-manage-api/src/main/java/com/enzhico/jwt/common/util/JWTUtil.java rename to app-manage-api/src/main/java/com/xncoding/jwt/common/util/JWTUtil.java index d854b8c..d2a5ac5 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/common/util/JWTUtil.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/common/util/JWTUtil.java @@ -1,4 +1,4 @@ -package com.enzhico.jwt.common.util; +package com.xncoding.jwt.common.util; import com.auth0.jwt.JWT; import com.auth0.jwt.JWTVerifier; diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/common/util/JsonConverter.java b/app-manage-api/src/main/java/com/xncoding/jwt/common/util/JsonConverter.java similarity index 97% rename from app-manage-api/src/main/java/com/enzhico/jwt/common/util/JsonConverter.java rename to app-manage-api/src/main/java/com/xncoding/jwt/common/util/JsonConverter.java index b401b1b..c0fc254 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/common/util/JsonConverter.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/common/util/JsonConverter.java @@ -1,4 +1,4 @@ -package com.enzhico.jwt.common.util; +package com.xncoding.jwt.common.util; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/config/MybatisPlusConfig.java b/app-manage-api/src/main/java/com/xncoding/jwt/config/MybatisPlusConfig.java similarity index 85% rename from app-manage-api/src/main/java/com/enzhico/jwt/config/MybatisPlusConfig.java rename to app-manage-api/src/main/java/com/xncoding/jwt/config/MybatisPlusConfig.java index 05af447..1c427c1 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/config/MybatisPlusConfig.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/config/MybatisPlusConfig.java @@ -1,8 +1,8 @@ -package com.enzhico.jwt.config; +package com.xncoding.jwt.config; import com.alibaba.druid.pool.DruidDataSource; import com.baomidou.mybatisplus.plugins.PaginationInterceptor; -import com.enzhico.jwt.config.properties.DruidProperties; +import com.xncoding.jwt.config.properties.DruidProperties; import org.mybatis.spring.annotation.MapperScan; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; @@ -20,8 +20,8 @@ import javax.annotation.Resource; @Configuration @EnableTransactionManagement(order = 2) @MapperScan(basePackages = { - "com.enzhico.jwt.common.dao.repository", - "com.enzhico.jwt.dao.repository"}) + "com.xncoding.jwt.common.dao.repository", + "com.xncoding.jwt.dao.repository"}) public class MybatisPlusConfig { @Resource diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/config/NettySocketConfig.java b/app-manage-api/src/main/java/com/xncoding/jwt/config/NettySocketConfig.java similarity index 88% rename from app-manage-api/src/main/java/com/enzhico/jwt/config/NettySocketConfig.java rename to app-manage-api/src/main/java/com/xncoding/jwt/config/NettySocketConfig.java index 53e76c6..3733c6f 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/config/NettySocketConfig.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/config/NettySocketConfig.java @@ -1,15 +1,15 @@ -package com.enzhico.jwt.config; +package com.xncoding.jwt.config; import com.corundumstudio.socketio.AuthorizationListener; import com.corundumstudio.socketio.HandshakeData; import com.corundumstudio.socketio.SocketIOServer; import com.corundumstudio.socketio.annotation.SpringAnnotationScanner; -import com.enzhico.jwt.common.util.JWTUtil; -import com.enzhico.jwt.config.properties.MyProperties; -import com.enzhico.jwt.dao.entity.ManagerInfo; -import com.enzhico.jwt.service.ApiService; -import com.enzhico.jwt.service.ManagerInfoService; -import com.enzhico.jwt.shiro.ShiroKit; +import com.xncoding.jwt.common.util.JWTUtil; +import com.xncoding.jwt.config.properties.MyProperties; +import com.xncoding.jwt.dao.entity.ManagerInfo; +import com.xncoding.jwt.service.ApiService; +import com.xncoding.jwt.service.ManagerInfoService; +import com.xncoding.jwt.shiro.ShiroKit; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Bean; diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/config/ShiroConfig.java b/app-manage-api/src/main/java/com/xncoding/jwt/config/ShiroConfig.java similarity index 98% rename from app-manage-api/src/main/java/com/enzhico/jwt/config/ShiroConfig.java rename to app-manage-api/src/main/java/com/xncoding/jwt/config/ShiroConfig.java index 45327f4..19e7130 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/config/ShiroConfig.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/config/ShiroConfig.java @@ -1,7 +1,7 @@ -package com.enzhico.jwt.config; +package com.xncoding.jwt.config; -import com.enzhico.jwt.shiro.JWTFilter; -import com.enzhico.jwt.shiro.MyShiroRealm; +import com.xncoding.jwt.shiro.JWTFilter; +import com.xncoding.jwt.shiro.MyShiroRealm; import org.apache.shiro.cache.ehcache.EhCacheManager; import org.apache.shiro.mgt.DefaultSessionStorageEvaluator; import org.apache.shiro.mgt.DefaultSubjectDAO; diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/config/Swagger2Config.java b/app-manage-api/src/main/java/com/xncoding/jwt/config/Swagger2Config.java similarity index 94% rename from app-manage-api/src/main/java/com/enzhico/jwt/config/Swagger2Config.java rename to app-manage-api/src/main/java/com/xncoding/jwt/config/Swagger2Config.java index 5ca0d6b..fdd1b50 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/config/Swagger2Config.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/config/Swagger2Config.java @@ -1,4 +1,4 @@ -package com.enzhico.jwt.config; +package com.xncoding.jwt.config; import com.google.common.collect.Sets; import org.springframework.context.annotation.Bean; @@ -33,7 +33,7 @@ public class Swagger2Config { .forCodeGeneration(true) .select() // 指定controller存放的目录路径 - .apis(RequestHandlerSelectors.basePackage("com.enzhico.jwt.api")) + .apis(RequestHandlerSelectors.basePackage("com.xncoding.jwt.api")) // .paths(PathSelectors.ant("/api/v1/*")) .paths(PathSelectors.any()) .build(); diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/config/WebConfig.java b/app-manage-api/src/main/java/com/xncoding/jwt/config/WebConfig.java similarity index 97% rename from app-manage-api/src/main/java/com/enzhico/jwt/config/WebConfig.java rename to app-manage-api/src/main/java/com/xncoding/jwt/config/WebConfig.java index b133c3f..34be079 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/config/WebConfig.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/config/WebConfig.java @@ -1,4 +1,4 @@ -package com.enzhico.jwt.config; +package com.xncoding.jwt.config; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.support.http.StatViewServlet; @@ -64,7 +64,7 @@ public class WebConfig { @Bean public JdkRegexpMethodPointcut druidStatPointcut() { JdkRegexpMethodPointcut druidStatPointcut = new JdkRegexpMethodPointcut(); - String patterns = "com.enzhico.jwt.*.service.*"; + String patterns = "com.xncoding.jwt.*.service.*"; //可以set多个 druidStatPointcut.setPatterns(patterns); return druidStatPointcut; diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/config/properties/DruidProperties.java b/app-manage-api/src/main/java/com/xncoding/jwt/config/properties/DruidProperties.java similarity index 99% rename from app-manage-api/src/main/java/com/enzhico/jwt/config/properties/DruidProperties.java rename to app-manage-api/src/main/java/com/xncoding/jwt/config/properties/DruidProperties.java index 5657248..94670af 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/config/properties/DruidProperties.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/config/properties/DruidProperties.java @@ -1,4 +1,4 @@ -package com.enzhico.jwt.config.properties; +package com.xncoding.jwt.config.properties; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.util.JdbcConstants; diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/config/properties/MyProperties.java b/app-manage-api/src/main/java/com/xncoding/jwt/config/properties/MyProperties.java similarity index 93% rename from app-manage-api/src/main/java/com/enzhico/jwt/config/properties/MyProperties.java rename to app-manage-api/src/main/java/com/xncoding/jwt/config/properties/MyProperties.java index 2c07950..68bda9d 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/config/properties/MyProperties.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/config/properties/MyProperties.java @@ -1,4 +1,4 @@ -package com.enzhico.jwt.config.properties; +package com.xncoding.jwt.config.properties; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; @@ -11,7 +11,7 @@ import org.springframework.stereotype.Component; * @since 2018/01/06 21:09 */ @Component -@ConfigurationProperties(prefix = "enzhico") +@ConfigurationProperties(prefix = "xncoding") public class MyProperties { /** * socket端口 diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/dao/entity/AppInfo.java b/app-manage-api/src/main/java/com/xncoding/jwt/dao/entity/AppInfo.java similarity index 92% rename from app-manage-api/src/main/java/com/enzhico/jwt/dao/entity/AppInfo.java rename to app-manage-api/src/main/java/com/xncoding/jwt/dao/entity/AppInfo.java index de7ce4d..9348ce8 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/dao/entity/AppInfo.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/dao/entity/AppInfo.java @@ -1,7 +1,7 @@ -package com.enzhico.jwt.dao.entity; +package com.xncoding.jwt.dao.entity; -import com.enzhico.jwt.common.constant.DictMap; -import com.enzhico.jwt.common.dao.entity.App; +import com.xncoding.jwt.common.constant.DictMap; +import com.xncoding.jwt.common.dao.entity.App; import java.io.Serializable; diff --git a/app-manage/src/main/java/com/enzhico/pos/dao/entity/AppVersionInfo.java b/app-manage-api/src/main/java/com/xncoding/jwt/dao/entity/AppVersionInfo.java similarity index 94% rename from app-manage/src/main/java/com/enzhico/pos/dao/entity/AppVersionInfo.java rename to app-manage-api/src/main/java/com/xncoding/jwt/dao/entity/AppVersionInfo.java index f11a984..a68d984 100644 --- a/app-manage/src/main/java/com/enzhico/pos/dao/entity/AppVersionInfo.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/dao/entity/AppVersionInfo.java @@ -1,4 +1,4 @@ -package com.enzhico.pos.dao.entity; +package com.xncoding.jwt.dao.entity; import java.util.List; diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/dao/entity/FileInfo.java b/app-manage-api/src/main/java/com/xncoding/jwt/dao/entity/FileInfo.java similarity index 91% rename from app-manage-api/src/main/java/com/enzhico/jwt/dao/entity/FileInfo.java rename to app-manage-api/src/main/java/com/xncoding/jwt/dao/entity/FileInfo.java index feffe2e..138df59 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/dao/entity/FileInfo.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/dao/entity/FileInfo.java @@ -1,4 +1,4 @@ -package com.enzhico.jwt.dao.entity; +package com.xncoding.jwt.dao.entity; /** * FileInfo diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/dao/entity/ManagerInfo.java b/app-manage-api/src/main/java/com/xncoding/jwt/dao/entity/ManagerInfo.java similarity index 93% rename from app-manage-api/src/main/java/com/enzhico/jwt/dao/entity/ManagerInfo.java rename to app-manage-api/src/main/java/com/xncoding/jwt/dao/entity/ManagerInfo.java index afde1eb..74951d9 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/dao/entity/ManagerInfo.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/dao/entity/ManagerInfo.java @@ -1,7 +1,7 @@ -package com.enzhico.jwt.dao.entity; +package com.xncoding.jwt.dao.entity; -import com.enzhico.jwt.common.constant.DictMap; -import com.enzhico.jwt.common.dao.entity.Manager; +import com.xncoding.jwt.common.constant.DictMap; +import com.xncoding.jwt.common.dao.entity.Manager; import java.io.Serializable; import java.util.List; diff --git a/app-manage/src/main/java/com/enzhico/pos/dao/entity/MonitorInfo.java b/app-manage-api/src/main/java/com/xncoding/jwt/dao/entity/MonitorInfo.java similarity index 84% rename from app-manage/src/main/java/com/enzhico/pos/dao/entity/MonitorInfo.java rename to app-manage-api/src/main/java/com/xncoding/jwt/dao/entity/MonitorInfo.java index 5bebe6a..33d8de6 100644 --- a/app-manage/src/main/java/com/enzhico/pos/dao/entity/MonitorInfo.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/dao/entity/MonitorInfo.java @@ -1,8 +1,8 @@ -package com.enzhico.pos.dao.entity; +package com.xncoding.jwt.dao.entity; -import com.enzhico.pos.common.constant.DictMap; -import com.enzhico.pos.common.dao.entity.Pos; -import com.enzhico.pos.common.dao.entity.PosMonitor; +import com.xncoding.jwt.common.constant.DictMap; +import com.xncoding.jwt.common.dao.entity.Pos; +import com.xncoding.jwt.common.dao.entity.PosMonitor; import java.io.Serializable; diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/dao/entity/PosGroupInfo.java b/app-manage-api/src/main/java/com/xncoding/jwt/dao/entity/PosGroupInfo.java similarity index 83% rename from app-manage-api/src/main/java/com/enzhico/jwt/dao/entity/PosGroupInfo.java rename to app-manage-api/src/main/java/com/xncoding/jwt/dao/entity/PosGroupInfo.java index 40e284e..0ef0440 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/dao/entity/PosGroupInfo.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/dao/entity/PosGroupInfo.java @@ -1,7 +1,7 @@ -package com.enzhico.jwt.dao.entity; +package com.xncoding.jwt.dao.entity; -import com.enzhico.jwt.common.constant.DictMap; -import com.enzhico.jwt.common.dao.entity.Pos; +import com.xncoding.jwt.common.constant.DictMap; +import com.xncoding.jwt.common.dao.entity.Pos; import java.io.Serializable; diff --git a/app-manage/src/main/java/com/enzhico/pos/dao/entity/PosInfo.java b/app-manage-api/src/main/java/com/xncoding/jwt/dao/entity/PosInfo.java similarity index 81% rename from app-manage/src/main/java/com/enzhico/pos/dao/entity/PosInfo.java rename to app-manage-api/src/main/java/com/xncoding/jwt/dao/entity/PosInfo.java index abeb5c4..bff4c5b 100644 --- a/app-manage/src/main/java/com/enzhico/pos/dao/entity/PosInfo.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/dao/entity/PosInfo.java @@ -1,8 +1,8 @@ -package com.enzhico.pos.dao.entity; +package com.xncoding.jwt.dao.entity; -import com.enzhico.pos.common.constant.DictMap; -import com.enzhico.pos.common.dao.entity.Manager; -import com.enzhico.pos.common.dao.entity.Pos; +import com.xncoding.jwt.common.constant.DictMap; +import com.xncoding.jwt.common.dao.entity.Manager; +import com.xncoding.jwt.common.dao.entity.Pos; import java.io.Serializable; import java.util.List; diff --git a/app-manage/src/main/java/com/enzhico/pos/dao/entity/PublishParam.java b/app-manage-api/src/main/java/com/xncoding/jwt/dao/entity/PublishParam.java similarity index 97% rename from app-manage/src/main/java/com/enzhico/pos/dao/entity/PublishParam.java rename to app-manage-api/src/main/java/com/xncoding/jwt/dao/entity/PublishParam.java index f1dfb5e..758f2ee 100644 --- a/app-manage/src/main/java/com/enzhico/pos/dao/entity/PublishParam.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/dao/entity/PublishParam.java @@ -1,4 +1,4 @@ -package com.enzhico.pos.dao.entity; +package com.xncoding.jwt.dao.entity; import org.springframework.web.multipart.MultipartFile; diff --git a/app-manage/src/main/java/com/enzhico/pos/dao/entity/SearchApp.java b/app-manage-api/src/main/java/com/xncoding/jwt/dao/entity/SearchApp.java similarity index 98% rename from app-manage/src/main/java/com/enzhico/pos/dao/entity/SearchApp.java rename to app-manage-api/src/main/java/com/xncoding/jwt/dao/entity/SearchApp.java index de4cdb2..97e9656 100644 --- a/app-manage/src/main/java/com/enzhico/pos/dao/entity/SearchApp.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/dao/entity/SearchApp.java @@ -1,4 +1,4 @@ -package com.enzhico.pos.dao.entity; +package com.xncoding.jwt.dao.entity; import java.util.Date; import java.util.List; diff --git a/app-manage/src/main/java/com/enzhico/pos/dao/entity/SearchMonitor.java b/app-manage-api/src/main/java/com/xncoding/jwt/dao/entity/SearchMonitor.java similarity index 97% rename from app-manage/src/main/java/com/enzhico/pos/dao/entity/SearchMonitor.java rename to app-manage-api/src/main/java/com/xncoding/jwt/dao/entity/SearchMonitor.java index 8e46b65..6de2574 100644 --- a/app-manage/src/main/java/com/enzhico/pos/dao/entity/SearchMonitor.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/dao/entity/SearchMonitor.java @@ -1,4 +1,4 @@ -package com.enzhico.pos.dao.entity; +package com.xncoding.jwt.dao.entity; import java.util.List; diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/dao/entity/SearchPos.java b/app-manage-api/src/main/java/com/xncoding/jwt/dao/entity/SearchPos.java similarity index 97% rename from app-manage-api/src/main/java/com/enzhico/jwt/dao/entity/SearchPos.java rename to app-manage-api/src/main/java/com/xncoding/jwt/dao/entity/SearchPos.java index 18d1fd0..8df99c0 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/dao/entity/SearchPos.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/dao/entity/SearchPos.java @@ -1,4 +1,4 @@ -package com.enzhico.jwt.dao.entity; +package com.xncoding.jwt.dao.entity; import java.util.Date; import java.util.List; diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/dao/entity/SearchUser.java b/app-manage-api/src/main/java/com/xncoding/jwt/dao/entity/SearchUser.java similarity index 97% rename from app-manage-api/src/main/java/com/enzhico/jwt/dao/entity/SearchUser.java rename to app-manage-api/src/main/java/com/xncoding/jwt/dao/entity/SearchUser.java index ead9c58..862e2c7 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/dao/entity/SearchUser.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/dao/entity/SearchUser.java @@ -1,4 +1,4 @@ -package com.enzhico.jwt.dao.entity; +package com.xncoding.jwt.dao.entity; import java.util.Date; diff --git a/app-manage/src/main/java/com/enzhico/pos/dao/entity/SysRole.java b/app-manage-api/src/main/java/com/xncoding/jwt/dao/entity/SysRole.java similarity index 78% rename from app-manage/src/main/java/com/enzhico/pos/dao/entity/SysRole.java rename to app-manage-api/src/main/java/com/xncoding/jwt/dao/entity/SysRole.java index 0428d28..a3205a6 100644 --- a/app-manage/src/main/java/com/enzhico/pos/dao/entity/SysRole.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/dao/entity/SysRole.java @@ -1,7 +1,7 @@ -package com.enzhico.pos.dao.entity; +package com.xncoding.jwt.dao.entity; -import com.enzhico.pos.common.dao.entity.Permission; -import com.enzhico.pos.common.dao.entity.Role; +import com.xncoding.jwt.common.dao.entity.Permission; +import com.xncoding.jwt.common.dao.entity.Role; import java.io.Serializable; import java.util.List; diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/dao/repository/ApiDao.java b/app-manage-api/src/main/java/com/xncoding/jwt/dao/repository/ApiDao.java similarity index 74% rename from app-manage-api/src/main/java/com/enzhico/jwt/dao/repository/ApiDao.java rename to app-manage-api/src/main/java/com/xncoding/jwt/dao/repository/ApiDao.java index 8e5f44b..77ec88b 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/dao/repository/ApiDao.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/dao/repository/ApiDao.java @@ -1,7 +1,7 @@ -package com.enzhico.jwt.dao.repository; +package com.xncoding.jwt.dao.repository; -import com.enzhico.jwt.api.model.VersionParam; -import com.enzhico.jwt.api.model.VersionResult; +import com.xncoding.jwt.api.model.VersionParam; +import com.xncoding.jwt.api.model.VersionResult; import org.apache.ibatis.annotations.Param; /** diff --git a/app-manage/src/main/java/com/enzhico/pos/dao/repository/ManagerInfoDao.java b/app-manage-api/src/main/java/com/xncoding/jwt/dao/repository/ManagerInfoDao.java similarity index 64% rename from app-manage/src/main/java/com/enzhico/pos/dao/repository/ManagerInfoDao.java rename to app-manage-api/src/main/java/com/xncoding/jwt/dao/repository/ManagerInfoDao.java index 50093ea..e175748 100644 --- a/app-manage/src/main/java/com/enzhico/pos/dao/repository/ManagerInfoDao.java +++ b/app-manage-api/src/main/java/com/xncoding/jwt/dao/repository/ManagerInfoDao.java @@ -1,9 +1,9 @@ -package com.enzhico.pos.dao.repository; +package com.xncoding.jwt.dao.repository; import com.baomidou.mybatisplus.plugins.pagination.Pagination; -import com.enzhico.pos.common.dao.repository.ManagerMapper; -import com.enzhico.pos.dao.entity.ManagerInfo; -import com.enzhico.pos.dao.entity.SearchUser; +import com.xncoding.jwt.common.dao.repository.ManagerMapper; +import com.xncoding.jwt.dao.entity.ManagerInfo; +import com.xncoding.jwt.dao.entity.SearchUser; import java.util.List; import java.util.Map; diff --git a/app-manage-api/src/main/java/com/enzhico/jwt/dao/repository/mapping/ApiDao.xml b/app-manage-api/src/main/java/com/xncoding/jwt/dao/repository/mapping/ApiDao.xml similarity index 94% rename from app-manage-api/src/main/java/com/enzhico/jwt/dao/repository/mapping/ApiDao.xml rename to app-manage-api/src/main/java/com/xncoding/jwt/dao/repository/mapping/ApiDao.xml index 6a58aea..e2debca 100644 --- a/app-manage-api/src/main/java/com/enzhico/jwt/dao/repository/mapping/ApiDao.xml +++ b/app-manage-api/src/main/java/com/xncoding/jwt/dao/repository/mapping/ApiDao.xml @@ -1,6 +1,6 @@ - + SELECT DISTINCT A.id AS id, diff --git a/app-manage/src/main/java/com/enzhico/pos/dao/repository/mapping/SysRoleDao.xml b/app-manage/src/main/java/com/xncoding/pos/dao/repository/mapping/SysRoleDao.xml similarity index 67% rename from app-manage/src/main/java/com/enzhico/pos/dao/repository/mapping/SysRoleDao.xml rename to app-manage/src/main/java/com/xncoding/pos/dao/repository/mapping/SysRoleDao.xml index a00ec74..21fe985 100644 --- a/app-manage/src/main/java/com/enzhico/pos/dao/repository/mapping/SysRoleDao.xml +++ b/app-manage/src/main/java/com/xncoding/pos/dao/repository/mapping/SysRoleDao.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/app-manage/src/main/java/com/enzhico/pos/exception/ForbiddenUserException.java b/app-manage/src/main/java/com/xncoding/pos/exception/ForbiddenUserException.java similarity index 85% rename from app-manage/src/main/java/com/enzhico/pos/exception/ForbiddenUserException.java rename to app-manage/src/main/java/com/xncoding/pos/exception/ForbiddenUserException.java index 77a06c8..654e795 100644 --- a/app-manage/src/main/java/com/enzhico/pos/exception/ForbiddenUserException.java +++ b/app-manage/src/main/java/com/xncoding/pos/exception/ForbiddenUserException.java @@ -1,4 +1,4 @@ -package com.enzhico.pos.exception; +package com.xncoding.pos.exception; import org.apache.shiro.authc.AuthenticationException; diff --git a/app-manage/src/main/java/com/enzhico/pos/http/CustomResponseErrorHandler.java b/app-manage/src/main/java/com/xncoding/pos/http/CustomResponseErrorHandler.java similarity index 93% rename from app-manage/src/main/java/com/enzhico/pos/http/CustomResponseErrorHandler.java rename to app-manage/src/main/java/com/xncoding/pos/http/CustomResponseErrorHandler.java index b644e95..ddb1277 100644 --- a/app-manage/src/main/java/com/enzhico/pos/http/CustomResponseErrorHandler.java +++ b/app-manage/src/main/java/com/xncoding/pos/http/CustomResponseErrorHandler.java @@ -1,4 +1,4 @@ -package com.enzhico.pos.http; +package com.xncoding.pos.http; import org.springframework.http.client.ClientHttpResponse; import org.springframework.web.client.DefaultResponseErrorHandler; diff --git a/app-manage/src/main/java/com/enzhico/pos/http/HttpBaseResponse.java b/app-manage/src/main/java/com/xncoding/pos/http/HttpBaseResponse.java similarity index 96% rename from app-manage/src/main/java/com/enzhico/pos/http/HttpBaseResponse.java rename to app-manage/src/main/java/com/xncoding/pos/http/HttpBaseResponse.java index 87e49f6..a2a2444 100644 --- a/app-manage/src/main/java/com/enzhico/pos/http/HttpBaseResponse.java +++ b/app-manage/src/main/java/com/xncoding/pos/http/HttpBaseResponse.java @@ -1,4 +1,4 @@ -package com.enzhico.pos.http; +package com.xncoding.pos.http; /** * API接口的基础返回类 diff --git a/app-manage/src/main/java/com/enzhico/pos/http/LoginParam.java b/app-manage/src/main/java/com/xncoding/pos/http/LoginParam.java similarity index 96% rename from app-manage/src/main/java/com/enzhico/pos/http/LoginParam.java rename to app-manage/src/main/java/com/xncoding/pos/http/LoginParam.java index 344f2d8..68013de 100644 --- a/app-manage/src/main/java/com/enzhico/pos/http/LoginParam.java +++ b/app-manage/src/main/java/com/xncoding/pos/http/LoginParam.java @@ -1,4 +1,4 @@ -package com.enzhico.pos.http; +package com.xncoding.pos.http; /** * 登录认证接口参数 diff --git a/app-manage/src/main/java/com/enzhico/pos/http/TokenRequestInterceptor.java b/app-manage/src/main/java/com/xncoding/pos/http/TokenRequestInterceptor.java similarity index 96% rename from app-manage/src/main/java/com/enzhico/pos/http/TokenRequestInterceptor.java rename to app-manage/src/main/java/com/xncoding/pos/http/TokenRequestInterceptor.java index b681482..33b046f 100644 --- a/app-manage/src/main/java/com/enzhico/pos/http/TokenRequestInterceptor.java +++ b/app-manage/src/main/java/com/xncoding/pos/http/TokenRequestInterceptor.java @@ -1,4 +1,4 @@ -package com.enzhico.pos.http; +package com.xncoding.pos.http; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpRequest; diff --git a/app-manage/src/main/java/com/enzhico/pos/http/UnbindParam.java b/app-manage/src/main/java/com/xncoding/pos/http/UnbindParam.java similarity index 94% rename from app-manage/src/main/java/com/enzhico/pos/http/UnbindParam.java rename to app-manage/src/main/java/com/xncoding/pos/http/UnbindParam.java index 3ef36cd..58737d3 100644 --- a/app-manage/src/main/java/com/enzhico/pos/http/UnbindParam.java +++ b/app-manage/src/main/java/com/xncoding/pos/http/UnbindParam.java @@ -1,4 +1,4 @@ -package com.enzhico.pos.http; +package com.xncoding.pos.http; /** * 解绑通知参数 diff --git a/app-manage/src/main/java/com/enzhico/pos/jobs/HeartbeatJob.java b/app-manage/src/main/java/com/xncoding/pos/jobs/HeartbeatJob.java similarity index 94% rename from app-manage/src/main/java/com/enzhico/pos/jobs/HeartbeatJob.java rename to app-manage/src/main/java/com/xncoding/pos/jobs/HeartbeatJob.java index 0714234..ddf71c8 100644 --- a/app-manage/src/main/java/com/enzhico/pos/jobs/HeartbeatJob.java +++ b/app-manage/src/main/java/com/xncoding/pos/jobs/HeartbeatJob.java @@ -1,6 +1,6 @@ -package com.enzhico.pos.jobs; +package com.xncoding.pos.jobs; -import com.enzhico.pos.service.MonitorService; +import com.xncoding.pos.service.MonitorService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.scheduling.annotation.Scheduled; diff --git a/app-manage/src/main/java/com/enzhico/pos/model/BaseResponse.java b/app-manage/src/main/java/com/xncoding/pos/model/BaseResponse.java similarity index 97% rename from app-manage/src/main/java/com/enzhico/pos/model/BaseResponse.java rename to app-manage/src/main/java/com/xncoding/pos/model/BaseResponse.java index f3335a7..882e0c7 100644 --- a/app-manage/src/main/java/com/enzhico/pos/model/BaseResponse.java +++ b/app-manage/src/main/java/com/xncoding/pos/model/BaseResponse.java @@ -1,4 +1,4 @@ -package com.enzhico.pos.model; +package com.xncoding.pos.model; /** * Controller的基础返回类 diff --git a/app-manage/src/main/java/com/enzhico/pos/service/AppService.java b/app-manage/src/main/java/com/xncoding/pos/service/AppService.java similarity index 93% rename from app-manage/src/main/java/com/enzhico/pos/service/AppService.java rename to app-manage/src/main/java/com/xncoding/pos/service/AppService.java index 128d4c6..c0d054a 100644 --- a/app-manage/src/main/java/com/enzhico/pos/service/AppService.java +++ b/app-manage/src/main/java/com/xncoding/pos/service/AppService.java @@ -1,15 +1,15 @@ -package com.enzhico.pos.service; +package com.xncoding.pos.service; import com.baomidou.mybatisplus.mapper.Condition; import com.baomidou.mybatisplus.plugins.Page; -import com.enzhico.pos.common.dao.entity.*; -import com.enzhico.pos.common.dao.repository.AppPublishMapper; -import com.enzhico.pos.common.dao.repository.PosMapper; -import com.enzhico.pos.common.dao.repository.ProjectMapper; -import com.enzhico.pos.common.util.CommonUtil; -import com.enzhico.pos.config.properties.MyProperties; -import com.enzhico.pos.dao.entity.*; -import com.enzhico.pos.dao.repository.AppInfoDao; +import com.xncoding.pos.common.dao.entity.*; +import com.xncoding.pos.common.dao.repository.AppPublishMapper; +import com.xncoding.pos.common.dao.repository.PosMapper; +import com.xncoding.pos.common.dao.repository.ProjectMapper; +import com.xncoding.pos.common.util.CommonUtil; +import com.xncoding.pos.config.properties.MyProperties; +import com.xncoding.pos.dao.entity.*; +import com.xncoding.pos.dao.repository.AppInfoDao; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; diff --git a/app-manage/src/main/java/com/enzhico/pos/service/DeviceService.java b/app-manage/src/main/java/com/xncoding/pos/service/DeviceService.java similarity index 80% rename from app-manage/src/main/java/com/enzhico/pos/service/DeviceService.java rename to app-manage/src/main/java/com/xncoding/pos/service/DeviceService.java index 3585069..4e0699f 100644 --- a/app-manage/src/main/java/com/enzhico/pos/service/DeviceService.java +++ b/app-manage/src/main/java/com/xncoding/pos/service/DeviceService.java @@ -1,23 +1,23 @@ -package com.enzhico.pos.service; +package com.xncoding.pos.service; import com.baomidou.mybatisplus.mapper.Condition; import com.baomidou.mybatisplus.plugins.Page; -import com.enzhico.pos.async.AsyncException; -import com.enzhico.pos.async.AsyncTask; -import com.enzhico.pos.common.dao.entity.Pos; -import com.enzhico.pos.common.dao.entity.PosHistory; -import com.enzhico.pos.common.dao.entity.Project; -import com.enzhico.pos.common.dao.repository.PosHistoryMapper; -import com.enzhico.pos.common.dao.repository.ProjectMapper; -import com.enzhico.pos.config.properties.MyProperties; -import com.enzhico.pos.dao.entity.ManagerInfo; -import com.enzhico.pos.dao.entity.PosInfo; -import com.enzhico.pos.dao.entity.SearchPos; -import com.enzhico.pos.dao.repository.PosInfoDao; -import com.enzhico.pos.http.HttpBaseResponse; -import com.enzhico.pos.http.LoginParam; -import com.enzhico.pos.http.TokenRequestInterceptor; -import com.enzhico.pos.http.UnbindParam; +import com.xncoding.pos.async.AsyncException; +import com.xncoding.pos.async.AsyncTask; +import com.xncoding.pos.common.dao.entity.Pos; +import com.xncoding.pos.common.dao.entity.PosHistory; +import com.xncoding.pos.common.dao.entity.Project; +import com.xncoding.pos.common.dao.repository.PosHistoryMapper; +import com.xncoding.pos.common.dao.repository.ProjectMapper; +import com.xncoding.pos.config.properties.MyProperties; +import com.xncoding.pos.dao.entity.ManagerInfo; +import com.xncoding.pos.dao.entity.PosInfo; +import com.xncoding.pos.dao.entity.SearchPos; +import com.xncoding.pos.dao.repository.PosInfoDao; +import com.xncoding.pos.http.HttpBaseResponse; +import com.xncoding.pos.http.LoginParam; +import com.xncoding.pos.http.TokenRequestInterceptor; +import com.xncoding.pos.http.UnbindParam; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.web.client.RestTemplateBuilder; diff --git a/app-manage/src/main/java/com/enzhico/pos/service/ManagerInfoService.java b/app-manage/src/main/java/com/xncoding/pos/service/ManagerInfoService.java similarity index 90% rename from app-manage/src/main/java/com/enzhico/pos/service/ManagerInfoService.java rename to app-manage/src/main/java/com/xncoding/pos/service/ManagerInfoService.java index 6238cdf..7ccf388 100644 --- a/app-manage/src/main/java/com/enzhico/pos/service/ManagerInfoService.java +++ b/app-manage/src/main/java/com/xncoding/pos/service/ManagerInfoService.java @@ -1,17 +1,17 @@ -package com.enzhico.pos.service; +package com.xncoding.pos.service; import com.baomidou.mybatisplus.mapper.Condition; import com.baomidou.mybatisplus.plugins.Page; -import com.enzhico.pos.common.dao.entity.Manager; -import com.enzhico.pos.common.dao.entity.Project; -import com.enzhico.pos.common.dao.entity.ProjectUser; -import com.enzhico.pos.common.dao.repository.ProjectMapper; -import com.enzhico.pos.common.dao.repository.ProjectUserMapper; -import com.enzhico.pos.dao.entity.ManagerInfo; -import com.enzhico.pos.dao.entity.SearchUser; -import com.enzhico.pos.dao.repository.ManagerInfoDao; -import com.enzhico.pos.exception.ForbiddenUserException; -import com.enzhico.pos.shiro.ShiroKit; +import com.xncoding.pos.common.dao.entity.Manager; +import com.xncoding.pos.common.dao.entity.Project; +import com.xncoding.pos.common.dao.entity.ProjectUser; +import com.xncoding.pos.common.dao.repository.ProjectMapper; +import com.xncoding.pos.common.dao.repository.ProjectUserMapper; +import com.xncoding.pos.dao.entity.ManagerInfo; +import com.xncoding.pos.dao.entity.SearchUser; +import com.xncoding.pos.dao.repository.ManagerInfoDao; +import com.xncoding.pos.exception.ForbiddenUserException; +import com.xncoding.pos.shiro.ShiroKit; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authc.UnknownAccountException; import org.apache.shiro.crypto.hash.SimpleHash; diff --git a/app-manage/src/main/java/com/enzhico/pos/service/MonitorService.java b/app-manage/src/main/java/com/xncoding/pos/service/MonitorService.java similarity index 87% rename from app-manage/src/main/java/com/enzhico/pos/service/MonitorService.java rename to app-manage/src/main/java/com/xncoding/pos/service/MonitorService.java index 3a3c46d..3c250e0 100644 --- a/app-manage/src/main/java/com/enzhico/pos/service/MonitorService.java +++ b/app-manage/src/main/java/com/xncoding/pos/service/MonitorService.java @@ -1,13 +1,13 @@ -package com.enzhico.pos.service; +package com.xncoding.pos.service; import com.baomidou.mybatisplus.mapper.Condition; import com.baomidou.mybatisplus.plugins.Page; -import com.enzhico.pos.common.dao.entity.Project; -import com.enzhico.pos.common.dao.repository.ProjectMapper; -import com.enzhico.pos.common.util.DateUtil; -import com.enzhico.pos.config.properties.MyProperties; -import com.enzhico.pos.dao.entity.*; -import com.enzhico.pos.dao.repository.PosInfoDao; +import com.xncoding.pos.common.dao.entity.Project; +import com.xncoding.pos.common.dao.repository.ProjectMapper; +import com.xncoding.pos.common.util.DateUtil; +import com.xncoding.pos.config.properties.MyProperties; +import com.xncoding.pos.dao.entity.*; +import com.xncoding.pos.dao.repository.PosInfoDao; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/app-manage/src/main/java/com/enzhico/pos/service/ProjectService.java b/app-manage/src/main/java/com/xncoding/pos/service/ProjectService.java similarity index 82% rename from app-manage/src/main/java/com/enzhico/pos/service/ProjectService.java rename to app-manage/src/main/java/com/xncoding/pos/service/ProjectService.java index 4b656b8..f7c45eb 100644 --- a/app-manage/src/main/java/com/enzhico/pos/service/ProjectService.java +++ b/app-manage/src/main/java/com/xncoding/pos/service/ProjectService.java @@ -1,14 +1,14 @@ -package com.enzhico.pos.service; +package com.xncoding.pos.service; import com.baomidou.mybatisplus.mapper.Condition; -import com.enzhico.pos.common.dao.entity.App; -import com.enzhico.pos.common.dao.entity.Pos; -import com.enzhico.pos.common.dao.entity.Project; -import com.enzhico.pos.common.dao.entity.ProjectUser; -import com.enzhico.pos.common.dao.repository.AppMapper; -import com.enzhico.pos.common.dao.repository.PosMapper; -import com.enzhico.pos.common.dao.repository.ProjectMapper; -import com.enzhico.pos.common.dao.repository.ProjectUserMapper; +import com.xncoding.pos.common.dao.entity.App; +import com.xncoding.pos.common.dao.entity.Pos; +import com.xncoding.pos.common.dao.entity.Project; +import com.xncoding.pos.common.dao.entity.ProjectUser; +import com.xncoding.pos.common.dao.repository.AppMapper; +import com.xncoding.pos.common.dao.repository.PosMapper; +import com.xncoding.pos.common.dao.repository.ProjectMapper; +import com.xncoding.pos.common.dao.repository.ProjectUserMapper; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/app-manage/src/main/java/com/enzhico/pos/shiro/CaptchaUsernamePasswordToken.java b/app-manage/src/main/java/com/xncoding/pos/shiro/CaptchaUsernamePasswordToken.java similarity index 95% rename from app-manage/src/main/java/com/enzhico/pos/shiro/CaptchaUsernamePasswordToken.java rename to app-manage/src/main/java/com/xncoding/pos/shiro/CaptchaUsernamePasswordToken.java index 39922a7..0902834 100644 --- a/app-manage/src/main/java/com/enzhico/pos/shiro/CaptchaUsernamePasswordToken.java +++ b/app-manage/src/main/java/com/xncoding/pos/shiro/CaptchaUsernamePasswordToken.java @@ -1,4 +1,4 @@ -package com.enzhico.pos.shiro; +package com.xncoding.pos.shiro; import org.apache.shiro.authc.UsernamePasswordToken; diff --git a/app-manage/src/main/java/com/enzhico/pos/shiro/IncorrectCaptchaException.java b/app-manage/src/main/java/com/xncoding/pos/shiro/IncorrectCaptchaException.java similarity index 94% rename from app-manage/src/main/java/com/enzhico/pos/shiro/IncorrectCaptchaException.java rename to app-manage/src/main/java/com/xncoding/pos/shiro/IncorrectCaptchaException.java index 568d9ec..4c43e72 100644 --- a/app-manage/src/main/java/com/enzhico/pos/shiro/IncorrectCaptchaException.java +++ b/app-manage/src/main/java/com/xncoding/pos/shiro/IncorrectCaptchaException.java @@ -1,4 +1,4 @@ -package com.enzhico.pos.shiro; +package com.xncoding.pos.shiro; import org.apache.shiro.authc.AuthenticationException; diff --git a/app-manage/src/main/java/com/enzhico/pos/shiro/KaptchaFilter.java b/app-manage/src/main/java/com/xncoding/pos/shiro/KaptchaFilter.java similarity index 97% rename from app-manage/src/main/java/com/enzhico/pos/shiro/KaptchaFilter.java rename to app-manage/src/main/java/com/xncoding/pos/shiro/KaptchaFilter.java index efe9144..5862c6f 100644 --- a/app-manage/src/main/java/com/enzhico/pos/shiro/KaptchaFilter.java +++ b/app-manage/src/main/java/com/xncoding/pos/shiro/KaptchaFilter.java @@ -1,6 +1,6 @@ -package com.enzhico.pos.shiro; +package com.xncoding.pos.shiro; -import com.enzhico.pos.dao.entity.ManagerInfo; +import com.xncoding.pos.dao.entity.ManagerInfo; import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.authc.AuthenticationToken; import org.apache.shiro.subject.Subject; diff --git a/app-manage/src/main/java/com/enzhico/pos/shiro/MyExceptionResolver.java b/app-manage/src/main/java/com/xncoding/pos/shiro/MyExceptionResolver.java similarity index 96% rename from app-manage/src/main/java/com/enzhico/pos/shiro/MyExceptionResolver.java rename to app-manage/src/main/java/com/xncoding/pos/shiro/MyExceptionResolver.java index ddb728b..de93d5f 100644 --- a/app-manage/src/main/java/com/enzhico/pos/shiro/MyExceptionResolver.java +++ b/app-manage/src/main/java/com/xncoding/pos/shiro/MyExceptionResolver.java @@ -1,4 +1,4 @@ -package com.enzhico.pos.shiro; +package com.xncoding.pos.shiro; import org.apache.shiro.authz.UnauthorizedException; import org.springframework.web.servlet.HandlerExceptionResolver; diff --git a/app-manage/src/main/java/com/enzhico/pos/shiro/MyShiroRealm.java b/app-manage/src/main/java/com/xncoding/pos/shiro/MyShiroRealm.java similarity index 95% rename from app-manage/src/main/java/com/enzhico/pos/shiro/MyShiroRealm.java rename to app-manage/src/main/java/com/xncoding/pos/shiro/MyShiroRealm.java index e1711a6..d3f505a 100644 --- a/app-manage/src/main/java/com/enzhico/pos/shiro/MyShiroRealm.java +++ b/app-manage/src/main/java/com/xncoding/pos/shiro/MyShiroRealm.java @@ -1,9 +1,9 @@ -package com.enzhico.pos.shiro; +package com.xncoding.pos.shiro; -import com.enzhico.pos.common.dao.entity.Permission; -import com.enzhico.pos.service.ManagerInfoService; -import com.enzhico.pos.dao.entity.ManagerInfo; -import com.enzhico.pos.dao.entity.SysRole; +import com.xncoding.pos.common.dao.entity.Permission; +import com.xncoding.pos.service.ManagerInfoService; +import com.xncoding.pos.dao.entity.ManagerInfo; +import com.xncoding.pos.dao.entity.SysRole; import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.authc.AuthenticationInfo; import org.apache.shiro.authc.AuthenticationToken; diff --git a/app-manage/src/main/java/com/enzhico/pos/shiro/RoleFilter.java b/app-manage/src/main/java/com/xncoding/pos/shiro/RoleFilter.java similarity index 96% rename from app-manage/src/main/java/com/enzhico/pos/shiro/RoleFilter.java rename to app-manage/src/main/java/com/xncoding/pos/shiro/RoleFilter.java index b23983b..9dbda1e 100644 --- a/app-manage/src/main/java/com/enzhico/pos/shiro/RoleFilter.java +++ b/app-manage/src/main/java/com/xncoding/pos/shiro/RoleFilter.java @@ -1,4 +1,4 @@ -package com.enzhico.pos.shiro; +package com.xncoding.pos.shiro; import org.apache.shiro.subject.Subject; import org.apache.shiro.web.filter.authz.RolesAuthorizationFilter; diff --git a/app-manage/src/main/java/com/enzhico/pos/shiro/ShiroKit.java b/app-manage/src/main/java/com/xncoding/pos/shiro/ShiroKit.java similarity index 98% rename from app-manage/src/main/java/com/enzhico/pos/shiro/ShiroKit.java rename to app-manage/src/main/java/com/xncoding/pos/shiro/ShiroKit.java index 310d732..9cfdd2b 100644 --- a/app-manage/src/main/java/com/enzhico/pos/shiro/ShiroKit.java +++ b/app-manage/src/main/java/com/xncoding/pos/shiro/ShiroKit.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.enzhico.pos.shiro; +package com.xncoding.pos.shiro; -import com.enzhico.pos.dao.entity.ManagerInfo; +import com.xncoding.pos.dao.entity.ManagerInfo; import org.apache.shiro.SecurityUtils; import org.apache.shiro.crypto.SecureRandomNumberGenerator; import org.apache.shiro.crypto.hash.SimpleHash; diff --git a/app-manage/src/main/resources/application.yml b/app-manage/src/main/resources/application.yml index 93291f8..373f23a 100644 --- a/app-manage/src/main/resources/application.yml +++ b/app-manage/src/main/resources/application.yml @@ -3,7 +3,7 @@ ########################################################## ################### 自定义项目配置 ################### -enzhico: +xncoding: kaptcha-open: true #是否开启登录时验证码 (true/false) session-open: false #是否开启session验证 (true/false) session-invalidate-time: 7200 #session失效时间 单位：秒 @@ -30,11 +30,11 @@ spring: ################### mybatis-plus配置 ################### mybatis-plus: - mapper-locations: classpath*:com/enzhico/pos/dao/repository/mapping/*.xml + mapper-locations: classpath*:com/xncoding/pos/dao/repository/mapping/*.xml typeAliasesPackage: > - com.enzhico.pos.api.model, - com.enzhico.pos.dao.entity, - com.enzhico.pos.common.dao.entity + com.xncoding.pos.api.model, + com.xncoding.pos.dao.entity, + com.xncoding.pos.common.dao.entity global-config: id-type: 0 # 0:数据库ID自增 1:用户输入id 2:全局唯一id(IdWorker) 3:全局唯一ID(uuid) db-column-underline: false @@ -63,24 +63,24 @@ spring: datasource: url: jdbc:mysql://123.207.66.156:3306/pos?useSSL=false&autoReconnect=true&tinyInt1isBit=false&useUnicode=true&characterEncoding=utf8 username: root - password: _EnZhi123 + password: ****** thymeleaf: cache: false ################### 自定义项目配置 ################### -enzhico: +xncoding: excel-path: E:/home/ files-path: E:/home/ - files-url-prefix: https://show.enzhico.net/files/ # 文件访问URL前缀 + files-url-prefix: https://show.xncoding.net/files/ # 文件访问URL前缀 pics-path: E:/home/ - pics-url-prefix: https://show.enzhico.net/pics/ # 图片访问URL前缀 + pics-url-prefix: https://show.xncoding.net/pics/ # 图片访问URL前缀 posapi-url-prefix: http://123.207.66.156:9095 logging: level: ROOT: INFO com: - enzhico: DEBUG + xncoding: DEBUG file: E:/logs/app-manage.log --- @@ -94,17 +94,17 @@ spring: datasource: url: jdbc:mysql://123.207.66.156:3306/pos?useSSL=false&autoReconnect=true&tinyInt1isBit=false&useUnicode=true&characterEncoding=utf8 username: root - password: _EnZhi123 + password: ****** thymeleaf: cache: false ################### 自定义项目配置 ################### -enzhico: +xncoding: excel-path: /var/data/ files-path: /usr/share/nginx/html/files/ - files-url-prefix: https://show.enzhico.net/files/ # 文件访问URL前缀 + files-url-prefix: https://show.xncoding.net/files/ # 文件访问URL前缀 pics-path: /usr/share/nginx/html/pics/ - pics-url-prefix: https://show.enzhico.net/pics/ # 图片访问URL前缀 + pics-url-prefix: https://show.xncoding.net/pics/ # 图片访问URL前缀 # posapi-url-prefix: http://posapi.enzhico.net posapi-url-prefix: http://123.207.66.156:9095 @@ -112,5 +112,5 @@ logging: level: ROOT: INFO com: - enzhico: DEBUG + xncoding: DEBUG file: /var/logs/app-manage.log diff --git a/app-manage/src/main/resources/sql/generate_mapper.py b/app-manage/src/main/resources/sql/generate_mapper.py index af710c6..b572387 100644 --- a/app-manage/src/main/resources/sql/generate_mapper.py +++ b/app-manage/src/main/resources/sql/generate_mapper.py @@ -18,10 +18,10 @@ """ ###################################下面的参数你来指定########################### -src_base_dir = r'E:\enzhico\app-manage\src\main\java' -domain_package = r'com.enzhico.pos.common.dao.entity' -mapper_package = r'com.enzhico.pos.common.dao.repository' -schema_name = r'E:\enzhico\app-manage\src\main\resources\sql\schema.sql' +src_base_dir = r'E:\xncoding\app-manage\src\main\java' +domain_package = r'com.xncoding.pos.common.dao.entity' +mapper_package = r'com.xncoding.pos.common.dao.repository' +schema_name = r'E:\xncoding\app-manage\src\main\resources\sql\schema.sql' author = r'熊能' TODAY_STR = '2018/01/02' ############################################################################### diff --git a/app-manage/src/test/java/com/enzhico/pos/ApplicationTests.java b/app-manage/src/test/java/com/xncoding/pos/ApplicationTests.java similarity index 93% rename from app-manage/src/test/java/com/enzhico/pos/ApplicationTests.java rename to app-manage/src/test/java/com/xncoding/pos/ApplicationTests.java index 2694112..45692a1 100644 --- a/app-manage/src/test/java/com/enzhico/pos/ApplicationTests.java +++ b/app-manage/src/test/java/com/xncoding/pos/ApplicationTests.java @@ -1,6 +1,6 @@ -package com.enzhico.pos; +package com.xncoding.pos; -import com.enzhico.pos.async.AsyncTask; +import com.xncoding.pos.async.AsyncTask; import org.junit.Test; import org.junit.runner.RunWith; import org.slf4j.Logger; diff --git a/app-manage/src/test/java/com/enzhico/pos/SimpleTest.java b/app-manage/src/test/java/com/xncoding/pos/SimpleTest.java similarity index 95% rename from app-manage/src/test/java/com/enzhico/pos/SimpleTest.java rename to app-manage/src/test/java/com/xncoding/pos/SimpleTest.java index 59a4e2d..5120283 100644 --- a/app-manage/src/test/java/com/enzhico/pos/SimpleTest.java +++ b/app-manage/src/test/java/com/xncoding/pos/SimpleTest.java @@ -1,6 +1,6 @@ -package com.enzhico.pos; +package com.xncoding.pos; -import com.enzhico.pos.shiro.ShiroKit; +import com.xncoding.pos.shiro.ShiroKit; import org.junit.Test; import java.nio.file.*; diff --git a/app-manage/src/test/java/com/enzhico/pos/common/util/CommonUtilTest.java b/app-manage/src/test/java/com/xncoding/pos/common/util/CommonUtilTest.java similarity index 93% rename from app-manage/src/test/java/com/enzhico/pos/common/util/CommonUtilTest.java rename to app-manage/src/test/java/com/xncoding/pos/common/util/CommonUtilTest.java index 8b4db9f..a586f84 100644 --- a/app-manage/src/test/java/com/enzhico/pos/common/util/CommonUtilTest.java +++ b/app-manage/src/test/java/com/xncoding/pos/common/util/CommonUtilTest.java @@ -1,4 +1,4 @@ -package com.enzhico.pos.common.util; +package com.xncoding.pos.common.util; import org.junit.Test; diff --git a/app-manage/src/test/java/com/enzhico/pos/crypto/asymmetric/RSAUtil.java b/app-manage/src/test/java/com/xncoding/pos/crypto/asymmetric/RSAUtil.java similarity index 99% rename from app-manage/src/test/java/com/enzhico/pos/crypto/asymmetric/RSAUtil.java rename to app-manage/src/test/java/com/xncoding/pos/crypto/asymmetric/RSAUtil.java index 17b464a..e21aaf0 100644 --- a/app-manage/src/test/java/com/enzhico/pos/crypto/asymmetric/RSAUtil.java +++ b/app-manage/src/test/java/com/xncoding/pos/crypto/asymmetric/RSAUtil.java @@ -1,4 +1,4 @@ -package com.enzhico.pos.crypto.asymmetric; +package com.xncoding.pos.crypto.asymmetric; import org.apache.commons.codec.binary.Base64; diff --git a/app-manage/src/test/java/com/enzhico/pos/crypto/symmetric/AESUtil.java b/app-manage/src/test/java/com/xncoding/pos/crypto/symmetric/AESUtil.java similarity index 98% rename from app-manage/src/test/java/com/enzhico/pos/crypto/symmetric/AESUtil.java rename to app-manage/src/test/java/com/xncoding/pos/crypto/symmetric/AESUtil.java index 9f9661c..5040dd5 100644 --- a/app-manage/src/test/java/com/enzhico/pos/crypto/symmetric/AESUtil.java +++ b/app-manage/src/test/java/com/xncoding/pos/crypto/symmetric/AESUtil.java @@ -1,4 +1,4 @@ -package com.enzhico.pos.crypto.symmetric; +package com.xncoding.pos.crypto.symmetric; import org.apache.commons.codec.binary.Hex; diff --git a/app-manage/src/test/java/com/enzhico/pos/crypto/symmetric/DESTripleUtil.java b/app-manage/src/test/java/com/xncoding/pos/crypto/symmetric/DESTripleUtil.java similarity index 98% rename from app-manage/src/test/java/com/enzhico/pos/crypto/symmetric/DESTripleUtil.java rename to app-manage/src/test/java/com/xncoding/pos/crypto/symmetric/DESTripleUtil.java index 8c2a92d..2dfe6dc 100644 --- a/app-manage/src/test/java/com/enzhico/pos/crypto/symmetric/DESTripleUtil.java +++ b/app-manage/src/test/java/com/xncoding/pos/crypto/symmetric/DESTripleUtil.java @@ -1,4 +1,4 @@ -package com.enzhico.pos.crypto.symmetric; +package com.xncoding.pos.crypto.symmetric; import org.apache.commons.codec.binary.Hex; diff --git a/app-manage/src/test/java/com/enzhico/pos/crypto/symmetric/DESUtil.java b/app-manage/src/test/java/com/xncoding/pos/crypto/symmetric/DESUtil.java similarity index 98% rename from app-manage/src/test/java/com/enzhico/pos/crypto/symmetric/DESUtil.java rename to app-manage/src/test/java/com/xncoding/pos/crypto/symmetric/DESUtil.java index 7ef0c85..43f9beb 100644 --- a/app-manage/src/test/java/com/enzhico/pos/crypto/symmetric/DESUtil.java +++ b/app-manage/src/test/java/com/xncoding/pos/crypto/symmetric/DESUtil.java @@ -1,4 +1,4 @@ -package com.enzhico.pos.crypto.symmetric; +package com.xncoding.pos.crypto.symmetric; import org.apache.commons.codec.binary.Hex; diff --git a/springboot-aop/pom.xml b/springboot-aop/pom.xml index acbb69f..d9d8d54 100644 --- a/springboot-aop/pom.xml +++ b/springboot-aop/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.enzhico + com.xncoding springboot-aop 1.0.0-SNAPSHOT jar diff --git a/app-manage/src/main/java/com/enzhico/pos/Application.java b/springboot-aop/src/main/java/com/xncoding/aop/Application.java similarity index 91% rename from app-manage/src/main/java/com/enzhico/pos/Application.java rename to springboot-aop/src/main/java/com/xncoding/aop/Application.java index bb8c49d..bb292a5 100644 --- a/app-manage/src/main/java/com/enzhico/pos/Application.java +++ b/springboot-aop/src/main/java/com/xncoding/aop/Application.java @@ -1,4 +1,4 @@ -package com.enzhico.pos; +package com.xncoding.aop; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/springboot-aop/src/main/java/com/enzhico/aop/aspect/LogAspect.java b/springboot-aop/src/main/java/com/xncoding/aop/aspect/LogAspect.java similarity index 95% rename from springboot-aop/src/main/java/com/enzhico/aop/aspect/LogAspect.java rename to springboot-aop/src/main/java/com/xncoding/aop/aspect/LogAspect.java index 3ad4ff0..36d6644 100644 --- a/springboot-aop/src/main/java/com/enzhico/aop/aspect/LogAspect.java +++ b/springboot-aop/src/main/java/com/xncoding/aop/aspect/LogAspect.java @@ -1,4 +1,4 @@ -package com.enzhico.aop.aspect; +package com.xncoding.aop.aspect; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.ProceedingJoinPoint; @@ -16,7 +16,7 @@ import java.util.Arrays; @Aspect @Component public class LogAspect { - @Pointcut("execution(public * com.enzhico.aop.controller.*.*(..))") + @Pointcut("execution(public * com.xncoding.aop.controller.*.*(..))") public void webLog(){} @Before("webLog()") diff --git a/springboot-aop/src/main/java/com/enzhico/aop/aspect/UserAccess.java b/springboot-aop/src/main/java/com/xncoding/aop/aspect/UserAccess.java similarity index 90% rename from springboot-aop/src/main/java/com/enzhico/aop/aspect/UserAccess.java rename to springboot-aop/src/main/java/com/xncoding/aop/aspect/UserAccess.java index 0ee659b..0b0ef4a 100644 --- a/springboot-aop/src/main/java/com/enzhico/aop/aspect/UserAccess.java +++ b/springboot-aop/src/main/java/com/xncoding/aop/aspect/UserAccess.java @@ -1,4 +1,4 @@ -package com.enzhico.aop.aspect; +package com.xncoding.aop.aspect; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/springboot-aop/src/main/java/com/enzhico/aop/aspect/UserAccessAspect.java b/springboot-aop/src/main/java/com/xncoding/aop/aspect/UserAccessAspect.java similarity index 87% rename from springboot-aop/src/main/java/com/enzhico/aop/aspect/UserAccessAspect.java rename to springboot-aop/src/main/java/com/xncoding/aop/aspect/UserAccessAspect.java index 8a07d5f..91cdedd 100644 --- a/springboot-aop/src/main/java/com/enzhico/aop/aspect/UserAccessAspect.java +++ b/springboot-aop/src/main/java/com/xncoding/aop/aspect/UserAccessAspect.java @@ -1,4 +1,4 @@ -package com.enzhico.aop.aspect; +package com.xncoding.aop.aspect; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.ProceedingJoinPoint; @@ -9,7 +9,7 @@ import org.springframework.stereotype.Component; @Aspect public class UserAccessAspect { - @Pointcut(value = "@annotation(com.enzhico.aop.aspect.UserAccess)") + @Pointcut(value = "@annotation(com.xncoding.aop.aspect.UserAccess)") public void access() { } diff --git a/springboot-aop/src/main/java/com/enzhico/aop/controller/UserController.java b/springboot-aop/src/main/java/com/xncoding/aop/controller/UserController.java similarity index 86% rename from springboot-aop/src/main/java/com/enzhico/aop/controller/UserController.java rename to springboot-aop/src/main/java/com/xncoding/aop/controller/UserController.java index e0ecd04..eb1f764 100644 --- a/springboot-aop/src/main/java/com/enzhico/aop/controller/UserController.java +++ b/springboot-aop/src/main/java/com/xncoding/aop/controller/UserController.java @@ -1,9 +1,9 @@ -package com.enzhico.aop.controller; +package com.xncoding.aop.controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.enzhico.aop.aspect.UserAccess; +import com.xncoding.aop.aspect.UserAccess; /** * Description: diff --git a/springboot-aop/src/main/resources/application.yml b/springboot-aop/src/main/resources/application.yml index 8d729b5..0602e80 100644 --- a/springboot-aop/src/main/resources/application.yml +++ b/springboot-aop/src/main/resources/application.yml @@ -2,11 +2,6 @@ ################## 所有profile共有的配置 ################# ########################################################## -################### 自定义项目配置 ################### -enzhico: - kaptcha-open: true #是否开启登录时验证码 (true/false) - session-open: false #是否开启session验证 (true/false) - ################### 项目启动端口 ################### server.port: 8092 @@ -15,10 +10,6 @@ spring: profiles: active: dev -logging: - level: - org.springframework.web.servlet: ERROR - --- ##################################################################### @@ -31,6 +22,6 @@ logging: level: ROOT: INFO com: - enzhico: DEBUG + xncoding: DEBUG file: E:/logs/aop.log diff --git a/springboot-batch/pom.xml b/springboot-batch/pom.xml index b43a2c0..28bda55 100644 --- a/springboot-batch/pom.xml +++ b/springboot-batch/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.enzhico + com.xncoding springboot-batch 1.0.0-SNAPSHOT jar diff --git a/springboot-batch/src/main/java/com/enzhico/trans/Application.java b/springboot-batch/src/main/java/com/xncoding/trans/Application.java similarity index 92% rename from springboot-batch/src/main/java/com/enzhico/trans/Application.java rename to springboot-batch/src/main/java/com/xncoding/trans/Application.java index 61cb67f..acc02f7 100644 --- a/springboot-batch/src/main/java/com/enzhico/trans/Application.java +++ b/springboot-batch/src/main/java/com/xncoding/trans/Application.java @@ -1,4 +1,4 @@ -package com.enzhico.trans; +package com.xncoding.trans; import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing; import org.springframework.boot.SpringApplication; diff --git a/springboot-cache/src/main/java/com/enzhico/trans/config/MybatisPlusConfig.java b/springboot-batch/src/main/java/com/xncoding/trans/config/MybatisPlusConfig.java similarity index 83% rename from springboot-cache/src/main/java/com/enzhico/trans/config/MybatisPlusConfig.java rename to springboot-batch/src/main/java/com/xncoding/trans/config/MybatisPlusConfig.java index 036728b..eaab67a 100644 --- a/springboot-cache/src/main/java/com/enzhico/trans/config/MybatisPlusConfig.java +++ b/springboot-batch/src/main/java/com/xncoding/trans/config/MybatisPlusConfig.java @@ -1,10 +1,9 @@ -package com.enzhico.trans.config; +package com.xncoding.trans.config; import com.alibaba.druid.pool.DruidDataSource; import com.baomidou.mybatisplus.plugins.PaginationInterceptor; -import com.enzhico.trans.config.DruidProperties; +import com.xncoding.trans.config.properties.DruidProperties; import org.mybatis.spring.annotation.MapperScan; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.transaction.annotation.EnableTransactionManagement; @@ -19,7 +18,7 @@ import javax.annotation.Resource; */ @Configuration @EnableTransactionManagement(order = 2) -@MapperScan(basePackages = {"com.enzhico.trans.dao.repository"}) +@MapperScan(basePackages = {"com.xncoding.trans.dao.repository"}) public class MybatisPlusConfig { @Resource diff --git a/springboot-batch/src/main/java/com/enzhico/trans/config/properties/CommonProperties.java b/springboot-batch/src/main/java/com/xncoding/trans/config/properties/CommonProperties.java similarity index 97% rename from springboot-batch/src/main/java/com/enzhico/trans/config/properties/CommonProperties.java rename to springboot-batch/src/main/java/com/xncoding/trans/config/properties/CommonProperties.java index 303c533..22dcd03 100644 --- a/springboot-batch/src/main/java/com/enzhico/trans/config/properties/CommonProperties.java +++ b/springboot-batch/src/main/java/com/xncoding/trans/config/properties/CommonProperties.java @@ -1,4 +1,4 @@ -package com.enzhico.trans.config.properties; +package com.xncoding.trans.config.properties; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.util.JdbcConstants; diff --git a/springboot-batch/src/main/java/com/enzhico/trans/config/properties/DruidProperties.java b/springboot-batch/src/main/java/com/xncoding/trans/config/properties/DruidProperties.java similarity index 99% rename from springboot-batch/src/main/java/com/enzhico/trans/config/properties/DruidProperties.java rename to springboot-batch/src/main/java/com/xncoding/trans/config/properties/DruidProperties.java index a0f3d1c..b308b30 100644 --- a/springboot-batch/src/main/java/com/enzhico/trans/config/properties/DruidProperties.java +++ b/springboot-batch/src/main/java/com/xncoding/trans/config/properties/DruidProperties.java @@ -1,4 +1,4 @@ -package com.enzhico.trans.config.properties; +package com.xncoding.trans.config.properties; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.util.JdbcConstants; diff --git a/springboot-batch/src/main/java/com/enzhico/trans/dao/entity/User.java b/springboot-batch/src/main/java/com/xncoding/trans/dao/entity/User.java similarity index 96% rename from springboot-batch/src/main/java/com/enzhico/trans/dao/entity/User.java rename to springboot-batch/src/main/java/com/xncoding/trans/dao/entity/User.java index 259dc1b..f66b107 100644 --- a/springboot-batch/src/main/java/com/enzhico/trans/dao/entity/User.java +++ b/springboot-batch/src/main/java/com/xncoding/trans/dao/entity/User.java @@ -1,4 +1,4 @@ -package com.enzhico.trans.dao.entity; +package com.xncoding.trans.dao.entity; import com.baomidou.mybatisplus.activerecord.Model; import com.baomidou.mybatisplus.annotations.TableId; diff --git a/springboot-redis/src/main/java/com/enzhico/trans/dao/repository/UserMapper.java b/springboot-batch/src/main/java/com/xncoding/trans/dao/repository/UserMapper.java similarity index 56% rename from springboot-redis/src/main/java/com/enzhico/trans/dao/repository/UserMapper.java rename to springboot-batch/src/main/java/com/xncoding/trans/dao/repository/UserMapper.java index a7800de..d038163 100644 --- a/springboot-redis/src/main/java/com/enzhico/trans/dao/repository/UserMapper.java +++ b/springboot-batch/src/main/java/com/xncoding/trans/dao/repository/UserMapper.java @@ -1,7 +1,7 @@ -package com.enzhico.trans.dao.repository; +package com.xncoding.trans.dao.repository; import com.baomidou.mybatisplus.mapper.BaseMapper; -import com.enzhico.trans.dao.entity.User; +import com.xncoding.trans.dao.entity.User; public interface UserMapper extends BaseMapper { } diff --git a/springboot-batch/src/main/java/com/enzhico/trans/modules/MyBatchConfig.java b/springboot-batch/src/main/java/com/xncoding/trans/modules/MyBatchConfig.java similarity index 98% rename from springboot-batch/src/main/java/com/enzhico/trans/modules/MyBatchConfig.java rename to springboot-batch/src/main/java/com/xncoding/trans/modules/MyBatchConfig.java index 0848d41..325f96f 100644 --- a/springboot-batch/src/main/java/com/enzhico/trans/modules/MyBatchConfig.java +++ b/springboot-batch/src/main/java/com/xncoding/trans/modules/MyBatchConfig.java @@ -1,4 +1,4 @@ -package com.enzhico.trans.modules; +package com.xncoding.trans.modules; import com.alibaba.druid.pool.DruidDataSource; import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing; diff --git a/springboot-batch/src/main/java/com/enzhico/trans/modules/MyBeanValidator.java b/springboot-batch/src/main/java/com/xncoding/trans/modules/MyBeanValidator.java similarity index 97% rename from springboot-batch/src/main/java/com/enzhico/trans/modules/MyBeanValidator.java rename to springboot-batch/src/main/java/com/xncoding/trans/modules/MyBeanValidator.java index 71b501c..50ef86f 100644 --- a/springboot-batch/src/main/java/com/enzhico/trans/modules/MyBeanValidator.java +++ b/springboot-batch/src/main/java/com/xncoding/trans/modules/MyBeanValidator.java @@ -1,4 +1,4 @@ -package com.enzhico.trans.modules; +package com.xncoding.trans.modules; import org.springframework.batch.item.validator.ValidationException; import org.springframework.batch.item.validator.Validator; diff --git a/springboot-batch/src/main/java/com/enzhico/trans/modules/MyBeanWrapperFieldSetMapper.java b/springboot-batch/src/main/java/com/xncoding/trans/modules/MyBeanWrapperFieldSetMapper.java similarity index 93% rename from springboot-batch/src/main/java/com/enzhico/trans/modules/MyBeanWrapperFieldSetMapper.java rename to springboot-batch/src/main/java/com/xncoding/trans/modules/MyBeanWrapperFieldSetMapper.java index 968634c..df88f88 100644 --- a/springboot-batch/src/main/java/com/enzhico/trans/modules/MyBeanWrapperFieldSetMapper.java +++ b/springboot-batch/src/main/java/com/xncoding/trans/modules/MyBeanWrapperFieldSetMapper.java @@ -1,7 +1,7 @@ -package com.enzhico.trans.modules; +package com.xncoding.trans.modules; import com.baomidou.mybatisplus.toolkit.StringUtils; -import com.enzhico.trans.modules.common.DateUtil; +import com.xncoding.trans.modules.common.DateUtil; import org.springframework.batch.item.file.mapping.BeanWrapperFieldSetMapper; import org.springframework.validation.DataBinder; diff --git a/springboot-batch/src/main/java/com/enzhico/trans/modules/MyJobListener.java b/springboot-batch/src/main/java/com/xncoding/trans/modules/MyJobListener.java similarity index 96% rename from springboot-batch/src/main/java/com/enzhico/trans/modules/MyJobListener.java rename to springboot-batch/src/main/java/com/xncoding/trans/modules/MyJobListener.java index 661187b..d762255 100644 --- a/springboot-batch/src/main/java/com/enzhico/trans/modules/MyJobListener.java +++ b/springboot-batch/src/main/java/com/xncoding/trans/modules/MyJobListener.java @@ -1,4 +1,4 @@ -package com.enzhico.trans.modules; +package com.xncoding.trans.modules; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/springboot-batch/src/main/java/com/enzhico/trans/modules/canton/Canton.java b/springboot-batch/src/main/java/com/xncoding/trans/modules/canton/Canton.java similarity index 98% rename from springboot-batch/src/main/java/com/enzhico/trans/modules/canton/Canton.java rename to springboot-batch/src/main/java/com/xncoding/trans/modules/canton/Canton.java index c2de0a6..df183cb 100644 --- a/springboot-batch/src/main/java/com/enzhico/trans/modules/canton/Canton.java +++ b/springboot-batch/src/main/java/com/xncoding/trans/modules/canton/Canton.java @@ -1,4 +1,4 @@ -package com.enzhico.trans.modules.canton; +package com.xncoding.trans.modules.canton; /** * Canton diff --git a/springboot-batch/src/main/java/com/enzhico/trans/modules/canton/CantonConfig.java b/springboot-batch/src/main/java/com/xncoding/trans/modules/canton/CantonConfig.java similarity index 98% rename from springboot-batch/src/main/java/com/enzhico/trans/modules/canton/CantonConfig.java rename to springboot-batch/src/main/java/com/xncoding/trans/modules/canton/CantonConfig.java index 25c314f..03f5280 100644 --- a/springboot-batch/src/main/java/com/enzhico/trans/modules/canton/CantonConfig.java +++ b/springboot-batch/src/main/java/com/xncoding/trans/modules/canton/CantonConfig.java @@ -1,8 +1,8 @@ -package com.enzhico.trans.modules.canton; +package com.xncoding.trans.modules.canton; import com.alibaba.druid.pool.DruidDataSource; -import com.enzhico.trans.modules.MyBeanValidator; -import com.enzhico.trans.modules.MyJobListener; +import com.xncoding.trans.modules.MyBeanValidator; +import com.xncoding.trans.modules.MyJobListener; import org.springframework.batch.core.Job; import org.springframework.batch.core.Step; import org.springframework.batch.core.configuration.annotation.JobBuilderFactory; diff --git a/springboot-batch/src/main/java/com/enzhico/trans/modules/common/CommonConfig.java b/springboot-batch/src/main/java/com/xncoding/trans/modules/common/CommonConfig.java similarity index 96% rename from springboot-batch/src/main/java/com/enzhico/trans/modules/common/CommonConfig.java rename to springboot-batch/src/main/java/com/xncoding/trans/modules/common/CommonConfig.java index 8410728..59f963c 100644 --- a/springboot-batch/src/main/java/com/enzhico/trans/modules/common/CommonConfig.java +++ b/springboot-batch/src/main/java/com/xncoding/trans/modules/common/CommonConfig.java @@ -1,10 +1,10 @@ -package com.enzhico.trans.modules.common; +package com.xncoding.trans.modules.common; import com.alibaba.druid.pool.DruidDataSource; -import com.enzhico.trans.config.properties.CommonProperties; -import com.enzhico.trans.modules.MyBeanValidator; -import com.enzhico.trans.modules.MyBeanWrapperFieldSetMapper; -import com.enzhico.trans.modules.MyJobListener; +import com.xncoding.trans.config.properties.CommonProperties; +import com.xncoding.trans.modules.MyBeanValidator; +import com.xncoding.trans.modules.MyBeanWrapperFieldSetMapper; +import com.xncoding.trans.modules.MyJobListener; import org.springframework.batch.core.Job; import org.springframework.batch.core.Step; import org.springframework.batch.core.configuration.annotation.JobBuilderFactory; diff --git a/springboot-batch/src/main/java/com/enzhico/trans/modules/common/DateUtil.java b/springboot-batch/src/main/java/com/xncoding/trans/modules/common/DateUtil.java similarity index 97% rename from springboot-batch/src/main/java/com/enzhico/trans/modules/common/DateUtil.java rename to springboot-batch/src/main/java/com/xncoding/trans/modules/common/DateUtil.java index 2ff0335..54897bc 100644 --- a/springboot-batch/src/main/java/com/enzhico/trans/modules/common/DateUtil.java +++ b/springboot-batch/src/main/java/com/xncoding/trans/modules/common/DateUtil.java @@ -1,4 +1,4 @@ -package com.enzhico.trans.modules.common; +package com.xncoding.trans.modules.common; import java.sql.Timestamp; import java.text.ParseException; diff --git a/springboot-batch/src/main/java/com/enzhico/trans/modules/common/anno/TableName.java b/springboot-batch/src/main/java/com/xncoding/trans/modules/common/anno/TableName.java similarity index 85% rename from springboot-batch/src/main/java/com/enzhico/trans/modules/common/anno/TableName.java rename to springboot-batch/src/main/java/com/xncoding/trans/modules/common/anno/TableName.java index 6541541..4d7b0e1 100644 --- a/springboot-batch/src/main/java/com/enzhico/trans/modules/common/anno/TableName.java +++ b/springboot-batch/src/main/java/com/xncoding/trans/modules/common/anno/TableName.java @@ -1,4 +1,4 @@ -package com.enzhico.trans.modules.common.anno; +package com.xncoding.trans.modules.common.anno; import java.lang.annotation.*; diff --git a/springboot-batch/src/main/java/com/enzhico/trans/modules/common/vo/BscCanton.java b/springboot-batch/src/main/java/com/xncoding/trans/modules/common/vo/BscCanton.java similarity index 97% rename from springboot-batch/src/main/java/com/enzhico/trans/modules/common/vo/BscCanton.java rename to springboot-batch/src/main/java/com/xncoding/trans/modules/common/vo/BscCanton.java index 97671e8..2efde46 100644 --- a/springboot-batch/src/main/java/com/enzhico/trans/modules/common/vo/BscCanton.java +++ b/springboot-batch/src/main/java/com/xncoding/trans/modules/common/vo/BscCanton.java @@ -1,6 +1,6 @@ -package com.enzhico.trans.modules.common.vo; +package com.xncoding.trans.modules.common.vo; -import com.enzhico.trans.modules.common.anno.TableName; +import com.xncoding.trans.modules.common.anno.TableName; /** * BscCanton diff --git a/springboot-batch/src/main/java/com/enzhico/trans/modules/common/vo/BscExeOffice.java b/springboot-batch/src/main/java/com/xncoding/trans/modules/common/vo/BscExeOffice.java similarity index 97% rename from springboot-batch/src/main/java/com/enzhico/trans/modules/common/vo/BscExeOffice.java rename to springboot-batch/src/main/java/com/xncoding/trans/modules/common/vo/BscExeOffice.java index 5a68162..1312082 100644 --- a/springboot-batch/src/main/java/com/enzhico/trans/modules/common/vo/BscExeOffice.java +++ b/springboot-batch/src/main/java/com/xncoding/trans/modules/common/vo/BscExeOffice.java @@ -1,6 +1,6 @@ -package com.enzhico.trans.modules.common.vo; +package com.xncoding.trans.modules.common.vo; -import com.enzhico.trans.modules.common.anno.TableName; +import com.xncoding.trans.modules.common.anno.TableName; import org.springframework.format.annotation.DateTimeFormat; import java.sql.Timestamp; diff --git a/springboot-batch/src/main/java/com/enzhico/trans/modules/common/vo/BscOfficeExeItem.java b/springboot-batch/src/main/java/com/xncoding/trans/modules/common/vo/BscOfficeExeItem.java similarity index 94% rename from springboot-batch/src/main/java/com/enzhico/trans/modules/common/vo/BscOfficeExeItem.java rename to springboot-batch/src/main/java/com/xncoding/trans/modules/common/vo/BscOfficeExeItem.java index 3bd339d..f9c62b6 100644 --- a/springboot-batch/src/main/java/com/enzhico/trans/modules/common/vo/BscOfficeExeItem.java +++ b/springboot-batch/src/main/java/com/xncoding/trans/modules/common/vo/BscOfficeExeItem.java @@ -1,6 +1,6 @@ -package com.enzhico.trans.modules.common.vo; +package com.xncoding.trans.modules.common.vo; -import com.enzhico.trans.modules.common.anno.TableName; +import com.xncoding.trans.modules.common.anno.TableName; /** * BscOfficeExeItem diff --git a/springboot-batch/src/main/java/com/enzhico/trans/modules/common/vo/BscTollItem.java b/springboot-batch/src/main/java/com/xncoding/trans/modules/common/vo/BscTollItem.java similarity index 98% rename from springboot-batch/src/main/java/com/enzhico/trans/modules/common/vo/BscTollItem.java rename to springboot-batch/src/main/java/com/xncoding/trans/modules/common/vo/BscTollItem.java index 08fab36..409a9a9 100644 --- a/springboot-batch/src/main/java/com/enzhico/trans/modules/common/vo/BscTollItem.java +++ b/springboot-batch/src/main/java/com/xncoding/trans/modules/common/vo/BscTollItem.java @@ -1,6 +1,6 @@ -package com.enzhico.trans.modules.common.vo; +package com.xncoding.trans.modules.common.vo; -import com.enzhico.trans.modules.common.anno.TableName; +import com.xncoding.trans.modules.common.anno.TableName; import java.math.BigDecimal; import java.sql.Timestamp; diff --git a/springboot-batch/src/main/java/com/enzhico/trans/modules/common/vo/BscTollSpecialShare.java b/springboot-batch/src/main/java/com/xncoding/trans/modules/common/vo/BscTollSpecialShare.java similarity index 97% rename from springboot-batch/src/main/java/com/enzhico/trans/modules/common/vo/BscTollSpecialShare.java rename to springboot-batch/src/main/java/com/xncoding/trans/modules/common/vo/BscTollSpecialShare.java index 0bdeb3f..587a535 100644 --- a/springboot-batch/src/main/java/com/enzhico/trans/modules/common/vo/BscTollSpecialShare.java +++ b/springboot-batch/src/main/java/com/xncoding/trans/modules/common/vo/BscTollSpecialShare.java @@ -1,6 +1,6 @@ -package com.enzhico.trans.modules.common.vo; +package com.xncoding.trans.modules.common.vo; -import com.enzhico.trans.modules.common.anno.TableName; +import com.xncoding.trans.modules.common.anno.TableName; import java.math.BigDecimal; diff --git a/springboot-batch/src/main/java/com/enzhico/trans/modules/vtoll/BudgetVtoll.java b/springboot-batch/src/main/java/com/xncoding/trans/modules/vtoll/BudgetVtoll.java similarity index 98% rename from springboot-batch/src/main/java/com/enzhico/trans/modules/vtoll/BudgetVtoll.java rename to springboot-batch/src/main/java/com/xncoding/trans/modules/vtoll/BudgetVtoll.java index ead5f97..234827c 100644 --- a/springboot-batch/src/main/java/com/enzhico/trans/modules/vtoll/BudgetVtoll.java +++ b/springboot-batch/src/main/java/com/xncoding/trans/modules/vtoll/BudgetVtoll.java @@ -1,4 +1,4 @@ -package com.enzhico.trans.modules.vtoll; +package com.xncoding.trans.modules.vtoll; import javax.validation.constraints.Size; diff --git a/springboot-batch/src/main/java/com/enzhico/trans/modules/vtoll/BudgetVtollConfig.java b/springboot-batch/src/main/java/com/xncoding/trans/modules/vtoll/BudgetVtollConfig.java similarity index 98% rename from springboot-batch/src/main/java/com/enzhico/trans/modules/vtoll/BudgetVtollConfig.java rename to springboot-batch/src/main/java/com/xncoding/trans/modules/vtoll/BudgetVtollConfig.java index 1777c62..ded5ed9 100644 --- a/springboot-batch/src/main/java/com/enzhico/trans/modules/vtoll/BudgetVtollConfig.java +++ b/springboot-batch/src/main/java/com/xncoding/trans/modules/vtoll/BudgetVtollConfig.java @@ -1,8 +1,8 @@ -package com.enzhico.trans.modules.vtoll; +package com.xncoding.trans.modules.vtoll; import com.alibaba.druid.pool.DruidDataSource; -import com.enzhico.trans.modules.MyBeanValidator; -import com.enzhico.trans.modules.MyJobListener; +import com.xncoding.trans.modules.MyBeanValidator; +import com.xncoding.trans.modules.MyJobListener; import org.springframework.batch.core.Job; import org.springframework.batch.core.Step; import org.springframework.batch.core.configuration.annotation.JobBuilderFactory; diff --git a/springboot-batch/src/main/java/com/enzhico/trans/modules/zapp/App.java b/springboot-batch/src/main/java/com/xncoding/trans/modules/zapp/App.java similarity index 85% rename from springboot-batch/src/main/java/com/enzhico/trans/modules/zapp/App.java rename to springboot-batch/src/main/java/com/xncoding/trans/modules/zapp/App.java index 3b9fbda..ff44061 100644 --- a/springboot-batch/src/main/java/com/enzhico/trans/modules/zapp/App.java +++ b/springboot-batch/src/main/java/com/xncoding/trans/modules/zapp/App.java @@ -1,6 +1,6 @@ -package com.enzhico.trans.modules.zapp; +package com.xncoding.trans.modules.zapp; -import com.enzhico.trans.modules.common.anno.TableName; +import com.xncoding.trans.modules.common.anno.TableName; /** * App diff --git a/springboot-batch/src/main/java/com/enzhico/trans/modules/zapp/AppConfig.java b/springboot-batch/src/main/java/com/xncoding/trans/modules/zapp/AppConfig.java similarity index 97% rename from springboot-batch/src/main/java/com/enzhico/trans/modules/zapp/AppConfig.java rename to springboot-batch/src/main/java/com/xncoding/trans/modules/zapp/AppConfig.java index c2e13b2..bced66f 100644 --- a/springboot-batch/src/main/java/com/enzhico/trans/modules/zapp/AppConfig.java +++ b/springboot-batch/src/main/java/com/xncoding/trans/modules/zapp/AppConfig.java @@ -1,8 +1,8 @@ -package com.enzhico.trans.modules.zapp; +package com.xncoding.trans.modules.zapp; import com.alibaba.druid.pool.DruidDataSource; -import com.enzhico.trans.modules.MyBeanValidator; -import com.enzhico.trans.modules.MyJobListener; +import com.xncoding.trans.modules.MyBeanValidator; +import com.xncoding.trans.modules.MyJobListener; import org.springframework.batch.core.Job; import org.springframework.batch.core.Step; import org.springframework.batch.core.configuration.annotation.JobBuilderFactory; diff --git a/springboot-batch/src/main/java/com/enzhico/trans/modules/zlog/Log.java b/springboot-batch/src/main/java/com/xncoding/trans/modules/zlog/Log.java similarity index 93% rename from springboot-batch/src/main/java/com/enzhico/trans/modules/zlog/Log.java rename to springboot-batch/src/main/java/com/xncoding/trans/modules/zlog/Log.java index 788a028..87acc41 100644 --- a/springboot-batch/src/main/java/com/enzhico/trans/modules/zlog/Log.java +++ b/springboot-batch/src/main/java/com/xncoding/trans/modules/zlog/Log.java @@ -1,4 +1,4 @@ -package com.enzhico.trans.modules.zlog; +package com.xncoding.trans.modules.zlog; /** * Log diff --git a/springboot-batch/src/main/java/com/enzhico/trans/modules/zlog/LogConfig.java b/springboot-batch/src/main/java/com/xncoding/trans/modules/zlog/LogConfig.java similarity index 97% rename from springboot-batch/src/main/java/com/enzhico/trans/modules/zlog/LogConfig.java rename to springboot-batch/src/main/java/com/xncoding/trans/modules/zlog/LogConfig.java index 51676f3..7050a7c 100644 --- a/springboot-batch/src/main/java/com/enzhico/trans/modules/zlog/LogConfig.java +++ b/springboot-batch/src/main/java/com/xncoding/trans/modules/zlog/LogConfig.java @@ -1,8 +1,8 @@ -package com.enzhico.trans.modules.zlog; +package com.xncoding.trans.modules.zlog; import com.alibaba.druid.pool.DruidDataSource; -import com.enzhico.trans.modules.MyBeanValidator; -import com.enzhico.trans.modules.MyJobListener; +import com.xncoding.trans.modules.MyBeanValidator; +import com.xncoding.trans.modules.MyJobListener; import org.springframework.batch.core.Job; import org.springframework.batch.core.Step; import org.springframework.batch.core.configuration.annotation.JobBuilderFactory; diff --git a/springboot-batch/src/main/java/com/enzhico/trans/service/CsvService.java b/springboot-batch/src/main/java/com/xncoding/trans/service/CsvService.java similarity index 87% rename from springboot-batch/src/main/java/com/enzhico/trans/service/CsvService.java rename to springboot-batch/src/main/java/com/xncoding/trans/service/CsvService.java index 3b96039..f7a1c62 100644 --- a/springboot-batch/src/main/java/com/enzhico/trans/service/CsvService.java +++ b/springboot-batch/src/main/java/com/xncoding/trans/service/CsvService.java @@ -1,11 +1,11 @@ -package com.enzhico.trans.service; +package com.xncoding.trans.service; -import com.enzhico.trans.config.properties.CommonProperties; -import com.enzhico.trans.modules.common.anno.TableName; -import com.enzhico.trans.modules.common.vo.BscCanton; -import com.enzhico.trans.modules.common.vo.BscExeOffice; -import com.enzhico.trans.modules.common.vo.BscOfficeExeItem; -import com.enzhico.trans.modules.common.vo.BscTollItem; +import com.xncoding.trans.config.properties.CommonProperties; +import com.xncoding.trans.modules.common.anno.TableName; +import com.xncoding.trans.modules.common.vo.BscCanton; +import com.xncoding.trans.modules.common.vo.BscExeOffice; +import com.xncoding.trans.modules.common.vo.BscOfficeExeItem; +import com.xncoding.trans.modules.common.vo.BscTollItem; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.batch.core.Job; diff --git a/springboot-batch/src/main/java/com/enzhico/trans/start/StartRunner.java b/springboot-batch/src/main/java/com/xncoding/trans/start/StartRunner.java similarity index 89% rename from springboot-batch/src/main/java/com/enzhico/trans/start/StartRunner.java rename to springboot-batch/src/main/java/com/xncoding/trans/start/StartRunner.java index daa1631..a72f3de 100644 --- a/springboot-batch/src/main/java/com/enzhico/trans/start/StartRunner.java +++ b/springboot-batch/src/main/java/com/xncoding/trans/start/StartRunner.java @@ -1,6 +1,6 @@ -package com.enzhico.trans.start; +package com.xncoding.trans.start; -import com.enzhico.trans.service.CsvService; +import com.xncoding.trans.service.CsvService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.CommandLineRunner; diff --git a/springboot-batch/src/main/resources/application.yml b/springboot-batch/src/main/resources/application.yml index fd3cc8b..1597a69 100644 --- a/springboot-batch/src/main/resources/application.yml +++ b/springboot-batch/src/main/resources/application.yml @@ -22,9 +22,9 @@ spring: ################### mybatis-plus配置 ################### mybatis-plus: - mapper-locations: classpath*:com/enzhico/trans/dao/repository/mapping/*.xml + mapper-locations: classpath*:com/xncoding/trans/dao/repository/mapping/*.xml typeAliasesPackage: > - com.enzhico.trans.dao.entity + com.xncoding.trans.dao.entity global-config: id-type: 1 # 0:数据库ID自增 1:用户输入id 2:全局唯一id(IdWorker) 3:全局唯一ID(uuid) db-column-underline: false @@ -49,7 +49,7 @@ spring: profiles: dev datasource: driver-class-name: oracle.jdbc.driver.OracleDriver - url: jdbc:oracle:thin:@111.230.194.170:1521:orcl11g + url: jdbc:oracle:thin:@127.0.0.1:1521:orcl11g username: adm_real password: adm_real @@ -61,7 +61,7 @@ logging: level: ROOT: INFO com: - enzhico: DEBUG + xncoding: DEBUG file: /var/logs/batch.log --- @@ -85,6 +85,6 @@ logging: level: ROOT: INFO com: - enzhico: DEBUG + xncoding: DEBUG file: /var/logs/batch.log diff --git a/springboot-batch/src/test/java/com/enzhico/service/BatchServiceTest.java b/springboot-batch/src/test/java/com/xncoding/service/BatchServiceTest.java similarity index 92% rename from springboot-batch/src/test/java/com/enzhico/service/BatchServiceTest.java rename to springboot-batch/src/test/java/com/xncoding/service/BatchServiceTest.java index ec1aa56..567d624 100644 --- a/springboot-batch/src/test/java/com/enzhico/service/BatchServiceTest.java +++ b/springboot-batch/src/test/java/com/xncoding/service/BatchServiceTest.java @@ -1,10 +1,10 @@ -package com.enzhico.service; +package com.xncoding.service; -import com.enzhico.trans.Application; -import com.enzhico.trans.config.properties.CommonProperties; -import com.enzhico.trans.modules.common.anno.TableName; -import com.enzhico.trans.modules.common.vo.*; -import com.enzhico.trans.service.CsvService; +import com.xncoding.trans.Application; +import com.xncoding.trans.config.properties.CommonProperties; +import com.xncoding.trans.modules.common.anno.TableName; +import com.xncoding.trans.modules.common.vo.*; +import com.xncoding.trans.service.CsvService; import org.junit.Test; import org.junit.runner.RunWith; import org.slf4j.Logger; @@ -108,7 +108,7 @@ public class BatchServiceTest { .addLong("time",System.currentTimeMillis()) .addString(KEY_JOB_NAME, "App") .addString(KEY_FILE_NAME, p.getCsvApp()) - .addString(KEY_VO_NAME, "com.enzhico.trans.modules.zapp.App") + .addString(KEY_VO_NAME, "com.xncoding.trans.modules.zapp.App") .addString(KEY_COLUMNS, String.join(",", new String[]{ "appid", "zname", "flag" })) @@ -120,7 +120,7 @@ public class BatchServiceTest { .addLong("time",System.currentTimeMillis()) .addString(KEY_JOB_NAME, "Log") .addString(KEY_FILE_NAME, p.getCsvLog()) - .addString(KEY_VO_NAME, "com.enzhico.trans.modules.zlog.Log") + .addString(KEY_VO_NAME, "com.xncoding.trans.modules.zlog.Log") .addString(KEY_COLUMNS, String.join(",", new String[]{ "logid", "msg", "logtime" })) @@ -145,7 +145,7 @@ public class BatchServiceTest { .addLong("time",System.currentTimeMillis()) .addString(KEY_JOB_NAME, "BscExeOffice") .addString(KEY_FILE_NAME, p.getCsvExeOffice()) - .addString(KEY_VO_NAME, "com.enzhico.trans.modules.common.vo.BscExeOffice") + .addString(KEY_VO_NAME, "com.xncoding.trans.modules.common.vo.BscExeOffice") .addString(KEY_COLUMNS, String.join(",", new String[]{ "id","cantonid","code","name","memcode","supdeptid","comdeptid","contactman","tel","mobil","email","bgofficeid","infomobil","infoman","logpass","startdate","stopdate","status","memo","auditer","audittime","isaudit","edittime","platform_id","isprintbill" })) @@ -158,7 +158,7 @@ public class BatchServiceTest { // .addLong("time",System.currentTimeMillis()) // .addString(KEY_JOB_NAME, "Log") // .addString(KEY_FILE_NAME, p.getCsvLog()) -// .addString(KEY_VO_NAME, "com.enzhico.trans.modules.zlog.Log") +// .addString(KEY_VO_NAME, "com.xncoding.trans.modules.zlog.Log") // .addString(KEY_COLUMNS, String.join(",", new String[]{ // "logid", "msg", "logtime" // })) diff --git a/springboot-batch/src/test/java/com/enzhico/service/SimpleTest.java b/springboot-batch/src/test/java/com/xncoding/service/SimpleTest.java similarity index 95% rename from springboot-batch/src/test/java/com/enzhico/service/SimpleTest.java rename to springboot-batch/src/test/java/com/xncoding/service/SimpleTest.java index 5849329..e61d6da 100644 --- a/springboot-batch/src/test/java/com/enzhico/service/SimpleTest.java +++ b/springboot-batch/src/test/java/com/xncoding/service/SimpleTest.java @@ -1,4 +1,4 @@ -package com.enzhico.service; +package com.xncoding.service; import org.junit.Test; diff --git a/springboot-cache/README.md b/springboot-cache/README.md index df3a70d..cca42cb 100644 --- a/springboot-cache/README.md +++ b/springboot-cache/README.md @@ -2,6 +2,14 @@ 基于注解的声明式缓存 +## 运行 + +初始化sql文件在`resources/sql/t_user.sql`中 + +另外还需要安装Redis，配置好`application.yml`文件中的redis地址 + +测试用例：`com.xncoding.service.UserServiceTest.java` + ## 许可证 Copyright (c) 2018 Xiong Neng diff --git a/springboot-cache/pom.xml b/springboot-cache/pom.xml index da69b93..4d51768 100644 --- a/springboot-cache/pom.xml +++ b/springboot-cache/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.enzhico + com.xncoding springboot-cache 1.0.0-SNAPSHOT jar diff --git a/springboot-cache/src/main/java/com/xncoding/trans/Application.java b/springboot-cache/src/main/java/com/xncoding/trans/Application.java new file mode 100644 index 0000000..83e2203 --- /dev/null +++ b/springboot-cache/src/main/java/com/xncoding/trans/Application.java @@ -0,0 +1,12 @@ +package com.xncoding.trans; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class Application { + public static void main(String[] args) { + SpringApplication.run(Application.class, args); + } + +} diff --git a/springboot-transaction/src/main/java/com/enzhico/trans/config/DruidProperties.java b/springboot-cache/src/main/java/com/xncoding/trans/config/DruidProperties.java similarity index 99% rename from springboot-transaction/src/main/java/com/enzhico/trans/config/DruidProperties.java rename to springboot-cache/src/main/java/com/xncoding/trans/config/DruidProperties.java index 31e1bf8..6331d4c 100644 --- a/springboot-transaction/src/main/java/com/enzhico/trans/config/DruidProperties.java +++ b/springboot-cache/src/main/java/com/xncoding/trans/config/DruidProperties.java @@ -1,4 +1,4 @@ -package com.enzhico.trans.config; +package com.xncoding.trans.config; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.util.JdbcConstants; diff --git a/springboot-batch/src/main/java/com/enzhico/trans/config/MybatisPlusConfig.java b/springboot-cache/src/main/java/com/xncoding/trans/config/MybatisPlusConfig.java similarity index 86% rename from springboot-batch/src/main/java/com/enzhico/trans/config/MybatisPlusConfig.java rename to springboot-cache/src/main/java/com/xncoding/trans/config/MybatisPlusConfig.java index 34b544e..c71d3c6 100644 --- a/springboot-batch/src/main/java/com/enzhico/trans/config/MybatisPlusConfig.java +++ b/springboot-cache/src/main/java/com/xncoding/trans/config/MybatisPlusConfig.java @@ -1,8 +1,7 @@ -package com.enzhico.trans.config; +package com.xncoding.trans.config; import com.alibaba.druid.pool.DruidDataSource; import com.baomidou.mybatisplus.plugins.PaginationInterceptor; -import com.enzhico.trans.config.properties.DruidProperties; import org.mybatis.spring.annotation.MapperScan; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -18,7 +17,7 @@ import javax.annotation.Resource; */ @Configuration @EnableTransactionManagement(order = 2) -@MapperScan(basePackages = {"com.enzhico.trans.dao.repository"}) +@MapperScan(basePackages = {"com.xncoding.trans.dao.repository"}) public class MybatisPlusConfig { @Resource diff --git a/springboot-cache/src/main/java/com/enzhico/trans/config/RedisCacheConfig.java b/springboot-cache/src/main/java/com/xncoding/trans/config/RedisCacheConfig.java similarity index 89% rename from springboot-cache/src/main/java/com/enzhico/trans/config/RedisCacheConfig.java rename to springboot-cache/src/main/java/com/xncoding/trans/config/RedisCacheConfig.java index b4c2c8c..c288235 100644 --- a/springboot-cache/src/main/java/com/enzhico/trans/config/RedisCacheConfig.java +++ b/springboot-cache/src/main/java/com/xncoding/trans/config/RedisCacheConfig.java @@ -1,4 +1,4 @@ -package com.enzhico.trans.config; +package com.xncoding.trans.config; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -8,8 +8,6 @@ import org.springframework.cache.interceptor.KeyGenerator; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.data.redis.cache.RedisCacheManager; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.EnableTransactionManagement; import java.lang.reflect.Method; import java.util.Arrays; diff --git a/springboot-cache/src/main/java/com/enzhico/trans/dao/entity/User.java b/springboot-cache/src/main/java/com/xncoding/trans/dao/entity/User.java similarity index 96% rename from springboot-cache/src/main/java/com/enzhico/trans/dao/entity/User.java rename to springboot-cache/src/main/java/com/xncoding/trans/dao/entity/User.java index 2e5c34c..217527b 100644 --- a/springboot-cache/src/main/java/com/enzhico/trans/dao/entity/User.java +++ b/springboot-cache/src/main/java/com/xncoding/trans/dao/entity/User.java @@ -1,4 +1,4 @@ -package com.enzhico.trans.dao.entity; +package com.xncoding.trans.dao.entity; import com.baomidou.mybatisplus.activerecord.Model; import com.baomidou.mybatisplus.annotations.TableId; diff --git a/springboot-cache/src/main/java/com/enzhico/trans/dao/repository/UserMapper.java b/springboot-cache/src/main/java/com/xncoding/trans/dao/repository/UserMapper.java similarity index 56% rename from springboot-cache/src/main/java/com/enzhico/trans/dao/repository/UserMapper.java rename to springboot-cache/src/main/java/com/xncoding/trans/dao/repository/UserMapper.java index a7800de..d038163 100644 --- a/springboot-cache/src/main/java/com/enzhico/trans/dao/repository/UserMapper.java +++ b/springboot-cache/src/main/java/com/xncoding/trans/dao/repository/UserMapper.java @@ -1,7 +1,7 @@ -package com.enzhico.trans.dao.repository; +package com.xncoding.trans.dao.repository; import com.baomidou.mybatisplus.mapper.BaseMapper; -import com.enzhico.trans.dao.entity.User; +import com.xncoding.trans.dao.entity.User; public interface UserMapper extends BaseMapper { } diff --git a/springboot-cache/src/main/java/com/enzhico/trans/service/UserService.java b/springboot-cache/src/main/java/com/xncoding/trans/service/UserService.java similarity index 95% rename from springboot-cache/src/main/java/com/enzhico/trans/service/UserService.java rename to springboot-cache/src/main/java/com/xncoding/trans/service/UserService.java index ec0fc72..328be99 100644 --- a/springboot-cache/src/main/java/com/enzhico/trans/service/UserService.java +++ b/springboot-cache/src/main/java/com/xncoding/trans/service/UserService.java @@ -1,7 +1,7 @@ -package com.enzhico.trans.service; +package com.xncoding.trans.service; -import com.enzhico.trans.dao.entity.User; -import com.enzhico.trans.dao.repository.UserMapper; +import com.xncoding.trans.dao.entity.User; +import com.xncoding.trans.dao.repository.UserMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cache.annotation.CacheConfig; diff --git a/springboot-cache/src/main/resources/application.yml b/springboot-cache/src/main/resources/application.yml index eb585e2..01739b4 100644 --- a/springboot-cache/src/main/resources/application.yml +++ b/springboot-cache/src/main/resources/application.yml @@ -2,11 +2,6 @@ ################## 所有profile共有的配置 ################# ########################################################## -################### 自定义项目配置 ################### -enzhico: - kaptcha-open: true #是否开启登录时验证码 (true/false) - session-open: false #是否开启session验证 (true/false) - ################### 项目启动端口 ################### server.port: 8092 @@ -17,13 +12,13 @@ spring: datasource: url: jdbc:mysql://123.207.66.156:3306/test?useSSL=false&autoReconnect=true&tinyInt1isBit=false&useUnicode=true&characterEncoding=utf8 username: root - password: _EnZhi123 + password: ****** ################### mybatis-plus配置 ################### mybatis-plus: - mapper-locations: classpath*:com/enzhico/trans/dao/repository/mapping/*.xml + mapper-locations: classpath*:com/xncoding/trans/dao/repository/mapping/*.xml typeAliasesPackage: > - com.enzhico.trans.dao.entity + com.xncoding.trans.dao.entity global-config: id-type: 0 # 0:数据库ID自增 1:用户输入id 2:全局唯一id(IdWorker) 3:全局唯一ID(uuid) db-column-underline: false @@ -62,6 +57,6 @@ logging: level: ROOT: INFO com: - enzhico: DEBUG + xncoding: DEBUG file: E:/logs/trans.log diff --git a/springboot-cache/src/main/resources/sql/t_user.sql b/springboot-cache/src/main/resources/sql/t_user.sql new file mode 100644 index 0000000..9d042a4 --- /dev/null +++ b/springboot-cache/src/main/resources/sql/t_user.sql @@ -0,0 +1,32 @@ +/* +Navicat MySQL Data Transfer + +Source Server : 123.207.66.156-mysql +Source Server Version : 50718 +Source Host : 123.207.66.156:3306 +Source Database : test + +Target Server Type : MYSQL +Target Server Version : 50718 +File Encoding : 65001 + +Date: 2018-02-27 16:12:19 +*/ + +SET FOREIGN_KEY_CHECKS=0; + +-- ---------------------------- +-- Table structure for t_user +-- ---------------------------- +DROP TABLE IF EXISTS `t_user`; +CREATE TABLE `t_user` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `username` varchar(255) DEFAULT NULL, + `password` varchar(255) DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=96 DEFAULT CHARSET=utf8; + +-- ---------------------------- +-- Records of t_user +-- ---------------------------- +INSERT INTO `t_user` VALUES ('52', 'admin', 'admin'); diff --git a/springboot-cache/src/test/java/com/enzhico/service/UserServiceTest.java b/springboot-cache/src/test/java/com/xncoding/service/UserServiceTest.java similarity index 90% rename from springboot-cache/src/test/java/com/enzhico/service/UserServiceTest.java rename to springboot-cache/src/test/java/com/xncoding/service/UserServiceTest.java index e620411..6d167d7 100644 --- a/springboot-cache/src/test/java/com/enzhico/service/UserServiceTest.java +++ b/springboot-cache/src/test/java/com/xncoding/service/UserServiceTest.java @@ -1,8 +1,8 @@ -package com.enzhico.service; +package com.xncoding.service; -import com.enzhico.trans.Application; -import com.enzhico.trans.dao.entity.User; -import com.enzhico.trans.service.UserService; +import com.xncoding.trans.Application; +import com.xncoding.trans.dao.entity.User; +import com.xncoding.trans.service.UserService; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; diff --git a/springboot-echarts/README.md b/springboot-echarts/README.md index d61c2d3..f836fa3 100644 --- a/springboot-echarts/README.md +++ b/springboot-echarts/README.md @@ -15,16 +15,16 @@ ## 改进方案 -通过配合PhantomJS来实现无浏览器的自动图片生成。 +通过配合PhantomJS来实现无浏览器的自动图片生成。经过测试PhantomJS打开页面后可以连上socket服务器，但是10秒后自动关闭了。 -经过测试PhantomJS打开页面后可以连上socket服务器，但是10秒后自动关闭了。 - -尝试采用页面js轮询方式，1秒轮询一次，有数据的时候就导出图片。 - -结果导出图片太大了，不知道怎么回事，另外轮询方案始终不是很好。 +尝试采用页面js轮询方式，1秒轮询一次，有数据的时候就导出图片。结果导出图片太大了，不知道怎么回事，另外轮询方案始终不是很好。 最后还是老老实实使用websocket方案，自己手动打开这个网页吧。 +## JMH性能测试 + +在包`com.xncoding.benchmark`中，有几个基准测试，并且可将测试结果利用echarts图片导出到图片。 + ## 许可证 Copyright (c) 2018 Xiong Neng diff --git a/springboot-echarts/pom.xml b/springboot-echarts/pom.xml index 26bda03..a6fb0c5 100644 --- a/springboot-echarts/pom.xml +++ b/springboot-echarts/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.enzhico + com.xncoding springboot-echarts 1.0.0-SNAPSHOT jar diff --git a/springboot-echarts/src/main/java/com/enzhico/echarts/Application.java b/springboot-echarts/src/main/java/com/enzhico/echarts/Application.java deleted file mode 100644 index cd7741b..0000000 --- a/springboot-echarts/src/main/java/com/enzhico/echarts/Application.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.enzhico.echarts; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@SpringBootApplication -public class Application { - public static void main(String[] args) { - SpringApplication.run(Application.class, args); - } -} diff --git a/springboot-echarts/src/main/java/com/enzhico/benchmark/common/ResultExporter.java b/springboot-echarts/src/main/java/com/xncoding/benchmark/common/ResultExporter.java similarity index 91% rename from springboot-echarts/src/main/java/com/enzhico/benchmark/common/ResultExporter.java rename to springboot-echarts/src/main/java/com/xncoding/benchmark/common/ResultExporter.java index 0c959c4..e45481b 100644 --- a/springboot-echarts/src/main/java/com/enzhico/benchmark/common/ResultExporter.java +++ b/springboot-echarts/src/main/java/com/xncoding/benchmark/common/ResultExporter.java @@ -1,4 +1,4 @@ -package com.enzhico.benchmark.common; +package com.xncoding.benchmark.common; import org.openjdk.jmh.infra.BenchmarkParams; import org.openjdk.jmh.results.BenchmarkResult; @@ -9,8 +9,8 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import static com.enzhico.echarts.common.util.ExportPngUtil.generateOption; -import static com.enzhico.echarts.common.util.ExportPngUtil.postOption; +import static com.xncoding.echarts.common.util.ExportPngUtil.generateOption; +import static com.xncoding.echarts.common.util.ExportPngUtil.postOption; /** * 将基准测试结果导出图片 diff --git a/springboot-echarts/src/main/java/com/enzhico/benchmark/first/FirstBenchmark.java b/springboot-echarts/src/main/java/com/xncoding/benchmark/first/FirstBenchmark.java similarity index 96% rename from springboot-echarts/src/main/java/com/enzhico/benchmark/first/FirstBenchmark.java rename to springboot-echarts/src/main/java/com/xncoding/benchmark/first/FirstBenchmark.java index 021200d..0de71e9 100644 --- a/springboot-echarts/src/main/java/com/enzhico/benchmark/first/FirstBenchmark.java +++ b/springboot-echarts/src/main/java/com/xncoding/benchmark/first/FirstBenchmark.java @@ -1,4 +1,4 @@ -package com.enzhico.benchmark.first; +package com.xncoding.benchmark.first; import org.openjdk.jmh.annotations.*; import org.openjdk.jmh.runner.Runner; diff --git a/springboot-echarts/src/main/java/com/enzhico/benchmark/json/JsonDeserializeBenchmark.java b/springboot-echarts/src/main/java/com/xncoding/benchmark/json/JsonDeserializeBenchmark.java similarity index 88% rename from springboot-echarts/src/main/java/com/enzhico/benchmark/json/JsonDeserializeBenchmark.java rename to springboot-echarts/src/main/java/com/xncoding/benchmark/json/JsonDeserializeBenchmark.java index 9b6a72b..29801c2 100644 --- a/springboot-echarts/src/main/java/com/enzhico/benchmark/json/JsonDeserializeBenchmark.java +++ b/springboot-echarts/src/main/java/com/xncoding/benchmark/json/JsonDeserializeBenchmark.java @@ -1,12 +1,12 @@ -package com.enzhico.benchmark.json; +package com.xncoding.benchmark.json; -import com.enzhico.benchmark.common.ResultExporter; -import com.enzhico.benchmark.json.model.FullName; -import com.enzhico.benchmark.json.model.Person; -import com.enzhico.benchmark.json.util.FastJsonUtil; -import com.enzhico.benchmark.json.util.GsonUtil; -import com.enzhico.benchmark.json.util.JacksonUtil; -import com.enzhico.benchmark.json.util.JsonLibUtil; +import com.xncoding.benchmark.common.ResultExporter; +import com.xncoding.benchmark.json.model.FullName; +import com.xncoding.benchmark.json.model.Person; +import com.xncoding.benchmark.json.util.FastJsonUtil; +import com.xncoding.benchmark.json.util.GsonUtil; +import com.xncoding.benchmark.json.util.JacksonUtil; +import com.xncoding.benchmark.json.util.JsonLibUtil; import org.openjdk.jmh.annotations.*; import org.openjdk.jmh.results.RunResult; import org.openjdk.jmh.runner.Runner; diff --git a/springboot-echarts/src/main/java/com/enzhico/benchmark/json/JsonSerializeBenchmark.java b/springboot-echarts/src/main/java/com/xncoding/benchmark/json/JsonSerializeBenchmark.java similarity index 80% rename from springboot-echarts/src/main/java/com/enzhico/benchmark/json/JsonSerializeBenchmark.java rename to springboot-echarts/src/main/java/com/xncoding/benchmark/json/JsonSerializeBenchmark.java index 2b71331..e0b0942 100644 --- a/springboot-echarts/src/main/java/com/enzhico/benchmark/json/JsonSerializeBenchmark.java +++ b/springboot-echarts/src/main/java/com/xncoding/benchmark/json/JsonSerializeBenchmark.java @@ -1,14 +1,14 @@ -package com.enzhico.benchmark.json; +package com.xncoding.benchmark.json; -import com.enzhico.benchmark.common.ResultExporter; -import com.enzhico.benchmark.json.model.FullName; -import com.enzhico.benchmark.json.model.Person; -import com.enzhico.benchmark.json.util.FastJsonUtil; -import com.enzhico.benchmark.json.util.GsonUtil; -import com.enzhico.benchmark.json.util.JacksonUtil; -import com.enzhico.benchmark.json.util.JsonLibUtil; -import com.enzhico.benchmark.sum.calc.impl.MultithreadCalculator; -import com.enzhico.benchmark.sum.calc.impl.SinglethreadCalculator; +import com.xncoding.benchmark.common.ResultExporter; +import com.xncoding.benchmark.json.model.FullName; +import com.xncoding.benchmark.json.model.Person; +import com.xncoding.benchmark.json.util.FastJsonUtil; +import com.xncoding.benchmark.json.util.GsonUtil; +import com.xncoding.benchmark.json.util.JacksonUtil; +import com.xncoding.benchmark.json.util.JsonLibUtil; +import com.xncoding.benchmark.sum.calc.impl.MultithreadCalculator; +import com.xncoding.benchmark.sum.calc.impl.SinglethreadCalculator; import org.openjdk.jmh.annotations.*; import org.openjdk.jmh.infra.BenchmarkParams; import org.openjdk.jmh.results.BenchmarkResult; @@ -22,8 +22,8 @@ import java.util.*; import java.util.concurrent.TimeUnit; import java.util.stream.IntStream; -import static com.enzhico.echarts.common.util.ExportPngUtil.generateOption; -import static com.enzhico.echarts.common.util.ExportPngUtil.postOption; +import static com.xncoding.echarts.common.util.ExportPngUtil.generateOption; +import static com.xncoding.echarts.common.util.ExportPngUtil.postOption; /** * Json序列化基准测试 diff --git a/springboot-echarts/src/main/java/com/enzhico/benchmark/json/model/FullName.java b/springboot-echarts/src/main/java/com/xncoding/benchmark/json/model/FullName.java similarity index 96% rename from springboot-echarts/src/main/java/com/enzhico/benchmark/json/model/FullName.java rename to springboot-echarts/src/main/java/com/xncoding/benchmark/json/model/FullName.java index f52a011..36d4ca6 100644 --- a/springboot-echarts/src/main/java/com/enzhico/benchmark/json/model/FullName.java +++ b/springboot-echarts/src/main/java/com/xncoding/benchmark/json/model/FullName.java @@ -1,4 +1,4 @@ -package com.enzhico.benchmark.json.model; +package com.xncoding.benchmark.json.model; /** * FullName diff --git a/springboot-echarts/src/main/java/com/enzhico/benchmark/json/model/Person.java b/springboot-echarts/src/main/java/com/xncoding/benchmark/json/model/Person.java similarity index 97% rename from springboot-echarts/src/main/java/com/enzhico/benchmark/json/model/Person.java rename to springboot-echarts/src/main/java/com/xncoding/benchmark/json/model/Person.java index 1651b16..8a4683d 100644 --- a/springboot-echarts/src/main/java/com/enzhico/benchmark/json/model/Person.java +++ b/springboot-echarts/src/main/java/com/xncoding/benchmark/json/model/Person.java @@ -1,4 +1,4 @@ -package com.enzhico.benchmark.json.model; +package com.xncoding.benchmark.json.model; import java.util.Date; import java.util.List; diff --git a/springboot-echarts/src/main/java/com/enzhico/benchmark/json/util/FastJsonUtil.java b/springboot-echarts/src/main/java/com/xncoding/benchmark/json/util/FastJsonUtil.java similarity index 89% rename from springboot-echarts/src/main/java/com/enzhico/benchmark/json/util/FastJsonUtil.java rename to springboot-echarts/src/main/java/com/xncoding/benchmark/json/util/FastJsonUtil.java index 8cac792..ba0b696 100644 --- a/springboot-echarts/src/main/java/com/enzhico/benchmark/json/util/FastJsonUtil.java +++ b/springboot-echarts/src/main/java/com/xncoding/benchmark/json/util/FastJsonUtil.java @@ -1,4 +1,4 @@ -package com.enzhico.benchmark.json.util; +package com.xncoding.benchmark.json.util; import com.alibaba.fastjson.JSON; diff --git a/springboot-echarts/src/main/java/com/enzhico/benchmark/json/util/GsonUtil.java b/springboot-echarts/src/main/java/com/xncoding/benchmark/json/util/GsonUtil.java similarity index 94% rename from springboot-echarts/src/main/java/com/enzhico/benchmark/json/util/GsonUtil.java rename to springboot-echarts/src/main/java/com/xncoding/benchmark/json/util/GsonUtil.java index 86f32c6..0276598 100644 --- a/springboot-echarts/src/main/java/com/enzhico/benchmark/json/util/GsonUtil.java +++ b/springboot-echarts/src/main/java/com/xncoding/benchmark/json/util/GsonUtil.java @@ -1,4 +1,4 @@ -package com.enzhico.benchmark.json.util; +package com.xncoding.benchmark.json.util; /** * GsonUtil diff --git a/springboot-echarts/src/main/java/com/enzhico/benchmark/json/util/JacksonUtil.java b/springboot-echarts/src/main/java/com/xncoding/benchmark/json/util/JacksonUtil.java similarity index 95% rename from springboot-echarts/src/main/java/com/enzhico/benchmark/json/util/JacksonUtil.java rename to springboot-echarts/src/main/java/com/xncoding/benchmark/json/util/JacksonUtil.java index 3cc048c..7a1e232 100644 --- a/springboot-echarts/src/main/java/com/enzhico/benchmark/json/util/JacksonUtil.java +++ b/springboot-echarts/src/main/java/com/xncoding/benchmark/json/util/JacksonUtil.java @@ -1,4 +1,4 @@ -package com.enzhico.benchmark.json.util; +package com.xncoding.benchmark.json.util; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/springboot-echarts/src/main/java/com/enzhico/benchmark/json/util/JsonLibUtil.java b/springboot-echarts/src/main/java/com/xncoding/benchmark/json/util/JsonLibUtil.java similarity index 92% rename from springboot-echarts/src/main/java/com/enzhico/benchmark/json/util/JsonLibUtil.java rename to springboot-echarts/src/main/java/com/xncoding/benchmark/json/util/JsonLibUtil.java index 0528668..8f10f13 100644 --- a/springboot-echarts/src/main/java/com/enzhico/benchmark/json/util/JsonLibUtil.java +++ b/springboot-echarts/src/main/java/com/xncoding/benchmark/json/util/JsonLibUtil.java @@ -1,4 +1,4 @@ -package com.enzhico.benchmark.json.util; +package com.xncoding.benchmark.json.util; import net.sf.json.JSONObject; diff --git a/springboot-echarts/src/main/java/com/enzhico/benchmark/string/StringBuilderBenchmark.java b/springboot-echarts/src/main/java/com/xncoding/benchmark/string/StringBuilderBenchmark.java similarity index 97% rename from springboot-echarts/src/main/java/com/enzhico/benchmark/string/StringBuilderBenchmark.java rename to springboot-echarts/src/main/java/com/xncoding/benchmark/string/StringBuilderBenchmark.java index 6b97b4e..5101e83 100644 --- a/springboot-echarts/src/main/java/com/enzhico/benchmark/string/StringBuilderBenchmark.java +++ b/springboot-echarts/src/main/java/com/xncoding/benchmark/string/StringBuilderBenchmark.java @@ -1,4 +1,4 @@ -package com.enzhico.benchmark.string; +package com.xncoding.benchmark.string; import org.openjdk.jmh.annotations.*; import org.openjdk.jmh.runner.Runner; diff --git a/springboot-echarts/src/main/java/com/enzhico/benchmark/sum/SecondBenchmark.java b/springboot-echarts/src/main/java/com/xncoding/benchmark/sum/SecondBenchmark.java similarity index 86% rename from springboot-echarts/src/main/java/com/enzhico/benchmark/sum/SecondBenchmark.java rename to springboot-echarts/src/main/java/com/xncoding/benchmark/sum/SecondBenchmark.java index cefbdb5..baf147b 100644 --- a/springboot-echarts/src/main/java/com/enzhico/benchmark/sum/SecondBenchmark.java +++ b/springboot-echarts/src/main/java/com/xncoding/benchmark/sum/SecondBenchmark.java @@ -1,9 +1,9 @@ -package com.enzhico.benchmark.sum; +package com.xncoding.benchmark.sum; -import com.enzhico.benchmark.common.ResultExporter; -import com.enzhico.benchmark.sum.calc.Calculator; -import com.enzhico.benchmark.sum.calc.impl.MultithreadCalculator; -import com.enzhico.benchmark.sum.calc.impl.SinglethreadCalculator; +import com.xncoding.benchmark.common.ResultExporter; +import com.xncoding.benchmark.sum.calc.Calculator; +import com.xncoding.benchmark.sum.calc.impl.MultithreadCalculator; +import com.xncoding.benchmark.sum.calc.impl.SinglethreadCalculator; import org.openjdk.jmh.annotations.*; import org.openjdk.jmh.results.RunResult; import org.openjdk.jmh.runner.Runner; diff --git a/springboot-echarts/src/main/java/com/enzhico/benchmark/sum/calc/Calculator.java b/springboot-echarts/src/main/java/com/xncoding/benchmark/sum/calc/Calculator.java similarity index 89% rename from springboot-echarts/src/main/java/com/enzhico/benchmark/sum/calc/Calculator.java rename to springboot-echarts/src/main/java/com/xncoding/benchmark/sum/calc/Calculator.java index 6b57d14..f827293 100644 --- a/springboot-echarts/src/main/java/com/enzhico/benchmark/sum/calc/Calculator.java +++ b/springboot-echarts/src/main/java/com/xncoding/benchmark/sum/calc/Calculator.java @@ -1,4 +1,4 @@ -package com.enzhico.benchmark.sum.calc; +package com.xncoding.benchmark.sum.calc; /** * Calculator diff --git a/springboot-echarts/src/main/java/com/enzhico/benchmark/sum/calc/impl/MultithreadCalculator.java b/springboot-echarts/src/main/java/com/xncoding/benchmark/sum/calc/impl/MultithreadCalculator.java similarity index 95% rename from springboot-echarts/src/main/java/com/enzhico/benchmark/sum/calc/impl/MultithreadCalculator.java rename to springboot-echarts/src/main/java/com/xncoding/benchmark/sum/calc/impl/MultithreadCalculator.java index c637332..1f57314 100644 --- a/springboot-echarts/src/main/java/com/enzhico/benchmark/sum/calc/impl/MultithreadCalculator.java +++ b/springboot-echarts/src/main/java/com/xncoding/benchmark/sum/calc/impl/MultithreadCalculator.java @@ -1,6 +1,6 @@ -package com.enzhico.benchmark.sum.calc.impl; +package com.xncoding.benchmark.sum.calc.impl; -import com.enzhico.benchmark.sum.calc.Calculator; +import com.xncoding.benchmark.sum.calc.Calculator; import java.util.ArrayList; import java.util.List; diff --git a/springboot-echarts/src/main/java/com/enzhico/benchmark/sum/calc/impl/SinglethreadCalculator.java b/springboot-echarts/src/main/java/com/xncoding/benchmark/sum/calc/impl/SinglethreadCalculator.java similarity index 80% rename from springboot-echarts/src/main/java/com/enzhico/benchmark/sum/calc/impl/SinglethreadCalculator.java rename to springboot-echarts/src/main/java/com/xncoding/benchmark/sum/calc/impl/SinglethreadCalculator.java index 1cf84a7..df0b4e0 100644 --- a/springboot-echarts/src/main/java/com/enzhico/benchmark/sum/calc/impl/SinglethreadCalculator.java +++ b/springboot-echarts/src/main/java/com/xncoding/benchmark/sum/calc/impl/SinglethreadCalculator.java @@ -1,6 +1,6 @@ -package com.enzhico.benchmark.sum.calc.impl; +package com.xncoding.benchmark.sum.calc.impl; -import com.enzhico.benchmark.sum.calc.Calculator; +import com.xncoding.benchmark.sum.calc.Calculator; /** * SinglethreadCalculator diff --git a/springboot-echarts/src/main/java/com/xncoding/echarts/Application.java b/springboot-echarts/src/main/java/com/xncoding/echarts/Application.java new file mode 100644 index 0000000..f0e9961 --- /dev/null +++ b/springboot-echarts/src/main/java/com/xncoding/echarts/Application.java @@ -0,0 +1,11 @@ +package com.xncoding.echarts; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class Application { + public static void main(String[] args) { + SpringApplication.run(Application.class, args); + } +} diff --git a/springboot-echarts/src/main/java/com/enzhico/echarts/api/PublicController.java b/springboot-echarts/src/main/java/com/xncoding/echarts/api/PublicController.java similarity index 95% rename from springboot-echarts/src/main/java/com/enzhico/echarts/api/PublicController.java rename to springboot-echarts/src/main/java/com/xncoding/echarts/api/PublicController.java index cac1df3..7b2c870 100644 --- a/springboot-echarts/src/main/java/com/enzhico/echarts/api/PublicController.java +++ b/springboot-echarts/src/main/java/com/xncoding/echarts/api/PublicController.java @@ -1,12 +1,12 @@ -package com.enzhico.echarts.api; +package com.xncoding.echarts.api; import com.corundumstudio.socketio.AckRequest; import com.corundumstudio.socketio.SocketIOClient; import com.corundumstudio.socketio.annotation.OnEvent; -import com.enzhico.echarts.api.model.BaseResponse; -import com.enzhico.echarts.api.model.EchartsData; -import com.enzhico.echarts.api.model.PicRequest; -import com.enzhico.echarts.service.ApiService; +import com.xncoding.echarts.api.model.BaseResponse; +import com.xncoding.echarts.api.model.EchartsData; +import com.xncoding.echarts.api.model.PicRequest; +import com.xncoding.echarts.service.ApiService; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.commons.io.IOUtils; diff --git a/springboot-echarts/src/main/java/com/enzhico/echarts/api/model/BaseResponse.java b/springboot-echarts/src/main/java/com/xncoding/echarts/api/model/BaseResponse.java similarity index 95% rename from springboot-echarts/src/main/java/com/enzhico/echarts/api/model/BaseResponse.java rename to springboot-echarts/src/main/java/com/xncoding/echarts/api/model/BaseResponse.java index 6400b8e..6d45b82 100644 --- a/springboot-echarts/src/main/java/com/enzhico/echarts/api/model/BaseResponse.java +++ b/springboot-echarts/src/main/java/com/xncoding/echarts/api/model/BaseResponse.java @@ -1,4 +1,4 @@ -package com.enzhico.echarts.api.model; +package com.xncoding.echarts.api.model; /** * API接口的基础返回类 diff --git a/springboot-echarts/src/main/java/com/enzhico/echarts/api/model/EchartsData.java b/springboot-echarts/src/main/java/com/xncoding/echarts/api/model/EchartsData.java similarity index 94% rename from springboot-echarts/src/main/java/com/enzhico/echarts/api/model/EchartsData.java rename to springboot-echarts/src/main/java/com/xncoding/echarts/api/model/EchartsData.java index f23a97c..ed1d3d7 100644 --- a/springboot-echarts/src/main/java/com/enzhico/echarts/api/model/EchartsData.java +++ b/springboot-echarts/src/main/java/com/xncoding/echarts/api/model/EchartsData.java @@ -1,4 +1,4 @@ -package com.enzhico.echarts.api.model; +package com.xncoding.echarts.api.model; /** * EchartsData diff --git a/springboot-echarts/src/main/java/com/enzhico/echarts/api/model/PicRequest.java b/springboot-echarts/src/main/java/com/xncoding/echarts/api/model/PicRequest.java similarity index 89% rename from springboot-echarts/src/main/java/com/enzhico/echarts/api/model/PicRequest.java rename to springboot-echarts/src/main/java/com/xncoding/echarts/api/model/PicRequest.java index 69ddc87..8782954 100644 --- a/springboot-echarts/src/main/java/com/enzhico/echarts/api/model/PicRequest.java +++ b/springboot-echarts/src/main/java/com/xncoding/echarts/api/model/PicRequest.java @@ -1,4 +1,4 @@ -package com.enzhico.echarts.api.model; +package com.xncoding.echarts.api.model; /** * PicRequest diff --git a/springboot-echarts/src/main/java/com/enzhico/echarts/api/model/jmh/AxisPointer.java b/springboot-echarts/src/main/java/com/xncoding/echarts/api/model/jmh/AxisPointer.java similarity index 89% rename from springboot-echarts/src/main/java/com/enzhico/echarts/api/model/jmh/AxisPointer.java rename to springboot-echarts/src/main/java/com/xncoding/echarts/api/model/jmh/AxisPointer.java index 4b05f15..564cd96 100644 --- a/springboot-echarts/src/main/java/com/enzhico/echarts/api/model/jmh/AxisPointer.java +++ b/springboot-echarts/src/main/java/com/xncoding/echarts/api/model/jmh/AxisPointer.java @@ -1,4 +1,4 @@ -package com.enzhico.echarts.api.model.jmh; +package com.xncoding.echarts.api.model.jmh; /** * AxisPointer diff --git a/springboot-echarts/src/main/java/com/enzhico/echarts/api/model/jmh/Feature.java b/springboot-echarts/src/main/java/com/xncoding/echarts/api/model/jmh/Feature.java similarity index 91% rename from springboot-echarts/src/main/java/com/enzhico/echarts/api/model/jmh/Feature.java rename to springboot-echarts/src/main/java/com/xncoding/echarts/api/model/jmh/Feature.java index 152a082..7e1154b 100644 --- a/springboot-echarts/src/main/java/com/enzhico/echarts/api/model/jmh/Feature.java +++ b/springboot-echarts/src/main/java/com/xncoding/echarts/api/model/jmh/Feature.java @@ -1,4 +1,4 @@ -package com.enzhico.echarts.api.model.jmh; +package com.xncoding.echarts.api.model.jmh; /** * Feature diff --git a/springboot-echarts/src/main/java/com/enzhico/echarts/api/model/jmh/Grid.java b/springboot-echarts/src/main/java/com/xncoding/echarts/api/model/jmh/Grid.java similarity index 88% rename from springboot-echarts/src/main/java/com/enzhico/echarts/api/model/jmh/Grid.java rename to springboot-echarts/src/main/java/com/xncoding/echarts/api/model/jmh/Grid.java index adbbf81..1c0237b 100644 --- a/springboot-echarts/src/main/java/com/enzhico/echarts/api/model/jmh/Grid.java +++ b/springboot-echarts/src/main/java/com/xncoding/echarts/api/model/jmh/Grid.java @@ -1,4 +1,4 @@ -package com.enzhico.echarts.api.model.jmh; +package com.xncoding.echarts.api.model.jmh; /** * Grid diff --git a/springboot-echarts/src/main/java/com/enzhico/echarts/api/model/jmh/Label.java b/springboot-echarts/src/main/java/com/xncoding/echarts/api/model/jmh/Label.java similarity index 89% rename from springboot-echarts/src/main/java/com/enzhico/echarts/api/model/jmh/Label.java rename to springboot-echarts/src/main/java/com/xncoding/echarts/api/model/jmh/Label.java index 166f3a2..d4b724b 100644 --- a/springboot-echarts/src/main/java/com/enzhico/echarts/api/model/jmh/Label.java +++ b/springboot-echarts/src/main/java/com/xncoding/echarts/api/model/jmh/Label.java @@ -1,4 +1,4 @@ -package com.enzhico.echarts.api.model.jmh; +package com.xncoding.echarts.api.model.jmh; /** * Label diff --git a/springboot-echarts/src/main/java/com/enzhico/echarts/api/model/jmh/Legend.java b/springboot-echarts/src/main/java/com/xncoding/echarts/api/model/jmh/Legend.java similarity index 90% rename from springboot-echarts/src/main/java/com/enzhico/echarts/api/model/jmh/Legend.java rename to springboot-echarts/src/main/java/com/xncoding/echarts/api/model/jmh/Legend.java index 54766c8..7bf93bf 100644 --- a/springboot-echarts/src/main/java/com/enzhico/echarts/api/model/jmh/Legend.java +++ b/springboot-echarts/src/main/java/com/xncoding/echarts/api/model/jmh/Legend.java @@ -1,4 +1,4 @@ -package com.enzhico.echarts.api.model.jmh; +package com.xncoding.echarts.api.model.jmh; import java.util.List; diff --git a/springboot-echarts/src/main/java/com/enzhico/echarts/api/model/jmh/Normal.java b/springboot-echarts/src/main/java/com/xncoding/echarts/api/model/jmh/Normal.java similarity index 93% rename from springboot-echarts/src/main/java/com/enzhico/echarts/api/model/jmh/Normal.java rename to springboot-echarts/src/main/java/com/xncoding/echarts/api/model/jmh/Normal.java index fb7d99d..f90a72a 100644 --- a/springboot-echarts/src/main/java/com/enzhico/echarts/api/model/jmh/Normal.java +++ b/springboot-echarts/src/main/java/com/xncoding/echarts/api/model/jmh/Normal.java @@ -1,4 +1,4 @@ -package com.enzhico.echarts.api.model.jmh; +package com.xncoding.echarts.api.model.jmh; /** * Normal diff --git a/springboot-echarts/src/main/java/com/enzhico/echarts/api/model/jmh/Option.java b/springboot-echarts/src/main/java/com/xncoding/echarts/api/model/jmh/Option.java similarity index 97% rename from springboot-echarts/src/main/java/com/enzhico/echarts/api/model/jmh/Option.java rename to springboot-echarts/src/main/java/com/xncoding/echarts/api/model/jmh/Option.java index 267937c..a3624eb 100644 --- a/springboot-echarts/src/main/java/com/enzhico/echarts/api/model/jmh/Option.java +++ b/springboot-echarts/src/main/java/com/xncoding/echarts/api/model/jmh/Option.java @@ -1,4 +1,4 @@ -package com.enzhico.echarts.api.model.jmh; +package com.xncoding.echarts.api.model.jmh; import java.util.List; diff --git a/springboot-echarts/src/main/java/com/enzhico/echarts/api/model/jmh/SaveAsImage.java b/springboot-echarts/src/main/java/com/xncoding/echarts/api/model/jmh/SaveAsImage.java similarity index 89% rename from springboot-echarts/src/main/java/com/enzhico/echarts/api/model/jmh/SaveAsImage.java rename to springboot-echarts/src/main/java/com/xncoding/echarts/api/model/jmh/SaveAsImage.java index c5a924a..b28c626 100644 --- a/springboot-echarts/src/main/java/com/enzhico/echarts/api/model/jmh/SaveAsImage.java +++ b/springboot-echarts/src/main/java/com/xncoding/echarts/api/model/jmh/SaveAsImage.java @@ -1,4 +1,4 @@ -package com.enzhico.echarts.api.model.jmh; +package com.xncoding.echarts.api.model.jmh; /** * SaveAsImage diff --git a/springboot-echarts/src/main/java/com/enzhico/echarts/api/model/jmh/Serie.java b/springboot-echarts/src/main/java/com/xncoding/echarts/api/model/jmh/Serie.java similarity index 94% rename from springboot-echarts/src/main/java/com/enzhico/echarts/api/model/jmh/Serie.java rename to springboot-echarts/src/main/java/com/xncoding/echarts/api/model/jmh/Serie.java index ca48d3d..0842e58 100644 --- a/springboot-echarts/src/main/java/com/enzhico/echarts/api/model/jmh/Serie.java +++ b/springboot-echarts/src/main/java/com/xncoding/echarts/api/model/jmh/Serie.java @@ -1,4 +1,4 @@ -package com.enzhico.echarts.api.model.jmh; +package com.xncoding.echarts.api.model.jmh; import java.util.List; diff --git a/springboot-echarts/src/main/java/com/enzhico/echarts/api/model/jmh/Title.java b/springboot-echarts/src/main/java/com/xncoding/echarts/api/model/jmh/Title.java similarity index 85% rename from springboot-echarts/src/main/java/com/enzhico/echarts/api/model/jmh/Title.java rename to springboot-echarts/src/main/java/com/xncoding/echarts/api/model/jmh/Title.java index 9b1226b..fdec6ed 100644 --- a/springboot-echarts/src/main/java/com/enzhico/echarts/api/model/jmh/Title.java +++ b/springboot-echarts/src/main/java/com/xncoding/echarts/api/model/jmh/Title.java @@ -1,4 +1,4 @@ -package com.enzhico.echarts.api.model.jmh; +package com.xncoding.echarts.api.model.jmh; /** * Title diff --git a/springboot-echarts/src/main/java/com/enzhico/echarts/api/model/jmh/Toolbox.java b/springboot-echarts/src/main/java/com/xncoding/echarts/api/model/jmh/Toolbox.java similarity index 93% rename from springboot-echarts/src/main/java/com/enzhico/echarts/api/model/jmh/Toolbox.java rename to springboot-echarts/src/main/java/com/xncoding/echarts/api/model/jmh/Toolbox.java index ffdcf54..49eafd4 100644 --- a/springboot-echarts/src/main/java/com/enzhico/echarts/api/model/jmh/Toolbox.java +++ b/springboot-echarts/src/main/java/com/xncoding/echarts/api/model/jmh/Toolbox.java @@ -1,4 +1,4 @@ -package com.enzhico.echarts.api.model.jmh; +package com.xncoding.echarts.api.model.jmh; /** * Toolbox diff --git a/springboot-echarts/src/main/java/com/enzhico/echarts/api/model/jmh/Tooltip.java b/springboot-echarts/src/main/java/com/xncoding/echarts/api/model/jmh/Tooltip.java similarity index 93% rename from springboot-echarts/src/main/java/com/enzhico/echarts/api/model/jmh/Tooltip.java rename to springboot-echarts/src/main/java/com/xncoding/echarts/api/model/jmh/Tooltip.java index 78af234..3d0ab9f 100644 --- a/springboot-echarts/src/main/java/com/enzhico/echarts/api/model/jmh/Tooltip.java +++ b/springboot-echarts/src/main/java/com/xncoding/echarts/api/model/jmh/Tooltip.java @@ -1,4 +1,4 @@ -package com.enzhico.echarts.api.model.jmh; +package com.xncoding.echarts.api.model.jmh; /** * Tooltip diff --git a/springboot-echarts/src/main/java/com/enzhico/echarts/api/model/jmh/XAxis.java b/springboot-echarts/src/main/java/com/xncoding/echarts/api/model/jmh/XAxis.java similarity index 92% rename from springboot-echarts/src/main/java/com/enzhico/echarts/api/model/jmh/XAxis.java rename to springboot-echarts/src/main/java/com/xncoding/echarts/api/model/jmh/XAxis.java index 1173252..bcd0eda 100644 --- a/springboot-echarts/src/main/java/com/enzhico/echarts/api/model/jmh/XAxis.java +++ b/springboot-echarts/src/main/java/com/xncoding/echarts/api/model/jmh/XAxis.java @@ -1,4 +1,4 @@ -package com.enzhico.echarts.api.model.jmh; +package com.xncoding.echarts.api.model.jmh; /** * XAxis diff --git a/springboot-echarts/src/main/java/com/enzhico/echarts/api/model/jmh/YAxis.java b/springboot-echarts/src/main/java/com/xncoding/echarts/api/model/jmh/YAxis.java similarity index 96% rename from springboot-echarts/src/main/java/com/enzhico/echarts/api/model/jmh/YAxis.java rename to springboot-echarts/src/main/java/com/xncoding/echarts/api/model/jmh/YAxis.java index 81a4195..080e097 100644 --- a/springboot-echarts/src/main/java/com/enzhico/echarts/api/model/jmh/YAxis.java +++ b/springboot-echarts/src/main/java/com/xncoding/echarts/api/model/jmh/YAxis.java @@ -1,4 +1,4 @@ -package com.enzhico.echarts.api.model.jmh; +package com.xncoding.echarts.api.model.jmh; import java.util.List; diff --git a/springboot-echarts/src/main/java/com/enzhico/echarts/api/model/jmh/YAxisLabel.java b/springboot-echarts/src/main/java/com/xncoding/echarts/api/model/jmh/YAxisLabel.java similarity index 89% rename from springboot-echarts/src/main/java/com/enzhico/echarts/api/model/jmh/YAxisLabel.java rename to springboot-echarts/src/main/java/com/xncoding/echarts/api/model/jmh/YAxisLabel.java index 20bd4dd..b5d72b1 100644 --- a/springboot-echarts/src/main/java/com/enzhico/echarts/api/model/jmh/YAxisLabel.java +++ b/springboot-echarts/src/main/java/com/xncoding/echarts/api/model/jmh/YAxisLabel.java @@ -1,4 +1,4 @@ -package com.enzhico.echarts.api.model.jmh; +package com.xncoding.echarts.api.model.jmh; /** * YAxisLabel diff --git a/springboot-echarts/src/main/java/com/enzhico/echarts/common/ServerRunner.java b/springboot-echarts/src/main/java/com/xncoding/echarts/common/ServerRunner.java similarity index 94% rename from springboot-echarts/src/main/java/com/enzhico/echarts/common/ServerRunner.java rename to springboot-echarts/src/main/java/com/xncoding/echarts/common/ServerRunner.java index ea0cddb..6b9c1ee 100644 --- a/springboot-echarts/src/main/java/com/enzhico/echarts/common/ServerRunner.java +++ b/springboot-echarts/src/main/java/com/xncoding/echarts/common/ServerRunner.java @@ -1,7 +1,7 @@ -package com.enzhico.echarts.common; +package com.xncoding.echarts.common; import com.corundumstudio.socketio.SocketIOServer; -import com.enzhico.echarts.config.properties.MyProperties; +import com.xncoding.echarts.config.properties.MyProperties; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/springboot-echarts/src/main/java/com/enzhico/echarts/common/constants/MsgType.java b/springboot-echarts/src/main/java/com/xncoding/echarts/common/constants/MsgType.java similarity index 81% rename from springboot-echarts/src/main/java/com/enzhico/echarts/common/constants/MsgType.java rename to springboot-echarts/src/main/java/com/xncoding/echarts/common/constants/MsgType.java index 48614d9..dd71019 100644 --- a/springboot-echarts/src/main/java/com/enzhico/echarts/common/constants/MsgType.java +++ b/springboot-echarts/src/main/java/com/xncoding/echarts/common/constants/MsgType.java @@ -1,4 +1,4 @@ -package com.enzhico.echarts.common.constants; +package com.xncoding.echarts.common.constants; /** * 消息类型 diff --git a/springboot-echarts/src/main/java/com/enzhico/echarts/common/util/CommonUtil.java b/springboot-echarts/src/main/java/com/xncoding/echarts/common/util/CommonUtil.java similarity index 96% rename from springboot-echarts/src/main/java/com/enzhico/echarts/common/util/CommonUtil.java rename to springboot-echarts/src/main/java/com/xncoding/echarts/common/util/CommonUtil.java index bf273bf..91978ac 100644 --- a/springboot-echarts/src/main/java/com/enzhico/echarts/common/util/CommonUtil.java +++ b/springboot-echarts/src/main/java/com/xncoding/echarts/common/util/CommonUtil.java @@ -1,4 +1,4 @@ -package com.enzhico.echarts.common.util; +package com.xncoding.echarts.common.util; /** * 常用工具类，字符串、数字相关 diff --git a/springboot-echarts/src/main/java/com/enzhico/echarts/common/util/ExportPngUtil.java b/springboot-echarts/src/main/java/com/xncoding/echarts/common/util/ExportPngUtil.java similarity index 96% rename from springboot-echarts/src/main/java/com/enzhico/echarts/common/util/ExportPngUtil.java rename to springboot-echarts/src/main/java/com/xncoding/echarts/common/util/ExportPngUtil.java index 48d7546..b1f7fba 100644 --- a/springboot-echarts/src/main/java/com/enzhico/echarts/common/util/ExportPngUtil.java +++ b/springboot-echarts/src/main/java/com/xncoding/echarts/common/util/ExportPngUtil.java @@ -1,6 +1,6 @@ -package com.enzhico.echarts.common.util; +package com.xncoding.echarts.common.util; -import com.enzhico.echarts.api.model.jmh.*; +import com.xncoding.echarts.api.model.jmh.*; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import okhttp3.*; diff --git a/springboot-echarts/src/main/java/com/enzhico/echarts/config/NettySocketConfig.java b/springboot-echarts/src/main/java/com/xncoding/echarts/config/NettySocketConfig.java similarity index 92% rename from springboot-echarts/src/main/java/com/enzhico/echarts/config/NettySocketConfig.java rename to springboot-echarts/src/main/java/com/xncoding/echarts/config/NettySocketConfig.java index 77b1c5a..2433975 100644 --- a/springboot-echarts/src/main/java/com/enzhico/echarts/config/NettySocketConfig.java +++ b/springboot-echarts/src/main/java/com/xncoding/echarts/config/NettySocketConfig.java @@ -1,9 +1,9 @@ -package com.enzhico.echarts.config; +package com.xncoding.echarts.config; import com.corundumstudio.socketio.SocketIOServer; import com.corundumstudio.socketio.annotation.SpringAnnotationScanner; -import com.enzhico.echarts.config.properties.MyProperties; -import com.enzhico.echarts.service.ApiService; +import com.xncoding.echarts.config.properties.MyProperties; +import com.xncoding.echarts.service.ApiService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Bean; diff --git a/springboot-echarts/src/main/java/com/enzhico/echarts/config/properties/MyProperties.java b/springboot-echarts/src/main/java/com/xncoding/echarts/config/properties/MyProperties.java similarity index 94% rename from springboot-echarts/src/main/java/com/enzhico/echarts/config/properties/MyProperties.java rename to springboot-echarts/src/main/java/com/xncoding/echarts/config/properties/MyProperties.java index b30c0ab..a32689a 100644 --- a/springboot-echarts/src/main/java/com/enzhico/echarts/config/properties/MyProperties.java +++ b/springboot-echarts/src/main/java/com/xncoding/echarts/config/properties/MyProperties.java @@ -1,4 +1,4 @@ -package com.enzhico.echarts.config.properties; +package com.xncoding.echarts.config.properties; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; @@ -11,7 +11,7 @@ import org.springframework.stereotype.Component; * @since 2018/01/06 21:09 */ @Component -@ConfigurationProperties(prefix = "enzhico") +@ConfigurationProperties(prefix = "xncoding") public class MyProperties { /** * socket端口 diff --git a/springboot-echarts/src/main/java/com/enzhico/echarts/controller/IndexController.java b/springboot-echarts/src/main/java/com/xncoding/echarts/controller/IndexController.java similarity index 89% rename from springboot-echarts/src/main/java/com/enzhico/echarts/controller/IndexController.java rename to springboot-echarts/src/main/java/com/xncoding/echarts/controller/IndexController.java index 8ab7139..54e4d98 100644 --- a/springboot-echarts/src/main/java/com/enzhico/echarts/controller/IndexController.java +++ b/springboot-echarts/src/main/java/com/xncoding/echarts/controller/IndexController.java @@ -1,4 +1,4 @@ -package com.enzhico.echarts.controller; +package com.xncoding.echarts.controller; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/springboot-echarts/src/main/java/com/enzhico/echarts/handler/MessageEventHandler.java b/springboot-echarts/src/main/java/com/xncoding/echarts/handler/MessageEventHandler.java similarity index 93% rename from springboot-echarts/src/main/java/com/enzhico/echarts/handler/MessageEventHandler.java rename to springboot-echarts/src/main/java/com/xncoding/echarts/handler/MessageEventHandler.java index 8afc95e..acbcc8c 100644 --- a/springboot-echarts/src/main/java/com/enzhico/echarts/handler/MessageEventHandler.java +++ b/springboot-echarts/src/main/java/com/xncoding/echarts/handler/MessageEventHandler.java @@ -1,4 +1,4 @@ -package com.enzhico.echarts.handler; +package com.xncoding.echarts.handler; import com.corundumstudio.socketio.AckRequest; import com.corundumstudio.socketio.SocketIOClient; @@ -6,9 +6,9 @@ import com.corundumstudio.socketio.SocketIOServer; import com.corundumstudio.socketio.annotation.OnConnect; import com.corundumstudio.socketio.annotation.OnDisconnect; import com.corundumstudio.socketio.annotation.OnEvent; -import com.enzhico.echarts.common.constants.MsgType; -import com.enzhico.echarts.config.properties.MyProperties; -import com.enzhico.echarts.service.ApiService; +import com.xncoding.echarts.common.constants.MsgType; +import com.xncoding.echarts.config.properties.MyProperties; +import com.xncoding.echarts.service.ApiService; import io.socket.client.Socket; import org.apache.commons.codec.binary.Base64; import org.apache.commons.io.IOUtils; diff --git a/springboot-echarts/src/main/java/com/enzhico/echarts/service/ApiService.java b/springboot-echarts/src/main/java/com/xncoding/echarts/service/ApiService.java similarity index 96% rename from springboot-echarts/src/main/java/com/enzhico/echarts/service/ApiService.java rename to springboot-echarts/src/main/java/com/xncoding/echarts/service/ApiService.java index 0cebe82..6ebb102 100644 --- a/springboot-echarts/src/main/java/com/enzhico/echarts/service/ApiService.java +++ b/springboot-echarts/src/main/java/com/xncoding/echarts/service/ApiService.java @@ -1,8 +1,8 @@ -package com.enzhico.echarts.service; +package com.xncoding.echarts.service; import com.corundumstudio.socketio.SocketIOClient; import com.corundumstudio.socketio.SocketIOServer; -import com.enzhico.echarts.config.properties.MyProperties; +import com.xncoding.echarts.config.properties.MyProperties; import org.apache.commons.codec.binary.Base64; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; diff --git a/springboot-echarts/src/main/resources/application.yml b/springboot-echarts/src/main/resources/application.yml index 90c34de..868ec26 100644 --- a/springboot-echarts/src/main/resources/application.yml +++ b/springboot-echarts/src/main/resources/application.yml @@ -3,7 +3,7 @@ ########################################################## ################### 自定义项目配置 ################### -enzhico: +xncoding: socket-port: 9076 #socket端口 ping-interval: 60000 #Ping消息间隔（毫秒） ping-timeout: 180000 #Ping消息超时时间（毫秒） @@ -35,7 +35,7 @@ logging: spring: profiles: dev -enzhico: +xncoding: image-dir: E:/pics/ load-js: E:/pics/html/js/echarts-load.js index-html: file:///E:/pics/html/index.html @@ -44,7 +44,7 @@ logging: level: ROOT: INFO com: - enzhico: DEBUG + xncoding: DEBUG file: E:/logs/sb-ehcharts.log --- @@ -56,7 +56,7 @@ logging: spring: profiles: test -enzhico: +xncoding: image-dir: /var/pics/echarts/ load-js: /usr/share/nginx/html/echarts/js/echarts-load.js index-html: file:///usr/share/nginx/html/echarts/index.html @@ -65,6 +65,6 @@ logging: level: ROOT: INFO com: - enzhico: DEBUG + xncoding: DEBUG file: /var/logs/sb-ehcharts.log diff --git a/springboot-echarts/src/test/java/com/enzhico/echarts/common/util/CommonUtilTest.java b/springboot-echarts/src/test/java/com/xncoding/echarts/common/util/CommonUtilTest.java similarity index 88% rename from springboot-echarts/src/test/java/com/enzhico/echarts/common/util/CommonUtilTest.java rename to springboot-echarts/src/test/java/com/xncoding/echarts/common/util/CommonUtilTest.java index 0b2414f..f2df54f 100644 --- a/springboot-echarts/src/test/java/com/enzhico/echarts/common/util/CommonUtilTest.java +++ b/springboot-echarts/src/test/java/com/xncoding/echarts/common/util/CommonUtilTest.java @@ -1,6 +1,6 @@ -package com.enzhico.echarts.common.util; +package com.xncoding.echarts.common.util; -import com.enzhico.echarts.api.model.jmh.*; +import com.xncoding.echarts.api.model.jmh.*; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectWriter; @@ -12,8 +12,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import static com.enzhico.echarts.common.util.ExportPngUtil.generateOption; -import static com.enzhico.echarts.common.util.ExportPngUtil.postOption; +import static com.xncoding.echarts.common.util.ExportPngUtil.generateOption; +import static com.xncoding.echarts.common.util.ExportPngUtil.postOption; import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; diff --git a/springboot-mybatis/.gitignore b/springboot-mybatis/.gitignore new file mode 100644 index 0000000..9d8e7cc --- /dev/null +++ b/springboot-mybatis/.gitignore @@ -0,0 +1,10 @@ +.idea/ +target/ +*.iml +*.ipr +*.iws +*.log +.svn/ +.project +rebel.xml +.rebel-remote.xml.* diff --git a/springboot-mybatis/LICENSE b/springboot-mybatis/LICENSE new file mode 100644 index 0000000..83cd47d --- /dev/null +++ b/springboot-mybatis/LICENSE @@ -0,0 +1,20 @@ +The MIT License (MIT) + +Copyright (c) 2018 Xiong Neng + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/springboot-mybatis/README.md b/springboot-mybatis/README.md new file mode 100644 index 0000000..db9c547 --- /dev/null +++ b/springboot-mybatis/README.md @@ -0,0 +1,28 @@ +## 集成MyBatis + +SpringBoot集成MyBatis做DAO层，并使用mybatis-plus框架来简化对MyBatis的操作。 + +## 安装MySQL数据库 + +数据库的安装教程网上非常多，版本最好是mysql5.5+ + +配置数据库的账号和密码。 + +## 修改application.yml + +修改配置文件，主要是mysql的账号和密码 + +## 数据库初始化 + +创建数据库pos，然后执行SQL文件`src/main/resources/sql/schema.sql`，创建t_user表 + +## 运行测试用例 + +执行对用户表增/删/改/查的测试用例：`com.xncoding.pos.ApplicationTests.java` + + +## 许可证 + +Copyright (c) 2018 Xiong Neng + +基于 MIT 协议发布: diff --git a/springboot-mybatis/pom.xml b/springboot-mybatis/pom.xml new file mode 100644 index 0000000..f08ba44 --- /dev/null +++ b/springboot-mybatis/pom.xml @@ -0,0 +1,114 @@ + + + 4.0.0 + + com.xncoding + springboot-mybatis + 1.0.0-SNAPSHOT + jar + + springboot-mybatis + SpringBoot集成MyBatis + + + org.springframework.boot + spring-boot-starter-parent + 1.5.9.RELEASE + + + + + UTF-8 + UTF-8 + 1.8 + 1.1.2 + 8.0.7-dmr + 2.1.8 + 1.0.5 + + + + + org.springframework.boot + spring-boot-starter-jdbc + + + mysql + mysql-connector-java + ${mysql-connector.version} + runtime + + + com.alibaba + druid + ${druid.version} + + + + com.baomidou + mybatis-plus + ${mybatis-plus.version} + + + com.baomidou + mybatisplus-spring-boot-starter + ${mybatisplus-spring-boot-starter.version} + + + + org.springframework.boot + spring-boot-starter-test + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.6.1 + + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.20 + + true + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + + + src/main/resources + + + src/main/java + + **/*.xml + + + + + + \ No newline at end of file diff --git a/springboot-mybatis/run.sh b/springboot-mybatis/run.sh new file mode 100644 index 0000000..955efb1 --- /dev/null +++ b/springboot-mybatis/run.sh @@ -0,0 +1,72 @@ +#!/bin/bash +# 项目自动更新脚本 +# 先clone相应的分支下来： +# git clone ssh://git@120.24.173.142:7999/xxx.git +# 远程调试启动： +# nohup java -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 -Xms512m -Xmx1024m -jar -Dspring.profiles.active=${profile} ${jarfile} >/dev/null 2>&1 & + +function start { + profile="$1" + echo "启动环境profile=${profile}" + jarfile=$(ls target/*.jar) + if [[ "$?" == "0" ]]; then + stop $profile $jarfile + fi + branch=$(git branch |awk '{print $2}') + git pull origin ${branch} + echo "更新完代码开始重新打包" + mvn clean && mvn clean && mvn package -DskipTests=true + if [[ "$?" != "0" ]]; then + echo "编译出错，退出！" + exit 1 + fi + echo "nohup java -Xms512m -Xmx1024m -jar -Dspring.profiles.active=${profile} ${jarfile} >/dev/null 2>&1 &" + nohup java -Xms512m -Xmx1024m -jar -Dspring.profiles.active=${profile} ${jarfile} >/dev/null 2>&1 & + echo "启动应用中，请查看日志文件..." +} + +function stop { + profile="$1" + jarfile="$2" + ps aux | grep "${jarfile}" | grep "spring.profiles.active=${profile}" | grep -v grep > /dev/null + if [[ "$?" == "0" ]]; then + echo "该应用还在跑，我先停了它" + pid=$(ps aux | grep "${jarfile}" | grep "spring.profiles.active=${profile}" | grep -v grep |awk '{print $2}') + if [[ "$pid" != "" ]]; then + kill -9 $pid + fi + echo "停止应用成功..." + fi +} + +if [[ "$1" == "start" ]]; then + if [[ "$#" < 2 ]]; then + echo "请输入正确参数：./epay.sh start {profile}" + exit 1 + fi + profile="$2" + if [[ "$profile" != "dev" && "$profile" != "test" && "$profile" != "show" && "$profile" != "production" ]]; then + echo "参数错误，请输入正确的profile参数，使用方法：" + echo "./epay.sh start {profile} ==> 启动应用，{profile}取值：dev|test|show|production" + exit 1 + fi + start "${profile}" +elif [[ "$1" == "stop" ]]; then + if [[ "$#" < 2 ]]; then + echo "请输入正确参数：./epay.sh stop {profile}" + exit 1 + fi + profile="$2" + if [[ "$profile" != "dev" && "$profile" != "test" && "$profile" != "show" && "$profile" != "production" ]]; then + echo "参数错误，请输入正确的profile参数，使用方法：" + echo "./epay.sh stop {profile} ==> 停止应用，{profile}取值：dev|test|show|production" + exit 1 + fi + jarfile=$(ls target/*.jar) + stop $profile $jarfile +else + echo "参数错误，使用方法：{}参数是必填的，[]参数可选" + echo "./epay.sh start {profile} ==> 启动应用，{profile}取值：dev|test|show|production" + echo "./epay.sh stop {profile} ==> 停止应用，{profile}取值：dev|test|show|production" + exit 1 +fi diff --git a/springboot-cache/src/main/java/com/enzhico/trans/Application.java b/springboot-mybatis/src/main/java/com/xncoding/pos/Application.java similarity index 91% rename from springboot-cache/src/main/java/com/enzhico/trans/Application.java rename to springboot-mybatis/src/main/java/com/xncoding/pos/Application.java index 77de9df..adc4c48 100644 --- a/springboot-cache/src/main/java/com/enzhico/trans/Application.java +++ b/springboot-mybatis/src/main/java/com/xncoding/pos/Application.java @@ -1,4 +1,4 @@ -package com.enzhico.trans; +package com.xncoding.pos; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/springboot-mybatis/src/main/java/com/xncoding/pos/common/dao/entity/User.java b/springboot-mybatis/src/main/java/com/xncoding/pos/common/dao/entity/User.java new file mode 100644 index 0000000..a05c48e --- /dev/null +++ b/springboot-mybatis/src/main/java/com/xncoding/pos/common/dao/entity/User.java @@ -0,0 +1,249 @@ +package com.xncoding.pos.common.dao.entity; + +import java.util.Date; +import com.baomidou.mybatisplus.annotations.TableName; +import com.baomidou.mybatisplus.enums.IdType; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.activerecord.Model; +import java.io.Serializable; + +/** + * 后台管理用户表 + * + * @author 熊能 + * @version 1.0 + * @since 2018/01/02 + */ +@TableName(value = "t_user") +public class User extends Model { + +private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(value="id", type= IdType.AUTO) + private Integer id; + /** + * 账号 + */ + private String username; + /** + * 名字 + */ + private String name; + /** + * 密码 + */ + private String password; + /** + * md5密码盐 + */ + private String salt; + /** + * 联系电话 + */ + private String phone; + /** + * 备注 + */ + private String tips; + /** + * 状态 1:正常 2:禁用 + */ + private Integer state; + /** + * 创建时间 + */ + private Date createdTime; + /** + * 更新时间 + */ + private Date updatedTime; + + /** + * 获取 主键ID. + * + * @return 主键ID. + */ + public Integer getId() { + return id; + } + + /** + * 设置 主键ID. + * + * @param id 主键ID. + */ + public void setId(Integer id) { + this.id = id; + } + + /** + * 获取 账号. + * + * @return 账号. + */ + public String getUsername() { + return username; + } + + /** + * 设置 账号. + * + * @param username 账号. + */ + public void setUsername(String username) { + this.username = username; + } + + /** + * 获取 名字. + * + * @return 名字. + */ + public String getName() { + return name; + } + + /** + * 设置 名字. + * + * @param name 名字. + */ + public void setName(String name) { + this.name = name; + } + + /** + * 获取 密码. + * + * @return 密码. + */ + public String getPassword() { + return password; + } + + /** + * 设置 密码. + * + * @param password 密码. + */ + public void setPassword(String password) { + this.password = password; + } + + /** + * 获取 md5密码盐. + * + * @return md5密码盐. + */ + public String getSalt() { + return salt; + } + + /** + * 设置 md5密码盐. + * + * @param salt md5密码盐. + */ + public void setSalt(String salt) { + this.salt = salt; + } + + /** + * 获取 联系电话. + * + * @return 联系电话. + */ + public String getPhone() { + return phone; + } + + /** + * 设置 联系电话. + * + * @param phone 联系电话. + */ + public void setPhone(String phone) { + this.phone = phone; + } + + /** + * 获取 备注. + * + * @return 备注. + */ + public String getTips() { + return tips; + } + + /** + * 设置 备注. + * + * @param tips 备注. + */ + public void setTips(String tips) { + this.tips = tips; + } + + /** + * 获取 状态 1:正常 2:禁用. + * + * @return 状态 1:正常 2:禁用. + */ + public Integer getState() { + return state; + } + + /** + * 设置 状态 1:正常 2:禁用. + * + * @param state 状态 1:正常 2:禁用. + */ + public void setState(Integer state) { + this.state = state; + } + + /** + * 获取 创建时间. + * + * @return 创建时间. + */ + public Date getCreatedTime() { + return createdTime; + } + + /** + * 设置 创建时间. + * + * @param createdTime 创建时间. + */ + public void setCreatedTime(Date createdTime) { + this.createdTime = createdTime; + } + + /** + * 获取 更新时间. + * + * @return 更新时间. + */ + public Date getUpdatedTime() { + return updatedTime; + } + + /** + * 设置 更新时间. + * + * @param updatedTime 更新时间. + */ + public void setUpdatedTime(Date updatedTime) { + this.updatedTime = updatedTime; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + +} diff --git a/springboot-mybatis/src/main/java/com/xncoding/pos/common/dao/repository/UserMapper.java b/springboot-mybatis/src/main/java/com/xncoding/pos/common/dao/repository/UserMapper.java new file mode 100644 index 0000000..3ab1560 --- /dev/null +++ b/springboot-mybatis/src/main/java/com/xncoding/pos/common/dao/repository/UserMapper.java @@ -0,0 +1,15 @@ +package com.xncoding.pos.common.dao.repository; + +import com.xncoding.pos.common.dao.entity.User; +import com.baomidou.mybatisplus.mapper.BaseMapper; + +/** + * 后台管理用户表 Mapper + * + * @author 熊能 + * @version 1.0 + * @since 2018/01/02 + */ +public interface UserMapper extends BaseMapper { + +} diff --git a/springboot-mybatis/src/main/java/com/xncoding/pos/config/MybatisPlusConfig.java b/springboot-mybatis/src/main/java/com/xncoding/pos/config/MybatisPlusConfig.java new file mode 100644 index 0000000..52a83d5 --- /dev/null +++ b/springboot-mybatis/src/main/java/com/xncoding/pos/config/MybatisPlusConfig.java @@ -0,0 +1,46 @@ +package com.xncoding.pos.config; + +import com.alibaba.druid.pool.DruidDataSource; +import com.baomidou.mybatisplus.plugins.PaginationInterceptor; +import com.xncoding.pos.config.properties.DruidProperties; +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +import javax.annotation.Resource; + +/** + * MybatisPlus配置 + * + * @author xiongneng + * @since 2017/5/20 21:58 + */ +@Configuration +@EnableTransactionManagement(order = 2) +@MapperScan(basePackages = { + "com.xncoding.pos.common.dao.repository", + "com.xncoding.pos.dao.repository"}) +public class MybatisPlusConfig { + + @Resource + private DruidProperties druidProperties; + + /** + * 单数据源连接池配置 + */ + @Bean + public DruidDataSource singleDatasource() { + DruidDataSource dataSource = new DruidDataSource(); + druidProperties.config(dataSource); + return dataSource; + } + + /** + * mybatis-plus分页插件 + */ + @Bean + public PaginationInterceptor paginationInterceptor() { + return new PaginationInterceptor(); + } +} diff --git a/springboot-mybatis/src/main/java/com/xncoding/pos/config/properties/DruidProperties.java b/springboot-mybatis/src/main/java/com/xncoding/pos/config/properties/DruidProperties.java new file mode 100644 index 0000000..7cb4424 --- /dev/null +++ b/springboot-mybatis/src/main/java/com/xncoding/pos/config/properties/DruidProperties.java @@ -0,0 +1,249 @@ +package com.xncoding.pos.config.properties; + +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.util.JdbcConstants; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +import java.sql.SQLException; + +/** + *

数据库数据源配置

+ *

说明:这个类中包含了许多默认配置,若这些配置符合您的情况,您可以不用管,若不符合,建议不要修改本类,建议直接在"application.yml"中配置即可

+ * + * @author xiongneng + * @since 2017-05-21 11:18 + */ +@Component +@ConfigurationProperties(prefix = "spring.datasource") +public class DruidProperties { + + private String url; + + private String username; + + private String password; + + private String driverClassName = "com.mysql.cj.jdbc.Driver"; + + private Integer initialSize = 10; + + private Integer minIdle = 3; + + private Integer maxActive = 60; + + private Integer maxWait = 60000; + + private Boolean removeAbandoned = true; + + private Integer removeAbandonedTimeout = 180; + + private Integer timeBetweenEvictionRunsMillis = 60000; + + private Integer minEvictableIdleTimeMillis = 300000; + + private String validationQuery = "SELECT 'x'"; + + private Boolean testWhileIdle = true; + + private Boolean testOnBorrow = false; + + private Boolean testOnReturn = false; + + private Boolean poolPreparedStatements = true; + + private Integer maxPoolPreparedStatementPerConnectionSize = 50; + + private String filters = "stat"; + + public void config(DruidDataSource dataSource) { + dataSource.setDbType(JdbcConstants.MYSQL); + dataSource.setUrl(url); + dataSource.setUsername(username); + dataSource.setPassword(password); + dataSource.setDriverClassName(driverClassName); + dataSource.setInitialSize(initialSize); // 定义初始连接数 + dataSource.setMinIdle(minIdle); // 最小空闲 + dataSource.setMaxActive(maxActive); // 定义最大连接数 + dataSource.setMaxWait(maxWait); // 获取连接等待超时的时间 + dataSource.setRemoveAbandoned(removeAbandoned); // 超过时间限制是否回收 + dataSource.setRemoveAbandonedTimeout(removeAbandonedTimeout); // 超过时间限制多长 + + // 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 + dataSource.setTimeBetweenEvictionRunsMillis(timeBetweenEvictionRunsMillis); + // 配置一个连接在池中最小生存的时间，单位是毫秒 + dataSource.setMinEvictableIdleTimeMillis(minEvictableIdleTimeMillis); + // 用来检测连接是否有效的sql，要求是一个查询语句 + dataSource.setValidationQuery(validationQuery); + // 申请连接的时候检测 + dataSource.setTestWhileIdle(testWhileIdle); + // 申请连接时执行validationQuery检测连接是否有效，配置为true会降低性能 + dataSource.setTestOnBorrow(testOnBorrow); + // 归还连接时执行validationQuery检测连接是否有效，配置为true会降低性能 + dataSource.setTestOnReturn(testOnReturn); + // 打开PSCache，并且指定每个连接上PSCache的大小 + dataSource.setPoolPreparedStatements(poolPreparedStatements); + dataSource.setMaxPoolPreparedStatementPerConnectionSize(maxPoolPreparedStatementPerConnectionSize); + // 属性类型是字符串，通过别名的方式配置扩展插件，常用的插件有： + // 监控统计用的filter:stat + // 日志用的filter:log4j + // 防御SQL注入的filter:wall + try { + dataSource.setFilters(filters); + } catch (SQLException e) { + e.printStackTrace(); + } + } + + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getDriverClassName() { + return driverClassName; + } + + public void setDriverClassName(String driverClassName) { + this.driverClassName = driverClassName; + } + + public Integer getInitialSize() { + return initialSize; + } + + public void setInitialSize(Integer initialSize) { + this.initialSize = initialSize; + } + + public Integer getMinIdle() { + return minIdle; + } + + public void setMinIdle(Integer minIdle) { + this.minIdle = minIdle; + } + + public Integer getMaxActive() { + return maxActive; + } + + public void setMaxActive(Integer maxActive) { + this.maxActive = maxActive; + } + + public Integer getMaxWait() { + return maxWait; + } + + public void setMaxWait(Integer maxWait) { + this.maxWait = maxWait; + } + + public Integer getTimeBetweenEvictionRunsMillis() { + return timeBetweenEvictionRunsMillis; + } + + public void setTimeBetweenEvictionRunsMillis(Integer timeBetweenEvictionRunsMillis) { + this.timeBetweenEvictionRunsMillis = timeBetweenEvictionRunsMillis; + } + + public Integer getMinEvictableIdleTimeMillis() { + return minEvictableIdleTimeMillis; + } + + public void setMinEvictableIdleTimeMillis(Integer minEvictableIdleTimeMillis) { + this.minEvictableIdleTimeMillis = minEvictableIdleTimeMillis; + } + + public String getValidationQuery() { + return validationQuery; + } + + public void setValidationQuery(String validationQuery) { + this.validationQuery = validationQuery; + } + + public Boolean getTestWhileIdle() { + return testWhileIdle; + } + + public void setTestWhileIdle(Boolean testWhileIdle) { + this.testWhileIdle = testWhileIdle; + } + + public Boolean getTestOnBorrow() { + return testOnBorrow; + } + + public void setTestOnBorrow(Boolean testOnBorrow) { + this.testOnBorrow = testOnBorrow; + } + + public Boolean getTestOnReturn() { + return testOnReturn; + } + + public void setTestOnReturn(Boolean testOnReturn) { + this.testOnReturn = testOnReturn; + } + + public Boolean getPoolPreparedStatements() { + return poolPreparedStatements; + } + + public void setPoolPreparedStatements(Boolean poolPreparedStatements) { + this.poolPreparedStatements = poolPreparedStatements; + } + + public Integer getMaxPoolPreparedStatementPerConnectionSize() { + return maxPoolPreparedStatementPerConnectionSize; + } + + public void setMaxPoolPreparedStatementPerConnectionSize(Integer maxPoolPreparedStatementPerConnectionSize) { + this.maxPoolPreparedStatementPerConnectionSize = maxPoolPreparedStatementPerConnectionSize; + } + + public String getFilters() { + return filters; + } + + public void setFilters(String filters) { + this.filters = filters; + } + + public Boolean getRemoveAbandoned() { + return removeAbandoned; + } + + public void setRemoveAbandoned(Boolean removeAbandoned) { + this.removeAbandoned = removeAbandoned; + } + + public Integer getRemoveAbandonedTimeout() { + return removeAbandonedTimeout; + } + + public void setRemoveAbandonedTimeout(Integer removeAbandonedTimeout) { + this.removeAbandonedTimeout = removeAbandonedTimeout; + } +} diff --git a/springboot-mybatis/src/main/java/com/xncoding/pos/service/UserService.java b/springboot-mybatis/src/main/java/com/xncoding/pos/service/UserService.java new file mode 100644 index 0000000..0b04ca9 --- /dev/null +++ b/springboot-mybatis/src/main/java/com/xncoding/pos/service/UserService.java @@ -0,0 +1,52 @@ +package com.xncoding.pos.service; + +import com.xncoding.pos.common.dao.entity.User; +import com.xncoding.pos.common.dao.repository.UserMapper; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +/** + * 后台用户管理 + */ + +@Service +public class UserService { + + @Resource + private UserMapper userMapper; + + /** + * 通过ID查找用户 + * @param id + * @return + */ + public User findById(Integer id) { + return userMapper.selectById(id); + } + + /** + * 新增用户 + * @param user + */ + public void insertUser(User user) { + userMapper.insert(user); + } + + /** + * 修改用户 + * @param user + */ + public void updateUser(User user) { + userMapper.updateById(user); + } + + /** + * 删除用户 + * @param id + */ + public void deleteUser(Integer id) { + userMapper.deleteById(id); + } + +} diff --git a/springboot-mybatis/src/main/resources/application.yml b/springboot-mybatis/src/main/resources/application.yml new file mode 100644 index 0000000..992edb8 --- /dev/null +++ b/springboot-mybatis/src/main/resources/application.yml @@ -0,0 +1,70 @@ +########################################################## +################## 所有profile共有的配置 ################# +########################################################## + +################### spring配置 ################### +spring: + profiles: + active: dev + +################### mybatis-plus配置 ################### +mybatis-plus: + mapper-locations: classpath*:com/xncoding/pos/dao/repository/mapping/*.xml + typeAliasesPackage: > + com.xncoding.pos.common.dao.entity + global-config: + id-type: 0 # 0:数据库ID自增 1:用户输入id 2:全局唯一id(IdWorker) 3:全局唯一ID(uuid) + db-column-underline: false + refresh-mapper: true + configuration: + map-underscore-to-camel-case: true + cache-enabled: true #配置的缓存的全局开关 + lazyLoadingEnabled: true #延时加载的开关 + multipleResultSetsEnabled: true #开启的话，延时加载一个属性时会加载该对象全部属性，否则按需加载属性 + +logging: + level: + org.springframework.web.servlet: ERROR + +--- + +##################################################################### +######################## 开发环境profile ########################## +##################################################################### +spring: + profiles: dev + datasource: + url: jdbc:mysql://123.207.66.156:3306/pos?useSSL=false&autoReconnect=true&tinyInt1isBit=false&useUnicode=true&characterEncoding=utf8 + username: root + password: ****** + thymeleaf: + cache: false + +logging: + level: + ROOT: INFO + com: + xncoding: DEBUG + file: E:/logs/app.log + +--- + +##################################################################### +######################## 测试环境profile ########################## +##################################################################### + +spring: + profiles: test + datasource: + url: jdbc:mysql://123.207.66.156:3306/pos?useSSL=false&autoReconnect=true&tinyInt1isBit=false&useUnicode=true&characterEncoding=utf8 + username: root + password: ****** + thymeleaf: + cache: false + +logging: + level: + ROOT: INFO + com: + xncoding: DEBUG + file: /var/logs/app.log diff --git a/springboot-mybatis/src/main/resources/banner.txt b/springboot-mybatis/src/main/resources/banner.txt new file mode 100644 index 0000000..859b78f --- /dev/null +++ b/springboot-mybatis/src/main/resources/banner.txt @@ -0,0 +1,23 @@ + + _____ _______ _____ _____ + /\ \ /::\ \ /\ \ /\ \ + /::\____\ /::::\ \ /::\____\ /::\ \ + /:::/ / /::::::\ \ /:::/ / /::::\ \ + /:::/ / /::::::::\ \ /:::/ / /::::::\ \ + /:::/ / /:::/~~\:::\ \ /:::/ / /:::/\:::\ \ + /:::/ / /:::/ \:::\ \ /:::/____/ /:::/__\:::\ \ + /:::/ / /:::/ / \:::\ \ |::| | /::::\ \:::\ \ + /:::/ / /:::/____/ \:::\____\ |::| | _____ /::::::\ \:::\ \ + /:::/ / |:::| | |:::| | |::| | /\ \ /:::/\:::\ \:::\ \ +/:::/____/ |:::|____| |:::| | |::| | /::\____\/:::/__\:::\ \:::\____\ +\:::\ \ \:::\ \ /:::/ / |::| | /:::/ /\:::\ \:::\ \::/ / + \:::\ \ \:::\ \ /:::/ / |::| | /:::/ / \:::\ \:::\ \/____/ + \:::\ \ \:::\ /:::/ / |::|____|/:::/ / \:::\ \:::\ \ + \:::\ \ \:::\__/:::/ / |:::::::::::/ / \:::\ \:::\____\ + \:::\ \ \::::::::/ / \::::::::::/____/ \:::\ \::/ / + \:::\ \ \::::::/ / ~~~~~~~~~~ \:::\ \/____/ + \:::\ \ \::::/ / \:::\ \ + \:::\____\ \::/____/ \:::\____\ + \::/ / ~~ \::/ / + \/____/ \/____/ + diff --git a/springboot-mybatis/src/main/resources/sql/schema.sql b/springboot-mybatis/src/main/resources/sql/schema.sql new file mode 100644 index 0000000..b332fb1 --- /dev/null +++ b/springboot-mybatis/src/main/resources/sql/schema.sql @@ -0,0 +1,24 @@ +# -------------------------------------以下业务表开始------------------------------------------- +# CREATE DATABASE IF NOT EXISTS pos default charset utf8 COLLATE utf8_general_ci; +# SET FOREIGN_KEY_CHECKS=0; +# USE pos; + +# -------------------------------------以下用户管理表开始------------------------------------------- + +-- 后台管理用户表 +DROP TABLE IF EXISTS `t_user`; +CREATE TABLE `t_user` ( + `id` INT(11) PRIMARY KEY AUTO_INCREMENT COMMENT '主键ID', + `username` VARCHAR(32) NOT NULL COMMENT '账号', + `name` VARCHAR(16) DEFAULT '' COMMENT '名字', + `password` VARCHAR(128) DEFAULT '' COMMENT '密码', + `salt` VARCHAR(64) DEFAULT '' COMMENT 'md5密码盐', + `phone` VARCHAR(32) DEFAULT '' COMMENT '联系电话', + `tips` VARCHAR(255) COMMENT '备注', + `state` TINYINT(1) DEFAULT 1 COMMENT '状态 1:正常 2:禁用', + `created_time` DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `updated_time` DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间' +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='后台管理用户表'; +INSERT INTO `t_user` VALUES (1,'admin','系统管理员','123456','www', '17890908889', '系统管理员', 1, '2017-12-12 09:46:12', '2017-12-12 09:46:12'); +INSERT INTO `t_user` VALUES (2,'aix','张三','123456','eee', '17859569358', '', 1, '2017-12-12 09:46:12', '2017-12-12 09:46:12'); + diff --git a/springboot-mybatis/src/test/java/com/xncoding/pos/ApplicationTests.java b/springboot-mybatis/src/test/java/com/xncoding/pos/ApplicationTests.java new file mode 100644 index 0000000..71ff546 --- /dev/null +++ b/springboot-mybatis/src/test/java/com/xncoding/pos/ApplicationTests.java @@ -0,0 +1,56 @@ +package com.xncoding.pos; + +import com.xncoding.pos.common.dao.entity.User; +import com.xncoding.pos.service.UserService; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +import javax.annotation.Resource; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.nullValue; + +/** + * 测试 + */ +@RunWith(SpringRunner.class) +@SpringBootTest +public class ApplicationTests { + private static final Logger log = LoggerFactory.getLogger(ApplicationTests.class); + + @Resource + private UserService userService; + + /** + * 测试增删改查 + */ + @Test + public void test() { + User user = new User(); + user.setUsername("xiaoxx"); + user.setName("小星星"); + user.setPassword("222222"); + user.setPhone("13890907676"); + userService.insertUser(user); + + User user1 = userService.findById(user.getId()); + assertThat(user1.getUsername(), is("xiaoxx")); + assertThat(user1.getName(), is("小星星")); + + user1.setPassword("888888"); + userService.updateUser(user1); + User user2 = userService.findById(user.getId()); + assertThat(user2.getPassword(), is("888888")); + + userService.deleteUser(user.getId()); + + User user3 = userService.findById(user.getId()); + assertThat(user3, nullValue()); + + } +} diff --git a/springboot-redis/README.md b/springboot-redis/README.md index b8b6061..07493b2 100644 --- a/springboot-redis/README.md +++ b/springboot-redis/README.md @@ -2,6 +2,14 @@ SpringBoot中通过RedisTemplate来直接操作Redis缓存数据库 +## 运行 + +初始化sql文件在`resources/sql/t_user.sql`中 + +另外还需要安装Redis，配置好`application.yml`文件中的redis地址 + +测试用例：`com.xncoding.service.UserServiceTest.java` + ## 许可证 Copyright (c) 2018 Xiong Neng diff --git a/springboot-redis/pom.xml b/springboot-redis/pom.xml index 1ab5fac..cfcb9ad 100644 --- a/springboot-redis/pom.xml +++ b/springboot-redis/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.enzhico + com.xncoding springboot-redis 1.0.0-SNAPSHOT jar diff --git a/springboot-redis/src/main/java/com/enzhico/trans/Application.java b/springboot-redis/src/main/java/com/enzhico/trans/Application.java deleted file mode 100644 index 77de9df..0000000 --- a/springboot-redis/src/main/java/com/enzhico/trans/Application.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.enzhico.trans; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@SpringBootApplication -public class Application { - public static void main(String[] args) { - SpringApplication.run(Application.class, args); - } - -} diff --git a/springboot-redis/src/main/java/com/xncoding/pos/Application.java b/springboot-redis/src/main/java/com/xncoding/pos/Application.java new file mode 100644 index 0000000..adc4c48 --- /dev/null +++ b/springboot-redis/src/main/java/com/xncoding/pos/Application.java @@ -0,0 +1,12 @@ +package com.xncoding.pos; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class Application { + public static void main(String[] args) { + SpringApplication.run(Application.class, args); + } + +} diff --git a/springboot-redis/src/main/java/com/enzhico/trans/config/DruidProperties.java b/springboot-redis/src/main/java/com/xncoding/pos/config/DruidProperties.java similarity index 99% rename from springboot-redis/src/main/java/com/enzhico/trans/config/DruidProperties.java rename to springboot-redis/src/main/java/com/xncoding/pos/config/DruidProperties.java index 31e1bf8..ea3dd72 100644 --- a/springboot-redis/src/main/java/com/enzhico/trans/config/DruidProperties.java +++ b/springboot-redis/src/main/java/com/xncoding/pos/config/DruidProperties.java @@ -1,4 +1,4 @@ -package com.enzhico.trans.config; +package com.xncoding.pos.config; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.util.JdbcConstants; diff --git a/springboot-redis/src/main/java/com/enzhico/trans/config/MybatisPlusConfig.java b/springboot-redis/src/main/java/com/xncoding/pos/config/MybatisPlusConfig.java similarity index 83% rename from springboot-redis/src/main/java/com/enzhico/trans/config/MybatisPlusConfig.java rename to springboot-redis/src/main/java/com/xncoding/pos/config/MybatisPlusConfig.java index 036728b..35b3af4 100644 --- a/springboot-redis/src/main/java/com/enzhico/trans/config/MybatisPlusConfig.java +++ b/springboot-redis/src/main/java/com/xncoding/pos/config/MybatisPlusConfig.java @@ -1,10 +1,8 @@ -package com.enzhico.trans.config; +package com.xncoding.pos.config; import com.alibaba.druid.pool.DruidDataSource; import com.baomidou.mybatisplus.plugins.PaginationInterceptor; -import com.enzhico.trans.config.DruidProperties; import org.mybatis.spring.annotation.MapperScan; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.transaction.annotation.EnableTransactionManagement; @@ -19,7 +17,7 @@ import javax.annotation.Resource; */ @Configuration @EnableTransactionManagement(order = 2) -@MapperScan(basePackages = {"com.enzhico.trans.dao.repository"}) +@MapperScan(basePackages = {"com.xncoding.pos.dao.repository"}) public class MybatisPlusConfig { @Resource diff --git a/springboot-redis/src/main/java/com/enzhico/trans/config/RedisConfig.java b/springboot-redis/src/main/java/com/xncoding/pos/config/RedisConfig.java similarity index 98% rename from springboot-redis/src/main/java/com/enzhico/trans/config/RedisConfig.java rename to springboot-redis/src/main/java/com/xncoding/pos/config/RedisConfig.java index 765b9bd..0ffa92e 100644 --- a/springboot-redis/src/main/java/com/enzhico/trans/config/RedisConfig.java +++ b/springboot-redis/src/main/java/com/xncoding/pos/config/RedisConfig.java @@ -1,4 +1,4 @@ -package com.enzhico.trans.config; +package com.xncoding.pos.config; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.PropertyAccessor; diff --git a/springboot-redis/src/main/java/com/enzhico/trans/dao/entity/User.java b/springboot-redis/src/main/java/com/xncoding/pos/dao/entity/User.java similarity index 96% rename from springboot-redis/src/main/java/com/enzhico/trans/dao/entity/User.java rename to springboot-redis/src/main/java/com/xncoding/pos/dao/entity/User.java index 2e5c34c..3337cd5 100644 --- a/springboot-redis/src/main/java/com/enzhico/trans/dao/entity/User.java +++ b/springboot-redis/src/main/java/com/xncoding/pos/dao/entity/User.java @@ -1,4 +1,4 @@ -package com.enzhico.trans.dao.entity; +package com.xncoding.pos.dao.entity; import com.baomidou.mybatisplus.activerecord.Model; import com.baomidou.mybatisplus.annotations.TableId; diff --git a/springboot-batch/src/main/java/com/enzhico/trans/dao/repository/UserMapper.java b/springboot-redis/src/main/java/com/xncoding/pos/dao/repository/UserMapper.java similarity index 56% rename from springboot-batch/src/main/java/com/enzhico/trans/dao/repository/UserMapper.java rename to springboot-redis/src/main/java/com/xncoding/pos/dao/repository/UserMapper.java index a7800de..c3b5d14 100644 --- a/springboot-batch/src/main/java/com/enzhico/trans/dao/repository/UserMapper.java +++ b/springboot-redis/src/main/java/com/xncoding/pos/dao/repository/UserMapper.java @@ -1,7 +1,7 @@ -package com.enzhico.trans.dao.repository; +package com.xncoding.pos.dao.repository; import com.baomidou.mybatisplus.mapper.BaseMapper; -import com.enzhico.trans.dao.entity.User; +import com.xncoding.pos.dao.entity.User; public interface UserMapper extends BaseMapper { } diff --git a/springboot-redis/src/main/java/com/enzhico/trans/service/UserService.java b/springboot-redis/src/main/java/com/xncoding/pos/service/UserService.java similarity index 86% rename from springboot-redis/src/main/java/com/enzhico/trans/service/UserService.java rename to springboot-redis/src/main/java/com/xncoding/pos/service/UserService.java index 100a658..534075b 100644 --- a/springboot-redis/src/main/java/com/enzhico/trans/service/UserService.java +++ b/springboot-redis/src/main/java/com/xncoding/pos/service/UserService.java @@ -1,14 +1,9 @@ -package com.enzhico.trans.service; +package com.xncoding.pos.service; -import com.enzhico.trans.dao.entity.User; -import com.enzhico.trans.dao.repository.UserMapper; +import com.xncoding.pos.dao.entity.User; +import com.xncoding.pos.dao.repository.UserMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cache.annotation.CacheConfig; -import org.springframework.cache.annotation.CacheEvict; -import org.springframework.cache.annotation.CachePut; -import org.springframework.cache.annotation.Cacheable; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.ValueOperations; import org.springframework.stereotype.Service; diff --git a/springboot-redis/src/main/resources/application.yml b/springboot-redis/src/main/resources/application.yml index eb585e2..d36c7fc 100644 --- a/springboot-redis/src/main/resources/application.yml +++ b/springboot-redis/src/main/resources/application.yml @@ -2,14 +2,6 @@ ################## 所有profile共有的配置 ################# ########################################################## -################### 自定义项目配置 ################### -enzhico: - kaptcha-open: true #是否开启登录时验证码 (true/false) - session-open: false #是否开启session验证 (true/false) - -################### 项目启动端口 ################### -server.port: 8092 - ################### spring配置 ################### spring: profiles: @@ -17,13 +9,13 @@ spring: datasource: url: jdbc:mysql://123.207.66.156:3306/test?useSSL=false&autoReconnect=true&tinyInt1isBit=false&useUnicode=true&characterEncoding=utf8 username: root - password: _EnZhi123 + password: ****** ################### mybatis-plus配置 ################### mybatis-plus: - mapper-locations: classpath*:com/enzhico/trans/dao/repository/mapping/*.xml + mapper-locations: classpath*:com/xncoding/pos/dao/repository/mapping/*.xml typeAliasesPackage: > - com.enzhico.trans.dao.entity + com.xncoding.pos.dao.entity global-config: id-type: 0 # 0:数据库ID自增 1:用户输入id 2:全局唯一id(IdWorker) 3:全局唯一ID(uuid) db-column-underline: false @@ -62,6 +54,6 @@ logging: level: ROOT: INFO com: - enzhico: DEBUG - file: E:/logs/trans.log + xncoding: DEBUG + file: E:/logs/app.log diff --git a/springboot-redis/src/main/resources/sql/t_user.sql b/springboot-redis/src/main/resources/sql/t_user.sql new file mode 100644 index 0000000..9d042a4 --- /dev/null +++ b/springboot-redis/src/main/resources/sql/t_user.sql @@ -0,0 +1,32 @@ +/* +Navicat MySQL Data Transfer + +Source Server : 123.207.66.156-mysql +Source Server Version : 50718 +Source Host : 123.207.66.156:3306 +Source Database : test + +Target Server Type : MYSQL +Target Server Version : 50718 +File Encoding : 65001 + +Date: 2018-02-27 16:12:19 +*/ + +SET FOREIGN_KEY_CHECKS=0; + +-- ---------------------------- +-- Table structure for t_user +-- ---------------------------- +DROP TABLE IF EXISTS `t_user`; +CREATE TABLE `t_user` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `username` varchar(255) DEFAULT NULL, + `password` varchar(255) DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=96 DEFAULT CHARSET=utf8; + +-- ---------------------------- +-- Records of t_user +-- ---------------------------- +INSERT INTO `t_user` VALUES ('52', 'admin', 'admin'); diff --git a/springboot-redis/src/test/java/com/enzhico/service/UserServiceTest.java b/springboot-redis/src/test/java/com/xncoding/service/UserServiceTest.java similarity index 89% rename from springboot-redis/src/test/java/com/enzhico/service/UserServiceTest.java rename to springboot-redis/src/test/java/com/xncoding/service/UserServiceTest.java index 77b68be..43783d9 100644 --- a/springboot-redis/src/test/java/com/enzhico/service/UserServiceTest.java +++ b/springboot-redis/src/test/java/com/xncoding/service/UserServiceTest.java @@ -1,8 +1,8 @@ -package com.enzhico.service; +package com.xncoding.service; -import com.enzhico.trans.Application; -import com.enzhico.trans.dao.entity.User; -import com.enzhico.trans.service.UserService; +import com.xncoding.pos.Application; +import com.xncoding.pos.dao.entity.User; +import com.xncoding.pos.service.UserService; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; diff --git a/springboot-thymeleaf/src/main/resources/application.yml b/springboot-thymeleaf/src/main/resources/application.yml index dc2a3ca..f373b6c 100644 --- a/springboot-thymeleaf/src/main/resources/application.yml +++ b/springboot-thymeleaf/src/main/resources/application.yml @@ -30,7 +30,7 @@ logging: level: ROOT: INFO com: - enzhico: DEBUG + xncoding: DEBUG file: E:/logs/app.log --- @@ -43,5 +43,5 @@ logging: level: ROOT: INFO com: - enzhico: DEBUG + xncoding: DEBUG file: /var/logs/app.log diff --git a/springboot-transaction/pom.xml b/springboot-transaction/pom.xml index 8f7cf41..55610c9 100644 --- a/springboot-transaction/pom.xml +++ b/springboot-transaction/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.enzhico + com.xncoding springboot-transaction 1.0.0-SNAPSHOT jar diff --git a/springboot-transaction/src/main/java/com/enzhico/trans/Application.java b/springboot-transaction/src/main/java/com/enzhico/trans/Application.java deleted file mode 100644 index 77de9df..0000000 --- a/springboot-transaction/src/main/java/com/enzhico/trans/Application.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.enzhico.trans; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@SpringBootApplication -public class Application { - public static void main(String[] args) { - SpringApplication.run(Application.class, args); - } - -} diff --git a/springboot-transaction/src/main/java/com/xncoding/trans/Application.java b/springboot-transaction/src/main/java/com/xncoding/trans/Application.java new file mode 100644 index 0000000..83e2203 --- /dev/null +++ b/springboot-transaction/src/main/java/com/xncoding/trans/Application.java @@ -0,0 +1,12 @@ +package com.xncoding.trans; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class Application { + public static void main(String[] args) { + SpringApplication.run(Application.class, args); + } + +} diff --git a/springboot-cache/src/main/java/com/enzhico/trans/config/DruidProperties.java b/springboot-transaction/src/main/java/com/xncoding/trans/config/DruidProperties.java similarity index 99% rename from springboot-cache/src/main/java/com/enzhico/trans/config/DruidProperties.java rename to springboot-transaction/src/main/java/com/xncoding/trans/config/DruidProperties.java index 31e1bf8..6331d4c 100644 --- a/springboot-cache/src/main/java/com/enzhico/trans/config/DruidProperties.java +++ b/springboot-transaction/src/main/java/com/xncoding/trans/config/DruidProperties.java @@ -1,4 +1,4 @@ -package com.enzhico.trans.config; +package com.xncoding.trans.config; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.util.JdbcConstants; diff --git a/springboot-transaction/src/main/java/com/enzhico/trans/config/MybatisPlusConfig.java b/springboot-transaction/src/main/java/com/xncoding/trans/config/MybatisPlusConfig.java similarity index 83% rename from springboot-transaction/src/main/java/com/enzhico/trans/config/MybatisPlusConfig.java rename to springboot-transaction/src/main/java/com/xncoding/trans/config/MybatisPlusConfig.java index 036728b..c71d3c6 100644 --- a/springboot-transaction/src/main/java/com/enzhico/trans/config/MybatisPlusConfig.java +++ b/springboot-transaction/src/main/java/com/xncoding/trans/config/MybatisPlusConfig.java @@ -1,10 +1,8 @@ -package com.enzhico.trans.config; +package com.xncoding.trans.config; import com.alibaba.druid.pool.DruidDataSource; import com.baomidou.mybatisplus.plugins.PaginationInterceptor; -import com.enzhico.trans.config.DruidProperties; import org.mybatis.spring.annotation.MapperScan; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.transaction.annotation.EnableTransactionManagement; @@ -19,7 +17,7 @@ import javax.annotation.Resource; */ @Configuration @EnableTransactionManagement(order = 2) -@MapperScan(basePackages = {"com.enzhico.trans.dao.repository"}) +@MapperScan(basePackages = {"com.xncoding.trans.dao.repository"}) public class MybatisPlusConfig { @Resource diff --git a/springboot-transaction/src/main/java/com/enzhico/trans/controller/UserController.java b/springboot-transaction/src/main/java/com/xncoding/trans/controller/UserController.java similarity index 86% rename from springboot-transaction/src/main/java/com/enzhico/trans/controller/UserController.java rename to springboot-transaction/src/main/java/com/xncoding/trans/controller/UserController.java index 7e8c08f..364d2a9 100644 --- a/springboot-transaction/src/main/java/com/enzhico/trans/controller/UserController.java +++ b/springboot-transaction/src/main/java/com/xncoding/trans/controller/UserController.java @@ -1,7 +1,7 @@ -package com.enzhico.trans.controller; +package com.xncoding.trans.controller; -import com.enzhico.trans.dao.entity.User; -import com.enzhico.trans.service.UserService; +import com.xncoding.trans.dao.entity.User; +import com.xncoding.trans.service.UserService; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/springboot-transaction/src/main/java/com/enzhico/trans/dao/entity/User.java b/springboot-transaction/src/main/java/com/xncoding/trans/dao/entity/User.java similarity index 96% rename from springboot-transaction/src/main/java/com/enzhico/trans/dao/entity/User.java rename to springboot-transaction/src/main/java/com/xncoding/trans/dao/entity/User.java index 0e621a4..c648b31 100644 --- a/springboot-transaction/src/main/java/com/enzhico/trans/dao/entity/User.java +++ b/springboot-transaction/src/main/java/com/xncoding/trans/dao/entity/User.java @@ -1,4 +1,4 @@ -package com.enzhico.trans.dao.entity; +package com.xncoding.trans.dao.entity; import com.baomidou.mybatisplus.activerecord.Model; import com.baomidou.mybatisplus.annotations.TableId; diff --git a/springboot-transaction/src/main/java/com/enzhico/trans/dao/repository/UserMapper.java b/springboot-transaction/src/main/java/com/xncoding/trans/dao/repository/UserMapper.java similarity index 56% rename from springboot-transaction/src/main/java/com/enzhico/trans/dao/repository/UserMapper.java rename to springboot-transaction/src/main/java/com/xncoding/trans/dao/repository/UserMapper.java index a7800de..d038163 100644 --- a/springboot-transaction/src/main/java/com/enzhico/trans/dao/repository/UserMapper.java +++ b/springboot-transaction/src/main/java/com/xncoding/trans/dao/repository/UserMapper.java @@ -1,7 +1,7 @@ -package com.enzhico.trans.dao.repository; +package com.xncoding.trans.dao.repository; import com.baomidou.mybatisplus.mapper.BaseMapper; -import com.enzhico.trans.dao.entity.User; +import com.xncoding.trans.dao.entity.User; public interface UserMapper extends BaseMapper { } diff --git a/springboot-transaction/src/main/java/com/enzhico/trans/exception/MyException.java b/springboot-transaction/src/main/java/com/xncoding/trans/exception/MyException.java similarity index 82% rename from springboot-transaction/src/main/java/com/enzhico/trans/exception/MyException.java rename to springboot-transaction/src/main/java/com/xncoding/trans/exception/MyException.java index 1f8e05f..a0d937c 100644 --- a/springboot-transaction/src/main/java/com/enzhico/trans/exception/MyException.java +++ b/springboot-transaction/src/main/java/com/xncoding/trans/exception/MyException.java @@ -1,4 +1,4 @@ -package com.enzhico.trans.exception; +package com.xncoding.trans.exception; public class MyException extends RuntimeException { public MyException() { diff --git a/springboot-transaction/src/main/java/com/enzhico/trans/service/UserService.java b/springboot-transaction/src/main/java/com/xncoding/trans/service/UserService.java similarity index 85% rename from springboot-transaction/src/main/java/com/enzhico/trans/service/UserService.java rename to springboot-transaction/src/main/java/com/xncoding/trans/service/UserService.java index d53cc9f..00fa239 100644 --- a/springboot-transaction/src/main/java/com/enzhico/trans/service/UserService.java +++ b/springboot-transaction/src/main/java/com/xncoding/trans/service/UserService.java @@ -1,8 +1,8 @@ -package com.enzhico.trans.service; +package com.xncoding.trans.service; -import com.enzhico.trans.dao.entity.User; -import com.enzhico.trans.dao.repository.UserMapper; -import com.enzhico.trans.exception.MyException; +import com.xncoding.trans.dao.entity.User; +import com.xncoding.trans.dao.repository.UserMapper; +import com.xncoding.trans.exception.MyException; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/springboot-transaction/src/main/resources/application.yml b/springboot-transaction/src/main/resources/application.yml index afbe05c..db6510c 100644 --- a/springboot-transaction/src/main/resources/application.yml +++ b/springboot-transaction/src/main/resources/application.yml @@ -3,7 +3,7 @@ ########################################################## ################### 自定义项目配置 ################### -enzhico: +xncoding: kaptcha-open: true #是否开启登录时验证码 (true/false) session-open: false #是否开启session验证 (true/false) @@ -17,13 +17,13 @@ spring: datasource: url: jdbc:mysql://123.207.66.156:3306/test?useSSL=false&autoReconnect=true&tinyInt1isBit=false&useUnicode=true&characterEncoding=utf8 username: root - password: _EnZhi123 + password: ****** ################### mybatis-plus配置 ################### mybatis-plus: - mapper-locations: classpath*:com/enzhico/trans/dao/repository/mapping/*.xml + mapper-locations: classpath*:com/xncoding/trans/dao/repository/mapping/*.xml typeAliasesPackage: > - com.enzhico.trans.dao.entity + com.xncoding.trans.dao.entity global-config: id-type: 0 # 0:数据库ID自增 1:用户输入id 2:全局唯一id(IdWorker) 3:全局唯一ID(uuid) db-column-underline: false @@ -50,6 +50,6 @@ logging: level: ROOT: INFO com: - enzhico: DEBUG + xncoding: DEBUG file: E:/logs/trans.log