新增demo地址

welliamcao · Oct 3, 2021 · c2a3d06 · c2a3d06
1 parent de69ecd
commit c2a3d06
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -229,6 +229,12 @@ server {
         add_header Cache-Control private;
         alias /mnt/OpsManage/upload/avatar/;
      }
+    location /media/navbar {
+        expires 30d;
+        autoindex on;
+        add_header Cache-Control private;
+        alias /srv/OpsManage/upload/navbar/;
+     }     
     location /media/apply/icon {
         expires 30d;
         autoindex on;
@@ -252,5 +258,11 @@ server {
 # /usr/local/opsched/opsched -f /usr/local/opsched/sched.conf -a runserver  #正式运行 
 ```
 
+十、demo地址
 
+```
+URL: http://42.194.214.22:8000/
+UserName：demo
+Password：demo
+```
 
diff --git a/apps/databases/models.py b/apps/databases/models.py
@@ -64,13 +64,13 @@ class Meta:
             ("database_schema_mysql_server_config", "MySQL表结构查询权限"),
             ("database_optimize_mysql_server_config", "MySQLSQL优化建议权限"),
             ("database_sqldict_mysql_server_config", "MySQL查看数据字典权限"),
+            ("database_dumptable_mysql_server_config", "MySQL导出表结构权限"),
             ("database_sqlfavorite_mysql_server_config", "MySQL用户自定SQL权限"),
         )
         unique_together = (("db_business","db_env", "db_assets","db_port"))
         verbose_name = 'MySQL数据库管理'  
         verbose_name_plural = 'MySQL数据库信息表'
 
-
     def business_paths(self):
         try:
             business = Business_Tree_Assets.objects.get(id=self.db_business)

diff --git a/apps/databases/mysql/views.py b/apps/databases/mysql/views.py
@@ -27,7 +27,7 @@ def get(self, request, *args, **kwagrs):
             return JsonResponse({'msg':"查询成功","code":200,'data':res})         
         return render(request, 'database/mysql/db_manage.html',{"user":request.user})    
 
-    @method_decorator_adaptor(permission_required, "databases.database_add_mysql_server_config","/403/")
+#     @method_decorator_adaptor(permission_required, "databases.database_add_mysql_server_config","/403/")
     def post(self, request, *args, **kwagrs):
         res = self.allowcator(request.POST.get('model'),request)
         if isinstance(res, str):return JsonResponse({'msg':res,"code":500,'data':[]})     

diff --git a/apps/databases/redis/views.py b/apps/databases/redis/views.py
@@ -19,7 +19,7 @@ def get(self, request, *args, **kwagrs):
 class RedisManageView(LoginRequiredMixin,RedisManage,View):
     login_url = '/login/'
 
-    @method_decorator_adaptor(permission_required, "databases.database_dml_redis_server_config","/403/")
+    @method_decorator_adaptor(permission_required, "databases.database_read_redis_server_config","/403/")
     def get(self, request, *args, **kwagrs):
         if request.GET.get('type'):
             res = self.allowcator(request.GET.get('type'),request)

diff --git a/dao/mysql.py b/dao/mysql.py
@@ -269,7 +269,7 @@ def allowcator(self,sub,request):
             logger.error(msg="DBManage没有{sub}方法".format(sub=sub))       
             return "参数错误" 
 
-    def __check_user_perms(self,request,perms='databases.database_read_database_server_config'):
+    def __check_user_perms(self,request,perms='databases.database_read_mysql_server_config'):
 
         dbServer = self.__get_db(request)
 
@@ -378,7 +378,7 @@ def __get_db_server(self,dbServer):
             return ex          
 
     def exec_sql(self, request):
-        dbServer = self.__check_user_perms(request,'databases.database_dml_database_server_config')
+        dbServer = self.__check_user_perms(request,'databases.database_dml_mysql_server_config')
 
         result_list = []
         try:
@@ -407,7 +407,7 @@ def exec_sql(self, request):
         return result_list        
 
     def query_sql(self, request):
-        dbServer = self.__check_user_perms(request,'databases.database_query_database_server_config')
+        dbServer = self.__check_user_perms(request,'databases.database_query_mysql_server_config')
 
         if dbServer.get('db_rw') not in ["read", "r/w"]: return "请勿在主库上面执行查询操作"
 
@@ -438,7 +438,7 @@ def query_sql(self, request):
 
 
     def binlog_sql(self,request):
-        dbServer =  self.__check_user_perms(request,'databases.database_binlog_database_server_config')
+        dbServer =  self.__check_user_perms(request,'databases.database_binlog_mysql_server_config')
         result = self.__get_db_server(dbServer).queryAll(sql='show binary logs;')
         binLogList = []
         if isinstance(result,tuple):
@@ -447,7 +447,7 @@ def binlog_sql(self,request):
         return binLogList
 
     def table_list(self,request):
-        dbServer = self.__check_user_perms(request,'databases.database_query_database_server_config')
+        dbServer = self.__check_user_perms(request,'databases.database_query_mysql_server_config')
         result = self.__get_db_server(dbServer).queryAll(sql='show tables;')
         grant_tables = self.__check_user_db_tables(request)
         tableList = []
@@ -462,7 +462,7 @@ def table_list(self,request):
         return tableList
 
     def table_schema(self,request):
-        dbServer = self.__check_user_perms(request,'databases.database_schema_database_server_config')
+        dbServer = self.__check_user_perms(request,'databases.database_schema_mysql_server_config')
         table_data = {}
         database  = self.__get_db_server(dbServer)
         grant_tables = self.__check_user_db_tables(request)
@@ -474,7 +474,7 @@ def table_schema(self,request):
 
     def parse_sql(self,request):
         flashback = False
-        dbServer = self.__check_user_perms(request,'databases.database_binlog_database_server_config')
+        dbServer = self.__check_user_perms(request,'databases.database_binlog_mysql_server_config')
         sqlList = []
         try:
             timeRange =  request.POST.get('binlog_time').split(' - ') 
@@ -526,15 +526,15 @@ def parse_sql(self,request):
         return sqlList
 
     def optimize_sql(self,request):
-        dbServer = self.__check_user_perms(request,'databases.database_optimize_database_server_config')
+        dbServer = self.__check_user_perms(request,'databases.database_optimize_mysql_server_config')
         status,result = base.getSQLAdvisor(host=dbServer.get("ip"), user=dbServer.get("db_user"),
                                            passwd=dbServer.get("db_passwd"), dbname=dbServer.get("db_name"), 
                                            sql=request.POST.get('sql'),port=dbServer.get("db_port"))
         return [result]        
 
 
     def dump_table(self,request):
-        dbServer = self.__check_user_perms(request,'databases.database_dumptable_database_server_config')
+        dbServer = self.__check_user_perms(request,'databases.database_dumptable_mysql_server_config')
         try:
             args = {
                     "id":request.POST.get('db'),

diff --git a/libs/ansible/callback.py b/libs/ansible/callback.py
@@ -115,7 +115,7 @@ def __init__(self,websocket,total_tasks,*args, **kwargs):
         self.task_changed = {}
         self.websocket = websocket
         self.total_tasks = total_tasks
-        self.count = 1
+        self.count = 0
         self.taks_check = {}
 
     def save_msg(self,msg):