Skip to content

S
StandaloneFrame
Commit c77d166b authored by wuhao's avatar wuhao 🎯
Browse files
Options

asder

parent e6e1408e
Show whitespace changes
Inline Side-by-side
Showing with 93 additions and 110 deletions
.DS_Store
View file @ c77d166b
No preview for this file type
database.sqlite
View file @ c77d166b
No preview for this file type
electron/controller/example.js
View file @ c77d166b
......@@ -3,7 +3,7 @@
const { Controller } = require("ee-core");
const Log = require("ee-core/log");
const Services = require("ee-core/services");
const db = require("../model/index");
const db = require("../model");
/**
* example
......@@ -24,10 +24,12 @@ class ExampleController extends Controller {
* test
*/
async test() {
const result = await Services.get("example").test("electron");
const User = require("../model/user")(db.sequelize, db.Sequelize.DataTypes);
// const result = await Services.get("example").test("electron");
// Log.info("service result:", result, db );
let res = await db?.User.create({
let res = await User.create({
username: "丁大炮",
email: "1148547900@qq.com",
});
......
electron/database/config.json
View file @ c77d166b
{
"development": {
"dialect": "sqlite",
"storage": "./data/database.sqlite"
"storage": "/Users/wuhao/Desktop/demos/standaloneframe/data/database.sqlite"
},
"test": {
"dialect": "sqlite",
"storage": "database.sqlite"
"storage": "/Users/wuhao/Desktop/demos/standaloneframe/data/database.sqlite"
},
"production": {
"dialect": "sqlite",
"storage": "database.sqlite"
"storage": "/Users/wuhao/Desktop/demos/standaloneframe/data/database.sqlite"
}
}
\ No newline at end of file
electron/database/migrations/20230616091828-create-user.js
View file @ c77d166b
'use strict';
"use strict";
/** @type {import('sequelize-cli').Migration} */
module.exports = {
async up(queryInterface, Sequelize) {
await queryInterface.createTable('Users', {
await queryInterface.createTable("Users", {
id: {
allowNull: false,
autoIncrement: true,
primaryKey: true,
type: Sequelize.INTEGER
type: Sequelize.INTEGER,
},
username: {
type: Sequelize.STRING
type: Sequelize.STRING,
},
email: {
type: Sequelize.STRING
type: Sequelize.STRING,
},
createdAt: {
allowNull: false,
type: Sequelize.DATE
type: Sequelize.DATE,
},
updatedAt: {
allowNull: false,
type: Sequelize.DATE
}
type: Sequelize.DATE,
},
});
},
async down(queryInterface, Sequelize) {
await queryInterface.dropTable('Users');
}
await queryInterface.dropTable("Users");
},
};
electron/model/index.js
View file @ c77d166b
"use strict";
const fs = require("fs");
const path = require("path");
const Sequelize = require("sequelize");
const process = require("process");
const basename = "index.js";
const env = process.env.NODE_ENV || "development";
const config = require("../database/config.json")[env];
const db = {};
let sequelize;
if (config.use_env_variable) {
sequelize = new Sequelize(process.env[config.use_env_variable], config);
} else {
sequelize = new Sequelize(
let sequelize = new Sequelize(
config.database,
config.username,
config.password,
config
);
}
fs.readdirSync(__dirname)
.filter((file) => {
return (
file.indexOf(".") !== 0 &&
file !== basename &&
file.slice(-3) === ".js" &&
file.indexOf(".test.js") === -1
);
})
.forEach((file) => {
const model = require(path.join(__dirname, file))(
sequelize,
Sequelize.DataTypes
);
db[model.name] = model;
});
);
Object.keys(db).forEach((modelName) => {
if (db[modelName].associate) {
......
frontend/src/pages/user/login.jsx
View file @ c77d166b
import Footer from "@/components/Footer";
import { doFetch, postFetch,getFetch } from "@/utils/doFetch";
import { doFetch, postFetch, getFetch } from "@/utils/doFetch";
import { LockOutlined, UserOutlined, RedoOutlined } from "@ant-design/icons";
import {
LoginForm,
ProFormCheckbox,
ProFormText,
} from "@ant-design/pro-components";
import { history, useModel,useOutletContext } from "umi";
import { Card, Dropdown, message, Tabs, QRCode } from "antd";
import React, { useState, useEffect } from 'react';
import { history, useModel, useOutletContext } from "umi";
import { Card, Dropdown, message, Tabs, Table } from "antd";
import React, { useState, useEffect } from "react";
import { ipc } from "@/utils/ipcRenderer";
import { useRequest } from "ahooks";
const Login = () => {
const {
......@@ -60,12 +60,12 @@ const Login = () => {
const [loginType, setLoginType] = useState("account");
const { data } = useRequest(async () => {
let res = await getFetch({ url: "/controller/example/test", params: {} });
return res?.data;
});
useEffect(() => {
getFetch({url:"/controller/example/test",params:{}})
}, []);
console.log(data);
return (
<div
......@@ -94,7 +94,7 @@ const Login = () => {
logo={
<img alt="logo" src="./logo.png" style={{ borderRadius: "50%" }} />
}
subTitle={"———军工健康监测系统"}
subTitle={data?.username + "———军工健康监测系统"}
initialValues={{
autoLogin: true,
}}
......@@ -103,7 +103,7 @@ const Login = () => {
}}
submitter={{
searchConfig: {
submitText: loginType === 'account' ? '登录' : '注册',
submitText: loginType === "account" ? "登录" : "注册",
},
}}
>
......@@ -177,55 +177,55 @@ const Login = () => {
</div>
</>
)}
{loginType === 'phone' && (
{loginType === "phone" && (
<>
<ProFormText
name="username"
fieldProps={{
size: 'large',
size: "large",
prefix: <UserOutlined />,
}}
placeholder={'用户名'}
placeholder={"用户名"}
rules={[
{
required: true,
message: '请输入用户名!',
message: "请输入用户名!",
},
]}
/>
<ProFormText.Password
name="password"
fieldProps={{
size: 'large',
size: "large",
prefix: <LockOutlined />,
}}
placeholder={'密码'}
placeholder={"密码"}
rules={[
{
required: true,
message: '请输入密码！',
message: "请输入密码！",
},
]}
/>
<ProFormText.Password
name="confirm"
dependencies={['password']}
dependencies={["password"]}
fieldProps={{
size: 'large',
size: "large",
prefix: <LockOutlined />,
}}
placeholder={'确认密码'}
placeholder={"确认密码"}
rules={[
{
required: true,
message: '请输入密码！',
message: "请输入密码！",
},
({ getFieldValue }) => ({
validator(_, value) {
if (!value || getFieldValue('password') === value) {
if (!value || getFieldValue("password") === value) {
return Promise.resolve();
}
return Promise.reject(new Error('两次密码不一致!'));
return Promise.reject(new Error("两次密码不一致!"));
},
}),
]}
......@@ -234,6 +234,7 @@ const Login = () => {
)}
</LoginForm>
</div>
<Footer />
</div>
);
......
yarn.lock
View file @ c77d166b
......@@ -267,7 +267,7 @@
dependencies:
"@types/node" "*"
"@types/debug@^4.1.6", "@types/debug@^4.1.7":
"@types/debug@^4.1.6", "@types/debug@^4.1.8":
version "4.1.8"
resolved "https://registry.npmmirror.com/@types/debug/-/debug-4.1.8.tgz#cef723a5d0a90990313faec2d1e22aee5eecb317"
integrity sha512-/vPO1EPOs306Cvhwv7KfVfYvOJqA/S/AXjaHQiJboCZzcNDb+TIJFN9/2C9DZ//ijSKWioNyUxD792QmDJ+HKQ==
......@@ -353,7 +353,7 @@
resolved "https://registry.npmmirror.com/@types/semver/-/semver-7.5.0.tgz#591c1ce3a702c45ee15f47a42ade72c2fd78978a"
integrity sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==
"@types/validator@^13.7.1", "@types/validator@^13.7.10":
"@types/validator@^13.7.10", "@types/validator@^13.7.17":
version "13.7.17"
resolved "https://registry.npmmirror.com/@types/validator/-/validator-13.7.17.tgz#0a6d1510395065171e3378a4afc587a3aefa7cc1"
integrity sha512-aqayTNmeWrZcvnG2MG9eGYI6b7S5fl+yKgPs6bAjOTwPS316R5SxBGKvtSExfyoJU7pIeHJfsHI0Ji41RVMkvQ==
......@@ -405,7 +405,7 @@ acorn-walk@^8.2.0:
resolved "https://registry.npmmirror.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
acorn@8.8.2, acorn@^8.7.0:
acorn@8.8.2:
version "8.8.2"
resolved "https://registry.npmmirror.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a"
integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==
......@@ -415,6 +415,11 @@ acorn@^6.0.7:
resolved "https://registry.npmmirror.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6"
integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==
acorn@^8.7.0:
version "8.9.0"
resolved "https://registry.npmmirror.com/acorn/-/acorn-8.9.0.tgz#78a16e3b2bcc198c10822786fa6679e245db5b59"
integrity sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ==
agent-base@6, agent-base@^6.0.0, agent-base@^6.0.2:
version "6.0.2"
resolved "https://registry.npmmirror.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
......@@ -1494,7 +1499,7 @@ dotenv@^9.0.2:
resolved "https://registry.npmmirror.com/dotenv/-/dotenv-9.0.2.tgz#dacc20160935a37dea6364aa1bef819fb9b6ab05"
integrity sha512-I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg==
dottie@^2.0.2:
dottie@^2.0.4:
version "2.0.6"
resolved "https://registry.npmmirror.com/dottie/-/dottie-2.0.6.tgz#34564ebfc6ec5e5772272d466424ad5b696484d4"
integrity sha512-iGCHkfUc5kFekGiqhe8B/mdaurD+lakO9txNnTvKtA6PISrw86LgqHvRzWYPyoE2Ph5aMIrCw9/uko6XHTKCwA==
......@@ -2103,9 +2108,9 @@ form-data@^4.0.0:
mime-types "^2.1.12"
formidable@^2.0.1:
version "2.1.1"
resolved "https://registry.npmmirror.com/formidable/-/formidable-2.1.1.tgz#81269cbea1a613240049f5f61a9d97731517414f"
integrity sha512-0EcS9wCFEzLvfiks7omJ+SiYJAiD+TzK4Pcw1UlUoGnhUxDcMKjt0P7x8wEb0u6OHu8Nb98WG3nxtlF5C7bvUQ==
version "2.1.2"
resolved "https://registry.npmmirror.com/formidable/-/formidable-2.1.2.tgz#fa973a2bec150e4ce7cac15589d7a25fc30ebd89"
integrity sha512-CM3GuJ57US06mlpQ47YcunuUZ9jpm8Vx+P2CGt2j7HpgkKZO/DJYQ0Bobim8G6PFQmK5lOqOOdUXboU+h73A4g==
dependencies:
dezalgo "^1.0.4"
hexoid "^1.0.0"
......@@ -2630,7 +2635,7 @@ inflation@^2.0.0:
resolved "https://registry.npmmirror.com/inflation/-/inflation-2.0.0.tgz#8b417e47c28f925a45133d914ca1fd389107f30f"
integrity sha512-m3xv4hJYR2oXw4o4Y5l6P5P16WYmazYof+el6Al3f+YlggGj6qT9kImBAnzDelRALnP5d3h4jGBPKzYCizjZZw==
inflection@^1.13.2:
inflection@^1.13.4:
version "1.13.4"
resolved "https://registry.npmmirror.com/inflection/-/inflection-1.13.4.tgz#65aa696c4e2da6225b148d7a154c449366633a32"
integrity sha512-6I/HUDeYFfuNCVS3td055BaXBwKYuzw7K3ExVMStBowKo9oOAMJIXIHvdyR3iboTCp1b+1i5DSkIZTcwIktuDw==
......@@ -3087,9 +3092,9 @@ levn@^0.3.0, levn@~0.3.0:
type-check "~0.3.2"
libphonenumber-js@^1.10.14:
version "1.10.34"
resolved "https://registry.npmmirror.com/libphonenumber-js/-/libphonenumber-js-1.10.34.tgz#63374bb988688ac28b03ed6c4b344d412199d56c"
integrity sha512-p6g4NaQH4gK1gre32+kV14Mk6GPo2EDcPDvjbi+D2ycsPFsN4gVWNbs0itdHLZqByg6YEK8mE7OeP200I/ScTQ==
version "1.10.36"
resolved "https://registry.npmmirror.com/libphonenumber-js/-/libphonenumber-js-1.10.36.tgz#ec74008ffbc488d7ad9ebd722b2773292d568033"
integrity sha512-NCPWES1poiS4NSzIS49mxHM5hCkSWov8wFICRKfL9narzimqAXlnAgNloHCt0BukZHbWt8TIStCdzLy7LXBYpQ==
lodash.escaperegexp@^4.1.2:
version "4.1.2"
......@@ -3433,14 +3438,14 @@ mkdirp@^2.1.3:
resolved "https://registry.npmmirror.com/mkdirp/-/mkdirp-2.1.6.tgz#964fbcb12b2d8c5d6fbc62a963ac95a273e2cc19"
integrity sha512-+hEnITedc8LAtIP9u3HJDFIdcLV2vXP33sqLLIzkv1Db1zO/1OxbvYf0Y1OC/S/Qo5dxHXepofhmxL02PsKe+A==
moment-timezone@^0.5.35:
moment-timezone@^0.5.43:
version "0.5.43"
resolved "https://registry.npmmirror.com/moment-timezone/-/moment-timezone-0.5.43.tgz#3dd7f3d0c67f78c23cd1906b9b2137a09b3c4790"
integrity sha512-72j3aNyuIsDxdF1i7CEgV2FfxM1r6aaqJyLB2vwb33mXYyoyLly+F1zbWqhA3/bVIoJ4szlUoMbUnVdid32NUQ==
dependencies:
moment "^2.29.4"
moment@^2.29.1, moment@^2.29.4:
moment@^2.29.4:
version "2.29.4"
resolved "https://registry.npmmirror.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==
......@@ -3870,7 +3875,7 @@ pend@~1.2.0:
resolved "https://registry.npmmirror.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==
pg-connection-string@^2.5.0:
pg-connection-string@^2.6.0:
version "2.6.0"
resolved "https://registry.npmmirror.com/pg-connection-string/-/pg-connection-string-2.6.0.tgz#12a36cc4627df19c25cc1b9b736cc39ee1f73ae8"
integrity sha512-x14ibktcwlHKoHxx9X3uTVW9zIGR41ZB6QNhHb21OPNdCCO3NaRnpJuwKIQSR4u+Yqjx4HCvy7Hh7VSy1U4dGg==
......@@ -4151,7 +4156,7 @@ restore-cursor@^3.1.0:
onetime "^5.1.0"
signal-exit "^3.0.2"
retry-as-promised@^7.0.3:
retry-as-promised@^7.0.4:
version "7.0.4"
resolved "https://registry.npmmirror.com/retry-as-promised/-/retry-as-promised-7.0.4.tgz#9df73adaeea08cb2948b9d34990549dc13d800a2"
integrity sha512-XgmCoxKWkDofwH8WddD0w85ZfqYz+ZHlr5yo+3YUCfycWawU56T5ckWXsScsj5B8tqUcIG67DxXByo3VUgiAdA==
......@@ -4255,10 +4260,10 @@ semver@^6.0.0, semver@^6.2.0:
resolved "https://registry.npmmirror.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
semver@^7.3.2, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8:
version "7.5.1"
resolved "https://registry.npmmirror.com/semver/-/semver-7.5.1.tgz#c90c4d631cf74720e46b21c1d37ea07edfab91ec"
integrity sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==
semver@^7.3.2, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.1:
version "7.5.2"
resolved "https://registry.npmmirror.com/semver/-/semver-7.5.2.tgz#5b851e66d1be07c1cdaf37dfc856f543325a2beb"
integrity sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==
dependencies:
lru-cache "^6.0.0"
......@@ -4286,25 +4291,25 @@ sequelize-pool@^7.1.0:
integrity sha512-G9c0qlIWQSK29pR/5U2JF5dDQeqqHRragoyahj/Nx4KOOQ3CPPfzxnfqFPCSB7x5UgjOgnZ61nSxz+fjDpRlJg==
sequelize@^6.32.0:
version "6.32.0"
resolved "https://registry.npmmirror.com/sequelize/-/sequelize-6.32.0.tgz#566488aa0fcf32c1baa2ff2344f462a4c9eb4a01"
integrity sha512-gMd1M6kPANyrCeU/vtgEP5gnse7sVsiKbJyz7p4huuW8zZcRopj47UlglvdrMuIoqksZmsUPfApmMo6ZlJpcvg==
version "6.32.1"
resolved "https://registry.npmmirror.com/sequelize/-/sequelize-6.32.1.tgz#8e8669a8d6cf711d2d94b33cc721928fad7487f6"
integrity sha512-3Iv0jruv57Y0YvcxQW7BE56O7DC1BojcfIrqh6my+IQwde+9u/YnuYHzK+8kmZLhLvaziRT1eWu38nh9yVwn/g==
dependencies:
"@types/debug" "^4.1.7"
"@types/validator" "^13.7.1"
debug "^4.3.3"
dottie "^2.0.2"
inflection "^1.13.2"
"@types/debug" "^4.1.8"
"@types/validator" "^13.7.17"
debug "^4.3.4"
dottie "^2.0.4"
inflection "^1.13.4"
lodash "^4.17.21"
moment "^2.29.1"
moment-timezone "^0.5.35"
pg-connection-string "^2.5.0"
retry-as-promised "^7.0.3"
semver "^7.3.5"
moment "^2.29.4"
moment-timezone "^0.5.43"
pg-connection-string "^2.6.0"
retry-as-promised "^7.0.4"
semver "^7.5.1"
sequelize-pool "^7.1.0"
toposort-class "^1.0.1"
uuid "^8.3.2"
validator "^13.7.0"
validator "^13.9.0"
wkx "^0.5.0"
serialize-error@^7.0.1:
......@@ -5034,7 +5039,7 @@ uuid@^8.3.2:
resolved "https://registry.npmmirror.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
validator@^13.7.0:
validator@^13.7.0, validator@^13.9.0:
version "13.9.0"
resolved "https://registry.npmmirror.com/validator/-/validator-13.9.0.tgz#33e7b85b604f3bbce9bb1a05d5c3e22e1c2ff855"
integrity sha512-B+dGG8U3fdtM0/aNK4/X8CXq/EcxU2WPrPEkJGslb47qyHsxmbggTWK0yEA4qnYVNF+nxNlN88o14hIcPmSIEA==
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment