Merge branch 'main' of github.com:Postcatlab/postcat

weirui88888 · Feb 16, 2023 · 3a2aab1 · 3a2aab1
2 parents 7f062d4 + 4bd7ea2
commit 3a2aab1
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 5 deletions.
diff --git a/publish.js b/publish.js
@@ -6,7 +6,7 @@ qiniu.conf.ACCESS_KEY = AK;
 qiniu.conf.SECRET_KEY = SK;
 
 const toLatest = name => name.replace(/\d+\.\d+\.\d+/, 'latest');
-const onlyName = name => name.replace(/build|release\//, '');
+const onlyName = name => name.replace(/build\/|release\//, '');
 
 // * 构建客户端实例
 const client = new qiniu.rs.Client();

diff --git a/src/workbench/browser/src/app/core/services/electron/electron.service.ts b/src/workbench/browser/src/app/core/services/electron/electron.service.ts
@@ -2,6 +2,7 @@ import { Injectable } from '@angular/core';
 // If you import a module but never use any of the imported values other than as TypeScript types,
 // the resulting javascript file will look as if you never imported the module at all.
 import { getSettings } from 'eo/workbench/browser/src/app/modules/system-setting/settings.service';
+import { TraceService } from 'eo/workbench/browser/src/app/shared/services/trace.service';
 import { getBrowserType } from 'eo/workbench/browser/src/app/utils/browser-type';
 import StorageUtil from 'eo/workbench/browser/src/app/utils/storage/storage.utils';
 
@@ -18,7 +19,7 @@ type DescriptionsItem = {
 })
 export class ElectronService {
   ipcRenderer;
-  constructor(private store: StoreService) {
+  constructor(private store: StoreService, private trace: TraceService) {
     // Conditional imports
     if (this.isElectron) {
       // Notes :
@@ -33,6 +34,7 @@ export class ElectronService {
       // https://www.electronjs.org/docs/latest/api/ipc-renderer#ipcrendererinvokechannel-args
       this.ipcRenderer = window.electron.ipcRenderer;
     }
+    this.trace.setUser({ client_type: this.isElectron ? 'client' : 'web' });
   }
 
   get isElectron(): boolean {

diff --git a/src/workbench/browser/src/app/core/services/language/language.service.ts b/src/workbench/browser/src/app/core/services/language/language.service.ts
@@ -2,6 +2,7 @@ import { Injectable } from '@angular/core';
 import { ElectronService } from 'eo/workbench/browser/src/app/core/services/electron/electron.service';
 import { LANGUAGES } from 'eo/workbench/browser/src/app/core/services/language/language.model';
 import { SettingService } from 'eo/workbench/browser/src/app/modules/system-setting/settings.service';
+import { TraceService } from 'eo/workbench/browser/src/app/shared/services/trace.service';
 import { APP_CONFIG } from 'eo/workbench/browser/src/environments/environment';
 
 @Injectable({
@@ -13,12 +14,13 @@ export class LanguageService {
   // Web from nginx setting and App from computer system setting
   systemLanguage;
   langHashMap = new Map().set('zh-Hans', 'zh').set('en-US', 'en');
-  constructor(private electron: ElectronService, private setting: SettingService) {
+  constructor(private electron: ElectronService, private setting: SettingService, private trace: TraceService) {
     //Curent language
     this.systemLanguage =
       this.languages.find(val => window.location.pathname.includes(`/${val.path}/`))?.value ||
       this.setting.settings?.['system.language'] ||
       (navigator.language.includes('zh') ? 'zh-Hans' : 'en-US');
+    this.trace.setUser({ app_language: this.systemLanguage });
   }
   get langHash() {
     return this.langHashMap.get(this.systemLanguage);

diff --git a/src/workbench/browser/src/app/layouts/navbar/btn-user/btn-user.component.ts b/src/workbench/browser/src/app/layouts/navbar/btn-user/btn-user.component.ts
@@ -29,7 +29,7 @@ import { StoreService } from '../../../shared/store/state.service';
       <eo-ng-dropdown-menu #userMenu>
         <ul nz-menu>
           <li class="px-[12px] py-[5px] font-bold">
-            {{ store.getUserProfile?.userNickName }}
+            {{ store.getUserProfile?.email }}
           </li>
           <li nz-menu-item (click)="openSettingModal()" i18n>Account Setting</li>
           <li nz-menu-item (click)="loginOut()" i18n>Sign Out</li>

diff --git a/src/workbench/browser/src/app/pages/components/user-modal/user-modal.component.ts b/src/workbench/browser/src/app/pages/components/user-modal/user-modal.component.ts
@@ -325,6 +325,7 @@ export class UserModalComponent implements OnInit, OnDestroy {
     }
     if (data.type == 1) {
       // * register
+      this.trace.report('register_success');
       this.trace.setUser({ register_way: this.hash.get(data.loginWay) });
     }
     this.store.setLoginInfo(data);
@@ -427,6 +428,7 @@ export class UserModalComponent implements OnInit, OnDestroy {
       }
       if (data.type == 1) {
         // * register
+        this.trace.report('register_success');
         this.trace.setUser({ register_way: this.hash.get(data.loginWay) });
       }
       this.store.setLoginInfo(data);

diff --git a/upload.js b/upload.js
@@ -10,7 +10,7 @@ qiniu.conf.SECRET_KEY = SK;
 const uptoken = (bucket, key) => new qiniu.rs.PutPolicy(bucket + ':' + key).token();
 
 const toLatest = name => name.replace(/\d+\.\d+\.\d+/, 'latest');
-const onlyName = name => name.replace(/build|release\//, '');
+const onlyName = name => name.replace(/build\/|release\//, '');
 
 // * 检测文件是否存在
 const isExists = async filePath =>