feat(webdav): support option configuration of webdav

ygyzy · Oct 14, 2021 · d667a83
1 parent bef9047
commit d667a83
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 18 deletions.
diff --git a/packages/sharelist-web/src/views/manage/partial/general.tsx b/packages/sharelist-web/src/views/manage/partial/general.tsx
@@ -24,19 +24,23 @@ const valueDisplay = (value: any, type: string) => {
 export default defineComponent({
  setup() {
  const fields = [
- { code: 'token', label: '后台密码', type: 'string', hiddenDesc: true },
+ { code: 'token', label: '后台密码', type: 'string', secret: true },
  { code: 'title', label: '网站标题', type: 'string' },
  { code: 'index_enable', label: '目录索引', type: 'boolean' },
  { code: 'expand_single_disk', label: '展开单一挂载盘', type: 'boolean' },
  { code: 'anonymous_download_enable', label: '允许下载', type: 'boolean' },
  { code: 'fast_mode', label: '快速模式', type: 'boolean' },
  { code: 'ignores', label: '忽略路径', type: 'array' },
- { code: 'webdav_path', label: 'WebDAV路径', type: 'string' },
+ { code: 'acl_file', label: '加密文件名', type: 'string' },
+ { code: 'webdav_path', label: 'WebDAV 路径', type: 'string' },
+ { code: 'webdav_proxy', label: 'WebDAV 代理', type: 'boolean' },
+ { code: 'webdav_user', label: 'WebDAV 用户名', type: 'string' },
+ { code: 'webdav_pass', label: 'WebDAV 密码', type: 'string', secret: true },
  ]
  const { config, setConfig } = useSetting()
 
- const createInputModifier = (label: string, code: string) => {
- const modifier = ref(config[code])
+ const createInputModifier = (label: string, code: string, isSecret: boolean | undefined) => {
+ const modifier = ref(isSecret ? '' : config[code])
  const handleChange = (e: any) => modifier.value = e.target.value
 
  //modal 下的input v-model 有bug
@@ -78,14 +82,14 @@ export default defineComponent({
  <div class="item__header">
  <div class="item__meta">
  <h4 class="item__meta-title">{i.label}</h4>
- <div class="item__meta-desc">{i.hiddenDesc ? '' : valueDisplay(config[i.code], i.type)}</div>
+ <div class="item__meta-desc">{i.secret ? '' : valueDisplay(config[i.code], i.type)}</div>
  </div>
  </div>
  <div class="item-action">
  {i.type == 'boolean' ? (
  <Switch checked={config[i.code]} onChange={(e) => setConfig({ [i.code]: e })} />
  ) : i.type == 'string' ? (
- <a onClick={() => createInputModifier(i.label, i.code, i.isPassword)}>修改</a>
+ <a onClick={() => createInputModifier(i.label, i.code, i.secret)}>修改</a>
  ) : i.type == 'array' ? (
  <a onClick={() => createListModifier(i.label, i.code)}>修改</a>
  ) : null}

diff --git a/packages/sharelist/package/sharelist/config.js b/packages/sharelist/package/sharelist/config.js
@@ -35,6 +35,12 @@ const defaultConfig = {
 
  proxy_server: '',
 
+ webdav_proxy: true,
+
+ webdav_user: 'admin',
+
+ webdav_pass: 'sharelist',
+
  ocr_server: '',
 
  drives: [],

diff --git a/packages/sharelist/package/sharelist/utils.js b/packages/sharelist/package/sharelist/utils.js
@@ -84,7 +84,7 @@ exports.getDownloadUrl = async (runtime) => {
  }
 
  try {
- let url = await sharelist.get_download_url(runtime)
+ let { url } = await sharelist.get_download_url(runtime)
  return { url }
 
  } catch (error) {

diff --git a/packages/sharelist/package/webdav/index.js b/packages/sharelist/package/webdav/index.js
@@ -27,7 +27,6 @@ const createDriver = (driver, { proxy, baseUrl } = {}) => {
  },
  async stat(path) {
  //console.log('stat', parsePath(path),)
-
  try {
  return await driver.stat({ paths: parsePath(path) })
  } catch (error) {
@@ -36,18 +35,17 @@ const createDriver = (driver, { proxy, baseUrl } = {}) => {
  }
  },