From 066424cd44c280910e5b5af833fe41f7c70d70b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E8=AF=BA?= <1253070437@qq.com> Date: Tue, 13 Apr 2021 18:12:31 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E4=BB=A3=E7=A0=81=E5=86=85=E9=83=A8=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 +++--- _sql/snowy-pub-mssql.sql | 4 ++-- _sql/snowy-pub-oracle.sql | 4 ++-- _sql/snowy-pub-postgresql.sql | 4 ++-- _sql/snowy-pub.sql | 4 ++-- _web/public/index.html | 2 +- _web/src/components/GlobalFooter/GlobalFooter.vue | 2 +- _web/src/components/Table/README.md | 2 +- _web/src/components/tools/Logo.vue | 2 +- _web/src/layouts/UserLayout.vue | 2 +- _web/src/mock/services/article.js | 2 +- _web/src/mock/services/manage.js | 2 +- _web/src/utils/domUtil.js | 2 +- _web/src/views/system/dashboard/Workplace.vue | 2 +- .../vip/xiaonuo/generate/core/enums/QueryTypeEnum.java | 10 +++++----- .../main/java/vip/xiaonuo/sys/config/WebMvcConfig.java | 2 +- .../vip/xiaonuo/sys/core/validator/SnowyValidator.java | 4 ++-- .../modular/consts/controller/SysConfigController.java | 1 - .../sys/modular/consts/service/SysConfigService.java | 1 - .../consts/service/impl/SysConfigServiceImpl.java | 1 - .../monitor/controller/SysMachineController.java | 1 - .../monitor/controller/SysOnlineUserController.java | 1 - .../sys/modular/monitor/param/SysOnlineUserParam.java | 1 - .../sys/modular/monitor/result/SysMachineResult.java | 1 - .../modular/monitor/result/SysOnlineUserResult.java | 1 - .../monitor/service/impl/SysMachineServiceImpl.java | 1 - .../monitor/service/impl/SysOnlineUserServiceImpl.java | 1 - .../modular/notice/controller/SysNoticeController.java | 1 - .../xiaonuo/sys/modular/notice/entity/SysNotice.java | 1 - .../sys/modular/notice/entity/SysNoticeUser.java | 1 - .../sys/modular/notice/param/SysNoticeParam.java | 1 - .../modular/notice/result/SysNoticeDetailResult.java | 1 - .../modular/notice/result/SysNoticeReceiveResult.java | 1 - .../modular/notice/service/SysNoticeUserService.java | 1 - .../notice/service/impl/SysNoticeServiceImpl.java | 1 - .../notice/service/impl/SysNoticeUserServiceImpl.java | 1 - .../modular/user/service/impl/SysUserServiceImpl.java | 2 +- snowy-main/src/main/resources/application-local.yml | 4 ++-- 38 files changed, 31 insertions(+), 50 deletions(-) diff --git a/README.md b/README.md index be62ef30..123df6c2 100644 --- a/README.md +++ b/README.md @@ -27,10 +27,10 @@ license Apache 2.0 - + Gitee star - + Gitee fork

