valarchie
							
						 
					 | 
					
						
						
						
						
							
						
						
							caba16e30f
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'upstream/main'
						
						
						
						
						
						
						
						# Conflicts:
#	package.json
#	pnpm-lock.yaml
#	public/serverConfig.json 
						
						
					 | 
					
						2023-07-07 18:17:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								valarchie
							
						 
					 | 
					
						
						
						
						
							
						
						
							4d41bccfbf
							
						
					 | 
					
						
						
							
							feat: 新增路由代码
						
						
						
						
						
						
					 | 
					
						2023-06-29 23:00:44 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoxian521
							
						 
					 | 
					
						
						
						
						
							
						
						
							1f27d6cd9e
							
						
					 | 
					
						
						
							
							release: update 4.5.0
						
						
						
						
						
						
					 | 
					
						2023-06-26 12:32:11 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								valarchie
							
						 
					 | 
					
						
						
						
						
							
						
						
							95a9675c7c
							
						
					 | 
					
						
						
							
							feat: 使用后端的验证码
						
						
						
						
						
						
					 | 
					
						2023-06-23 17:03:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								valarchie
							
						 
					 | 
					
						
						
						
						
							
						
						
							af481d72b9
							
						
					 | 
					
						
						
							
							chore: sync with upstream
						
						
						
						
						
						
					 | 
					
						2023-06-22 15:13:58 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoxian521
							
						 
					 | 
					
						
						
						
						
							
						
						
							b6859d7920
							
						
					 | 
					
						
						
							
							release: update 4.4.0
						
						
						
						
						
						
					 | 
					
						2023-06-14 16:29:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								valarchie
							
						 
					 | 
					
						
						
						
						
							
						
						
							e23191f6ad
							
						
					 | 
					
						
						
							
							Merge branch 'merge_1' into main
						
						
						
						
						
						
					 | 
					
						2023-06-11 15:56:13 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								valarchie
							
						 
					 | 
					
						
						
						
						
							
						
						
							10e4598979
							
						
					 | 
					
						
						
							
							chore: sync with upstream
						
						
						
						
						
						
					 | 
					
						2023-06-11 15:55:27 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								valarchie
							
						 
					 | 
					
						
						
						
						
							
						
						
							aebb7fa802
							
						
					 | 
					
						
						
							
							refactor(./build/index.ts): 调整加载env的代码
						
						
						
						
						
						
					 | 
					
						2023-05-20 16:50:46 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoxian521
							
						 
					 | 
					
						
						
						
						
							
						
						
							4e95672cb4
							
						
					 | 
					
						
						
							
							release: update 4.1.0
						
						
						
						
						
						
					 | 
					
						2023-05-12 13:27:40 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoxian521
							
						 
					 | 
					
						
						
						
						
							
						
						
							635da1dc52
							
						
					 | 
					
						
						
							
							chore: update link
						
						
						
						
						
						
					 | 
					
						2023-02-08 20:10:08 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoxian521
							
						 
					 | 
					
						
						
						
						
							
						
						
							707200c71d
							
						
					 | 
					
						
						
							
							release: update 3.9.6
						
						
						
						
						
						
					 | 
					
						2022-12-19 13:45:28 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoxian521
							
						 
					 | 
					
						
						
						
						
							
						
						
							bc548d500c
							
						
					 | 
					
						
						
							
							chore: update @pureadmin/theme latest
						
						
						
						
						
						
					 | 
					
						2022-12-15 12:41:02 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoxian521
							
						 
					 | 
					
						
						
						
						
							
						
						
							4d57c9e3d7
							
						
					 | 
					
						
						
							
							release: update 3.9.5
						
						
						
						
						
						
					 | 
					
						2022-12-13 14:37:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoxian521
							
						 
					 | 
					
						
						
						
						
							
						
						
							1bcf391513
							
						
					 | 
					
						
						
							
							fix: 修复暗黑主题样式问题
						
						
						
						
						
						
					 | 
					
						2022-12-09 20:35:50 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoxian521
							
						 
					 | 
					
						
						
						
						
							
						
						
							27056e7560
							
						
					 | 
					
						
						
							
							release: update 3.9.4
						
						
						
						
						
						
					 | 
					
						2022-12-05 14:28:46 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoxian521
							
						 
					 | 
					
						
						
						
						
							
						
						
							c6e25d6933
							
						
					 | 
					
						
						
							
							release: update 3.9.2
						
						
						
						
						
						
					 | 
					
						2022-12-03 15:20:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoxian521
							
						 
					 | 
					
						
						
						
						
							
						
						
							2b67efe771
							
						
					 | 
					
						
						
							
							release: update 3.9.0
						
						
						
						
						
						
					 | 
					
						2022-11-30 16:33:46 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoxian521
							
						 
					 | 
					
						
						
						
						
							
						
						
							bbe23ce0a2
							
						
					 | 
					
						
						
							
							release: update 3.8.7
						
						
						
						
						
						
					 | 
					
						2022-11-28 01:49:35 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoxian521
							
						 
					 | 
					
						
						
						
						
							
						
						
							6110be29a1
							
						
					 | 
					
						
						
							
							release: update 3.8.0
						
						
						
						
						
						
					 | 
					
						2022-11-26 19:14:08 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoxian521
							
						 
					 | 
					
						
						
						
						
							
						
						
							d53496e495
							
						
					 | 
					
						
						
							
							chore: 同步完整版代码
						
						
						
						
						
						
					 | 
					
						2022-11-11 11:53:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoxian521
							
						 
					 | 
					
						
						
						
						
							
						
						
							1bafbeaab7
							
						
					 | 
					
						
						
							
							release: update 3.6.4
						
						
						
						
						
						
					 | 
					
						2022-11-10 12:28:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoxian521
							
						 
					 | 
					
						
						
						
						
							
						
						
							761b0e5ec2
							
						
					 | 
					
						
						
							
							feat: 提交非国际化版本代码
						
						
						
						
						
						
					 | 
					
						2022-10-28 15:32:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoxian521
							
						 
					 | 
					
						
						
						
						
							
						
						
							7d419c3b35
							
						
					 | 
					
						
						
							
							refactor: 使用@/别名替换/@/别名
						
						
						
						
						
						
					 | 
					
						2022-10-27 13:17:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoxian521
							
						 
					 | 
					
						
						
						
						
							
						
						
							fdf12660c1
							
						
					 | 
					
						
						
							
							feat: 打包构建添加可选 gzip 与 brotli 压缩模式
						
						
						
						
						
						
					 | 
					
						2022-10-27 02:19:23 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoxian521
							
						 
					 | 
					
						
						
						
						
							
						
						
							49cdcf216f
							
						
					 | 
					
						
						
							
							feat: 添加打包是否启动cdn替换本地库配置,默认false不启动
						
						
						
						
						
						
					 | 
					
						2022-10-26 19:51:06 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoxian521
							
						 
					 | 
					
						
						
						
						
							
						
						
							ee65ec9f72
							
						
					 | 
					
						
						
							
							perf: 使用/** */替换//注释,对编辑器的智能提示更友好
						
						
						
						
						
						
					 | 
					
						2022-09-11 16:46:21 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoxian521
							
						 
					 | 
					
						
						
						
						
							
						
						
							60cdaf4697
							
						
					 | 
					
						
						
							
							refactor: use tailwindcss replace unocss
						
						
						
						
						
						
					 | 
					
						2022-09-07 16:04:26 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoxian521
							
						 
					 | 
					
						
						
						
						
							
						
						
							c07e60e114
							
						
					 | 
					
						
						
							
							release: update 3.4.5
						
						
						
						
						
						
					 | 
					
						2022-08-22 21:34:55 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoxian521
							
						 
					 | 
					
						
						
						
						
							
						
						
							45c08d779d
							
						
					 | 
					
						
						
							
							refactor: use unocss replace windicss
						
						
						
						
						
						
					 | 
					
						2022-05-07 11:50:06 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoxian521
							
						 
					 | 
					
						
						
						
						
							
						
						
							41b35588c5
							
						
					 | 
					
						
						
							
							perf: 同步完整版代码
						
						
						
						
						
						
					 | 
					
						2022-05-01 08:34:33 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoxian521
							
						 
					 | 
					
						
						
						
						
							
						
						
							73e98814e2
							
						
					 | 
					
						
						
							
							perf: 同步完整版代码
						
						
						
						
						
						
					 | 
					
						2022-04-25 18:46:25 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoxian521
							
						 
					 | 
					
						
						
						
						
							
						
						
							bc8a0f3b35
							
						
					 | 
					
						
						
							
							perf: 同步完整版代码
						
						
						
						
						
						
					 | 
					
						2022-04-06 13:42:49 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoxian521
							
						 
					 | 
					
						
						
						
						
							
						
						
							45743a7c74
							
						
					 | 
					
						
						
							
							feat: use @pureadmin/theme
						
						
						
						
						
						
					 | 
					
						2022-03-17 15:45:11 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoxian521
							
						 
					 | 
					
						
						
						
						
							
						
						
							f5b387231a
							
						
					 | 
					
						
						
							
							perf: 同步完整版代码
						
						
						
						
						
						
					 | 
					
						2022-03-14 14:49:02 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoxian521
							
						 
					 | 
					
						
						
						
						
							
						
						
							eb9d1e8238
							
						
					 | 
					
						
						
							
							perf: 同步完整版
						
						
						
						
						
						
					 | 
					
						2022-02-27 13:31:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoxian521
							
						 
					 | 
					
						
						
						
						
							
						
						
							9e5fe5edbc
							
						
					 | 
					
						
						
							
							feat: add build report
						
						
						
						
						
						
					 | 
					
						2022-02-05 15:32:38 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoxian521
							
						 
					 | 
					
						
						
						
						
							
						
						
							d943550e10
							
						
					 | 
					
						
						
							
							chore: 重构图标
						
						
						
						
						
						
					 | 
					
						2022-02-05 14:45:20 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoxian521
							
						 
					 | 
					
						
						
						
						
							
						
						
							7bc50662b9
							
						
					 | 
					
						
						
							
							perf: 同步完整版分支代码
						
						
						
						
						
						
					 | 
					
						2021-12-17 15:09:02 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoxian521
							
						 
					 | 
					
						
						
						
						
							
						
						
							eeb1d378f2
							
						
					 | 
					
						
						
							
							perf: 同步完整版分支代码
						
						
						
						
						
						
					 | 
					
						2021-12-14 10:51:07 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoxian521
							
						 
					 | 
					
						
						
						
						
							
						
						
							f6057458de
							
						
					 | 
					
						
						
							
							perf: 同步完整版分支代码
						
						
						
						
						
						
					 | 
					
						2021-12-06 17:11:15 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoxian521
							
						 
					 | 
					
						
						
						
						
							
						
						
							f4b5150b03
							
						
					 | 
					
						
						
							
							feat: add pure-admin-thin
						
						
						
						
						
						
					 | 
					
						2021-10-16 16:16:58 +08:00 | 
					
					
						
						
							
							
							
						
					 |