git变更记录

来源：互联网发布：东莞凤岗cnc编程培训编辑：程序博客网时间：2024/04/29 05:02

dh@dh-PC MINGW64 ~
$ pwd
/c/Users/dh

dh@dh-PC MINGW64 ~
$ cd downloads

dh@dh-PC MINGW64 ~/downloads
$ cd static-noah

dh@dh-PC MINGW64 ~/downloads/static-noah (master)
$ git status
On branch master
Your branch is up-to-date with 'origin/master'.
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)

modified: src/js/config/config-publish.js
modified: src/js/config/config.js
modified: src/js/index/change/change.ctl.js
modified: src/views/change/difference.html
modified: src/views/change/interfaceChange.html
modified: src/views/change/list.html
modified: src/views/change/projectContent.html
modified: src/views/change/regression.html
modified: src/views/change/smoke.html

Untracked files:
(use "git add <file>..." to include in what will be committed)

.idea/
npm-debug.log

no changes added to commit (use "git add" and/or "git commit -a")
s
dh@dh-PC MINGW64 ~/downloads/static-noah (master)
$ git add src/js/config/config-publish.js

dh@dh-PC MINGW64 ~/downloads/static-noah (master)
$ git commit -m "[misc]:添加获取图片地址"
[master 0db6a48] [misc]:添加获取图片地址
1 file changed, 1 insertion(+)

dh@dh-PC MINGW64 ~/downloads/static-noah (master)
$ git push origin master
Username for 'http://git.2dfire-inc.com': shumei
To http://git.2dfire-inc.com/testing/static-noah.git
! [rejected] master -> master (fetch first)
error: failed to push some refs to 'http://git.2dfire-inc.com/testing/static-noah.git'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

dh@dh-PC MINGW64 ~/downloads/static-noah (master)
$ git pull origin master
Username for 'http://git.2dfire-inc.com': shumei
remote: Counting objects: 6, done.
remote: Compressing objects: 100% (6/6), done.
remote: Total 6 (delta 5), reused 0 (delta 0)
Unpacking objects: 100% (6/6), done.
From http://git.2dfire-inc.com/testing/static-noah
* branch master -> FETCH_HEAD
8ed230e..4cde4b6 master -> origin/master
Auto-merging src/js/config/config-publish.js
CONFLICT (content): Merge conflict in src/js/config/config-publish.js
Automatic merge failed; fix conflicts and then commit the result.

dh@dh-PC MINGW64 ~/downloads/static-noah (master|MERGING)
$ git add src/js/config/config-publish.js

dh@dh-PC MINGW64 ~/downloads/static-noah (master|MERGING)
$ git commit -m "[misc]:解决冲突"
[master e24bcf1] [misc]:解决冲突

dh@dh-PC MINGW64 ~/downloads/static-noah (master)
$ git push origin master
Username for 'http://git.2dfire-inc.com': shumei
Counting objects: 24, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (24/24), done.
Writing objects: 100% (24/24), 2.72 KiB | 0 bytes/s, done.
Total 24 (delta 18), reused 0 (delta 0)
To http://git.2dfire-inc.com/testing/static-noah.git
4cde4b6..e24bcf1 master -> master

dh@dh-PC MINGW64 ~/downloads/static-noah (master)
$ git status
On branch master
Your branch is up-to-date with 'origin/master'.
Untracked files:
(use "git add <file>..." to include in what will be committed)

.idea/
npm-debug.log

nothing added to commit but untracked files present (use "git add" to track)

dh@dh-PC MINGW64 ~/downloads/static-noah (master)
$ git log
commit e24bcf1ae6fc0d7779783bc92ee9ba8249afef59
Merge: 0db6a48 4cde4b6
Author: shumei <shumei@2dfire.com>
Date: Fri Dec 15 01:51:19 2017 +0800

[misc]:解决冲突

commit 0db6a4863e0af1958fb533ad5a67e0bf5070a77c
Author: shumei <shumei@2dfire.com>
Date: Fri Dec 15 01:48:38 2017 +0800

