update

app/models/Config.py

@@ -0,0 +1,32 @@
+from app import db
+from datetime import datetime
+
+class Config(db.Model):
+    __tablename__ = 'SYS_CONFIG'
+    config_id = db.Column(db.Integer, primary_key=True)
+    config_name = db.Column(db.String(100))
+    config_key = db.Column(db.String(100))
+    config_value = db.Column(db.String(500))
+    config_type = db.Column(db.Integer)
+    create_by = db.Column(db.String(64))
+    create_time = db.Column(db.DATETIME, default=datetime.now)
+    update_by = db.Column(db.String(64))
+    update_time = db.Column(db.DATETIME, default=datetime.now)
+    remark = db.Column(db.String(500))
+
+    def to_json(self):
+        return {
+            'config_id': self.config_id,
+            'config_name': self.config_name,
+            'config_key': self.dicconfig_keyt_type,
+            'config_value': self.config_value,
+            'config_type': self.config_type,
+            'create_by': self.create_by,
+            'create_time': self.create_time,
+            'update_by': self.update_by,
+            'update_time': self.update_time,
+            'remark': self.remark,
+        }
+
+    def __repr__(self):
+        return '<Config %r>\n' %(self.config_name)

app/models/Resource.py

@@ -6,6 +6,9 @@ from flask import jsonify
 
 class Resource(db.Model, UserMixin):
     __tablename__ = 'SYRESOURCE'
+    __mapper_args__ = {
+     "order_by": 'SEQ'
+    }
     ID = db.Column(db.String(36), primary_key=True)
     CREATEDATETIME = db.Column(db.DateTime, index=True, default=datetime.now)
     UPDATEDATETIME = db.Column(db.DateTime, index=True, default=datetime.now)

app/models/__init__.py

@@ -7,3 +7,4 @@ from .User import User
 from .OnLine import OnLine
 from .DictData import DictData
 from .DictType import DictType
+from .Config import Config

app/routes/__init__.py

@@ -5,3 +5,4 @@ from . import resource
 from . import organization
 from . import online
 from . import dictdata
+from . import config

app/routes/config.py

@@ -0,0 +1,11 @@
+from ..base import base
+from ..models import Config
+from flask import render_template, request, jsonify
+from sqlalchemy import asc
+from sqlalchemy import desc
+
+@base.route('/system/config/configKey/<configKey>', methods=['GET'])
+def sysconfig_get_value(configKey):
+    data = Config.query.filter(Config.config_key == configKey).first()
+
+    return jsonify({'code': 200, 'msg': data.config_value})

app/routes/user.py

@@ -128,6 +128,13 @@ def user_grid():
 
     return jsonify({'rows': [user.to_json() for user in users], 'total': pagination.total, 'code': 200, 'msg': '查询成功'})
 
+@base.route('/system/user/', methods=['GET'])
+def syuser_get():
+    json = {'code': 200, 'msg': ''}
+    json['roles'] = [role.to_json() for role in Role.query.all()]
+    json['posts'] = []
+    return jsonify(json)
+
 @base.route('/system/user/<id>', methods=['GET'])
 def syuser_getById(id):
     user = User.query.get(id)
@@ -142,29 +149,30 @@ def syuser_getById(id):
     else:
         return jsonify({'success': False, 'msg': 'error'})
 
-@base.route('/base/syuser!update.action', methods=['POST'])
+@base.route('/system/user', methods=['PUT'])
 def syuser_update():
-    id = request.form.get('data.id')
-    loginname = request.form.get('data.loginname')
+    id = request.json['userId']
+    userName = request.json['userName']
     
-    if User.query.filter(User.LOGINNAME == loginname).filter(User.ID != id).first():
-        return jsonify({'success': False, 'msg': '更新用户失败，用户名已存在！'})
+    # if User.query.filter(User.LOGINNAME == loginname).filter(User.ID != id).first():
+    #     return jsonify({'code': 201, 'msg': '更新用户失败，用户名已存在！'})
 
     user = User.query.get(id)
 
     user.UPDATEDATETIME = datetime.now()
-    user.LOGINNAME = request.form.get('data.loginname')
-    user.NAME = request.form.get('data.name')
-    user.SEX = request.form.get('data.sex')
-    user.PHOTO = request.form.get('data.photo')
+    if 'nickName' in request.json: user.NAME = request.json['nickName'] 
+    if 'sex' in request.json: user.SEX = request.json['sex']
+    if 'deptId' in request.json: user.organizations = Organization.query.filter(Organization.ID == request.json['deptId']).all()
+    if 'roleIds' in request.json:
+        user.roles = [Role.query.get(roleId) for roleId in request.json['roleIds']]
 
     db.session.add(user)
 
