Commit 0c1764bb by 赵剑炜

修改忽略文件

parent 9cf9c689
...@@ -28,7 +28,7 @@ namespace Junmp.Platform.Common.Utility ...@@ -28,7 +28,7 @@ namespace Junmp.Platform.Common.Utility
//从头部获取salt //从头部获取salt
var tokenSalt = context.Request.Headers["ts"]; var tokenSalt = context.Request.Headers["ts"];
//token解密 //token解密
token = RsaUtil.PemDecrypt(token, AdminGlobalContext.SystemConfig.RsaPrivateKey); //token = RsaUtil.PemDecrypt(token, AdminGlobalContext.SystemConfig.RsaPrivateKey);
//移除salt //移除salt
token = token.ToString().Replace("^" + tokenSalt, ""); token = token.ToString().Replace("^" + tokenSalt, "");
//返回token //返回token
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -1084,51 +1084,11 @@ ...@@ -1084,51 +1084,11 @@
系统配置 系统配置
</summary> </summary>
</member> </member>
<member name="P:Junmp.Platform.Common.Global.SystemConfig.RsaPublicKey">
<summary>
Pem格式Rsa公钥
</summary>
</member>
<member name="P:Junmp.Platform.Common.Global.SystemConfig.RsaPrivateKey">
<summary>
Pem格式Rsa私钥
</summary>
</member>
<member name="P:Junmp.Platform.Common.Global.SystemConfig.WhiteList"> <member name="P:Junmp.Platform.Common.Global.SystemConfig.WhiteList">
<summary> <summary>
白名单 白名单
</summary> </summary>
</member> </member>
<member name="P:Junmp.Platform.Common.Global.SystemConfig.HeaderConfig">
<summary>
Header配置
</summary>
</member>
<member name="P:Junmp.Platform.Common.Global.SystemConfig.OrgRoot">
<summary>
机构根目录编号
</summary>
</member>
<member name="P:Junmp.Platform.Common.Global.SystemConfig.DefaultPassword">
<summary>
默认密码
</summary>
</member>
<member name="P:Junmp.Platform.Common.Global.SystemConfig.AesKey">
<summary>
AesKey
</summary>
</member>
<member name="P:Junmp.Platform.Common.Global.SystemConfig.LogonCountLimit">
<summary>
登录上限
</summary>
</member>
<member name="P:Junmp.Platform.Common.Global.SystemConfig.TokenKey">
<summary>
TokenKey
</summary>
</member>
<member name="P:Junmp.Platform.Common.Global.SystemConfig.CheckToken"> <member name="P:Junmp.Platform.Common.Global.SystemConfig.CheckToken">
<summary> <summary>
检测Token开关 检测Token开关
......
...@@ -503,6 +503,21 @@ namespace Junmp.Platform.Service.Base ...@@ -503,6 +503,21 @@ namespace Junmp.Platform.Service.Base
return actionResult; return actionResult;
} }
/// <summary>
/// 获取列表
/// </summary>
/// <returns>列表</returns>
public async Task<ActionResult> ReturnOK()
{
var actionResult = new ActionResult();
actionResult.code = ResultCode.OPERATE_SUCCESS.Code;
actionResult.msg = ResultCode.OPERATE_SUCCESS.Msg;
actionResult.data = new object();
return actionResult;
}
/// <summary> /// <summary>
/// 查询列表 /// 查询列表
/// </summary> /// </summary>
......
...@@ -275,6 +275,13 @@ namespace Junmp.Platform.Service.Base ...@@ -275,6 +275,13 @@ namespace Junmp.Platform.Service.Base
/// </summary> /// </summary>
/// <returns>列表</returns> /// <returns>列表</returns>
Task<ActionResult> GetListAsync(); Task<ActionResult> GetListAsync();
/// <summary>
/// 无操作,直接返回OK
/// </summary>
/// <returns>列表</returns>
Task<ActionResult> ReturnOK();
/// <summary> /// <summary>
/// 查询列表 /// 查询列表
......
...@@ -13,6 +13,7 @@ using System.IO.Compression; ...@@ -13,6 +13,7 @@ using System.IO.Compression;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using Junmp.Platform.Common.Tools;
namespace Admin.Net.Service.BusinessService.SystemManagement.CodeGeneratorService namespace Admin.Net.Service.BusinessService.SystemManagement.CodeGeneratorService
{ {
...@@ -74,7 +75,7 @@ namespace Admin.Net.Service.BusinessService.SystemManagement.CodeGeneratorServic ...@@ -74,7 +75,7 @@ namespace Admin.Net.Service.BusinessService.SystemManagement.CodeGeneratorServic
/// </remarks> /// </remarks>
/// <param name="jdata"></param> /// <param name="jdata"></param>
/// <returns></returns> /// <returns></returns>
public async Task CodeGenerate(CodeGeneratorDTO codeGenerator) public async Task<bool> CodeGenerate(CodeGeneratorDTO codeGenerator)
{ {
var zipId = Guid.NewGuid(); var zipId = Guid.NewGuid();
var tempPath = AdminGlobalContext.DirectoryConfig.GetTempPath() + "/" + zipId; var tempPath = AdminGlobalContext.DirectoryConfig.GetTempPath() + "/" + zipId;
...@@ -581,10 +582,10 @@ namespace Admin.Net.Service.BusinessService.SystemManagement.CodeGeneratorServic ...@@ -581,10 +582,10 @@ namespace Admin.Net.Service.BusinessService.SystemManagement.CodeGeneratorServic
} }
//制作zip压缩包 //制作zip压缩包
ZipFile.CreateFromDirectory(tempPath, tempPath + ".zip", CompressionLevel.Fastest, false, Encoding.UTF8); //ZipFile.CreateFromDirectory(tempPath, tempPath + ".zip", CompressionLevel.Fastest, false, Encoding.UTF8);
} }
return true;
//return zipId; //return zipId;
} }
...@@ -737,6 +738,21 @@ namespace Admin.Net.Service.BusinessService.SystemManagement.CodeGeneratorServic ...@@ -737,6 +738,21 @@ namespace Admin.Net.Service.BusinessService.SystemManagement.CodeGeneratorServic
return result; return result;
} }
/// <summary>
/// 获取列表
/// </summary>
/// <returns>列表</returns>
public async Task<ActionResult> ReturnOK()
{
var actionResult = new ActionResult();
actionResult.code = ResultCode.OPERATE_SUCCESS.Code;
actionResult.msg = ResultCode.OPERATE_SUCCESS.Msg;
actionResult.data = new object();
return actionResult;
}
#endregion #endregion
#endregion #endregion
......
using Junmp.Platform.Entity.BusinessDTO.SystemManagement; using Junmp.Platform.Entity.BusinessDTO.SystemManagement;
using Junmp.Platform.Entity.CoreDTO; using Junmp.Platform.Entity.CoreDTO;
using Junmp.Platform.Entity.CoreEntity;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Threading.Tasks; using System.Threading.Tasks;
...@@ -12,6 +13,12 @@ namespace Admin.Net.Service.BusinessService.SystemManagement.CodeGeneratorServic ...@@ -12,6 +13,12 @@ namespace Admin.Net.Service.BusinessService.SystemManagement.CodeGeneratorServic
public interface ICodeGeneratorService public interface ICodeGeneratorService
{ {
/// <summary> /// <summary>
/// 无操作,直接返回OK
/// </summary>
/// <returns>列表</returns>
Task<ActionResult> ReturnOK();
/// <summary>
/// 获取表名称列表 /// 获取表名称列表
/// </summary> /// </summary>
/// <returns>表名称列表</returns> /// <returns>表名称列表</returns>
...@@ -22,6 +29,6 @@ namespace Admin.Net.Service.BusinessService.SystemManagement.CodeGeneratorServic ...@@ -22,6 +29,6 @@ namespace Admin.Net.Service.BusinessService.SystemManagement.CodeGeneratorServic
/// </summary> /// </summary>
/// <param name="codeGenerator">参数</param> /// <param name="codeGenerator">参数</param>
/// <returns>zipId</returns> /// <returns>zipId</returns>
Task CodeGenerate(CodeGeneratorDTO codeGenerator); Task<bool> CodeGenerate(CodeGeneratorDTO codeGenerator);
} }
} }
...@@ -1084,51 +1084,11 @@ ...@@ -1084,51 +1084,11 @@
系统配置 系统配置
</summary> </summary>
</member> </member>
<member name="P:Junmp.Platform.Common.Global.SystemConfig.RsaPublicKey">
<summary>
Pem格式Rsa公钥
</summary>
</member>
<member name="P:Junmp.Platform.Common.Global.SystemConfig.RsaPrivateKey">
<summary>
Pem格式Rsa私钥
</summary>
</member>
<member name="P:Junmp.Platform.Common.Global.SystemConfig.WhiteList"> <member name="P:Junmp.Platform.Common.Global.SystemConfig.WhiteList">
<summary> <summary>
白名单 白名单
</summary> </summary>
</member> </member>
<member name="P:Junmp.Platform.Common.Global.SystemConfig.HeaderConfig">
<summary>
Header配置
</summary>
</member>
<member name="P:Junmp.Platform.Common.Global.SystemConfig.OrgRoot">
<summary>
机构根目录编号
</summary>
</member>
<member name="P:Junmp.Platform.Common.Global.SystemConfig.DefaultPassword">
<summary>
默认密码
</summary>
</member>
<member name="P:Junmp.Platform.Common.Global.SystemConfig.AesKey">
<summary>
AesKey
</summary>
</member>
<member name="P:Junmp.Platform.Common.Global.SystemConfig.LogonCountLimit">
<summary>
登录上限
</summary>
</member>
<member name="P:Junmp.Platform.Common.Global.SystemConfig.TokenKey">
<summary>
TokenKey
</summary>
</member>
<member name="P:Junmp.Platform.Common.Global.SystemConfig.CheckToken"> <member name="P:Junmp.Platform.Common.Global.SystemConfig.CheckToken">
<summary> <summary>
检测Token开关 检测Token开关
......
...@@ -19,6 +19,7 @@ using System; ...@@ -19,6 +19,7 @@ using System;
using System.Net; using System.Net;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using Junmp.Platform.Common.Tools;
namespace Junmp.Platform.WebApi.AppCode.FrameworkExtensions namespace Junmp.Platform.WebApi.AppCode.FrameworkExtensions
{ {
...@@ -140,11 +141,10 @@ namespace Junmp.Platform.WebApi.AppCode.FrameworkExtensions ...@@ -140,11 +141,10 @@ namespace Junmp.Platform.WebApi.AppCode.FrameworkExtensions
break; break;
default: default:
response.StatusCode = (int)HttpStatusCode.InternalServerError; response.StatusCode = int.Parse(ResultCode.OPERATE_FAILED.Code);
errorResponse.Message = "Internal Server Error"; errorResponse.Message = ResultCode.OPERATE_FAILED.Msg;
break; break;
} }
//错误日志控制台输出 //错误日志控制台输出
_logger.LogError(exception.Message); _logger.LogError(exception.Message);
......
...@@ -94,11 +94,39 @@ namespace Junmp.Platform.WebApi.Controllers.BusinessModule ...@@ -94,11 +94,39 @@ namespace Junmp.Platform.WebApi.Controllers.BusinessModule
/// <returns>ActionResult</returns> /// <returns>ActionResult</returns>
[HttpPost] [HttpPost]
[Log(OperationType.QueryList)] [Log(OperationType.QueryList)]
[Permission("user:nonmodule:list")]
public async Task<IActionResult> MQTest(String jdata) public async Task<IActionResult> MQTest(String jdata)
{ {
MQService.SendQueue(jdata); MQService.SendQueue(jdata);
return Ok(); var actionResult = new Entity.CoreEntity.ActionResult()
{
code = ResultCode.OPERATE_FAILED.Code,
msg = ResultCode.OPERATE_FAILED.Msg,
data = new String("OK")
};
return Ok(actionResult);
}
#endregion
#region 直接操作返回成功结果
/// <summary>
/// 直接操作返回成功结果
/// </summary>
/// <returns>ActionResult</returns>
[HttpPost]
[Log(OperationType.QueryEntity)]
public async Task<IActionResult> TrueRes(String jdata)
{
var actionResult = new Entity.CoreEntity.ActionResult()
{
code = ResultCode.OPERATE_SUCCESS.Code,
msg = ResultCode.OPERATE_SUCCESS.Msg,
data = new String("OK")
};
return Ok(actionResult);
} }
#endregion #endregion
......
...@@ -58,21 +58,19 @@ namespace Junmp.Platform.WebApi.Controllers.SystemManagement ...@@ -58,21 +58,19 @@ namespace Junmp.Platform.WebApi.Controllers.SystemManagement
/// <summary> /// <summary>
/// 生成代码 /// 生成代码
/// </summary> /// </summary>
/// <param name="codeGenerator">生成器对象</param>
/// <remarks> /// <remarks>
/// ///
/// ## 例子 /// ## 例子
/// ///
///{ /// {
/// "entityNamespace": "string", /// "entityNamespace": "string",
/// "dtoNamespace": "string", /// "dtoNamespace": "string",
/// "controllerNamespace": "string", /// "controllerNamespace": "string",
/// "serviceNamespace": "string", /// "serviceNamespace": "string",
/// "repositoryNamespace": "string", /// "repositoryNamespace": "string",
/// "tables": "table1/table2/table3",使用/符号对需要生成的表进行添加和生成 /// "tables": "table1/table2/table3",使用/符号对需要生成的表进行添加和生成
/// "layoutMode": 0 /// "layoutMode": 0
/// /// }
/// }
/// ///
/// </remarks> /// </remarks>
/// <returns>ActionResult</returns> /// <returns>ActionResult</returns>
...@@ -80,9 +78,11 @@ namespace Junmp.Platform.WebApi.Controllers.SystemManagement ...@@ -80,9 +78,11 @@ namespace Junmp.Platform.WebApi.Controllers.SystemManagement
[Log(OperationType.GenerateCode)] [Log(OperationType.GenerateCode)]
public async Task<IActionResult> CodeGenerate([FromBody] CodeGeneratorDTO codeGenerator) public async Task<IActionResult> CodeGenerate([FromBody] CodeGeneratorDTO codeGenerator)
{ {
await this.CodeGeneratorService.CodeGenerate(codeGenerator); bool res= await this.CodeGeneratorService.CodeGenerate(codeGenerator);
//var result = new ActionResult();
var result = this.CodeGeneratorService.ReturnOK();
//var actionResult = Junmp.Platform.Entity.CoreEntity.ActionResult.Success(result); //var actionResult = Junmp.Platform.Entity.CoreEntity.ActionResult.Success(result);
return Ok(); return Ok(result.Result);
} }
#endregion #endregion
......
...@@ -1084,51 +1084,11 @@ ...@@ -1084,51 +1084,11 @@
系统配置 系统配置
</summary> </summary>
</member> </member>
<member name="P:Junmp.Platform.Common.Global.SystemConfig.RsaPublicKey">
<summary>
Pem格式Rsa公钥
</summary>
</member>
<member name="P:Junmp.Platform.Common.Global.SystemConfig.RsaPrivateKey">
<summary>
Pem格式Rsa私钥
</summary>
</member>
<member name="P:Junmp.Platform.Common.Global.SystemConfig.WhiteList"> <member name="P:Junmp.Platform.Common.Global.SystemConfig.WhiteList">
<summary> <summary>
白名单 白名单
</summary> </summary>
</member> </member>
<member name="P:Junmp.Platform.Common.Global.SystemConfig.HeaderConfig">
<summary>
Header配置
</summary>
</member>
<member name="P:Junmp.Platform.Common.Global.SystemConfig.OrgRoot">
<summary>
机构根目录编号
</summary>
</member>
<member name="P:Junmp.Platform.Common.Global.SystemConfig.DefaultPassword">
<summary>
默认密码
</summary>
</member>
<member name="P:Junmp.Platform.Common.Global.SystemConfig.AesKey">
<summary>
AesKey
</summary>
</member>
<member name="P:Junmp.Platform.Common.Global.SystemConfig.LogonCountLimit">
<summary>
登录上限
</summary>
</member>
<member name="P:Junmp.Platform.Common.Global.SystemConfig.TokenKey">
<summary>
TokenKey
</summary>
</member>
<member name="P:Junmp.Platform.Common.Global.SystemConfig.CheckToken"> <member name="P:Junmp.Platform.Common.Global.SystemConfig.CheckToken">
<summary> <summary>
检测Token开关 检测Token开关
......
...@@ -301,6 +301,12 @@ ...@@ -301,6 +301,12 @@
</summary> </summary>
<returns>ActionResult</returns> <returns>ActionResult</returns>
</member> </member>
<member name="M:Junmp.Platform.WebApi.Controllers.BusinessModule.BizTestController.TrueRes(System.String)">
<summary>
直接操作返回成功结果
</summary>
<returns>ActionResult</returns>
</member>
<member name="T:Junmp.Platform.WebApi.Controllers.CoreControllers.AdminHealthController"> <member name="T:Junmp.Platform.WebApi.Controllers.CoreControllers.AdminHealthController">
<summary> <summary>
健康检查控制器 健康检查控制器
...@@ -381,27 +387,25 @@ ...@@ -381,27 +387,25 @@
<returns>ActionResult</returns> <returns>ActionResult</returns>
</member> </member>
<member name="M:Junmp.Platform.WebApi.Controllers.SystemManagement.CodeGeneratorController.CodeGenerate(Junmp.Platform.Entity.BusinessDTO.SystemManagement.CodeGeneratorDTO)"> <member name="M:Junmp.Platform.WebApi.Controllers.SystemManagement.CodeGeneratorController.CodeGenerate(Junmp.Platform.Entity.BusinessDTO.SystemManagement.CodeGeneratorDTO)">
<summary> <summary>
生成代码 生成代码
</summary> </summary>
<param name="codeGenerator">生成器对象</param> <remarks>
<remarks>
## 例子
{
"entityNamespace": "string",
"dtoNamespace": "string",
"controllerNamespace": "string",
"serviceNamespace": "string",
"repositoryNamespace": "string",
"tables": "table1/table2/table3",使用/符号对需要生成的表进行添加和生成
"layoutMode": 0
} ## 例子
</remarks> {
<returns>ActionResult</returns> "entityNamespace": "string",
"dtoNamespace": "string",
"controllerNamespace": "string",
"serviceNamespace": "string",
"repositoryNamespace": "string",
"tables": "table1/table2/table3",使用/符号对需要生成的表进行添加和生成
"layoutMode": 0
}
</remarks>
<returns>ActionResult</returns>
</member> </member>
<member name="T:Junmp.Platform.WebApi.Controllers.SystemManagement.ImportConfigManagementController"> <member name="T:Junmp.Platform.WebApi.Controllers.SystemManagement.ImportConfigManagementController">
<summary> <summary>
......
...@@ -6,12 +6,13 @@ ...@@ -6,12 +6,13 @@
<!--查询表名信息--> <!--查询表名信息-->
<sql name="query_mysql_schema_info"> <sql name="query_mysql_schema_info">
<![CDATA[ <![CDATA[
SELECT SELECT
`TABLE_SCHEMA`, `TABLE_NAME`, `TABLE_COMMENT`, `CREATE_TIME` `TABLE_SCHEMA`, `TABLE_NAME`, `TABLE_COMMENT`, `CREATE_TIME`
FROM FROM
information_schema.tables information_schema.tables
WHERE WHERE
table_schema = 'admin' and table_name not like '%admin%' table_schema = 'ruyiadmin'
]]> ]]>
</sql> </sql>
......
...@@ -32,24 +32,8 @@ ...@@ -32,24 +32,8 @@
}, },
//系统配置 //系统配置
"SystemConfig": { "SystemConfig": {
//Rsa公钥
"RsaPublicKey": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCDzNqPhq2nk1aIsIK30X7UAHC5jNqVKk12ZxsVEOjPFajV82VuJ7a31uLtU3NWRN4SIzhXmhAiptiDXq04AReV6veh3xdI069xmsIx/EEJNHnL034is6gSVev8p7wJ+qevxdYUGaMVgAV6osYAeQhMTTld emiiriKVAoeezhs5fQIDAQAB",
//Rsa私钥
"RsaPrivateKey": "MIICXAIBAAKBgQCDzNqPhq2nk1aIsIK30X7UAHC5jNqVKk12ZxsVEOjPFajV82VuJ7a31uLtU3NWRN4SIzhXmhAiptiDXq04AReV6veh3xdI069xmsIx/EEJNHnL034is6gSVev8p7wJ+qevxdYUGaMVgAV6osYAeQhMTTldemiiriKVAoeezhs5fQIDAQABAoGAC5l5psx1Xg+WiKmLZ5gb1f0P7q4zbCtXILnxGG9VJFySPMb5QOX+RVTqwqfnuUqOuZpSuOSWa1mAKdepEQoixCIBTbG8THhbXi5/vdN4FMUXmHBe1Gage0HFE5EpEMGpFuGZW9PmXG5m78gkTwc/cYJYWSA6I9AMWJ8rBGfti/UCQQC9ehPq0wFV8icLqcW3HlNsPzpqKPWFKp9UWz8kB6ayyTX9pci02Rp4Fig3i625+eMnJ+Kq0DRVGeJE4auCugb7AkEAshLgdDxnvQVbPFJvxF8yAZe3Tu4L2vbEA55wqnEdHMUSnHERXO729Uk1t2n5v67xIksGewyZ0X6x/7wbsg035wJAR+0FjoiW4zdPFyBVS5QZeuftlssBmJF7dhxFNbopz4iOFEFQlUYsxBU1IxDE2+o+DmkXpFvw4bU3rYo0/yT67QJAQcpRnQA4P5C8DYRTgNS+7/Gyqvmt7Z8f+kpOS9pwrBFvd9caWCB9o1ACBZqkyBoFQus/ILUeG1VYxCgmf1j83wJBAK1ETGDQM9LPOZAtB7Idv1Xo4sJtDn90yIyjhJjE6hhApvGGRb/1aOB1DMrx3JweIUB7rKMpkGVcouFIO4/s9cU=",
//白名单列表,用英文逗号隔开 //白名单列表,用英文逗号隔开
"WhiteList": "AttachmentManagement/UploadAttachments", "WhiteList": "AttachmentManagement/UploadAttachments",
//前端Request头部参数,用英文逗号隔开
"HeaderConfig": "",
//机构根目录编号
"OrgRoot": "ab907b1e-13a3-4c04-85db-f560f9c8f9aa",
//用户默认密码
"DefaultPassword": "123456",
//Aes加密算法密钥
"AesKey": "ae125efkk4_54eeff444ferfkny6oxi8",
//登录数量上限
"LogonCountLimit": "1",
//用户token格式
"TokenKey": "user_{0}_{1}",
//是否检查token //是否检查token
"CheckToken": true, "CheckToken": true,
//token有效时间,单位:分钟 //token有效时间,单位:分钟
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论