[misc]:添加获取图片地址

commit 4cde4b6e775ed6b24c92e1ab4e8111603dec503c
Author: 七喜 <qixi@2dfire.com>
Date: Thu Dec 14 21:53:34 2017 +0800

修改后端地址

commit 8ed230e002a34c957aa1bda8beb6937f9e0c91e2
Author: shumei <shumei@2dfire.com>
Date: Thu Dec 14 15:26:29 2017 +0800

dh@dh-PC MINGW64 ~/downloads/static-noah (master)
$ git diff 0db6a4863e0af1958fb533ad5a67e0bf5070a77c e24bcf1ae6fc0d7779783bc92ee9ba8249afef59
diff --git a/src/js/config/config-publish.js b/src/js/config/config-publish.js
index 76b4478..d90c9fa 100644
--- a/src/js/config/config-publish.js
+++ b/src/js/config/config-publish.js
@@ -3,7 +3,7 @@
*/
(function () {
var module = angular.module('config',[]);
- module.constant('remoteUrl', "http://noah-backend-quality-assurance.cloudapps.2dfire-pre.com");
+ module.constant('remoteUrl', "https://noah-backend.2dfire.net");
module.constant('remoteAddress', "https://img.2dfire.com");
module.constant('environment', "publish");
}).call(this);
\ No newline at end of file
diff --git a/src/js/config/config.js b/src/js/config/config.js
index 1a6685a..22c41be 100644
--- a/src/js/config/config.js
+++ b/src/js/config/config.js
@@ -3,7 +3,7 @@
*/
(function () {
var module = angular.module('config',[]);
- module.constant('remoteUrl', "http://10.1.5.70:8080");
- module.constant('remoteAddress', "http://10.1.5.70");
+ module.constant('remoteUrl', "http://localhost:8080");
+ module.constant('remoteAddress', "https://img.2dfire.com");
module.constant('environment', "dev");
}).call(this);
\ No newline at end of file
diff --git a/src/js/index/change/change.ctl.js b/src/js/index/change/change.ctl.js
index d17e147..5135967 100644
--- a/src/js/index/change/change.ctl.js
+++ b/src/js/index/change/change.ctl.js
@@ -1881,9 +1881,15 @@
if (vm.change.report == null) {
vm.change.report = "";
}
+ if (vm.change.dailyReport == null) {
+ vm.change.dailyReport = "";
+ }
if(vm.change.createUser == userName) {
$scope.isSelf = 1;
}
+ if(vm.change.report != '') {
+ vm.change.report = vm.change.dailyReport;
+ }
var testEditormdView = editormd.markdownToHTML("test-editor
dh@dh-PC MINGW64 ~/downloads/static-noah (master)
$ git log
commit e24bcf1ae6fc0d7779783bc92ee9ba8249afef59
Merge: 0db6a48 4cde4b6
Author: shumei <shumei@2dfire.com>
Date: Fri Dec 15 01:51:19 2017 +0800

[misc]:解决冲突

commit 0db6a4863e0af1958fb533ad5a67e0bf5070a77c
Author: shumei <shumei@2dfire.com>
Date: Fri Dec 15 01:48:38 2017 +0800

[misc]:添加获取图片地址

commit 4cde4b6e775ed6b24c92e1ab4e8111603dec503c
Author: 七喜 <qixi@2dfire.com>
Date: Thu Dec 14 21:53:34 2017 +0800

修改后端地址

commit 8ed230e002a34c957aa1bda8beb6937f9e0c91e2
Author: shumei <shumei@2dfire.com>
Date: Thu Dec 14 15:26:29 2017 +0800

dh@dh-PC MINGW64 ~/downloads/static-noah (master)
$ git diff 0db6a4863e0af1958fb533ad5a67e0bf5070a77c e24bcf1ae6fc0d7779783bc92ee9ba8249afef59
diff --git a/src/js/config/config-publish.js b/src/js/config/config-publish.js
index 76b4478..d90c9fa 100644
--- a/src/js/config/config-publish.js
+++ b/src/js/config/config-publish.js
@@ -3,7 +3,7 @@
*/
(function () {
var module = angular.module('config',[]);
- module.constant('remoteUrl', "http://noah-backend-quality-assurance.cloudapps.2dfire-pre.com");
+ module.constant('remoteUrl', "https://noah-backend.2dfire.net");
module.constant('remoteAddress', "https://img.2dfire.com");
module.constant('environment', "publish");
}).call(this);
\ No newline at end of file
diff --git a/src/js/config/config.js b/src/js/config/config.js
index 1a6685a..22c41be 100644
--- a/src/js/config/config.js
+++ b/src/js/config/config.js
@@ -3,7 +3,7 @@
*/
(function () {
var module = angular.module('config',[]);
- module.constant('remoteUrl', "http://10.1.5.70:8080");
- module.constant('remoteAddress', "http://10.1.5.70");
+ module.constant('remoteUrl', "http://localhost:8080");
+ module.constant('remoteAddress', "https://img.2dfire.com");
module.constant('environment', "dev");
}).call(this);
\ No newline at end of file
diff --git a/src/js/index/change/change.ctl.js b/src/js/index/change/change.ctl.js
index d17e147..5135967 100644
--- a/src/js/index/change/change.ctl.js
+++ b/src/js/index/change/change.ctl.js
@@ -1881,9 +1881,15 @@
if (vm.change.report == null) {
vm.change.report = "";
}
+ if (vm.change.dailyReport == null) {
+ vm.change.dailyReport = "";
+ }
if(vm.change.createUser == userName) {
$scope.isSelf = 1;
}
+ if(vm.change.report != '') {
+ vm.change.report = vm.change.dailyReport;
+ }
var testEditormdView = editormd.markdownToHTML("test-editormd-view", {
markdown : vm.change.report ,//+ "\r\n" + $("#append-test").text(),
//htmlDecode : true, // 开启 HTML 标签解析，认不开启
@@ -1906,6 +1912,42 @@
}
$scope.initializeProject();

+ //测试报告发送邮件测试一下
+ $scope.sendTestEmail = function (application) {
+ var user = $cookieStore.get("user");
+ var userName = user.nickName;
+ var userEmail = user.email;
+ var testEditormdView = editormd.markdownToHTML("test-editormd-view", {
+ markdown : "" ,//+ "\r\n" + $("#append-test").text(),
+ // htmlDecode : true, // 开启 HTML 标签解析，为了安全性，默认不开启
+ htmlDecode : "style,script,iframe", // you can filter tags decode
+ //toc : false,
+ tocm : true, // Using [TOCM]
+ //tocContainer : "#custom-toc-container", // 自定义 ToC 容器层
+ //gfm : false,
+ //tocDropdown : true,
+ // markdownSourceCode : true, // 是否保留 Markdown 源码，即是否xtarea 标签
+ emoji : true,
+ taskList : true,
+ tex : true, // 默认不解析
+ flowChart : true, // 默认不解析
+ sequenceDiagram : true, // 默认不解析
+ });
+ changeService.sendEmail(userEmail,userEmail,userName,userEmail,vm.change.emailTitle,testEditormdView[0].innerHTML,null).then(function (resp) {
+ if (resp.data.code == 1) {
+ swal({
+ title: "操作成功",
+ type: "success",
+ html: true,
+ timer: 1000,
+ showConfirmButton: false
+ });
+ } else {
+ SweetAlert.swal("操作失败", resp.data.message, "error");
+ }
+ });
+ };
+
//测试报告发送邮件
$scope.sendEmail = function (application) {
swal({
@@ -1954,42 +1996,6 @@
});
};

- //测试报告发送邮件测试一下
- $scope.sendTestEmail = function (application) {
- var user = $cookieStore.get("user");
- var userName = user.nickName;
- var userEmail = user.email;
- var testEditormdView = editormd.markdownToHTML("test-editormd-view", {
- markdown : "" ,//+ "\r\n" + $("#append-test").text(),
- // htmlDecode : true, // 开启 HTML 标签解析，为了安全性，默认不开启
- htmlDecode : "style,script,iframe", // you can filter tags decode
- //toc : false,
- tocm : true, // Using [TOCM]
- //tocContainer : "#custom-toc-container", // 自定义 ToC 容器层
- //gfm : false,
- //tocDropdown : true,
- // markdownSourceCode : true, // 是否保留 Markdown 源码，即是否xtarea 标签
- emoji : true,
- taskList : true,
- tex : true, // 默认不解析
- flowChart : true, // 默认不解析
- sequenceDiagram : true, // 默认不解析
- });
- changeService.sendEmail(userEmail,userEmail,userName,userEmail,vm.change.emailTitle,testEditormdView[0].innerHTML,null).then(function (resp) {
- if (resp.data.code == 1) {
- swal({
- title: "操作成功",
- type: "success",
- html: true,
- timer: 1000,
- showConfirmButton: false
- });
- } else {
- SweetAlert.swal("操作失败", resp.data.message, "error");
- }
- });
- };
-
})

