il y a 3 ans · d7cd9cec99
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
--- a/leiSP-admin/src/main/resources/application-druid.yml
+++ b/leiSP-admin/src/main/resources/application-druid.yml
@@ -7,8 +7,8 @@ spring:
 
				             # 主库数据源
			
 
				             master:
			
 
				 
			
 
				-                url: jdbc:mysql://127.0.0.1:53306/jian?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
			
 
				-#                url: jdbc:mysql://218.27.1.157:53306/jian?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
			
 
				+#                url: jdbc:mysql://127.0.0.1:53306/jian?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
			
 
				+                url: jdbc:mysql://218.27.1.157:53306/jian?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
			
 
				                 username: root
			
 
				                 password: sys200888
			
 
				 
			
--- a/leiSP-admin/target/classes/application-druid.yml
+++ b/leiSP-admin/target/classes/application-druid.yml
@@ -7,8 +7,8 @@ spring:
 
				             # 主库数据源
			
 
				             master:
			
 
				 
			
 
				-                url: jdbc:mysql://127.0.0.1:53306/jian?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
			
 
				-#                url: jdbc:mysql://218.27.1.157:53306/jian?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
			
 
				+#                url: jdbc:mysql://127.0.0.1:53306/jian?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
			
 
				+                url: jdbc:mysql://218.27.1.157:53306/jian?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
			
 
				                 username: root
			
 
				                 password: sys200888
			
 
				 
			
--- a/leiSP-admin/target/classes/com/sooka/web/controller/common/CommonController.class
+++ b/leiSP-admin/target/classes/com/sooka/web/controller/common/CommonController.class
--- a/leiSP-admin/target/classes/com/sooka/web/controller/demo/controller/DemoOperateController.class
+++ b/leiSP-admin/target/classes/com/sooka/web/controller/demo/controller/DemoOperateController.class
--- a/leiSP-admin/target/classes/com/sooka/web/controller/demo/controller/DemoTableController.class
+++ b/leiSP-admin/target/classes/com/sooka/web/controller/demo/controller/DemoTableController.class
--- a/leiSP-admin/target/classes/com/sooka/web/controller/monitor/SysUserOnlineController.class
+++ b/leiSP-admin/target/classes/com/sooka/web/controller/monitor/SysUserOnlineController.class
--- a/leiSP-admin/target/classes/com/sooka/web/controller/system/SysCaptchaController.class
+++ b/leiSP-admin/target/classes/com/sooka/web/controller/system/SysCaptchaController.class
--- a/leiSP-admin/target/classes/com/sooka/web/controller/system/SysDeptController.class
+++ b/leiSP-admin/target/classes/com/sooka/web/controller/system/SysDeptController.class
--- a/leiSP-admin/target/classes/com/sooka/web/controller/system/SysIndexController.class
+++ b/leiSP-admin/target/classes/com/sooka/web/controller/system/SysIndexController.class
--- a/leiSP-admin/target/classes/com/sooka/web/controller/system/SysLoginController.class
+++ b/leiSP-admin/target/classes/com/sooka/web/controller/system/SysLoginController.class
--- a/leiSP-admin/target/classes/com/sooka/web/controller/system/SysMenuController.class
+++ b/leiSP-admin/target/classes/com/sooka/web/controller/system/SysMenuController.class
--- a/leiSP-admin/target/classes/com/sooka/web/controller/system/SysPostController.class
+++ b/leiSP-admin/target/classes/com/sooka/web/controller/system/SysPostController.class
--- a/leiSP-admin/target/classes/com/sooka/web/controller/system/SysProfileController.class
+++ b/leiSP-admin/target/classes/com/sooka/web/controller/system/SysProfileController.class
--- a/leiSP-admin/target/classes/com/sooka/web/controller/system/SysRegisterController.class
+++ b/leiSP-admin/target/classes/com/sooka/web/controller/system/SysRegisterController.class
--- a/leiSP-admin/target/classes/com/sooka/web/controller/system/SysRoleController.class
+++ b/leiSP-admin/target/classes/com/sooka/web/controller/system/SysRoleController.class
--- a/leiSP-admin/target/classes/com/sooka/web/controller/system/SysUserController.class
+++ b/leiSP-admin/target/classes/com/sooka/web/controller/system/SysUserController.class
--- a/leiSP-admin/target/classes/templates/main.html
+++ b/leiSP-admin/target/classes/templates/main.html
@@ -90,7 +90,7 @@
 
				                         </div>
			
 
				                     </div>-->
			
 
				                     <div th:each="obj,objStat : ${weather}">
			
 
				-                        <input type="hidden" class="year" th:value="*{obj.year}">
			
 
				+                        <!--<input type="hidden" class="year" th:value="*{obj.year}">-->
			
 
				                         <input type="hidden" class="month" th:value="*{obj.month}">
			
 
				                         <input type="hidden" class="day" th:value="*{obj.day}">
			
 
				                         <input type="hidden" class="temperature" th:value="*{obj.temperature}">
			
