From 3ceae27b0c11e541ac72ec3002432d81306323c6 Mon Sep 17 00:00:00 2001 From: xuyuxiang Date: Wed, 14 Apr 2021 12:29:52 +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=E6=96=87=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _web/src/components/Table/README.md | 2 +- _web/src/views/system/dashboard/Workplace.vue | 2 +- .../constant/ConstantContextHolder.java | 66 +++++++++---------- .../generate/core/enums/QueryTypeEnum.java | 24 ------- .../sys/core/validator/SnowyValidator.java | 6 +- .../java/vip/xiaonuo/SnowyApplication.java | 24 ------- .../vip/xiaonuo/SnowyServletInitializer.java | 26 +------- .../src/test/java/vip/xiaonuo/core/Test.java | 1 - 8 files changed, 39 insertions(+), 112 deletions(-) diff --git a/_web/src/components/Table/README.md b/_web/src/components/Table/README.md index 5de0f28f..c48d196b 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: '小诺', + title: 'Snowy', description: '那时候我只会想自己想要什么，从不想自己拥有什么', status: 1, updatedAt: '2018-07-26 00:00:00' diff --git a/_web/src/views/system/dashboard/Workplace.vue b/_web/src/views/system/dashboard/Workplace.vue index 46830bd5..1b4c9e9f 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: '小诺', + title: 'Snowy', description: '那时候我只会想自己想要什么，从不想自己拥有什么', status: 1, updatedAt: '2018-07-26 00:00:00' diff --git a/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/context/constant/ConstantContextHolder.java b/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/context/constant/ConstantContextHolder.java index dfbac008..79b52ebe 100644 --- a/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/context/constant/ConstantContextHolder.java +++ b/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/context/constant/ConstantContextHolder.java @@ -89,11 +89,11 @@ public class ConstantContextHolder { * @date 2020/6/20 22:13 */ public static List getUnXssFilterUrl() { - String xiaoNuoUnXssFilterUrl = getSysConfigWithDefault("SNOWY_UN_XSS_FILTER_URL", String.class, null); - if (ObjectUtil.isEmpty(xiaoNuoUnXssFilterUrl)) { + String snowyUnXssFilterUrl = getSysConfigWithDefault("SNOWY_UN_XSS_FILTER_URL", String.class, null); + if (ObjectUtil.isEmpty(snowyUnXssFilterUrl)) { return CollectionUtil.newArrayList(); } else { - return CollectionUtil.toList(xiaoNuoUnXssFilterUrl.split(SymbolConstant.COMMA)); + return CollectionUtil.toList(snowyUnXssFilterUrl.split(SymbolConstant.COMMA)); } } @@ -138,16 +138,16 @@ public class ConstantContextHolder { * @date 2020/6/19 18:08 */ public static TencentSmsConfigs getTencentSmsConfigs() { - String xiaoNuoTencentSmsSecretId = getSysConfig("SNOWY_TENCENT_SMS_SECRET_ID", String.class, true); - String xiaoNuoTencentSmsSecretKey = getSysConfig("SNOWY_TENCENT_SMS_SECRET_KEY", String.class, true); - String xiaoNuoTencentSmsSdkAppId = getSysConfig("SNOWY_TENCENT_SMS_SDK_APP_ID", String.class, true); - String xiaoNuoTencentSmsSign = getSysConfig("SNOWY_TENCENT_SMS_SIGN", String.class, true); + String snowyTencentSmsSecretId = getSysConfig("SNOWY_TENCENT_SMS_SECRET_ID", String.class, true); + String snowyTencentSmsSecretKey = getSysConfig("SNOWY_TENCENT_SMS_SECRET_KEY", String.class, true); + String snowyTencentSmsSdkAppId = getSysConfig("SNOWY_TENCENT_SMS_SDK_APP_ID", String.class, true); + String snowyTencentSmsSign = getSysConfig("SNOWY_TENCENT_SMS_SIGN", String.class, true); TencentSmsConfigs tencentSmsConfigs = new TencentSmsConfigs(); - tencentSmsConfigs.setSecretId(xiaoNuoTencentSmsSecretId); - tencentSmsConfigs.setSecretKey(xiaoNuoTencentSmsSecretKey); - tencentSmsConfigs.setSdkAppId(xiaoNuoTencentSmsSdkAppId); - tencentSmsConfigs.setSign(xiaoNuoTencentSmsSign); + tencentSmsConfigs.setSecretId(snowyTencentSmsSecretId); + tencentSmsConfigs.setSecretKey(snowyTencentSmsSecretKey); + tencentSmsConfigs.setSdkAppId(snowyTencentSmsSdkAppId); + tencentSmsConfigs.setSign(snowyTencentSmsSign); return tencentSmsConfigs; } @@ -158,18 +158,18 @@ public class ConstantContextHolder { * @date 2020/6/19 18:08 */ public static AliyunSmsConfigs getAliyunSmsConfigs() { - String xiaoNuoSmsAccesskeyId = getSysConfig("SNOWY_ALIYUN_SMS_ACCESSKEY_ID", String.class, true); - String xiaoNuoSmsAccesskeySecret = getSysConfig("SNOWY_ALIYUN_SMS_ACCESSKEY_SECRET", String.class, true); - String xiaoNuoSmsSignName = getSysConfig("SNOWY_ALIYUN_SMS_SIGN_NAME", String.class, true); - String xiaoNuoSmsLoginTemplateCode = getSysConfig("SNOWY_ALIYUN_SMS_LOGIN_TEMPLATE_CODE", String.class, true); - String xiaoNuoSmsInvalidateMinutes = getSysConfig("SNOWY_ALIYUN_SMS_INVALIDATE_MINUTES", String.class, true); + String snowySmsAccesskeyId = getSysConfig("SNOWY_ALIYUN_SMS_ACCESSKEY_ID", String.class, true); + String snowySmsAccesskeySecret = getSysConfig("SNOWY_ALIYUN_SMS_ACCESSKEY_SECRET", String.class, true); + String snowySmsSignName = getSysConfig("SNOWY_ALIYUN_SMS_SIGN_NAME", String.class, true); + String snowySmsLoginTemplateCode = getSysConfig("SNOWY_ALIYUN_SMS_LOGIN_TEMPLATE_CODE", String.class, true); + String snowySmsInvalidateMinutes = getSysConfig("SNOWY_ALIYUN_SMS_INVALIDATE_MINUTES", String.class, true); AliyunSmsConfigs aliyunSmsProperties = new AliyunSmsConfigs(); - aliyunSmsProperties.setAccessKeyId(xiaoNuoSmsAccesskeyId); - aliyunSmsProperties.setAccessKeySecret(xiaoNuoSmsAccesskeySecret); - aliyunSmsProperties.setSignName(xiaoNuoSmsSignName); - aliyunSmsProperties.setLoginTemplateCode(xiaoNuoSmsLoginTemplateCode); - aliyunSmsProperties.setInvalidateMinutes(Convert.toInt(xiaoNuoSmsInvalidateMinutes)); + aliyunSmsProperties.setAccessKeyId(snowySmsAccesskeyId); + aliyunSmsProperties.setAccessKeySecret(snowySmsAccesskeySecret); + aliyunSmsProperties.setSignName(snowySmsSignName); + aliyunSmsProperties.setLoginTemplateCode(snowySmsLoginTemplateCode); + aliyunSmsProperties.setInvalidateMinutes(Convert.toInt(snowySmsInvalidateMinutes)); return aliyunSmsProperties; } @@ -272,14 +272,14 @@ public class ConstantContextHolder { * @date 2020/7/28 17:16 **/ public static OauthConfigs getGiteeOauthConfigs() { - String xiaoNuoClientId = getSysConfig("SNOWY_OAUTH_GITEE_CLIENT_ID", String.class, true); - String xiaoNuoClientSecret = getSysConfig("SNOWY_OAUTH_GITEE_CLIENT_SECRET", String.class, true); - String xiaoNuoRedirectUri = getSysConfig("SNOWY_OAUTH_GITEE_REDIRECT_URI", String.class, true); + String snowyClientId = getSysConfig("SNOWY_OAUTH_GITEE_CLIENT_ID", String.class, true); + String snowyClientSecret = getSysConfig("SNOWY_OAUTH_GITEE_CLIENT_SECRET", String.class, true); + String snowyRedirectUri = getSysConfig("SNOWY_OAUTH_GITEE_REDIRECT_URI", String.class, true); OauthConfigs oauthConfigs = new OauthConfigs(); - oauthConfigs.setClientId(xiaoNuoClientId); - oauthConfigs.setClientSecret(xiaoNuoClientSecret); - oauthConfigs.setRedirectUri(xiaoNuoRedirectUri); + oauthConfigs.setClientId(snowyClientId); + oauthConfigs.setClientSecret(snowyClientSecret); + oauthConfigs.setRedirectUri(snowyRedirectUri); return oauthConfigs; } @@ -290,14 +290,14 @@ public class ConstantContextHolder { * @date 2020/7/28 17:16 **/ public static OauthConfigs getGithubOauthConfigs() { - String xiaoNuoClientId = getSysConfig("SNOWY_OAUTH_GITHUB_CLIENT_ID", String.class, true); - String xiaoNuoClientSecret = getSysConfig("SNOWY_OAUTH_GITHUB_CLIENT_SECRET", String.class, true); - String xiaoNuoRedirectUri = getSysConfig("SNOWY_OAUTH_GITHUB_REDIRECT_URI", String.class, true); + String snowyClientId = getSysConfig("SNOWY_OAUTH_GITHUB_CLIENT_ID", String.class, true); + String snowyClientSecret = getSysConfig("SNOWY_OAUTH_GITHUB_CLIENT_SECRET", String.class, true); + String snowyRedirectUri = getSysConfig("SNOWY_OAUTH_GITHUB_REDIRECT_URI", String.class, true); OauthConfigs oauthConfigs = new OauthConfigs(); - oauthConfigs.setClientId(xiaoNuoClientId); - oauthConfigs.setClientSecret(xiaoNuoClientSecret); - oauthConfigs.setRedirectUri(xiaoNuoRedirectUri); + oauthConfigs.setClientId(snowyClientId); + oauthConfigs.setClientSecret(snowyClientSecret); + oauthConfigs.setRedirectUri(snowyRedirectUri); return oauthConfigs; } 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 0e9bc928..5b5c3ed8 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,30 +13,6 @@ 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. -小诺采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点： - -1.请不要删除和修改根目录下的LICENSE文件。 -2.请不要删除和修改Snowy源码头部的版权声明。 -3.请保留源码和相关描述文件的项目出处，作者声明等。 -4.分发源码时候，请注明软件出处 https://gitee.com/xiaonuobase/snowy -5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/xiaonuobase/snowy -6.若您的项目无法满足以上几点，可申请商业授权，获取小诺商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip - */ -/* -Copyright [2020] [https://www.xiaonuo.vip] - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -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. - Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点： 1.请不要删除和修改根目录下的LICENSE文件。 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 fd49a4c1..193df9b6 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 @@ -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开源协议，您在使用过程中，需要注意以下几点： +Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点： 1.请不要删除和修改根目录下的LICENSE文件。 -2.请不要删除和修改XiaoNuo源码头部的版权声明。 +2.请不要删除和修改Snowy源码头部的版权声明。 3.请保留源码和相关描述文件的项目出处，作者声明等。 4.分发源码时候，请注明软件出处 https://gitee.com/xiaonuobase/snowy 5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/xiaonuobase/snowy -6.若您的项目无法满足以上几点，可申请商业授权，获取XiaoNuo商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip +6.若您的项目无法满足以上几点，可申请商业授权，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip */ /* diff --git a/snowy-main/src/main/java/vip/xiaonuo/SnowyApplication.java b/snowy-main/src/main/java/vip/xiaonuo/SnowyApplication.java index 47770cad..e2153764 100644 --- a/snowy-main/src/main/java/vip/xiaonuo/SnowyApplication.java +++ b/snowy-main/src/main/java/vip/xiaonuo/SnowyApplication.java @@ -1,27 +1,3 @@ -/* -Copyright [2020] [https://www.xiaonuo.vip] - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -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. - -Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点： - -1.请不要删除和修改根目录下的LICENSE文件。 -2.请不要删除和修改Snowy源码头部的版权声明。 -3.请保留源码和相关描述文件的项目出处，作者声明等。 -4.分发源码时候，请注明软件出处 https://gitee.com/xiaonuobase/snowy -5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/xiaonuobase/snowy -6.若您的项目无法满足以上几点，可申请商业授权，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip - */ package vip.xiaonuo; import cn.hutool.log.Log; diff --git a/snowy-main/src/main/java/vip/xiaonuo/SnowyServletInitializer.java b/snowy-main/src/main/java/vip/xiaonuo/SnowyServletInitializer.java index 924be212..12e54fd2 100644 --- a/snowy-main/src/main/java/vip/xiaonuo/SnowyServletInitializer.java +++ b/snowy-main/src/main/java/vip/xiaonuo/SnowyServletInitializer.java @@ -1,34 +1,10 @@ -/* -Copyright [2020] [https://www.xiaonuo.vip] - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -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. - -Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点： - -1.请不要删除和修改根目录下的LICENSE文件。 -2.请不要删除和修改Snowy源码头部的版权声明。 -3.请保留源码和相关描述文件的项目出处，作者声明等。 -4.分发源码时候，请注明软件出处 https://gitee.com/xiaonuobase/snowy -5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/xiaonuobase/snowy -6.若您的项目无法满足以上几点，可申请商业授权，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip - */ package vip.xiaonuo; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; /** - * XiaoNuo Web程序启动类 + * Snowy Web程序启动类 * * @author xuyuxiang * @date 2017-05-21 9:43 diff --git a/snowy-main/src/test/java/vip/xiaonuo/core/Test.java b/snowy-main/src/test/java/vip/xiaonuo/core/Test.java index 51a6d828..67b670e1 100644 --- a/snowy-main/src/test/java/vip/xiaonuo/core/Test.java +++ b/snowy-main/src/test/java/vip/xiaonuo/core/Test.java @@ -26,7 +26,6 @@ package vip.xiaonuo.core; /** - * v * 测试类 * * @author xuyuxiang