/**
@@ -3826,9 +3832,15 @@
if(typeof(theValue) == "object" && Object.prototype.toString.call(theValue).toLowerCase() == "[object object]" && !theValue.length){
var theValue = JSON.stringify(theValue, null, 4);
}
+ var desc = "";
+ if(key.indexOf(",") >= 0) {
+ desc = key.split(",")[1];
+ key = key.split(",")[0];
+ }
var keyValue = {
"key": key,
"value":theValue,
+ "description":desc,
};
vm.keyValueList.push(keyValue);
}
@@ -3979,7 +3991,10 @@
if(vm.keyValueList != null && vm.keyValueList != undefined) {
var inputData = {};
for (var i = 0; i < vm.keyValueList.length; i++) {
- inputData[vm.keyValueList[i].key] = vm.keyValueList[i].value;
+ var myArray=new Array();
+ myArray.push(vm.keyValueList[i].key);
+ myArray.push(vm.keyValueList[i].description);
+ inputData[myArray] = vm.keyValueList[i].value;
}
vm.change.inputData = JSON.stringify(inputData);
}
diff --git a/src/views/change/difference.html b/src/views/change/difference.html
index 896038e..b1364d5 100644
--- a/src/views/change/difference.html
+++ b/src/views/change/difference.html
@@ -61,7 +61,7 @@
<div class="ibox float-e-margins">
<div class="ibox-content" style="">
<body>
- <span class="btn btn-rounded btn-sm col-sm-1" title="批量 onclick="textchange()" style="background-color: #8b2f81;color:#FFF">
+ <span class="btn btn-rounded btn-sm col-sm-1" title="对比"nclick="textchange()" style="background-color: #8b2f81;color:#FFF">
对比
</span>
<button class="btn pull-left btn-rounded" style="background-color: #788da3;color:#FFF;border-color:#788da3;height: 32px;width: 60px;margin-right: 740px" ui-sref="profile.content({id:id})">取消</button>
@@ -69,7 +69,7 @@
<table style="width:100%">

<tr>
- <td style="width:50%">
+ <td style="width:50%">+
<div class="edit_div">
<pre id="edit_pre_1"></pre>
<textarea id="edit_textarea_1" onscroll="test1_scroll()" oninput="textchange()" onpropertychange="textchange()" ng-model="vm.change.initContent"></textarea>
diff --git a/src/views/change/interfaceChange.html b/src/views/change/interfaceChange.html
index 4c35cf8..ee29e76 100644
--- a/src/views/change/interfaceChange.html
+++ b/src/views/change/interfaceChange.html
@@ -119,30 +119,39 @@ border-left-width: 0px";
<div class="col-sm-10">
<thead>
<div>
- <div class="col-md-5">
+ <div class="col-md-3">
Key
</div>
- <div class="col-md-5">
+ <div class="col-md-4">
Value
</div>
+ <div class="col-md-3">
+ Description
+ </div>
</div>
</thead>
<tbody>
<div ng-repeat="item in vm.keyValueList" my-repeat-directive>
- <div class="col-md-5">
- <textarea type="text" class="form-control" rows="1" autosize ng-model="item.key" > </textarea>
- </div>
- <div class="col-md-5">
- <textarea type="text" class="form-control" rows="1" autosize ng-model="item.value" > </textarea>
- </div>
- <button type="button" class="close pull-right" ng-click="vm.delKeyValue(item)">×</button>
+ <div class="col-md-3">
+ <textarea type="text" class="form-control" rows="1" autosize ng-model="item.key" > </textarea>
+ </div>
+ <div class="col-md-4">
+ <textarea type="text" class="form-control" rows="1" autosize ng-model="item.value" > </textarea>
+ </div>
+ <div class="col-md-3">
+ <textarea type="text" class="form-control" rows="1" autosize ng-model="item.description" > </textarea>
+ </div>
+ <button type="button" class="close pull-right" ng-click="vm.delKeyValue(item)">×</button>
</div>
- <div class="col-md-5">
+ <div class="col-md-3">
<textarea type="text" class="form-control" rows="1" autosize ng-model="vm.key" ng-change="vm.addKeyValue()"> </textarea>
</div>
- <div class="col-md-5">
+ <div class="col-md-4">
<textarea type="text" class="form-control" rows="1" autosize ng-model="vm.value" > </textarea>
</div>
+ <div class="col-md-3">
+ <textarea type="text" class="form-control" rows="1" autosize ng-model="vm.description" > </textarea>
+ </div>
</div>
</div>

diff --git a/src/views/change/list.html b/src/views/change/list.html
index a6c0f27..e690042 100644
--- a/src/views/change/list.html
+++ b/src/views/change/list.html
@@ -119,13 +119,13 @@
<span class="btn btn-rounded btn-sm col-sm-1" title="新增 ng-click="openCase(moduleId)" style="background-color: #8b2f81;color:#FFF">
新增用例
</span>
- <span class="btn btn-rounded btn-sm col-sm-1" title="批量 ng-if="!vm.ischoose" style="background-color: #8b2f81;color:#FFF">
+ <span class="btn btn-rounded btn-sm col-sm-1" title="批量 ng-if="!vm.ischoose" style="background-color: #8b2f81;color:#FFF">
<font color="#585858" >
- {{"批量执行"}}
+ {{"批量操作"}}
</font>
</span>
- <span class="btn btn-rounded btn-sm col-sm-1" title="批量 ng-click="openBatch(moduleId)" ng-if="vm.ischoose" style="background-color: #8b2f81;color:#FFF">
- 批量执行
+ <span class="btn btn-rounded btn-sm col-sm-1" title="批量 ng-click="openBatch(moduleId)" ng-if="vm.ischoose" style="background-color: #8b2f81;color:#FFF">
+ 批量操作
</span>
<span class="btn btn-rounded btn-sm col-sm-1" tooltip-placement="top" tooltip="模板下载" ng-click="daochu()" style="background-color: #8b2folor:#FFF">
模板下载
diff --git a/src/views/change/projectContent.html b/src/views/change/projectContent.html
index 7683b17..e04372e 100644
--- a/src/views/change/projectContent.html
+++ b/src/views/change/projectContent.html
@@ -123,7 +123,9 @@
<span>
<button class="btn pull-left btn-rounded" ui-sref="profile.editors({id:id})" style="background-color: #8b2f81;color:#FFF;border-color:#8b2f81;height: 30px;" ng-if = "isContent == 1">编辑</button>
<button class="btn pull-left btn-rounded" ui-sref="profile.reportEditors({id:id})" style="background-color: #8b2f81;color:#FFF;border-color:#8b2f81;height: 30px;" ng-if = "isContent != 1 && vm.change.report == ''">新建测试报告</button>
- <button class="btn pull-left btn-rounded" ui-sref="profile.reportEditors({id:id})" style="background-color: #8b2f81;color:#FFF;border-color:#8b2f81;height: 30px;" ng-if = "isContent != 1 && vm.change.report != ''">编辑</button>
+ <button class="btn pull-left btn-rounded" ui-sref="profile.reportEditors({id:id})" style="background-color: #8b2f81;color:#FFF;border-color:#8b2f81;height: 30px;" ng-if = "isContent != 1 && vm.change.dailyReport == ''">新建测试日报</button>
+ <button class="btn pull-left btn-rounded" ui-sref="profile.reportEditors({id:id})" style="background-color: #8b2f81;color:#FFF;border-color:#8b2f81;height: 30px;" ng-if = "isContent != 1 && vm.change.report != ''">编辑测试报告</button>
+ <button class="btn pull-left btn-rounded" ui-sref="profile.reportEditors({id:id})" style="background-color: #8b2f81;color:#FFF;border-color:#8b2f81;height: 30px;" ng-if = "isContent != 1 && vm.change.dailyReport != ''">编辑测试日报</button>
</span>
<span>
<button class="btn pull-left btn-rounded" style="background-color: #8b2f81;color:#FFF;border-color:#8b2f81;height: 30px;" ng-if = "isContent == 1 && (vm.change.submit == 0 || vm.change.submit == 3) && isSelf == 1" ng-click="commitToTL(vm.change.id)">提交给TL</button>
diff --git a/src/views/change/regression.html b/src/views/change/regression.html
index 4fa112c..342b8b0 100644
--- a/src/views/change/regression.html
+++ b/src/views/change/regression.html
@@ -33,13 +33,13 @@



- <span class="btn btn-rounded btn-sm col-sm-1" title="批量执 ng-if="!vm.ischoose" style="background-color: #8b2f81;color:#FFF">
+ <span class="btn btn-rounded btn-sm col-sm-1" title="批量操 ng-if="!vm.ischoose" style="background-color: #8b2f81;color:#FFF">
<font color="#585858" >
- {{"批量执行"}}
+ {{"批量操作"}}
</font>
</span>
- <span class="btn btn-rounded btn-sm col-sm-1" title="批量 ng-click="openBatch(moduleId)" ng-if="vm.ischoose" style="background-color: #8b2f81;color:#FFF">
- 批量执行
+ <span class="btn btn-rounded btn-sm col-sm-1" title="批量 ng-click="openBatch(moduleId)" ng-if="vm.ischoose" style="background-color: #8b2f81;color:#FFF">
+ 批量操作
</span>
<input type="file" ng-file-select="onFileSelect($files)" accept="*/*" style="display:none;" id="importFile">

