From fdc86945f9c4a5a76abed0305aecd34b1e4db042 Mon Sep 17 00:00:00 2001
From: Brook yu <3032470652@qq.com>
Date: Mon, 8 Aug 2022 16:52:21 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=B0=83=E8=AF=95java?=
 =?UTF-8?q?=E7=89=88=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3=EF=BC=9A=E9=9D=9E?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8E=A5=E5=8F=A3=E6=94=AF=E6=8C=81=E6=AF=94?=
 =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E5=80=BC=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/index.html     |  41 +++++++
 src/assets/js/http.js | 254 ++++++++++++++++++++++++++++++++++++++++++
 vue.config.js         |   9 ++
 3 files changed, 304 insertions(+)
diff --git a/public/index.html b/public/index.html
index 6ea539e..99d1de2 100644
--- a/public/index.html
+++ b/public/index.html
@@ -8,6 +8,47 @@
 </head>
 <body>
 <div id="app"></div>
+<script>
+  window.urls_update = [
+      'project/project_collect/collect',
+      'project/project_member/inviteMember',
+      'project/invite_link/save',
+      'project/account/resume',
+      'project/account/forbid',
+      'project/events/save',
+  ]
+  window.urls = [
+      ...window.urls_update,
+
+      'project/login',
+      'project/file',
+      'project/task/selfList',
+      'project/project/getLogBySelfProject',
+      'project/project_features',
+      'project/project_version',
+      'project/events/getEventsListByCalendar',
+      'project/account/_allList',
+      'index/index/checkInstall',
+      'project/index/systemConfig',
+      'project/project',
+      'project/index',
+      'project/account',
+      'project/department',
+      'project/task_stages',
+      'project/project_template',
+      'project/notify',
+      'project/menu/menu',
+      'project/project/selfList',
+      'project/project_member/_listForInvite',
+      'project/project_member/searchInviteMember',
+      'project/project/read',
+      'project/task_stages/tasks',
+      'project/organization/_getOrgList',
+      'project/notify/noReads',
+      'project/project_member/index'
+  ]
+</script>
+
 <!-- built files will be auto injected -->
 <!--<script src="https://webapi.amap.com/js/marker.js"></script>
 <script type="text/javascript"
diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index 5e58b88..9757c5e 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -24,7 +24,16 @@ const $http = Axios.create(axiosConfig);
 $http.interceptors.request.use(
     config => {
         //正在请求更新token时，其他接口等待
+        if (window.urls && window.urls.indexOf(config.url) >= 0) {
+            config.url2 = config.url
+            config.data2 = config.data || {}
+        }
         config.url = utils.getApiUrl(config.url);
+        if (config.url2 && !config.is_check_data_diff) {
+            config.url = getApiUrl2(config.url2);
+        } else if (!config.is_check_data_diff) {
+            console.warn('old call:', config.url, config)
+        }
         if (config.method === 'post') {
             const querystring = require('querystring');
             config.data = querystring.stringify(config.data);
@@ -48,6 +57,24 @@ $http.interceptors.request.use(
 // After request
 $http.interceptors.response.use(
     response => {
+        let is_check_data_diff = false
+        let response_ori = response
+        if (response.config.url2
+                && !response.config.is_check_data_diff
+                && window.urls_update.indexOf(response.config.url2) < 0) {
+            let url2 = response.config.url2
+            is_check_data_diff = true;
+            try {
+                $http.post(url2, response.config.data2, {is_check_data_diff:true})
+                .then ( data => {
+                    if (diff(data, response_ori.data, data, response_ori.data, {response:response_ori})) {
+                        console.error('diff url:', url2, data, response_ori.data)
+                    }
+                })
+            }catch(ex) {
+                console.error('ex', ex)
+            }
+        }
         response = response.data;
         response.code = Number(response.code);
         switch (response.code) {
@@ -166,4 +193,231 @@ $http.interceptors.response.use(
     }
 );
 
+let sort = function(list) {
+    try {
+        return list.sort(function (a, b) {
+            let aValue = a.show_slider ? 'a' : 'b';
+            let bValue = b.show_slider ? 'a' : 'b';
+            if (aValue != bValue) {
+                return aValue.localeCompare(bValue)
+            }
+            aValue = aValue + (parseInt(a.sort ? a.sort : 0) + 10000000)
+            bValue = bValue + (parseInt(b.sort ? b.sort : 0) + 10000000)
+            if (aValue != bValue) {
+                return aValue.localeCompare(bValue)
+            }
+            aValue = aValue + (a.name || '') + ','
+            bValue = bValue + (b.name || '') + ','
+            if (aValue != bValue) {
+                return aValue.localeCompare(bValue)
+            }
+            aValue = aValue + (a.code || '') + ','
+            bValue = bValue + (b.code || '') + ','
+            if (aValue != bValue) {
+                return aValue.localeCompare(bValue)
+            }
+            aValue = aValue + (a.title || '') + ','
+            bValue = bValue + (b.title || '') + ','
+            if (aValue != bValue) {
+                return aValue.localeCompare(bValue)
+            }
+            aValue = aValue + (a.id || '') + ','
+            bValue = bValue + (b.id || '') + ','
+            if (aValue != bValue) {
+                return aValue.localeCompare(bValue)
+            }
+            return (a+'').localeCompare(b+'')
+        });
+    }catch (ex) {
+        console.error('ex', ex)
+        console.error('list', list)
+        return list
+    }
+}
+
+var diff = function(item, item2, data, data2, params) {
+    if (!('miss_null_prop' in params)) params.miss_null_prop = {}
+    if (!('miss_prop' in params)) params.miss_prop = {}
+    if (!('diff_prop' in params)) params.diff_prop = {}
+        
+    const { miss_null_prop, miss_prop, diff_prop, response } = params
+
+    if (item !== null && item2 !== null && item instanceof Array && item2 instanceof Array) {
+        if (item.length != item2.length) {
+            console.error('data length diff:', item, item2, data, data2);
+            return true;
+        }
+        let isDiff = false
+        for(let i = 0; i < item.length; i++) {
+            let _item = item[i]
+            let _item2 = item2[i]
+            if (diff(_item, _item2, data, data2, params)) {
+                console.error('is diff, i:',i,',item:', _item, ',item2:', _item2, ',', item, ',', item2, ',data:', data, ',data2:', data2)
+                isDiff = true;
+            }
+        }
+        if (isDiff) {
+            return true
+        }
+        // console.log('same array,length:', item.length, ',item:', item, ',item2:', item2, ',', data, ',', data2)
+        return false
+    }
+    let i_item, i_item2, d_item, d_item2
+    try {i_item = parseInt(item)}catch(ex) {}
+    try {i_item2 = parseInt(item2)}catch(ex) {}
+    try {d_item = parseFloat(item)}catch(ex) {}
+    try {d_item2 = parseFloat(item2)}catch(ex) {}
+    if (item !== null && item2 !== null
+            && item !== undefined && item2 !== undefined
+            && item !== true && item2 !== true
+            && item2 !== false && item2 !== false
+            && item !== item+'' && item2 !== item2+''
+            && item !== i_item && item2 !== i_item2
+            && item !== d_item && item2 !== d_item2
+            && item instanceof Object && item2 instanceof Object) {
+        let isDiff = false
+        for(let p in item) {
+            if (p == 'description'
+                    || p == 'deleted_time'
+                    || p == 'schedule'
+                    || p == 'access_control_type'
+                    || p == 'order'
+                    || p == 'template_code'
+                    || p == 'organization_code'
+                    || p == 'prefix'
+                    || p == 'open_prefix'
+                    || p == 'archive'
+                    || p == 'archive_time'
+                    || p == 'open_begin_time'
+                    || p == 'open_task_private'
+                    || p == 'task_board_theme'
+                    || p == 'private'
+                    || p == 'cover'
+                    || p == 'auto_update_schedule'
+            ) {
+                //这个接口的这些属性是project的属性
+                if (response.config.url.indexOf('project/task/selfList') >= 0) {
+                    continue;
+                }
+            }
+
+            if (!(p in item2)) {
+                if (item[p] === null) {
+                    if (!(p in miss_null_prop)) {
+                        miss_null_prop[p] = p
+                        // console.log('miss prop(old is null),p:', p, ',item:', item, ',item2:', item2, ',', data, data2);
+                    }
+                    continue;
+                }
+                if (!(p in miss_prop)) {
+                    miss_prop[p] = p
+                    isDiff = true
+                    console.error('miss prop,p:', p, item[p], ',item:', item, ',item2:', item2, ',', data, data2);
+                }
+                continue
+            }
+            try {i_item = parseInt(item[p])}catch(ex) {}
+            try {i_item2 = parseInt(item2[p])}catch(ex) {}
+            try {d_item = parseFloat(item[p])}catch(ex) {}
+            try {d_item2 = parseFloat(item2[p])}catch(ex) {}
+            if (response.config.url.indexOf('project/project/getLogBySelfProject') < 0
+                    && response.config.url.indexOf('project/index') < 0
+            ) {
+                //接口排序一致，或php接口中没有用于排序的字段
+                if (item[p] && item[p] instanceof Array && item[p].length) {
+                    item[p] = sort(item[p])
+                }
+                if (item2[p] && item2[p] instanceof Array && item2[p].length) {
+                    item2[p] = sort(item2[p])
+                }
+            }
+            if (item[p] && item2[p] && item[p] instanceof Array && item2[p] instanceof Array && 'length' in item[p] && 'length' in item2[p]) {
+                if (item[p].length == 0 && (p == 'tasks' || p == 'unDoneTasks' || p == 'doneTasks')) {
+                    //因为接口返回后，会被前端处理，所以这些属性无需校验
+                    if (response.config.url.indexOf('project/task_stages') >= 0) {
+                        continue;
+                    }
+                }
+
+                if (diff(item[p], item2[p], data, data2, params)) {
+                    console.error('data length diff for prop:', p, item[p].length, item2[p].length);
+                    isDiff = true;
+                }
+                continue
+            }
+
+            if (p == 'tasksLoading') {
+                //因为接口返回后，会被前端处理，所以这些属性无需校验
+                if (response.config.url.indexOf('project/task_stages') >= 0) {
+                    continue;
+                }
+            }
+
+            if (p == 'page' && item[p] == item2[p]) {
+                //page 应为数值类型，但是在以下几个接口中php接口返回的类型为字符串
+                if (response.config.url.indexOf('project/task_stages') >= 0
+                        || response.config.url.indexOf('project/project_member/index') >= 0
+                        || response.config.url.indexOf('project/department') >= 0
+                        || response.config.url.indexOf('project/account') >= 0
+                ) {
+                    continue;
+                }
+                console.log('response for page', response)
+                continue
+            }
+
+            if (item[p] !== null && item2[p] !== null
+                    && item[p] !== undefined && item2[p] !== undefined
+                    && item[p] !== true && item2[p] !== true
+                    && item[p] !== false && item2[p] !== false
+                    && item[p] !== item[p]+'' && item2[p] !== item2[p]+''
+                    && item[p] !== i_item && item2[p] !== i_item2
+                    && item[p] !== d_item && item2[p] !== d_item2
+                    && item[p] instanceof Object && item2[p] instanceof Object) {
+                if (diff(item[p], item2[p], data, data2, params)) {
+                    isDiff = true;
+                }
+                continue
+            }
+            if (item[p] === null && item2[p] === undefined) {
+                if (!(p in miss_null_prop)) {
+                    miss_null_prop[p] = p
+                    // console.error('miss prop(old is null),p:',p,',item:', item[p], ',item2:', item2[p], ',', item, item2, data, data2)
+                }
+            } else if (item[p] !== item2[p]) {
+                if (!(p in diff_prop)) {
+                    diff_prop[p] = p
+                    console.error('data diff,p:',p,',item:', item[p], ',item2:', item2[p], ',', item, item2, data, data2)
+                }
+                isDiff = true
+            }
+        }
+        if (isDiff) {
+            return true
+        }
+        // console.log('same obj,:', ',item:', item, ',item2:', item2, ',data:', data, ',data2:', data2)
+    } else if (item === null && item2 === undefined) {
+        console.log('miss prop(old is null):', ',item:', item, ',item2:', item2, ',', data, data2);
+    } else if (item !== item2) {
+        console.error('data diff,',',item:', item, ',item2:', item2, ',', data, data2)
+        return true
+    }
+    return false
+}
+
+const getApiUrl2 = (api) => {
+    if (
+        process.env.VUE_APP_CROSS_DOMAIN === 'true'
+        || process.env.VUE_APP_CROSS_DOMAIN === true
+        || process.env.VUE_APP_CROSS_DOMAIN === ''
+        || process.env.VUE_APP_CROSS_DOMAIN === null) {
+        return process.env.VUE_APP_API_URL + '2/' + api; //开启跨域直接返回
+    }
+    if (process.env.NODE_ENV === 'production') {
+        return process.env.VUE_APP_API_URL + '2/' + api;
+    } else {
+        return '/api2/' + api;
+    }
+};
+
 export default $http;
diff --git a/vue.config.js b/vue.config.js
index b85facf..ab1f863 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -24,6 +24,15 @@ module.exports = {
         https: false,
         hotOnly: false,
         proxy: { // 配置跨域
+            '/api2': {
+                //要访问的跨域的api的域名
+                target: `${process.env.VUE_APP_API_URL2}/`,
+                ws: true,
+                changOrigin: true,
+                pathRewrite: {
+                    '^/api2': ''
+                }
+            },
             '/api': {
                 //要访问的跨域的api的域名
                 target: `${process.env.VUE_APP_API_URL}/`,
-- 
Gitee


From 03983ff540b8a0bab284ab3baeabf7711a83f67d Mon Sep 17 00:00:00 2001
From: Brook yu <3032470652@qq.com>
Date: Mon, 8 Aug 2022 18:24:46 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=9C=E9=87=8D=E6=96=B0=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E5=AF=BC=E8=87=B4=E7=9A=84=E9=80=BB=E8=BE=91=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=9A=E5=89=8D=E7=AB=AFdataSource=E6=9C=80?=
 =?UTF-8?q?=E5=A5=BD=E4=B8=8D=E8=A6=81=E7=94=A8index=E4=BD=9C=E4=B8=BAlist?=
 =?UTF-8?q?=E7=9A=84key=EF=BC=8C=E5=90=A6=E5=88=99=E9=87=8D=E6=8E=92?=
 =?UTF-8?q?=E5=90=8E=E4=BC=9A=E5=AF=BC=E8=87=B4=E9=80=BB=E8=BE=91=E6=B7=B7?=
 =?UTF-8?q?=E4=B9=B1=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/index.html     |  5 +++++
 src/assets/js/http.js | 12 +++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/public/index.html b/public/index.html
index 99d1de2..6cac56b 100644
--- a/public/index.html
+++ b/public/index.html
@@ -17,6 +17,11 @@
       'project/account/forbid',
       'project/events/save',
   ]
+  window.urls_without_sort = [
+    'project/project/getLogBySelfProject',
+    'project/index',
+    'project/account/_allList',
+  ]
   window.urls = [
       ...window.urls_update,
 
diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index 9757c5e..68c62a2 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -320,9 +320,15 @@ var diff = function(item, item2, data, data2, params) {
             try {i_item2 = parseInt(item2[p])}catch(ex) {}
             try {d_item = parseFloat(item[p])}catch(ex) {}
             try {d_item2 = parseFloat(item2[p])}catch(ex) {}
-            if (response.config.url.indexOf('project/project/getLogBySelfProject') < 0
-                    && response.config.url.indexOf('project/index') < 0
-            ) {
+            let needSort = true;
+            for(let url_without_sort in window.urls_without_sort) {
+                url_without_sort = window.urls_without_sort[url_without_sort]
+                if (response.config.url.indexOf(url_without_sort) >= 0) {
+                    needSort = false;
+                    break;
+                }
+            }
+            if (needsort) {
                 //接口排序一致，或php接口中没有用于排序的字段
                 if (item[p] && item[p] instanceof Array && item[p].length) {
                     item[p] = sort(item[p])
-- 
Gitee


From 21cc4b77c55eb3dc21b87b3e210767ee22ceca11 Mon Sep 17 00:00:00 2001
From: Brook yu <3032470652@qq.com>
Date: Mon, 8 Aug 2022 18:26:12 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=98=E9=87=8F?=
 =?UTF-8?q?=E5=90=8D=E6=8B=BC=E5=86=99=E9=94=99=E8=AF=AF=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/js/http.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index 68c62a2..947e6b2 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -328,7 +328,7 @@ var diff = function(item, item2, data, data2, params) {
                     break;
                 }
             }
-            if (needsort) {
+            if (needSort) {
                 //接口排序一致，或php接口中没有用于排序的字段
                 if (item[p] && item[p] instanceof Array && item[p].length) {
                     item[p] = sort(item[p])
-- 
Gitee


From 07129ee718fbc90ebf5312b1069d99c9561f41b7 Mon Sep 17 00:00:00 2001
From: Brook yu <3032470652@qq.com>
Date: Tue, 9 Aug 2022 08:47:35 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E5=90=8E=E5=85=88=E8=BF=9B=E8=A1=8C=E4=B8=80=E6=AC=A1=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=EF=BC=8C=E9=81=BF=E5=85=8D=E5=89=8D=E7=AB=AF=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E9=80=BB=E8=BE=91=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/index.html     | 5 ++++-
 src/assets/js/http.js | 5 +++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/public/index.html b/public/index.html
index 6cac56b..448bda6 100644
--- a/public/index.html
+++ b/public/index.html
@@ -17,10 +17,13 @@
       'project/account/forbid',
       'project/events/save',
   ]
+
+  //以下接口不可在比对php接口时进行重新排序
+  //project/index是因为排序后前端会导致错乱
+  //project/project/getLogBySelfProject是因为没有用于排序的关键字
   window.urls_without_sort = [
     'project/project/getLogBySelfProject',
     'project/index',
-    'project/account/_allList',
   ]
   window.urls = [
       ...window.urls_update,
diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index 947e6b2..c5d3270 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -64,6 +64,11 @@ $http.interceptors.response.use(
                 && window.urls_update.indexOf(response.config.url2) < 0) {
             let url2 = response.config.url2
             is_check_data_diff = true;
+
+            //这里调用diff的目的是为了先进行一次排序
+            //排序的目的是为了避免获取php接口后再排序会导致前端逻辑异常
+            diff(response_ori.data, response_ori.data, response_ori.data, response_ori.data, {response:response_ori});
+
             try {
                 $http.post(url2, response.config.data2, {is_check_data_diff:true})
                 .then ( data => {
-- 
Gitee


From 7e0e49579ae359a30509fe6d54286984d6542227 Mon Sep 17 00:00:00 2001
From: Brook yu <3032470652@qq.com>
Date: Tue, 9 Aug 2022 09:25:44 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E5=8F=B0-=E6=97=A5=E7=A8=8B-=E6=9F=A5=E7=9C=8B=E6=9B=B4?=
 =?UTF-8?q?=E5=A4=9A=E6=97=A5=E7=A8=8B=E6=8C=89=E9=92=AE=E7=9A=84page?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index aa40d7e..b0c524f 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -511,7 +511,7 @@
             },
             onLoadMoreEvents(page, PageSize) {
                 this.events.loadingMore = true;
-                this.events.page = page;
+                this.events.page++;
                 this.getEvents();
             },
             confirmJoinEvents(events, status) {
-- 
Gitee

