Browse Source

😁1、调整swagger登录接口路由 2、修复代码生成接口路由 3、升级npm包依赖

zuohuaijun 2 years ago
parent
commit
86fb1532ed

+ 2 - 2
Admin.NET/Admin.NET.Application/Configuration/Swagger.json

@@ -34,8 +34,8 @@
     "EnableAllGroups": true,
     "LoginInfo": {
       "Enabled": true, // 是否开启Swagger登录
-      "CheckUrl": "/swagger/checkUrl",
-      "SubmitUrl": "/swagger/submitUrl"
+      "CheckUrl": "/api/swagger/checkUrl",
+      "SubmitUrl": "/api/swagger/submitUrl"
     },
     "EnumToNumber": true // 枚举类型生成值类型
   }

+ 2 - 2
Admin.NET/Admin.NET.Core/Service/Auth/SysAuthService.cs

@@ -310,7 +310,7 @@ public class SysAuthService : IDynamicApiController, ITransient
     /// </summary>
     /// <returns></returns>
     [AllowAnonymous]
-    [HttpPost("/swagger/checkUrl"), NonUnify]
+    [HttpPost("/api/swagger/checkUrl"), NonUnify]
     [DisplayName("Swagger登录检查")]
     public int SwaggerCheckUrl()
     {
@@ -323,7 +323,7 @@ public class SysAuthService : IDynamicApiController, ITransient
     /// <param name="auth"></param>
     /// <returns></returns>
     [AllowAnonymous]
-    [HttpPost("/swagger/submitUrl"), NonUnify]
+    [HttpPost("/api/swagger/submitUrl"), NonUnify]
     [DisplayName("Swagger登录提交")]
     public async Task<int> SwaggerSubmitUrl([FromForm] SpecificationAuth auth)
     {

+ 1 - 1
Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/Service.cs.vm

@@ -233,7 +233,7 @@ if(@column.EffectType == "Upload"){
 @foreach (var column in Model.TableField){
 if(@column.EffectType == "ApiTreeSelect" && !definedObjects.ContainsKey("@(@column.FkEntityName)Tree")){
     @{definedObjects.Add("@(@column.FkEntityName)Tree", 1);}
-    @:[HttpGet("/@(@Model.LowerClassName)/@(@column.FkEntityName)Tree")]
+    @:[HttpGet("@(@Model.LowerClassName)/@(@column.FkEntityName)Tree")]
     @:public async Task<dynamic> @(@column.FkEntityName)Tree()
     @:{
         @:return await _rep.Context.Queryable<@(@column.FkEntityName)>().ToTreeAsync(u => u.Children, u => u.@(@column.PidColumn), 0);

+ 4 - 4
Web/package.json

@@ -25,7 +25,7 @@
 		"echarts": "^5.5.0",
 		"echarts-gl": "^2.0.9",
 		"echarts-wordcloud": "^2.1.0",
-		"element-plus": "^2.6.0",
+		"element-plus": "^2.6.1",
 		"js-cookie": "^3.0.5",
 		"js-table2excel": "^1.1.2",
 		"jsplumb": "^2.15.6",
@@ -36,7 +36,7 @@
 		"pinia": "^2.1.7",
 		"print-js": "^1.6.0",
 		"qrcodejs2-fixes": "^0.0.2",
-		"qs": "^6.11.2",
+		"qs": "^6.12.0",
 		"screenfull": "^6.0.2",
 		"sm-crypto-v2": "^1.9.0",
 		"sortablejs": "^1.15.2",
@@ -57,7 +57,7 @@
 	},
 	"devDependencies": {
 		"@types/lodash-es": "^4.17.12",
-		"@types/node": "^20.11.24",
+		"@types/node": "^20.11.25",
 		"@types/nprogress": "^0.2.3",
 		"@types/sortablejs": "^1.15.8",
 		"@typescript-eslint/eslint-plugin": "^7.1.1",
@@ -71,7 +71,7 @@
 		"less": "^4.2.0",
 		"prettier": "^3.2.5",
 		"sass": "^1.71.1",
-		"typescript": "^5.3.3",
+		"typescript": "^5.4.2",
 		"vite": "^5.1.5",
 		"vite-plugin-cdn-import": "^0.3.5",
 		"vite-plugin-compression": "^0.5.1",

+ 22 - 30
Web/src/components/table/search.vue

@@ -53,15 +53,7 @@
 								@change="val.change"
 								class="w100"
 							/>
-							<el-select
-								v-model="model[val.prop]"
-								v-bind="val.comProps"
-								:clearable="!val.required"
-								:placeholder="val.placeholder"
-								v-else-if="val.type === 'select'"
-								@change="val.change"
-								class="w100"
-							>
+							<el-select v-model="model[val.prop]" v-bind="val.comProps" :clearable="!val.required" :placeholder="val.placeholder" v-else-if="val.type === 'select'" @change="val.change" class="w100">
 								<el-option v-for="item in val.options" :key="item.value" :label="item.label" :value="item.value"> </el-option>
 							</el-select>
 							<el-cascader
@@ -105,9 +97,9 @@
 </template>
 
 <script setup lang="ts" name="makeTableDemoSearch">
-import { reactive, ref } from 'vue'
-import type { FormInstance } from 'element-plus'
-import { saulVModel } from '/@/utils/saulVModel'
+import { reactive, ref } from 'vue';
+import type { FormInstance } from 'element-plus';
+import { saulVModel } from '/@/utils/saulVModel';
 
 // 定义父组件传过来的值
 const props = defineProps({
@@ -115,48 +107,48 @@ const props = defineProps({
 	// 可带入comProps属性,和使用的控件属性对应
 	search: {
 		type: Array<TableSearchType>,
-		default: () => []
+		default: () => [],
 	},
 	reset: {
 		type: Object,
-		default: () => {}
+		default: () => {},
 	},
 	modelValue: {
 		type: Object,
-		default: () => {}
-	}
-})
+		default: () => {},
+	},
+});
 
 // 定义子组件向父组件传值/事件
-const emit = defineEmits(['search', 'reset', 'update:modelValue'])
+const emit = defineEmits(['search', 'reset', 'update:modelValue']);
 
 // 定义变量内容
-const tableSearchRef = ref<FormInstance>()
+const tableSearchRef = ref<FormInstance>();
 const state = reactive({
 	isToggle: false,
 	cascaderProps: { checkStrictly: true, emitPath: false, value: 'id', label: 'name', expandTrigger: 'hover' },
-})
+});
 
-const model = saulVModel(props, 'modelValue', emit)
+const model = saulVModel(props, 'modelValue', emit);
 
 // 查询
 const onSearch = (formEl: FormInstance | undefined) => {
-	if (!formEl) return
+	if (!formEl) return;
 	formEl.validate((valid: boolean) => {
 		if (valid) {
-			emit('search')
+			emit('search');
 		} else {
-			return false
+			return false;
 		}
-	})
-}
+	});
+};
 
 // 重置
 const onReset = (formEl: FormInstance | undefined) => {
-	if (!formEl) return
-	formEl.resetFields()
-	emit('reset')
-}
+	if (!formEl) return;
+	formEl.resetFields();
+	emit('reset');
+};
 </script>
 
 <style scoped lang="scss">