From 13c6892c31496e7e9ac76ca439a09d405834ecfb Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sun, 11 Oct 2020 16:47:37 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin_manage.git
---
src/main/java/com/xcong/excoin/modules/Sms106Send.java | 4 +-
src/main/resources/templates/error/403.html | 2
src/main/resources/templates/febs/views/index.html | 3 -
.gitignore | 2 +
src/main/resources/templates/index.html | 2
src/main/resources/templates/error/404.html | 2
src/main/resources/application-prod.yml | 14 +++---
src/main/resources/templates/error/500.html | 2
src/main/resources/templates/febs/views/modules/member/memberDetail.html | 10 ++--
src/main/resources/templates/febs/views/layout.html | 2
src/main/resources/templates/febs/views/login.html | 20 +++++-----
11 files changed, 31 insertions(+), 32 deletions(-)
diff --git a/.gitignore b/.gitignore
index d472d37..7a94c4a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,8 @@
*.iml
*.ipr
+.DS_Store
+
.mvn
mvnw
mvnw.cmd
diff --git a/src/main/java/com/xcong/excoin/modules/Sms106Send.java b/src/main/java/com/xcong/excoin/modules/Sms106Send.java
index a213e6b..c2f60bf 100644
--- a/src/main/java/com/xcong/excoin/modules/Sms106Send.java
+++ b/src/main/java/com/xcong/excoin/modules/Sms106Send.java
@@ -16,8 +16,8 @@
public class Sms106Send {
private static final String URL = "http://www.qf106.com/sms.aspx";
- private static final String ID = "16580";
- private static final String ACCOUNT = "Biue";
+ private static final String ID = "16615";
+ private static final String ACCOUNT = "hibit";
private static final String PASSWORD = "123456";
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/templates/error/403.html b/src/main/resources/templates/error/403.html
index 09a5349..42398f7 100644
--- a/src/main/resources/templates/error/403.html
+++ b/src/main/resources/templates/error/403.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">
diff --git a/src/main/resources/templates/error/404.html b/src/main/resources/templates/error/404.html
index 9593794..076d628 100644
--- a/src/main/resources/templates/error/404.html
+++ b/src/main/resources/templates/error/404.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">
diff --git a/src/main/resources/templates/error/500.html b/src/main/resources/templates/error/500.html
index 9496dbc..95a555c 100644
--- a/src/main/resources/templates/error/500.html
+++ b/src/main/resources/templates/error/500.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">
diff --git a/src/main/resources/templates/febs/views/index.html b/src/main/resources/templates/febs/views/index.html
index b47aa0d..04dd885 100644
--- a/src/main/resources/templates/febs/views/index.html
+++ b/src/main/resources/templates/febs/views/index.html
@@ -138,9 +138,6 @@
var time = hour < 6 ? '早上好' : (hour <= 11 ? '上午好' : (hour <= 13 ? '中午好' : (hour <= 18 ? '下午好' : '晚上好')));
var welcomeArr = [
'喝杯咖啡休息下吧☕',
- '要不要和朋友打局LOL',
- '今天又写了几个Bug呢',
- '今天在群里吹水了吗',
'今天吃了什么好吃的呢',
'今天您微笑了吗😊',
'今天帮助别人了吗',
diff --git a/src/main/resources/templates/febs/views/layout.html b/src/main/resources/templates/febs/views/layout.html
index 82bcbfa..c2a0266 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 bcd2fc0..89928ab 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">
@@ -91,14 +91,14 @@
<input type="password" name="passwordB" lay-verify="required"
placeholder="密码确认" autocomplete="off" class="layui-input">
</div>
- <div class="layui-form-item">
- <button class="layui-btn layui-btn-normal layui-btn-fluid" lay-submit
- lay-filter="regist-submit" id="regist">
- <i style="display: none"
- class="layui-icon layui-icon-loading layui-icon layui-anim layui-anim-rotate layui-anim-loop"></i>
- 立即注册
- </button>
- </div>
+<!-- <div class="layui-form-item">-->
+<!-- <button class="layui-btn layui-btn-normal layui-btn-fluid" lay-submit-->
+<!-- lay-filter="regist-submit" id="regist">-->
+<!-- <i style="display: none"-->
+<!-- class="layui-icon layui-icon-loading layui-icon layui-anim layui-anim-rotate layui-anim-loop"></i>-->
+<!-- 立即注册-->
+<!-- </button>-->
+<!-- </div>-->
</div>
</div>
<div class="layui-form-item febs-tr">
diff --git a/src/main/resources/templates/febs/views/modules/member/memberDetail.html b/src/main/resources/templates/febs/views/modules/member/memberDetail.html
index 2e2c478..d68a5a1 100644
--- a/src/main/resources/templates/febs/views/modules/member/memberDetail.html
+++ b/src/main/resources/templates/febs/views/modules/member/memberDetail.html
@@ -29,35 +29,35 @@
<label class="layui-form-label febs-form-item-require">真实姓名：</label>
<div class="layui-input-block">
<input type="text" name="realName" minlength="4" maxlength="10" data-th-id="${member.realName}"
- lay-verify="range|realName" autocomplete="off" class="layui-input" readonly>
+ autocomplete="off" class="layui-input" readonly>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label febs-form-item-require">姓：</label>
<div class="layui-input-block">
<input type="text" name="firstName" minlength="4" maxlength="10" data-th-id="${member.firstName}"
- lay-verify="range|firstName" autocomplete="off" class="layui-input" readonly>
+ autocomplete="off" class="layui-input" readonly>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label febs-form-item-require">名：</label>
<div class="layui-input-block">
<input type="text" name="secondName" minlength="4" maxlength="10" data-th-id="${member.secondName}"
- lay-verify="range|secondName" autocomplete="off" class="layui-input" readonly>
+ autocomplete="off" class="layui-input" readonly>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label febs-form-item-require">国家：</label>
<div class="layui-input-block">
<input type="text" name="nation" minlength="4" maxlength="10" data-th-id="${member.nation}"
- lay-verify="range|nation" autocomplete="off" class="layui-input" readonly>
+ autocomplete="off" class="layui-input" readonly>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label febs-form-item-require">身份证号：</label>
<div class="layui-input-block">
<input type="text" name="idcardNo" minlength="4" maxlength="10" data-th-id="${member.idcardNo}"
- lay-verify="range|idcardNo" autocomplete="off" class="layui-input" readonly>
+ autocomplete="off" class="layui-input" readonly>
</div>
</div>
<div class="layui-form-item">
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index 91ebb2c..a6aec71 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