@@ -220,7 +220,7 @@ jodconverter: - 二次开发请不要删除和修改根目录下的LICENSE文件及代码头部作者声明。 - 请不要删除和修改Snowy源码头部的版权声明及出处。 -### XiaoNuo技术团队荣誉作品 +### 小诺技术团队荣誉作品 | 成员组成 | 负责内容 | | :---: | :---: | diff --git a/_sql/snowy-pub-mssql.sql b/_sql/snowy-pub-mssql.sql index 37f12697..f17f9239 100644 --- a/_sql/snowy-pub-mssql.sql +++ b/_sql/snowy-pub-mssql.sql @@ -674,10 +674,10 @@ GO INSERT INTO [dbo].[sys_config] VALUES (N'1270380786649972739', N'linux/mac本地上传文件路径', N'SNOWY_FILE_UPLOAD_PATH_FOR_LINUX', N'/tmp', N'Y', N'linux/mac本地上传文件路径', N'0', N'FILE_PATH', N'2020-06-09 23:42:37.0000000', N'1265476890672672808', NULL, NULL) GO -INSERT INTO [dbo].[sys_config] VALUES (N'1270380786649982740', N'XiaoNuo演示环境', N'SNOWY_DEMO_ENV_FLAG', N'false', N'Y', N'XiaoNuo演示环境的开关，true-打开，false-关闭，如果演示环境开启，则只能读数据不能写数据', N'0', N'DEFAULT', N'2020-06-09 23:42:37.0000000', N'1265476890672672808', N'2020-09-03 14:38:17.0000000', N'1265476890672672808') +INSERT INTO [dbo].[sys_config] VALUES (N'1270380786649982740', N'Snowy演示环境', N'SNOWY_DEMO_ENV_FLAG', N'false', N'Y', N'Snowy演示环境的开关，true-打开，false-关闭，如果演示环境开启，则只能读数据不能写数据', N'0', N'DEFAULT', N'2020-06-09 23:42:37.0000000', N'1265476890672672808', N'2020-09-03 14:38:17.0000000', N'1265476890672672808') GO -INSERT INTO [dbo].[sys_config] VALUES (N'1270380786649982741', N'XiaoNuo放开XSS过滤的接口', N'SNOWY_UN_XSS_FILTER_URL', N'/demo/xssfilter,/demo/unxss', N'Y', N'多个url可以用英文逗号隔开', N'0', N'DEFAULT', N'2020-06-09 23:42:37.0000000', N'1265476890672672808', NULL, NULL) +INSERT INTO [dbo].[sys_config] VALUES (N'1270380786649982741', N'Snowy放开XSS过滤的接口', N'SNOWY_UN_XSS_FILTER_URL', N'/demo/xssfilter,/demo/unxss', N'Y', N'多个url可以用英文逗号隔开', N'0', N'DEFAULT', N'2020-06-09 23:42:37.0000000', N'1265476890672672808', NULL, NULL) GO INSERT INTO [dbo].[sys_config] VALUES (N'1270380786649982742', N'单用户登陆的开关', N'SNOWY_ENABLE_SINGLE_LOGIN', N'false', N'Y', N'单用户登陆的开关，true-打开，false-关闭，如果一个人登录两次，就会将上一次登陆挤下去', N'0', N'DEFAULT', N'2020-06-09 23:42:37.0000000', N'1265476890672672808', NULL, NULL) diff --git a/_sql/snowy-pub-oracle.sql b/_sql/snowy-pub-oracle.sql index 38ed769f..8b63af7a 100644 --- a/_sql/snowy-pub-oracle.sql +++ b/_sql/snowy-pub-oracle.sql @@ -214,8 +214,8 @@ INSERT INTO "SYS_CONFIG" VALUES ('1270378790035460097', '邮箱是否开启ssl', INSERT INTO "SYS_CONFIG" VALUES ('1270380786649972737', '邮箱发件人', 'SNOWY_EMAIL_FROM', 'test@126.com', 'Y', '邮箱发件人', '0', 'EMAIL', TO_DATE('2020-06-09 23:42:37', 'SYYYY-MM-DD HH24:MI:SS'), '1265476890672672808', NULL, NULL); INSERT INTO "SYS_CONFIG" VALUES ('1270380786649972738', 'win本地上传文件路径', 'SNOWY_FILE_UPLOAD_PATH_FOR_WINDOWS', 'd:/tmp', 'Y', 'win本地上传文件路径', '0', 'FILE_PATH', TO_DATE('2020-06-09 23:42:37', 'SYYYY-MM-DD HH24:MI:SS'), '1265476890672672808', NULL, NULL); INSERT INTO "SYS_CONFIG" VALUES ('1270380786649972739', 'linux/mac本地上传文件路径', 'SNOWY_FILE_UPLOAD_PATH_FOR_LINUX', '/tmp', 'Y', 'linux/mac本地上传文件路径', '0', 'FILE_PATH', TO_DATE('2020-06-09 23:42:37', 'SYYYY-MM-DD HH24:MI:SS'), '1265476890672672808', NULL, NULL); -INSERT INTO "SYS_CONFIG" VALUES ('1270380786649982740', 'XiaoNuo演示环境', 'SNOWY_DEMO_ENV_FLAG', 'false', 'Y', 'XiaoNuo演示环境的开关，true-打开，false-关闭，如果演示环境开启，则只能读数据不能写数据', '0', 'DEFAULT', TO_DATE('2020-06-09 23:42:37', 'SYYYY-MM-DD HH24:MI:SS'), '1265476890672672808', TO_DATE('2020-09-03 14:38:17', 'SYYYY-MM-DD HH24:MI:SS'), '1265476890672672808'); -INSERT INTO "SYS_CONFIG" VALUES ('1270380786649982741', 'XiaoNuo放开XSS过滤的接口', 'SNOWY_UN_XSS_FILTER_URL', '/demo/xssfilter,/demo/unxss', 'Y', '多个url可以用英文逗号隔开', '0', 'DEFAULT', TO_DATE('2020-06-09 23:42:37', 'SYYYY-MM-DD HH24:MI:SS'), '1265476890672672808', NULL, NULL); +INSERT INTO "SYS_CONFIG" VALUES ('1270380786649982740', 'Snowy演示环境', 'SNOWY_DEMO_ENV_FLAG', 'false', 'Y', 'Snowy演示环境的开关，true-打开，false-关闭，如果演示环境开启，则只能读数据不能写数据', '0', 'DEFAULT', TO_DATE('2020-06-09 23:42:37', 'SYYYY-MM-DD HH24:MI:SS'), '1265476890672672808', TO_DATE('2020-09-03 14:38:17', 'SYYYY-MM-DD HH24:MI:SS'), '1265476890672672808'); +INSERT INTO "SYS_CONFIG" VALUES ('1270380786649982741', 'Snowy放开XSS过滤的接口', 'SNOWY_UN_XSS_FILTER_URL', '/demo/xssfilter,/demo/unxss', 'Y', '多个url可以用英文逗号隔开', '0', 'DEFAULT', TO_DATE('2020-06-09 23:42:37', 'SYYYY-MM-DD HH24:MI:SS'), '1265476890672672808', NULL, NULL); INSERT INTO "SYS_CONFIG" VALUES ('1270380786649982742', '单用户登陆的开关', 'SNOWY_ENABLE_SINGLE_LOGIN', 'false', 'Y', '单用户登陆的开关，true-打开，false-关闭，如果一个人登录两次，就会将上一次登陆挤下去', '0', 'DEFAULT', TO_DATE('2020-06-09 23:42:37', 'SYYYY-MM-DD HH24:MI:SS'), '1265476890672672808', NULL, NULL); INSERT INTO "SYS_CONFIG" VALUES ('1270380786649982743', '登录验证码的开关', 'SNOWY_CAPTCHA_OPEN', 'true', 'Y', '登录验证码的开关，true-打开，false-关闭', '0', 'DEFAULT', TO_DATE('2020-06-09 23:42:37', 'SYYYY-MM-DD HH24:MI:SS'), '1265476890672672808', NULL, NULL); INSERT INTO "SYS_CONFIG" VALUES ('1280694183769792514', 'druid监控登录账号', 'SNOWY_DRUID_USERNAME', 'superAdmin', 'Y', 'druid监控登录账号', '0', 'DEFAULT', TO_DATE('2020-07-08 10:44:22', 'SYYYY-MM-DD HH24:MI:SS'), '1265476890672672808', NULL, NULL); diff --git a/_sql/snowy-pub-postgresql.sql b/_sql/snowy-pub-postgresql.sql index 64e4aa2e..5e2d3a51 100644 --- a/_sql/snowy-pub-postgresql.sql +++ b/_sql/snowy-pub-postgresql.sql @@ -216,8 +216,8 @@ INSERT INTO "public"."sys_config" VALUES (1270378790035460097, '邮箱是否开 INSERT INTO "public"."sys_config" VALUES (1270380786649972737, '邮箱发件人', 'SNOWY_EMAIL_FROM', 'test@126.com', 'Y', '邮箱发件人', 0, 'EMAIL', '2020-06-09 23:42:37', 1265476890672672808, NULL, NULL); INSERT INTO "public"."sys_config" VALUES (1270380786649972738, 'win本地上传文件路径', 'SNOWY_FILE_UPLOAD_PATH_FOR_WINDOWS', 'd:/tmp', 'Y', 'win本地上传文件路径', 0, 'FILE_PATH', '2020-06-09 23:42:37', 1265476890672672808, NULL, NULL); INSERT INTO "public"."sys_config" VALUES (1270380786649972739, 'linux/mac本地上传文件路径', 'SNOWY_FILE_UPLOAD_PATH_FOR_LINUX', '/tmp', 'Y', 'linux/mac本地上传文件路径', 0, 'FILE_PATH', '2020-06-09 23:42:37', 1265476890672672808, NULL, NULL); -INSERT INTO "public"."sys_config" VALUES (1270380786649982740, 'XiaoNuo演示环境', 'SNOWY_DEMO_ENV_FLAG', 'false', 'Y', 'XiaoNuo演示环境的开关，true-打开，false-关闭，如果演示环境开启，则只能读数据不能写数据', 0, 'DEFAULT', '2020-06-09 23:42:37', 1265476890672672808, '2020-09-03 14:38:17', 1265476890672672808); -INSERT INTO "public"."sys_config" VALUES (1270380786649982741, 'XiaoNuo放开XSS过滤的接口', 'SNOWY_UN_XSS_FILTER_URL', '/demo/xssfilter,/demo/unxss', 'Y', '多个url可以用英文逗号隔开', 0, 'DEFAULT', '2020-06-09 23:42:37', 1265476890672672808, NULL, NULL); +INSERT INTO "public"."sys_config" VALUES (1270380786649982740, 'Snowy演示环境', 'SNOWY_DEMO_ENV_FLAG', 'false', 'Y', 'Snowy演示环境的开关，true-打开，false-关闭，如果演示环境开启，则只能读数据不能写数据', 0, 'DEFAULT', '2020-06-09 23:42:37', 1265476890672672808, '2020-09-03 14:38:17', 1265476890672672808); +INSERT INTO "public"."sys_config" VALUES (1270380786649982741, 'Snowy放开XSS过滤的接口', 'SNOWY_UN_XSS_FILTER_URL', '/demo/xssfilter,/demo/unxss', 'Y', '多个url可以用英文逗号隔开', 0, 'DEFAULT', '2020-06-09 23:42:37', 1265476890672672808, NULL, NULL); INSERT INTO "public"."sys_config" VALUES (1270380786649982742, '单用户登陆的开关', 'SNOWY_ENABLE_SINGLE_LOGIN', 'false', 'Y', '单用户登陆的开关，true-打开，false-关闭，如果一个人登录两次，就会将上一次登陆挤下去', 0, 'DEFAULT', '2020-06-09 23:42:37', 1265476890672672808, NULL, NULL); INSERT INTO "public"."sys_config" VALUES (1270380786649982743, '登录验证码的开关', 'SNOWY_CAPTCHA_OPEN', 'true', 'Y', '登录验证码的开关，true-打开，false-关闭', 0, 'DEFAULT', '2020-06-09 23:42:37', 1265476890672672808, NULL, NULL); INSERT INTO "public"."sys_config" VALUES (1280694183769792514, 'druid监控登录账号', 'SNOWY_DRUID_USERNAME', 'superAdmin', 'Y', 'druid监控登录账号', 0, 'DEFAULT', '2020-07-08 10:44:22', 1265476890672672808, NULL, NULL); diff --git a/_sql/snowy-pub.sql b/_sql/snowy-pub.sql index 2c427079..b3ea6355 100644 --- a/_sql/snowy-pub.sql +++ b/_sql/snowy-pub.sql @@ -157,8 +157,8 @@ INSERT INTO `sys_config` VALUES (1270378790035460097, '邮箱是否开启ssl', ' INSERT INTO `sys_config` VALUES (1270380786649972737, '邮箱发件人', 'SNOWY_EMAIL_FROM', 'test@126.com', 'Y', '邮箱发件人', 0, 'EMAIL', '2020-06-09 23:42:37', 1265476890672672808, NULL, NULL); INSERT INTO `sys_config` VALUES (1270380786649972738, 'win本地上传文件路径', 'SNOWY_FILE_UPLOAD_PATH_FOR_WINDOWS', 'd:/tmp', 'Y', 'win本地上传文件路径', 0, 'FILE_PATH', '2020-06-09 23:42:37', 1265476890672672808, NULL, NULL); INSERT INTO `sys_config` VALUES (1270380786649972739, 'linux/mac本地上传文件路径', 'SNOWY_FILE_UPLOAD_PATH_FOR_LINUX', '/tmp', 'Y', 'linux/mac本地上传文件路径', 0, 'FILE_PATH', '2020-06-09 23:42:37', 1265476890672672808, NULL, NULL); -INSERT INTO `sys_config` VALUES (1270380786649982740, 'XiaoNuo演示环境', 'SNOWY_DEMO_ENV_FLAG', 'false', 'Y', 'XiaoNuo演示环境的开关，true-打开，false-关闭，如果演示环境开启，则只能读数据不能写数据', 0, 'DEFAULT', '2020-06-09 23:42:37', 1265476890672672808, '2020-09-03 14:38:17', 1265476890672672808); -INSERT INTO `sys_config` VALUES (1270380786649982741, 'XiaoNuo放开XSS过滤的接口', 'SNOWY_UN_XSS_FILTER_URL', '/demo/xssfilter,/demo/unxss', 'Y', '多个url可以用英文逗号隔开', 0, 'DEFAULT', '2020-06-09 23:42:37', 1265476890672672808, NULL, NULL); +INSERT INTO `sys_config` VALUES (1270380786649982740, 'Snowy演示环境', 'SNOWY_DEMO_ENV_FLAG', 'false', 'Y', 'Snowy演示环境的开关，true-打开，false-关闭，如果演示环境开启，则只能读数据不能写数据', 0, 'DEFAULT', '2020-06-09 23:42:37', 1265476890672672808, '2020-09-03 14:38:17', 1265476890672672808); +INSERT INTO `sys_config` VALUES (1270380786649982741, 'Snowy放开XSS过滤的接口', 'SNOWY_UN_XSS_FILTER_URL', '/demo/xssfilter,/demo/unxss', 'Y', '多个url可以用英文逗号隔开', 0, 'DEFAULT', '2020-06-09 23:42:37', 1265476890672672808, NULL, NULL); INSERT INTO `sys_config` VALUES (1270380786649982742, '单用户登陆的开关', 'SNOWY_ENABLE_SINGLE_LOGIN', 'false', 'Y', '单用户登陆的开关，true-打开，false-关闭，如果一个人登录两次，就会将上一次登陆挤下去', 0, 'DEFAULT', '2020-06-09 23:42:37', 1265476890672672808, NULL, NULL); INSERT INTO `sys_config` VALUES (1270380786649982743, '登录验证码的开关', 'SNOWY_CAPTCHA_OPEN', 'true', 'Y', '登录验证码的开关，true-打开，false-关闭', 0, 'DEFAULT', '2020-06-09 23:42:37', 1265476890672672808, NULL, NULL); INSERT INTO `sys_config` VALUES (1280694183769792514, 'druid监控登录账号', 'SNOWY_DRUID_USERNAME', 'superAdmin', 'Y', 'druid监控登录账号', 0, 'DEFAULT', '2020-07-08 10:44:22', 1265476890672672808, NULL, NULL); diff --git a/_web/public/index.html b/_web/public/index.html index ab9e4978..3c030bb2 100644 --- a/_web/public/index.html +++ b/_web/public/index.html @@ -18,7 +18,7 @@
-

