Merge branch 'main' into ec

README.md

@@ -19,6 +19,8 @@
 
 **Yi.Vue**：Vue2.0配合CC.Yi.Framework使用前端项目（正在更新）
 
+**分支：ec**：基于Yi.Framework微服务电商项目（同步更新）
+
 ****
 #### 支持:
 

Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/AccountController.cs

@@ -30,7 +30,8 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         private RabbitMQInvoker _rabbitMQInvoker;
         private CacheClientDB _cacheClientDB;
         private IRoleService _roleService;
-        public AccountController(ILogger<UserController> logger, IUserService userService, IMenuService menuService,RabbitMQInvoker rabbitMQInvoker,CacheClientDB cacheClientDB, IRoleService roleService)
+        private IHttpContextAccessor _httpContext;
+        public AccountController(ILogger<UserController> logger, IUserService userService, IMenuService menuService,RabbitMQInvoker rabbitMQInvoker,CacheClientDB cacheClientDB, IRoleService roleService, IHttpContextAccessor httpContext)
         {
             _logger = logger;
             _userService = userService;
@@ -38,6 +39,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers
             _rabbitMQInvoker = rabbitMQInvoker;
             _cacheClientDB = cacheClientDB;
             _roleService = roleService;
+            _httpContext = httpContext;
         }
 
 
@@ -94,6 +96,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers
                 //设置默认头像
                 var setting = JsonHelper.StrToObj<SettingDto>(_cacheClientDB.Get<string>(RedisConst.key));
                 _user.icon = setting.InitIcon;
+                _user.ip = _httpContext.HttpContext.Request.Headers["X-Real-IP"].FirstOrDefault();//通过上下文获取ip
                 //设置默认角色
                 if (string.IsNullOrEmpty(setting.InitRole))
                 {
@@ -117,6 +120,10 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         [HttpPost]
         public async  Task<Result> SendSMS(string SMSAddress)
         {
+            if (string.IsNullOrEmpty(SMSAddress))
+            {
+                return Result.Error("请输入电话号码");
+            }
             SMSAddress = SMSAddress.Trim();
             if (!await _userService.PhoneIsExsit(SMSAddress))
             {

Yi.Framework/Yi.Framework.Core/ElasticSearchInvoker.cs

@@ -0,0 +1,53 @@
+using Microsoft.Extensions.Options;
+using Nest;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Yi.Framework.Common.IOCOptions;
+
+namespace Yi.Framework.Core
+{
+    public class ElasticSearchInvoker
+    {
+        private readonly ElasticSearchOptions _elasticSearchOptions;
+
+        public ElasticSearchInvoker(IOptionsMonitor<ElasticSearchOptions> optionsMonitor)
+        {
+            _elasticSearchOptions = optionsMonitor.CurrentValue;
+            var settings = new ConnectionSettings(new Uri(_elasticSearchOptions.Url)).DefaultIndex(this._elasticSearchOptions.IndexName);
+            Client = new ElasticClient(settings);
+        }
+        private ElasticClient Client;
+        public ElasticClient GetElasticClient()
+        {
+            return Client;
+        }
+        public void Send<T>(List<T> model) where T : class
+        {
+            Client.IndexMany(model);
+        }
+
+        public void InsertOrUpdata<T>(T model) where T : class
+        {
+            Client.IndexDocument(model);
+        }
+
+        public bool Delete<T>(string id) where T : class
+        {
+
+            var response = Client.Delete<T>(id);
+            return response.IsValid;
+        }
+        public bool DropIndex(string indexName)
+        {
+            return Client.Indices.Delete(Indices.Parse(indexName)).IsValid;
+        }
+        public void CreateIndex(string indexName)
+        {
+            var settings = new ConnectionSettings(new Uri(_elasticSearchOptions.Url)).DefaultIndex(indexName);
+            this.Client = new ElasticClient(settings);
+        }
+    }
+}

Yi.Framework/Yi.Framework.Core/Yi.Framework.Core.csproj

@@ -12,6 +12,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="5.0.0" />
+    <PackageReference Include="NEST" Version="7.15.2" />
     <PackageReference Include="RabbitMQ.Client" Version="6.2.2" />
   </ItemGroup>
 

Yi.Framework/Yi.Framework.Model/Yi.Framework.Model.csproj

@@ -4,10 +4,6 @@
     <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Folder Include="Search\" />
-  </ItemGroup>
-
   <ItemGroup>
     <None Include="T4DataContext.cs">
       <DesignTime>True</DesignTime>

Yi.Framework/Yi.Framework.Service/MenuService.cs

@@ -59,7 +59,7 @@ namespace Yi.Framework.Service
  
         public async Task<List<menu>> GetTopMenuByUserId(int userId)
         {
-            var user_data = await _DbRead.Set<user>().Include(u => u.roles).ThenInclude(u => u.menus).FirstOrDefaultAsync();
+            var user_data = await _DbRead.Set<user>().Include(u => u.roles).ThenInclude(u => u.menus).Where(u=>u.id==userId).FirstOrDefaultAsync();
             List<menu> menuList = new();
             user_data.roles.ForEach(u =>
             {

Yi.Framework/Yi.Framework.Service/RoleService.cs

@@ -16,7 +16,8 @@ namespace Yi.Framework.Service
         public async Task<List<role>> GetRolesByUserId(int userId)
         {
             var user_data =await _Db.Set<user>().Include(u => u.roles).Where(u => u.id==userId).FirstOrDefaultAsync();
-            var roleList = user_data.roles.Where(u=>u.is_delete==Normal).ToList();       
+            var roleList = user_data.roles.Where(u=>u.is_delete==Normal).ToList();
+            roleList.ForEach(u => u.users = null);
             return roleList;
         }
 

Yi.Framework/Yi.Framework.WebCore/Utility/CustomAutofacModule.cs

@@ -1,6 +1,7 @@
 using Autofac;
 using Autofac.Extras.DynamicProxy;
 using Castle.DynamicProxy;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.ApplicationParts;
 using Microsoft.AspNetCore.Mvc.Controllers;
 using Microsoft.EntityFrameworkCore;
@@ -36,11 +37,11 @@ namespace Yi.Framework.WebCore.Utility
 
             containerBuilder.RegisterType<DbContextFactory>().As<IDbContextFactory>().InstancePerDependency().EnableInterfaceInterceptors();
 
-
+            containerBuilder.RegisterType< HttpContextAccessor>().As<IHttpContextAccessor>().SingleInstance();
-            
 
 
-///反射注入服务层及接口层     
+
+            ///反射注入服务层及接口层     
             var assemblysServices = GetDll( "Yi.Framework.Service.dll");
             containerBuilder.RegisterAssemblyTypes(assemblysServices)
                      .AsImplementedInterfaces()

Yi.Vue/src/views/register.vue

@@ -57,7 +57,7 @@
             </v-text-field>
           </v-col>
           <v-col cols="3">
-            <app-btn @click="sendSMS" class="mb-1 mt-1">验证码</app-btn>
+            <v-btn color="secondary" @click="sendSMS" class="mb-1 mt-1" :disabled="is_en">验证码</v-btn>
           </v-col>
         </v-row>
         <v-text-field
@@ -113,6 +113,7 @@ import accoutAPI from "../api/accountApi";
 export default {
   methods: {
     sendSMS() {
+      this.is_en=true
       accoutAPI.SendSMS(this.form.phone).then(resp=>{
          if (resp.status) {
             this.$dialog.notify.success(resp.msg, {
@@ -171,6 +172,7 @@ export default {
     ],
     isPasswordVisible: false,
     code: "",
+    is_en:false,
     form: {
       phone: "",
       username: "",