From cf43dc8e70ff99712b3ccb0873a243bb9e4d7394 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com>
Date: Sun, 16 Oct 2022 15:54:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8A=E4=BC=A0=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yi-sqlsugar-dev.db                        | Bin 364544 -> 364544 bytes
 .../Yi.Framework.Service/ArticleService.cs    |   2 +-
 Yi.Vue3.x.Vant/src/api/articleApi.ts          |   6 +--
 Yi.Vue3.x.Vant/src/api/fileApi.ts             |   2 +-
 Yi.Vue3.x.Vant/src/api/login.ts               |   2 +-
 Yi.Vue3.x.Vant/src/components/AppGrid.vue     |   2 +-
 Yi.Vue3.x.Vant/src/main.ts                    |   1 -
 Yi.Vue3.x.Vant/src/store/modules/user.ts      |   7 +--
 Yi.Vue3.x.Vant/src/utils/myaxios.ts           |   5 +-
 Yi.Vue3.x.Vant/src/view/main/recommend.vue    |  10 ++--
 Yi.Vue3.x.Vant/src/view/my.vue                |   2 +-
 Yi.Vue3.x.Vant/src/view/send/imageText.vue    |  19 +++++---
 Yi.Vue3.x.Vant/tsconfig.json                  |   5 ++
 Yi.Vue3.x.Vant/vite.config.ts                 |   3 +-
 ...vite.config.ts.timestamp-1665906237992.mjs |  46 ++++++++++++++++++
 15 files changed, 86 insertions(+), 26 deletions(-)
 create mode 100644 Yi.Vue3.x.Vant/vite.config.ts.timestamp-1665906237992.mjs

diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db
index f62873e1bd31a156cc778f25ba9d2ab3a8c077bc..da5b244af193c06bf06753a74af3271501e0fe3d 100644
GIT binary patch
delta 3399
zcmcInZEO=|9KZIq>t62K10766*(QM*?Rn30_uO4?uyq?y2_d2+Q)x(PSQ!J>;RYX&
zgl9v|cv%D!v}#0$@)APWfJGXE@L`|qhKXNPLgE*sRuU3$F)@D7_}oj|TMMSc*ld^l
zp6B}e|DXTw|MGNTWZuBYyrWOL_Pw{T-L-FU(>t47Uv6@ryjOP0vx7>o>*&_RnxJb>
zV&cC0UAJe)cs;*>@p3fdu9;53dHZ>aI-Pv;5BH(QD%v|t`QGq;?;TF?b@YN{V;$Y;
z#Ua|uaDbu6r-J-9)l6US{H=|rGW)+u4_(O|Kk@6CgVwX=R%7L|37!f!0Hgtg0FXr}
z%19G6MQ+$Q_=MZXa4+SU23u;Tr|xWV^VIFDBk2Pd(xaEtC(n@Qowu$M&h)iJ`pDQF
ze0(JH@!N&eA__=~sEVqpX<Ebcwn1|hNf00?!I`TXL@FX*nYkK3#8aq3;vDND&PDUi
zJx0Rw>C0_ArVOV(IAlDJoXea)NSw_aOJ<IJmOeFZJTF}Q<-;-SS>UCt5f2qb0YDO=
zoV9GOs-mPRK+XGOtpY`sWySEPiiDc>-K2cwzxy)2n+aYt1QF>=zQrufxUwS97O=wT
zuBMqv%kAXfEi}W^AvT`ytfQj>H_TzKkBf1yacj6{4seUP`CJwI7ki)mnf-xHv0t-e
z?C0$J>;ZN!8y~N)yHTCMW3F;Mef?}R$&rw4G&)V>T4e+9BiUJLgU1gNu)+qup$VR9
zx4_h`akA5v1((Q9YZhE|^HeYkM%#F*#Rj@UUTbD)Y#en;mkC;)-I54cmILHVO%|Ah
z=g5wp18$xQWWm|}Jf&s98S)*~21{$mj$(mSVinmzS+J7qG|E}jPPQZ)M5ZQq3fkb+
zYVsaPezcL^J`sGn>@ej!>3h+8*L&2vl>3J3=jO7P+1IOYR1Z`ys+y>ZRo<=~u9Pdr
zD>^)XdOq>AFxQwZOjY@4`P#C(Wrs<1hRSdx<YnqTP4lUCtLBK>rV8CX(XQAF+jhpf
zf?rhJ8z3pNdTl5IMF@cil!#Gpk|b=~*|pku(OCBb(GQe5fOJ_Re*z2u7060tRgnQx
zS<3)^L<>-tL;-3*RV6L5vdDs&E~Oj+KlBVhmw_NcNs?5wVTEA<ID=&7pu@tt(eFr%
zD4-}vLm(hZGSo<TVh@ZD&;j8FNRhCJHnbO!n>p<u7b*>Ii(H0?u&e67kc&tltty}@
zN=KW`-IP_=Dv=yF?h4Mzb5REYA)raP)kh*S=$cPCn2mbNF?R(IU1~7AUcb377K`_9
z?cHUjkCi5VQSt-TFJa9O5r}N=?GgH;@$I{#-9k^Sd)Mx0{9(Cedmx5`w(1TCj2d@1
zP(tG3g3PtpRVmz3%x*Ld2m9$I@&GyB%(8%@V(R`t*)4JfhMRNb*c^05-!Zz-e_@wY
z9jbziV0d|sJx6XdH3xY<Fu25$w%KJFFDn*aH`=6wz7*kY-EqmnXFU)*nvC<2V$2J#
zOEaY@J*6?yZDL95&<lyJHt#rD>BNK=>PQukCgVU+$Oy693>nTg*;&M_^pM#efUs7W
z5|hvvQ{6rI(Yw5TJ{5)4Vs>NhIpX%vTERw>d{D92?1~amZ1&uMnluNggFT<lrDikK
zWhAH|fUpK(2P)Lvn$8Xjv(lZExkd_6!*Y@Csf01<9mM#5(cSg{g{4AeQVHX7k#_*k
ze!5E*yR2-0cHDBxq|Dn&o;~=~x5fm>PDMo{?P=!V!j5YL4CoLDima(BLJ?3Xd&<21
zILK!$J23#DplGTFWwc)OGK)Mzd;Dd|J^u2;uh2Ej`GjYn{8=}1o?MOgGPV7KOL%5Z
z{UT8RoN+rMp9=GLOya~9ckRMZEFSCY-dwl7C)&4b=hohMtTo=**W2A$2Vi1OEnPd;
XybD21mt;W^$xi|qCZ8E9|Ec013xJ8h

delta 599
zcmZ9K&1(}u7>8#w`9iu$EVdFA+-~bvah93c+4;ytr3iwT;xz=albtD62!)*NB~g%q
z2Wd}>7wI7vPYOl$<{>BjBm55n3Ld<P6HB3b8Th@t%rnpX&g6J?a=dzY)f*mN+wz7l
z`mg%lr+#Vry*#b$gM4WlKFA;6_nzmoAEh@ZYpu;{vHz>|`gR$#0LWVbypjh2tQVUB
z)QvIH*lHxRII+wyhGQG;JhkE7P#cx9j8QaTTp^YiisXPB#8WD*(2`hV{<ii2@Q8oC
z4z>WO0|3m*{Ncvumn}eOOxWU}m{LSAA|xQJgK>wkNJ)+fr{iu&bZUgO7G*?G#In>n
zkfunfOiG?5+R`lA8}5V-1it$1^C0;?ot=Vce4Y|_Fz*l=sW?d#7Tqu%P%F5?NNO=a
zjALh$2!+N(#$q6tkcs4HIw12e|3i6p!|BAtnfwPyI#@;6)j8wcP$bM<WI56?Cx{7y
zQ7Sk?40Ejvjd7+-w7cg_E;yCNI-2=K4BL5t7yH2QV{^mRZ=MYhy3k&kpGuZoSaQL=
zrTBdhR$CDJZ}ZwVOi$JV;^*TJUZr@~gLbxD^GBdLZ9Zzu8;6Zs{uh7bT6+G$2$hQw
asvJFmmul;IZBn`8zQ@mMv3^kbR{sM*bd$jV

diff --git a/Yi.Framework.Net6/Yi.Framework.Service/ArticleService.cs b/Yi.Framework.Net6/Yi.Framework.Service/ArticleService.cs
index 0b039004..1ff17a7f 100644
--- a/Yi.Framework.Net6/Yi.Framework.Service/ArticleService.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Service/ArticleService.cs
@@ -19,7 +19,7 @@ namespace Yi.Framework.Service
                        //.WhereIF(!string.IsNullOrEmpty(config.ConfigKey), u => u.ConfigKey.Contains(config.ConfigKey))
                        .WhereIF(page.StartTime is not null && page.EndTime is not null, u => u.CreateTime >= page.StartTime && u.CreateTime <= page.EndTime)
                      .WhereIF(entity.IsDeleted is not null, u => u.IsDeleted == entity.IsDeleted)
-                    .OrderBy(u => u.CreateTime, OrderByType.Desc)
+                    .OrderBy(u => u.CreateTime, OrderByType.Asc)
                           .ToPageListAsync(page.PageNum, page.PageSize, total);
 
             return new PageModel<List<ArticleEntity>>(data, total);
diff --git a/Yi.Vue3.x.Vant/src/api/articleApi.ts b/Yi.Vue3.x.Vant/src/api/articleApi.ts
index 56127ad0..24ad276c 100644
--- a/Yi.Vue3.x.Vant/src/api/articleApi.ts
+++ b/Yi.Vue3.x.Vant/src/api/articleApi.ts
@@ -1,8 +1,8 @@
-import myaxios from '@/utils/myaxios.ts'
+import myaxios from '@/utils/myaxios'
 import { ArticleEntity } from '@/type/interface/ArticleEntity'
 
 export default {
-    add(data: ArticleEntity) {
+    add(data:any) {
         console.log(data)
         return myaxios({
             url: `/article/add`,
@@ -10,7 +10,7 @@ export default {
             data: data
         })
     },
-    pageList(data:ArticleEntity) {
+    pageList(data:any) {
         return myaxios({
           url: '/article/pageList',
           method: 'get',
diff --git a/Yi.Vue3.x.Vant/src/api/fileApi.ts b/Yi.Vue3.x.Vant/src/api/fileApi.ts
index 2000eef4..bcd09760 100644
--- a/Yi.Vue3.x.Vant/src/api/fileApi.ts
+++ b/Yi.Vue3.x.Vant/src/api/fileApi.ts
@@ -1,4 +1,4 @@
-import myaxios from '@/utils/myaxios.ts'
+import myaxios from '@/utils/myaxios'
 
 export default{
    upload(type:string,data:any){
diff --git a/Yi.Vue3.x.Vant/src/api/login.ts b/Yi.Vue3.x.Vant/src/api/login.ts
index 0fdae247..cb1f59c1 100644
--- a/Yi.Vue3.x.Vant/src/api/login.ts
+++ b/Yi.Vue3.x.Vant/src/api/login.ts
@@ -1,4 +1,4 @@
-import myaxios from '@/utils/myaxios.ts'
+import myaxios from '@/utils/myaxios'
 
 // 登录方法
 export function login(username:string, password:string, code:string, uuid:string) {
diff --git a/Yi.Vue3.x.Vant/src/components/AppGrid.vue b/Yi.Vue3.x.Vant/src/components/AppGrid.vue
index 0b634a3e..42dcc356 100644
--- a/Yi.Vue3.x.Vant/src/components/AppGrid.vue
+++ b/Yi.Vue3.x.Vant/src/components/AppGrid.vue
@@ -9,7 +9,7 @@
 </template>
 <script setup lang="ts">
 import { ref } from 'vue'
-import {AppGridData} from '@/type/class/AppGridData.ts'
+import {AppGridData} from '@/type/class/AppGridData'
 defineProps<{ data: AppGridData }>()
 const count = ref(0)
 </script>
diff --git a/Yi.Vue3.x.Vant/src/main.ts b/Yi.Vue3.x.Vant/src/main.ts
index 6ac54909..429931bc 100644
--- a/Yi.Vue3.x.Vant/src/main.ts
+++ b/Yi.Vue3.x.Vant/src/main.ts
@@ -7,7 +7,6 @@ import 'vant/es/notify/style';
 import router from './router'
 import store from './store'
 import './permission'
-
 import App from './App.vue'
 
 const app=createApp(App)
diff --git a/Yi.Vue3.x.Vant/src/store/modules/user.ts b/Yi.Vue3.x.Vant/src/store/modules/user.ts
index ddf7b1f9..bb84d008 100644
--- a/Yi.Vue3.x.Vant/src/store/modules/user.ts
+++ b/Yi.Vue3.x.Vant/src/store/modules/user.ts
@@ -13,7 +13,7 @@ const useUserStore = defineStore(
     }),
     actions: {
       // 登录
-      login(userInfo) {
+      login(userInfo:any ) {
         const username = userInfo.username.trim()
         const password = userInfo.password
         const code = userInfo.code
@@ -48,7 +48,7 @@ const useUserStore = defineStore(
               // this.permissions=["*:*:*"]
 
             } else {
-              this.roles = ['ROLE_DEFAULT']
+              this.roles = ["ROLE_DEFAULT"] as never[]
             }
             // this.roles = ["admin"];
             // this.permissions=["*:*:*"]
@@ -67,7 +67,8 @@ const useUserStore = defineStore(
       // 退出系统
       logOut() {
         return new Promise((resolve, reject) => {
-          logout(this.token).then((response) => {
+          //this.token
+          logout().then((response) => {
             this.token = ''
             this.roles = []
             this.permissions = []
diff --git a/Yi.Vue3.x.Vant/src/utils/myaxios.ts b/Yi.Vue3.x.Vant/src/utils/myaxios.ts
index 8e00722c..fbcd51fd 100644
--- a/Yi.Vue3.x.Vant/src/utils/myaxios.ts
+++ b/Yi.Vue3.x.Vant/src/utils/myaxios.ts
@@ -1,3 +1,4 @@
+
 import axios from 'axios'
 // import store from '../store/index'
 // import vm from '../main'
@@ -24,12 +25,12 @@ const myaxios = axios.create({
           }],
     })
     // 请求拦截器
-myaxios.interceptors.request.use(function(config) {
+myaxios.interceptors.request.use(function(config:any) {
     const isToken = (config.headers || {}).isToken === false
     // 是否需要防止数据重复提交
     const isRepeatSubmit = (config.headers || {}).repeatSubmit === false
     if (getToken() && !isToken) {
-        config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
+        config.headers['Authorization'] = 'Bearer ' + getToken()
       }
     // store.dispatch("openLoad");
     return config;
diff --git a/Yi.Vue3.x.Vant/src/view/main/recommend.vue b/Yi.Vue3.x.Vant/src/view/main/recommend.vue
index 1cb8bbcc..89311e01 100644
--- a/Yi.Vue3.x.Vant/src/view/main/recommend.vue
+++ b/Yi.Vue3.x.Vant/src/view/main/recommend.vue
@@ -73,8 +73,8 @@ import { ref, onMounted, reactive, toRefs } from "vue";
 import { ImagePreview, Toast } from "vant";
 import AppCreateTime from "@/components/AppCreateTime.vue";
 import   AppUserIcon from "@/components/AppUserIcon.vue";
-import articleApi from "@/api/articleApi.ts";
-import { ArticleEntity } from "@/type/interface/ArticleEntity.ts";
+import articleApi from "@/api/articleApi";
+import { ArticleEntity } from "@/type/interface/ArticleEntity";
 const VanImagePreview = ImagePreview.Component;
 const url = `${import.meta.env.VITE_APP_BASE_API}/file/`;
 const data = reactive({
@@ -88,7 +88,7 @@ const data = reactive({
 });
 const { queryParams } = toRefs(data);
 
-const articleList = ref<ArticleEntity[]>([]);
+const articleList = ref<any[]>([]);
 const totol = ref<Number>(0);
 const imageShow = ref(false);
 const index = ref(0);
@@ -119,7 +119,7 @@ const onLoad = async () => {
       finished.value = true;
     } else {
       console.log("执行");
-      articleList.value.push(...(response.data.data as ArticleEntity[]));
+      articleList.value.push(...(response.data.data));
       totol.value = response.data.totol;
       queryParams.value.pageNum += 1;
     }
@@ -149,7 +149,7 @@ onMounted(() => {
 
 const getList = () => {
   articleApi.pageList(queryParams.value).then((response: any) => {
-    articleList.value.push(...(response.data.data as ArticleEntity[]));
+    articleList.value.push(...(response.data.data));
     totol.value = response.data.totol;
   });
 };
diff --git a/Yi.Vue3.x.Vant/src/view/my.vue b/Yi.Vue3.x.Vant/src/view/my.vue
index b4a36b4d..09eb1644 100644
--- a/Yi.Vue3.x.Vant/src/view/my.vue
+++ b/Yi.Vue3.x.Vant/src/view/my.vue
@@ -90,7 +90,7 @@
 </template>
 <script setup lang="ts">
 import AppGrid from "@/components/AppGrid.vue";
-import { AppGridData } from "@/type/class/AppGridData.ts";
+import { AppGridData } from "@/type/class/AppGridData";
 import { ref } from "vue";
 import { Dialog } from "vant";
 import useUserStore from "@/store/modules/user";
diff --git a/Yi.Vue3.x.Vant/src/view/send/imageText.vue b/Yi.Vue3.x.Vant/src/view/send/imageText.vue
index 36f7f61f..183b2430 100644
--- a/Yi.Vue3.x.Vant/src/view/send/imageText.vue
+++ b/Yi.Vue3.x.Vant/src/view/send/imageText.vue
@@ -39,7 +39,7 @@
       <van-divider />
       <van-row>
         <van-col class="img-col" span="24">
-          <van-uploader :after-read="afterRead" v-model="fileList" multiple />
+          <van-uploader  accept="image/*" :after-read="afterRead" v-model="fileList" multiple />
         </van-col>
       </van-row>
     </div>
@@ -47,9 +47,9 @@
 </template>
 <script setup lang="ts">
 import { ref, onMounted, reactive, toRefs,watch } from "vue";
-import { ArticleEntity } from "@/type/interface/ArticleEntity.ts";
-import fileApi from "@/api/fileApi.ts";
-import articleApi from "@/api/articleApi.ts";
+import { ArticleEntity } from "@/type/interface/ArticleEntity";
+import fileApi from "@/api/fileApi";
+import articleApi from "@/api/articleApi";
 import { Toast } from "vant";
 import { useRouter } from 'vue-router'
 const router = useRouter();
@@ -58,6 +58,7 @@ const form = reactive<ArticleEntity>({
   content: "",
   images: [],
   isDeleted: false,
+  createTime:""
 });
 
 const isSend=ref(false)
@@ -68,7 +69,6 @@ onMounted(() => {
   visible.value = true;
 });
 const afterRead = (file: any) => {
-
   file.status = "uploading";
   file.message = "上传中...";
   var formData = new FormData();
@@ -83,12 +83,20 @@ else
 file.forEach((f:any) => {
   formData.append("file", f.file);
 });
+Toast({
+        message: "全部文件正在上传",
+        position: "bottom",
+      });
 }
   fileApi.upload("image", formData)
     .then((response: any) => {
       images.value.push(...response.data);
       file.status = "done";
       file.message = "成功";
+      Toast({
+        message: "文件上传成功",
+        position: "bottom",
+      });
     })
 };
 
@@ -118,7 +126,6 @@ watch(()=>form.content,(newValue,oldValue)=>{
  {
   isSend.value=true
  }
- console.log(isSend.value?'#FFF':'#111')
 })
 </script>
 <style scoped>
diff --git a/Yi.Vue3.x.Vant/tsconfig.json b/Yi.Vue3.x.Vant/tsconfig.json
index 6f20a935..8e905fac 100644
--- a/Yi.Vue3.x.Vant/tsconfig.json
+++ b/Yi.Vue3.x.Vant/tsconfig.json
@@ -13,6 +13,11 @@
     "lib": ["ESNext", "DOM"],
     "skipLibCheck": true,
     // "strictPropertyInitialization": false
+    "paths": {
+      "@": ["./src"],
+      // "@/*": ["./src/*"] // 多加个这个,
+      "@/*": ["./src/*"]
+    }
   },
   "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue"],
   "references": [{ "path": "./tsconfig.node.json" }]
diff --git a/Yi.Vue3.x.Vant/vite.config.ts b/Yi.Vue3.x.Vant/vite.config.ts
index 2be3bef5..fbd12138 100644
--- a/Yi.Vue3.x.Vant/vite.config.ts
+++ b/Yi.Vue3.x.Vant/vite.config.ts
@@ -19,7 +19,8 @@ export default defineConfig(({ mode, command }) => {
         // 设置路径
         '~': path.resolve(__dirname, './'),
         // 设置别名
-        '@': path.resolve(__dirname, './src')
+        // '@': path.resolve(__dirname, './src'),
+        "@": path.join(__dirname, "./src"),
       }
     },
     server: {
diff --git a/Yi.Vue3.x.Vant/vite.config.ts.timestamp-1665906237992.mjs b/Yi.Vue3.x.Vant/vite.config.ts.timestamp-1665906237992.mjs
new file mode 100644
index 00000000..0ff3d530
--- /dev/null
+++ b/Yi.Vue3.x.Vant/vite.config.ts.timestamp-1665906237992.mjs
@@ -0,0 +1,46 @@
+// vite.config.ts
+import { defineConfig, loadEnv } from "vite";
+import path from "path";
+import vue from "@vitejs/plugin-vue";
+import Components from "unplugin-vue-components/vite";
+import { VantResolver } from "unplugin-vue-components/resolvers";
+var __vite_injected_original_dirname = "D:\\CC.Yi\\CC.Yi\\Yi.Vue3.x.Vant";
+var vite_config_default = defineConfig(
+  ({ mode, command }) => {
+    const env = loadEnv(mode, process.cwd());
+    const { VITE_APP_ENV, VITE_APP_BASE_URL } = env;
+    return {
+      plugins: [vue(), Components({
+        resolvers: [VantResolver()]
+      })],
+      resolve: {
+        alias: {
+          "~": path.resolve(__vite_injected_original_dirname, "./"),
+          "@": path.join(__vite_injected_original_dirname, "./src")
+        }
+      },
+      server: {
+        port: 17e3,
+        host: true,
+        open: true,
+        proxy: {
+          "/dev-api": {
+            target: VITE_APP_BASE_URL,
+            changeOrigin: true,
+            rewrite: (p) => p.replace(/^\/dev-api/, "")
+          },
+          "/dev-ws": {
+            target: VITE_APP_BASE_URL,
+            changeOrigin: true,
+            rewrite: (p) => p.replace(/^\/dev-ws/, ""),
+            ws: true
+          }
+        }
+      }
+    };
+  }
+);
+export {
+  vite_config_default as default
+};
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsidml0ZS5jb25maWcudHMiXSwKICAic291cmNlc0NvbnRlbnQiOiBbImNvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9kaXJuYW1lID0gXCJEOlxcXFxDQy5ZaVxcXFxDQy5ZaVxcXFxZaS5WdWUzLnguVmFudFwiO2NvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9maWxlbmFtZSA9IFwiRDpcXFxcQ0MuWWlcXFxcQ0MuWWlcXFxcWWkuVnVlMy54LlZhbnRcXFxcdml0ZS5jb25maWcudHNcIjtjb25zdCBfX3ZpdGVfaW5qZWN0ZWRfb3JpZ2luYWxfaW1wb3J0X21ldGFfdXJsID0gXCJmaWxlOi8vL0Q6L0NDLllpL0NDLllpL1lpLlZ1ZTMueC5WYW50L3ZpdGUuY29uZmlnLnRzXCI7aW1wb3J0IHsgZGVmaW5lQ29uZmlnLCBsb2FkRW52IH0gZnJvbSAndml0ZSdcclxuaW1wb3J0IHBhdGggZnJvbSAncGF0aCdcclxuaW1wb3J0IHZ1ZSBmcm9tICdAdml0ZWpzL3BsdWdpbi12dWUnXHJcbmltcG9ydCBDb21wb25lbnRzIGZyb20gJ3VucGx1Z2luLXZ1ZS1jb21wb25lbnRzL3ZpdGUnO1xyXG5pbXBvcnQgeyBWYW50UmVzb2x2ZXIgfSBmcm9tICd1bnBsdWdpbi12dWUtY29tcG9uZW50cy9yZXNvbHZlcnMnO1xyXG5cclxuXHJcbi8vIGh0dHBzOi8vdml0ZWpzLmRldi9jb25maWcvXHJcbmV4cG9ydCBkZWZhdWx0IGRlZmluZUNvbmZpZygoeyBtb2RlLCBjb21tYW5kIH0pID0+IHtcclxuICBjb25zdCBlbnYgPSBsb2FkRW52KG1vZGUsIHByb2Nlc3MuY3dkKCkpXHJcbiAgY29uc3QgeyBWSVRFX0FQUF9FTlYsIFZJVEVfQVBQX0JBU0VfVVJMfSA9IGVudlxyXG4gIHJldHVybiB7XHJcbiAgICBwbHVnaW5zOiBbdnVlKCksIENvbXBvbmVudHMoe1xyXG4gICAgICByZXNvbHZlcnM6IFtWYW50UmVzb2x2ZXIoKV0sXHJcbiAgICB9KSxdLFxyXG4gICAgcmVzb2x2ZToge1xyXG4gICAgICAvLyBodHRwczovL2NuLnZpdGVqcy5kZXYvY29uZmlnLyNyZXNvbHZlLWFsaWFzXHJcbiAgICAgIGFsaWFzOiB7XHJcbiAgICAgICAgLy8gXHU4QkJFXHU3RjZFXHU4REVGXHU1Rjg0XHJcbiAgICAgICAgJ34nOiBwYXRoLnJlc29sdmUoX19kaXJuYW1lLCAnLi8nKSxcclxuICAgICAgICAvLyBcdThCQkVcdTdGNkVcdTUyMkJcdTU0MERcclxuICAgICAgICAvLyAnQCc6IHBhdGgucmVzb2x2ZShfX2Rpcm5hbWUsICcuL3NyYycpLFxyXG4gICAgICAgIFwiQFwiOiBwYXRoLmpvaW4oX19kaXJuYW1lLCBcIi4vc3JjXCIpLFxyXG4gICAgICB9XHJcbiAgICB9LFxyXG4gICAgc2VydmVyOiB7XHJcbiAgICAgIHBvcnQ6IDE3MDAwLFxyXG4gICAgICBob3N0OiB0cnVlLFxyXG4gICAgICBvcGVuOiB0cnVlLFxyXG4gIFxyXG4gICAgICBcclxuICAgICAgcHJveHk6IHtcclxuICAgICAgICAvLyBodHRwczovL2NuLnZpdGVqcy5kZXYvY29uZmlnLyNzZXJ2ZXItcHJveHlcclxuICAgICAgICAnL2Rldi1hcGknOiB7XHJcbiAgICAgICAgICB0YXJnZXQ6IFZJVEVfQVBQX0JBU0VfVVJMLFxyXG4gICAgICAgICAgY2hhbmdlT3JpZ2luOiB0cnVlLFxyXG4gICAgICAgICAgcmV3cml0ZTogKHApID0+IHAucmVwbGFjZSgvXlxcL2Rldi1hcGkvLCAnJyksXHJcbiAgICAgICAgfSxcclxuICBcclxuICAgICAgICAnL2Rldi13cyc6IHtcclxuICAgICAgICAgIHRhcmdldDogVklURV9BUFBfQkFTRV9VUkwsXHJcbiAgICAgICAgICBjaGFuZ2VPcmlnaW46IHRydWUsXHJcbiAgICAgICAgICByZXdyaXRlOiAocCkgPT4gcC5yZXBsYWNlKC9eXFwvZGV2LXdzLywgJycpLFxyXG4gICAgICAgICAgd3M6IHRydWVcclxuICAgICAgICB9XHJcbiAgXHJcbiAgICAgIH1cclxuICAgIH0sXHJcbiAgfVxyXG5cclxufVxyXG5cclxuKVxyXG4iXSwKICAibWFwcGluZ3MiOiAiO0FBQWlSLFNBQVMsY0FBYyxlQUFlO0FBQ3ZULE9BQU8sVUFBVTtBQUNqQixPQUFPLFNBQVM7QUFDaEIsT0FBTyxnQkFBZ0I7QUFDdkIsU0FBUyxvQkFBb0I7QUFKN0IsSUFBTSxtQ0FBbUM7QUFRekMsSUFBTyxzQkFBUTtBQUFBLEVBQWEsQ0FBQyxFQUFFLE1BQU0sUUFBUSxNQUFNO0FBQ2pELFVBQU0sTUFBTSxRQUFRLE1BQU0sUUFBUSxJQUFJLENBQUM7QUFDdkMsVUFBTSxFQUFFLGNBQWMsa0JBQWlCLElBQUk7QUFDM0MsV0FBTztBQUFBLE1BQ0wsU0FBUyxDQUFDLElBQUksR0FBRyxXQUFXO0FBQUEsUUFDMUIsV0FBVyxDQUFDLGFBQWEsQ0FBQztBQUFBLE1BQzVCLENBQUMsQ0FBRTtBQUFBLE1BQ0gsU0FBUztBQUFBLFFBRVAsT0FBTztBQUFBLFVBRUwsS0FBSyxLQUFLLFFBQVEsa0NBQVcsSUFBSTtBQUFBLFVBR2pDLEtBQUssS0FBSyxLQUFLLGtDQUFXLE9BQU87QUFBQSxRQUNuQztBQUFBLE1BQ0Y7QUFBQSxNQUNBLFFBQVE7QUFBQSxRQUNOLE1BQU07QUFBQSxRQUNOLE1BQU07QUFBQSxRQUNOLE1BQU07QUFBQSxRQUdOLE9BQU87QUFBQSxVQUVMLFlBQVk7QUFBQSxZQUNWLFFBQVE7QUFBQSxZQUNSLGNBQWM7QUFBQSxZQUNkLFNBQVMsQ0FBQyxNQUFNLEVBQUUsUUFBUSxjQUFjLEVBQUU7QUFBQSxVQUM1QztBQUFBLFVBRUEsV0FBVztBQUFBLFlBQ1QsUUFBUTtBQUFBLFlBQ1IsY0FBYztBQUFBLFlBQ2QsU0FBUyxDQUFDLE1BQU0sRUFBRSxRQUFRLGFBQWEsRUFBRTtBQUFBLFlBQ3pDLElBQUk7QUFBQSxVQUNOO0FBQUEsUUFFRjtBQUFBLE1BQ0Y7QUFBQSxJQUNGO0FBQUEsRUFFRjtBQUVBOyIsCiAgIm5hbWVzIjogW10KfQo=