封版

api/api_app.py

@@ -15,11 +15,10 @@ from requests_toolbelt import MultipartEncoder
 from win10toast import ToastNotifier
 
 
-from config import file_type_map
+from config import file_type_map, TARGET_URL
 from tools.check import is_file_open_in_wps
 from tools.file_manager import get_file_md5
 from tools.logger_handle import logger
-from tools.oss_client import oss_handle
 
 socket.getfqdn = lambda name=None: 'localhost'
 toaster = ToastNotifier()
@@ -27,7 +26,7 @@ toaster = ToastNotifier()
 app = Flask(__name__, static_folder='../static')
 
 CORS(app, resources=r'/*')
-TARGET_URL = 'http://120.195.49.22:7215'
+
 
 class InterceptHandler(logging.Handler):
     def emit(self, record):
@@ -197,7 +196,7 @@ def download_and_open_with_wps():
         return jsonify({'code': 1000, 'msg': '检测到文件已被打开'})
 
     # 判断本地文件和线上文件是否一致
-    local_file_metadata = oss_handle.load_metadata(local_file)
+    local_file_metadata = current_app.config['serve_client'].load_metadata(local_file)
     if local_file_metadata['update_time'] == file_info['updateTime']:
         return open_file_by_wps(local_file)
 
@@ -245,7 +244,7 @@ def update_local_file():
         return jsonify({'code': 3004, 'msg': '操作失败，文件已被打开无法操作'})
 
     try:
-        metadata = oss_handle.load_metadata(os.path.join(current_app.config['work_path'], file_name))
+        metadata = current_app.config['serve_client'].load_metadata(os.path.join(current_app.config['work_path'], file_name))
 
         os.remove(os.path.join(current_app.config['work_path'], file_name))
         os.remove(os.path.join(current_app.config['work_path'], file_name + '.metadata'))
@@ -280,7 +279,7 @@ def file_state_list():
         if not os.path.exists(os.path.join(current_app.config['work_path'], file_name + '.metadata')):
             continue
 
-        metadata = oss_handle.load_metadata(os.path.join(current_app.config['work_path'], file_name))
+        metadata = current_app.config['serve_client'].load_metadata(os.path.join(current_app.config['work_path'], file_name))
         file_info = {
             'file_name': file_name,
             'show_name': metadata['file_name'],
@@ -433,7 +432,7 @@ def download_cloud_file():
         return jsonify({'code': 2001, 'msg': '检测到文档正在被编辑，无法下载'})
 
     # 判断本地文件和线上文件是否一致
-    local_file_metadata = oss_handle.load_metadata(local_file)
+    local_file_metadata = current_app.config['serve_client'].load_metadata(local_file)
     if local_file_metadata['update_time'] == file_info['updateTime']:
         return jsonify({'code': 1000, 'msg': '操作成功', 'file_path': local_file})
 

config.py

@@ -7,9 +7,9 @@ CONFIG = {'oss': {
     'access_key': 'miniominio',
     'secret_key': 'miniominio'
 }}
-# SERVER_POINT = 'http://120.195.49.22:7215'
-SERVER_POINT = 'http://172.10.3.71:10001'
+SERVER_POINT = 'http://221.226.175.250:7215/'
 
+TARGET_URL = 'http://221.226.175.250:7215'
 
 def get_config(config_name):
     return CONFIG.get(config_name)

office_helper.py

@@ -56,14 +56,14 @@ if __name__ == "__main__":
         sys.exit(0)
 
     with open(f'{dl_code}:\\ProgramData\\OfficeAssistant\\config.json', 'r', encoding='utf-8') as f:
-    # with open(f'config.json', 'r', encoding='utf-8') as f:
+        # with open(f'config.json', 'r', encoding='utf-8') as f:
         args = json.load(f)
     args['worker_path'] = args['worker_path'].replace('\\\\', '\\')
-    if not (args.get('server') and args.get('username') and args.get('password')):
+    if not (args.get('username') and args.get('password')):
         logger.error('The config is missing critical information')
         sys.exit(0)
 
-    client = ServerClient(args['server'], args['username'], args['password'])
+    client = ServerClient(TARGET_URL, args['username'], args['password'])
     if not os.path.exists(os.path.join(args['worker_path'], args['username'])):
         os.makedirs(os.path.join(args['worker_path'], args['username']))
 

tools/serve_client.py

@@ -8,7 +8,6 @@ import requests
 from Crypto.Cipher import AES
 
 from tools.logger_handle import logger
-from tools.oss_client import oss_handle
 
 
 class ServerClient:
@@ -109,9 +108,6 @@ class ServerClient:
 
             with open(os.path.join(storage_path, local_file_name + '.metadata'), 'w', encoding='utf-8') as f:
                 f.write(json.dumps({
-                    'serve': oss_handle.service,
-                    'access_key': oss_handle.access_key,
-                    'secret_key': oss_handle.secret_key,
                     'file_id': file_info["id"],
                     'bucket_name': file_info['bucketName'],
                     'md5': self.get_file_md5(os.path.join(storage_path, local_file_name)),
@@ -237,6 +233,4 @@ if __name__ == '__main__':
     client = ServerClient('http://120.195.49.22:7215', 'admin', 'jxkj123456')
     res = client.decryption(
         "")
-    # print(res)
-    for row in res['data']:
-        print(res)
+    print(res)