v3.4.6

2023-05-31 10:19:05 +08:00
parent 1b65a7a9e5
commit 9c621c75cd
238 changed files with 9905 additions and 4034 deletions
--- a/apihost/Tnb.API.Entry/Configurations/App.json
+++ b/apihost/Tnb.API.Entry/Configurations/App.json
@@ -4,15 +4,88 @@
    //系统文件路径
    "SystemPath": "D:\\ToTong\\tnb\\Resources",
    //微信公众号允许上传文件类型
-    "MPUploadFileType": [ "bmp", "png", "jpeg", "jpg", "gif", "mp3", "wma", "wav", "amr", "mp4" ],
+    "MPUploadFileType": [
+      "bmp",
+      "png",
+      "jpeg",
+      "jpg",
+      "gif",
+      "mp3",
+      "wma",
+      "wav",
+      "amr",
+      "mp4"
+    ],
    //微信允许上传文件类型
-    "WeChatUploadFileType": [ "jpg", "png", "doc", "docx", "ppt", "pptx", "xls", "xlsx", "pdf", "txt", "rar", "zip", "csv", "amr", "mp4" ],
+    "WeChatUploadFileType": [
+      "jpg",
+      "png",
+      "doc",
+      "docx",
+      "ppt",
+      "pptx",
+      "xls",
+      "xlsx",
+      "pdf",
+      "txt",
+      "rar",
+      "zip",
+      "csv",
+      "amr",
+      "mp4"
+    ],
    //允许图片类型
-    "AllowUploadImageType": [ "jpg", "gif", "png", "bmp", "jpeg", "tiff", "psd", "swf", "svg", "pcx", "dxf", "wmf", "emf", "lic", "eps", "tga" ],
+    "AllowUploadImageType": [
+      "jpg",
+      "gif",
+      "png",
+      "bmp",
+      "jpeg",
+      "tiff",
+      "psd",
+      "swf",
+      "svg",
+      "pcx",
+      "dxf",
+      "wmf",
+      "emf",
+      "lic",
+      "eps",
+      "tga"
+    ],
    //允许上传文件类型
-    "AllowUploadFileType": [ "jpg", "mp3", "gif", "png", "bmp", "jpeg", "doc", "docx", "ppt", "pptx", "xls", "xlsx", "pdf", "txt", "rar", "zip", "csv" ],
+    "AllowUploadFileType": [
+      "jpg",
+      "mp3",
+      "gif",
+      "png",
+      "bmp",
+      "jpeg",
+      "doc",
+      "docx",
+      "ppt",
+      "pptx",
+      "xls",
+      "xlsx",
+      "pdf",
+      "txt",
+      "rar",
+      "zip",
+      "csv"
+    ],
    //过滤上传文件名称特殊字符
-    "SpecialString": [ "/", "<", ">", "|", "?", "\\", ":", "\"", "*", "_" ],
+    "SpecialString": [
+      "/",
+      "<",
+      ">",
+      "|",
+      "?",
+      "\\",
+      ":",
+      "\"",
+      "*",
+      "_"
+    ],
    "PreviewType": "kkfile", //文件预览方式 （kkfile，yozo）默认使用kkfile
    "KKFileDomain": "http://127.0.0.1:30090/FileServer",
    "Domain": "http://yinmai.tpddns.cn:7772",
@@ -21,18 +94,52 @@
      "domainKey": "57462250284462899305150",
      "UploadAPI": "http://dmc.yozocloud.cn/api/file/http?fileUrl={0}&appId={1}&sign={2}", //上传接口
      "DownloadAPI": "http://eic.yozocloud.cn/api/view/file?fileVersionId={0}&appId={1}&sign={2}", //预览接口
-      "AppId": "yozoAQh5dPSt6063", //应用Id
-      "AppKey": "6365bfbd733fce644fd7ac0aaeca" //签名
+      "AppId": "yozoAQh5dPSt6063", // 应用Id
+      "AppKey": "6365bfbd733fce644fd7ac0aaeca" // 签名
    },
