7x31/SOP
1
0
Fork 0
mirror of https://gitee.com/durcframework/SOP.git synced 2025-08-11 21:57:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

4.2.0

Browse Source
This commit is contained in:
tanghc
2020-11-07 13:36:25 +08:00
parent 2b08d4d9f2
commit 27ec6c5915
8 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sop-website/sop-website-server/src/main/java/com/gitee/sop/websiteserver/controller/IsvController.java
View File

@@ -93,7 +93,8 @@ public class IsvController {
public Result<IsvPublicKeyUploadResult> uploadPublicKey(@RequestBody @Valid IsvPublicKeyUploadParam param) { public Result<IsvPublicKeyUploadResult> uploadPublicKey(@RequestBody @Valid IsvPublicKeyUploadParam param) {
String publicKeyIsv = param.getPublicKeyIsv(); String publicKeyIsv = param.getPublicKeyIsv();
LoginUser loginUser = UserContext.getLoginUser(); LoginUser loginUser = UserContext.getLoginUser();
IsvKeys isvKeys = userService.getIsvKeys(loginUser.getAppKey()); String appKey = loginUser.getAppKey();
IsvKeys isvKeys = userService.getIsvKeys(appKey);
RSATool rsaToolIsv = new RSATool(RSATool.KeyFormat.PKCS8, RSATool.KeyLength.LENGTH_2048); RSATool rsaToolIsv = new RSATool(RSATool.KeyFormat.PKCS8, RSATool.KeyLength.LENGTH_2048);
RSATool.KeyStore keyStorePlatform; RSATool.KeyStore keyStorePlatform;
try { try {
@@ -106,7 +107,7 @@ public class IsvController {
String privateKeyPlatform = keyStorePlatform.getPrivateKey(); String privateKeyPlatform = keyStorePlatform.getPrivateKey();
if (isvKeys == null) { if (isvKeys == null) {
isvKeys = new IsvKeys(); isvKeys = new IsvKeys();
isvKeys.setAppKey(loginUser.getAppKey()); isvKeys.setAppKey(appKey);
// 私钥自己保存 // 私钥自己保存
isvKeys.setPrivateKeyIsv(""); isvKeys.setPrivateKeyIsv("");
isvKeys.setPublicKeyIsv(publicKeyIsv); isvKeys.setPublicKeyIsv(publicKeyIsv);
@@ -124,6 +125,7 @@ public class IsvController {
isvPublicKeyUploadResult.setIsUploadPublicKey(BooleanUtils.toInteger(true)); isvPublicKeyUploadResult.setIsUploadPublicKey(BooleanUtils.toInteger(true));
isvPublicKeyUploadResult.setPublicKeyIsv(isvKeys.getPublicKeyIsv()); isvPublicKeyUploadResult.setPublicKeyIsv(isvKeys.getPublicKeyIsv());
isvPublicKeyUploadResult.setPublicKeyPlatform(isvKeys.getPublicKeyPlatform()); isvPublicKeyUploadResult.setPublicKeyPlatform(isvKeys.getPublicKeyPlatform());
userService.sendChannelMsg(appKey);
return Result.ok(isvPublicKeyUploadResult); return Result.ok(isvPublicKeyUploadResult);
} }

25
sop-website/sop-website-server/src/main/java/com/gitee/sop/websiteserver/service/UserService.java
View File

@@ -2,6 +2,7 @@ package com.gitee.sop.websiteserver.service;
import com.gitee.fastmybatis.core.query.Query; import com.gitee.fastmybatis.core.query.Query;
import com.gitee.sop.gatewaycommon.bean.NacosConfigs; import com.gitee.sop.gatewaycommon.bean.NacosConfigs;
import com.gitee.sop.gatewaycommon.sync.MyNamedThreadFactory;
import com.gitee.sop.gatewaycommon.util.CopyUtil; import com.gitee.sop.gatewaycommon.util.CopyUtil;
import com.gitee.sop.websiteserver.bean.ChannelMsg; import com.gitee.sop.websiteserver.bean.ChannelMsg;
import com.gitee.sop.websiteserver.bean.ChannelOperation; import com.gitee.sop.websiteserver.bean.ChannelOperation;
@@ -25,6 +26,9 @@ import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
/** /**
* @author tanghc * @author tanghc
@@ -35,6 +39,10 @@ public class UserService {
public static final byte STATUS_ENABLE = 1; public static final byte STATUS_ENABLE = 1;
private final ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(4, 4,
0L,TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<>(), new MyNamedThreadFactory("push-thread"));
@Autowired @Autowired
private UserAccountMapper userAccountMapper; private UserAccountMapper userAccountMapper;
@@ -81,16 +89,17 @@ public class UserService {
*/ */
public void updateIsvKey(IsvKeys isvKeys) { public void updateIsvKey(IsvKeys isvKeys) {
isvKeysMapper.updateIgnoreNull(isvKeys); isvKeysMapper.updateIgnoreNull(isvKeys);
this.sendChannelMsg(isvKeys.getAppKey());
} }
private void sendChannelMsg(String appKey) { public void sendChannelMsg(String appKey) {
IsvDetailDTO isvDetail = isvInfoMapper.getIsvDetail(appKey); threadPoolExecutor.execute(() -> {
if (isvDetail == null) { IsvDetailDTO isvDetail = isvInfoMapper.getIsvDetail(appKey);
return; if (isvDetail == null) {
} return;
ChannelMsg channelMsg = new ChannelMsg(ChannelOperation.ISV_INFO_UPDATE, isvDetail); }
configPushService.publishConfig(NacosConfigs.DATA_ID_ISV, NacosConfigs.GROUP_CHANNEL, channelMsg); ChannelMsg channelMsg = new ChannelMsg(ChannelOperation.ISV_INFO_UPDATE, isvDetail);
configPushService.publishConfig(NacosConfigs.DATA_ID_ISV, NacosConfigs.GROUP_CHANNEL, channelMsg);
});
} }
public LoginUser getLoginUser(String username, String password) { public LoginUser getLoginUser(String username, String password) {

2
sop-website/sop-website-server/src/main/resources/public/index.html
View File

@@ -1 +1 @@
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><link rel=icon href=favicon.ico><title>开放平台</title><link href=static/css/chunk-elementUI.ded27da0.css rel=stylesheet><link href=static/css/chunk-libs.3dfb7769.css rel=stylesheet><link href=static/css/app.520ff3b4.css rel=stylesheet></head><body><noscript><strong>We're sorry but 开放平台 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script>(function(e){function n(n){for(var r,c,a=n[0],f=n[1],d=n[2],i=0,h=[];i<a.length;i++)c=a[i],u[c]&&h.push(u[c][0]),u[c]=0;for(r in f)Object.prototype.hasOwnProperty.call(f,r)&&(e[r]=f[r]);l&&l(n);while(h.length)h.shift()();return o.push.apply(o,d||[]),t()}function t(){for(var e,n=0;n<o.length;n++){for(var t=o[n],r=!0,c=1;c<t.length;c++){var a=t[c];0!==u[a]&&(r=!1)}r&&(o.splice(n--,1),e=f(f.s=t[0]))}return e}var r={},c={runtime:0},u={runtime:0},o=[];function a(e){return f.p+"static/js/"+({}[e]||e)+"."+{"chunk-27eb7616":"26efb320","chunk-28a29d22":"7852c65c","chunk-2d0ac226":"908e7bac","chunk-2d0b6e8a":"ddfa15ec","chunk-2d0e958e":"1652deea","chunk-2d216d78":"211ad599","chunk-3cffc9a9":"80488077","chunk-4e7f1f48":"331ccf8a","chunk-5142434b":"623e9909","chunk-6440f6d0":"4dcd9cf4","chunk-2d0d43b7":"a9f25820","chunk-2d0e1a00":"c05ee2a3","chunk-57325c88":"6f1a8ef5","chunk-788f7208":"6f676b03"}[e]+".js"}function f(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,f),t.l=!0,t.exports}f.e=function(e){var n=[],t={"chunk-27eb7616":1,"chunk-28a29d22":1,"chunk-3cffc9a9":1,"chunk-4e7f1f48":1,"chunk-5142434b":1,"chunk-6440f6d0":1,"chunk-57325c88":1};c[e]?n.push(c[e]):0!==c[e]&&t[e]&&n.push(c[e]=new Promise((function(n,t){for(var r="static/css/"+({}[e]||e)+"."+{"chunk-27eb7616":"67b30787","chunk-28a29d22":"4dc6f542","chunk-2d0ac226":"31d6cfe0","chunk-2d0b6e8a":"31d6cfe0","chunk-2d0e958e":"31d6cfe0","chunk-2d216d78":"31d6cfe0","chunk-3cffc9a9":"c94c4e9c","chunk-4e7f1f48":"cf843403","chunk-5142434b":"0ad43c8d","chunk-6440f6d0":"b35fc6d0","chunk-2d0d43b7":"31d6cfe0","chunk-2d0e1a00":"31d6cfe0","chunk-57325c88":"77426e4e","chunk-788f7208":"31d6cfe0"}[e]+".css",u=f.p+r,o=document.getElementsByTagName("link"),a=0;a<o.length;a++){var d=o[a],i=d.getAttribute("data-href")||d.getAttribute("href");if("stylesheet"===d.rel&&(i===r||i===u))return n()}var h=document.getElementsByTagName("style");for(a=0;a<h.length;a++){d=h[a],i=d.getAttribute("data-href");if(i===r||i===u)return n()}var l=document.createElement("link");l.rel="stylesheet",l.type="text/css",l.onload=n,l.onerror=function(n){var r=n&&n.target&&n.target.src||u,o=new Error("Loading CSS chunk "+e+" failed.\n("+r+")");o.code="CSS_CHUNK_LOAD_FAILED",o.request=r,delete c[e],l.parentNode.removeChild(l),t(o)},l.href=u;var s=document.getElementsByTagName("head")[0];s.appendChild(l)})).then((function(){c[e]=0})));var r=u[e];if(0!==r)if(r)n.push(r[2]);else{var o=new Promise((function(n,t){r=u[e]=[n,t]}));n.push(r[2]=o);var d,i=document.createElement("script");i.charset="utf-8",i.timeout=120,f.nc&&i.setAttribute("nonce",f.nc),i.src=a(e),d=function(n){i.onerror=i.onload=null,clearTimeout(h);var t=u[e];if(0!==t){if(t){var r=n&&("load"===n.type?"missing":n.type),c=n&&n.target&&n.target.src,o=new Error("Loading chunk "+e+" failed.\n("+r+": "+c+")");o.type=r,o.request=c,t[1](o)}u[e]=void 0}};var h=setTimeout((function(){d({type:"timeout",target:i})}),12e4);i.onerror=i.onload=d,document.head.appendChild(i)}return Promise.all(n)},f.m=e,f.c=r,f.d=function(e,n,t){f.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:t})},f.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(e,n){if(1&n&&(e=f(e)),8&n)return e;if(4&n&&"object"===typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(f.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&n&&"string"!=typeof e)for(var r in e)f.d(t,r,function(n){return e[n]}.bind(null,r));return t},f.n=function(e){var n=e&&e.__esModule?function(){return e["default"]}:function(){return e};return f.d(n,"a",n),n},f.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},f.p="",f.oe=function(e){throw console.error(e),e};var d=window["webpackJsonp"]=window["webpackJsonp"]||[],i=d.push.bind(d);d.push=n,d=d.slice();for(var h=0;h<d.length;h++)n(d[h]);var l=i;t()})([]);</script><script src=static/js/chunk-elementUI.1d3df44e.js></script><script src=static/js/chunk-libs.089b1949.js></script><script src=static/js/app.1beca552.js></script></body></html> <!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><link rel=icon href=favicon.ico><title>开放平台</title><link href=static/css/chunk-elementUI.ded27da0.css rel=stylesheet><link href=static/css/chunk-libs.3dfb7769.css rel=stylesheet><link href=static/css/app.520ff3b4.css rel=stylesheet></head><body><noscript><strong>We're sorry but 开放平台 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script>(function(e){function n(n){for(var r,c,o=n[0],f=n[1],d=n[2],i=0,h=[];i<o.length;i++)c=o[i],u[c]&&h.push(u[c][0]),u[c]=0;for(r in f)Object.prototype.hasOwnProperty.call(f,r)&&(e[r]=f[r]);l&&l(n);while(h.length)h.shift()();return a.push.apply(a,d||[]),t()}function t(){for(var e,n=0;n<a.length;n++){for(var t=a[n],r=!0,c=1;c<t.length;c++){var o=t[c];0!==u[o]&&(r=!1)}r&&(a.splice(n--,1),e=f(f.s=t[0]))}return e}var r={},c={runtime:0},u={runtime:0},a=[];function o(e){return f.p+"static/js/"+({}[e]||e)+"."+{"chunk-27eb7616":"26efb320","chunk-28a29d22":"7852c65c","chunk-2d0ac226":"908e7bac","chunk-2d0b6e8a":"ddfa15ec","chunk-2d0e958e":"1652deea","chunk-2d216d78":"211ad599","chunk-4e7f1f48":"331ccf8a","chunk-5142434b":"623e9909","chunk-6440f6d0":"4dcd9cf4","chunk-2d0d43b7":"a9f25820","chunk-2d0e1a00":"c05ee2a3","chunk-57325c88":"6f1a8ef5","chunk-788f7208":"6f676b03","chunk-eaa69404":"04ac7757"}[e]+".js"}function f(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,f),t.l=!0,t.exports}f.e=function(e){var n=[],t={"chunk-27eb7616":1,"chunk-28a29d22":1,"chunk-4e7f1f48":1,"chunk-5142434b":1,"chunk-6440f6d0":1,"chunk-57325c88":1,"chunk-eaa69404":1};c[e]?n.push(c[e]):0!==c[e]&&t[e]&&n.push(c[e]=new Promise((function(n,t){for(var r="static/css/"+({}[e]||e)+"."+{"chunk-27eb7616":"67b30787","chunk-28a29d22":"4dc6f542","chunk-2d0ac226":"31d6cfe0","chunk-2d0b6e8a":"31d6cfe0","chunk-2d0e958e":"31d6cfe0","chunk-2d216d78":"31d6cfe0","chunk-4e7f1f48":"cf843403","chunk-5142434b":"0ad43c8d","chunk-6440f6d0":"b35fc6d0","chunk-2d0d43b7":"31d6cfe0","chunk-2d0e1a00":"31d6cfe0","chunk-57325c88":"77426e4e","chunk-788f7208":"31d6cfe0","chunk-eaa69404":"04f4b7fb"}[e]+".css",u=f.p+r,a=document.getElementsByTagName("link"),o=0;o<a.length;o++){var d=a[o],i=d.getAttribute("data-href")||d.getAttribute("href");if("stylesheet"===d.rel&&(i===r||i===u))return n()}var h=document.getElementsByTagName("style");for(o=0;o<h.length;o++){d=h[o],i=d.getAttribute("data-href");if(i===r||i===u)return n()}var l=document.createElement("link");l.rel="stylesheet",l.type="text/css",l.onload=n,l.onerror=function(n){var r=n&&n.target&&n.target.src||u,a=new Error("Loading CSS chunk "+e+" failed.\n("+r+")");a.code="CSS_CHUNK_LOAD_FAILED",a.request=r,delete c[e],l.parentNode.removeChild(l),t(a)},l.href=u;var s=document.getElementsByTagName("head")[0];s.appendChild(l)})).then((function(){c[e]=0})));var r=u[e];if(0!==r)if(r)n.push(r[2]);else{var a=new Promise((function(n,t){r=u[e]=[n,t]}));n.push(r[2]=a);var d,i=document.createElement("script");i.charset="utf-8",i.timeout=120,f.nc&&i.setAttribute("nonce",f.nc),i.src=o(e),d=function(n){i.onerror=i.onload=null,clearTimeout(h);var t=u[e];if(0!==t){if(t){var r=n&&("load"===n.type?"missing":n.type),c=n&&n.target&&n.target.src,a=new Error("Loading chunk "+e+" failed.\n("+r+": "+c+")");a.type=r,a.request=c,t[1](a)}u[e]=void 0}};var h=setTimeout((function(){d({type:"timeout",target:i})}),12e4);i.onerror=i.onload=d,document.head.appendChild(i)}return Promise.all(n)},f.m=e,f.c=r,f.d=function(e,n,t){f.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:t})},f.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(e,n){if(1&n&&(e=f(e)),8&n)return e;if(4&n&&"object"===typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(f.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&n&&"string"!=typeof e)for(var r in e)f.d(t,r,function(n){return e[n]}.bind(null,r));return t},f.n=function(e){var n=e&&e.__esModule?function(){return e["default"]}:function(){return e};return f.d(n,"a",n),n},f.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},f.p="",f.oe=function(e){throw console.error(e),e};var d=window["webpackJsonp"]=window["webpackJsonp"]||[],i=d.push.bind(d);d.push=n,d=d.slice();for(var h=0;h<d.length;h++)n(d[h]);var l=i;t()})([]);</script><script src=static/js/chunk-elementUI.1d3df44e.js></script><script src=static/js/chunk-libs.089b1949.js></script><script src=static/js/app.5706d539.js></script></body></html>

2
sop-website/sop-website-server/src/main/resources/public/static/css/chunk-3cffc9a9.c94c4e9c.css → sop-website/sop-website-server/src/main/resources/public/static/css/chunk-eaa69404.04f4b7fb.css
View File

@@ -1 +1 @@
@supports (-webkit-mask:none) and (not (cater-color:#000)){.login-container .el-input input{color:#000}}.login-container .el-input{display:inline-block;height:47px;width:85%}.login-container .el-input input{background:transparent;border:0;-webkit-appearance:none;border-radius:0;padding:12px 5px 12px 15px;color:#000;height:47px;caret-color:#000}.login-container .el-input input:-webkit-autofill{-webkit-box-shadow:0 0 0 1000px #fff inset!important;box-shadow:inset 0 0 0 1000px #fff!important;-webkit-text-fill-color:#000!important}.login-container .el-form-item{border:1px solid #d3dce6;border-radius:5px;color:#454545}.login-container[data-v-0b530f82]{min-height:100%;width:100%;overflow:hidden}.login-container .login-form[data-v-0b530f82]{position:relative;width:520px;max-width:100%;padding:60px 35px 0;margin:0 auto;overflow:hidden}.login-container .tips[data-v-0b530f82]{font-size:14px;color:#fff;margin-bottom:10px}.login-container .tips span[data-v-0b530f82]:first-of-type{margin-right:16px}.login-container .svg-container[data-v-0b530f82]{padding:6px 5px 6px 15px;color:#889aa4;vertical-align:middle;width:30px;display:inline-block}.login-container .title-container[data-v-0b530f82]{position:relative}.login-container .title-container .title[data-v-0b530f82]{font-size:26px;margin:0 auto 40px auto;text-align:center;font-weight:700}.login-container .show-pwd[data-v-0b530f82]{position:absolute;right:10px;top:7px;font-size:16px;color:#889aa4;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none} @supports (-webkit-mask:none) and (not (cater-color:#000)){.login-container .el-input input{color:#000}}.login-container .el-input{display:inline-block;height:47px;width:85%}.login-container .el-input input{background:transparent;border:0;-webkit-appearance:none;border-radius:0;padding:12px 5px 12px 15px;color:#000;height:47px;caret-color:#000}.login-container .el-input input:-webkit-autofill{-webkit-box-shadow:0 0 0 1000px #fff inset!important;box-shadow:inset 0 0 0 1000px #fff!important;-webkit-text-fill-color:#000!important}.login-container .el-form-item{border:1px solid #d3dce6;border-radius:5px;color:#454545}.login-container[data-v-6695e9ee]{min-height:100%;width:100%;overflow:hidden}.login-container .login-form[data-v-6695e9ee]{position:relative;width:520px;max-width:100%;padding:60px 35px 0;margin:0 auto;overflow:hidden}.login-container .tips[data-v-6695e9ee]{font-size:14px;color:#fff;margin-bottom:10px}.login-container .tips span[data-v-6695e9ee]:first-of-type{margin-right:16px}.login-container .svg-container[data-v-6695e9ee]{padding:6px 5px 6px 15px;color:#889aa4;vertical-align:middle;width:30px;display:inline-block}.login-container .title-container[data-v-6695e9ee]{position:relative}.login-container .title-container .title[data-v-6695e9ee]{font-size:26px;margin:0 auto 40px auto;text-align:center;font-weight:700}.login-container .show-pwd[data-v-6695e9ee]{position:absolute;right:10px;top:7px;font-size:16px;color:#889aa4;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}

2
sop-website/sop-website-server/src/main/resources/public/static/js/app.1beca552.js → sop-website/sop-website-server/src/main/resources/public/static/js/app.5706d539.js
View File

File diff suppressed because one or more lines are too long

1
sop-website/sop-website-server/src/main/resources/public/static/js/chunk-3cffc9a9.80488077.js
View File

File diff suppressed because one or more lines are too long

1
sop-website/sop-website-server/src/main/resources/public/static/js/chunk-eaa69404.04ac7757.js Normal file
View File

File diff suppressed because one or more lines are too long

2
sop-website/sop-website-vue/src/views/common/regIsv.vue
View File

@@ -34,7 +34,7 @@
prefix-icon="el-icon-lock" prefix-icon="el-icon-lock"
/> />
</el-form-item> </el-form-item>
<el-button type="primary" style="width: 100%;" @click.native.prevent="handleReg">注 册</el-button> <el-button type="primary" style="width: 100%;" native-type="submit" @click="handleReg">注 册</el-button>
<div class="footer"> <div class="footer">
已有账号，<el-button type="text" @click="goLogin">去登录</el-button> 已有账号，<el-button type="text" @click="goLogin">去登录</el-button>
</div> </div>