diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminStorageController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminStorageController.java index 544fbb6c3fcf3dd8989f251265f4b0096fcdc0db..32481d235922c4ce30cc21e6577011b1d5955665 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminStorageController.java +++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminStorageController.java @@ -18,6 +18,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.validation.constraints.NotNull; import java.io.IOException; +import java.time.LocalDateTime; import java.util.List; @RestController @@ -47,7 +48,7 @@ public class AdminStorageController { @RequiresPermissionsDesc(menu = {"系统管理", "对象存储"}, button = "上传") @PostMapping("/create") public Object create(@RequestParam("file") MultipartFile file) throws IOException { - String originalFilename = file.getOriginalFilename(); + String originalFilename = file.getOriginalFilename()+ LocalDateTime.now().toString(); LitemallStorage litemallStorage = storageService.store(file.getInputStream(), file.getSize(), file.getContentType(), originalFilename); return ResponseUtil.ok(litemallStorage); diff --git a/litemall-admin/config/prod.env.js b/litemall-admin/config/prod.env.js index 7477e14b9894dc73acca9aed8fcd48b346a60da0..5657977b7ec0531e4b2f324aa7490d3e3e984f55 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://www.hkvinic.top/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-core/src/main/resources/application-core.yml b/litemall-core/src/main/resources/application-core.yml index 9240ce12af381f528d3b85e61b0623e9ae158cdd..1436047ed2ed144a51bf1ac929c7301017c44115 100644 --- a/litemall-core/src/main/resources/application-core.yml +++ b/litemall-core/src/main/resources/application-core.yml @@ -1,11 +1,11 @@ litemall: # 开发者应该设置成自己的wx相关信息 wx: - app-id: wxa5b486c6b918ecfb - app-secret: e04004829d4c383b4db7769d88dfbca1 - mch-id: 111111 - mch-key: xxxxxx - notify-url: http://www.example.com/wx/order/pay-notify + app-id: wxb6fd642f51545fc8 + app-secret: 04b0ddb07c5ec604aa5ba5744dc11c9c + mch-id: 1546962111 + mch-key: 54DBE97DC1C8856E4B55D6A01DDDC56A + notify-url: https://www.hkvinic.top/wx/order/vinicWxNotify # 商户证书文件路径 # 请参考“商户证书”一节 https://pay.weixin.qq.com/wiki/doc/api/wxa/wxa_api.php?chapter=4_3 key-path: xxxxx @@ -15,35 +15,39 @@ litemall: mail: # 邮件通知配置,邮箱一般用于接收业务通知例如收到新的订单，sendto 定义邮件接收者，通常为商城运营人员 enable: false - host: smtp.exmail.qq.com - username: ex@ex.com.cn - password: XXXXXXXXXXXXX - sendfrom: ex@ex.com.cn - sendto: ex@qq.com + host: smtp.qq.com + username: 2086229539@qq.com + password: tuhpittbjgkgbfea + sendfrom: 2086229539@qq.com + sendto: 173653962@qq.com + sendcc: 375838673@qq.com + port: 465 # 短消息模版通知配置 # 短信息用于通知客户，例如发货短信通知，注意配置格式；template-name，template-templateId 请参考 NotifyType 枚举值 sms: - enable: false - appid: 111111111 - appkey: xxxxxxxxxxxxxx + enable: true + appid: 1400205120 + appkey: 6f8eaf148c267d24ee8374b32936dd86 template: - - name: paySucceed - templateId: 156349 - - name: captcha - templateId: 156433 - - name: ship - templateId: 158002 - - name: refund - templateId: 159447 + - name: paySucceed + templateId: 323022 + - name: proxyRegister + templateId: 323014 + - name: captcha + templateId: 156433 + - name: ship + templateId: 158002 + - name: refund + templateId: 159447 # 微信模版通知配置 # 微信模版用于通知客户或者运营者，注意配置格式；template-name，template-templateId 请参考 NotifyType 枚举值 wx: - enable: false + enable: true template: - name: paySucceed - templateId: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx + templateId: iBhy0Rj8BqRIiCDjC1Xcrwi1kQMO7yf0j1gp04dGRG0 - name: captcha templateId: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - name: ship @@ -53,9 +57,9 @@ litemall: # 快鸟物流查询配置 express: - enable: false - appId: "XXXXXXXXX" - appKey: "XXXXXXXXXXXXXXXXXXXXXXXXX" + enable: true + appId: "1438769" + appKey: "1d467469-fc01-4778-90b7-2dc145df6c7d" vendors: - code: "ZTO" name: "中通快递" @@ -87,18 +91,18 @@ litemall: # 对象存储配置 storage: # 当前工作的对象存储模式，分别是local、aliyun、tencent、qiniu - active: local + active: aliyun # 本地对象存储配置信息 local: storagePath: storage # 这个地方应该是wx模块的WxStorageController的fetch方法对应的地址 - address: http://localhost:8080/wx/storage/fetch/ + address: https://eyetips.oss-cn-shenzhen.aliyuncs.com/storage/fetch/ # 阿里云对象存储配置信息 aliyun: endpoint: oss-cn-shenzhen.aliyuncs.com - accessKeyId: 111111 - accessKeySecret: xxxxxx - bucketName: litemall + accessKeyId: LTAIwVpPe1ZRvZjC + accessKeySecret: tf53zoOLeQ6NVudcip1U86PIJS3t5k + bucketName: eyetips # 腾讯对象存储配置信息 # 请参考 https://cloud.tencent.com/document/product/436/6249 tencent: diff --git a/litemall-db/src/main/resources/application-db.yml b/litemall-db/src/main/resources/application-db.yml index ef526211806da7e17ca1ac697076325aff1155a9..bb61b06e6da6839df385ff16ff6984ca4a23a10a 100644 --- a/litemall-db/src/main/resources/application-db.yml +++ b/litemall-db/src/main/resources/application-db.yml @@ -1,26 +1,26 @@ -pagehelper: - helperDialect: mysql - reasonable: true - supportMethodsArguments: true - params: count=countSql - -spring: - datasource: - druid: - url: jdbc:mysql://localhost:3306/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 - initial-size: 10 - max-active: 50 - min-idle: 10 - max-wait: 60000 - pool-prepared-statements: true - max-pool-prepared-statement-per-connection-size: 20 - validation-query: SELECT 1 FROM DUAL - test-on-borrow: false - test-on-return: false - test-while-idle: true - time-between-eviction-runs-millis: 60000 - filters: stat,wall - +pagehelper: + helperDialect: mysql + reasonable: true + supportMethodsArguments: true + params: count=countSql + +spring: + datasource: + druid: + url: jdbc:mysql://106.14.226.204:3306/litemall?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC&allowPublicKeyRetrieval=true&verifyServerCertificate=false&useSSL=false + driver-class-name: com.mysql.jdbc.Driver + username: vinic + password: Vinic@888 + initial-size: 10 + max-active: 50 + min-idle: 10 + max-wait: 60000 + pool-prepared-statements: true + max-pool-prepared-statement-per-connection-size: 20 + validation-query: SELECT 1 FROM DUAL + test-on-borrow: false + test-on-return: false + 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/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxOrderController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxOrderController.java index 24838bd613c178fbafd2f21199b7bae1bd6c623e..c2ae4d8cdb1066ec77a2c248f226afe8e519ca11 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxOrderController.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxOrderController.java @@ -100,7 +100,7 @@ public class WxOrderController { * @param response 响应内容 * @return 操作结果 */ - @PostMapping("pay-notify") + @PostMapping("vinicWxNotify") public Object payNotify(HttpServletRequest request, HttpServletResponse response) { return wxOrderService.payNotify(request, response); } diff --git a/litemall-wx/app.json b/litemall-wx/app.json index affff8f0e03b59e31415ce0142f0da31aa27a387..bb41200cfda1d9880c8f2f3d039ea1f3ea0fefe1 100644 --- a/litemall-wx/app.json +++ b/litemall-wx/app.json @@ -41,7 +41,7 @@ ], "window": { "navigationBarBackgroundColor": "#FFFFFF", - "navigationBarTitleText": "litemall小程序商城", + "navigationBarTitleText": "VINIC刹车制动改装商城", "enablePullDownRefresh": true, "navigationBarTextStyle": "black", "backgroundColor": "#FFFFFF", diff --git a/litemall-wx/config/api.js b/litemall-wx/config/api.js index 2be3d2132a35c81ca62643e8e104f655b607a76f..bd7269f5d15e948e77540bcec83778dae25627e9 100644 --- a/litemall-wx/config/api.js +++ b/litemall-wx/config/api.js @@ -1,12 +1,12 @@ // 以下是业务服务器API地址 // 本机开发时使用 -var WxApiRoot = 'http://localhost:8080/wx/'; +//var WxApiRoot = 'http://localhost:8080/wx/'; // 局域网测试使用 // var WxApiRoot = 'http://192.168.0.101:8080/wx/'; // 云平台部署时使用 // var WxApiRoot = 'http://118.24.0.153:8080/wx/'; // 云平台上线时使用 -// var WxApiRoot = 'https://www.menethil.com.cn/wx/'; + var WxApiRoot = 'https://www.hkvinic.top/wx/'; module.exports = { IndexUrl: WxApiRoot + 'home/index', //首页数据接口 diff --git a/litemall-wx/pages/about/about.js b/litemall-wx/pages/about/about.js index 328ca13c0bb5a593442c5c269c23b86ed4888241..5ab7e6f6f66da8f6ee695e9730f410fec778f7de 100644 --- a/litemall-wx/pages/about/about.js +++ b/litemall-wx/pages/about/about.js @@ -12,12 +12,12 @@ Page({ data: { load_statue: true, shopInfo: { - name: 'litemall', - address: 'https://github.com/linlinjava/litemall', - latitude: 31.201900, - longitude: 121.587839, - linkPhone: '021-xxxx-xxxx', - qqNumber: '738696120' + name: 'VINIC汽车制动用品有限公司', + address: '东莞市鸿海智谷产业园', + latitude: 22.7703190000, + longitude: 114.1346210000, + linkPhone: '4009961993', + qqNumber: '13760291511' }, }, diff --git a/litemall-wx/pages/about/about.wxml b/litemall-wx/pages/about/about.wxml index ac1983d5bc2127b5ade6494335e8c4b4e1fd3863..755f3ad0b2e7131c829aae2abea9e85dd42df45f 100644 --- a/litemall-wx/pages/about/about.wxml +++ b/litemall-wx/pages/about/about.wxml @@ -3,7 +3,7 @@ - + {{shopInfo.name}} @@ -32,7 +32,7 @@ - + {{shopInfo.qqNumber}} @@ -40,18 +40,4 @@ - - - - 1.0.0 - - - - - - - MIT - - - \ No newline at end of file diff --git a/litemall-wx/pages/index/index.js b/litemall-wx/pages/index/index.js index 8e0d66d499336eeadf203c3da23d5c57e4afe9b0..6a1198d43bab399362d95637de4edd7babd437e3 100644 --- a/litemall-wx/pages/index/index.js +++ b/litemall-wx/pages/index/index.js @@ -21,8 +21,8 @@ Page({ onShareAppMessage: function() { return { - title: 'litemall小程序商场', - desc: '开源微信小程序商城', + title: 'VINIC刹车制动改装商城', + desc: 'VINIC小程序商城', path: '/pages/index/index' } }, diff --git a/litemall-wx/project.config.json b/litemall-wx/project.config.json index 9383d66e0704ce6a0432ab39ca2c14f71d43d03d..baf7e1d6bdba8b7f20136d0b57a246b002edba5d 100644 --- a/litemall-wx/project.config.json +++ b/litemall-wx/project.config.json @@ -10,7 +10,7 @@ }, "compileType": "miniprogram", "libVersion": "2.4.0", - "appid": "wxa5b486c6b918ecfb", + "appid": "wxb6fd642f51545fc8", "projectname": "litemall-wx", "simulatorType": "wechat", "simulatorPluginLibVersion": {}, 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