diff --git a/src/views/change/smoke.html b/src/views/change/smoke.html
index 44f3201..bc9f15a 100644
--- a/src/views/change/smoke.html
+++ b/src/views/change/smoke.html
@@ -30,13 +30,13 @@
</div>

<div>
- <span class="btn btn-rounded btn-sm col-sm-1" title="批量 ng-if="!vm.ischoose" style="background-color: #8b2f81;color:#FFF">
+ <span class="btn btn-rounded btn-sm col-sm-1" title="批量 ng-if="!vm.ischoose" style="background-color: #8b2f81;color:#FFF">
<font color="#585858" >
- {{"批量执行"}}
+ {{"批量操作"}}
</font>
</span>
- <span class="btn btn-info btn-rounded btn-sm col-sm-1" title="批量执行" ng-click="openBatch(moduleId)" ng-if="vm.ischoose" style="backgrounlor: #8b2f81;color:#FFF">
- 批量执行
+ <span class="btn btn-info btn-rounded btn-sm col-sm-1" title="批量操作" ng-click="openBatch(moduleId)" ng-if="vm.ischoose" style="backgrounlor: #8b2f81;color:#FFF">
+ 批量操作
</span>
<input type="file" ng-file-select="onFileSelect($files)" accept="*/*" style="display:none;" id="importFile">
</div>
(END)

阅读全文

0 0