Skip to content

N
new-nms
Commit 217e616e authored by YazhouChen's avatar YazhouChen
Browse files
Options

后端管理优化

parent 159364d1
Hide whitespace changes
Inline Side-by-side
Showing with 118 additions and 425 deletions
.idea/workspace.xml
View file @ 217e616e
......@@ -6,396 +6,36 @@
</artifacts-to-build>
</component>
<component name="ChangeListManager">
<list default="true" id="d78dbbd2-2fbf-4680-80a9-30edd19c4d7f" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/.github/ISSUE_TEMPLATE/bug_report.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.github/ISSUE_TEMPLATE/feature_request.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
<change afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/LICENSE" afterDir="false" />
<change afterPath="$PROJECT_DIR$/NOTICE" afterDir="false" />
<change afterPath="$PROJECT_DIR$/README-zh.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/admin/.gitignore" afterDir="false" />
<change afterPath="$PROJECT_DIR$/admin/README.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/admin/pom.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/admin/src/main/java/io/geekidea/springbootplus/admin/SpringBootPlusAdminApplication.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/admin/src/main/java/io/geekidea/springbootplus/admin/config/AdminWebMvcConfig.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/admin/src/main/java/io/geekidea/springbootplus/admin/config/SecuritySecureConfig.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/admin/src/main/resources/application.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/bootstrap/.gitignore" afterDir="false" />
<change afterPath="$PROJECT_DIR$/bootstrap/README.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/bootstrap/pom.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/bootstrap/src/main/java/META-INF/MANIFEST.MF" afterDir="false" />
<change afterPath="$PROJECT_DIR$/bootstrap/src/main/java/io/geekidea/springbootplus/SpringBootPlusApplication.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/bootstrap/src/main/java/io/geekidea/springbootplus/aop/LogAop.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/bootstrap/src/main/java/io/geekidea/springbootplus/config/JacksonConfig.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/bootstrap/src/main/java/io/geekidea/springbootplus/config/MybatisPlusConfig.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/bootstrap/src/main/java/io/geekidea/springbootplus/config/RedisCacheConfig.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/bootstrap/src/main/java/io/geekidea/springbootplus/config/RedisTemplateConfig.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/bootstrap/src/main/java/io/geekidea/springbootplus/config/RestTemplateConfig.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/bootstrap/src/main/java/io/geekidea/springbootplus/config/ShiroConfig.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/bootstrap/src/main/java/io/geekidea/springbootplus/config/SpringBootPlusConfig.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/bootstrap/src/main/java/io/geekidea/springbootplus/config/SpringBootPlusCorsConfig.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/bootstrap/src/main/java/io/geekidea/springbootplus/config/SpringBootPlusWebMvcConfig.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/bootstrap/src/main/java/io/geekidea/springbootplus/config/Swagger2Config.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/bootstrap/src/main/java/io/geekidea/springbootplus/handler/GlobalExceptionHandler.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/bootstrap/src/test/java/io/geekidea/springbootplus/test/BaseTest.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/config/.gitignore" afterDir="false" />
<change afterPath="$PROJECT_DIR$/config/README.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/config/pom.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/config/src/main/java/io/geekidea/springbootplus/config/constant/CacheKey.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/config/src/main/java/io/geekidea/springbootplus/config/constant/CommonConstant.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/config/src/main/java/io/geekidea/springbootplus/config/constant/CommonRedisKey.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/config/src/main/java/io/geekidea/springbootplus/config/constant/DatePattern.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/config/src/main/java/io/geekidea/springbootplus/config/properties/CorsConfig.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/config/src/main/java/io/geekidea/springbootplus/config/properties/DataPathProperties.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/config/src/main/java/io/geekidea/springbootplus/config/properties/JwtProperties.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/config/src/main/java/io/geekidea/springbootplus/config/properties/ShiroPermissionProperties.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/config/src/main/java/io/geekidea/springbootplus/config/properties/ShiroProperties.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/config/src/main/java/io/geekidea/springbootplus/config/properties/SpringBootPlusAopProperties.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/config/src/main/java/io/geekidea/springbootplus/config/properties/SpringBootPlusCorsProperties.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/config/src/main/java/io/geekidea/springbootplus/config/properties/SpringBootPlusFilterProperties.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/config/src/main/java/io/geekidea/springbootplus/config/properties/SpringBootPlusInterceptorProperties.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/config/src/main/java/io/geekidea/springbootplus/config/properties/SpringBootPlusProperties.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/config/src/main/java/io/geekidea/springbootplus/config/properties/SpringBootPlusStaticProperties.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/config/src/main/java/io/geekidea/springbootplus/config/properties/SwaggerProperties.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/config/src/main/resources/config/application-dev.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/config/src/main/resources/config/application-prod.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/config/src/main/resources/config/application-test.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/config/src/main/resources/config/application-uat.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/config/src/main/resources/config/application.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/config/src/main/resources/config/banner.txt" afterDir="false" />
<change afterPath="$PROJECT_DIR$/config/src/main/resources/config/logback.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/config/src/main/resources/config/mime-type.properties" afterDir="false" />
<change afterPath="$PROJECT_DIR$/config/src/main/resources/static/404.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/config/src/main/resources/static/500.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/config/src/main/resources/static/error.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/config/src/main/resources/static/favicon.ico" afterDir="false" />
<change afterPath="$PROJECT_DIR$/config/src/main/resources/static/index.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/config/src/main/resources/static/verifyCode.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/config/src/main/resources/static/welcome.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/distribution/.gitignore" afterDir="false" />
<change afterPath="$PROJECT_DIR$/distribution/README.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/distribution/admin/bin/restart.sh" afterDir="false" />
<change afterPath="$PROJECT_DIR$/distribution/admin/bin/shutdown.sh" afterDir="false" />
<change afterPath="$PROJECT_DIR$/distribution/admin/bin/startup.sh" afterDir="false" />
<change afterPath="$PROJECT_DIR$/distribution/bin/restart.sh" afterDir="false" />
<change afterPath="$PROJECT_DIR$/distribution/bin/shutdown.sh" afterDir="false" />
<change afterPath="$PROJECT_DIR$/distribution/bin/startup.sh" afterDir="false" />
<change afterPath="$PROJECT_DIR$/distribution/pom.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/distribution/release-admin.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/distribution/release.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/docs/bin/deploy.sh" afterDir="false" />
<change afterPath="$PROJECT_DIR$/docs/bin/install/aliyun-mirrors.sh" afterDir="false" />
<change afterPath="$PROJECT_DIR$/docs/bin/install/download-install-all.sh" afterDir="false" />
<change afterPath="$PROJECT_DIR$/docs/bin/install/install-all.sh" afterDir="false" />
<change afterPath="$PROJECT_DIR$/docs/bin/install/install-git.sh" afterDir="false" />
<change afterPath="$PROJECT_DIR$/docs/bin/install/install-jdk.sh" afterDir="false" />
<change afterPath="$PROJECT_DIR$/docs/bin/install/install-maven.sh" afterDir="false" />
<change afterPath="$PROJECT_DIR$/docs/bin/install/install-mysql.sh" afterDir="false" />
<change afterPath="$PROJECT_DIR$/docs/bin/install/install-redis.sh" afterDir="false" />
<change afterPath="$PROJECT_DIR$/docs/config/settings.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/docs/db/mysql_pv_data.sql" afterDir="false" />
<change afterPath="$PROJECT_DIR$/docs/db/mysql_pv_table.sql" afterDir="false" />
<change afterPath="$PROJECT_DIR$/docs/db/mysql_spring_boot_plus.sql" afterDir="false" />
<change afterPath="$PROJECT_DIR$/docs/db/oracle_spring_boot_plus.sql" afterDir="false" />
<change afterPath="$PROJECT_DIR$/docs/db/sqlserver_spring_boot_plus.sql" afterDir="false" />
<change afterPath="$PROJECT_DIR$/docs/img/geekidea-wechat-donate.jpeg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/docs/img/logo.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/docs/img/spring-boot-plus-architecture.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/docs/img/spring-boot-plus-maven-diagrams.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/docs/img/spring-boot-plus-qq-group.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/.gitignore" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/README.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/pom.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/common/api/ApiCode.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/common/api/ApiResult.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/common/bean/ClientInfo.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/common/bean/DeviceInfo.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/common/controller/BaseController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/common/controller/CsrfController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/common/controller/EnumController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/common/controller/IndexController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/common/entity/BaseEntity.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/common/enums/BaseEnum.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/common/exception/BusinessException.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/common/exception/DaoException.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/common/exception/GlobalErrorController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/common/exception/SpringBootPlusConfigException.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/common/exception/SpringBootPlusException.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/common/param/IdParam.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/common/service/BaseService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/common/service/impl/BaseServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/common/vo/EnumVo.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/config/converter/ConverterConfig.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/config/converter/StringToDateConverter.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/config/converter/StringToDateUtil.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/config/converter/StringToDoubleConverter.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/config/converter/StringToDoubleUtil.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/config/converter/StringToIntegerConverter.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/config/converter/StringToIntegerUtil.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/config/jackson/deserializer/JacksonDateDeserializer.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/config/jackson/deserializer/JacksonDoubleDeserializer.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/config/jackson/deserializer/JacksonLocalDateTimeDeserializer.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/config/jackson/serializer/JacksonDateSerializer.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/config/jackson/serializer/JacksonIntegerDeserializer.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/config/jackson/serializer/JacksonLocalDateTimeSerializer.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/core/bean/RequestDetail.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/core/filter/RequestDetailFilter.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/core/interceptor/PermissionInterceptor.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/core/pagination/BasePageOrderParam.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/core/pagination/BasePageParam.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/core/pagination/OrderMapping.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/core/pagination/PageInfo.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/core/pagination/Paging.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/core/util/RequestDetailThreadLocal.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/core/validator/EnumTypeValidator.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/core/validator/IdCardValidator.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/core/validator/PhoneValidator.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/core/validator/constraints/EnumType.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/core/validator/constraints/IdCard.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/core/validator/constraints/Phone.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/core/validator/groups/Add.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/core/validator/groups/Update.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/core/xss/XssFilter.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/core/xss/XssHttpServletRequestWrapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/core/xss/XssJacksonDeserializer.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/core/xss/XssJacksonSerializer.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/ip/entity/IpAddress.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/ip/mapper/IpAddressMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/ip/service/IpAddressService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/ip/service/impl/IpAddressServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/log/annotation/Module.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/log/annotation/OperationLog.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/log/annotation/OperationLogIgnore.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/log/aop/BaseLogAop.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/log/bean/OperationLogInfo.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/log/bean/RequestInfo.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/log/controller/SysLoginLogController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/log/controller/SysOperationLogController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/log/entity/SysLoginLog.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/log/entity/SysOperationLog.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/log/enums/OperationLogType.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/log/mapper/SysLoginLogMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/log/mapper/SysOperationLogMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/log/param/SysLoginLogPageParam.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/log/param/SysOperationLogPageParam.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/log/service/SysLoginLogService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/log/service/SysOperationLogService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/log/service/impl/SysLoginLogServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/log/service/impl/SysOperationLogServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/cache/LoginRedisService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/cache/impl/LoginRedisServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/convert/LoginSysUserVoConvert.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/convert/ShiroMapstructConvert.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/exception/ShiroConfigException.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/jwt/JwtCredentialsMatcher.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/jwt/JwtFilter.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/jwt/JwtRealm.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/jwt/JwtToken.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/service/LoginToken.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/service/LoginUsername.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/service/ShiroLoginService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/service/impl/ShiroLoginServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/util/JwtTokenUtil.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/util/JwtUtil.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/util/SaltUtil.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/vo/JwtTokenRedisVo.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/vo/LoginSysUserRedisVo.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/vo/LoginSysUserVo.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/vo/Members.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/vo/SysPermission.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/vo/SysPermissionTreeVo.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/util/AnsiUtil.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/util/BaseEnumUtil.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/util/BrowserUtil.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/util/ClientInfoUtil.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/util/ContentTypeUtil.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/util/DateUtil.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/util/DownloadUtil.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/util/HttpServletRequestUtil.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/util/HttpServletResponseUtil.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/util/IniUtil.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/util/IpUtil.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/util/Jackson.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/util/LambdaColumn.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/util/LoginUtil.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/util/MapUtil.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/util/PasswordUtil.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/util/PhoneUtil.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/util/PrintApplicationInfo.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/util/PropertyColumnUtil.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/util/RedisCacheUtil.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/util/SpringContextUtil.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/util/TokenUtil.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/util/UUIDUtil.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/util/UploadUtil.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/util/VerificationCode.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/java/io/geekidea/springbootplus/framework/util/package-info.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/resources/mapper/ip/IpAddressMapper.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/resources/mapper/log/SysLoginLogMapper.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/framework/src/main/resources/mapper/log/SysOperationLogMapper.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/generator/.gitignore" afterDir="false" />
<change afterPath="$PROJECT_DIR$/generator/README.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/generator/pom.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/generator/src/main/java/io/geekidea/springbootplus/generator/CodeGenerator.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/generator/src/main/java/io/geekidea/springbootplus/generator/SpringBootPlusGenerator.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/generator/src/main/java/io/geekidea/springbootplus/generator/config/GeneratorConfig.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/generator/src/main/java/io/geekidea/springbootplus/generator/config/GeneratorStrategy.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/generator/src/main/java/io/geekidea/springbootplus/generator/config/MybatisPlusGeneratorConfig.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/generator/src/main/java/io/geekidea/springbootplus/generator/config/ProjectConfig.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/generator/src/main/java/io/geekidea/springbootplus/generator/config/TableConfig.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/generator/src/main/java/io/geekidea/springbootplus/generator/config/query/SpringBootPlusMySqlQuery.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/generator/src/main/java/io/geekidea/springbootplus/generator/config/query/SpringBootPlusSqlServerQuery.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/generator/src/main/java/io/geekidea/springbootplus/generator/constant/GeneratorConstant.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/generator/src/main/java/io/geekidea/springbootplus/generator/exception/GeneratorException.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/generator/src/main/java/io/geekidea/springbootplus/generator/properties/GeneratorProperties.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/generator/src/main/resources/application.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/generator/src/main/resources/templates/controller.java.vm" afterDir="false" />
<change afterPath="$PROJECT_DIR$/generator/src/main/resources/templates/entity.java.vm" afterDir="false" />
<change afterPath="$PROJECT_DIR$/generator/src/main/resources/templates/mapper.java.vm" afterDir="false" />
<change afterPath="$PROJECT_DIR$/generator/src/main/resources/templates/mapper.xml.vm" afterDir="false" />
<change afterPath="$PROJECT_DIR$/generator/src/main/resources/templates/pageParam.java.vm" afterDir="false" />
<change afterPath="$PROJECT_DIR$/generator/src/main/resources/templates/queryVo.java.vm" afterDir="false" />
<change afterPath="$PROJECT_DIR$/generator/src/main/resources/templates/service.java.vm" afterDir="false" />
<change afterPath="$PROJECT_DIR$/generator/src/main/resources/templates/serviceImpl.java.vm" afterDir="false" />
<change afterPath="$PROJECT_DIR$/generator/src/test/java/io/geekidea/springbootplus/generator/test/GeneratorPropertiesTest.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/generator/src/test/java/io/geekidea/springbootplus/generator/test/GeneratorTestApplication.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/.gitignore" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/README.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/pom.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/controller/MembersController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/controller/MultithreadScheduleTask.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/controller/NoticeController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/controller/NoticetypeController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/controller/SuperadmindbController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/controller/SurveyController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/controller/SurveyfileController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/controller/UploadController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/controller/WeChartAuthorizedController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/controller/WxController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/entity/Members.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/entity/Notice.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/entity/Noticetype.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/entity/Superadmindb.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/entity/Survey.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/entity/Surveyfile.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/enums/EntityEnum.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/enums/MenuLevelEnum.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/enums/StateEnum.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/mapper/MembersMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/mapper/NoticeMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/mapper/NoticetypeMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/mapper/SuperadmindbMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/mapper/SurveyMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/mapper/SurveyfileMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/param/EnterPageParam.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/param/EnterpriseMembers.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/param/EnterpriseMembersPage.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/param/EnterpriseMembersUpdate.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/param/HomeInfo.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/param/MembersPageParam.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/param/NoticeAdd.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/param/NoticePageParam.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/param/NoticetypePageParam.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/param/NoticetypeUpdate.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/param/PersonalMembers.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/param/PersonalMembersPage.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/param/PersonalMembersUpdate.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/param/SuperadmindbAdd.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/param/SuperadmindbPageParam.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/param/SurveyAdd.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/param/SurveyPageParam.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/param/SurveyfilePageParam.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/MembersService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/NoticeService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/NoticetypeService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/SuperadmindbService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/SurveyService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/SurveyfileService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/WxService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/impl/MembersServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/impl/NoticeServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/impl/NoticetypeServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/impl/SuperadmindbServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/impl/SurveyServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/impl/SurveyfileServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/impl/WxServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/CapitalizationUtils.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/CheckUtil.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/DateUtils.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/DownloadHelper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/EntityUtil.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/ExcelUtils.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/FileUtils.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/HttpSessionConfig.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/IdCardUtil.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/IpUtils.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/ListUtils.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/SendMail.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/StringUtils.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/VerifyCodeUtils.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/ZipUtils.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/wx/AccessTokenCommon.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/wx/DateUtils.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/wx/MessageManager.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/wx/SignatureUtil.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/wx/StringUtils.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/wx/WXConfigInfo.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/wx/WXMessageUtils.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/wx/WXSecurityUtils.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/wx/aes/AesException.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/wx/aes/ByteGroup.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/wx/aes/PKCS7Encoder.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/wx/aes/SHA1.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/wx/aes/WXBizMsgCrypt.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/wx/aes/XMLParse.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/wx/msg/BaseMessage.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/wx/msg/EventMessage.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/wx/msg/ImageMessage.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/wx/msg/LinkMessage.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/wx/msg/LocationMessage.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/wx/msg/MediaMessage.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/wx/msg/MusicMessage.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/wx/msg/NewsMessage.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/wx/msg/RespMessage.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/wx/msg/TextMessage.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/wx/msg/VideoMessage.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/wx/msg/VoiceMessage.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/vo/ProjectQueryVo.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/vo/SubjectinformationQueryVo.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/vo/SubjectsInfoStatisticsDashboard.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/vo/SysDepartmentQueryVo.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/vo/SysUserQueryVo.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/vo/TCaseReportVO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/vo/TFirsthandDataPageList.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/vo/TFolderManagementTreeVo.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/vo/TSubmitRulesVO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/vo/countFiveYearsEntity.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/vo/sysName.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/resources/mapper/MembersMapper.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/resources/mapper/NoticeMapper.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/resources/mapper/NoticetypeMapper.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/resources/mapper/SuperadmindbMapper.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/resources/mapper/SurveyMapper.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hongxinhui/src/main/resources/mapper/SurveyfileMapper.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/scheduled/.gitignore" afterDir="false" />
<change afterPath="$PROJECT_DIR$/scheduled/README.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/scheduled/pom.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/scheduled/src/main/java/io/geekidea/springbootplus/scheduled/HelloScheduled.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/system/.gitignore" afterDir="false" />
<change afterPath="$PROJECT_DIR$/system/README.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/system/pom.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/system/src/main/java/io/geekidea/springbootplus/system/enums/EntityEnum.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/system/src/main/java/io/geekidea/springbootplus/system/enums/MenuLevelEnum.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/system/src/main/java/io/geekidea/springbootplus/system/enums/StateEnum.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/system/src/main/java/io/geekidea/springbootplus/system/exception/SysLoginException.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/system/src/main/java/io/geekidea/springbootplus/system/exception/VerificationCodeException.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/system/src/main/java/io/geekidea/springbootplus/system/interceptor/DownloadInterceptor.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/system/src/main/java/io/geekidea/springbootplus/system/interceptor/ResourceInterceptor.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/system/src/main/java/io/geekidea/springbootplus/system/interceptor/UploadInterceptor.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/system/src/main/resources/mapper/system.md" afterDir="false" />
<list default="true" id="d78dbbd2-2fbf-4680-80a9-30edd19c4d7f" name="Default Changelist" comment="上传项目">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/admin/target/admin-2.0.jar" beforeDir="false" afterPath="$PROJECT_DIR$/admin/target/admin-2.0.jar" afterDir="false" />
<change beforePath="$PROJECT_DIR$/admin/target/admin-2.0.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/admin/target/admin-2.0.jar.original" afterDir="false" />
<change beforePath="$PROJECT_DIR$/bootstrap/target/bootstrap-2.0.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/bootstrap/target/bootstrap-2.0.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/bootstrap/target/bootstrap-2.0.jar.original" afterDir="false" />
<change beforePath="$PROJECT_DIR$/bootstrap/target/hongxinhui.jar" beforeDir="false" afterPath="$PROJECT_DIR$/bootstrap/target/hongxinhui.jar" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/src/main/resources/config/application-prod.yml" beforeDir="false" afterPath="$PROJECT_DIR$/config/src/main/resources/config/application-prod.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/target/classes/config/application-prod.yml" beforeDir="false" afterPath="$PROJECT_DIR$/config/target/classes/config/application-prod.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/target/config-2.0.jar" beforeDir="false" afterPath="$PROJECT_DIR$/config/target/config-2.0.jar" afterDir="false" />
<change beforePath="$PROJECT_DIR$/framework/target/framework-2.0.jar" beforeDir="false" afterPath="$PROJECT_DIR$/framework/target/framework-2.0.jar" afterDir="false" />
<change beforePath="$PROJECT_DIR$/framework/target/generated-sources/annotations/io/geekidea/springbootplus/framework/shiro/convert/LoginSysUserVoConvertImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/framework/target/generated-sources/annotations/io/geekidea/springbootplus/framework/shiro/convert/LoginSysUserVoConvertImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/framework/target/generated-sources/annotations/io/geekidea/springbootplus/framework/shiro/convert/ShiroMapstructConvertImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/framework/target/generated-sources/annotations/io/geekidea/springbootplus/framework/shiro/convert/ShiroMapstructConvertImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/generator/target/generator-2.0.jar" beforeDir="false" afterPath="$PROJECT_DIR$/generator/target/generator-2.0.jar" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/controller/SurveyController.java" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/controller/SurveyController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/NoticeService.java" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/NoticeService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/NoticetypeService.java" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/NoticetypeService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/SuperadmindbService.java" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/SuperadmindbService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/SurveyService.java" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/SurveyService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/SurveyfileService.java" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/SurveyfileService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/impl/MembersServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/impl/MembersServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/impl/NoticetypeServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/impl/NoticetypeServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/impl/SurveyServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/impl/SurveyServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/controller/SurveyController.class" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/controller/SurveyController.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/service/SurveyService.class" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/service/SurveyService.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/service/impl/MembersServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/service/impl/MembersServiceImpl.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/service/impl/NoticetypeServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/service/impl/NoticetypeServiceImpl.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/service/impl/SurveyServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/service/impl/SurveyServiceImpl.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/target/example-2.0.jar" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/example-2.0.jar" afterDir="false" />
<change beforePath="$PROJECT_DIR$/system/target/system-2.0.jar" beforeDir="false" afterPath="$PROJECT_DIR$/system/target/system-2.0.jar" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -432,6 +72,12 @@
</option>
</component>
<component name="Git.Settings">
<option name="PUSH_TAGS">
<GitPushTagMode>
<option name="argument" value="--tags" />
<option name="title" value="All" />
</GitPushTagMode>
</option>
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="MavenImportPreferences">
......@@ -796,15 +442,24 @@
<workItem from="1625707504342" duration="1424000" />
<workItem from="1625708970553" duration="11668000" />
<workItem from="1625793892173" duration="46000" />
<workItem from="1625793974855" duration="3199000" />
<workItem from="1625793974855" duration="10851000" />
</task>
<task id="LOCAL-00001" summary="上传项目">
<created>1625797686627</created>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
<updated>1625797686627</updated>
</task>
<option name="localTasksCounter" value="2" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
</component>
<component name="VcsManagerConfiguration">
<option name="LAST_COMMIT_MESSAGE" value="" />
<MESSAGE value="上传项目" />
<option name="LAST_COMMIT_MESSAGE" value="上传项目" />
</component>
<component name="WindowStateProjectService">
<state x="361" y="74" key="#Plugins" timestamp="1624963006648">
......@@ -815,10 +470,10 @@
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="223" y="67" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1536.824@0.0.1536.824" timestamp="1625040317986" />
<state x="574" y="116" key="#com.intellij.ide.util.MemberChooser" timestamp="1625714492463">
<state x="574" y="116" key="#com.intellij.ide.util.MemberChooser" timestamp="1625800749614">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="574" y="116" key="#com.intellij.ide.util.MemberChooser/0.0.1536.824@0.0.1536.824" timestamp="1625714492463" />
<state x="574" y="116" key="#com.intellij.ide.util.MemberChooser/0.0.1536.824@0.0.1536.824" timestamp="1625800749614" />
<state x="495" y="252" width="618" height="319" key="#com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesDialog.classes" timestamp="1624930043181">
<screen x="0" y="0" width="1536" height="824" />
</state>
......@@ -835,38 +490,38 @@
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="434" y="57" width="661" height="767" key="#xdebugger.evaluate/0.0.1536.824@0.0.1536.824" timestamp="1625564326839" />
<state x="346" y="0" key="CommitChangelistDialog2" timestamp="1625797412638">
<state x="346" y="0" key="CommitChangelistDialog2" timestamp="1625813646961">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="346" y="0" key="CommitChangelistDialog2/0.0.1536.824@0.0.1536.824" timestamp="1625797412638" />
<state x="346" y="0" key="CommitChangelistDialog2/0.0.1536.824@0.0.1536.824" timestamp="1625813646961" />
<state width="657" height="618" key="DebuggerActiveHint" timestamp="1625564044324">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state width="657" height="618" key="DebuggerActiveHint/0.0.1536.824@0.0.1536.824" timestamp="1625564044324" />
<state x="122" y="80" width="1350" height="638" key="DiffContextDialog" timestamp="1625562177079">
<state x="122" y="80" width="1350" height="638" key="DiffContextDialog" timestamp="1625797922016">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="122" y="80" width="1350" height="638" key="DiffContextDialog/0.0.1536.824@0.0.1536.824" timestamp="1625562177079" />
<state x="122" y="80" width="1350" height="638" key="DiffContextDialog/0.0.1536.824@0.0.1536.824" timestamp="1625797922016" />
<state x="549" y="167" key="FileChooserDialogImpl" timestamp="1625797418458">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1625797418458" />
<state width="1493" height="333" key="GridCell.Tab.0.bottom" timestamp="1625738554900">
<state width="1493" height="267" key="GridCell.Tab.0.bottom" timestamp="1625811677089">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state width="1493" height="333" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1625738554900" />
<state width="1493" height="333" key="GridCell.Tab.0.center" timestamp="1625738554900">
<state width="1493" height="267" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1625811677089" />
<state width="1493" height="267" key="GridCell.Tab.0.center" timestamp="1625811677089">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state width="1493" height="333" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1625738554900" />
<state width="1493" height="333" key="GridCell.Tab.0.left" timestamp="1625738554899">
<state width="1493" height="267" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1625811677089" />
<state width="1493" height="267" key="GridCell.Tab.0.left" timestamp="1625811677089">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state width="1493" height="333" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1625738554899" />
<state width="1493" height="333" key="GridCell.Tab.0.right" timestamp="1625738554900">
<state width="1493" height="267" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1625811677089" />
<state width="1493" height="267" key="GridCell.Tab.0.right" timestamp="1625811677089">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state width="1493" height="333" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1625738554900" />
<state width="1493" height="267" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1625811677089" />
<state width="1493" height="315" key="GridCell.Tab.1.bottom" timestamp="1625647492230">
<screen x="0" y="0" width="1536" height="824" />
</state>
......@@ -911,6 +566,10 @@
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="249" y="0" width="1250" height="824" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1625044058689" />
<state x="361" y="127" key="Vcs.Push.Dialog.v2" timestamp="1625797719831">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="361" y="127" key="Vcs.Push.Dialog.v2/0.0.1536.824@0.0.1536.824" timestamp="1625797719831" />
<state width="775" height="419" key="XDebugger.FullValuePopup" timestamp="1625564074239">
<screen x="0" y="0" width="1536" height="824" />
</state>
......@@ -931,10 +590,10 @@
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="421" y="62" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser/0.0.1536.824@0.0.1536.824" timestamp="1625021359303" />
<state x="437" y="78" width="836" height="746" key="find.popup" timestamp="1625738225465">
<state x="437" y="78" width="836" height="746" key="find.popup" timestamp="1625801022315">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="437" y="78" width="836" height="746" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1625738225465" />
<state x="437" y="78" width="836" height="746" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1625801022315" />
<state x="550" y="185" key="git4idea.merge.GitPullDialog" timestamp="1625797427678">
<screen x="0" y="0" width="1536" height="824" />
</state>
......@@ -943,10 +602,10 @@
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="425" y="187" key="run.anything.popup/0.0.1536.824@0.0.1536.824" timestamp="1625651453194" />
<state x="431" y="145" width="672" height="678" key="search.everywhere.popup" timestamp="1625709013406">
<state x="431" y="145" width="672" height="678" key="search.everywhere.popup" timestamp="1625811109926">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="431" y="145" width="672" height="678" key="search.everywhere.popup/0.0.1536.824@0.0.1536.824" timestamp="1625709013406" />
<state x="431" y="145" width="672" height="678" key="search.everywhere.popup/0.0.1536.824@0.0.1536.824" timestamp="1625811109926" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
......
admin/target/admin-2.0.jar
View file @ 217e616e
No preview for this file type
admin/target/admin-2.0.jar.original
View file @ 217e616e
No preview for this file type
bootstrap/target/bootstrap-2.0.jar deleted 100644 → 0
View file @ 159364d1
File deleted
bootstrap/target/bootstrap-2.0.jar.original
View file @ 217e616e
No preview for this file type
bootstrap/target/hongxinhui.jar
View file @ 217e616e
No preview for this file type
config/src/main/resources/config/application-prod.yml
View file @ 217e616e
......@@ -2,7 +2,7 @@ spring-boot-plus:
# 是否启用ansi控制台输出有颜色的字体，dev环境建议开启，服务器环境设置为false
enable-ansi: true
# 当前环境服务IP地址
server-ip: 127.0.0.1
server-ip: 114.67.82.178
# 文件上传下载配置
upload-path: /opt/upload/
taskstatus: 1
......
config/target/classes/config/application-prod.yml
View file @ 217e616e
......@@ -2,7 +2,7 @@ spring-boot-plus:
# 是否启用ansi控制台输出有颜色的字体，dev环境建议开启，服务器环境设置为false
enable-ansi: true
# 当前环境服务IP地址
server-ip: 127.0.0.1
server-ip: 114.67.82.178
# 文件上传下载配置
upload-path: /opt/upload/
taskstatus: 1
......
config/target/config-2.0.jar
View file @ 217e616e
No preview for this file type
framework/target/framework-2.0.jar
View file @ 217e616e
No preview for this file type
framework/target/generated-sources/annotations/io/geekidea/springbootplus/framework/shiro/convert/LoginSysUserVoConvertImpl.java
View file @ 217e616e
......@@ -6,7 +6,7 @@ import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
date = "2021-07-08T18:02:51+0800",
date = "2021-07-09T14:13:11+0800",
comments = "version: 1.3.1.Final, compiler: javac, environment: Java 1.8.0_131 (Oracle Corporation)"
)
public class LoginSysUserVoConvertImpl implements LoginSysUserVoConvert {
......
framework/target/generated-sources/annotations/io/geekidea/springbootplus/framework/shiro/convert/ShiroMapstructConvertImpl.java
View file @ 217e616e
......@@ -6,7 +6,7 @@ import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
date = "2021-07-08T18:02:51+0800",
date = "2021-07-09T14:13:11+0800",
comments = "version: 1.3.1.Final, compiler: javac, environment: Java 1.8.0_131 (Oracle Corporation)"
)
public class ShiroMapstructConvertImpl implements ShiroMapstructConvert {
......
generator/target/generator-2.0.jar
View file @ 217e616e
No preview for this file type
hongxinhui/src/main/java/com/hongxinhui/controller/SurveyController.java
View file @ 217e616e
......@@ -53,7 +53,7 @@ public class SurveyController extends BaseController {
@PostMapping("/update")
@OperationLog(name = "修改", type = OperationLogType.UPDATE)
@ApiOperation(value = "修改", response = ApiResult.class)
public ApiResult<Boolean> updateSurvey(@Validated(Update.class) @RequestBody Survey survey) throws Exception {
public ApiResult<Boolean> updateSurvey(@Validated(Update.class) @RequestBody SurveyAdd survey) throws Exception {
boolean flag = surveyService.updateSurvey(survey);
return ApiResult.result(flag);
}
......@@ -76,7 +76,7 @@ public class SurveyController extends BaseController {
@OperationLog(name = "详情", type = OperationLogType.INFO)
@ApiOperation(value = "详情", response = Survey.class)
public ApiResult<Survey> getSurvey(@PathVariable("id") Long id) throws Exception {
Survey survey = surveyService.getById(id);
Survey survey = surveyService.getSurveyById(id);
return ApiResult.ok(survey);
}
......
hongxinhui/src/main/java/com/hongxinhui/service/NoticeService.java
View file @ 217e616e
......@@ -45,7 +45,7 @@ public interface NoticeService extends BaseService<Notice> {
/**
* 获取分页对象
*
* @param noticeQueryParam
* @param noticePageParam
* @return
* @throws Exception
*/
......
hongxinhui/src/main/java/com/hongxinhui/service/NoticetypeService.java
View file @ 217e616e
......@@ -47,7 +47,7 @@ public interface NoticetypeService extends BaseService<Noticetype> {
/**
* 获取分页对象
*
* @param noticetypeQueryParam
* @param noticetypePageParam
* @return
* @throws Exception
*/
......
hongxinhui/src/main/java/com/hongxinhui/service/SuperadmindbService.java
View file @ 217e616e
......@@ -47,7 +47,6 @@ public interface SuperadmindbService extends BaseService<Superadmindb> {
/**
* 获取分页对象
*
* @param superadmindbQueryParam
* @return
* @throws Exception
*/
......
hongxinhui/src/main/java/com/hongxinhui/service/SurveyService.java
View file @ 217e616e
......@@ -30,7 +30,7 @@ public interface SurveyService extends BaseService<Survey> {
* @return
* @throws Exception
*/
boolean updateSurvey(Survey survey) throws Exception;
boolean updateSurvey(SurveyAdd survey) throws Exception;
/**
* 删除
......@@ -45,10 +45,11 @@ public interface SurveyService extends BaseService<Survey> {
/**
* 获取分页对象
*
* @param surveyQueryParam
* @param surveyPageParam
* @return
* @throws Exception
*/
Paging<Survey> getSurveyPageList(SurveyPageParam surveyPageParam) throws Exception;
Survey getSurveyById(Long id);
}
hongxinhui/src/main/java/com/hongxinhui/service/SurveyfileService.java
View file @ 217e616e
......@@ -44,7 +44,7 @@ public interface SurveyfileService extends BaseService<Surveyfile> {
/**
* 获取分页对象
*
* @param surveyfileQueryParam
* @param surveyfilePageParam
* @return
* @throws Exception
*/
......
hongxinhui/src/main/java/com/hongxinhui/service/impl/MembersServiceImpl.java
View file @ 217e616e
......@@ -323,6 +323,7 @@ public class MembersServiceImpl extends BaseServiceImpl<MembersMapper, Members>
return hashMap;
}
//首页会员统计
@Override
public HomeInfo getHomeInfo() {
HomeInfo homeInfo = new HomeInfo();
......@@ -341,6 +342,7 @@ public class MembersServiceImpl extends BaseServiceImpl<MembersMapper, Members>
return homeInfo;
}
//通过或者驳回会员的注册申请
@Override
public HashMap<String, Object> handleApply(Integer id, Integer status) {
HashMap<String, Object> hashMap = new HashMap<>();
......@@ -361,6 +363,7 @@ public class MembersServiceImpl extends BaseServiceImpl<MembersMapper, Members>
return hashMap;
}
//企业会员分页列表
@Override
public Paging<EnterpriseMembersPage> getPageListEnterprise(EnterPageParam enterPageParam) {
Page<EnterpriseMembersPage> page = new PageInfo<>(enterPageParam);
......
hongxinhui/src/main/java/com/hongxinhui/service/impl/NoticetypeServiceImpl.java
View file @ 217e616e
......@@ -41,11 +41,12 @@ public class NoticetypeServiceImpl extends BaseServiceImpl<NoticetypeMapper, Not
QueryWrapper<Noticetype> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("name",noticetype.getName());
List<Noticetype> noticetypes = noticetypeMapper.selectList(queryWrapper);
if(noticetypes!=null||noticetypes.size()>0){
if(noticetypes!=null&&noticetypes.size()>0){
hashMap.put("code","500");
hashMap.put("info","名称已存在");
return hashMap;
}
noticetypeMapper.insert(noticetype);
hashMap.put("code","200");
hashMap.put("info","新增成功");
return hashMap;
......@@ -60,7 +61,7 @@ public class NoticetypeServiceImpl extends BaseServiceImpl<NoticetypeMapper, Not
queryWrapper.eq("name",noticetype.getName());
queryWrapper.ne("id",noticetype.getId());
List<Noticetype> noticetypes = noticetypeMapper.selectList(queryWrapper);
if(noticetypes!=null||noticetypes.size()>0){
if(noticetypes!=null&&noticetypes.size()>0){
hashMap.put("code","500");
hashMap.put("info","名称已存在");
return hashMap;
......
hongxinhui/src/main/java/com/hongxinhui/service/impl/SurveyServiceImpl.java
View file @ 217e616e
......@@ -24,6 +24,8 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.List;
/**
* 服务实现类
*
......@@ -72,7 +74,21 @@ public class SurveyServiceImpl extends BaseServiceImpl<SurveyMapper, Survey> imp
@Transactional(rollbackFor = Exception.class)
@Override
public boolean updateSurvey(Survey survey) throws Exception {
public boolean updateSurvey(SurveyAdd surveyAdd) throws Exception {
Survey survey = new Survey();
BeanUtils.copyProperties(surveyAdd, survey);
//修改附件表 项目id
if(!StringUtils.isEmpty( surveyAdd.getFileIdlist())){
String[] split = surveyAdd.getFileIdlist().split(",");
for (String string:split) {
Integer fileid = Integer.valueOf(string);
Surveyfile surveyfile = new Surveyfile();
surveyfile.setFileID(Long.valueOf( fileid));
surveyfile.setSurveyId(survey.getId().intValue());
surveyfileMapper.updateById(surveyfile);
}
}
return super.updateById(survey);
}
......@@ -108,9 +124,23 @@ public class SurveyServiceImpl extends BaseServiceImpl<SurveyMapper, Survey> imp
survey.setCreateUserName(superadmindb.getNickname());
}
}
QueryWrapper<Surveyfile> queryWrapper1 = new QueryWrapper<>();
queryWrapper1.eq("surveyId",survey.getId());
List<Surveyfile> surveyfiles = surveyfileMapper.selectList(queryWrapper1);
survey.setFilelist(surveyfiles);
}
return new Paging<Survey>(iPage);
}
@Override
public Survey getSurveyById(Long id) {
Survey survey = surveyMapper.selectById(id);
QueryWrapper<Surveyfile> queryWrapper1 = new QueryWrapper<>();
queryWrapper1.eq("surveyId",survey.getId());
List<Surveyfile> surveyfiles = surveyfileMapper.selectList(queryWrapper1);
survey.setFilelist(surveyfiles);
return survey;
}
}
hongxinhui/target/classes/com/hongxinhui/controller/SurveyController.class
View file @ 217e616e
No preview for this file type
hongxinhui/target/classes/com/hongxinhui/service/SurveyService.class
View file @ 217e616e
No preview for this file type
hongxinhui/target/classes/com/hongxinhui/service/impl/MembersServiceImpl.class
View file @ 217e616e
No preview for this file type
hongxinhui/target/classes/com/hongxinhui/service/impl/NoticetypeServiceImpl.class
View file @ 217e616e
No preview for this file type
hongxinhui/target/classes/com/hongxinhui/service/impl/SurveyServiceImpl.class
View file @ 217e616e
No preview for this file type
hongxinhui/target/example-2.0.jar
View file @ 217e616e
No preview for this file type
system/target/system-2.0.jar
View file @ 217e616e
No preview for this file type
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment