Merge branch 'master' of https://gitee.com/xuxiaowei-com-cn/crmeb_java into master-sun

# Conflicts:
#	crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/CrmebUtil.java

README.md

@@ -94,6 +94,10 @@ CRMEB开源商城PHP：https://gitee.com/ZhongBangKeJi/CRMEB
 WEBPC管理端：https://admin.java.crmeb.net<br>
 账号密码： demo/crmeb.com<br>
 
+自己搭建演示账号
+移动端 18292417675 / crmeb@123456
+管理端 admin / 123456
+
 ### 官方论坛
 产品BUG、优化建议，欢迎社区反馈：https://www.crmeb.com/ask/thread/list/152
 

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   need Nonbreaking Space Plugin
         init_instance_callback: editor => {
           if (_this.value) {

admin/src/views/login/index.vue

@@ -134,8 +134,8 @@ export default {
         }
       },
       loginForm: {
-        account: 'demo', // admin
+        account: 'admin', // admin
-        pwd: 'crmeb.com',
+        pwd: '123456',
         key: '',
         code: '',
         wxCode: ''
@@ -599,4 +599,4 @@ export default {
     right: 0;
     bottom: 6px;
   }
-</style>
+</style>

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,

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?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: crmeb
-    username: root
+    password: 111111
-    password: 123456
   redis:
     host: 127.0.0.1 #地址
     port: 6379 #端口
-    password: 123456
+    password: 111111
     timeout: 10000 # 连接超时时间（毫秒）
     database: 3 #默认数据库
     jedis:

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
+    url: jdbc:mysql://127.0.0.1:3306/crmeb?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8
-    username: root
+    username: crmeb
-    password: 123456
+    password: 111111
   redis:
     host: 127.0.0.1 #地址
     port: 6379 #端口
-    password: 123456
+    password: 111111
     timeout: 10000 # 连接超时时间（毫秒）
     database: 10 #默认数据库
     jedis:

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
+    url: jdbc:mysql://127.0.0.1:3306/crmeb?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8
-    username: root
+    username: crmeb
-    password: 123456
+    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的账号
+    username:  #访问swagger的账号
-    password: crmeb.com #访问swagger的密码
+    password:  #访问swagger的密码

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
+    url: jdbc:mysql://127.0.0.1:3306/crmeb?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8
-    username: crmeb_os
+    username: crmeb
-    password: cGEfaaRDbwd6cc2k
+    password: 111111
 
   redis:
-    host: 118.178.234.105 #地址
+    host: 127.0.0.1 #地址
     port: 6379 #端口
-    password: 1qazxsw2
+    password: 111111
     timeout: 30000 # 连接超时时间（毫秒）
     database: 15  #默认数据库
     jedis:

crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/CrmebUtil.java

@@ -127,6 +127,7 @@ public class CrmebUtil {
         // 原始数据：中国123ABCabc
         // 加密结果：5JNGj04iE/XUuTZM75zMrA==
         // 解密结果：中国123ABCabc
+        System.out.println(encryptPassword("crmeb@123456", "18292417675"));
     }
 
     /**

crmeb/crmeb-front/src/main/resources/application-prod.yml

@@ -51,5 +51,5 @@ swagger:
   basic:
     enable: true #是否开启界面
     check: true #是否打开验证
-    username: crmeb #访问swagger的账号
+    username:  #访问swagger的账号
-    password: crmeb.com #访问swagger的密码
+    password:  #访问swagger的密码

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
+    url: jdbc:mysql://127.0.0.1:3306/crmeb?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8
-    username: root
+    username: crmeb
-    password: 123456
+    password: 111111
   redis:
     host: 127.0.0.1 #地址
     port: 6379 #端口
-    password: 123456
+    password: 111111
     timeout: 30000 # 连接超时时间（毫秒）
     database: 3  #默认数据库
     jedis:

crmeb/pom.xml

@@ -45,7 +45,7 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
-            <version>1.2.56</version>
+            <version>1.2.83</version>
         </dependency>
 
         <!--添加 Alibaba 数据源-->

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
 -- ----------------------------

crmeb/sql/重置admin.sql

@@ -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 */;