-    //================== 系统错误邮件报告反馈相关 ============================== -->
-    //软件的错误报告
+    // ================== 系统错误邮件报告反馈相关 ============================== -->
+    // 软件的错误报告
    "ErrorReport": false,
    //软件的错误报告发给谁
    "ErrorReportTo": "tuotong_tech@163.com"
  },
+  // ================== 单点登录配置(和其他登录方式 只能二选一) ============================== -->
+  "OAuth": {
+    "Enabled": false, // 开启后将支持单点登录, 前端与后端都不可使用普通模式登录
+    "LoginPath": "http://192.168.20.119:5000/api/oauth/Login", // 前端登录页面访问登录接口进行单点登录页面跳转, 需要与身份管理系统中的 JNPF-Auth2、JNPF-CAS中的认证地址一致
+    "SucessFrontUrl": "http://192.168.20.119:3000/sso", // 从单点登录中心直接访问JNPF时登录成功后跳转的前端页面
+    "DefaultSSO": "auth2", // 默认接口
+    "TicketTimeout": 5, // 缓存过期时间 / 分钟
+    "TicketOutMessage": false, // 是否前端输出消息
+    "SSO": {
+      "auth2": {
+        "enabled": true,
+        "clientId": "747887288041603072",
+        "clientSecret": "MYgMMjIwNzIwMjIxNTU4MTAxNzQlKQ",
+        "authorizeUrl": "https://192.168.20.133:8527/sign/authz/oauth/v20/authorize",
+        "accessTokenUrl": "https://192.168.20.133:8527/sign/authz/oauth/v20/token",
+        "userInfoUrl": "https://192.168.20.133:8527/sign/api/oauth/v20/me"
+      },
+      "cas": {
+        "enabled": true,
+        "serverLoginUrl": "https://sso.test.jnpf.work/sign/authz/cas/login",
+        "serverValidateUrl": "https://sso.test.jnpf.work/sign/authz/cas"
+      }
+    },
+    "Pull": {
+      "Enabled": true,
+      "CreateRestAddress": "http://192.168.20.133:9526/sso-mgt-api/api/idm/Account",
+      "ReplaceRestAddress": "http://192.168.20.133:9526/sso-mgt-api/api/idm/Account",
+      "ChangePasswordRestAddress": "http://192.168.20.133:9526/sso-mgt-api/api/idm/Account/changePassword",
+      "DeleteRestAddress": "http://192.168.20.133:9526/sso-mgt-api/api/idm/Account",
+      "CredentialType": "Basic",
+      "UserName": "747887288041603072",
+      "Password": "MYgMMjIwNzIwMjIxNTU4MTAxNzQlKQ"
+    }
+  },
  //================== 第三方登录配置 ============================== -->
  "Socials": {
-    "SocialsEnabled": true,
+    "SocialsEnabled": false,
    "DoMain": "https://562f45p309.goho.co/dev", // 外网能访问的地址(域名), 回调的时候拼接接口地址用
    "Config": [
      {
@@ -76,8 +183,9 @@
  },
  //================== 消息跳转配置 ============================== -->
  "Message": {
-    "DoMainPc": "http://127.0.0.1:3000", // 前端PC外网能访问的地址(域名), 回调的时候拼接接口地址用
-    "DoMainApp": "http://127.0.0.1:3000", // 前端App外网能访问的地址(域名), 回调的时候拼接接口地址用
+    "ApiDoMain": "http://localhost:5000", // 后端Api路径  (发布时与DoMainPc一致)
+    "DoMainPc": "http://localhost:3000", // 前端PC外网能访问的地址(域名), 回调的时候拼接接口地址用
+    "DoMainApp": "http://localhost:8081", // 前端App外网能访问的地址(域名), 回调的时候拼接接口地址用
    "AppPushUrl": "https://8e84eea8-6922-4033-8e86-67ad7442e692.bspapp.com/unipush"
  }
 }
--- a/apihost/Tnb.API.Entry/Configurations/EventBus.json
+++ b/apihost/Tnb.API.Entry/Configurations/EventBus.json
@@ -0,0 +1,8 @@
+{
+  "EventBus": {
+    "EventBusType": "Memory", //Memory,RabbitMQ
+    "HostName": "192.168.0.232",
+    "UserName": "jnpf",
+    "Password": "jnpf@2019"
+  }
+}
--- a/apihost/Tnb.API.Entry/Configurations/JWT.json
+++ b/apihost/Tnb.API.Entry/Configurations/JWT.json
@@ -1,7 +1,7 @@
 {
  "JWTSettings": {
    "ValidateIssuerSigningKey": true, // 是否验证密钥，bool 类型，默认true
-    "IssuerSigningKey": "7k5yOxSMHVdYjs61gkgUY3W9DHbgk7tokaZlP3QIlfk34D1H7jYEOcLybClW1aKl", // 密钥，string 类型，必须是复杂密钥，长度大于16
+    "IssuerSigningKey": "RkayGi4ltkMWrSQKsQTWic1VnakqsQfaJOmJIBUWE1gxGaS0IrJHxa9anjVAwuew", // 密钥，string 类型，必须是复杂密钥，长度大于16
    "ValidateIssuer": true, // 是否验证签发方，bool 类型，默认true
    "ValidIssuer": "tuotong", // 签发方，string 类型
    "ValidateAudience": true, // 是否验证签收方，bool 类型，默认true
--- a/apihost/Tnb.API.Entry/Configurations/JobConnectionStrings.json
+++ b/apihost/Tnb.API.Entry/Configurations/JobConnectionStrings.json
@@ -0,0 +1,23 @@
+{
+  "JobConnectionStrings": {
+    "ConfigId": "JNPF-Job",// 不可修改
+    "DBName": "jnpf_sundial",
+    "DBType": "SqlServer", //MySql;SqlServer;Oracle;PostgreSQL;Dm;Kdbndp;Sqlite;
+    "Host": "192.168.0.214",
+    "Port": "1433",
+    "UserName": "sa",
+    "Password": "kMaeMP8Yck6b6wA",
+    //SqlServer
+    "DefaultConnection": "Data Source=192.168.0.214;Initial Catalog={0};User ID=sa;Password=kMaeMP8Yck6b6wA;MultipleActiveResultSets=true"
+    //Kdbndp
+    //"DefaultConnection": "Server=192.168.0.103;Port=54321;UID=YANYU;PWD=123456;database=YANSOURCE"
+    //Dm
+    //"DefaultConnection": "Server=192.168.0.50; User Id=JNPFTEST; PWD=I97eH!bRfy55qGzF;DATABASE=JNPFTEST"
+    //Oracle
+    //"DefaultConnection": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.0.19)(PORT=1521))(CONNECT_DATA=(SERVER = DEDICATED)(SERVICE_NAME=JNPFCLOUD)));User Id=JNPFCLOUD;Password=JNPFCLOUD"
+    //PostgreSQL
+    //"DefaultConnection": "PORT=5432;DATABASE=java_boot_dev_postgresql;HOST=192.168.0.103;PASSWORD=123456;USER ID=postgres"
+    //MySql
+    //"DefaultConnection": "server=192.168.0.10;Database=netcore_test;Uid=netcore_test;Pwd=jhpGB3A88CF57fBC;AllowLoadLocalInfile=true"
+  }
+}
--- a/apihost/Tnb.API.Entry/Configurations/Swagger.json
+++ b/apihost/Tnb.API.Entry/Configurations/Swagger.json
@@ -8,7 +8,7 @@
        "Group": "Default",
        "Title": "ToTong Next Builder",
        "Description": "",
-        "Version": "3.4.5"
+        "Version": "3.4.6"
      }
    ],
    "LoginInfo": {