From f851b0bf1c702373ff4cb2dab59708fc877c0681 Mon Sep 17 00:00:00 2001
From: cKey <35512826+colinin@users.noreply.github.com>
Date: Wed, 16 Sep 2020 11:07:28 +0800
Subject: [PATCH 1/3] Re-reference a valid EventBus component

---
 aspnet-core/services/cleanup-logs.bat         |  1 +
 ...AbpIdentityServerAdminHttpApiHostModule.cs |  4 +-
 ...UN.Abp.IdentityServer4.HttpApi.Host.csproj |  4 +-
 .../Program.cs                                |  2 +-
 .../Startup.cs                                |  2 +-
 vueJs/package-lock.json                       |  6 --
 vueJs/package.json                            |  1 -
 vueJs/src/components/EventBus/events.d.ts     | 21 +++++
 vueJs/src/components/EventBus/index.d.ts      | 10 +++
 vueJs/src/components/EventBus/index.js        | 83 +++++++++++++++++++
 vueJs/src/components/EventBus/vue.d.ts        |  7 ++
 vueJs/src/components/Notification/index.vue   |  9 +-
 vueJs/src/main.ts                             |  2 +-
 vueJs/src/mixins/DataListMiXin.ts             |  8 +-
 vueJs/src/mixins/EventBusMiXin.ts             | 59 +++++++++++++
 vueJs/src/utils/request.ts                    | 40 +++++----
 16 files changed, 220 insertions(+), 39 deletions(-)
 create mode 100644 vueJs/src/components/EventBus/events.d.ts
 create mode 100644 vueJs/src/components/EventBus/index.d.ts
 create mode 100644 vueJs/src/components/EventBus/index.js
 create mode 100644 vueJs/src/components/EventBus/vue.d.ts
 create mode 100644 vueJs/src/mixins/EventBusMiXin.ts

diff --git a/aspnet-core/services/cleanup-logs.bat b/aspnet-core/services/cleanup-logs.bat
index 74f137b75..dfeccae34 100644
--- a/aspnet-core/services/cleanup-logs.bat
+++ b/aspnet-core/services/cleanup-logs.bat
@@ -8,6 +8,7 @@ del .\platform\LINGYUN.Platform.HttpApi.Host\Logs /Q
 del .\apigateway\LINGYUN.ApiGateway.Host\Logs /Q
 del .\apigateway\LINGYUN.ApiGateway.HttpApi.Host\Logs /Q
 del .\account\AuthServer.Host\Logs /Q
+del .\identity-server\LINGYUN.Abp.IdentityServer4.HttpApi.Host\Logs /Q
 del .\messages\LINGYUN.Abp.MessageService.HttpApi.Host\Logs /Q
 del .\admin\LINGYUN.Abp.BackendAdmin.HttpApi.Host\Logs /Q
 
diff --git a/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/AbpIdentityServerAdminHttpApiHostModule.cs b/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/AbpIdentityServerAdminHttpApiHostModule.cs
index b79432c67..651b2a8c4 100644
--- a/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/AbpIdentityServerAdminHttpApiHostModule.cs
+++ b/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/AbpIdentityServerAdminHttpApiHostModule.cs
@@ -1,4 +1,4 @@
-using DotNetCore.CAP;
+using DotNetCore.CAP;
 using IdentityModel;
 using LINGYUN.Abp.EventBus.CAP;
 using LINGYUN.Abp.ExceptionHandling;
@@ -267,4 +267,4 @@ namespace LINGYUN.Abp.IdentityServer4
             app.UseConfiguredEndpoints();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/LINGYUN.Abp.IdentityServer4.HttpApi.Host.csproj b/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/LINGYUN.Abp.IdentityServer4.HttpApi.Host.csproj
index 8de7ac6b4..b55623fe4 100644
--- a/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/LINGYUN.Abp.IdentityServer4.HttpApi.Host.csproj
+++ b/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/LINGYUN.Abp.IdentityServer4.HttpApi.Host.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
@@ -61,4 +61,4 @@
     <ProjectReference Include="..\..\..\modules\tenants\LINGYUN.Abp.MultiTenancy.DbFinder\LINGYUN.Abp.MultiTenancy.DbFinder.csproj" />
   </ItemGroup>
 
