diff --git a/.gitignore b/.gitignore index 0d23ed38aa67880693bf97ef5e6192bb05f17438..b3e176a54db1ca4db23093eb8da14b8015ee0e9f 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,4 @@ Servers .metadata upload gen_code +/litemall-db/src/main/resources/application-db.yml diff --git a/litemall-admin/config/prod.env.js b/litemall-admin/config/prod.env.js index 7477e14b9894dc73acca9aed8fcd48b346a60da0..3f46431c488d63c3492e2f61c2982640d37e0079 100644 --- a/litemall-admin/config/prod.env.js +++ b/litemall-admin/config/prod.env.js @@ -1,5 +1,5 @@ module.exports = { NODE_ENV: '"production"', ENV_CONFIG: '"prod"', - BASE_API: '"https://www.example.com/admin"' + BASE_API: '"https://hinsyang.cn/admin"' } diff --git a/litemall-admin/index.html b/litemall-admin/index.html index b2af159180030dfa1b4d2d5434da0453091d03dc..47f8d88867a3dbc85a51e3f009e213fec08e3b12 100644 --- a/litemall-admin/index.html +++ b/litemall-admin/index.html @@ -5,7 +5,7 @@ - litemall-admin + VINIC diff --git a/litemall-admin/package.json b/litemall-admin/package.json index c9bb4d7cd79fb016c186c2623b4090c9cfb18a0e..b37156e6e740eebd0b0987365f5ed4ceb3dd7907 100644 --- a/litemall-admin/package.json +++ b/litemall-admin/package.json @@ -1,8 +1,8 @@ { - "name": "litemall-admin", + "name": "vinic-admin", "version": "0.1.0", - "description": "litemall-admin basing on vue-element-admin 3.9.3", - "author": "linlinjava ", + "description": "vinic-admin basing on vue-element-admin 3.9.3", + "author": "vinic ", "license": "MIT", "private": true, "scripts": { diff --git a/litemall-admin/src/router/index.js b/litemall-admin/src/router/index.js index d9d2c1010362dd243bacec12b26445c6c70986ba..b5e64d8ae97303868e4e66dfd6e5a2177760ea5c 100644 --- a/litemall-admin/src/router/index.js +++ b/litemall-admin/src/router/index.js @@ -527,47 +527,6 @@ export const asyncRouterMap = [ } ] }, - { - path: 'external-link', - component: Layout, - redirect: 'noredirect', - alwaysShow: true, - name: 'externalLink', - meta: { - title: '外链', - icon: 'link' - }, - children: [ - { - path: 'https://cloud.tencent.com/product/cos', - meta: { title: '腾讯云存储', icon: 'link' } - }, - { - path: 'https://cloud.tencent.com/product/sms', - meta: { title: '腾讯云短信', icon: 'link' } - }, - { - path: 'https://pay.weixin.qq.com/index.php/core/home/login', - meta: { title: '微信支付', icon: 'link' } - }, - { - path: 'https://mpkf.weixin.qq.com/', - meta: { title: '小程序客服', icon: 'link' } - }, - { - path: 'https://www.alibabacloud.com/zh/product/oss', - meta: { title: '阿里云存储', icon: 'link' } - }, - { - path: 'https://www.qiniu.com/products/kodo', - meta: { title: '七牛云存储', icon: 'link' } - }, - { - path: 'http://www.kdniao.com/api-track', - meta: { title: '快递鸟', icon: 'link' } - } - ] - }, { path: '/profile', component: Layout, diff --git a/litemall-admin/src/utils/request.js b/litemall-admin/src/utils/request.js index 6da07211f0c568d0c7e027b94efd2085cadf8073..df40d0a000d1499845c22a9dcdaa48f92d7fbb60 100644 --- a/litemall-admin/src/utils/request.js +++ b/litemall-admin/src/utils/request.js @@ -6,7 +6,7 @@ import { getToken } from '@/utils/auth' // create an axios instance const service = axios.create({ baseURL: process.env.BASE_API, // api 的 base_url - timeout: 5000 // request timeout + timeout: 15000 // request timeout }) // request interceptor diff --git a/litemall-admin/src/views/layout/components/Navbar.vue b/litemall-admin/src/views/layout/components/Navbar.vue index a26eb359c51de606d9d17c2a597c1382af646f82..72886156335f7f409989d6311eb023f28e79b247 100644 --- a/litemall-admin/src/views/layout/components/Navbar.vue +++ b/litemall-admin/src/views/layout/components/Navbar.vue @@ -28,16 +28,6 @@ 首页 - - - GitHub - - - - - 码云 - - 密码修改 diff --git a/litemall-admin/src/views/login/index.vue b/litemall-admin/src/views/login/index.vue index 876f5fb522d50b7d749693e3e9c50a90460f41dc..d304587eca9c148bb8b15fd4f1b19c694183d4fc 100644 --- a/litemall-admin/src/views/login/index.vue +++ b/litemall-admin/src/views/login/index.vue @@ -23,20 +23,6 @@ 登录 -
-
- 超级管理员用户名: admin123 - 超级管理员用户名：admin123 -
-
- 商城管理员用户名: mall123 - 商城管理员用户名：mall123 -
-
- 推广管理员用户名: promotion123 - 推广管理员用户名：promotion123 -
-
@@ -55,8 +41,8 @@ export default { } return { loginForm: { - username: 'admin123', - password: 'admin123' + username: '', + password: '' }, loginRules: { username: [{ required: true, message: '管理员账户不允许为空', trigger: 'blur' }], diff --git a/litemall-db/src/main/resources/application-db.yml b/litemall-db/src/main/resources/application-db.yml index ef526211806da7e17ca1ac697076325aff1155a9..13d129b0c24e5db066ac48648f0c7be653d6cdeb 100644 --- a/litemall-db/src/main/resources/application-db.yml +++ b/litemall-db/src/main/resources/application-db.yml @@ -7,7 +7,7 @@ pagehelper: spring: datasource: druid: - url: jdbc:mysql://localhost:3306/litemall?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC&allowPublicKeyRetrieval=true&verifyServerCertificate=false&useSSL=false + url: jdbc:mysql://localhost:443/litemall?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC&allowPublicKeyRetrieval=true&verifyServerCertificate=false&useSSL=false driver-class-name: com.mysql.jdbc.Driver username: litemall password: litemall123456 @@ -23,4 +23,3 @@ spring: test-while-idle: true time-between-eviction-runs-millis: 60000 filters: stat,wall - diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAuthController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAuthController.java index 071881d1d1116b1d6ccfacf3455576b26462342b..b9acd2beb8ed404ee782119ee38ea16c399e4c80 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAuthController.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAuthController.java @@ -197,13 +197,13 @@ public class WxAuthController { return ResponseUtil.fail(AUTH_CAPTCHA_UNSUPPORT, "小程序后台验证码服务不支持"); } String code = CharUtil.getRandomNum(6); - notifyService.notifySmsTemplate(phoneNumber, NotifyType.CAPTCHA, new String[]{code}); boolean successful = CaptchaCodeManager.addToCache(phoneNumber, code); if (!successful) { return ResponseUtil.fail(AUTH_CAPTCHA_FREQUENCY, "验证码未超时1分钟，不能发送"); } + notifyService.notifySmsTemplate(phoneNumber, NotifyType.CAPTCHA, new String[]{code}); return ResponseUtil.ok(); } diff --git a/pom.xml b/pom.xml index fa3e6615e5b025794925d775b1d8464406ad3253..51a6f88d66d139f2046dfd716409827d83352573 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.5.RELEASE + 2.1.4.RELEASE