From da264055500dbeb73c1dd97bb49d66d1cd7d64ba Mon Sep 17 00:00:00 2001
From: stivepeim <peimm126@126.com>
Date: Wed, 15 Mar 2023 18:02:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E6=95=B4=E6=BC=94=E7=A4=BA=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=20=E7=AE=A1=E7=90=86=E7=AB=AF=20admin=20/=20123456=20?=
 =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=2018292417675=20/=20crmeb@123456?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/components/Tinymce/index.vue        |   1 +
 admin/src/views/login/index.vue               |   6 +-
 app/config/app.js                             |   4 +-
 .../src/main/resources/application-beta.yml   |   9 ++-
 .../src/main/resources/application-dev.yml    |   8 +--
 .../src/main/resources/application-prod.yml   |  12 ++--
 .../src/main/resources/application.yml        |  13 ++--
 .../java/com/zbkj/common/utils/CrmebUtil.java |   4 +-
 .../src/main/resources/application-prod.yml   |   4 +-
 .../src/main/resources/application.yml        |   8 +--
 ...a967eb764d918f064744cc51dc70a6f2bj3sha.jpg | Bin 0 -> 8432 bytes
 crmeb/sql/Crmeb_1.3.4.sql                     |   4 +-
 crmeb/sql/重置admin.sql                       |  59 ------------------
 13 files changed, 37 insertions(+), 95 deletions(-)
 create mode 100644 crmeb/crmebimage/crmebimage/public/maintain/2023/02/23/1c0fa967eb764d918f064744cc51dc70a6f2bj3sha.jpg
 delete mode 100644 crmeb/sql/重置admin.sql

