mirror/yapi
2
0
Fork 0
mirror of https://github.com/YMFE/yapi.git synced 2025-03-31 14:50:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

userligin

Browse Source
This commit is contained in:
lwg 2017-07-10 11:11:35 +08:00
parent 3e245114fc
commit 5739bbde76
11 changed files with 488 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
doc/build/api.html vendored
View File

@ -75,6 +75,20 @@
<li >
<a href="#-group-list">/group/list</a>
</li>
</ul>
<!-- <li > -->
<li >
<a href="#user">user</a>
</li>
<ul class="nav docs-sidenav-extend" >
<li >
<a href="#-user-login">/user/login</a>
</li>
</ul>
@ -183,6 +197,88 @@
</div>
<h2 id="user" class="page-header subject">user<a class="hashlink" href="#user">#</a></h2>
<div class="con-list-item">
<blockquote class="api">
<h3 id="-user-login" class="page-header subject">
/user/login
<span class="ui-badge">POST</span>
<a class="hashlink" href="#-user-login">#</a>
</h3>
</blockquote>
<p>
<small class="text-muted">描述:</small>
添加项目分组
</p>
<p>
<small class="text-muted">参数:</small>
</p>
<div class="docs-table">
<table class="yo-table yo-table-border">
<colgroup>
<col class="c1">
<col class="c2">
<col class="c3">
<col class="c4">
</colgroup>
<thead>
<tr class="active">
<th>参数名</th>
<th>类型</th>
<th>描述</th>
<th>必选</th>
<th>支持版本</th>
</tr>
</thead>
<tr>
<td>username</td>
<td>String</td>
<td>用户名称，不能为空</td>
<td>
<i class="yo-ico glyphicon glyphicon-ok text-success"></i>
</td>
<td></td>
</tr>
<tr>
<td>password</td>
<td>String</td>
<td>密码，不能为空</td>
<td>
<i class="yo-ico glyphicon glyphicon-ok text-success"></i>
</td>
<td></td>
</tr>
</table>
</div>
<div>返回示例：</div>
<pre class="ydoc-example" data-foldnumber=10><code><span class="token punctuation">{</span>
<span class="token string">"errcode"</span><span class="token punctuation">:</span> <span class="token number">0</span><span class="token punctuation">,</span>
<span class="token string">"errmsg"</span><span class="token punctuation">:</span> <span class="token string">"success"</span><span class="token punctuation">,</span>
<span class="token string">"data"</span><span class="token punctuation">:</span> <span class="token punctuation">{</span>
<span class="token string">"_id"</span><span class="token punctuation">:</span> <span class="token number">4</span><span class="token punctuation">,</span>
<span class="token string">"username"</span><span class="token punctuation">:</span> <span class="token string">"testuser"</span><span class="token punctuation">,</span>
<span class="token string">"password"</span><span class="token punctuation">:</span> <span class="token string">"testpassword"</span>
<span class="token punctuation">}</span>
<span class="token punctuation">}</span></code></pre>
</div>

6
doc/build/static/server/controllers/base.js.html vendored
View File

@ -36,6 +36,12 @@ class baseController{
}
getLoginStatus(){
// let token = getCookie('_yapi_token');
// let uid = getCookie('_yapi_uid');
// let usermodel
// usermode.token === token
// return true
return true
}

214
doc/build/static/server/controllers/user.js.html vendored Normal file
View File