-</Project>
+</Project>
\ No newline at end of file
diff --git a/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/Program.cs b/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/Program.cs
index 73223e247..454c84767 100644
--- a/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/Program.cs
+++ b/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/Program.cs
@@ -46,4 +46,4 @@ namespace LINGYUN.Abp.IdentityServer4.HttpApi.Host
                 .UseSerilog()
                 .UseAutofac();
     }
-}
+}
\ No newline at end of file
diff --git a/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/Startup.cs b/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/Startup.cs
index 15c1915db..bd45bfb5c 100644
--- a/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/Startup.cs
+++ b/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/Startup.cs
@@ -15,4 +15,4 @@ namespace LINGYUN.Abp.IdentityServer4.HttpApi.Host
             app.InitializeApplication();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/vueJs/package-lock.json b/vueJs/package-lock.json
index ba0978c00..be3cf43d6 100644
--- a/vueJs/package-lock.json
+++ b/vueJs/package-lock.json
@@ -21314,12 +21314,6 @@
         }
       }
     },
-    "vue-events": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npm.taobao.org/vue-events/download/vue-events-3.1.0.tgz",
-      "integrity": "sha1-jiMSHDRbT/Mu4FT5eVmV8+NEsn0=",
-      "dev": true
-    },
     "vue-hot-reload-api": {
       "version": "2.3.4",
       "resolved": "https://registry.npm.taobao.org/vue-hot-reload-api/download/vue-hot-reload-api-2.3.4.tgz",
diff --git a/vueJs/package.json b/vueJs/package.json
index e17da4654..e5f50de33 100644
--- a/vueJs/package.json
+++ b/vueJs/package.json
@@ -117,7 +117,6 @@
     "typescript": "^3.8.3",
     "vue-cli-plugin-element": "^1.0.1",
     "vue-cli-plugin-style-resources-loader": "^0.1.4",
-    "vue-events": "^3.1.0",
     "vue-template-compiler": "^2.6.11",
     "vue-virtual-scroll-list": "^2.1.8",
     "webpack": "^4.42.1"
diff --git a/vueJs/src/components/EventBus/events.d.ts b/vueJs/src/components/EventBus/events.d.ts
new file mode 100644
index 000000000..11416484f
--- /dev/null
+++ b/vueJs/src/components/EventBus/events.d.ts
@@ -0,0 +1,21 @@
+import { PluginFunction } from 'vue'
+
+export declare class VueEvents {
+  static install: PluginFunction<never>
+
+  emit(event: string, ...args: any[]): void
+
+  fire(event: string, ...args: any[]): void
+
+  on(event: string, callback: (eventData: any) => void): void
+
+  listen(event: string, callback: (eventData: any) => void): void
+
+  once(event: string, callback: (eventData: any) => void): void
+
+  off(event:string, callback?: (eventData: any) => void): void
+
+  unlisten (event:string, callback?: (eventData: any) => void): void
+
+  removeAll(): void
+}
diff --git a/vueJs/src/components/EventBus/index.d.ts b/vueJs/src/components/EventBus/index.d.ts
new file mode 100644
index 000000000..551d2eac4
--- /dev/null
+++ b/vueJs/src/components/EventBus/index.d.ts
@@ -0,0 +1,10 @@
+import './vue';
+import * as E from './events'
+
+declare namespace VueEvents {
+  export type VueEvents = E.VueEvents;
+}
+
+declare class VueEvents extends E.VueEvents {}
+
+export default VueEvents
diff --git a/vueJs/src/components/EventBus/index.js b/vueJs/src/components/EventBus/index.js
new file mode 100644
index 000000000..2efeb3976
--- /dev/null
+++ b/vueJs/src/components/EventBus/index.js
@@ -0,0 +1,83 @@
+/**
+ * vue-event-handler typescript adapter
+ * src: https://github.com/sandeepk01/vue-event-handler
+ * reference: https://github.com/cklmercer/vue-events
+ */
+
+function plugin(Vue) {
+  if (plugin.installed) {
+    return
+  }
+  const evmap = {}
+  const events = new Vue({
+    methods: {
+      fire(name, data = null) {
+        this.emit(name, data)
+      },
+      emit(name, data = null) {
+        this.$emit(name, data)
+      },
+      listen(name, cb) {
+        this.on(name, cb)
+      },
+      listenOnce(name, cb) {
+        this.once(name, cb)
+      },
+      on(name, cb) {
+        evmap[name] = cb
+        this.$on(name, cb)
+      },
+      once(name, cb) {
+        evmap[name] = cb
+        this.$once(name, cb)
+      },
+      off(name, cb) {
+        if (!cb) {
+          cb = evmap[name]
+        }
+        this.$off(name, cb)
+      },
+      unlisten(name, cb) {
+        this.off(name, cb)
+      },
+      removeAll() {
+        this.$off()
+      }
+    }
+  })
+
+  Vue.mixin({
+    beforeCreate() {
+      if (typeof this.$options.events !== 'object') return
+      let eventMap = {}
+      for (const key in this.$options.events) {
+        eventMap[key] = this.$options.events[key].bind(this)
+      }
+      this.$once('hook:beforeMount', () => {
+        for (const key in eventMap) {
+          events.$on(key, eventMap[key])
+        }
+      })
+      this.$once('hook:beforeDestroy', () => {
+        for (const key in eventMap) {
+          events.$off(key, eventMap[key])
+        }
+        eventMap = null
+      })
+    }
+  })
+
+  Vue.events = events
+
+  Object.defineProperty(Vue.prototype, '$events', {
+    get() {
+      return events
+    }
+  })
+}
+
+if (typeof window !== 'undefined' && window.Vue) {
+  window.Vue.use(plugin)
+}
+
+export default plugin
diff --git a/vueJs/src/components/EventBus/vue.d.ts b/vueJs/src/components/EventBus/vue.d.ts
new file mode 100644
index 000000000..47d0a9f40
--- /dev/null
+++ b/vueJs/src/components/EventBus/vue.d.ts
@@ -0,0 +1,7 @@
+import VueEvents from './index';
+
+declare module 'vue/types/vue' {
+  interface Vue {
+    $events: VueEvents
+  }
+}
diff --git a/vueJs/src/components/Notification/index.vue b/vueJs/src/components/Notification/index.vue
index 37d4f5756..09339c7c9 100644
--- a/vueJs/src/components/Notification/index.vue
+++ b/vueJs/src/components/Notification/index.vue
@@ -33,7 +33,8 @@
 </template>
 
 <script lang="ts">
-import { Component, Vue } from 'vue-property-decorator'
+import Component, { mixins } from 'vue-class-component'
+import EventBusMiXin from '@/mixins/EventBusMiXin'
 import UserNofitications from './components/UserNofitications.vue'
 
 @Component({
@@ -42,14 +43,14 @@ import UserNofitications from './components/UserNofitications.vue'
     UserNofitications
   }
 })
