From ec74f248ddac773a6024a243a37346bd2e9bb028 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Thu, 15 Oct 2020 23:46:09 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin_agent
---
/dev/null | 0
src/main/resources/templates/index.html | 2 +-
src/main/resources/logback-spring.xml | 2 +-
src/main/java/com/xcong/excoin/system/entity/User.java | 2 +-
src/main/resources/application-dev.yml | 2 +-
src/main/resources/application-prod.yml | 14 +++++++-------
src/main/resources/mapper/modules/MemberMapper.xml | 4 ++--
src/main/resources/templates/febs/views/modules/agent/agentAdd.html | 2 +-
src/main/resources/templates/febs/views/layout.html | 2 +-
src/main/resources/templates/febs/views/login.html | 4 ++--
10 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/system/entity/User.java b/src/main/java/com/xcong/excoin/system/entity/User.java
index 2b2c1c7..5584046 100644
--- a/src/main/java/com/xcong/excoin/system/entity/User.java
+++ b/src/main/java/com/xcong/excoin/system/entity/User.java
@@ -45,7 +45,7 @@
/**
* 默认密码
*/
- public static final String DEFAULT_PASSWORD = "1234qwer";
+ public static final String DEFAULT_PASSWORD = "hibit123";
/**
* 性别男
*/
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index e5a60b3..0000373 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -22,7 +22,7 @@
username: ctcoin_data
password: ctcoin_123
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://rm-bp151tw8er79ig9kb5o.mysql.rds.aliyuncs.com:3306/db_biue?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
+ url: jdbc:mysql://rm-bp151tw8er79ig9kb5o.mysql.rds.aliyuncs.com:3306/db_hibit?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
redis:
# Redis数据库索引（默认为 0）
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 0b1c337..08a49c7 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -18,17 +18,17 @@
username: ctcoin_data
password: ctcoin_123
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://rm-bp151tw8er79ig9kb5o.mysql.rds.aliyuncs.com:3306/db_biue?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
+ url: jdbc:mysql://rm-bp151tw8er79ig9kb5o.mysql.rds.aliyuncs.com:3306/db_hibit?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
redis:
# Redis数据库索引（默认为 0）
- database: 2
- # Redis服务器地址
- host: 47.114.114.219
- # Redis服务器连接端口
+ database: 1
+ ## Redis服务器地址
+ host: 114.55.92.106
+ ## Redis服务器连接端口
port: 6379
- # Redis 密码
- password: biyi123
+ ## Redis服务器连接密码（默认为空）
+ password: hibit123
lettuce:
pool:
# 连接池中的最小空闲连接
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index 2892dbe..9ff1b79 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration scan="true" scanPeriod="60 seconds" debug="false">
<contextName>febs</contextName>
- <property name="log.path" value="biue/logs" />
+ <property name="log.path" value="hibit/logs" />
<property name="log.maxHistory" value="15" />
<property name="log.colorPattern" value="%magenta(%d{yyyy-MM-dd HH:mm:ss}) %highlight(%-5level) %yellow(%thread) %green(%logger) %msg%n"/>
<property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss} %-5level %thread %logger %msg%n"/>
diff --git a/src/main/resources/mapper/modules/MemberMapper.xml b/src/main/resources/mapper/modules/MemberMapper.xml
index cd8de9b..6a6c7e1 100644
--- a/src/main/resources/mapper/modules/MemberMapper.xml
+++ b/src/main/resources/mapper/modules/MemberMapper.xml
@@ -11,7 +11,7 @@
c.available_balance coinTotal,
d.total_balance agentTotal
from member a
- left join member_wallet_contract b on a.id=b.member_id
+ left join (select member_id, sum(total_balance) total_balance from member_wallet_contract group by member_id) b on a.id=b.member_id
left join member_wallet_coin c on a.id=c.member_id and c.wallet_code='USDT'
left join member_wallet_agent d on a.id=d.member_id
left join member_authentication e on a.id=e.member_id
@@ -92,7 +92,7 @@
c.available_balance coinTotal,
d.total_balance agentTotal
from member a
- left join member_wallet_contract b on a.id=b.member_id
+ left join (select member_id, sum(total_balance) total_balance from member_wallet_contract group by member_id) b on a.id=b.member_id
left join member_wallet_coin c on a.id=c.member_id and c.wallet_code='USDT'
left join member_wallet_agent d on a.id=d.member_id
left join member_authentication e on a.id=e.member_id
diff --git a/src/main/resources/static/febs/images/favicon.ico b/src/main/resources/static/febs/images/favicon.ico
deleted file mode 100755
index 9d015cd..0000000
--- a/src/main/resources/static/febs/images/favicon.ico
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/templates/febs/views/layout.html b/src/main/resources/templates/febs/views/layout.html
index 0e6f89f..0473bb9 100644
--- a/src/main/resources/templates/febs/views/layout.html
+++ b/src/main/resources/templates/febs/views/layout.html
@@ -63,7 +63,7 @@
<div class="layui-side-scroll">
<div class="layui-logo" style="cursor: pointer">
<img data-th-src="@{febs/images/logo.png}">
- <span>Biue 代理系统</span>
+ <span>Hibit 代理系统</span>
</div>
<script
type="text/html"
diff --git a/src/main/resources/templates/febs/views/login.html b/src/main/resources/templates/febs/views/login.html
index 4e5d969..b685ba3 100644
--- a/src/main/resources/templates/febs/views/login.html
+++ b/src/main/resources/templates/febs/views/login.html
@@ -2,7 +2,7 @@
<html xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="utf-8">
- <title>Biue 代理系统</title>
+ <title>Hibit 代理系统</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
@@ -19,7 +19,7 @@
<div class="layui-container">
<div class="layui-row">
<div class="layui-col-xs12 layui-col-lg4 layui-col-lg-offset4 febs-tc">
- <div class="layui-logo"><span><b>Biue</b> 代理系统</span></div>
+ <div class="layui-logo"><span><b>Hibit</b> 代理系统</span></div>
</div>
<div class="layui-col-xs12 layui-col-lg4 layui-col-lg-offset4" id="login-div">
<div class="layui-form" lay-filter="login-form">
diff --git a/src/main/resources/templates/febs/views/modules/agent/agentAdd.html b/src/main/resources/templates/febs/views/modules/agent/agentAdd.html
index b2ecc14..a9edfe1 100644
--- a/src/main/resources/templates/febs/views/modules/agent/agentAdd.html
+++ b/src/main/resources/templates/febs/views/modules/agent/agentAdd.html
@@ -68,7 +68,7 @@
form.on('submit(user-add-form-submit)', function (data) {
febs.post(ctx + 'agent/add', data.field, function () {
layer.closeAll();
- febs.alert.success('新增用户成功，初始密码为 1234qwer');
+ febs.alert.success('新增用户成功，初始密码为 hibit123');
$('#febs-user').find('#query').click();
});
return false;
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index 677320c..cc2a9b2 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -3,7 +3,7 @@
xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
<meta charset="utf-8">
- <title>Biue 代理系统</title>
+ <title>Hibit 代理系统</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
--
Gitblit v1.9.1