XiaoNuo

+

Snowy

diff --git a/_web/src/components/GlobalFooter/GlobalFooter.vue b/_web/src/components/GlobalFooter/GlobalFooter.vue index a8fe6a70..844ba1c6 100644 --- a/_web/src/components/GlobalFooter/GlobalFooter.vue +++ b/_web/src/components/GlobalFooter/GlobalFooter.vue @@ -3,7 +3,7 @@
- Copyright © 2020 XiaoNuo All rights reserved. xiaonuo-vue 1.3 + Copyright © 2020 小诺 All rights reserved. Snowy 1.3
diff --git a/_web/src/components/Table/README.md b/_web/src/components/Table/README.md index 80de48e6..5de0f28f 100644 --- a/_web/src/components/Table/README.md +++ b/_web/src/components/Table/README.md @@ -299,7 +299,7 @@ result.then(r => { { id: 4, cover: 'https://gw.alipayobjects.com/zos/rmsportal/sfjbOqnsXXJgNCjCzDBL.png', - title: 'XiaoNuo', + title: '小诺', description: '那时候我只会想自己想要什么，从不想自己拥有什么', status: 1, updatedAt: '2018-07-26 00:00:00' diff --git a/_web/src/components/tools/Logo.vue b/_web/src/components/tools/Logo.vue index 7722bd93..fc32ec88 100644 --- a/_web/src/components/tools/Logo.vue +++ b/_web/src/components/tools/Logo.vue @@ -25,7 +25,7 @@ export default { props: { title: { type: String, - default: 'Snowy快速开发平台', + default: 'Snowy', required: false }, showTitle: { diff --git a/_web/src/layouts/UserLayout.vue b/_web/src/layouts/UserLayout.vue index 9fdd9647..5b2983e1 100644 --- a/_web/src/layouts/UserLayout.vue +++ b/_web/src/layouts/UserLayout.vue @@ -22,7 +22,7 @@ 条款
- Copyright © 2020 XiaoNuo All rights reserved. xiaonuo-vue 1.3 + Copyright © 2020 小诺 All rights reserved. Snowy 1.3
diff --git a/_web/src/mock/services/article.js b/_web/src/mock/services/article.js index 37057f7f..80eb1496 100644 --- a/_web/src/mock/services/article.js +++ b/_web/src/mock/services/article.js @@ -5,7 +5,7 @@ const titles = [ 'Alipay', 'Angular', 'Ant Design', - 'XiaoNuo', + 'Snowy', 'Bootstrap', 'React', 'Vue', diff --git a/_web/src/mock/services/manage.js b/_web/src/mock/services/manage.js index 9ac472e4..84319c48 100644 --- a/_web/src/mock/services/manage.js +++ b/_web/src/mock/services/manage.js @@ -65,7 +65,7 @@ const projects = () => { { id: 4, cover: 'https://gw.alipayobjects.com/zos/rmsportal/sfjbOqnsXXJgNCjCzDBL.png', - title: 'XiaoNuo', + title: 'Snowy', description: '那时候我只会想自己想要什么，从不想自己拥有什么', status: 1, updatedAt: '2018-07-26 00:00:00' diff --git a/_web/src/utils/domUtil.js b/_web/src/utils/domUtil.js index 47996707..23662b2c 100644 --- a/_web/src/utils/domUtil.js +++ b/_web/src/utils/domUtil.js @@ -16,4 +16,4 @@ export const setDocumentTitle = function (title) { } } -export const domTitle = 'XiaoNuo' +export const domTitle = 'Snowy' diff --git a/_web/src/views/system/dashboard/Workplace.vue b/_web/src/views/system/dashboard/Workplace.vue index b0770b72..46830bd5 100644 --- a/_web/src/views/system/dashboard/Workplace.vue +++ b/_web/src/views/system/dashboard/Workplace.vue @@ -223,7 +223,7 @@ { id: 4, cover: 'https://gw.alipayobjects.com/zos/rmsportal/sfjbOqnsXXJgNCjCzDBL.png', - title: 'XiaoNuo', + title: '小诺', description: '那时候我只会想自己想要什么，从不想自己拥有什么', status: 1, updatedAt: '2018-07-26 00:00:00' diff --git a/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/core/enums/QueryTypeEnum.java b/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/core/enums/QueryTypeEnum.java index d83b23e1..0e9bc928 100644 --- a/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/core/enums/QueryTypeEnum.java +++ b/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/core/enums/QueryTypeEnum.java @@ -13,14 +13,14 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -XiaoNuo采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点： +小诺采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点： 1.请不要删除和修改根目录下的LICENSE文件。 -2.请不要删除和修改XiaoNuo源码头部的版权声明。 +2.请不要删除和修改Snowy源码头部的版权声明。 3.请保留源码和相关描述文件的项目出处，作者声明等。 -4.分发源码时候，请注明软件出处 https://gitee.com/xiaonuo/xiaonuo-vue -5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/xiaonuo/xiaonuo-vue -6.若您的项目无法满足以上几点，可申请商业授权，获取XiaoNuo商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip +4.分发源码时候，请注明软件出处 https://gitee.com/xiaonuobase/snowy +5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/xiaonuobase/snowy +6.若您的项目无法满足以上几点，可申请商业授权，获取小诺商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip */ /* Copyright [2020] [https://www.xiaonuo.vip] diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/config/WebMvcConfig.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/config/WebMvcConfig.java index fd91ae70..51d4e8e9 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/config/WebMvcConfig.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/config/WebMvcConfig.java @@ -135,7 +135,7 @@ public class WebMvcConfig implements WebMvcConfigurer { /** - * 自定义的XiaoNuoRequestResponseBodyMethodProcessor，放在所有resolvers之前 + * 自定义的SnowyRequestResponseBodyMethodProcessor，放在所有resolvers之前 * * @author xuyuxiang * @date 2020/8/21 21:09 diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/validator/SnowyValidator.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/validator/SnowyValidator.java index 16a686bc..fd49a4c1 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/validator/SnowyValidator.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/validator/SnowyValidator.java @@ -18,8 +18,8 @@ XiaoNuo采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注 1.请不要删除和修改根目录下的LICENSE文件。 2.请不要删除和修改XiaoNuo源码头部的版权声明。 3.请保留源码和相关描述文件的项目出处，作者声明等。 -4.分发源码时候，请注明软件出处 https://gitee.com/xiaonuobase/xiaonuo-vue -5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/xiaonuobase/xiaonuo-vue +4.分发源码时候，请注明软件出处 https://gitee.com/xiaonuobase/snowy +5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/xiaonuobase/snowy 6.若您的项目无法满足以上几点，可申请商业授权，获取XiaoNuo商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip */ diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/consts/controller/SysConfigController.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/consts/controller/SysConfigController.java index f77e6eed..78b76c97 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/consts/controller/SysConfigController.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/consts/controller/SysConfigController.java @@ -36,7 +36,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; - import javax.annotation.Resource; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/consts/service/SysConfigService.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/consts/service/SysConfigService.java index 8cb1b000..5a11be31 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/consts/service/SysConfigService.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/consts/service/SysConfigService.java @@ -28,7 +28,6 @@ import com.baomidou.mybatisplus.extension.service.IService; import vip.xiaonuo.core.pojo.page.PageResult; import vip.xiaonuo.sys.modular.consts.entity.SysConfig; import vip.xiaonuo.sys.modular.consts.param.SysConfigParam; - import java.util.List; /** diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/consts/service/impl/SysConfigServiceImpl.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/consts/service/impl/SysConfigServiceImpl.java index cb43b629..15486f2f 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/consts/service/impl/SysConfigServiceImpl.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/consts/service/impl/SysConfigServiceImpl.java @@ -40,7 +40,6 @@ import vip.xiaonuo.sys.modular.consts.mapper.SysConfigMapper; import vip.xiaonuo.sys.modular.consts.param.SysConfigParam; import vip.xiaonuo.sys.modular.consts.service.SysConfigService; import org.springframework.stereotype.Service; - import java.util.List; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/controller/SysMachineController.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/controller/SysMachineController.java index 314aee70..2f3968dc 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/controller/SysMachineController.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/controller/SysMachineController.java @@ -31,7 +31,6 @@ import vip.xiaonuo.core.pojo.response.SuccessResponseData; import vip.xiaonuo.sys.modular.monitor.service.SysMachineService; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; - import javax.annotation.Resource; /** diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/controller/SysOnlineUserController.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/controller/SysOnlineUserController.java index 1d7f043a..a4786c01 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/controller/SysOnlineUserController.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/controller/SysOnlineUserController.java @@ -36,7 +36,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; - import javax.annotation.Resource; /** diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/param/SysOnlineUserParam.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/param/SysOnlineUserParam.java index 835d133c..03e7b79b 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/param/SysOnlineUserParam.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/param/SysOnlineUserParam.java @@ -27,7 +27,6 @@ package vip.xiaonuo.sys.modular.monitor.param; import vip.xiaonuo.core.pojo.base.param.BaseParam; import lombok.Data; import lombok.EqualsAndHashCode; - import javax.validation.constraints.NotEmpty; /** diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/result/SysMachineResult.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/result/SysMachineResult.java index 4e5a059d..fbef8f18 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/result/SysMachineResult.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/result/SysMachineResult.java @@ -26,7 +26,6 @@ package vip.xiaonuo.sys.modular.monitor.result; import lombok.Data; import lombok.NoArgsConstructor; - import java.io.Serializable; /** diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/result/SysOnlineUserResult.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/result/SysOnlineUserResult.java index 91098c1d..08e0cece 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/result/SysOnlineUserResult.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/result/SysOnlineUserResult.java @@ -25,7 +25,6 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 package vip.xiaonuo.sys.modular.monitor.result; import lombok.Data; - import java.io.Serializable; /** diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/service/impl/SysMachineServiceImpl.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/service/impl/SysMachineServiceImpl.java index 6f0b37dd..cca3a1bb 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/service/impl/SysMachineServiceImpl.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/service/impl/SysMachineServiceImpl.java @@ -31,7 +31,6 @@ import vip.xiaonuo.core.consts.SymbolConstant; import vip.xiaonuo.sys.modular.monitor.result.SysMachineResult; import vip.xiaonuo.sys.modular.monitor.service.SysMachineService; import org.springframework.stereotype.Service; - import java.math.BigDecimal; import java.text.DecimalFormat; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/service/impl/SysOnlineUserServiceImpl.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/service/impl/SysOnlineUserServiceImpl.java index d0e04c9c..880b4d24 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/service/impl/SysOnlineUserServiceImpl.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/service/impl/SysOnlineUserServiceImpl.java @@ -41,7 +41,6 @@ import vip.xiaonuo.sys.modular.monitor.param.SysOnlineUserParam; import vip.xiaonuo.sys.modular.monitor.result.SysOnlineUserResult; import vip.xiaonuo.sys.modular.monitor.service.SysOnlineUserService; import org.springframework.stereotype.Service; - import javax.annotation.Resource; import java.util.Comparator; import java.util.List; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/controller/SysNoticeController.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/controller/SysNoticeController.java index 8b2dc47c..637c3bca 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/controller/SysNoticeController.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/controller/SysNoticeController.java @@ -36,7 +36,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; - import javax.annotation.Resource; /** diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/entity/SysNotice.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/entity/SysNotice.java index 7d406854..fa51d660 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/entity/SysNotice.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/entity/SysNotice.java @@ -30,7 +30,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import vip.xiaonuo.core.pojo.base.entity.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; - import java.util.Date; /** diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/entity/SysNoticeUser.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/entity/SysNoticeUser.java index 1629e185..206bef71 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/entity/SysNoticeUser.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/entity/SysNoticeUser.java @@ -28,7 +28,6 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; - import java.util.Date; /** diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/param/SysNoticeParam.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/param/SysNoticeParam.java index 8e2ba209..31ad219e 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/param/SysNoticeParam.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/param/SysNoticeParam.java @@ -27,7 +27,6 @@ package vip.xiaonuo.sys.modular.notice.param; import vip.xiaonuo.core.pojo.base.param.BaseParam; import lombok.Data; import lombok.EqualsAndHashCode; - import javax.validation.constraints.Max; import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/result/SysNoticeDetailResult.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/result/SysNoticeDetailResult.java index 0bfd009b..1c7a2929 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/result/SysNoticeDetailResult.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/result/SysNoticeDetailResult.java @@ -27,7 +27,6 @@ package vip.xiaonuo.sys.modular.notice.result; import cn.hutool.core.lang.Dict; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; - import java.util.Date; import java.util.List; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/result/SysNoticeReceiveResult.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/result/SysNoticeReceiveResult.java index b233eb6b..a0e993e6 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/result/SysNoticeReceiveResult.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/result/SysNoticeReceiveResult.java @@ -25,7 +25,6 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 package vip.xiaonuo.sys.modular.notice.result; import lombok.Data; - import java.util.Date; /** diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/service/SysNoticeUserService.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/service/SysNoticeUserService.java index 6e9512ac..0bf19863 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/service/SysNoticeUserService.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/service/SysNoticeUserService.java @@ -26,7 +26,6 @@ package vip.xiaonuo.sys.modular.notice.service; import com.baomidou.mybatisplus.extension.service.IService; import vip.xiaonuo.sys.modular.notice.entity.SysNoticeUser; - import java.util.List; /** diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/service/impl/SysNoticeServiceImpl.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/service/impl/SysNoticeServiceImpl.java index 154e6539..f0532f59 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/service/impl/SysNoticeServiceImpl.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/service/impl/SysNoticeServiceImpl.java @@ -50,7 +50,6 @@ import vip.xiaonuo.sys.modular.notice.service.SysNoticeUserService; import vip.xiaonuo.sys.modular.user.service.SysUserService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; - import javax.annotation.Resource; import java.util.Date; import java.util.List; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/service/impl/SysNoticeUserServiceImpl.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/service/impl/SysNoticeUserServiceImpl.java index 19083841..d6c69ba1 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/service/impl/SysNoticeUserServiceImpl.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/service/impl/SysNoticeUserServiceImpl.java @@ -32,7 +32,6 @@ import vip.xiaonuo.sys.modular.notice.mapper.SysNoticeUserMapper; import vip.xiaonuo.sys.modular.notice.service.SysNoticeUserService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; - import java.util.Date; import java.util.List; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java index e783c224..6219bf2b 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java @@ -429,7 +429,7 @@ public class SysUserServiceImpl extends ServiceImpl impl @Override public void export(SysUserParam sysUserParam) { List list = this.list(); - PoiUtil.exportExcelWithStream("XiaoNuoUsers.xls", SysUser.class, list); + PoiUtil.exportExcelWithStream("SonwyUsers.xls", SysUser.class, list); } @Override diff --git a/snowy-main/src/main/resources/application-local.yml b/snowy-main/src/main/resources/application-local.yml index a5fb8f9d..3075a87a 100644 --- a/snowy-main/src/main/resources/application-local.yml +++ b/snowy-main/src/main/resources/application-local.yml @@ -4,7 +4,7 @@ spring: driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://localhost:3306/snowy-pub?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true username: root - password: 123456 + password: ybs1003 # 连接池大小根据实际情况调整 max-active: 20 max-pool-prepared-statement-per-connection-size: 20 @@ -34,4 +34,4 @@ spring: # url: jdbc:postgresql://127.0.0.1:5432/snowy-pub-postgresql # username: snowy-pub-postgresql # password: 123456 -# filters: wall,mergeStat \ No newline at end of file +# filters: wall,mergeStat