@ -0,0 +1,214 @@
<!DOCTYPE html>
<html lang="zh-CN">
<head>
<meta charset="utf-8">
<meta name="viewport" content="initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no" />
<title>yapi : ./server/controllers/user.js</title>
<link type="text/css" rel="stylesheet" href="../../../source/code.css"/>
<script type="text/javascript" src="../../../source/shCore.js"></script>
<script type="text/javascript" src="../../../source/shBrush-js.js"></script>
<style>
.syntaxhighlighter .number1 .spaces,.syntaxhighlighter .toolbar{ display: none;}
.syntaxhighlighter table td.gutter .line.highlight { background-color: #6ce26c !important; color: white; }
</style>
</head>
<body>
<div class="ydoc">
<div class="ydoc-banner-bg">
<div class="ydoc-banner" id="content" tabindex="-1">
<div class="ydoc-banner-area">
<h1>yapi : ./server/controllers/user.js</h1>
<p>源代码</p>
</div>
</div>
<div class="ydoc-container">
<div class="ydoc-container-content">
<div class="static-code-content" role="main">
<pre class="brush: js;">
import userModel from '../models/user.js'
import yapi from '../yapi.js'
import baseController from './base.js'
import mongoose from 'mongoose'
const sha1 = require('sha1');
class userController extends baseController{
constructor(ctx){
super(ctx)
console.log('constructor...')
}
/**
* 添加项目分组
* @interface /user/login
* @method POST
* @category user
* @foldnumber 10
* @param {String} username 用户名称，不能为空
* @param {String} password 密码，不能为空
* @returns {Object}
* @example ./api/user/login.json
*/
async login(ctx){ //登录
var userInst = yapi.getInst(userModel); //创建user实体
let username = ctx.request.body.username;
let password = ctx.request.body.password;
let result = await userInst.findByName(username);
console.log(password)
userInst.save(function(error){
console.log(111)
var error = userInst.validateSync();
assert.equal(error.errors['password'].message, 'password required');
});
if(!username){
return ctx.body = yapi.commons.resReturn(null,400,'用户名不能为空');
}
// if(!password){
// return ctx.body = yapi.commons.resReturn(null,400,'密码不能为空');
// }
//输入一个不存在的用户名
var checkRepeat = await userInst.checkRepeat(username);//然后检查是否已经存在该用户
if(checkRepeat==0){
return ctx.body = yapi.commons.resReturn(null,404,'该用户不存在'); //返回的错误码对吗？？？？
}else if(sha1(result.password)===password){ //用户名存在，判断密码是否正确，正确则可以登录
console.log('密码一致'); //是不是还需要把用户名密码一些东西写到session
// setCookie('token', sha1(username+password));
// userInst.update({_id, result._id}, {token: sha1(username+password)})
// return ctx.body = {username: ''}
return ctx.body = yapi.commons.resReturn(null,200,'ok');
}else{
return ctx.body = yapi.commons.resReturn(null,400,'密码错误');
}
}
async reg(ctx){ //注册
var userInst = yapi.getInst(userModel);
let params = ctx.request.body; //获取请求的参数,检查是否存在用户名和密码
// if(!params.username){
// return ctx.body = yapi.commons.resReturn(null,400,'用户名不能为空');
// }
// if(!params.password){
// return ctx.body = yapi.commons.resReturn(null,400,'密码不能为空');
// }
// if(!params.email){
// return ctx.body = yapi.commons.resReturn(null,400,'邮箱不能为空');
// }
// var checkRepeat = await userInst.checkRepeat(params.username);//然后检查是否已经存在该用户
// if(checkRepeat>0){
// return ctx.body = yapi.commons.resReturn(null,401,'该用户名已经注册');
// }
// var checkRepeat = await userInst.checkRepeat(params.email);//然后检查是否已经存在该用户
// if(checkRepeat>0){
// return ctx.body = yapi.commons.resReturn(null,401,'该邮箱已经注册');
// }
let data = {
username: params.username,
password: sha1(params.password),//加密
email: params.email,
role: params.role,
add_time: yapi.commons.time(),
up_time: yapi.commons.time()
}
try{
let user = await userInst.save(data);
user = yapi.commons.fieldSelect(user,['id','username','password','email','role'])
ctx.body = yapi.commons.resReturn(user);
}catch(e){
ctx.body = yapi.commons.resReturn(null, 401, e.message);
}
}
async list(ctx){ //获取用户列表并分页
var userInst = yapi.getInst(userModel);
try{
let user = await userInst.list();
return ctx.body = yapi.commons.resReturn(user);
}catch(e){
return ctx.body = yapi.commons.resReturn(null,402,e.message);
}
}
async findById(ctx){ //根据id获取用户信息
try{
var userInst = yapi.getInst(userModel);
let id = ctx.request.body.id;
let result = await userInst.findById(id);
return ctx.body = yapi.commons.resReturn(result);
}catch(e){
return ctx.body = yapi.commons.resReturn(null,402,e.message);
}
}
async del(ctx){ //根据id删除一个用户
try{
var userInst = yapi.getInst(userModel);
let id = ctx.request.body.id;
let result = await userInst.del(id);
ctx.body = yapi.commons.resReturn(result);
}catch(e){
ctx.body = yapi.commons.resReturn(null,402,e.message);
}
}
async update(ctx){ //更新用户信息
try{
var userInst = yapi.getInst(userModel);
let id = ctx.request.body.id;
let data ={};
ctx.request.body.username && (data.username = ctx.request.body.username)
ctx.request.body.password && (data.password = ctx.request.body.password)
ctx.request.body.email && (data.email = ctx.request.body.email)
ctx.request.body.role && (data.role = ctx.request.body.role)
if (Object.keys(data).length===0){
ctx.body = yapi.commons.resReturn(null,404,'用户名、密码、Email、role都为空');
}
let result = await userInst.update(id,data);
ctx.body = yapi.commons.resReturn(result);
}catch(e){
ctx.body = yapi.commons.resReturn(null,402,e.message);
}
}
}
module.exports = userController
</pre>
</div>
</div>
</div>
</div>
<!-- <div class="docs-header" id="content" tabindex="-1">
<div class="container">
<h1>yapi : ./server/controllers/user.js</h1>
<p>源代码</p>
</div>
</div> -->
<footer class="docs-footer" role="contentinfo">
<div class="container">
<p></p>
</div>
</footer>
</div>
<script type="text/javascript">
SyntaxHighlighter.all();
function getTop(node){
return node.offsetTop + (node.offsetParent ? getTop(node.offsetParent) : 0);
}
document.addEventListener('DOMContentLoaded', function() {
setTimeout(function() {
try {
var lineNum = (parseInt(location.hash.replace(/#/g, '')) - 1) || 0,
node = document.querySelectorAll('div.line')[lineNum];
document.body.scrollTop = getTop(node);
node.className += ' highlight';
} catch(e) {}
}, 500);
}, false);
</script>
</body>
</html>

9
exampleCode/api/user/login.json Normal file
View File

@ -0,0 +1,9 @@
{
"errcode": 0,
"errmsg": "success",
"data": {
"_id": 4,
"username": "testuser",
"password": "testpassword"
}
}

0
exampleCode/login.json Normal file
View File

13
server/controllers/base.js
View File

@ -1,7 +1,18 @@
import yapi from '../yapi.js'
class baseController{
constructor(ctx){
console.log('baseControler init...')
// console.log('baseControler init...')
// let router;
// if(router === 'user/reg' || 'router/login'){
// }else{
// var a = this.getLoginStatus()
// if(a === false){
// return ctx.body = {};
// }
// }
// this.auth = false;
}
getUid(){

71
server/controllers/user.js
View File

@ -1,6 +1,7 @@
import userModel from '../models/user.js'
import yapi from '../yapi.js'
import baseController from './base.js'
import mongoose from 'mongoose'
const sha1 = require('sha1');
@ -9,28 +10,48 @@ class userController extends baseController{
super(ctx)
console.log('constructor...')
}
/**
* 添加项目分组
* @interface /user/login
* @method POST
* @category user
* @foldnumber 10
* @param {String} username 用户名称，不能为空
* @param {String} password 密码，不能为空
* @returns {Object}
* @example ./api/user/login.json
*/
async login(ctx){ //登录
var userInst = yapi.getInst(userModel); //创建user实体
let username = ctx.request.body.username;
let password = sha1(ctx.request.body.password);
let user = await userInst.findByName(username);
let id = user.id;
let result = await userInst.findById(id); //获取登录用户的id
let password = ctx.request.body.password;
let result = await userInst.findByName(username);
console.log(password)
userInst.save(function(error){
console.log(111)
var error = userInst.validateSync();
assert.equal(error.errors['password'].message, 'password required');
});
if(!username){
return ctx.body = yapi.commons.resReturn(null,400,'用户名不能为空');
}
if(!password){
return ctx.body = yapi.commons.resReturn(null,400,'密码不能为空');
}
// if(!password){
// return ctx.body = yapi.commons.resReturn(null,400,'密码不能为空');
// }
//输入一个不存在的用户名
var checkRepeat = await userInst.checkRepeat(username);//然后检查是否已经存在该用户
if(checkRepeat==0){
return ctx.body = yapi.commons.resReturn(null,404,'该用户不存在'); //返回的错误码对吗？？？？
}else if(result.password===password){ //用户名存在，判断密码是否正确，正确则可以登录
}else if(sha1(result.password)===password){ //用户名存在，判断密码是否正确，正确则可以登录
console.log('密码一致'); //是不是还需要把用户名密码一些东西写到session
// setCookie('token', sha1(username+password));
// userInst.update({_id, result._id}, {token: sha1(username+password)})
// return ctx.body = {username: ''}
return ctx.body = yapi.commons.resReturn(null,200,'ok');
}else{
return ctx.body = yapi.commons.resReturn(null,400,'密码错误');
}
@ -41,24 +62,24 @@ class userController extends baseController{
async reg(ctx){ //注册
var userInst = yapi.getInst(userModel);
let params = ctx.request.body; //获取请求的参数,检查是否存在用户名和密码
if(!params.username){
return ctx.body = yapi.commons.resReturn(null,400,'用户名不能为空');
}
if(!params.password){
return ctx.body = yapi.commons.resReturn(null,400,'密码不能为空');
}
if(!params.email){
return ctx.body = yapi.commons.resReturn(null,400,'邮箱不能为空');
}
// if(!params.username){
// return ctx.body = yapi.commons.resReturn(null,400,'用户名不能为空');
// }
// if(!params.password){
// return ctx.body = yapi.commons.resReturn(null,400,'密码不能为空');
// }
// if(!params.email){
// return ctx.body = yapi.commons.resReturn(null,400,'邮箱不能为空');
// }
var checkRepeat = await userInst.checkRepeat(params.username);//然后检查是否已经存在该用户
if(checkRepeat>0){
return ctx.body = yapi.commons.resReturn(null,401,'该用户名已经注册');
}
var checkRepeat = await userInst.checkRepeat(params.email);//然后检查是否已经存在该用户
if(checkRepeat>0){
return ctx.body = yapi.commons.resReturn(null,401,'该邮箱已经注册');
}
// var checkRepeat = await userInst.checkRepeat(params.username);//然后检查是否已经存在该用户
// if(checkRepeat>0){
// return ctx.body = yapi.commons.resReturn(null,401,'该用户名已经注册');
// }
// var checkRepeat = await userInst.checkRepeat(params.email);//然后检查是否已经存在该用户
// if(checkRepeat>0){
// return ctx.body = yapi.commons.resReturn(null,401,'该邮箱已经注册');
// }
let data = {
username: params.username,

19
server/models/user.js
View File

@ -9,10 +9,19 @@ class userModel extends baseModel{
getSchema(){
return{
username: String,
password: String,
username: {
type: String,
required: true
},
password:{
type:String,
required: true
},
email: {
type: String,
required: true
},
passsalt: String,
email: String,
role: String,
add_time: Number,
up_time: Number
@ -30,8 +39,8 @@ class userModel extends baseModel{
list(){
return this.model.find().select("username_id username email role add_time up_time").exec() //显示id name email role
}
findByName(name){
return this.model.find({"username":name})
findByName(username){
return this.model.findOne({username})
}
findById(id){
return this.model.findById({

15
server_dist/controllers/base.js
View File

@ -16,9 +16,20 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
var baseController = function () {
function baseController(ctx) {
(0, _classCallCheck3.default)(this, baseController);
// console.log('baseControler init...')
// let router;
// if(router === 'user/reg' || 'router/login'){
console.log('baseControler init...');
// }else{
// var a = this.getLoginStatus()
// if(a === false){
// return ctx.body = {};
// }
// }
// this.auth = false;
(0, _classCallCheck3.default)(this, baseController);
}
(0, _createClass3.default)(baseController, [{

153
server_dist/controllers/user.js
View File

@ -44,6 +44,10 @@ var _base = require('./base.js');
var _base2 = _interopRequireDefault(_base);
var _mongoose = require('mongoose');
var _mongoose2 = _interopRequireDefault(_mongoose);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
var sha1 = require('sha1');
@ -59,12 +63,24 @@ var userController = function (_baseController) {
console.log('constructor...');
return _this;
}
/**
* 添加项目分组
* @interface /user/login
* @method POST
* @category user
* @foldnumber 10
* @param {String} username 用户名称，不能为空
* @param {String} password 密码，不能为空
* @returns {Object}
* @example ./api/user/login.json
*/
(0, _createClass3.default)(userController, [{
key: 'login',
value: function () {
var _ref = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee(ctx) {
var userInst, username, password, user, id, result, checkRepeat;
var userInst, username, password, result, checkRepeat;
return _regenerator2.default.wrap(function _callee$(_context) {
while (1) {
switch (_context.prev = _context.next) {
@ -73,51 +89,45 @@ var userController = function (_baseController) {
userInst = _yapi2.default.getInst(_user2.default); //创建user实体
username = ctx.request.body.username;
password = sha1(ctx.request.body.password);
password = ctx.request.body.password;
_context.next = 5;
return userInst.findByName(username);
case 5:
user = _context.sent;
id = user.id;
_context.next = 9;
return userInst.findById(id);
case 9:
result = _context.sent;
console.log(password);
userInst.save(function (error) {
console.log(111);
var error = userInst.validateSync();
assert.equal(error.errors['password'].message, 'password required');
});
if (username) {
_context.next = 12;
_context.next = 10;
break;
}
return _context.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(null, 400, '用户名不能为空'));
case 12:
if (password) {
_context.next = 14;
break;
}
return _context.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(null, 400, '密码不能为空'));
case 14:
_context.next = 16;
case 10:
_context.next = 12;
return userInst.checkRepeat(username);
case 16:
case 12:
checkRepeat = _context.sent;
if (!(checkRepeat == 0)) {
_context.next = 21;
_context.next = 17;
break;
}
return _context.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(null, 404, '该用户不存在'));
case 21:
if (!(result.password === password)) {
_context.next = 25;
case 17:
if (!(sha1(result.password) === password)) {
_context.next = 22;
break;
}
@ -126,13 +136,12 @@ var userController = function (_baseController) {
// setCookie('token', sha1(username+password));
// userInst.update({_id, result._id}, {token: sha1(username+password)})
// return ctx.body = {username: ''}
_context.next = 26;
break;
return _context.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(null, 200, 'ok'));
case 25:
case 22:
return _context.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(null, 400, '密码错误'));
case 26:
case 23:
case 'end':
return _context.stop();
}
@ -150,7 +159,7 @@ var userController = function (_baseController) {
key: 'reg',
value: function () {
var _ref2 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee2(ctx) {
var userInst, params, checkRepeat, data, user;
var userInst, params, data, user;
return _regenerator2.default.wrap(function _callee2$(_context2) {
while (1) {
switch (_context2.prev = _context2.next) {
@ -158,59 +167,25 @@ var userController = function (_baseController) {
//注册
userInst = _yapi2.default.getInst(_user2.default);
params = ctx.request.body; //获取请求的参数,检查是否存在用户名和密码
// if(!params.username){
// return ctx.body = yapi.commons.resReturn(null,400,'用户名不能为空');
// }
// if(!params.password){
// return ctx.body = yapi.commons.resReturn(null,400,'密码不能为空');
// }
// if(!params.email){
// return ctx.body = yapi.commons.resReturn(null,400,'邮箱不能为空');
// }
if (params.username) {
_context2.next = 4;
break;
}
// var checkRepeat = await userInst.checkRepeat(params.username);//然后检查是否已经存在该用户
// if(checkRepeat>0){
// return ctx.body = yapi.commons.resReturn(null,401,'该用户名已经注册');
// }
// var checkRepeat = await userInst.checkRepeat(params.email);//然后检查是否已经存在该用户
// if(checkRepeat>0){
// return ctx.body = yapi.commons.resReturn(null,401,'该邮箱已经注册');
// }
return _context2.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(null, 400, '用户名不能为空'));
case 4:
if (params.password) {
_context2.next = 6;
break;
}
return _context2.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(null, 400, '密码不能为空'));
case 6:
if (params.email) {
_context2.next = 8;
break;
}
return _context2.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(null, 400, '邮箱不能为空'));
case 8:
_context2.next = 10;
return userInst.checkRepeat(params.username);
case 10:
checkRepeat = _context2.sent;
if (!(checkRepeat > 0)) {
_context2.next = 13;
break;
}
return _context2.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(null, 401, '该用户名已经注册'));
case 13:
_context2.next = 15;
return userInst.checkRepeat(params.email);
case 15:
checkRepeat = _context2.sent;
if (!(checkRepeat > 0)) {
_context2.next = 18;
break;
}
return _context2.abrupt('return', ctx.body = _yapi2.default.commons.resReturn(null, 401, '该邮箱已经注册'));
case 18:
data = {
username: params.username,
password: sha1(params.password), //加密
@ -219,30 +194,30 @@ var userController = function (_baseController) {
add_time: _yapi2.default.commons.time(),
up_time: _yapi2.default.commons.time()
};
_context2.prev = 19;
_context2.next = 22;
_context2.prev = 3;
_context2.next = 6;
return userInst.save(data);
case 22:
case 6:
user = _context2.sent;
user = _yapi2.default.commons.fieldSelect(user, ['id', 'username', 'password', 'email', 'role']);
ctx.body = _yapi2.default.commons.resReturn(user);
_context2.next = 30;
_context2.next = 14;
break;
case 27:
_context2.prev = 27;
_context2.t0 = _context2['catch'](19);
case 11:
_context2.prev = 11;
_context2.t0 = _context2['catch'](3);
ctx.body = _yapi2.default.commons.resReturn(null, 401, _context2.t0.message);
case 30:
case 14:
case 'end':
return _context2.stop();
}
}
}, _callee2, this, [[19, 27]]);
}, _callee2, this, [[3, 11]]);
}));
function reg(_x2) {

19
server_dist/models/user.js
View File

@ -51,10 +51,19 @@ var userModel = function (_baseModel) {
key: 'getSchema',
value: function getSchema() {
return {
username: String,
password: String,
username: {
type: String,
required: true
},
password: {
type: String,
required: true
},
email: {
type: String,
required: true
},
passsalt: String,
email: String,
role: String,
add_time: Number,
up_time: Number
@ -80,8 +89,8 @@ var userModel = function (_baseModel) {
}
}, {
key: 'findByName',
value: function findByName(name) {
return this.model.find({ "username": name });
value: function findByName(username) {
return this.model.findOne({ username: username });
}
}, {
key: 'findById',