-    return jsonify({'success': True, 'msg': '更新成功！'})
+    return jsonify({'code': 200, 'msg': '更新成功！'})
 
-@base.route('/base/syuser!save.action', methods=['POST'])
+@base.route('/system/user', methods=['POST'])
 def syuser_save():
-    if User.query.filter_by(LOGINNAME = request.form.get('data.loginname')).first():
+    if User.query.filter_by(LOGINNAME = request.json['userName']).first():
         return jsonify({'success': False, 'msg': '新建用户失败，用户名已存在！'})
 
     user = User()
@@ -172,28 +180,32 @@ def syuser_save():
     user.ID = str(uuid.uuid4())
 
     md = hashlib.md5()
-    md.update('123456'.encode('utf-8'))
+    md.update(request.json['password'].encode('utf-8'))
     user.PWD = md.hexdigest()
 
-    user.NAME = request.form.get('data.name')
-    user.LOGINNAME = request.form.get('data.loginname')
-    user.SEX = request.form.get('data.sex')
-    user.PHOTO = request.form.get('data.photo')
+    with db.session.no_autoflush:
+        if 'nickName' in request.json: user.NAME = request.json['nickName'] 
+        if 'sex' in request.json: user.SEX = request.json['sex']
+        if 'deptId' in request.json: user.organizations = Organization.query.filter(Organization.ID == request.json['deptId']).all()
+        if 'roleIds' in request.json:
+            user.roles = [Role.query.get(roleId) for roleId in request.json['roleIds']]
 
-    # add current use to new user
-    #current_user.roles.append(user)
+        user.LOGINNAME = request.json['userName']
 
-    db.session.add(user)
+        # add current use to new user
+        #current_user.roles.append(user)
+
+        db.session.add(user)
 
-    return jsonify({'success': True, 'msg': '新建用户成功！默认密码：123456'})
+    return jsonify({'code': 200, 'msg': '新建用户成功！'})
 
-@base.route('/base/syuser!delete.action', methods=['POST'])
-def syuser_delete():
-    user = User.query.get(request.form.get('id'))
+@base.route('/system/user/<id>', methods=['DELETE'])
+def syuser_delete(id):
+    user = User.query.get(id)
     if user:
         db.session.delete(user)
 
-    return jsonify({'success': True})
+    return jsonify({'code': 200, 'msg': '删除成功'})
 
 @base.route('/base/syuser!doNotNeedSecurity_updateCurrentPwd.action', methods=['POST']) 
 def syuser_update_pwd():

db.sql

@@ -11,7 +11,7 @@
  Target Server Version : 80029
  File Encoding         : 65001
 
- Date: 24/05/2022 21:43:55
+ Date: 26/05/2022 07:54:42
 */
 
 SET NAMES utf8mb4;
