zhangle преди 8 месеца
родител
ревизия
cfe465896c

+ 4 - 4
crmeb_src/mer_java/crmeb-admin/src/main/resources/application-dev.yml

@@ -26,13 +26,13 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://127.0.0.1:3306/java_mer_trip?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8
-    username: java_mer_trip
-    password: 111111
+    url: jdbc:mysql://127.0.0.1:3306/crmeb_b2b2c_v2?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8&allowPublicKeyRetrieval=true
+    username: root
+    password: CTJG_86866666
   redis:
     host: 127.0.0.1 #地址
     port: 6379 #端口
-    password: 111111
+    password:
     timeout: 10000 # 连接超时时间(毫秒)
     database: 8 #默认数据库
     jedis:

+ 1 - 1
crmeb_src/mer_java/crmeb-admin/src/main/resources/application.yml

@@ -40,7 +40,7 @@ server:
 
 spring:
   profiles:
-    active:
+    active: dev
   servlet:
     multipart:
       max-file-size: 50MB #设置单个文件大小

+ 4 - 4
crmeb_src/mer_java/crmeb-front/src/main/resources/application-dev.yml

@@ -22,13 +22,13 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://127.0.0.1:3306/java_mer_trip?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8
-    username: java_mer_trip
-    password: 111111
+    url: jdbc:mysql://127.0.0.1:3306/crmeb_b2b2c_v2?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8&allowPublicKeyRetrieval=true
+    username: root
+    password: CTJG_86866666
   redis:
     host: 127.0.0.1 #地址
     port: 6379 #端口
-    password: 111111
+    password:
     timeout: 10000 # 连接超时时间(毫秒)
     database: 8 #默认数据库
     jedis:

+ 1 - 1
crmeb_src/mer_java/crmeb-front/src/main/resources/application.yml

@@ -41,7 +41,7 @@ server:
 
 spring:
   profiles:
-    active:
+    active: dev
   servlet:
     multipart:
       max-file-size: 50MB #设置单个文件大小

+ 1 - 1
crmeb_src/mer_mer_admin/.env.development

@@ -3,7 +3,7 @@ ENV = 'development'
 
 # base api
 # VUE_APP_BASE_API = '/dev-api'
-VUE_APP_BASE_API = 'http://127.0.0.1:8080'
+VUE_APP_BASE_API = 'http://127.0.0.1:20800'
 
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
 # to control whether the babel-plugin-dynamic-import-node plugin is enabled.

+ 1 - 1
crmeb_src/mer_plat_admin/.env.development

@@ -3,7 +3,7 @@ ENV = 'development'
 
 # base api
 # VUE_APP_BASE_API = '/dev-api'
-VUE_APP_BASE_API = 'http://127.0.0.1:8080'
+VUE_APP_BASE_API = 'http://127.0.0.1:20800'
 
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
 # to control whether the babel-plugin-dynamic-import-node plugin is enabled.

+ 1 - 1
crmeb_src/mer_uniapp/config/app.js

@@ -8,7 +8,7 @@
 // | Author: CRMEB Team <admin@crmeb.com>
 // +----------------------------------------------------------------------
 //移动端商城API 网络接口修改此配置,小程序域名要求https 例如:https://xxx
- let domain = 'http://127.0.0.1:8081'
+ let domain = 'http://127.0.0.1:20810'
 
 module.exports = {
 	// 请求域名 格式: https://您的域名