diff --git a/admin/src/components/Tinymce/index.vue b/admin/src/components/Tinymce/index.vue
index 2e6e8bba..d4e7a0d2 100644
--- a/admin/src/components/Tinymce/index.vue
+++ b/admin/src/components/Tinymce/index.vue
@@ -106,6 +106,7 @@ export default {
         imagetools_cors_hosts: ['www.tinymce.com', 'codepen.io'],
         default_link_target: '_blank',
         link_title: false,
+        convert_urls: false, //防止路径被转化为相对路径
         nonbreaking_force_tab: true, // inserting nonbreaking space &nbsp; need Nonbreaking Space Plugin
         init_instance_callback: editor => {
           if (_this.value) {
diff --git a/admin/src/views/login/index.vue b/admin/src/views/login/index.vue
index efc4ee8e..6333d936 100644
--- a/admin/src/views/login/index.vue
+++ b/admin/src/views/login/index.vue
@@ -134,8 +134,8 @@ export default {
         }
       },
       loginForm: {
-        account: 'demo', // admin
-        pwd: 'crmeb.com',
+        account: 'admin', // admin
+        pwd: '123456',
         key: '',
         code: '',
         wxCode: ''
@@ -599,4 +599,4 @@ export default {
     right: 0;
     bottom: 6px;
   }
-</style>
\ No newline at end of file
+</style>
diff --git a/app/config/app.js b/app/config/app.js
index 9614eac3..1991df11 100644
--- a/app/config/app.js
+++ b/app/config/app.js
@@ -1,12 +1,12 @@
 
-let domain = 'http://127.0.0.1:20101'
+let domain = 'http://127.0.0.1:8081'
 
 module.exports = {
 	// 请求域名 格式： https://您的域名
 	// #ifdef MP
 		HTTP_REQUEST_URL: domain,
 	// #endif
-	HTTP_ADMIN_URL:'xxx.xxx.xxx', //PC后台的API请求地址，上传图片用
+	HTTP_ADMIN_URL:'http://127.0.0.1:8080', //PC后台的API请求地址，上传图片用
 	// #ifdef H5
 		//H5接口是浏览器地址
 		// HTTP_REQUEST_URL: window.location.protocol+"//"+window.location.host,
diff --git a/crmeb/crmeb-admin/src/main/resources/application-beta.yml b/crmeb/crmeb-admin/src/main/resources/application-beta.yml
index c3ae0bd4..1dcdcb46 100644
--- a/crmeb/crmeb-admin/src/main/resources/application-beta.yml
+++ b/crmeb/crmeb-admin/src/main/resources/application-beta.yml
@@ -30,14 +30,13 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.jdbc.Driver
-#    url: jdbc:mysql://121.196.17.222:3306/crmeb_java_beta?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8
-    url: jdbc:mysql://127.0.0.1:3306/crmeb_java_beta?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8
-    username: root
-    password: 123456
+    url: jdbc:mysql://127.0.0.1:3306/crmeb?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8
+    username: crmeb
+    password: 111111
   redis:
     host: 127.0.0.1 #地址
     port: 6379 #端口
-    password: 123456
+    password: 111111
     timeout: 10000 # 连接超时时间（毫秒）
     database: 3 #默认数据库
     jedis:
diff --git a/crmeb/crmeb-admin/src/main/resources/application-dev.yml b/crmeb/crmeb-admin/src/main/resources/application-dev.yml
index fc138548..0e193937 100644
--- a/crmeb/crmeb-admin/src/main/resources/application-dev.yml
+++ b/crmeb/crmeb-admin/src/main/resources/application-dev.yml
@@ -24,13 +24,13 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://127.0.0.1:3306/crmeb_java_dev?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8
-    username: root
-    password: 123456
+    url: jdbc:mysql://127.0.0.1:3306/crmeb?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8
+    username: crmeb
+    password: 111111
   redis:
     host: 127.0.0.1 #地址
     port: 6379 #端口
-    password: 123456
+    password: 111111
     timeout: 10000 # 连接超时时间（毫秒）
     database: 10 #默认数据库
     jedis:
diff --git a/crmeb/crmeb-admin/src/main/resources/application-prod.yml b/crmeb/crmeb-admin/src/main/resources/application-prod.yml
index c969c314..6ce0f40c 100644
--- a/crmeb/crmeb-admin/src/main/resources/application-prod.yml
+++ b/crmeb/crmeb-admin/src/main/resources/application-prod.yml
@@ -24,13 +24,13 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://127.0.0.1:3306/crmeb_java?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8
-    username: root
-    password: 123456
+    url: jdbc:mysql://127.0.0.1:3306/crmeb?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8
+    username: crmeb
+    password: 1111111
   redis:
     host: 127.0.0.1 #地址
     port: 6379 #端口
-    password: 123456
+    password: 111111
     timeout: 10000 # 连接超时时间（毫秒）
     database: 15 #默认数据库
     jedis:
@@ -62,5 +62,5 @@ swagger:
   basic:
     enable: true #是否开启界面
     check: true #是否打开验证
-    username: crmeb #访问swagger的账号
-    password: crmeb.com #访问swagger的密码
+    username:  #访问swagger的账号
+    password:  #访问swagger的密码
diff --git a/crmeb/crmeb-admin/src/main/resources/application.yml b/crmeb/crmeb-admin/src/main/resources/application.yml
index b523daec..f3f9eb52 100644
--- a/crmeb/crmeb-admin/src/main/resources/application.yml
+++ b/crmeb/crmeb-admin/src/main/resources/application.yml
@@ -7,7 +7,7 @@ crmeb:
   wechat-js-api-beta: true #微信js api是否是beta版本
   asyncConfig: false #是否同步config表数据到redis
   asyncWeChatProgramTempList: false #是否同步小程序公共模板库
-  imagePath: /Users/stivepeim/Documents/ZBKJ/OpenSource/CRMEBJava/crmeb/crmebimage/ # 服务器图片路径配置 斜杠结尾
+  imagePath: /当前项目更根目录的素材文件(绝对路径)/crmebimage/ # 服务器图片路径配置 斜杠结尾
   database: mysql
 
 # 配置端口
@@ -23,7 +23,6 @@ server:
 spring:
   profiles:
   #  配置的环境
-#    active: #spring.profiles.active#
     active:
   servlet:
     multipart:
@@ -39,14 +38,14 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://118.178.234.105:3306/crmeb_os?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8
-    username: crmeb_os
-    password: cGEfaaRDbwd6cc2k
+    url: jdbc:mysql://127.0.0.1:3306/crmeb?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8
+    username: crmeb
+    password: 111111
 
   redis:
-    host: 118.178.234.105 #地址
+    host: 127.0.0.1 #地址
     port: 6379 #端口
-    password: 1qazxsw2
+    password: 111111
     timeout: 30000 # 连接超时时间（毫秒）
     database: 15  #默认数据库
     jedis:
diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/CrmebUtil.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/CrmebUtil.java
index 8d04e596..12bda7c5 100644
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/CrmebUtil.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/CrmebUtil.java
@@ -134,8 +134,8 @@ public class CrmebUtil {
      * @param args String[] 字符串数组
      */
     public static void main(String[] args) throws Exception {
-//        System.out.println(encryptPassword("123456", "admin"));
-		System.out.println(decryptPassowrd("", ""));
+        System.out.println(encryptPassword("crmeb@123456", "18292417675"));
+//		System.out.println(decryptPassowrd("Ffg0LtOQNyWU1//Y16+72A==", "18292417675"));
     }
 
     /**
diff --git a/crmeb/crmeb-front/src/main/resources/application-prod.yml b/crmeb/crmeb-front/src/main/resources/application-prod.yml
index 66f6f1ad..f6ebde4d 100644
--- a/crmeb/crmeb-front/src/main/resources/application-prod.yml
+++ b/crmeb/crmeb-front/src/main/resources/application-prod.yml
@@ -51,5 +51,5 @@ swagger:
   basic:
     enable: true #是否开启界面
     check: true #是否打开验证
-    username: crmeb #访问swagger的账号
-    password: crmeb.com #访问swagger的密码
+    username:  #访问swagger的账号
+    password:  #访问swagger的密码
diff --git a/crmeb/crmeb-front/src/main/resources/application.yml b/crmeb/crmeb-front/src/main/resources/application.yml
index 69935d9e..318ba73f 100644
--- a/crmeb/crmeb-front/src/main/resources/application.yml
+++ b/crmeb/crmeb-front/src/main/resources/application.yml
@@ -33,13 +33,13 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://127.0.0.1:3306/crmeb_java_beta?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8
-    username: root
-    password: 123456
+    url: jdbc:mysql://127.0.0.1:3306/crmeb?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8
+    username: crmeb
+    password: 111111
   redis:
     host: 127.0.0.1 #地址
     port: 6379 #端口
-    password: 123456
+    password: 111111
     timeout: 30000 # 连接超时时间（毫秒）
     database: 3  #默认数据库
     jedis:
diff --git a/crmeb/crmebimage/crmebimage/public/maintain/2023/02/23/1c0fa967eb764d918f064744cc51dc70a6f2bj3sha.jpg b/crmeb/crmebimage/crmebimage/public/maintain/2023/02/23/1c0fa967eb764d918f064744cc51dc70a6f2bj3sha.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..00239a7773d693cd210386e439fa6afd37c2ca77
GIT binary patch
literal 8432
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

literal 0
HcmV?d00001

diff --git a/crmeb/sql/Crmeb_1.3.4.sql b/crmeb/sql/Crmeb_1.3.4.sql
index e5873804..ffdad377 100644
--- a/crmeb/sql/Crmeb_1.3.4.sql
+++ b/crmeb/sql/Crmeb_1.3.4.sql
@@ -1,6 +1,7 @@
 /**
     默认账号
-    admin / 123456
+    管理端：admin / 123456
+    商城端：18292417675 / crmeb@123456
 */
 SET NAMES utf8mb4;
 SET FOREIGN_KEY_CHECKS = 0;
@@ -8644,6 +8645,7 @@ CREATE TABLE `eb_user`  (
   INDEX `is_promoter`(`is_promoter`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户表' ROW_FORMAT = Dynamic;
 
+INSERT INTO `eb_user` VALUES (1, '18292417675', 'f6mcpGQ8NEmwbab2TlkpUg==', '', '', '', '', NULL, '', '', '大粽子', 'crmebimage/public/maintain/2023/02/23/1c0fa967eb764d918f064744cc51dc70a6f2bj3sha.jpg', '18292417675', '', '', 0.00, 0.00, 0, 0, 0, 1, 0, 0, NULL, '', 0, 0, 0, '', 0, '', '2023-03-15 17:41:12', '2023-03-15 17:48:11', '2023-03-15 17:42:44', NULL, '/0/', 0, NULL, 1, 'CN', NULL);
 -- ----------------------------
 -- Table structure for eb_user_address
 -- ----------------------------
diff --git a/crmeb/sql/重置admin.sql b/crmeb/sql/重置admin.sql
deleted file mode 100644
index a6e2c0c0..00000000
--- a/crmeb/sql/重置admin.sql
+++ /dev/null
@@ -1,59 +0,0 @@
-# ************************************************************
-# 重置admin    admin / 123456
-# 重置demo     demo / crmeb.com
-# ************************************************************
-
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-
-
-# Dump of table eb_system_admin
-# ------------------------------------------------------------
-
-DROP TABLE IF EXISTS `eb_system_admin`;
-
-CREATE TABLE `eb_system_admin` (
-  `id` smallint(5) unsigned NOT NULL AUTO_INCREMENT COMMENT '后台管理员表ID',
-  `account` varchar(32) NOT NULL COMMENT '后台管理员账号',
-  `pwd` char(32) NOT NULL COMMENT '后台管理员密码',
-  `real_name` varchar(16) NOT NULL COMMENT '后台管理员姓名',
-  `roles` varchar(128) NOT NULL COMMENT '后台管理员权限(menus_id)',
-  `last_ip` varchar(16) DEFAULT NULL COMMENT '后台管理员最后一次登录ip',
-  `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '后台管理员最后一次登录时间',
-  `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '后台管理员添加时间',
-  `login_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '登录次数',
-  `level` tinyint(3) unsigned NOT NULL DEFAULT '1' COMMENT '后台管理员级别',
-  `status` tinyint(1) unsigned NOT NULL DEFAULT '1' COMMENT '后台管理员状态 1有效0无效',
-  `is_del` tinyint(1) unsigned NOT NULL DEFAULT '0',
-  `phone` varchar(15) DEFAULT NULL COMMENT '手机号码',
-  `is_sms` tinyint(1) unsigned DEFAULT '0' COMMENT '是否接收短信',
-  PRIMARY KEY (`id`) USING BTREE,
-  KEY `account` (`account`) USING BTREE,
-  KEY `status` (`status`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='后台管理员表';
-
-LOCK TABLES `eb_system_admin` WRITE;
-/*!40000 ALTER TABLE `eb_system_admin` DISABLE KEYS */;
-
-INSERT INTO `eb_system_admin` (`id`, `account`, `pwd`, `real_name`, `roles`, `last_ip`, `update_time`, `create_time`, `login_count`, `level`, `status`, `is_del`, `phone`, `is_sms`)
-VALUES
-	(1,'admin','L8qdg72wbeQ=','admin','1','111.19.94.179','2021-03-09 22:39:20','2020-08-17 17:48:58',1317,0,1,0,'18292417675',0),
-	(36,'demo','Rb/KmlSjAxI=','普通','3','60.210.126.252','2021-02-04 11:23:03','2021-02-04 11:23:03',2,1,1,0,NULL,0);
-
-/*!40000 ALTER TABLE `eb_system_admin` ENABLE KEYS */;
-UNLOCK TABLES;
-
-
-
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;