doum
20 小时以前 eb14fddff37f3783c63deba20f53b37383fba652
经销商管理
已删除5个文件
已修改8个文件
已重命名1个文件
364 ■■■■ 文件已修改
admin/.env.test 补丁 | 查看 | 原始文档 | blame | 历史
admin/dmmall_admin/index.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/dmmall_admin/static/css/app.7d97a292.css 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/dmmall_admin/static/js/app.5b8aadbb.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/dmmall_admin/static/js/app.5b8aadbb.js.map 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/dmmall_admin/static/js/chunk-vendors.433308b2.js 243 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/dmmall_admin/static/js/chunk-vendors.433308b2.js.map 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/package.json 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/vue.config.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/dmmall_admin/src/main/resources/application.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/src/main/resources/application-pro.yml 49 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/src/main/resources/application-test.yml 53 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/dmmall_web/src/main/resources/application.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/startsh/admin_start.sh 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/.env.test
admin/dmmall_admin/index.html
@@ -1 +1 @@
<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>鼎元农机后台管理</title><link href="static/css/app.7d97a292.css" rel="preload" as="style"><link href="static/css/chunk-vendors.d9e68312.css" rel="preload" as="style"><link href="static/js/app.5b8aadbb.js" rel="preload" as="script"><link href="static/js/chunk-vendors.433308b2.js" rel="preload" as="script"><link href="static/css/chunk-vendors.d9e68312.css" rel="stylesheet"><link href="static/css/app.7d97a292.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but å’–啡之声后台管理 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="static/js/chunk-vendors.433308b2.js"></script><script src="static/js/app.5b8aadbb.js"></script></body></html>
<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>鼎元农机后台管理</title><link href="static/css/app.1e37c419.css" rel="preload" as="style"><link href="static/css/chunk-vendors.d9e68312.css" rel="preload" as="style"><link href="static/js/app.8f0928af.js" rel="preload" as="script"><link href="static/js/chunk-vendors.95f08430.js" rel="preload" as="script"><link href="static/css/chunk-vendors.d9e68312.css" rel="stylesheet"><link href="static/css/app.1e37c419.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but é¼Žå…ƒå†œæœºåŽå°ç®¡ç† doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="static/js/chunk-vendors.95f08430.js"></script><script src="static/js/app.8f0928af.js"></script></body></html>
admin/dmmall_admin/static/css/app.7d97a292.css
ÎļþÒÑɾ³ý
admin/dmmall_admin/static/js/app.5b8aadbb.js
ÎļþÒÑɾ³ý
admin/dmmall_admin/static/js/app.5b8aadbb.js.map
ÎļþÒÑɾ³ý
admin/dmmall_admin/static/js/chunk-vendors.433308b2.js
ÎļþÒÑɾ³ý
admin/dmmall_admin/static/js/chunk-vendors.433308b2.js.map
ÎļþÒÑɾ³ý
admin/package.json
@@ -5,7 +5,7 @@
  "scripts": {
    "serve": "vue-cli-service serve",
    "build:pro": "vue-cli-service build",
    "build:staging": "vue-cli-service build --mode staging",
    "build:test": "vue-cli-service build --mode test",
    "lint": "vue-cli-service lint",
    "fix": "eslint --ext .js,.vue src --fix"
  },
