用户最后登陆时间

src/main/java/cn/quantgroup/cashloanflowboss/api/login/service/LoginServiceImpl.java

@@ -79,9 +79,12 @@ public class LoginServiceImpl implements LoginService {
         session.setAttribute(ApplicationDictionary.USER_SESSION_LOGIN_TIME, currentTimeMillis);
         // session登陆时间，毫秒值
         // 用户登陆时间，毫秒值
-
         loginInfo.put(userInfo.getUserId() + "", currentTimeMillis);
 
+        // 保存用户最后登陆时间
+        user.setLastLoginTime(new Date());
+        userService.updateUser(user);
+
         return session.getId();
 
     }

src/main/java/cn/quantgroup/cashloanflowboss/core/init/BossInit.java → src/main/java/cn/quantgroup/cashloanflowboss/core/init/BossDataBaseInit.java

 package cn.quantgroup.cashloanflowboss.core.init;
 
 
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.taskdefs.SQLExec;
-import org.apache.tools.ant.types.EnumeratedAttribute;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
-import org.springframework.util.ResourceUtils;
-
-import java.io.File;
 
 /**
  * function:
@@ -18,7 +12,7 @@ import java.io.File;
  * @author: suntao
  */
 @Component
-public class BossInit implements CommandLineRunner {
+public class BossDataBaseInit implements CommandLineRunner {
 
     @Value("${data.boss.url}")
     private String url;

src/main/java/cn/quantgroup/cashloanflowboss/spi/apollo/service/ApolloSettingServiceImpl.java

 package cn.quantgroup.cashloanflowboss.spi.apollo.service;
 
 import cn.quantgroup.cashloanflowboss.spi.util.HttpService;
-import cn.quantgroup.cashloanflowboss.utils.JSONTools;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.MapUtils;
 import org.apache.commons.collections.map.HashedMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
-
-import javax.annotation.Resource;
 import java.util.HashMap;
 import java.util.Map;
 

src/main/resources/sql/cash_loan_flow_boss_setting_2019-10-22.sql → src/main/resources/sql/bak/base_data_bak.sql

-# ************************************************************
-# Sequel Pro SQL dump
-# Version 5129
-#
-# https://www.sequelpro.com/
-# https://github.com/sequelpro/sequelpro
-#
-# Host: 172.17.5.17 (MySQL 5.6.43-log)
-# Database: cash_loan_flow_boss
-# Generation Time: 2019-10-22 10:44:24 +0000
-# ************************************************************
-
-
-/*!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 */;
-SET NAMES utf8mb4;
-/*!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 */;
+CREATE DATABASE IF NOT EXISTS cash_loan_flow_boss CHARACTER SET utf8 COLLATE utf8_general_ci;
+
+use cash_loan_flow_boss;
+
+CREATE TABLE IF NOT EXISTS  `channel_conf` (
+  `id` bigint(64) NOT NULL AUTO_INCREMENT COMMENT '物理主键',
+  `channel_id` bigint(8) DEFAULT NULL COMMENT '量化派对渠道标记；渠道号',
+  `channel_code` varchar(32) DEFAULT '' COMMENT '渠道code',
+  `channel_name` varchar(32) DEFAULT '' COMMENT '渠道code',
+  `env` varchar(64) DEFAULT '' COMMENT '测试环境',
+  `fund_id` bigint(32) DEFAULT NULL COMMENT '资方id',
+  `p2p_fund_id` bigint(32) DEFAULT NULL COMMENT '存管资方id',
+  `biz_type` bigint(32) DEFAULT NULL COMMENT '业务产品类型productId',
+  `aes_key` varchar(64) DEFAULT NULL COMMENT 'aesKey',
+  `md5_key` varchar(64) DEFAULT NULL COMMENT 'md5Key',
+  `auth_code` varchar(64) DEFAULT NULL COMMENT '提交授信code',
+  `risk_code` varchar(64) DEFAULT NULL COMMENT '提交爬虫数据code',
+  `env_path` varchar(64) DEFAULT NULL COMMENT '环境域名',
+  `channel_ip` varchar(64) DEFAULT NULL COMMENT '渠道ip',
+  `approve_call_back_url` varchar(256) DEFAULT NULL COMMENT '审批回调地址',
+  `order_status_call_back_url` varchar(256) DEFAULT NULL COMMENT '订单状态回调地址',
+  `repay_result_call_back_url` varchar(256) DEFAULT NULL COMMENT '还款结果回调地址',
+  `repayment_plan_call_back_url` varchar(256) DEFAULT NULL COMMENT '还款计划回调地址',
+  `message` text,
+  `extend_data` text COMMENT '扩展信息',
+  `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `idx_channel_id` (`channel_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='渠道配置表';
+
+
+
+# table opt_history_log
+# ------------------------------------------------------------
+
+
+CREATE TABLE IF NOT EXISTS `opt_history_log` (
+  `id` int(20) NOT NULL AUTO_INCREMENT COMMENT 'ID',
+  `channel_order_number` varchar(64) DEFAULT NULL COMMENT '渠道订单号',
+  `credit_number` varchar(64) DEFAULT NULL COMMENT '授信订单号',
+  `loan_id` bigint(32) DEFAULT NULL COMMENT '提现单号',
+  `channel_id` bigint(32) DEFAULT NULL COMMENT '渠道号',
+  `opt_name` varchar(64) DEFAULT NULL COMMENT '操作节点(功能)名称',
+  `opt_enum_name` varchar(64) DEFAULT NULL COMMENT '操作节点(功能)枚举值',
+  `opt_user` varchar(64) DEFAULT NULL COMMENT '操作员',
+  `opt_log_detail` text,
+  `ext_data` text,
+  `opt_result` bigint(2) DEFAULT NULL COMMENT '是否成功 1 成功 0 失败',
+  `create_time` timestamp NULL DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='操作记录日志';
+
+
+
+# table order_approve
+# ------------------------------------------------------------
+
+
+CREATE TABLE IF NOT EXISTS `order_approve` (
+  `id` int(20) NOT NULL AUTO_INCREMENT COMMENT 'ID',
+  `channel_order_number` varchar(64) DEFAULT NULL COMMENT '渠道订单号',
+  `credit_number` varchar(64) DEFAULT NULL COMMENT '授信订单号',
+  `channel_id` bigint(32) NOT NULL COMMENT '渠道号',
+  `fund_id` bigint(16) DEFAULT NULL COMMENT '资方id',
+  `fund_type` bigint(2) DEFAULT NULL COMMENT '资方类型0：非存管；1：存管',
+  `ext_data` text,
+  `create_time` timestamp NOT NULL,
+  `update_time` timestamp NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
+
+
 
 
 # Dump of table permission
@@ -97,7 +149,7 @@ CREATE TABLE `role` (
   `create_time` timestamp NOT NULL,
   `update_time` timestamp NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8;
 
 LOCK TABLES `role` WRITE;
 /*!40000 ALTER TABLE `role` DISABLE KEYS */;
@@ -111,7 +163,8 @@ VALUES
 	(5,NULL,'量化派查询角色','查询 权限','','2019-08-06 13:31:26','2019-08-06 13:31:26'),
 	(6,5,'量化派产品','产品角色','','2019-08-06 13:31:26','2019-08-06 13:31:26'),
 	(7,5,'量化派运营','运营角色','','2019-08-06 13:31:26','2019-08-06 13:31:26'),
-	(8,2,'量化派测试','量化派测试','','2019-08-06 13:31:26','2019-08-06 13:31:26');
+	(8,2,'量化派测试','量化派测试','','2019-08-06 13:31:26','2019-08-06 13:31:26'),
+	(9,2,'量化派开发','量化派开发','','2019-08-06 13:31:26','2019-08-06 13:31:26');
 
 /*!40000 ALTER TABLE `role` ENABLE KEYS */;
 UNLOCK TABLES;
@@ -238,7 +291,7 @@ CREATE TABLE `user` (
   `update_time` timestamp NOT NULL,
   `last_login_time` timestamp NULL DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=21 DEFAULT CHARSET=utf8;
 
 LOCK TABLES `user` WRITE;
 /*!40000 ALTER TABLE `user` DISABLE KEYS */;
@@ -256,7 +309,15 @@ VALUES
 	(9,'yunying','运营1','202CB962AC59075B964B07152D234B70',NULL,'OPERATOR','ENABLED','2019-09-19 18:03:57','2019-09-19 18:03:57',NULL),
 	(10,'yunying2','运营2','202CB962AC59075B964B07152D234B70',NULL,'OPERATOR','ENABLED','2019-09-19 18:06:05','2019-09-19 18:06:05',NULL),
 	(11,'huhui','胡慧','202CB962AC59075B964B07152D234B70',NULL,'OPERATOR','ENABLED','2019-09-19 18:06:05','2019-09-19 18:06:05',NULL),
-	(12,'suntao','suntao','202CB962AC59075B964B07152D234B70',NULL,'OPERATOR','ENABLED','2019-09-19 18:06:05','2019-09-19 18:06:05',NULL);
+	(12,'suntao','suntao','202CB962AC59075B964B07152D234B70',NULL,'OPERATOR','ENABLED','2019-09-19 18:06:05','2019-09-19 18:06:05',NULL),
+	(13,'guomei','guomei','202CB962AC59075B964B07152D234B70',159843,'CHANNEL','ENABLED','2019-09-19 18:06:05','2019-09-19 18:06:05','2019-08-06 13:33:15'),
+	(14,'shangying','尚英','202CB962AC59075B964B07152D234B70',NULL,'OPERATOR','ENABLED','2019-09-19 18:06:05','2019-09-19 18:06:05','2019-08-06 13:33:15'),
+	(15,'jiangsuxia','素霞','202CB962AC59075B964B07152D234B70',NULL,'OPERATOR','ENABLED','2019-09-19 18:06:05','2019-09-19 18:06:05','2019-08-06 13:33:15'),
+	(16,'ameng','阿蒙','202CB962AC59075B964B07152D234B70',NULL,'OPERATOR','ENABLED','2019-09-19 18:06:05','2019-09-19 18:06:05','2019-08-06 13:33:15'),
+	(17,'chenxiaoze','晓哲','202CB962AC59075B964B07152D234B70',NULL,'OPERATOR','ENABLED','2019-09-19 18:06:05','2019-09-19 18:06:05','2019-08-06 13:33:15'),
+	(18,'fengjie','雷总','202CB962AC59075B964B07152D234B70',NULL,'OPERATOR','ENABLED','2019-09-19 18:06:05','2019-09-19 18:06:05','2019-08-06 13:33:15'),
+	(19,'lupeng','鹿朋','202CB962AC59075B964B07152D234B70',NULL,'OPERATOR','ENABLED','2019-09-19 18:06:05','2019-09-19 18:06:05','2019-08-06 13:33:15'),
+	(20,'wangjunquan','俊权','202CB962AC59075B964B07152D234B70',NULL,'OPERATOR','ENABLED','2019-09-19 18:06:05','2019-09-19 18:06:05','2019-08-06 13:33:15');
 
 /*!40000 ALTER TABLE `user` ENABLE KEYS */;
 UNLOCK TABLES;
@@ -288,7 +349,15 @@ VALUES
 	('9','6'),
 	('10','6'),
 	('11','8'),
-	('12','2');
+	('12','9'),
+	('13','4'),
+	('14','8'),
+	('15','8'),
+	('16','8'),
+	('17','9'),
+	('18','9'),
+	('19','9'),
+	('20','9');
 
 /*!40000 ALTER TABLE `user_role_mapping` ENABLE KEYS */;
 UNLOCK TABLES;