-export default class extends Vue {
+export default class extends mixins(EventBusMiXin) {
   private notificationCount = 0
 
   created() {
-    this.$events.on('onNotificationReceived', () => {
+    this.subscribe('onNotificationReceived', () => {
       this.notificationCount += 1
     })
-    this.$events.on('onNotificationReadChanged', () => {
+    this.subscribe('onNotificationReadChanged', () => {
       this.notificationCount -= 1
     })
   }
diff --git a/vueJs/src/main.ts b/vueJs/src/main.ts
index 2ac3aa9b5..00e5e0d17 100644
--- a/vueJs/src/main.ts
+++ b/vueJs/src/main.ts
@@ -7,7 +7,7 @@ import SvgIcon from 'vue-svgicon'
 
 import uploader from 'vue-simple-uploader'
 import contextMenu from 'vue-contextmenujs'
-import VueEvents from 'vue-events'
+import VueEvents from '@/components/EventBus'
 
 import '@/styles/element-variables.scss'
 import 'view-design/dist/styles/iview.css'
diff --git a/vueJs/src/mixins/DataListMiXin.ts b/vueJs/src/mixins/DataListMiXin.ts
index 01303f6bc..18913d1c6 100644
--- a/vueJs/src/mixins/DataListMiXin.ts
+++ b/vueJs/src/mixins/DataListMiXin.ts
@@ -37,6 +37,8 @@ export default class DataListMiXin extends Vue {
    */
   protected refreshPagedData() {
     this.dataLoading = true
+    // 这里还可以处理对于过滤器的变动
+    // 例如 abp 框架的skipCount区别于常见的pageNumber
     this.getPagedList(this.dataFilter)
       .then(res => {
         this.dataList = res.items
@@ -52,9 +54,7 @@ export default class DataListMiXin extends Vue {
    */
   protected getList(filter: any): Promise<ListResultDto<any>> {
     console.log(filter)
-    return new Promise<ListResultDto<any>>((resolve) => {
-      return resolve(new ListResultDto<any>())
-    })
+    return this.getEmptyList()
   }
 
   /** 获取空数据 */
@@ -96,4 +96,6 @@ export default class DataListMiXin extends Vue {
   protected l(name: string, values?: any[] | { [key: string]: any }) {
     return this.$t(name, values).toString()
   }
+
+  /** 还可以添加 eventbus 的通用处理器 */
 }
diff --git a/vueJs/src/mixins/EventBusMiXin.ts b/vueJs/src/mixins/EventBusMiXin.ts
new file mode 100644
index 000000000..777c56f0d
--- /dev/null
+++ b/vueJs/src/mixins/EventBusMiXin.ts
@@ -0,0 +1,59 @@
+import { Component, Vue } from 'vue-property-decorator'
+
+/**
+ * 封装领域事件组件
+ * 提供简单的防重复订阅以及组件销毁自动注销事件功能
+ */
+@Component
+export default class EventBusMiXin extends Vue {
+  protected eventMap = new Array<string>()
+
+  /** 
+   * 组件销毁事件
+   * 注销所有事件
+   */
+  destroyed() {
+    this.$events.removeAll()
+    this.eventMap.length = 0
+  }
+
+  /**
+   * 订阅事件
+   * @param name 事件名称
+   * @param callback 回调函数
+   */
+  protected subscribe(name: string, callback: (eventData: any) => void) {
+    if (this.eventMap.includes(name)) {
+      return
+    }
+    this.eventMap.push(name)
+    this.$events.on(name, callback)
+  }
+
+  /**
+   * 订阅事件一次
+   * @param name 事件名称
+   * @param callback 回调函数
+   */
+  protected subscribeOne(name: string, callback: (eventData: any) => void) {
+    this.$events.once(name, callback)
+  }
+
+  /**
+   * 注销订阅事件
+   * @param name 事件名称
+   * @param callback 注销回调
+   */
+  protected unSubscribe(name: string, callback: (eventData: any) => void | undefined) {
+    this.$events.off(name, callback)
+  }
+
+  /**
+   * 触发事件
+   * @param name 事件名称
+   * @param args 事件参数列表
+   */
+  protected trigger(name: string, ...args: any[]) {
+    this.$events.emit(name, args)
+  }
+}
diff --git a/vueJs/src/utils/request.ts b/vueJs/src/utils/request.ts
index f26703fd8..44df4c04a 100644
--- a/vueJs/src/utils/request.ts
+++ b/vueJs/src/utils/request.ts
@@ -18,20 +18,21 @@ service.interceptors.request.use(
     if (tenantId) {
       config.headers.__tenant = tenantId
     }
-    if (config.url === '/connect/token') {
-      return config
-    }
-    // Add X-Access-Token header to every request, you can add other custom headers here
-    if (UserModule.token) {
-      config.headers.Authorization = UserModule.token
-    }
     // abp官方类库用的 zh-Hans 的简体中文包 这里直接粗暴一点
+    // 顺序调整到token之前
     const language = getLanguage()
     if (language?.indexOf('zh') !== -1) {
       config.headers['Accept-Language'] = 'zh-Hans'
     } else {
       config.headers['Accept-Language'] = language
     }
+    if (config.url === '/connect/token') {
+      return config
+    }
+    // Add X-Access-Token header to every request, you can add other custom headers here
+    if (UserModule.token) {
+      config.headers.Authorization = UserModule.token
+    }
     return config
   },
   (error) => {
@@ -43,21 +44,21 @@ function l(name: string) {
   return i18n.tc(name)
 }
 
-function showError(error: any, status: number) {
+function showError(response: any) {
   let message = ''
   let title = ''
-  if (error && error.error) {
-    if (error.error.details) {
-      message = error.error.details
-      title = error.error.message
-    } else if (error.error.message) {
-      message = error.error.message
+  if (response.data && response.data.error) {
+    if (response.data.error.details) {
+      message = response.data.error.details
+      title = response.data.error.message
+    } else if (response.data.error.message) {
+      message = response.data.error.message
     }
   } else {
-    switch (status) {
+    switch (response.status) {
       case 400:
-        title = error.error
-        message = error.error_description
+        title = response.data.error
+        message = response.data.error_description
         break
       case 401:
         title = l('AbpUi.DefaultErrorMessage401')
@@ -79,6 +80,9 @@ function showError(error: any, status: number) {
         message = l('AbpUi.InternalServerErrorMessage')
         break
       default:
+        // 从响应中返回原始状态说明
+        title = response.statusText
+        message = response.status + ' ' + response.statusText
         break
     }
   }
@@ -116,7 +120,7 @@ service.interceptors.response.use(
         })
       })
     } else {
-      showError(error.response.data, error.response.status)
+      showError(error.response)
     }
     return Promise.reject(error)
   }

From a75c650ec501b8cb32cd5fc41830e6aeb5acd368 Mon Sep 17 00:00:00 2001
From: cKey <35512826+colinin@users.noreply.github.com>
Date: Wed, 16 Sep 2020 16:28:27 +0800
Subject: [PATCH 2/3] fix to send register phone verify code

---
 .../LINGYUN/Abp/Account/AccountAppService.cs  |   2 +-
 .../LINGYUN.ApiGateway.Host/event-bus-cap.db  | Bin 32768 -> 32768 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.Application/LINGYUN/Abp/Account/AccountAppService.cs b/aspnet-core/modules/account/LINGYUN.Abp.Account.Application/LINGYUN/Abp/Account/AccountAppService.cs
index b2b54e631..005e95f11 100644
--- a/aspnet-core/modules/account/LINGYUN.Abp.Account.Application/LINGYUN/Abp/Account/AccountAppService.cs
+++ b/aspnet-core/modules/account/LINGYUN.Abp.Account.Application/LINGYUN/Abp/Account/AccountAppService.cs
@@ -191,7 +191,7 @@ namespace LINGYUN.Abp.Account
                     verifyCacheItem.VerifyCode = phoneVerifyCode.ToString();
                     var templateCode = await SettingProvider.GetOrDefaultAsync(AccountSettingNames.SmsRegisterTemplateCode, ServiceProvider);
                     await SendPhoneVerifyMessageAsync(templateCode, input.PhoneNumber, phoneVerifyCode.ToString());
-                    return;
+                    break;
                 case PhoneNumberVerifyType.Signin:
                     var phoneSigninCode = await SendSigninVerifyCodeAsync(input.PhoneNumber);
                     verifyCacheItem.VerifyCode = phoneSigninCode;
diff --git a/aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/event-bus-cap.db b/aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/event-bus-cap.db
index 37333ae2c675090e9ccdc5b5895432f33f5eeed8..96df554c4b590699ee6d78a40774d0189bb8586b 100644
GIT binary patch
delta 205
zcmZo@U}|V!njp<+K2gS*(R^dV5`F;&0R{#pI|SU=sKCU>dyY-8k=d{<or8ga_t0i1
zA$KMg1_ti(&AlRE7N^eU8)9G<+r!Pul3*6gw9R?aU>1}2=AE+MOne}t`8UJhW+8=z
z{H_cP48B5ge~#$@S!_U#1CX=#K`R3TE0ALh<ZKNAvVfK`r~x@ES080yU<Ps|ft>z5
Qu0W>(IXs(x=yL=B0IPd1LjV8(

delta 204
zcmZo@U}|V!njp<+Hc`fz(QISF5`F<TCOZb+t=w6h@@!XFI+^S?HYzaj@t$K7Y-BcU
zOXq0uVB^{BB;?LCxjRH)^Gp$ICYBZt7M{&F#N0tFW}eN;l3*4S&*nU7FpH6A^G;cB
zCO$U)%?$is_@DFN;y=rOV6%|ILVi~sW;RA4xj)BrTp1YHpq#xAS{WEvp`5KDtPBh+
dP|nKLM;REHp`89bKs`*{%xs*Sf9P`r004IkG-?0<


From 2a399057d1ac9cc9ad006c191c609d93e3a2dfd2 Mon Sep 17 00:00:00 2001
From: cKey <35512826+colinin@users.noreply.github.com>
Date: Thu, 17 Sep 2020 09:23:19 +0800
Subject: [PATCH 3/3] add comment

---
 vueJs/src/mixins/EventBusMiXin.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vueJs/src/mixins/EventBusMiXin.ts b/vueJs/src/mixins/EventBusMiXin.ts
index 777c56f0d..89f5de908 100644
--- a/vueJs/src/mixins/EventBusMiXin.ts
+++ b/vueJs/src/mixins/EventBusMiXin.ts
@@ -8,7 +8,7 @@ import { Component, Vue } from 'vue-property-decorator'
 export default class EventBusMiXin extends Vue {
   protected eventMap = new Array<string>()
 
-  /** 
+  /**
    * 组件销毁事件
    * 注销所有事件
    */