admin/vue.config.js
@@ -1,12 +1,12 @@
// è¯¦ç»†é…ç½®è¯·å‚考https://cli.vuejs.org/zh/config/#vue-config-js
//const outputDir = process.env.VUE_APP_CONTEXT_PATH.substring(1, process.env.VUE_APP_CONTEXT_PATH.length)
// const outputDir = process.env.VUE_APP_CONTEXT_PATH.substring(1, process.env.VUE_APP_CONTEXT_PATH.length)
const path = require('path')
function resolve (dir) {
  return path.join(__dirname, dir)
}
module.exports = {
  publicPath: './',
  outputDir: 'dmmall_admin' || 'test',
  outputDir: process.env.VUE_APP_CONTEXT_PATH || 'test',
  assetsDir: 'static',
  lintOnSave: false,
  devServer: {
server/dmmall_admin/src/main/resources/application.yml
@@ -70,7 +70,7 @@
    enabled: true
    mime-types: application/json
  port: 10014
  port: 12014
  tomcat:
    max-swallow-size: -1
  servlet:
server/dmmall_service/src/main/resources/application-pro.yml
@@ -1,29 +1,39 @@
spring:
  # æ•°æ®æºé…ç½®
  datasource:
    url: jdbc:mysql://57b57595ddc66.sh.cdb.myqcloud.com:4464/dmmall?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8
    username: test
    password: doumee@168
    url: jdbc:mysql://192.168.0.211:3306/dmmall_full?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
    username: root
    password: Doumee@168
    driver-class-name: com.mysql.cj.jdbc.Driver
    type: com.alibaba.druid.pool.DruidDataSource
  redis:
    #    database: 0
    host: localhost
    port: 6379
    password:
    timeout: 5000      # è¿žæŽ¥æ± ä¸­çš„æœ€å°ç©ºé—²è¿žæŽ¥
  jackson:
    time-zone: GMT+8
    date-format: yyyy-MM-dd HH:mm:ss
rocketmq:
  #  name-server: MQ_INST_1192607506254616_BYF2iMz7.cn-shanghai.mq-internal.aliyuncs.com:8080
  namesrvAddr: http://rmq-cn-pe335rcnn06.cn-shanghai.rmq.aliyuncs.com:8080
  accessKey: LTAI5tG5rPuqw1B48rgtY2Td
  secretKey: KvLOlSQXHpomOhxmMnbN7IVwJuEDI5
  groupId: GID-wakatest
  topic: waka-test
  instanceId: rmq-cn-pe335rcnn06
  namesrvAddr: rmq-cn-zxu364d2k0i.cn-shanghai.rmq.aliyuncs.com:8080
  groupId: doumeeGroup
  topic: doumeeTopic
  username: Onu5C13YO2wj1NUn
  password: xpQFFE0y543lB2a7
knife4j:
  enable: true
  basic:
    enable: true
    username: admin
    password: doumee@168.com
    password: doumee@168
debug_model: true
debug_model: false
captcha_check: false
@@ -36,6 +46,21 @@
  # ç¦ç”¨swagger时的重定向地址
  redirect-uri: /
########################微信支付相关配置########################
wx:
  pay:
    appId: wxcd2b89fd2ff065f8
    appSecret: 3462fa186da7cb06c544df8d8664b63a
    mchId: 1229817002
    mchKey: u4TSNtv0wFP7WRfnxBgijYOtRhS9FvlM
    notifyUrl: https://dmtest.ahapp.net/dmmall_interface/web/api/wxPayNotify
    keyPath: /usr/local/apiclient_cert.p12
tencent:
  map:
    remoteHost: https://apis.map.qq.com
    appKey: 3AYBZ-I5R3V-2BVP3-UWBDQ-ETBM5-B2BBQ
########################定时开启配置########################
timing: true
server/dmmall_service/src/main/resources/application-test.yml
@@ -1,27 +1,37 @@
spring:
  # æ•°æ®æºé…ç½®
  datasource:
    url: jdbc:mysql://57b57595ddc66.sh.cdb.myqcloud.com:4464/dmmall?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8
    username: test
    password: doumee@168
    url: jdbc:mysql://192.168.0.211:3306/dmmall_full?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
    username: root
    password: Doumee@168
    driver-class-name: com.mysql.cj.jdbc.Driver
    type: com.alibaba.druid.pool.DruidDataSource
  redis:
    #    database: 0
    host: localhost
    port: 6379
    password:
    timeout: 5000      # è¿žæŽ¥æ± ä¸­çš„æœ€å°ç©ºé—²è¿žæŽ¥
  jackson:
    time-zone: GMT+8
    date-format: yyyy-MM-dd HH:mm:ss
rocketmq:
  #  name-server: MQ_INST_1192607506254616_BYF2iMz7.cn-shanghai.mq-internal.aliyuncs.com:8080
  namesrvAddr: http://rmq-cn-pe335rcnn06.cn-shanghai.rmq.aliyuncs.com:8080
  accessKey: LTAI5tG5rPuqw1B48rgtY2Td
  secretKey: KvLOlSQXHpomOhxmMnbN7IVwJuEDI5
  groupId: GID-wakatest
  topic: waka-test
  instanceId: rmq-cn-pe335rcnn06
  namesrvAddr: rmq-cn-zxu364d2k0i.cn-shanghai.rmq.aliyuncs.com:8080
  groupId: doumeeGroup
  topic: doumeeTopic
  username: Onu5C13YO2wj1NUn
  password: xpQFFE0y543lB2a7
knife4j:
  enable: true
  basic:
    enable: true
    username: admin
    password: test@168.com
    password: 111111
debug_model: true
@@ -34,4 +44,23 @@
  description: ${project.name}接口文档
  enabled: true
  # ç¦ç”¨swagger时的重定向地址
  redirect-uri: /
  redirect-uri: /
########################微信支付相关配置########################
wx:
  pay:
    appId: wxcd2b89fd2ff065f8
    appSecret: 3462fa186da7cb06c544df8d8664b63a
    mchId: 1229817002
    mchKey: u4TSNtv0wFP7WRfnxBgijYOtRhS9FvlM
    notifyUrl: https://dmtest.ahapp.net/dmmall_interface/web/api/wxPayNotify
    keyPath: /usr/local/apiclient_cert.p12
tencent:
  map:
    remoteHost: https://apis.map.qq.com
    appKey: 3AYBZ-I5R3V-2BVP3-UWBDQ-ETBM5-B2BBQ
########################定时开启配置########################
timing: true
server/dmmall_web/src/main/resources/application.yml
@@ -70,7 +70,7 @@
    enabled: true
    mime-types: application/json
  port: 10014
  port: 12015
  tomcat:
    max-swallow-size: -1
  servlet:
server/startsh/admin_start.sh
@@ -5,7 +5,7 @@
redis-server &
/usr/local/nginx/sbin/nginx
nohup java -jar /usr/local/jars/dmmall/dmmall_admin_api.jar > /dev/null 2>&1 &
nohup java -jar /usr/local/jars/dingyuannongji/dmmall_admin_api.jar > /dev/null 2>&1 &
nohup java -jar /usr/local/jars/dmmall/dmmall_web_api.jar > /dev/null 2>&1 &