.gitignore

@@ -405,4 +405,5 @@ ASALocalRun/
 .localhistory/
 appsettings.Development.json
 
-.ionide
\ No newline at end of file
+.ionide
+p_output

.vscode/launch.json

@@ -4,14 +4,21 @@
     // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
+        {
+            "name": "Python: Current File",
+            "type": "python",
+            "request": "launch",
+            "program": "${file}",
+            "console": "integratedTerminal"
+        },
         {
             "name": ".NET Core Launch (web)",
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build",
-            "program": "${workspaceFolder}/Aurora.Micorservices/Aurora.Core/Aurora.Core.Api/bin/Debug/net5.0/Aurora.Core.Api.dll",
+            "program": "${workspaceFolder}/Aurora.Microservices/Aurora.Core/Aurora.Core.Api/bin/Debug/net5.0/Aurora.Core.Api.dll",
             "args": [],
-            "cwd": "${workspaceFolder}/Aurora.Micorservices/Aurora.Core/Aurora.Core.Api",
+            "cwd": "${workspaceFolder}/Aurora.Microservices/Aurora.Core/Aurora.Core.Api",
             "stopAtEntry": false,
             "serverReadyAction": {
                 "action": "openExternally",

.vscode/tasks.json

@@ -7,7 +7,7 @@
             "type": "process",
             "args": [
                 "build",
-                "${workspaceFolder}/Aurora.Micorservices/Aurora.Core/Aurora.Core.Api/Aurora.Core.Api.csproj",
+                "${workspaceFolder}/Aurora.Microservices/Aurora.Core/Aurora.Core.Api/Aurora.Core.Api.csproj",
                 "/property:GenerateFullPaths=true",
                 "/consoleloggerparameters:NoSummary"
             ],
@@ -19,7 +19,7 @@
             "type": "process",
             "args": [
                 "publish",
-                "${workspaceFolder}/Aurora.Micorservices/Aurora.Core/Aurora.Core.Api/Aurora.Core.Api.csproj",
+                "${workspaceFolder}/Aurora.Microservices/Aurora.Core/Aurora.Core.Api/Aurora.Core.Api.csproj",
                 "/property:GenerateFullPaths=true",
                 "/consoleloggerparameters:NoSummary"
             ],
@@ -32,7 +32,7 @@
             "args": [
                 "watch",
                 "run",
-                "${workspaceFolder}/Aurora.Micorservices/Aurora.Core/Aurora.Core.Api/Aurora.Core.Api.csproj",
+                "${workspaceFolder}/Aurora.Microservices/Aurora.Core/Aurora.Core.Api/Aurora.Core.Api.csproj",
                 "/property:GenerateFullPaths=true",
                 "/consoleloggerparameters:NoSummary"
             ],

Aurora.Micorservices/Aurora.Core/Aurora.Core.Service/AutomapperProfiles/CategoryProfile.cs → Aurora.Microservices/Aurora.Core/Aurora.Core.Service/AutomapperProfiles/CategoryProfile.cs

@@ -7,18 +7,9 @@ namespace Aurora.Core.Service.AutomapperProfiles
 {
     public class CategoryProfile : Profile
     {
-        //Source->Destination
-        // CreateMap<Source, Destination>();
-
-        // //Source->Destination2
-        // CreateMap<Source, Destination2>().ForMember(d => d.AnotherValue2, opt =>
-        // {
-        //     opt.MapFrom(s => s.AnotherValue);
-        // });
         public CategoryProfile()
         {
-            CreateMap<Category, CategoryDto>();
-            CreateMap<CategoryDto, Category>();
+            CreateMap<Category, CategoryDto>().ReverseMap();
         }
     }
 }

Aurora.Micorservices/Aurora.Tenant/batch_rename.py → Aurora.Microservices/Aurora.Tenant/batch_rename.py

@@ -6,7 +6,7 @@ class BatchRename():
     批量重命名文件夹中的文件
     '''
     def __init__(self):
-        self.path = '/Volumes/PSSD/Worksapce/aurora/Aurora.Micorservices/Aurora.Tenant'  #表示需要命名处理的文件夹
+        self.path = '/Volumes/PSSD/Worksapce/aurora/Aurora.Microservices/Aurora.Tenant'  #表示需要命名处理的文件夹
         self.srcName='Category'
         self.destName='Tenant'
  

Scripts/Deploy/run.py

+import os
+import signal
+import subprocess
+
+work_space = 'E:\\Workspace\\aurora'
+pid_output = 'p_output'
+print('work_space: ' + work_space)
+print('开始运行……')
+
+
+def kill_process(name):
+    try:
+        # iterating through each instance of the process
+        for line in os.popen("ps ax | grep " + name + " | grep -v grep"):
+            fields = line.split()
+            # extracting Process ID from the output
+            pid = fields[0]
+            # terminating process
+            os.kill(int(pid), signal.SIGKILL)
+        print("Process {} Successfully terminated".format(name))
+    except:
+        print("Error Encountered while running script")
+
+
+def clear_poutput(name):  # 定义函数名
+    b = os.getcwd()
+    filePath = os.path.join(b, name)  # 在当前py文件所在路径下的new文件中创建txt
+    with open(filePath, 'a+', encoding='utf-8') as f:
+        f.truncate(0)
+
+
+def poutput(name, pid):  # 定义函数名
+    b = os.getcwd()
+    filePath = os.path.join(b, name)  # 在当前py文件所在路径下的new文件中创建txt
+    with open(filePath, 'a+') as f:
+        f.write(pid+'\n')  # 加\n换行显示
+
+
+def start_dotnetservice(name, runPath):
+    start_service(
+        name, 'dotnet run --project {}'.format(os.path.join(runPath, name, name+'.csproj')))
+    # start_service(
+    #     name, 'cd {};dotnet publish -o bin/Publish;cd bin/Publish;run {}.dll'.format(runPath, name))
+
+
+def start_service(name, cmd):
+    print('启动 ' + name)
+    print('run cmd -> ' + cmd)
+    ret = subprocess.Popen(cmd)
+    # 记录下 pid
+    poutput(pid_output, "service {},pid {}".format(name, str(ret.pid)))
+
+
+clear_poutput(pid_output)
+
+
+print('启动 Consul')
+start_service('Consul', 'consul agent -dev')
+
+# d = os.system('consul agent -dev')
+# d = os.popen('consul agent -dev')
+
+# cmd 查看端口占用 netstat -aon|findstr "8500"
+# cmd 杀死进程 taskkill /f /pid 18xx8
+
+# Gateway
+s_name = 'Aurora.Gateway'
+runPath = os.path.join(work_space)
+start_dotnetservice(s_name, runPath)
+
+# Tenant
+s_name = 'Aurora.Tenant.Api'
+runPath = os.path.join(work_space, 'Aurora.Microservices',
+                       'Aurora.Tenant')
+start_dotnetservice(s_name, runPath)
+
+# Core.Api
+s_name = 'Aurora.Core.Api'
+runPath = os.path.join(work_space, 'Aurora.Microservices',
+                       'Aurora.Core')
+start_dotnetservice(s_name, runPath)
+
+# WebHost
+s_name = 'Aurora.WebHost'
+runPath = os.path.join(work_space)
+start_dotnetservice(s_name, runPath)
+
+iStr = input('输入任意字符以结束……')

Scripts/Deploy/run.sh

+#!/bin/bash
+
+work_space="E:\Workspace\aurora"
+
+echo "当前目录"
+pwd
+
+# rm -fr ./dist
+# rm -fr *.zip
+echo "开始发布"
+echo $work_space 
+cd $work_space 
+
+echo "运行Consul"
+nohub consul agent -dev
+# ps -aux | grep "runoob.sh" 
+
+cd "$work_space/Aurora.Consul"
+
+
+  

aurora.sln

@@ -9,35 +9,35 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aurora.WebHost", "Aurora.We
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aurora.Gateway", "Aurora.Gateway\Aurora.Gateway.csproj", "{E7850F7D-F911-4D69-B5A0-CFE28EA39FBC}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Aurora.Micorservices", "Aurora.Micorservices", "{584A022C-ACAE-47E9-9D53-55FF40DC664D}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Aurora.Microservices", "Aurora.Microservices", "{584A022C-ACAE-47E9-9D53-55FF40DC664D}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Aurora.Core", "Aurora.Core", "{DE864DFA-7032-4A52-9B73-7DA794FAE2EA}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aurora.Core.Api", "Aurora.Micorservices\Aurora.Core\Aurora.Core.Api\Aurora.Core.Api.csproj", "{73E41DAF-D5DE-4702-AB2E-F93CAE277EF5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aurora.Core.Api", "Aurora.Microservices\Aurora.Core\Aurora.Core.Api\Aurora.Core.Api.csproj", "{73E41DAF-D5DE-4702-AB2E-F93CAE277EF5}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aurora.Core.Domain", "Aurora.Micorservices\Aurora.Core\Aurora.Core.Domain\Aurora.Core.Domain.csproj", "{F57C40C2-7F48-4360-8AAA-DD50B6518C84}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aurora.Core.Domain", "Aurora.Microservices\Aurora.Core\Aurora.Core.Domain\Aurora.Core.Domain.csproj", "{F57C40C2-7F48-4360-8AAA-DD50B6518C84}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aurora.Core.IService", "Aurora.Micorservices\Aurora.Core\Aurora.Core.IService\Aurora.Core.IService.csproj", "{D4270B1E-D5DD-40D8-9281-54E2EBD38FB7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aurora.Core.IService", "Aurora.Microservices\Aurora.Core\Aurora.Core.IService\Aurora.Core.IService.csproj", "{D4270B1E-D5DD-40D8-9281-54E2EBD38FB7}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aurora.Core.EntityFramework", "Aurora.Micorservices\Aurora.Core\Aurora.Core.EntityFramework\Aurora.Core.EntityFramework.csproj", "{8E22664E-C22C-46E0-B970-056C24BEC66F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aurora.Core.EntityFramework", "Aurora.Microservices\Aurora.Core\Aurora.Core.EntityFramework\Aurora.Core.EntityFramework.csproj", "{8E22664E-C22C-46E0-B970-056C24BEC66F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aurora.Core.Service", "Aurora.Micorservices\Aurora.Core\Aurora.Core.Service\Aurora.Core.Service.csproj", "{E500647A-0385-49BF-BE01-3942C8C554A9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aurora.Core.Service", "Aurora.Microservices\Aurora.Core\Aurora.Core.Service\Aurora.Core.Service.csproj", "{E500647A-0385-49BF-BE01-3942C8C554A9}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aurora.Infrastructure", "Aurora.Infrastructure\Aurora.Infrastructure.csproj", "{46336F7C-61B1-481B-9860-1868249667B3}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aurora.Common", "Aurora.Common\Aurora.Common.csproj", "{399C1F2A-FE91-4FA8-B1D4-5E077689EED4}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aurora.Storage", "Aurora.Micorservices\Aurora.Storage\Aurora.Storage.csproj", "{09AC6731-56CC-4075-B437-78D8D668D481}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aurora.Storage", "Aurora.Microservices\Aurora.Storage\Aurora.Storage.csproj", "{09AC6731-56CC-4075-B437-78D8D668D481}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Aurora.Tenant", "Aurora.Tenant", "{0CD896F9-6F85-438F-A20C-0E10D6F7EF27}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aurora.Tenant.Api", "Aurora.Micorservices\Aurora.Tenant\Aurora.Tenant.Api\Aurora.Tenant.Api.csproj", "{C60141C8-0CD0-4ED5-AB10-C0B235F9DC74}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aurora.Tenant.Api", "Aurora.Microservices\Aurora.Tenant\Aurora.Tenant.Api\Aurora.Tenant.Api.csproj", "{C60141C8-0CD0-4ED5-AB10-C0B235F9DC74}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aurora.Tenant.Domain", "Aurora.Micorservices\Aurora.Tenant\Aurora.Tenant.Domain\Aurora.Tenant.Domain.csproj", "{06951545-AF8E-4259-AD5B-FD63EC460271}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aurora.Tenant.Domain", "Aurora.Microservices\Aurora.Tenant\Aurora.Tenant.Domain\Aurora.Tenant.Domain.csproj", "{06951545-AF8E-4259-AD5B-FD63EC460271}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aurora.Tenant.EntityFramework", "Aurora.Micorservices\Aurora.Tenant\Aurora.Tenant.EntityFramework\Aurora.Tenant.EntityFramework.csproj", "{788035D4-431F-49D1-820B-B7D00A0910C3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aurora.Tenant.EntityFramework", "Aurora.Microservices\Aurora.Tenant\Aurora.Tenant.EntityFramework\Aurora.Tenant.EntityFramework.csproj", "{788035D4-431F-49D1-820B-B7D00A0910C3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aurora.Tenant.IService", "Aurora.Micorservices\Aurora.Tenant\Aurora.Tenant.IService\Aurora.Tenant.IService.csproj", "{BC10AC86-DDF1-4C0F-B450-DF36BA97F0E1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aurora.Tenant.IService", "Aurora.Microservices\Aurora.Tenant\Aurora.Tenant.IService\Aurora.Tenant.IService.csproj", "{BC10AC86-DDF1-4C0F-B450-DF36BA97F0E1}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aurora.AdminHost", "Aurora.AdminHost\Aurora.AdminHost.csproj", "{23BC1840-B8C0-458D-A88A-22DFF337D74F}"
 EndProject

batch_rename.py

+# -*- coding: utf-8 -*-
+import os
+ 
+class BatchRename():
+    '''
+    批量重命名文件夹中的文件
+    '''
+    def __init__(self):
+        self.path = 'E:/Workspace/aurora'  #表示需要命名处理的文件夹
+        self.srcName='Aurora.Micorservices'
+        self.destName='Aurora.Microservices'
+ 
+    def rename(self):
+        filelist = os.listdir(self.path)      #获取文件路径
+        total_num = len(filelist)     #获取文件长度（个数）
+        i=0
+        for item in filelist:
+            if item.startswith(self.srcName):  # 找到 [srcName] 开头的文件夹或文件
+                src = os.path.join(os.path.abspath(self.path), item)
+                dst = os.path.join(os.path.abspath(self.path),item.replace(self.srcName,self.destName)) # 替换名字
+                try:
+                    os.rename(src, dst)
+                    print ('converting %s to %s ...' % (src, dst))
+                    i = i + 1
+                except:
+                    continue
+        print ('total %d to rename & converted %d ,%s-to-%s' % (total_num, i,self.srcName,self.destName))
+ 
+    def rename_all(self,path):
+        filelist = os.listdir(path)      #获取文件路径
+        total_num = len(filelist)     #获取文件长度（个数）
+        i=0
+        for item in filelist:
+            src = os.path.join(os.path.abspath(path), item)
+            if os.path.isdir(src):  # 如果是文件夹进入递归
+                self.rename_all(src)
+            if item.startswith(self.srcName):  # 找到 [srcName] 开头的文件夹或文件
+                dst = os.path.join(os.path.abspath(path),item.replace(self.srcName,self.destName)) # 替换名字
+                try:
+                    os.rename(src, dst)
+                    print ('converting %s to %s ...' % (src, dst))
+                    i = i + 1
+                except:
+                    continue
+        print ('total %d to rename & converted %d, %s-to-%s' % (total_num, i,self.srcName,self.destName))
+    
+if __name__ == '__main__':
+    demo = BatchRename()
+    #demo.rename()
+    demo.rename_all(demo.path)
\ No newline at end of file