exchange-back.git

parent: cbaf6ac2 | patch | commit | ignore whitespace

zainali5120

2020-10-01 16d7f301fc9a61fe84064f15f5f1ae28f1cb44ea

cpv分支

9 files modified

	pom.xml	4 ●●●●● patch \| view \| raw \| blame \| history
	src/main/resources/application-prod.yml	10 ●●●●● patch \| view \| raw \| blame \| history
	src/main/resources/templates/error/403.html	2 ●●●●● patch \| view \| raw \| blame \| history
	src/main/resources/templates/error/404.html	2 ●●●●● patch \| view \| raw \| blame \| history
	src/main/resources/templates/error/500.html	2 ●●●●● patch \| view \| raw \| blame \| history
	src/main/resources/templates/febs/views/layout.html	2 ●●●●● patch \| view \| raw \| blame \| history
	src/main/resources/templates/febs/views/login.html	4 ●●●●● patch \| view \| raw \| blame \| history
	src/main/resources/templates/febs/views/modules/member/member.html	4 ●●●●● patch \| view \| raw \| blame \| history
	src/main/resources/templates/index.html	2 ●●●●● patch \| view \| raw \| blame \| history

 pom.xml

@@ -3,9 +3,9 @@
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <groupId>com.xcong</groupId>
    <artifactId>excoin-back</artifactId>
    <artifactId>hanbei-back</artifactId>
    <version>1.0</version>
    <name>golden-back</name>
    <name>hanbei-back</name>
    <description>coin back manage</description>

    <parent>

 src/main/resources/application-prod.yml

@@ -15,20 +15,20 @@
      datasource:
        # 数据源-1，名称为 base
        base:
          username: roc_user
          password: roc123pasd!@
          username: cpv_user
          password: cpv123456
          driver-class-name: com.mysql.cj.jdbc.Driver
          url: jdbc:mysql://47.114.114.219:3306/db_roc?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
          url: jdbc:mysql://121.196.181.91:3306/db_cpv?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8

  redis:
    # Redis数据库索引（默认为 0）
    database: 1
    # Redis服务器地址
    host: 47.114.114.219
    host: 121.196.181.91
    # Redis服务器连接端口
    port: 6379
    # Redis 密码
    password: biyi123
    password: cpv1qaz!@#
    lettuce:
      pool:
        # 连接池中的最小空闲连接

 src/main/resources/templates/error/403.html

@@ -2,7 +2,7 @@
<html xmlns:th="http://www.thymeleaf.org">

<head>

    <meta charset="utf-8">

    <title>GoldenFlame 后台系统</title>

    <title>HanBei 后台系统</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">


 src/main/resources/templates/error/404.html

@@ -2,7 +2,7 @@
<html xmlns:th="http://www.thymeleaf.org">

<head>

    <meta charset="utf-8">

    <title>GoldenFlame 后台系统</title>

    <title>HanBei 后台系统</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">


 src/main/resources/templates/error/500.html

@@ -2,7 +2,7 @@
<html xmlns:th="http://www.thymeleaf.org">

<head>

    <meta charset="utf-8">

    <title>GoldenFlame 后台系统</title>

    <title>HanBei 后台系统</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">


 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>GoldenFlame 管理系统</span>

                <span>HanBei 管理系统</span>

            </div>

            <script

                    type="text/html"


 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>GoldenFlame 后台系统</title>
    <title>HanBei 后台系统</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>GoldenFlame</b> 后台系统</span></div>
                    <div class="layui-logo"><span><b>HanBei</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">

 src/main/resources/templates/febs/views/modules/member/member.html

@@ -176,13 +176,9 @@
                            if (d.certifyStatus === 1) {

                                return '<a lay-event="edit" shiro:hasPermission="user:update">审核认证</a>'

                                +'<i class="layui-icon febs-edit-area febs-blue">&#xe7a4;</i>'

                                +'<a lay-event="addCoin" shiro:hasPermission="user:update">拨币</a>'

                            }else if(d.certifyStatus === 2){

                                return '<a lay-event="see" shiro:hasPermission="user:update">'

                                +'<i class="layui-icon febs-edit-area febs-blue">&#xe7a5;</i></a>'

                                +'<a lay-event="addCoin" shiro:hasPermission="user:update">拨币</a>'

                            }else {

                                return '<a lay-event="addCoin" shiro:hasPermission="user:update">拨币</a>'

                            }

                        },minWidth: 200,align:'center'}

                ]]


 src/main/resources/templates/index.html

@@ -3,7 +3,7 @@
      xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
    <meta charset="utf-8">
    <title>GoldenFlame 后台系统</title>
    <title>HanBei 后台系统</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">

			@@ -3,9 +3,9 @@
			xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
			<modelVersion>4.0.0</modelVersion>
			<groupId>com.xcong</groupId>
			<artifactId>excoin-back</artifactId>
			<artifactId>hanbei-back</artifactId>
			<version>1.0</version>
			<name>golden-back</name>
			<name>hanbei-back</name>
			<description>coin back manage</description>

			<parent>

			@@ -15,20 +15,20 @@
			datasource:
			# 数据源-1，名称为 base
			base:
			username: roc_user
			password: roc123pasd!@
			username: cpv_user
			password: cpv123456
			driver-class-name: com.mysql.cj.jdbc.Driver
			url: jdbc:mysql://47.114.114.219:3306/db_roc?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
			url: jdbc:mysql://121.196.181.91:3306/db_cpv?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8

			redis:
			# Redis数据库索引（默认为 0）
			database: 1
			# Redis服务器地址
			host: 47.114.114.219
			host: 121.196.181.91
			# Redis服务器连接端口
			port: 6379
			# Redis 密码
			password: biyi123
			password: cpv1qaz!@#
			lettuce:
			pool:
			# 连接池中的最小空闲连接

			@@ -2,7 +2,7 @@
			<html xmlns:th="http://www.thymeleaf.org">
			<head>
			<meta charset="utf-8">
			<title>GoldenFlame 后台系统</title>
			<title>HanBei 后台系统</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">

			@@ -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>GoldenFlame 管理系统</span>
			<span>HanBei 管理系统</span>
			</div>
			<script
			type="text/html"

			@@ -176,13 +176,9 @@
			if (d.certifyStatus === 1) {
			return '<a lay-event="edit" shiro:hasPermission="user:update">审核认证</a>'
			+'<i class="layui-icon febs-edit-area febs-blue"></i>'
			+'<a lay-event="addCoin" shiro:hasPermission="user:update">拨币</a>'
			}else if(d.certifyStatus === 2){
			return '<a lay-event="see" shiro:hasPermission="user:update">'
			+'<i class="layui-icon febs-edit-area febs-blue"></i></a>'
			+'<a lay-event="addCoin" shiro:hasPermission="user:update">拨币</a>'
			}else {
			return '<a lay-event="addCoin" shiro:hasPermission="user:update">拨币</a>'
			}
			},minWidth: 200,align:'center'}
			]]

			@@ -3,7 +3,7 @@
			xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
			<head>
			<meta charset="utf-8">
			<title>GoldenFlame 后台系统</title>
			<title>HanBei 后台系统</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">