@@ -41,7 +41,11 @@ INSERT INTO `SYONLINE` VALUES ('2db49057-349e-49d7-a42e-a09a2ec05a09', '2022-05-
 INSERT INTO `SYONLINE` VALUES ('2ec4552a-8e85-43f7-b80c-e7c770bffab3', '2022-05-22 09:41:31', '127.0.0.1', 'admin', '1');
 INSERT INTO `SYONLINE` VALUES ('30196021-2423-458b-b72e-3db1fc959c79', '2022-05-14 20:36:36', '127.0.0.1', 'admin', '1');
 INSERT INTO `SYONLINE` VALUES ('30602de4-33e7-48e6-baee-f8f6a573d508', '2022-05-22 09:40:41', '127.0.0.1', 'admin', '0');
+INSERT INTO `SYONLINE` VALUES ('4c27ef37-8acd-412c-934b-3f779fcfb3d4', '2022-05-25 10:48:50', '127.0.0.1', 'admin', '0');
+INSERT INTO `SYONLINE` VALUES ('4ee9e9cb-90fb-4970-9f5e-a3ca9ea1c654', '2022-05-25 00:42:44', '127.0.0.1', 'admin', '1');
 INSERT INTO `SYONLINE` VALUES ('6ce4da2f-0833-40d3-bd8b-fe42146b05c6', '2022-05-15 18:16:59', '127.0.0.1', 'admin', '1');
+INSERT INTO `SYONLINE` VALUES ('72ce76e3-d025-43f6-83b9-458b74ad3c33', '2022-05-25 00:42:41', '127.0.0.1', 'admin', '0');
+INSERT INTO `SYONLINE` VALUES ('734aeec9-e371-4f2f-9046-9b2daefa2370', '2022-05-25 10:48:59', '127.0.0.1', 'admin', '1');
 INSERT INTO `SYONLINE` VALUES ('76071a92-e2fb-4c45-8a71-f44a70d0dd8e', '2022-05-22 09:22:26', '127.0.0.1', 'admin', '1');
 INSERT INTO `SYONLINE` VALUES ('76c7109c-af8c-4375-bb65-0f17cd2446dd', '2022-05-22 09:23:30', '127.0.0.1', 'admin', '0');
 INSERT INTO `SYONLINE` VALUES ('80de6227-9a7e-45c5-a093-ca4950a8fc7d', '2022-05-22 09:40:38', '127.0.0.1', 'admin', '1');
@@ -88,7 +92,8 @@ CREATE TABLE `SYORGANIZATION`  (
 -- Records of SYORGANIZATION
 -- ----------------------------
 INSERT INTO `SYORGANIZATION` VALUES ('0', NULL, NULL, '2016-11-28 10:34:54', 'ext-icon-bricks', '总部', 100, '2016-11-28 10:35:12', NULL, NULL, NULL, NULL);
-INSERT INTO `SYORGANIZATION` VALUES ('5477d9a9-e41e-485f-bb08-697e8facef88', NULL, NULL, '2022-05-22 09:59:33', NULL, 'test', 2, '2022-05-22 11:28:57', '0', 'dd', '18905189016', 'ss@ada.com');
+INSERT INTO `SYORGANIZATION` VALUES ('5477d9a9-e41e-485f-bb08-697e8facef88', NULL, NULL, '2022-05-22 09:59:33', NULL, '南京分公司', 1, '2022-05-24 23:43:51', '0', 'dd', '18905189016', 'ss@ada.com');
+INSERT INTO `SYORGANIZATION` VALUES ('ce627e90-57d6-4ed4-a789-1f3dd467ae7d', NULL, NULL, '2022-05-24 23:54:10', NULL, '上海分公司', 2, '2022-05-24 23:56:21', '0', 'jack', NULL, NULL);
 
 -- ----------------------------
 -- Table structure for SYORGANIZATION_SYRESOURCE
@@ -136,9 +141,9 @@ CREATE TABLE `SYRESOURCE`  (
 -- ----------------------------
 -- Records of SYRESOURCE
 -- ----------------------------
-INSERT INTO `SYRESOURCE` VALUES ('jgbj', '2015-08-25 10:34:53', '编辑机构', 'ext-icon-bullet_wrench', '编辑机构', 2, '', '2015-08-25 10:34:53', NULL, '/base/syorganization!update', 'system:dept:edit', 'jggl', '1');
+INSERT INTO `SYRESOURCE` VALUES ('jgbj', '2015-08-25 10:34:53', '编辑机构', 'ext-icon-bullet_wrench', '编辑机构', 2, '', '2022-05-25 00:39:56', NULL, '/base/syorganization!update', 'system:dept:edit', 'jggl', '1');
 INSERT INTO `SYRESOURCE` VALUES ('jgck', '2015-08-25 10:34:53', '查看机构', 'ext-icon-bullet_wrench', '查看机构', 4, '', '2015-08-25 10:34:53', NULL, '/base/syorganization!getById', 'system:dept:query', 'jggl', '1');
-INSERT INTO `SYRESOURCE` VALUES ('jggl', '2015-08-25 10:34:53', '管理系统中用户的机构', 'tree', '机构管理', 3, '', '2015-08-25 10:34:53', 'dept', 'system/dept/index', 'system:dept:list', 'xtgl', '0');
+INSERT INTO `SYRESOURCE` VALUES ('jggl', '2015-08-25 10:34:53', '管理系统中用户的机构', 'tree', '机构管理', 4, '', '2022-05-25 00:40:04', 'dept', 'system/dept/index', 'system:dept:list', 'xtgl', '0');
 INSERT INTO `SYRESOURCE` VALUES ('jglb', '2015-08-25 10:34:53', '查询机构列表', 'ext-icon-bullet_wrench', '机构列表', 0, '', '2016-11-28 14:09:52', NULL, '/base/syorganization!treeGrid', 'system:dept:list', 'jggl', '1');
 INSERT INTO `SYRESOURCE` VALUES ('jgsc', '2015-08-25 10:34:53', '删除机构', 'ext-icon-bullet_wrench', '删除机构', 3, '', '2015-08-25 10:34:53', NULL, '/base/syorganization!delete', 'system:dept:remove', 'jggl', '1');
 INSERT INTO `SYRESOURCE` VALUES ('jgsq', '2015-08-25 10:34:53', '机构授权', 'ext-icon-bullet_wrench', '机构授权', 5, '', '2015-08-25 10:34:53', NULL, '/base/syorganization!grant', NULL, 'jggl', '1');
@@ -156,7 +161,7 @@ INSERT INTO `SYRESOURCE` VALUES ('xtgl', '2015-08-25 10:34:53', '管理系统的
 INSERT INTO `SYRESOURCE` VALUES ('xtjk', '2015-08-25 10:34:53', '监控系统运行情况等信息', 'ext-icon-monitor', '系统监控', 6, '', '2015-08-25 10:34:53', NULL, '/welcome.jsp', '', NULL, '0');
 INSERT INTO `SYRESOURCE` VALUES ('yhbj', '2015-08-25 10:34:53', '编辑用户', 'ext-icon-bullet_wrench', '编辑用户', 2, '', '2015-08-25 10:34:53', NULL, '/base/syuser!update', 'system:user:edit', 'yhgl', '1');
 INSERT INTO `SYRESOURCE` VALUES ('yhck', '2015-08-25 10:34:53', '查看用户', 'ext-icon-bullet_wrench', '查看用户', 4, '', '2015-08-25 10:34:53', NULL, '/base/syuser!getById', 'system:user:query', 'yhgl', '1');
-INSERT INTO `SYRESOURCE` VALUES ('yhgl', '2015-08-25 10:34:53', '管理系统中用户的用户', 'user', '用户管理', 4, '', '2015-08-25 10:34:53', 'user', 'system/user/index', 'system:user:list', 'xtgl', '0');
+INSERT INTO `SYRESOURCE` VALUES ('yhgl', '2015-08-25 10:34:53', '管理系统中用户的用户', 'user', '用户管理', 1, '', '2022-05-25 00:48:17', 'user', 'system/user/index', 'system:user:list', 'xtgl', '0');
 INSERT INTO `SYRESOURCE` VALUES ('yhjg', '2015-08-25 10:34:53', '编辑用户机构', 'ext-icon-bullet_wrench', '用户机构', 6, '', '2015-08-25 10:34:53', NULL, '/base/syuser!grantOrganization', 'system:dept:edit', 'yhgl', '1');
 INSERT INTO `SYRESOURCE` VALUES ('yhjs', '2015-08-25 10:34:53', '编辑用户角色', 'ext-icon-bullet_wrench', '用户角色', 5, '', '2015-08-25 10:34:53', NULL, '/base/syuser!grantRole', 'system:role:edit', 'yhgl', '1');
 INSERT INTO `SYRESOURCE` VALUES ('yhlb', '2015-08-25 10:34:53', '查询用户列表', 'ext-icon-bullet_wrench', '用户列表', 0, '', '2015-08-25 10:34:53', NULL, '/base/syuser!grid', 'system:user:list', 'yhgl', '1');
@@ -164,7 +169,7 @@ INSERT INTO `SYRESOURCE` VALUES ('yhsc', '2015-08-25 10:34:53', '删除用户',
 INSERT INTO `SYRESOURCE` VALUES ('yhtj', '2015-08-25 10:34:53', '添加用户', 'ext-icon-bullet_wrench', '添加用户', 1, '', '2015-08-25 10:34:53', NULL, '/base/syuser!save', 'system:user:add', 'yhgl', '1');
 INSERT INTO `SYRESOURCE` VALUES ('zybj', '2015-08-25 10:34:53', '编辑资源', 'ext-icon-bullet_wrench', '编辑资源', 2, '', '2015-08-25 10:34:53', NULL, '/base/syresource!update', 'system:menu:edit', 'zygl', '1');
 INSERT INTO `SYRESOURCE` VALUES ('zyck', '2015-08-25 10:34:53', '查看资源', 'ext-icon-bullet_wrench', '查看资源', 4, '', '2015-08-25 10:34:53', NULL, '/base/syresource!getById', 'system:menu:query', 'zygl', '1');
-INSERT INTO `SYRESOURCE` VALUES ('zygl', '2015-08-25 10:34:53', '管理系统的资源', 'tree-table', '资源管理', 1, '', '2015-08-25 10:34:53', 'menu', 'system/menu/index', 'system:menu:list', 'xtgl', '0');
+INSERT INTO `SYRESOURCE` VALUES ('zygl', '2015-08-25 10:34:53', '管理系统的资源', 'tree-table', '资源管理', 3, '', '2022-05-25 00:48:32', 'menu', 'system/menu/index', 'system:menu:list', 'xtgl', '0');
 INSERT INTO `SYRESOURCE` VALUES ('zylb', '2015-08-25 10:34:53', '查询资源', 'ext-icon-bullet_wrench', '资源列表', 0, '', '2015-08-25 10:34:53', NULL, '/base/syresource!treeGrid', 'system:menu:query', 'zygl', '1');
 INSERT INTO `SYRESOURCE` VALUES ('zysc', '2015-08-25 10:34:53', '删除资源', 'ext-icon-bullet_wrench', '删除资源', 3, '', '2015-08-25 10:34:53', NULL, '/base/syresource!delete', 'system:menu:remove', 'zygl', '1');
 INSERT INTO `SYRESOURCE` VALUES ('zytj', '2015-08-25 10:34:53', '添加资源', 'ext-icon-bullet_wrench', '添加资源', 1, '', '2015-08-25 10:34:53', NULL, '/base/syresource!save', 'system:menu:add', 'zygl', '1');
@@ -260,6 +265,33 @@ INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'zylb');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'zysc');
 INSERT INTO `SYROLE_SYRESOURCE` VALUES ('0', 'zytj');
 
+-- ----------------------------
+-- Table structure for SYS_CONFIG
+-- ----------------------------
+DROP TABLE IF EXISTS `SYS_CONFIG`;
+CREATE TABLE `SYS_CONFIG`  (
+  `config_id` int NOT NULL AUTO_INCREMENT COMMENT '参数主键',
+  `config_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '参数名称',
+  `config_key` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '参数键名',
+  `config_value` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '参数键值',
+  `config_type` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT 'N' COMMENT '系统内置（Y是 N否）',
+  `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '创建者',
+  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '更新者',
+  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+  `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`config_id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 100 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '参数配置表' ROW_FORMAT = DYNAMIC;
+
+-- ----------------------------
+-- Records of SYS_CONFIG
+-- ----------------------------
+INSERT INTO `SYS_CONFIG` VALUES (1, '主框架页-默认皮肤样式名称', 'sys.index.skinName', 'skin-blue', 'Y', 'admin', '2022-05-14 14:04:21', '', NULL, '蓝色 skin-blue、绿色 skin-green、紫色 skin-purple、红色 skin-red、黄色 skin-yellow');
+INSERT INTO `SYS_CONFIG` VALUES (2, '用户管理-账号初始密码', 'sys.user.initPassword', '123456', 'Y', 'admin', '2022-05-14 14:04:21', '', NULL, '初始化密码 123456');
+INSERT INTO `SYS_CONFIG` VALUES (3, '主框架页-侧边栏主题', 'sys.index.sideTheme', 'theme-dark', 'Y', 'admin', '2022-05-14 14:04:21', '', NULL, '深色主题theme-dark，浅色主题theme-light');
+INSERT INTO `SYS_CONFIG` VALUES (4, '账号自助-验证码开关', 'sys.account.captchaOnOff', 'true', 'Y', 'admin', '2022-05-14 14:04:21', '', NULL, '是否开启验证码功能（true开启，false关闭）');
+INSERT INTO `SYS_CONFIG` VALUES (5, '账号自助-是否开启用户注册功能', 'sys.account.registerUser', 'false', 'Y', 'admin', '2022-05-14 14:04:21', '', NULL, '是否开启注册用户功能（true开启，false关闭）');
+
 -- ----------------------------
 -- Table structure for SYS_DICT_DATA
 -- ----------------------------
@@ -370,7 +402,7 @@ CREATE TABLE `SYUSER`  (
 -- ----------------------------
 -- Records of SYUSER
 -- ----------------------------
-INSERT INTO `SYUSER` VALUES ('0', 30, '2015-08-25 10:34:54', 'admin', '超级管理员', '', 'e10adc3949ba59abbe56e057f20f883e', '1', '2016-09-27 15:41:11', NULL);
+INSERT INTO `SYUSER` VALUES ('0', 30, '2015-08-25 10:34:54', 'admin', 'admin', '', 'e10adc3949ba59abbe56e057f20f883e', '0', '2022-05-25 11:36:25', NULL);
 
 -- ----------------------------
 -- Table structure for SYUSER_SYORGANIZATION
@@ -391,7 +423,6 @@ CREATE TABLE `SYUSER_SYORGANIZATION`  (
 -- ----------------------------
 INSERT INTO `SYUSER_SYORGANIZATION` VALUES ('0', '0');
 INSERT INTO `SYUSER_SYORGANIZATION` VALUES ('346e8333-b644-4939-8b06-f23654963c6a', '0');
-INSERT INTO `SYUSER_SYORGANIZATION` VALUES ('0', '5477d9a9-e41e-485f-bb08-697e8facef88');
 
 -- ----------------------------
 -- Table structure for SYUSER_SYROLE