--- a/leiSP-common/target/classes/com/sooka/common/config/thread/ThreadPoolConfig$1.class
+++ b/leiSP-common/target/classes/com/sooka/common/config/thread/ThreadPoolConfig$1.class
--- a/leiSP-common/target/classes/com/sooka/common/core/controller/BaseController.class
+++ b/leiSP-common/target/classes/com/sooka/common/core/controller/BaseController.class
--- a/leiSP-common/target/classes/com/sooka/common/core/domain/AjaxResult.class
+++ b/leiSP-common/target/classes/com/sooka/common/core/domain/AjaxResult.class
--- a/leiSP-common/target/classes/com/sooka/common/core/text/CharsetKit.class
+++ b/leiSP-common/target/classes/com/sooka/common/core/text/CharsetKit.class
--- a/leiSP-common/target/classes/com/sooka/common/core/text/Convert.class
+++ b/leiSP-common/target/classes/com/sooka/common/core/text/Convert.class
--- a/leiSP-common/target/classes/com/sooka/common/core/text/StrFormatter.class
+++ b/leiSP-common/target/classes/com/sooka/common/core/text/StrFormatter.class
--- a/leiSP-common/target/classes/com/sooka/common/json/JSON.class
+++ b/leiSP-common/target/classes/com/sooka/common/json/JSON.class
--- a/leiSP-common/target/classes/com/sooka/common/json/JSONObject$JSONArray.class
+++ b/leiSP-common/target/classes/com/sooka/common/json/JSONObject$JSONArray.class
--- a/leiSP-common/target/classes/com/sooka/common/json/JSONObject.class
+++ b/leiSP-common/target/classes/com/sooka/common/json/JSONObject.class
--- a/leiSP-common/target/classes/com/sooka/common/utils/AddressUtils.class
+++ b/leiSP-common/target/classes/com/sooka/common/utils/AddressUtils.class
--- a/leiSP-common/target/classes/com/sooka/common/utils/Arith.class
+++ b/leiSP-common/target/classes/com/sooka/common/utils/Arith.class
--- a/leiSP-common/target/classes/com/sooka/common/utils/CacheUtils.class
+++ b/leiSP-common/target/classes/com/sooka/common/utils/CacheUtils.class
--- a/leiSP-common/target/classes/com/sooka/common/utils/DateUtils.class
+++ b/leiSP-common/target/classes/com/sooka/common/utils/DateUtils.class
--- a/leiSP-common/target/classes/com/sooka/common/utils/ExceptionUtil.class
+++ b/leiSP-common/target/classes/com/sooka/common/utils/ExceptionUtil.class
--- a/leiSP-common/target/classes/com/sooka/common/utils/IpUtils.class
+++ b/leiSP-common/target/classes/com/sooka/common/utils/IpUtils.class
--- a/leiSP-common/target/classes/com/sooka/common/utils/MapDataUtil.class
+++ b/leiSP-common/target/classes/com/sooka/common/utils/MapDataUtil.class
--- a/leiSP-common/target/classes/com/sooka/common/utils/ServletUtils.class
+++ b/leiSP-common/target/classes/com/sooka/common/utils/ServletUtils.class
--- a/leiSP-common/target/classes/com/sooka/common/utils/StringUtils.class
+++ b/leiSP-common/target/classes/com/sooka/common/utils/StringUtils.class
--- a/leiSP-common/target/classes/com/sooka/common/utils/Threads.class
+++ b/leiSP-common/target/classes/com/sooka/common/utils/Threads.class
--- a/leiSP-common/target/classes/com/sooka/common/utils/YamlUtil.class
+++ b/leiSP-common/target/classes/com/sooka/common/utils/YamlUtil.class
--- a/leiSP-common/target/classes/com/sooka/common/utils/bean/BeanUtils.class
+++ b/leiSP-common/target/classes/com/sooka/common/utils/bean/BeanUtils.class
--- a/leiSP-common/target/classes/com/sooka/common/utils/file/FileTypeUtils.class
+++ b/leiSP-common/target/classes/com/sooka/common/utils/file/FileTypeUtils.class
--- a/leiSP-common/target/classes/com/sooka/common/utils/file/FileUploadUtils.class
+++ b/leiSP-common/target/classes/com/sooka/common/utils/file/FileUploadUtils.class
--- a/leiSP-common/target/classes/com/sooka/common/utils/file/FileUtils.class
+++ b/leiSP-common/target/classes/com/sooka/common/utils/file/FileUtils.class
--- a/leiSP-common/target/classes/com/sooka/common/utils/file/ImageUtils.class
+++ b/leiSP-common/target/classes/com/sooka/common/utils/file/ImageUtils.class
--- a/leiSP-common/target/classes/com/sooka/common/utils/file/MimeTypeUtils.class
+++ b/leiSP-common/target/classes/com/sooka/common/utils/file/MimeTypeUtils.class
--- a/leiSP-common/target/classes/com/sooka/common/utils/html/EscapeUtil.class
+++ b/leiSP-common/target/classes/com/sooka/common/utils/html/EscapeUtil.class
--- a/leiSP-common/target/classes/com/sooka/common/utils/html/HTMLFilter.class
+++ b/leiSP-common/target/classes/com/sooka/common/utils/html/HTMLFilter.class
--- a/leiSP-common/target/classes/com/sooka/common/utils/http/HttpUtils.class
+++ b/leiSP-common/target/classes/com/sooka/common/utils/http/HttpUtils.class
--- a/leiSP-common/target/classes/com/sooka/common/utils/poi/ExcelUtil.class
+++ b/leiSP-common/target/classes/com/sooka/common/utils/poi/ExcelUtil.class
--- a/leiSP-common/target/classes/com/sooka/common/utils/reflect/ReflectUtils.class
+++ b/leiSP-common/target/classes/com/sooka/common/utils/reflect/ReflectUtils.class
--- a/leiSP-common/target/classes/com/sooka/common/utils/security/Md5Utils.class
+++ b/leiSP-common/target/classes/com/sooka/common/utils/security/Md5Utils.class
--- a/leiSP-common/target/classes/com/sooka/common/utils/security/PermissionUtils.class
+++ b/leiSP-common/target/classes/com/sooka/common/utils/security/PermissionUtils.class
--- a/leiSP-common/target/classes/com/sooka/common/utils/uuid/UUID.class
+++ b/leiSP-common/target/classes/com/sooka/common/utils/uuid/UUID.class
--- a/leiSP-common/target/classes/com/sooka/common/xss/XssFilter.class
+++ b/leiSP-common/target/classes/com/sooka/common/xss/XssFilter.class
--- a/leiSP-common/target/classes/com/sooka/common/xss/XssHttpServletRequestWrapper.class
+++ b/leiSP-common/target/classes/com/sooka/common/xss/XssHttpServletRequestWrapper.class
--- a/leiSP-framework/target/classes/com/sooka/framework/aspectj/DataScopeAspect.class
+++ b/leiSP-framework/target/classes/com/sooka/framework/aspectj/DataScopeAspect.class
--- a/leiSP-framework/target/classes/com/sooka/framework/aspectj/DataSourceAspect.class
+++ b/leiSP-framework/target/classes/com/sooka/framework/aspectj/DataSourceAspect.class
--- a/leiSP-framework/target/classes/com/sooka/framework/aspectj/LogAspect.class
+++ b/leiSP-framework/target/classes/com/sooka/framework/aspectj/LogAspect.class
--- a/leiSP-framework/target/classes/com/sooka/framework/config/DruidConfig.class
+++ b/leiSP-framework/target/classes/com/sooka/framework/config/DruidConfig.class
--- a/leiSP-framework/target/classes/com/sooka/framework/config/KaptchaTextCreator.class
+++ b/leiSP-framework/target/classes/com/sooka/framework/config/KaptchaTextCreator.class
--- a/leiSP-framework/target/classes/com/sooka/framework/config/MyBatisConfig.class
+++ b/leiSP-framework/target/classes/com/sooka/framework/config/MyBatisConfig.class
--- a/leiSP-framework/target/classes/com/sooka/framework/config/ShiroConfig.class
+++ b/leiSP-framework/target/classes/com/sooka/framework/config/ShiroConfig.class
--- a/leiSP-framework/target/classes/com/sooka/framework/interceptor/RepeatSubmitInterceptor.class
+++ b/leiSP-framework/target/classes/com/sooka/framework/interceptor/RepeatSubmitInterceptor.class
--- a/leiSP-framework/target/classes/com/sooka/framework/interceptor/impl/SameUrlDataInterceptor.class
+++ b/leiSP-framework/target/classes/com/sooka/framework/interceptor/impl/SameUrlDataInterceptor.class
--- a/leiSP-framework/target/classes/com/sooka/framework/manager/ShutdownManager.class
+++ b/leiSP-framework/target/classes/com/sooka/framework/manager/ShutdownManager.class
--- a/leiSP-framework/target/classes/com/sooka/framework/manager/factory/AsyncFactory$1.class
+++ b/leiSP-framework/target/classes/com/sooka/framework/manager/factory/AsyncFactory$1.class
--- a/leiSP-framework/target/classes/com/sooka/framework/manager/factory/AsyncFactory$2.class
+++ b/leiSP-framework/target/classes/com/sooka/framework/manager/factory/AsyncFactory$2.class
--- a/leiSP-framework/target/classes/com/sooka/framework/manager/factory/AsyncFactory$3.class
+++ b/leiSP-framework/target/classes/com/sooka/framework/manager/factory/AsyncFactory$3.class
--- a/leiSP-framework/target/classes/com/sooka/framework/manager/factory/AsyncFactory.class
+++ b/leiSP-framework/target/classes/com/sooka/framework/manager/factory/AsyncFactory.class
--- a/leiSP-framework/target/classes/com/sooka/framework/shiro/realm/UserRealm.class
+++ b/leiSP-framework/target/classes/com/sooka/framework/shiro/realm/UserRealm.class
--- a/leiSP-framework/target/classes/com/sooka/framework/shiro/service/SysLoginService.class
+++ b/leiSP-framework/target/classes/com/sooka/framework/shiro/service/SysLoginService.class
--- a/leiSP-framework/target/classes/com/sooka/framework/shiro/service/SysPasswordService.class
+++ b/leiSP-framework/target/classes/com/sooka/framework/shiro/service/SysPasswordService.class
--- a/leiSP-framework/target/classes/com/sooka/framework/shiro/service/SysRegisterService.class
+++ b/leiSP-framework/target/classes/com/sooka/framework/shiro/service/SysRegisterService.class
--- a/leiSP-framework/target/classes/com/sooka/framework/shiro/service/SysShiroService.class
+++ b/leiSP-framework/target/classes/com/sooka/framework/shiro/service/SysShiroService.class
--- a/leiSP-framework/target/classes/com/sooka/framework/shiro/session/OnlineSessionDAO.class
+++ b/leiSP-framework/target/classes/com/sooka/framework/shiro/session/OnlineSessionDAO.class
--- a/leiSP-framework/target/classes/com/sooka/framework/shiro/session/OnlineSessionFactory.class
+++ b/leiSP-framework/target/classes/com/sooka/framework/shiro/session/OnlineSessionFactory.class
--- a/leiSP-framework/target/classes/com/sooka/framework/shiro/web/filter/LogoutFilter.class
+++ b/leiSP-framework/target/classes/com/sooka/framework/shiro/web/filter/LogoutFilter.class
--- a/leiSP-framework/target/classes/com/sooka/framework/shiro/web/filter/captcha/CaptchaValidateFilter.class
+++ b/leiSP-framework/target/classes/com/sooka/framework/shiro/web/filter/captcha/CaptchaValidateFilter.class
--- a/leiSP-framework/target/classes/com/sooka/framework/shiro/web/filter/kickout/KickoutSessionFilter.class
+++ b/leiSP-framework/target/classes/com/sooka/framework/shiro/web/filter/kickout/KickoutSessionFilter.class
--- a/leiSP-framework/target/classes/com/sooka/framework/shiro/web/filter/online/OnlineSessionFilter.class
+++ b/leiSP-framework/target/classes/com/sooka/framework/shiro/web/filter/online/OnlineSessionFilter.class
--- a/leiSP-framework/target/classes/com/sooka/framework/shiro/web/filter/sync/SyncOnlineSessionFilter.class
+++ b/leiSP-framework/target/classes/com/sooka/framework/shiro/web/filter/sync/SyncOnlineSessionFilter.class
--- a/leiSP-framework/target/classes/com/sooka/framework/shiro/web/session/OnlineWebSessionManager.class
+++ b/leiSP-framework/target/classes/com/sooka/framework/shiro/web/session/OnlineWebSessionManager.class
--- a/leiSP-framework/target/classes/com/sooka/framework/shiro/web/session/SpringSessionValidationScheduler.class
+++ b/leiSP-framework/target/classes/com/sooka/framework/shiro/web/session/SpringSessionValidationScheduler.class
--- a/leiSP-framework/target/classes/com/sooka/framework/util/LogUtils.class
+++ b/leiSP-framework/target/classes/com/sooka/framework/util/LogUtils.class
--- a/leiSP-framework/target/classes/com/sooka/framework/util/ShiroUtils.class
+++ b/leiSP-framework/target/classes/com/sooka/framework/util/ShiroUtils.class
--- a/leiSP-framework/target/classes/com/sooka/framework/web/domain/Server.class
+++ b/leiSP-framework/target/classes/com/sooka/framework/web/domain/Server.class
--- a/leiSP-framework/target/classes/com/sooka/framework/web/service/PermissionService.class
+++ b/leiSP-framework/target/classes/com/sooka/framework/web/service/PermissionService.class
--- a/leiSP-generator/target/classes/com/sooka/generator/controller/GenController.class
+++ b/leiSP-generator/target/classes/com/sooka/generator/controller/GenController.class
--- a/leiSP-generator/target/classes/com/sooka/generator/domain/GenTableColumn.class
+++ b/leiSP-generator/target/classes/com/sooka/generator/domain/GenTableColumn.class
--- a/leiSP-generator/target/classes/com/sooka/generator/service/impl/GenTableServiceImpl.class
+++ b/leiSP-generator/target/classes/com/sooka/generator/service/impl/GenTableServiceImpl.class
--- a/leiSP-generator/target/classes/com/sooka/generator/util/GenUtils.class
+++ b/leiSP-generator/target/classes/com/sooka/generator/util/GenUtils.class
--- a/leiSP-generator/target/classes/com/sooka/generator/util/VelocityInitializer.class
+++ b/leiSP-generator/target/classes/com/sooka/generator/util/VelocityInitializer.class
--- a/leiSP-generator/target/classes/com/sooka/generator/util/VelocityUtils.class
+++ b/leiSP-generator/target/classes/com/sooka/generator/util/VelocityUtils.class
--- a/leiSP-quartz/target/classes/com/sooka/quartz/service/impl/SysJobServiceImpl.class
+++ b/leiSP-quartz/target/classes/com/sooka/quartz/service/impl/SysJobServiceImpl.class
--- a/leiSP-quartz/target/classes/com/sooka/quartz/util/AbstractQuartzJob.class
+++ b/leiSP-quartz/target/classes/com/sooka/quartz/util/AbstractQuartzJob.class
--- a/leiSP-quartz/target/classes/com/sooka/quartz/util/CronUtils.class
+++ b/leiSP-quartz/target/classes/com/sooka/quartz/util/CronUtils.class
--- a/leiSP-quartz/target/classes/com/sooka/quartz/util/JobInvokeUtil.class
+++ b/leiSP-quartz/target/classes/com/sooka/quartz/util/JobInvokeUtil.class
--- a/leiSP-quartz/target/classes/com/sooka/quartz/util/ScheduleUtils.class
+++ b/leiSP-quartz/target/classes/com/sooka/quartz/util/ScheduleUtils.class
--- a/leiSP-system/target/classes/com/sooka/system/service/impl/SysConfigServiceImpl.class
+++ b/leiSP-system/target/classes/com/sooka/system/service/impl/SysConfigServiceImpl.class
--- a/leiSP-system/target/classes/com/sooka/system/service/impl/SysDeptServiceImpl.class
+++ b/leiSP-system/target/classes/com/sooka/system/service/impl/SysDeptServiceImpl.class
--- a/leiSP-system/target/classes/com/sooka/system/service/impl/SysDictTypeServiceImpl.class
+++ b/leiSP-system/target/classes/com/sooka/system/service/impl/SysDictTypeServiceImpl.class