From b392f26743ff6abe5163de78ef04002b328b8e79 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 21 八月 2024 15:04:34 +0800
Subject: [PATCH] 1

---
 docker-compose/nginx/conf/nginx.conf                                     |   26 ++++++++----
 se-api/se-api-system/src/main/java/com/se/system/api/domain/SysUser.java |   14 +++++++
 docker-compose/mysql/initdb/se_cloud_20240629.sql                        |   31 ++++++++++-----
 3 files changed, 52 insertions(+), 19 deletions(-)

diff --git a/docker-compose/mysql/initdb/se_cloud_20240629.sql b/docker-compose/mysql/initdb/se_cloud_20240629.sql
index 4cacedf..befae6a 100644
--- a/docker-compose/mysql/initdb/se_cloud_20240629.sql
+++ b/docker-compose/mysql/initdb/se_cloud_20240629.sql
@@ -53,6 +53,7 @@
   user_name         varchar(30)     not null                   comment '鐢ㄦ埛璐﹀彿',
   nick_name         varchar(30)     not null                   comment '鐢ㄦ埛鏄电О',
   user_type         varchar(2)      default '00'               comment '鐢ㄦ埛绫诲瀷锛�00绯荤粺鐢ㄦ埛锛�',
+  secret_level      varchar(2)      default '1'                comment '瀵嗙骇绫诲瀷',
   email             varchar(50)     default ''                 comment '鐢ㄦ埛閭',
   phonenumber       varchar(11)     default ''                 comment '鎵嬫満鍙风爜',
   sex               char(1)         default '0'                comment '鐢ㄦ埛鎬у埆锛�0鐢� 1濂� 2鏈煡锛�',
@@ -73,9 +74,8 @@
 -- ----------------------------
 -- 鍒濆鍖�-鐢ㄦ埛淇℃伅琛ㄦ暟鎹�
 -- ----------------------------
-insert into sys_user values(1,  103, 'admin', '', '00', 'ry@163.com', '15888888888', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate(), 'admin', sysdate(), '', null, '绠$悊鍛�');
-insert into sys_user values(2,  105, 'ry',    '', '00', 'ry@qq.com',  '15666666666', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate(), 'admin', sysdate(), '', null, '娴嬭瘯鍛�');
-
+insert into sys_user values(1,  103, 'admin', '', '00', '1', 'ry@163.com', '15888888888', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate(), 'admin', sysdate(), '', null, '绠$悊鍛�');
+insert into sys_user values(2,  105, 'ry',    '', '00', '1', 'ry@qq.com',  '15666666666', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate(), 'admin', sysdate(), '', null, '娴嬭瘯鍛�');
 
 -- ----------------------------
 -- 3銆佸矖浣嶄俊鎭〃
@@ -125,14 +125,16 @@
   update_time          datetime                                   comment '鏇存柊鏃堕棿',
   remark               varchar(500)    default null               comment '澶囨敞',
   primary key (role_id)
-) engine=innodb auto_increment=3 comment = '瑙掕壊淇℃伅琛�';
+) engine=innodb auto_increment=6 comment = '瑙掕壊淇℃伅琛�';
 
 -- ----------------------------
 -- 鍒濆鍖�-瑙掕壊淇℃伅琛ㄦ暟鎹�
 -- ----------------------------
-insert into sys_role values('1', '瓒呯骇绠$悊鍛�',  'admin',  1, 1, 1, 1, '0', '0', 'admin', sysdate(), '', null, '瓒呯骇绠$悊鍛�');
-insert into sys_role values('2', '鏅�氳鑹�',    'common', 2, 2, 1, 1, '0', '0', 'admin', sysdate(), '', null, '鏅�氳鑹�');
-
+insert into sys_role values('1', '绯荤粺绠$悊鍛�',  'admin',  1, 1, 1, 1, '0', '0', 'admin', sysdate(), '', null, '绯荤粺绠$悊鍛�');
+insert into sys_role values('2', '瓒呯骇鐢ㄦ埛', 'superuser', 2, 2, 1, 1, '0', '0', 'admin', sysdate(), '', null, '瓒呯骇鐢ㄦ埛');
+insert into sys_role values('3', '鏅�氱敤鎴�',    'common', 3, 4, 1, 1, '0', '0', 'admin', sysdate(), '', null, '鏅�氱敤鎴�');
+insert into sys_role values('4', '鍙楅檺鐢ㄦ埛',   'limited', 4, 4, 1, 1, '0', '0', 'admin', sysdate(), '', null, '鍙楅檺鐢ㄦ埛');
+insert into sys_role values('5', '鍙鐢ㄦ埛',  'readonly', 5, 4, 1, 1, '0', '0', 'admin', sysdate(), '', null, '鍙鐢ㄦ埛');
 
 -- ----------------------------
 -- 5銆佽彍鍗曟潈闄愯〃
@@ -464,7 +466,7 @@
   remark           varchar(500)    default null               comment '澶囨敞',
   primary key (dict_id),
   unique (dict_type)
-) engine=innodb auto_increment=11 comment = '瀛楀吀绫诲瀷琛�';
+) engine=innodb auto_increment=13 comment = '瀛楀吀绫诲瀷琛�';
 
 insert into sys_dict_type values(1,  '鐢ㄦ埛鎬у埆', 'sys_user_sex',        '0', 'admin', sysdate(), '', null, '鐢ㄦ埛鎬у埆鍒楄〃');
 insert into sys_dict_type values(2,  '鑿滃崟鐘舵��', 'sys_show_hide',       '0', 'admin', sysdate(), '', null, '鑿滃崟鐘舵�佸垪琛�');
@@ -476,6 +478,8 @@
 insert into sys_dict_type values(8,  '閫氱煡鐘舵��', 'sys_notice_status',   '0', 'admin', sysdate(), '', null, '閫氱煡鐘舵�佸垪琛�');
 insert into sys_dict_type values(9,  '鎿嶄綔绫诲瀷', 'sys_oper_type',       '0', 'admin', sysdate(), '', null, '鎿嶄綔绫诲瀷鍒楄〃');
 insert into sys_dict_type values(10, '绯荤粺鐘舵��', 'sys_common_status',   '0', 'admin', sysdate(), '', null, '鐧诲綍鐘舵�佸垪琛�');
+insert into sys_dict_type values(11, '鍔犲瘑绫诲瀷', 'sys_encryption_method','0', 'admin', sysdate(), '', null, '鍔犲瘑绫诲瀷鍒楄〃');
+insert into sys_dict_type values(12, '瀵嗙骇绫诲瀷', 'sys_secret_level',    '0', 'admin', sysdate(), '', null, '瀵嗙骇绫诲瀷鍒楄〃');
 
 
 -- ----------------------------
@@ -499,7 +503,7 @@
   update_time      datetime                                   comment '鏇存柊鏃堕棿',
   remark           varchar(500)    default null               comment '澶囨敞',
   primary key (dict_code)
-) engine=innodb auto_increment=30 comment = '瀛楀吀鏁版嵁琛�';
+) engine=innodb auto_increment=37 comment = '瀛楀吀鏁版嵁琛�';
 
 insert into sys_dict_data values(1,  1,  '鐢�',       '0',       'sys_user_sex',        '',   '',        'Y', '0', 'admin', sysdate(), '', null, '鎬у埆鐢�');
 insert into sys_dict_data values(2,  2,  '濂�',       '1',       'sys_user_sex',        '',   '',        'N', '0', 'admin', sysdate(), '', null, '鎬у埆濂�');
@@ -530,7 +534,14 @@
 insert into sys_dict_data values(27, 9,  '娓呯┖鏁版嵁', '9',       'sys_oper_type',       '',   'danger',  'N', '0', 'admin', sysdate(), '', null, '娓呯┖鎿嶄綔');
 insert into sys_dict_data values(28, 1,  '鎴愬姛',     '0',       'sys_common_status',   '',   'primary', 'N', '0', 'admin', sysdate(), '', null, '姝e父鐘舵��');
 insert into sys_dict_data values(29, 2,  '澶辫触',     '1',       'sys_common_status',   '',   'danger',  'N', '0', 'admin', sysdate(), '', null, '鍋滅敤鐘舵��');
