From e7c0aae19aa55f7b9d87298d53131577839b63e5 Mon Sep 17 00:00:00 2001 From: Mlxa0324 Date: Sat, 11 Mar 2023 00:28:13 +0800 Subject: [PATCH] 1 --- doc/云效脚本/tianze.conf | 51 +++++++++++++++++++ .../resources/sql/jlw/resourcesApplication.md | 2 +- .../js/jlw/resourcesApplication/index.js | 12 ++++- .../jlw/resourcesApplication/add.html | 25 +++++++-- 4 files changed, 83 insertions(+), 7 deletions(-) create mode 100644 doc/云效脚本/tianze.conf diff --git a/doc/云效脚本/tianze.conf b/doc/云效脚本/tianze.conf new file mode 100644 index 00000000..17afcc78 --- /dev/null +++ b/doc/云效脚本/tianze.conf @@ -0,0 +1,51 @@ + +server { + listen 80; + server_name zycloud.sztzjy.com; + client_max_body_size 100M; + + # 后台资源文件存放位置 + location /server/filesystem/ { + alias /data/dev/web/filesystem/; + } + + location /server { + proxy_pass http://127.0.0.1:9090/server; + proxy_set_header Host $proxy_host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + alias /data/dev/; + } + + location / { + try_files $uri $uri/ @router ; + root /www/wwwroot/tianze/dist; + index index.html index.htm; + } + + location /static { + alias /www/wwwroot/tianze/dist/static/; + } + + # 前台资源文件存放位置 + location /filesystem/ { + alias /data/dev/web/filesystem/; + } + + # 老系统的存档文件迁移 + location /archive/ { + alias /data/dev/web/filesystem/archive/; + } + # 老系统的存档文件迁移 + location /server/archive/ { + alias /data/dev/web/filesystem/archive/; + } + + location @router { + rewrite ^.*$ /index.html last; + } + +} \ No newline at end of file diff --git a/web/src/main/resources/sql/jlw/resourcesApplication.md b/web/src/main/resources/sql/jlw/resourcesApplication.md index 0e88e0d2..2838d362 100644 --- a/web/src/main/resources/sql/jlw/resourcesApplication.md +++ b/web/src/main/resources/sql/jlw/resourcesApplication.md @@ -15,7 +15,7 @@ queryByCondition and t.resources_application_id =#resourcesApplicationId# @} @if(!isEmpty(applicationName)){ - and t.application_name =#applicationName# + and t.application_name like #"%"+applicationName+"%"# @} @if(!isEmpty(applicationLink)){ and t.application_link =#applicationLink# diff --git a/web/src/main/resources/static/js/jlw/resourcesApplication/index.js b/web/src/main/resources/static/js/jlw/resourcesApplication/index.js index 8d7af066..daa8d7b8 100644 --- a/web/src/main/resources/static/js/jlw/resourcesApplication/index.js +++ b/web/src/main/resources/static/js/jlw/resourcesApplication/index.js @@ -38,13 +38,23 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { field : 'applicationName', title : '应用名称',align:"center",width:300 }, + { + + field : 'applicationOneLevelRelation', + title : '一级关联',align:"center",width:200 + }, + { + + field : 'applicationSecondLevelRelation', + title : '二级关联',align:"center",width:300 + }, { field : 'applicationLink', title : '应用链接',align:"center" },{ field : 'linkSecretKey', - title : '应用秘钥',align:"center" + title : '应用秘钥',align:"center",width:150 },{ field : 'userId',title : '操作',align:"center", width:150,templet: function (d) { var htm = '编辑'; diff --git a/web/src/main/resources/templates/jlw/resourcesApplication/add.html b/web/src/main/resources/templates/jlw/resourcesApplication/add.html index 97699f30..f6783df3 100644 --- a/web/src/main/resources/templates/jlw/resourcesApplication/add.html +++ b/web/src/main/resources/templates/jlw/resourcesApplication/add.html @@ -171,17 +171,32 @@ layui.use(['add','form'], function(){ form = layui.form resourcesApplicationAdd.init(); + // 老数据 + // var levelRelationMapOld = { + // 1:{name:"国内外宏观经济运行与金融监管平台",child:[{name:"中央银行、财政部、其他政府机构"},{name:"证监会、银保监会、行业协会"},{name:"国外经济、国外政局"}]}, + // 2:{name:"金融产品设计",child:[{name:"风险管理"},{name:"征信评级"},{name:"估值定价"},{name:"期权建模"},{name:"仿真预测"},{name:"资产证券化"}]}, + // 3:{name:"金融产品发行市场",child:[{name:"承销/挂牌"},{name:"并购重组"},{name:"私募"},{name:"PE/VC"}]}, + // 4:{name:"金融产品流通市场",child:[{name:"经纪/做市商"},{name:"融资融券"},{name:"数据与资讯"},{name:"研究咨询"},{name:"支付清算"},{name:"财富管理"}]}, + // 5:{name:"金融市场参与主体",child:[{name:"证券/期货/基金/信托/资管公司"},{name:"商业银行/政策性银行/信用合作社机构"},{name:"保险公司"},{name:"P2P网络借贷公司"}, + // {name:"众筹公司"},{name:"第三方支付公司"},{name:"征信评级机构"},{name:"供应链金融服务公司"},{name:"金融科技服务公司"}]}, + // 6:{name:"大数据技术",child:[{name:"大数据采集"},{name:"大数据存储"},{name:"大数据分析挖掘"},{name:"大数据可视化"}]}, + // 7:{name:"人工智能技术",child:[{name:"智能数据"},{name:"人工智能技术"},{name:"智能营销"},{name:"智能交易"},{name:"智能投研"},{name:"智能支付"},{name:"智能风控"},{name:"智能投顾"}]}, + // 8:{name:"云计算技术",child:[{name:"云主机"},{name:"云存储"},{name:"云数据库"},{name:"容器服务"},{name:"金融 SaaS 应用"},{name:"公有云"},{name:"私有云"}]}, + // 9:{name:"区块链技术",child:[{name:"区块链底层开发平台"},{name:"数字资产"},{name:"智能合约"},{name:"分布式账本"},{name:"数字票据"},{name:"供应链金融"},{name:"支付清算"}]} + // } + + // 从老智云，获取到的最新的数据 2023.03.07 index.html中也有一份 var levelRelationMap = { 1:{name:"国内外宏观经济运行与金融监管平台",child:[{name:"中央银行、财政部、其他政府机构"},{name:"证监会、银保监会、行业协会"},{name:"国外经济、国外政局"}]}, 2:{name:"金融产品设计",child:[{name:"风险管理"},{name:"征信评级"},{name:"估值定价"},{name:"期权建模"},{name:"仿真预测"},{name:"资产证券化"}]}, 3:{name:"金融产品发行市场",child:[{name:"承销/挂牌"},{name:"并购重组"},{name:"私募"},{name:"PE/VC"}]}, - 4:{name:"金融产品流通市场",child:[{name:"经纪/做市商"},{name:"融资融券"},{name:"数据与资讯"},{name:"研究咨询"},{name:"支付清算"},{name:"财富管理"}]}, - 5:{name:"金融市场参与主体",child:[{name:"证券/期货/基金/信托/资管公司"},{name:"商业银行/政策性银行/信用合作社机构"},{name:"保险公司"},{name:"P2P网络借贷公司"}, + 4:{name:"金融产品流通市场",child:[{name:"证券交易"},{name:"融资融券"},{name:"数据资讯"},{name:"研究咨询"},{name:"登记清算"},{name:"财富管理"}]}, + 5:{name:"金融市场参与主体",child:[{name:"经纪/做市商"},{name:"证券/期货/基金/信托/资管公司"},{name:"商业银行/政策性银行/信用合作社机构"},{name:"保险公司"},{name:"P2P网络借贷公司"}, {name:"众筹公司"},{name:"第三方支付公司"},{name:"征信评级机构"},{name:"供应链金融服务公司"},{name:"金融科技服务公司"}]}, - 6:{name:"大数据技术",child:[{name:"大数据采集"},{name:"大数据存储"},{name:"大数据分析挖掘"},{name:"大数据可视化"}]}, + 6:{name:"大数据技术",child:[{name:"大数据采集"},{name:"大数据储存"},{name:"大数据分析挖掘"},{name:"大数据可视化"}]}, 7:{name:"人工智能技术",child:[{name:"智能数据"},{name:"人工智能技术"},{name:"智能营销"},{name:"智能交易"},{name:"智能投研"},{name:"智能支付"},{name:"智能风控"},{name:"智能投顾"}]}, - 8:{name:"云计算技术",child:[{name:"云主机"},{name:"云存储"},{name:"云数据库"},{name:"容器服务"},{name:"金融 SaaS 应用"},{name:"公有云"},{name:"私有云"}]}, - 9:{name:"区块链技术",child:[{name:"区块链底层开发平台"},{name:"数字资产"},{name:"智能合约"},{name:"分布式账本"},{name:"数字票据"},{name:"供应链金融"},{name:"支付清算"}]} + 8:{name:"云计算技术",child:[{name:"云主机"},{name:"云储存"},{name:"云数据库"},{name:"容器服务"},{name:"金融SaaS应用"},{name:"公有云"},{name:"私有云"}]}, + 9:{name:"区块链技术",child:[{name:"区块链底层开发平台"},{name:"数字资产"},{name:"智能合约"},{name:"分布式账本"},{name:"数字票据"},{name:"供应链金融"},{name:"支付清算"},{name:"......"}]} } $.each(levelRelationMap,function (key,value){