Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev

client/containers/Group/ProjectList/ProjectList.js

@@ -126,7 +126,7 @@ class ProjectList extends Component {
           </Col>
           <Col>
             {/(admin)|(owner)|(dev)/.test(this.props.currGroup.role) ?
-              <Button type="primary"><Link to="/add-project">添加项目</Link></Button>:
+              <Link to="/add-project"><Button type="primary">添加项目</Button></Link>:
               <Tooltip title="您没有权限,请联系该分组组长或管理员">
                 <Button type="primary" disabled >添加项目</Button>
               </Tooltip>}

package.json

@@ -45,7 +45,8 @@
     "sha1": "^1.1.1",
     "underscore": "^1.8.3",
     "universal-cookie": "^2.0.8",
-    "url": "^0.11.0"
+    "url": "^0.11.0",
+    "yapi-plugin-qsso": "^1.0.7"
   },
   "devDependencies": {
     "prop-types": "^15.5.10",

server/controllers/project.js

@@ -609,7 +609,7 @@ class projectController extends baseController {
             let result = await this.Model.up(id, data);
             let username = this.getUsername();
             yapi.commons.saveLog({
-                content: `<a href="/user/profile/${this.getUid()}">${username}</a> 更新了项目 <a href="/user/profile/${id}}">${projectData.name}</a> ""`,
+                content: `<a href="/user/profile/${this.getUid()}">${username}</a> 更新了项目 <a href="/user/profile/${id}}">${projectData.name}</a>`,
                 type: 'project',
                 uid: this.getUid(),
                 username: username,
@@ -660,7 +660,7 @@ class projectController extends baseController {
             let result = await this.Model.up(id, data);
             let username = this.getUsername();
             yapi.commons.saveLog({
-                content: `<a href="/user/profile/${this.getUid()}">${username}</a> 更新了项目 <a href="/user/profile/${id}">${projectData.name}"</a> 环境`,
+                content: `<a href="/user/profile/${this.getUid()}">${username}</a> 更新了项目 <a href="/user/profile/${id}">${projectData.name}</a> 的环境`,
                 type: 'project',
                 uid: this.getUid(),
                 username: username,

static/prd/assets.js

@@ -1 +0,0 @@
-window.WEBPACK_ASSETS = {"index.js":{"js":"index@3a486a0088071e0d59d5.js","css":"index@3a486a0088071e0d59d5.css"},"lib":{"js":"lib@3d6790748483412d111e.js"},"lib2":{"js":"lib2@34c977588e1eeac462a0.js"},"manifest":{"js":"manifest@b67af9f8b578904e66c5.js"}}

static/prd/manifest@b67af9f8b578904e66c5.js

@@ -1 +0,0 @@
-!function(e){function t(n){if(r[n])return r[n].exports;var i=r[n]={exports:{},id:n,loaded:!1};return e[n].call(i.exports,i,i.exports,t),i.loaded=!0,i.exports}var n=window.webpackJsonp;window.webpackJsonp=function(s,o){for(var u,f,l=0,c=[];l<s.length;l++)f=s[l],i[f]&&c.push.apply(c,i[f]),i[f]=0;for(u in o)e[u]=o[u];for(n&&n(s,o);c.length;)c.shift().call(null,t);if(o[0])return r[0]=0,t(0)};var r={},i={3:0};t.e=function(e,n){if(0===i[e])return n.call(null,t);if(void 0!==i[e])i[e].push(n);else{i[e]=[n];var r=document.getElementsByTagName("head")[0],s=document.createElement("script");s.type="text/javascript",s.charset="utf-8",s.async=!0,s.src=t.p+""+e+".chunk.min.js",r.appendChild(s)}},t.m=e,t.c=r,t.p=""}([])