-
+insert into sys_dict_data values(30, 1,  'AES鍔犲瘑',     '1',  'sys_encryption_method', '',  '',  'Y', '0', 'admin', sysdate(), '', null, 'AES鍔犲瘑绠楁硶');
+insert into sys_dict_data values(31, 2,  'DES鍔犲瘑',     '2',  'sys_encryption_method', '',  '',  'N', '0', 'admin', sysdate(), '', null, 'DES鍔犲瘑绠楁硶');
+insert into sys_dict_data values(32, 3,  'RSA鍔犲瘑',     '3',   'sys_encryption_method', '',  '',  'N', '0', 'admin', sysdate(), '', null, 'RSA鍔犲瘑绠楁硶');
+insert into sys_dict_data values(33, 1,  '鍏紑',     '1',      'sys_secret_level', '',  '',  'Y', '0', 'admin', sysdate(), '', null, '鍏紑瀵嗙骇');
+insert into sys_dict_data values(34, 2,  '涓�鑸�',     '2',      'sys_secret_level', '',  '',  'N', '0', 'admin', sysdate(), '', null, '涓�鑸瘑绾�');
+insert into sys_dict_data values(35, 3,  '閲嶈',     '3',      'sys_secret_level', '',  '',  'N', '0', 'admin', sysdate(), '', null, '閲嶈瀵嗙骇');
+insert into sys_dict_data values(36, 4,  '鏍稿績',     '4',      'sys_secret_level', '',  '',  'N', '0', 'admin', sysdate(), '', null, '鏍稿績瀵嗙骇');
+-- select * from sys_dict_data;
 
 -- ----------------------------
 -- 13銆佸弬鏁伴厤缃〃
diff --git a/docker-compose/nginx/conf/nginx.conf b/docker-compose/nginx/conf/nginx.conf
index 8243d3c..e3efd20 100644
--- a/docker-compose/nginx/conf/nginx.conf
+++ b/docker-compose/nginx/conf/nginx.conf
@@ -19,21 +19,29 @@
             try_files $uri $uri/ /index.html;
             index  index.html index.htm;
         }
-
+        
+        location /sso {
+            alias    /usr/share/nginx/html/sso;
+            try_files $uri $uri/ /sso/;
+            #index  index.html index.htm;
+        }
+        
+        location /sys {
+            alias    /usr/share/nginx/html/sys;
+            try_files $uri $uri/ /sys/;
+            #index  index.html index.htm;
+        }
+        
         location /prod-api/ {
-            #add_header Access-Control-Allow-Origin $http_origin always;
-聽 聽 聽 聽 聽 聽 #add_header Access-Control-Allow-Credentials true always;
-聽 聽 聽 聽 聽 聽 #add_header Access-Control-Allow-Methods 'GET,POST,PUT,DELETE,OPTIONS' always;
-聽 聽 聽 聽 聽 聽 #add_header Access-Control-Allow-Headers 'Authorization,X-Requested-With,Content-Type,Origin,Accept' always;
-聽 聽 聽 聽 聽 聽 
             proxy_set_header Host $http_host;
             proxy_set_header X-Real-IP $remote_addr;
-		        proxy_set_header REMOTE-HOST $remote_addr;
-		        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header REMOTE-HOST $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            
             proxy_pass http://se-gateway:8080/;
         }
 
-        # 閬垮厤actuator鏆撮湶
+        # actuator
         if ($request_uri ~ "/actuator") {
             return 403;
         }
diff --git a/se-api/se-api-system/src/main/java/com/se/system/api/domain/SysUser.java b/se-api/se-api-system/src/main/java/com/se/system/api/domain/SysUser.java
index 4c6525d..6c561d6 100644
--- a/se-api/se-api-system/src/main/java/com/se/system/api/domain/SysUser.java
+++ b/se-api/se-api-system/src/main/java/com/se/system/api/domain/SysUser.java
@@ -37,6 +37,10 @@
     @Excel(name = "鐢ㄦ埛鍚嶇О")
     private String nickName;
 
+    /** 瀵嗙骇绫诲瀷 */
+    @Excel(name = "瀵嗙骇绫诲瀷")
+    private String secretLevel;
+
     /** 鐢ㄦ埛閭 */
     @Excel(name = "鐢ㄦ埛閭")
     private String email;
@@ -129,6 +133,16 @@
         this.deptId = deptId;
     }
 
+    @Xss(message = "瀵嗙骇绫诲瀷涓嶈兘鍖呭惈鑴氭湰瀛楃")
+    @Size(min = 1, max = 2, message = "瀵嗙骇绫诲瀷闀垮害涓嶈兘瓒呰繃2涓瓧绗�")
+    public String getSecretLevel() {
+        return secretLevel;
+    }
+
+    public void setSecretLevel(String secretLevel) {
+        this.secretLevel = secretLevel;
+    }
+
     @Xss(message = "鐢ㄦ埛鏄电О涓嶈兘鍖呭惈鑴氭湰瀛楃")
     @Size(min = 0, max = 30, message = "鐢ㄦ埛鏄电О闀垮害涓嶈兘瓒呰繃30涓瓧绗�")
     public String getNickName()

--
Gitblit v1.9.3