diff --git a/bms-back/ruoyi-admin/pom.xml b/bms-back/ruoyi-admin/pom.xml
index bdaf7f6..4d385c9 100644
--- a/bms-back/ruoyi-admin/pom.xml
+++ b/bms-back/ruoyi-admin/pom.xml
@@ -63,6 +63,8 @@
spring-boot-maven-plugin
true
+ -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -Duser.language=zh -Duser.country=CN
+ -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -Duser.language=zh -Duser.country=CN
diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/bms-back/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
index d6f9167..16a4676 100644
--- a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
+++ b/bms-back/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
@@ -3,12 +3,14 @@ package com.ruoyi;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration;
+import org.springframework.scheduling.annotation.EnableAsync;
/**
* 启动程序
- *
+ *
* @author ruoyi
*/
+@EnableAsync
@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
public class RuoYiApplication
{
diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/data/BmsRegionController.java b/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/data/BmsRegionController.java
new file mode 100644
index 0000000..1e43357
--- /dev/null
+++ b/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/data/BmsRegionController.java
@@ -0,0 +1,124 @@
+package com.ruoyi.web.controller.data;
+
+import java.util.List;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.BmsRegion;
+import com.ruoyi.system.service.IBmsRegionService;
+import com.ruoyi.system.service.IBmsRegionSyncService;
+
+/**
+ * 区域管理 信息操作处理
+ *
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/data/region")
+public class BmsRegionController extends BaseController
+{
+ @Autowired
+ private IBmsRegionService regionService;
+
+ @Autowired
+ private IBmsRegionSyncService syncService;
+
+ /**
+ * 获取区域列表
+ */
+ @PreAuthorize("@ss.hasPermi('data:region:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(BmsRegion region)
+ {
+ startPage();
+ List list = regionService.selectRegionList(region);
+ return getDataTable(list);
+ }
+
+ /**
+ * 导出区域列表
+ */
+ @PreAuthorize("@ss.hasPermi('data:region:list')")
+ @Log(title = "区域管理", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, BmsRegion region)
+ {
+ List list = regionService.selectRegionList(region);
+ ExcelUtil util = new ExcelUtil(BmsRegion.class);
+ util.exportExcel(response, list, "区域数据");
+ }
+
+ /**
+ * 获取区域详细信息
+ */
+ @PreAuthorize("@ss.hasPermi('data:region:query')")
+ @GetMapping(value = "/{regionId}")
+ public AjaxResult getInfo(@PathVariable Long regionId)
+ {
+ return success(regionService.selectRegionById(regionId));
+ }
+
+ /**
+ * 修改区域
+ */
+ @PreAuthorize("@ss.hasPermi('data:region:edit')")
+ @Log(title = "区域管理", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@Validated @RequestBody BmsRegion region)
+ {
+ region.setUpdateBy(getUsername());
+ return toAjax(regionService.updateRegion(region));
+ }
+
+ /**
+ * 删除区域
+ */
+ @PreAuthorize("@ss.hasPermi('data:region:remove')")
+ @Log(title = "区域管理", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{regionIds}")
+ public AjaxResult remove(@PathVariable Long[] regionIds)
+ {
+ return toAjax(regionService.deleteRegionByIds(regionIds));
+ }
+
+ /**
+ * 修改区域状态(启用/停用)
+ */
+ @PreAuthorize("@ss.hasPermi('data:region:edit')")
+ @Log(title = "区域管理", businessType = BusinessType.UPDATE)
+ @PutMapping("/changeStatus")
+ public AjaxResult changeStatus(@RequestBody BmsRegion region)
+ {
+ region.setUpdateBy(getUsername());
+ return toAjax(regionService.updateRegionStatus(region));
+ }
+
+ /**
+ * 同步国家数据(异步)
+ */
+ @PreAuthorize("@ss.hasPermi('data:region:sync')")
+ @Log(title = "区域管理", businessType = BusinessType.OTHER)
+ @PostMapping("/sync")
+ public AjaxResult sync()
+ {
+ Long logId = syncService.syncRegion();
+ AjaxResult ajax = AjaxResult.success("同步任务已创建,正在后台执行");
+ ajax.put("logId", logId);
+ return ajax;
+ }
+}
diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/data/BmsRegionSyncLogController.java b/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/data/BmsRegionSyncLogController.java
new file mode 100644
index 0000000..9f40976
--- /dev/null
+++ b/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/data/BmsRegionSyncLogController.java
@@ -0,0 +1,63 @@
+package com.ruoyi.web.controller.data;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.BmsRegionSyncLog;
+import com.ruoyi.system.mapper.BmsRegionSyncLogMapper;
+
+/**
+ * 区域同步日志 信息操作处理
+ *
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/data/region/log")
+public class BmsRegionSyncLogController extends BaseController
+{
+ @Autowired
+ private BmsRegionSyncLogMapper syncLogMapper;
+
+ /**
+ * 获取同步日志列表
+ */
+ @PreAuthorize("@ss.hasPermi('data:region:log:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(BmsRegionSyncLog syncLog)
+ {
+ startPage();
+ List list = syncLogMapper.selectSyncLogList(syncLog);
+ return getDataTable(list);
+ }
+
+ /**
+ * 获取同步日志详细信息
+ */
+ @PreAuthorize("@ss.hasPermi('data:region:log:list')")
+ @GetMapping(value = "/{logId}")
+ public AjaxResult getInfo(@PathVariable Long logId)
+ {
+ return success(syncLogMapper.selectSyncLogById(logId));
+ }
+
+ /**
+ * 删除同步日志
+ */
+ @PreAuthorize("@ss.hasPermi('data:region:log:remove')")
+ @Log(title = "同步日志", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{logIds}")
+ public AjaxResult remove(@PathVariable Long[] logIds)
+ {
+ return toAjax(syncLogMapper.deleteSyncLogByIds(logIds));
+ }
+}
diff --git a/bms-back/ruoyi-admin/src/main/resources/application-druid.yml b/bms-back/ruoyi-admin/src/main/resources/application-druid.yml
index 426a48a..7be78ff 100644
--- a/bms-back/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/bms-back/ruoyi-admin/src/main/resources/application-druid.yml
@@ -6,9 +6,10 @@ spring:
druid:
# 主库数据源
master:
- url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&connectionCollation=utf8mb4_unicode_ci&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: password
+ connectionInitSqls: SET NAMES utf8mb4
# 从库数据源
slave:
# 从数据源开关/默认关闭
diff --git a/bms-back/ruoyi-admin/src/main/resources/countries.json b/bms-back/ruoyi-admin/src/main/resources/countries.json
new file mode 100644
index 0000000..7eca4dc
--- /dev/null
+++ b/bms-back/ruoyi-admin/src/main/resources/countries.json
@@ -0,0 +1,107 @@
+[
+ {"name":{"common":"China","official":"People's Republic of China"},"cca2":"CN","cca3":"CHN","region":"Asia","subregion":"Eastern Asia","currencies":{"CNY":{"name":"Chinese yuan","symbol":"¥"}},"idd":{"root":"+86","suffixes":[""]},"flag":"🇨🇳","flags":{"png":"https://flagcdn.com/w320/cn.png"},"independent":true},
+ {"name":{"common":"United States","official":"United States of America"},"cca2":"US","cca3":"USA","region":"Americas","subregion":"North America","currencies":{"USD":{"name":"United States dollar","symbol":"$"}},"idd":{"root":"+1","suffixes":[""]},"flag":"🇺🇸","flags":{"png":"https://flagcdn.com/w320/us.png"},"independent":true},
+ {"name":{"common":"Germany","official":"Federal Republic of Germany"},"cca2":"DE","cca3":"DEU","region":"Europe","subregion":"Western Europe","currencies":{"EUR":{"name":"Euro","symbol":"€"}},"idd":{"root":"+49","suffixes":[""]},"flag":"🇩🇪","flags":{"png":"https://flagcdn.com/w320/de.png"},"independent":true},
+ {"name":{"common":"Japan","official":"Japan"},"cca2":"JP","cca3":"JPN","region":"Asia","subregion":"Eastern Asia","currencies":{"JPY":{"name":"Japanese yen","symbol":"¥"}},"idd":{"root":"+81","suffixes":[""]},"flag":"🇯🇵","flags":{"png":"https://flagcdn.com/w320/jp.png"},"independent":true},
+ {"name":{"common":"South Korea","official":"Republic of Korea"},"cca2":"KR","cca3":"KOR","region":"Asia","subregion":"Eastern Asia","currencies":{"KRW":{"name":"South Korean won","symbol":"₩"}},"idd":{"root":"+82","suffixes":[""]},"flag":"🇰🇷","flags":{"png":"https://flagcdn.com/w320/kr.png"},"independent":true},
+ {"name":{"common":"United Kingdom","official":"United Kingdom of Great Britain and Northern Ireland"},"cca2":"GB","cca3":"GBR","region":"Europe","subregion":"Northern Europe","currencies":{"GBP":{"name":"British pound","symbol":"£"}},"idd":{"root":"+44","suffixes":[""]},"flag":"🇬🇧","flags":{"png":"https://flagcdn.com/w320/gb.png"},"independent":true},
+ {"name":{"common":"France","official":"French Republic"},"cca2":"FR","cca3":"FRA","region":"Europe","subregion":"Western Europe","currencies":{"EUR":{"name":"Euro","symbol":"€"}},"idd":{"root":"+33","suffixes":[""]},"flag":"🇫🇷","flags":{"png":"https://flagcdn.com/w320/fr.png"},"independent":true},
+ {"name":{"common":"Italy","official":"Italian Republic"},"cca2":"IT","cca3":"ITA","region":"Europe","subregion":"Southern Europe","currencies":{"EUR":{"name":"Euro","symbol":"€"}},"idd":{"root":"+39","suffixes":[""]},"flag":"🇮🇹","flags":{"png":"https://flagcdn.com/w320/it.png"},"independent":true},
+ {"name":{"common":"Spain","official":"Kingdom of Spain"},"cca2":"ES","cca3":"ESP","region":"Europe","subregion":"Southern Europe","currencies":{"EUR":{"name":"Euro","symbol":"€"}},"idd":{"root":"+34","suffixes":[""]},"flag":"🇪🇸","flags":{"png":"https://flagcdn.com/w320/es.png"},"independent":true},
+ {"name":{"common":"Netherlands","official":"Kingdom of the Netherlands"},"cca2":"NL","cca3":"NLD","region":"Europe","subregion":"Western Europe","currencies":{"EUR":{"name":"Euro","symbol":"€"}},"idd":{"root":"+31","suffixes":[""]},"flag":"🇳🇱","flags":{"png":"https://flagcdn.com/w320/nl.png"},"independent":true},
+ {"name":{"common":"Belgium","official":"Kingdom of Belgium"},"cca2":"BE","cca3":"BEL","region":"Europe","subregion":"Western Europe","currencies":{"EUR":{"name":"Euro","symbol":"€"}},"idd":{"root":"+32","suffixes":[""]},"flag":"🇧🇪","flags":{"png":"https://flagcdn.com/w320/be.png"},"independent":true},
+ {"name":{"common":"Switzerland","official":"Swiss Confederation"},"cca2":"CH","cca3":"CHE","region":"Europe","subregion":"Western Europe","currencies":{"CHF":{"name":"Swiss franc","symbol":"Fr."}},"idd":{"root":"+41","suffixes":[""]},"flag":"🇨🇭","flags":{"png":"https://flagcdn.com/w320/ch.png"},"independent":true},
+ {"name":{"common":"Austria","official":"Republic of Austria"},"cca2":"AT","cca3":"AUT","region":"Europe","subregion":"Western Europe","currencies":{"EUR":{"name":"Euro","symbol":"€"}},"idd":{"root":"+43","suffixes":[""]},"flag":"🇦🇹","flags":{"png":"https://flagcdn.com/w320/at.png"},"independent":true},
+ {"name":{"common":"Sweden","official":"Kingdom of Sweden"},"cca2":"SE","cca3":"SWE","region":"Europe","subregion":"Northern Europe","currencies":{"SEK":{"name":"Swedish krona","symbol":"kr"}},"idd":{"root":"+46","suffixes":[""]},"flag":"🇸🇪","flags":{"png":"https://flagcdn.com/w320/se.png"},"independent":true},
+ {"name":{"common":"Norway","official":"Kingdom of Norway"},"cca2":"NO","cca3":"NOR","region":"Europe","subregion":"Northern Europe","currencies":{"NOK":{"name":"Norwegian krone","symbol":"kr"}},"idd":{"root":"+47","suffixes":[""]},"flag":"🇳🇴","flags":{"png":"https://flagcdn.com/w320/no.png"},"independent":true},
+ {"name":{"common":"Denmark","official":"Kingdom of Denmark"},"cca2":"DK","cca3":"DNK","region":"Europe","subregion":"Northern Europe","currencies":{"DKK":{"name":"Danish krone","symbol":"kr"}},"idd":{"root":"+45","suffixes":[""]},"flag":"🇩🇰","flags":{"png":"https://flagcdn.com/w320/dk.png"},"independent":true},
+ {"name":{"common":"Finland","official":"Republic of Finland"},"cca2":"FI","cca3":"FIN","region":"Europe","subregion":"Northern Europe","currencies":{"EUR":{"name":"Euro","symbol":"€"}},"idd":{"root":"+358","suffixes":[""]},"flag":"🇫🇮","flags":{"png":"https://flagcdn.com/w320/fi.png"},"independent":true},
+ {"name":{"common":"Poland","official":"Republic of Poland"},"cca2":"PL","cca3":"POL","region":"Europe","subregion":"Central Europe","currencies":{"PLN":{"name":"Polish zloty","symbol":"zł"}},"idd":{"root":"+48","suffixes":[""]},"flag":"🇵🇱","flags":{"png":"https://flagcdn.com/w320/pl.png"},"independent":true},
+ {"name":{"common":"Russia","official":"Russian Federation"},"cca2":"RU","cca3":"RUS","region":"Europe","subregion":"Eastern Europe","currencies":{"RUB":{"name":"Russian ruble","symbol":"₽"}},"idd":{"root":"+7","suffixes":[""]},"flag":"🇷🇺","flags":{"png":"https://flagcdn.com/w320/ru.png"},"independent":true},
+ {"name":{"common":"India","official":"Republic of India"},"cca2":"IN","cca3":"IND","region":"Asia","subregion":"Southern Asia","currencies":{"INR":{"name":"Indian rupee","symbol":"₹"}},"idd":{"root":"+91","suffixes":[""]},"flag":"🇮🇳","flags":{"png":"https://flagcdn.com/w320/in.png"},"independent":true},
+ {"name":{"common":"Brazil","official":"Federative Republic of Brazil"},"cca2":"BR","cca3":"BRA","region":"Americas","subregion":"South America","currencies":{"BRL":{"name":"Brazilian real","symbol":"R$"}},"idd":{"root":"+55","suffixes":[""]},"flag":"🇧🇷","flags":{"png":"https://flagcdn.com/w320/br.png"},"independent":true},
+ {"name":{"common":"Canada","official":"Canada"},"cca2":"CA","cca3":"CAN","region":"Americas","subregion":"North America","currencies":{"CAD":{"name":"Canadian dollar","symbol":"$"}},"idd":{"root":"+1","suffixes":[""]},"flag":"🇨🇦","flags":{"png":"https://flagcdn.com/w320/ca.png"},"independent":true},
+ {"name":{"common":"Australia","official":"Commonwealth of Australia"},"cca2":"AU","cca3":"AUS","region":"Oceania","subregion":"Australia and New Zealand","currencies":{"AUD":{"name":"Australian dollar","symbol":"$"}},"idd":{"root":"+61","suffixes":[""]},"flag":"🇦🇺","flags":{"png":"https://flagcdn.com/w320/au.png"},"independent":true},
+ {"name":{"common":"Mexico","official":"United Mexican States"},"cca2":"MX","cca3":"MEX","region":"Americas","subregion":"North America","currencies":{"MXN":{"name":"Mexican peso","symbol":"$"}},"idd":{"root":"+52","suffixes":[""]},"flag":"🇲🇽","flags":{"png":"https://flagcdn.com/w320/mx.png"},"independent":true},
+ {"name":{"common":"Indonesia","official":"Republic of Indonesia"},"cca2":"ID","cca3":"IDN","region":"Asia","subregion":"South-Eastern Asia","currencies":{"IDR":{"name":"Indonesian rupiah","symbol":"Rp"}},"idd":{"root":"+62","suffixes":[""]},"flag":"🇮🇩","flags":{"png":"https://flagcdn.com/w320/id.png"},"independent":true},
+ {"name":{"common":"Thailand","official":"Kingdom of Thailand"},"cca2":"TH","cca3":"THA","region":"Asia","subregion":"South-Eastern Asia","currencies":{"THB":{"name":"Thai baht","symbol":"฿"}},"idd":{"root":"+66","suffixes":[""]},"flag":"🇹🇭","flags":{"png":"https://flagcdn.com/w320/th.png"},"independent":true},
+ {"name":{"common":"Vietnam","official":"Socialist Republic of Vietnam"},"cca2":"VN","cca3":"VNM","region":"Asia","subregion":"South-Eastern Asia","currencies":{"VND":{"name":"Vietnamese đồng","symbol":"₫"}},"idd":{"root":"+84","suffixes":[""]},"flag":"🇻🇳","flags":{"png":"https://flagcdn.com/w320/vn.png"},"independent":true},
+ {"name":{"common":"Malaysia","official":"Malaysia"},"cca2":"MY","cca3":"MYS","region":"Asia","subregion":"South-Eastern Asia","currencies":{"MYR":{"name":"Malaysian ringgit","symbol":"RM"}},"idd":{"root":"+60","suffixes":[""]},"flag":"🇲🇾","flags":{"png":"https://flagcdn.com/w320/my.png"},"independent":true},
+ {"name":{"common":"Singapore","official":"Republic of Singapore"},"cca2":"SG","cca3":"SGP","region":"Asia","subregion":"South-Eastern Asia","currencies":{"SGD":{"name":"Singapore dollar","symbol":"$"}},"idd":{"root":"+65","suffixes":[""]},"flag":"🇸🇬","flags":{"png":"https://flagcdn.com/w320/sg.png"},"independent":true},
+ {"name":{"common":"Philippines","official":"Republic of the Philippines"},"cca2":"PH","cca3":"PHL","region":"Asia","subregion":"South-Eastern Asia","currencies":{"PHP":{"name":"Philippine peso","symbol":"₱"}},"idd":{"root":"+63","suffixes":[""]},"flag":"🇵🇭","flags":{"png":"https://flagcdn.com/w320/ph.png"},"independent":true},
+ {"name":{"common":"Turkey","official":"Republic of Türkiye"},"cca2":"TR","cca3":"TUR","region":"Asia","subregion":"Western Asia","currencies":{"TRY":{"name":"Turkish lira","symbol":"₺"}},"idd":{"root":"+90","suffixes":[""]},"flag":"🇹🇷","flags":{"png":"https://flagcdn.com/w320/tr.png"},"independent":true},
+ {"name":{"common":"Saudi Arabia","official":"Kingdom of Saudi Arabia"},"cca2":"SA","cca3":"SAU","region":"Asia","subregion":"Western Asia","currencies":{"SAR":{"name":"Saudi riyal","symbol":"ر.س"}},"idd":{"root":"+966","suffixes":[""]},"flag":"🇸🇦","flags":{"png":"https://flagcdn.com/w320/sa.png"},"independent":true},
+ {"name":{"common":"United Arab Emirates","official":"United Arab Emirates"},"cca2":"AE","cca3":"ARE","region":"Asia","subregion":"Western Asia","currencies":{"AED":{"name":"United Arab Emirates dirham","symbol":"د.إ"}},"idd":{"root":"+971","suffixes":[""]},"flag":"🇦🇪","flags":{"png":"https://flagcdn.com/w320/ae.png"},"independent":true},
+ {"name":{"common":"Israel","official":"State of Israel"},"cca2":"IL","cca3":"ISR","region":"Asia","subregion":"Western Asia","currencies":{"ILS":{"name":"Israeli new shekel","symbol":"₪"}},"idd":{"root":"+972","suffixes":[""]},"flag":"🇮🇱","flags":{"png":"https://flagcdn.com/w320/il.png"},"independent":true},
+ {"name":{"common":"Egypt","official":"Arab Republic of Egypt"},"cca2":"EG","cca3":"EGY","region":"Africa","subregion":"Northern Africa","currencies":{"EGP":{"name":"Egyptian pound","symbol":"£"}},"idd":{"root":"+20","suffixes":[""]},"flag":"🇪🇬","flags":{"png":"https://flagcdn.com/w320/eg.png"},"independent":true},
+ {"name":{"common":"South Africa","official":"Republic of South Africa"},"cca2":"ZA","cca3":"ZAF","region":"Africa","subregion":"Southern Africa","currencies":{"ZAR":{"name":"South African rand","symbol":"R"}},"idd":{"root":"+27","suffixes":[""]},"flag":"🇿🇦","flags":{"png":"https://flagcdn.com/w320/za.png"},"independent":true},
+ {"name":{"common":"Nigeria","official":"Federal Republic of Nigeria"},"cca2":"NG","cca3":"NGA","region":"Africa","subregion":"Western Africa","currencies":{"NGN":{"name":"Nigerian naira","symbol":"₦"}},"idd":{"root":"+234","suffixes":[""]},"flag":"🇳🇬","flags":{"png":"https://flagcdn.com/w320/ng.png"},"independent":true},
+ {"name":{"common":"Argentina","official":"Argentine Republic"},"cca2":"AR","cca3":"ARG","region":"Americas","subregion":"South America","currencies":{"ARS":{"name":"Argentine peso","symbol":"$"}},"idd":{"root":"+54","suffixes":[""]},"flag":"🇦🇷","flags":{"png":"https://flagcdn.com/w320/ar.png"},"independent":true},
+ {"name":{"common":"Chile","official":"Republic of Chile"},"cca2":"CL","cca3":"CHL","region":"Americas","subregion":"South America","currencies":{"CLP":{"name":"Chilean peso","symbol":"$"}},"idd":{"root":"+56","suffixes":[""]},"flag":"🇨🇱","flags":{"png":"https://flagcdn.com/w320/cl.png"},"independent":true},
+ {"name":{"common":"Colombia","official":"Republic of Colombia"},"cca2":"CO","cca3":"COL","region":"Americas","subregion":"South America","currencies":{"COP":{"name":"Colombian peso","symbol":"$"}},"idd":{"root":"+57","suffixes":[""]},"flag":"🇨🇴","flags":{"png":"https://flagcdn.com/w320/co.png"},"independent":true},
+ {"name":{"common":"Peru","official":"Republic of Peru"},"cca2":"PE","cca3":"PER","region":"Americas","subregion":"South America","currencies":{"PEN":{"name":"Peruvian sol","symbol":"S/"}},"idd":{"root":"+51","suffixes":[""]},"flag":"🇵🇪","flags":{"png":"https://flagcdn.com/w320/pe.png"},"independent":true},
+ {"name":{"common":"New Zealand","official":"New Zealand"},"cca2":"NZ","cca3":"NZL","region":"Oceania","subregion":"Australia and New Zealand","currencies":{"NZD":{"name":"New Zealand dollar","symbol":"$"}},"idd":{"root":"+64","suffixes":[""]},"flag":"🇳🇿","flags":{"png":"https://flagcdn.com/w320/nz.png"},"independent":true},
+ {"name":{"common":"Ireland","official":"Republic of Ireland"},"cca2":"IE","cca3":"IRL","region":"Europe","subregion":"Northern Europe","currencies":{"EUR":{"name":"Euro","symbol":"€"}},"idd":{"root":"+353","suffixes":[""]},"flag":"🇮🇪","flags":{"png":"https://flagcdn.com/w320/ie.png"},"independent":true},
+ {"name":{"common":"Portugal","official":"Portuguese Republic"},"cca2":"PT","cca3":"PRT","region":"Europe","subregion":"Southern Europe","currencies":{"EUR":{"name":"Euro","symbol":"€"}},"idd":{"root":"+351","suffixes":[""]},"flag":"🇵🇹","flags":{"png":"https://flagcdn.com/w320/pt.png"},"independent":true},
+ {"name":{"common":"Greece","official":"Hellenic Republic"},"cca2":"GR","cca3":"GRC","region":"Europe","subregion":"Southern Europe","currencies":{"EUR":{"name":"Euro","symbol":"€"}},"idd":{"root":"+30","suffixes":[""]},"flag":"🇬🇷","flags":{"png":"https://flagcdn.com/w320/gr.png"},"independent":true},
+ {"name":{"common":"Czechia","official":"Czech Republic"},"cca2":"CZ","cca3":"CZE","region":"Europe","subregion":"Central Europe","currencies":{"CZK":{"name":"Czech koruna","symbol":"Kč"}},"idd":{"root":"+420","suffixes":[""]},"flag":"🇨🇿","flags":{"png":"https://flagcdn.com/w320/cz.png"},"independent":true},
+ {"name":{"common":"Hungary","official":"Hungary"},"cca2":"HU","cca3":"HUN","region":"Europe","subregion":"Central Europe","currencies":{"HUF":{"name":"Hungarian forint","symbol":"Ft"}},"idd":{"root":"+36","suffixes":[""]},"flag":"🇭🇺","flags":{"png":"https://flagcdn.com/w320/hu.png"},"independent":true},
+ {"name":{"common":"Romania","official":"Romania"},"cca2":"RO","cca3":"ROU","region":"Europe","subregion":"Central Europe","currencies":{"RON":{"name":"Romanian leu","symbol":"lei"}},"idd":{"root":"+40","suffixes":[""]},"flag":"🇷🇴","flags":{"png":"https://flagcdn.com/w320/ro.png"},"independent":true},
+ {"name":{"common":"Bulgaria","official":"Republic of Bulgaria"},"cca2":"BG","cca3":"BGR","region":"Europe","subregion":"Southeast Europe","currencies":{"BGN":{"name":"Bulgarian lev","symbol":"лв"}},"idd":{"root":"+359","suffixes":[""]},"flag":"🇧🇬","flags":{"png":"https://flagcdn.com/w320/bg.png"},"independent":true},
+ {"name":{"common":"Croatia","official":"Republic of Croatia"},"cca2":"HR","cca3":"HRV","region":"Europe","subregion":"Southeast Europe","currencies":{"EUR":{"name":"Euro","symbol":"€"}},"idd":{"root":"+385","suffixes":[""]},"flag":"🇭🇷","flags":{"png":"https://flagcdn.com/w320/hr.png"},"independent":true},
+ {"name":{"common":"Slovakia","official":"Slovak Republic"},"cca2":"SK","cca3":"SVK","region":"Europe","subregion":"Central Europe","currencies":{"EUR":{"name":"Euro","symbol":"€"}},"idd":{"root":"+421","suffixes":[""]},"flag":"🇸🇰","flags":{"png":"https://flagcdn.com/w320/sk.png"},"independent":true},
+ {"name":{"common":"Slovenia","official":"Republic of Slovenia"},"cca2":"SI","cca3":"SVN","region":"Europe","subregion":"Central Europe","currencies":{"EUR":{"name":"Euro","symbol":"€"}},"idd":{"root":"+386","suffixes":[""]},"flag":"🇸🇮","flags":{"png":"https://flagcdn.com/w320/si.png"},"independent":true},
+ {"name":{"common":"Lithuania","official":"Republic of Lithuania"},"cca2":"LT","cca3":"LTU","region":"Europe","subregion":"Northern Europe","currencies":{"EUR":{"name":"Euro","symbol":"€"}},"idd":{"root":"+370","suffixes":[""]},"flag":"🇱🇹","flags":{"png":"https://flagcdn.com/w320/lt.png"},"independent":true},
+ {"name":{"common":"Latvia","official":"Republic of Latvia"},"cca2":"LV","cca3":"LVA","region":"Europe","subregion":"Northern Europe","currencies":{"EUR":{"name":"Euro","symbol":"€"}},"idd":{"root":"+371","suffixes":[""]},"flag":"🇱🇻","flags":{"png":"https://flagcdn.com/w320/lv.png"},"independent":true},
+ {"name":{"common":"Estonia","official":"Republic of Estonia"},"cca2":"EE","cca3":"EST","region":"Europe","subregion":"Northern Europe","currencies":{"EUR":{"name":"Euro","symbol":"€"}},"idd":{"root":"+372","suffixes":[""]},"flag":"🇪🇪","flags":{"png":"https://flagcdn.com/w320/ee.png"},"independent":true},
+ {"name":{"common":"Ukraine","official":"Ukraine"},"cca2":"UA","cca3":"UKR","region":"Europe","subregion":"Eastern Europe","currencies":{"UAH":{"name":"Ukrainian hryvnia","symbol":"₴"}},"idd":{"root":"+380","suffixes":[""]},"flag":"🇺🇦","flags":{"png":"https://flagcdn.com/w320/ua.png"},"independent":true},
+ {"name":{"common":"Morocco","official":"Kingdom of Morocco"},"cca2":"MA","cca3":"MAR","region":"Africa","subregion":"Northern Africa","currencies":{"MAD":{"name":"Moroccan dirham","symbol":"د.م."}},"idd":{"root":"+212","suffixes":[""]},"flag":"🇲🇦","flags":{"png":"https://flagcdn.com/w320/ma.png"},"independent":true},
+ {"name":{"common":"Kenya","official":"Republic of Kenya"},"cca2":"KE","cca3":"KEN","region":"Africa","subregion":"Eastern Africa","currencies":{"KES":{"name":"Kenyan shilling","symbol":"KSh"}},"idd":{"root":"+254","suffixes":[""]},"flag":"🇰🇪","flags":{"png":"https://flagcdn.com/w320/ke.png"},"independent":true},
+ {"name":{"common":"Pakistan","official":"Islamic Republic of Pakistan"},"cca2":"PK","cca3":"PAK","region":"Asia","subregion":"Southern Asia","currencies":{"PKR":{"name":"Pakistani rupee","symbol":"₨"}},"idd":{"root":"+92","suffixes":[""]},"flag":"🇵🇰","flags":{"png":"https://flagcdn.com/w320/pk.png"},"independent":true},
+ {"name":{"common":"Bangladesh","official":"People's Republic of Bangladesh"},"cca2":"BD","cca3":"BGD","region":"Asia","subregion":"Southern Asia","currencies":{"BDT":{"name":"Bangladeshi taka","symbol":"৳"}},"idd":{"root":"+880","suffixes":[""]},"flag":"🇧🇩","flags":{"png":"https://flagcdn.com/w320/bd.png"},"independent":true},
+ {"name":{"common":"Iran","official":"Islamic Republic of Iran"},"cca2":"IR","cca3":"IRN","region":"Asia","subregion":"Southern Asia","currencies":{"IRR":{"name":"Iranian rial","symbol":"﷼"}},"idd":{"root":"+98","suffixes":[""]},"flag":"🇮🇷","flags":{"png":"https://flagcdn.com/w320/ir.png"},"independent":true},
+ {"name":{"common":"Iraq","official":"Republic of Iraq"},"cca2":"IQ","cca3":"IRQ","region":"Asia","subregion":"Western Asia","currencies":{"IQD":{"name":"Iraqi dinar","symbol":"د.ع"}},"idd":{"root":"+964","suffixes":[""]},"flag":"🇮🇶","flags":{"png":"https://flagcdn.com/w320/iq.png"},"independent":true},
+ {"name":{"common":"Kuwait","official":"State of Kuwait"},"cca2":"KW","cca3":"KWT","region":"Asia","subregion":"Western Asia","currencies":{"KWD":{"name":"Kuwaiti dinar","symbol":"د.ك"}},"idd":{"root":"+965","suffixes":[""]},"flag":"🇰🇼","flags":{"png":"https://flagcdn.com/w320/kw.png"},"independent":true},
+ {"name":{"common":"Qatar","official":"State of Qatar"},"cca2":"QA","cca3":"QAT","region":"Asia","subregion":"Western Asia","currencies":{"QAR":{"name":"Qatari riyal","symbol":"ر.ق"}},"idd":{"root":"+974","suffixes":[""]},"flag":"🇶🇦","flags":{"png":"https://flagcdn.com/w320/qa.png"},"independent":true},
+ {"name":{"common":"Hong Kong","official":"Hong Kong Special Administrative Region of China"},"cca2":"HK","cca3":"HKG","region":"Asia","subregion":"Eastern Asia","currencies":{"HKD":{"name":"Hong Kong dollar","symbol":"$"}},"idd":{"root":"+852","suffixes":[""]},"flag":"🇭🇰","flags":{"png":"https://flagcdn.com/w320/hk.png"},"independent":false},
+ {"name":{"common":"Taiwan","official":"Republic of China"},"cca2":"TW","cca3":"TWN","region":"Asia","subregion":"Eastern Asia","currencies":{"TWD":{"name":"New Taiwan dollar","symbol":"$"}},"idd":{"root":"+886","suffixes":[""]},"flag":"🇹🇼","flags":{"png":"https://flagcdn.com/w320/tw.png"},"independent":false},
+ {"name":{"common":"Iceland","official":"Iceland"},"cca2":"IS","cca3":"ISL","region":"Europe","subregion":"Northern Europe","currencies":{"ISK":{"name":"Icelandic króna","symbol":"kr"}},"idd":{"root":"+354","suffixes":[""]},"flag":"🇮🇸","flags":{"png":"https://flagcdn.com/w320/is.png"},"independent":true},
+ {"name":{"common":"Luxembourg","official":"Grand Duchy of Luxembourg"},"cca2":"LU","cca3":"LUX","region":"Europe","subregion":"Western Europe","currencies":{"EUR":{"name":"Euro","symbol":"€"}},"idd":{"root":"+352","suffixes":[""]},"flag":"🇱🇺","flags":{"png":"https://flagcdn.com/w320/lu.png"},"independent":true},
+ {"name":{"common":"Malta","official":"Republic of Malta"},"cca2":"MT","cca3":"MLT","region":"Europe","subregion":"Southern Europe","currencies":{"EUR":{"name":"Euro","symbol":"€"}},"idd":{"root":"+356","suffixes":[""]},"flag":"🇲🇹","flags":{"png":"https://flagcdn.com/w320/mt.png"},"independent":true},
+ {"name":{"common":"Cyprus","official":"Republic of Cyprus"},"cca2":"CY","cca3":"CYP","region":"Europe","subregion":"Southern Europe","currencies":{"EUR":{"name":"Euro","symbol":"€"}},"idd":{"root":"+357","suffixes":[""]},"flag":"🇨🇾","flags":{"png":"https://flagcdn.com/w320/cy.png"},"independent":true},
+ {"name":{"common":"Albania","official":"Republic of Albania"},"cca2":"AL","cca3":"ALB","region":"Europe","subregion":"Southeast Europe","currencies":{"ALL":{"name":"Albanian lek","symbol":"L"}},"idd":{"root":"+355","suffixes":[""]},"flag":"🇦🇱","flags":{"png":"https://flagcdn.com/w320/al.png"},"independent":true},
+ {"name":{"common":"Serbia","official":"Republic of Serbia"},"cca2":"RS","cca3":"SRB","region":"Europe","subregion":"Southeast Europe","currencies":{"RSD":{"name":"Serbian dinar","symbol":"дин"}},"idd":{"root":"+381","suffixes":[""]},"flag":"🇷🇸","flags":{"png":"https://flagcdn.com/w320/rs.png"},"independent":true},
+ {"name":{"common":"Belarus","official":"Republic of Belarus"},"cca2":"BY","cca3":"BLR","region":"Europe","subregion":"Eastern Europe","currencies":{"BYN":{"name":"Belarusian ruble","symbol":"Br"}},"idd":{"root":"+375","suffixes":[""]},"flag":"🇧🇾","flags":{"png":"https://flagcdn.com/w320/by.png"},"independent":true},
+ {"name":{"common":"Kazakhstan","official":"Republic of Kazakhstan"},"cca2":"KZ","cca3":"KAZ","region":"Asia","subregion":"Central Asia","currencies":{"KZT":{"name":"Kazakhstani tenge","symbol":"₸"}},"idd":{"root":"+7","suffixes":[""]},"flag":"🇰🇿","flags":{"png":"https://flagcdn.com/w320/kz.png"},"independent":true},
+ {"name":{"common":"Uzbekistan","official":"Republic of Uzbekistan"},"cca2":"UZ","cca3":"UZB","region":"Asia","subregion":"Central Asia","currencies":{"UZS":{"name":"Uzbekistani soʻm","symbol":"so'm"}},"idd":{"root":"+998","suffixes":[""]},"flag":"🇺🇿","flags":{"png":"https://flagcdn.com/w320/uz.png"},"independent":true},
+ {"name":{"common":"Sri Lanka","official":"Democratic Socialist Republic of Sri Lanka"},"cca2":"LK","cca3":"LKA","region":"Asia","subregion":"Southern Asia","currencies":{"LKR":{"name":"Sri Lankan rupee","symbol":"Rs"}},"idd":{"root":"+94","suffixes":[""]},"flag":"🇱🇰","flags":{"png":"https://flagcdn.com/w320/lk.png"},"independent":true},
+ {"name":{"common":"Cambodia","official":"Kingdom of Cambodia"},"cca2":"KH","cca3":"KHM","region":"Asia","subregion":"South-Eastern Asia","currencies":{"KHR":{"name":"Cambodian riel","symbol":"៛"}},"idd":{"root":"+855","suffixes":[""]},"flag":"🇰🇭","flags":{"png":"https://flagcdn.com/w320/kh.png"},"independent":true},
+ {"name":{"common":"Myanmar","official":"Republic of the Union of Myanmar"},"cca2":"MM","cca3":"MMR","region":"Asia","subregion":"South-Eastern Asia","currencies":{"MMK":{"name":"Burmese kyat","symbol":"K"}},"idd":{"root":"+95","suffixes":[""]},"flag":"🇲🇲","flags":{"png":"https://flagcdn.com/w320/mm.png"},"independent":true},
+ {"name":{"common":"Laos","official":"Lao People's Democratic Republic"},"cca2":"LA","cca3":"LAO","region":"Asia","subregion":"South-Eastern Asia","currencies":{"LAK":{"name":"Lao kip","symbol":"₭"}},"idd":{"root":"+856","suffixes":[""]},"flag":"🇱🇦","flags":{"png":"https://flagcdn.com/w320/la.png"},"independent":true},
+ {"name":{"common":"Nepal","official":"Federal Democratic Republic of Nepal"},"cca2":"NP","cca3":"NPL","region":"Asia","subregion":"Southern Asia","currencies":{"NPR":{"name":"Nepalese rupee","symbol":"रू"}},"idd":{"root":"+977","suffixes":[""]},"flag":"🇳🇵","flags":{"png":"https://flagcdn.com/w320/np.png"},"independent":true},
+ {"name":{"common":"Afghanistan","official":"Islamic Republic of Afghanistan"},"cca2":"AF","cca3":"AFG","region":"Asia","subregion":"Southern Asia","currencies":{"AFN":{"name":"Afghan afghani","symbol":"؋"}},"idd":{"root":"+93","suffixes":[""]},"flag":"🇦🇫","flags":{"png":"https://flagcdn.com/w320/af.png"},"independent":true},
+ {"name":{"common":"Jordan","official":"Hashemite Kingdom of Jordan"},"cca2":"JO","cca3":"JOR","region":"Asia","subregion":"Western Asia","currencies":{"JOD":{"name":"Jordanian dinar","symbol":"د.ا"}},"idd":{"root":"+962","suffixes":[""]},"flag":"🇯🇴","flags":{"png":"https://flagcdn.com/w320/jo.png"},"independent":true},
+ {"name":{"common":"Lebanon","official":"Lebanese Republic"},"cca2":"LB","cca3":"LBN","region":"Asia","subregion":"Western Asia","currencies":{"LBP":{"name":"Lebanese pound","symbol":"ل.ل"}},"idd":{"root":"+961","suffixes":[""]},"flag":"🇱🇧","flags":{"png":"https://flagcdn.com/w320/lb.png"},"independent":true},
+ {"name":{"common":"Oman","official":"Sultanate of Oman"},"cca2":"OM","cca3":"OMN","region":"Asia","subregion":"Western Asia","currencies":{"OMR":{"name":"Omani rial","symbol":"ر.ع."}},"idd":{"root":"+968","suffixes":[""]},"flag":"🇴🇲","flags":{"png":"https://flagcdn.com/w320/om.png"},"independent":true},
+ {"name":{"common":"Bahrain","official":"Kingdom of Bahrain"},"cca2":"BH","cca3":"BHR","region":"Asia","subregion":"Western Asia","currencies":{"BHD":{"name":"Bahraini dinar","symbol":"د.ب"}},"idd":{"root":"+973","suffixes":[""]},"flag":"🇧🇭","flags":{"png":"https://flagcdn.com/w320/bh.png"},"independent":true},
+ {"name":{"common":"Algeria","official":"People's Democratic Republic of Algeria"},"cca2":"DZ","cca3":"DZA","region":"Africa","subregion":"Northern Africa","currencies":{"DZD":{"name":"Algerian dinar","symbol":"دج"}},"idd":{"root":"+213","suffixes":[""]},"flag":"🇩🇿","flags":{"png":"https://flagcdn.com/w320/dz.png"},"independent":true},
+ {"name":{"common":"Tunisia","official":"Republic of Tunisia"},"cca2":"TN","cca3":"TUN","region":"Africa","subregion":"Northern Africa","currencies":{"TND":{"name":"Tunisian dinar","symbol":"د.ت"}},"idd":{"root":"+216","suffixes":[""]},"flag":"🇹🇳","flags":{"png":"https://flagcdn.com/w320/tn.png"},"independent":true},
+ {"name":{"common":"Ghana","official":"Republic of Ghana"},"cca2":"GH","cca3":"GHA","region":"Africa","subregion":"Western Africa","currencies":{"GHS":{"name":"Ghanaian cedi","symbol":"₵"}},"idd":{"root":"+233","suffixes":[""]},"flag":"🇬🇭","flags":{"png":"https://flagcdn.com/w320/gh.png"},"independent":true},
+ {"name":{"common":"Ethiopia","official":"Federal Democratic Republic of Ethiopia"},"cca2":"ET","cca3":"ETH","region":"Africa","subregion":"Eastern Africa","currencies":{"ETB":{"name":"Ethiopian birr","symbol":"Br"}},"idd":{"root":"+251","suffixes":[""]},"flag":"🇪🇹","flags":{"png":"https://flagcdn.com/w320/et.png"},"independent":true},
+ {"name":{"common":"Tanzania","official":"United Republic of Tanzania"},"cca2":"TZ","cca3":"TZA","region":"Africa","subregion":"Eastern Africa","currencies":{"TZS":{"name":"Tanzanian shilling","symbol":"Sh"}},"idd":{"root":"+255","suffixes":[""]},"flag":"🇹🇿","flags":{"png":"https://flagcdn.com/w320/tz.png"},"independent":true},
+ {"name":{"common":"Uganda","official":"Republic of Uganda"},"cca2":"UG","cca3":"UGA","region":"Africa","subregion":"Eastern Africa","currencies":{"UGX":{"name":"Ugandan shilling","symbol":"Sh"}},"idd":{"root":"+256","suffixes":[""]},"flag":"🇺🇬","flags":{"png":"https://flagcdn.com/w320/ug.png"},"independent":true},
+ {"name":{"common":"Cameroon","official":"Republic of Cameroon"},"cca2":"CM","cca3":"CMR","region":"Africa","subregion":"Middle Africa","currencies":{"XAF":{"name":"Central African CFA franc","symbol":"FCFA"}},"idd":{"root":"+237","suffixes":[""]},"flag":"🇨🇲","flags":{"png":"https://flagcdn.com/w320/cm.png"},"independent":true},
+ {"name":{"common":"Angola","official":"Republic of Angola"},"cca2":"AO","cca3":"AGO","region":"Africa","subregion":"Middle Africa","currencies":{"AOA":{"name":"Angolan kwanza","symbol":"Kz"}},"idd":{"root":"+244","suffixes":[""]},"flag":"🇦🇴","flags":{"png":"https://flagcdn.com/w320/ao.png"},"independent":true},
+ {"name":{"common":"Senegal","official":"Republic of Senegal"},"cca2":"SN","cca3":"SEN","region":"Africa","subregion":"Western Africa","currencies":{"XOF":{"name":"West African CFA franc","symbol":"FCFA"}},"idd":{"root":"+221","suffixes":[""]},"flag":"🇸🇳","flags":{"png":"https://flagcdn.com/w320/sn.png"},"independent":true},
+ {"name":{"common":"Zimbabwe","official":"Republic of Zimbabwe"},"cca2":"ZW","cca3":"ZWE","region":"Africa","subregion":"Eastern Africa","currencies":{"ZWL":{"name":"Zimbabwean dollar","symbol":"$"}},"idd":{"root":"+263","suffixes":[""]},"flag":"🇿🇼","flags":{"png":"https://flagcdn.com/w320/zw.png"},"independent":true},
+ {"name":{"common":"Bolivia","official":"Plurinational State of Bolivia"},"cca2":"BO","cca3":"BOL","region":"Americas","subregion":"South America","currencies":{"BOB":{"name":"Bolivian boliviano","symbol":"Bs"}},"idd":{"root":"+591","suffixes":[""]},"flag":"🇧🇴","flags":{"png":"https://flagcdn.com/w320/bo.png"},"independent":true},
+ {"name":{"common":"Ecuador","official":"Republic of Ecuador"},"cca2":"EC","cca3":"ECU","region":"Americas","subregion":"South America","currencies":{"USD":{"name":"United States dollar","symbol":"$"}},"idd":{"root":"+593","suffixes":[""]},"flag":"🇪🇨","flags":{"png":"https://flagcdn.com/w320/ec.png"},"independent":true},
+ {"name":{"common":"Uruguay","official":"Oriental Republic of Uruguay"},"cca2":"UY","cca3":"URY","region":"Americas","subregion":"South America","currencies":{"UYU":{"name":"Uruguayan peso","symbol":"$"}},"idd":{"root":"+598","suffixes":[""]},"flag":"🇺🇾","flags":{"png":"https://flagcdn.com/w320/uy.png"},"independent":true},
+ {"name":{"common":"Paraguay","official":"Republic of Paraguay"},"cca2":"PY","cca3":"PRY","region":"Americas","subregion":"South America","currencies":{"PYG":{"name":"Paraguayan guaraní","symbol":"₲"}},"idd":{"root":"+595","suffixes":[""]},"flag":"🇵🇾","flags":{"png":"https://flagcdn.com/w320/py.png"},"independent":true},
+ {"name":{"common":"Venezuela","official":"Bolivarian Republic of Venezuela"},"cca2":"VE","cca3":"VEN","region":"Americas","subregion":"South America","currencies":{"VES":{"name":"Venezuelan bolívar soberano","symbol":"Bs.S"}},"idd":{"root":"+58","suffixes":[""]},"flag":"🇻🇪","flags":{"png":"https://flagcdn.com/w320/ve.png"},"independent":true},
+ {"name":{"common":"Dominican Republic","official":"Dominican Republic"},"cca2":"DO","cca3":"DOM","region":"Americas","subregion":"Caribbean","currencies":{"DOP":{"name":"Dominican peso","symbol":"$"}},"idd":{"root":"+1","suffixes":["809"]},"flag":"🇩🇴","flags":{"png":"https://flagcdn.com/w320/do.png"},"independent":true},
+ {"name":{"common":"Guatemala","official":"Republic of Guatemala"},"cca2":"GT","cca3":"GTM","region":"Americas","subregion":"Central America","currencies":{"GTQ":{"name":"Guatemalan quetzal","symbol":"Q"}},"idd":{"root":"+502","suffixes":[""]},"flag":"🇬🇹","flags":{"png":"https://flagcdn.com/w320/gt.png"},"independent":true},
+ {"name":{"common":"Panama","official":"Republic of Panama"},"cca2":"PA","cca3":"PAN","region":"Americas","subregion":"Central America","currencies":{"USD":{"name":"United States dollar","symbol":"$"}},"idd":{"root":"+507","suffixes":[""]},"flag":"🇵🇦","flags":{"png":"https://flagcdn.com/w320/pa.png"},"independent":true},
+ {"name":{"common":"Costa Rica","official":"Republic of Costa Rica"},"cca2":"CR","cca3":"CRI","region":"Americas","subregion":"Central America","currencies":{"CRC":{"name":"Costa Rican colón","symbol":"₡"}},"idd":{"root":"+506","suffixes":[""]},"flag":"🇨🇷","flags":{"png":"https://flagcdn.com/w320/cr.png"},"independent":true},
+ {"name":{"common":"Vietnam","official":"Socialist Republic of Vietnam"},"cca2":"VN","cca3":"VNM","region":"Asia","subregion":"South-Eastern Asia","currencies":{"VND":{"name":"Vietnamese đồng","symbol":"₫"}},"idd":{"root":"+84","suffixes":[""]},"flag":"🇻🇳","flags":{"png":"https://flagcdn.com/w320/vn.png"},"independent":true}
+]
diff --git a/bms-back/ruoyi-admin/src/main/resources/logback.xml b/bms-back/ruoyi-admin/src/main/resources/logback.xml
index a360583..557bc52 100644
--- a/bms-back/ruoyi-admin/src/main/resources/logback.xml
+++ b/bms-back/ruoyi-admin/src/main/resources/logback.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RestTemplateConfig.java b/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RestTemplateConfig.java
new file mode 100644
index 0000000..ea1972c
--- /dev/null
+++ b/bms-back/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RestTemplateConfig.java
@@ -0,0 +1,25 @@
+package com.ruoyi.framework.config;
+
+import java.time.Duration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.client.SimpleClientHttpRequestFactory;
+import org.springframework.web.client.RestTemplate;
+
+/**
+ * RestTemplate配置
+ *
+ * @author ruoyi
+ */
+@Configuration
+public class RestTemplateConfig
+{
+ @Bean
+ public RestTemplate restTemplate()
+ {
+ SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory();
+ factory.setConnectTimeout(10000);
+ factory.setReadTimeout(30000);
+ return new RestTemplate(factory);
+ }
+}
diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/BmsRegion.java b/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/BmsRegion.java
new file mode 100644
index 0000000..a57037b
--- /dev/null
+++ b/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/BmsRegion.java
@@ -0,0 +1,270 @@
+package com.ruoyi.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 国家/区域 bms_region
+ *
+ * @author ruoyi
+ */
+public class BmsRegion extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** 区域ID */
+ @Excel(name = "区域ID")
+ private Long regionId;
+
+ /** 中文名 */
+ @Excel(name = "中文名")
+ private String countryNameCn;
+
+ /** 英文名 */
+ @Excel(name = "英文名")
+ private String countryNameEn;
+
+ /** ISO两位码 */
+ @Excel(name = "国家代码")
+ private String countryCode2;
+
+ /** ISO三位码 */
+ @Excel(name = "ISO三位码")
+ private String countryCode3;
+
+ /** 洲/大区 */
+ @Excel(name = "洲/大区")
+ private String continent;
+
+ /** 子区域 */
+ @Excel(name = "子区域")
+ private String subRegion;
+
+ /** 货币代码 */
+ @Excel(name = "货币代码")
+ private String currencyCode;
+
+ /** 货币名称 */
+ @Excel(name = "货币名称")
+ private String currencyName;
+
+ /** 货币符号 */
+ private String currencySymbol;
+
+ /** 电话前缀 */
+ @Excel(name = "电话前缀")
+ private String phonePrefix;
+
+ /** 国旗emoji */
+ private String flagEmoji;
+
+ /** 国旗图片URL */
+ private String flagUrl;
+
+ /** 是否独立(1是 0否) */
+ @Excel(name = "是否独立", readConverterExp = "1=是,0=否")
+ private String isIndependent;
+
+ /** 是否欧盟成员(1是 0否) */
+ @Excel(name = "是否欧盟", readConverterExp = "1=是,0=否")
+ private String isEu;
+
+ /** 状态(0正常 1停用) */
+ @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
+ private String status;
+
+ /** 删除标志(0存在 2删除) */
+ private String delFlag;
+
+ public Long getRegionId()
+ {
+ return regionId;
+ }
+
+ public void setRegionId(Long regionId)
+ {
+ this.regionId = regionId;
+ }
+
+ public String getCountryNameCn()
+ {
+ return countryNameCn;
+ }
+
+ public void setCountryNameCn(String countryNameCn)
+ {
+ this.countryNameCn = countryNameCn;
+ }
+
+ public String getCountryNameEn()
+ {
+ return countryNameEn;
+ }
+
+ public void setCountryNameEn(String countryNameEn)
+ {
+ this.countryNameEn = countryNameEn;
+ }
+
+ public String getCountryCode2()
+ {
+ return countryCode2;
+ }
+
+ public void setCountryCode2(String countryCode2)
+ {
+ this.countryCode2 = countryCode2;
+ }
+
+ public String getCountryCode3()
+ {
+ return countryCode3;
+ }
+
+ public void setCountryCode3(String countryCode3)
+ {
+ this.countryCode3 = countryCode3;
+ }
+
+ public String getContinent()
+ {
+ return continent;
+ }
+
+ public void setContinent(String continent)
+ {
+ this.continent = continent;
+ }
+
+ public String getSubRegion()
+ {
+ return subRegion;
+ }
+
+ public void setSubRegion(String subRegion)
+ {
+ this.subRegion = subRegion;
+ }
+
+ public String getCurrencyCode()
+ {
+ return currencyCode;
+ }
+
+ public void setCurrencyCode(String currencyCode)
+ {
+ this.currencyCode = currencyCode;
+ }
+
+ public String getCurrencyName()
+ {
+ return currencyName;
+ }
+
+ public void setCurrencyName(String currencyName)
+ {
+ this.currencyName = currencyName;
+ }
+
+ public String getCurrencySymbol()
+ {
+ return currencySymbol;
+ }
+
+ public void setCurrencySymbol(String currencySymbol)
+ {
+ this.currencySymbol = currencySymbol;
+ }
+
+ public String getPhonePrefix()
+ {
+ return phonePrefix;
+ }
+
+ public void setPhonePrefix(String phonePrefix)
+ {
+ this.phonePrefix = phonePrefix;
+ }
+
+ public String getFlagEmoji()
+ {
+ return flagEmoji;
+ }
+
+ public void setFlagEmoji(String flagEmoji)
+ {
+ this.flagEmoji = flagEmoji;
+ }
+
+ public String getFlagUrl()
+ {
+ return flagUrl;
+ }
+
+ public void setFlagUrl(String flagUrl)
+ {
+ this.flagUrl = flagUrl;
+ }
+
+ public String getIsIndependent()
+ {
+ return isIndependent;
+ }
+
+ public void setIsIndependent(String isIndependent)
+ {
+ this.isIndependent = isIndependent;
+ }
+
+ public String getIsEu()
+ {
+ return isEu;
+ }
+
+ public void setIsEu(String isEu)
+ {
+ this.isEu = isEu;
+ }
+
+ public String getStatus()
+ {
+ return status;
+ }
+
+ public void setStatus(String status)
+ {
+ this.status = status;
+ }
+
+ public String getDelFlag()
+ {
+ return delFlag;
+ }
+
+ public void setDelFlag(String delFlag)
+ {
+ this.delFlag = delFlag;
+ }
+
+ @Override
+ public String toString()
+ {
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+ .append("regionId", getRegionId())
+ .append("countryNameCn", getCountryNameCn())
+ .append("countryNameEn", getCountryNameEn())
+ .append("countryCode2", getCountryCode2())
+ .append("countryCode3", getCountryCode3())
+ .append("continent", getContinent())
+ .append("subRegion", getSubRegion())
+ .append("status", getStatus())
+ .append("createBy", getCreateBy())
+ .append("createTime", getCreateTime())
+ .append("updateBy", getUpdateBy())
+ .append("updateTime", getUpdateTime())
+ .append("remark", getRemark())
+ .toString();
+ }
+}
diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/BmsRegionSyncLog.java b/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/BmsRegionSyncLog.java
new file mode 100644
index 0000000..bcefc04
--- /dev/null
+++ b/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/BmsRegionSyncLog.java
@@ -0,0 +1,160 @@
+package com.ruoyi.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 区域数据同步日志 bms_region_sync_log
+ *
+ * @author ruoyi
+ */
+public class BmsRegionSyncLog extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** 日志ID */
+ @Excel(name = "日志ID")
+ private Long logId;
+
+ /** 同步类型 */
+ @Excel(name = "同步类型")
+ private String syncType;
+
+ /** 状态 */
+ @Excel(name = "状态", readConverterExp = "PENDING=待处理,PROCESSING=处理中,SUCCESS=成功,FAILED=失败")
+ private String status;
+
+ /** API返回总数 */
+ @Excel(name = "总数")
+ private Integer totalCount;
+
+ /** 新增数 */
+ @Excel(name = "新增数")
+ private Integer insertCount;
+
+ /** 更新数 */
+ @Excel(name = "更新数")
+ private Integer updateCount;
+
+ /** 失败数 */
+ @Excel(name = "失败数")
+ private Integer failCount;
+
+ /** 耗时(毫秒) */
+ @Excel(name = "耗时(ms)")
+ private Long durationMs;
+
+ /** 错误信息 */
+ private String errorMsg;
+
+ public Long getLogId()
+ {
+ return logId;
+ }
+
+ public void setLogId(Long logId)
+ {
+ this.logId = logId;
+ }
+
+ public String getSyncType()
+ {
+ return syncType;
+ }
+
+ public void setSyncType(String syncType)
+ {
+ this.syncType = syncType;
+ }
+
+ public String getStatus()
+ {
+ return status;
+ }
+
+ public void setStatus(String status)
+ {
+ this.status = status;
+ }
+
+ public Integer getTotalCount()
+ {
+ return totalCount;
+ }
+
+ public void setTotalCount(Integer totalCount)
+ {
+ this.totalCount = totalCount;
+ }
+
+ public Integer getInsertCount()
+ {
+ return insertCount;
+ }
+
+ public void setInsertCount(Integer insertCount)
+ {
+ this.insertCount = insertCount;
+ }
+
+ public Integer getUpdateCount()
+ {
+ return updateCount;
+ }
+
+ public void setUpdateCount(Integer updateCount)
+ {
+ this.updateCount = updateCount;
+ }
+
+ public Integer getFailCount()
+ {
+ return failCount;
+ }
+
+ public void setFailCount(Integer failCount)
+ {
+ this.failCount = failCount;
+ }
+
+ public Long getDurationMs()
+ {
+ return durationMs;
+ }
+
+ public void setDurationMs(Long durationMs)
+ {
+ this.durationMs = durationMs;
+ }
+
+ public String getErrorMsg()
+ {
+ return errorMsg;
+ }
+
+ public void setErrorMsg(String errorMsg)
+ {
+ this.errorMsg = errorMsg;
+ }
+
+ @Override
+ public String toString()
+ {
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+ .append("logId", getLogId())
+ .append("syncType", getSyncType())
+ .append("status", getStatus())
+ .append("totalCount", getTotalCount())
+ .append("insertCount", getInsertCount())
+ .append("updateCount", getUpdateCount())
+ .append("failCount", getFailCount())
+ .append("durationMs", getDurationMs())
+ .append("errorMsg", getErrorMsg())
+ .append("createBy", getCreateBy())
+ .append("createTime", getCreateTime())
+ .append("updateTime", getUpdateTime())
+ .toString();
+ }
+}
diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BmsRegionMapper.java b/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BmsRegionMapper.java
new file mode 100644
index 0000000..f9f9ca5
--- /dev/null
+++ b/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BmsRegionMapper.java
@@ -0,0 +1,68 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.BmsRegion;
+
+/**
+ * 国家/区域 数据层
+ *
+ * @author ruoyi
+ */
+public interface BmsRegionMapper
+{
+ /**
+ * 查询区域信息
+ *
+ * @param regionId 区域ID
+ * @return 区域信息
+ */
+ public BmsRegion selectRegionById(Long regionId);
+
+ /**
+ * 查询区域列表
+ *
+ * @param region 区域信息
+ * @return 区域集合
+ */
+ public List selectRegionList(BmsRegion region);
+
+ /**
+ * 根据ISO两位码查询区域
+ *
+ * @param countryCode2 ISO两位码
+ * @return 区域信息
+ */
+ public BmsRegion selectRegionByCode2(String countryCode2);
+
+ /**
+ * 新增区域
+ *
+ * @param region 区域信息
+ * @return 结果
+ */
+ public int insertRegion(BmsRegion region);
+
+ /**
+ * 修改区域
+ *
+ * @param region 区域信息
+ * @return 结果
+ */
+ public int updateRegion(BmsRegion region);
+
+ /**
+ * 批量删除区域
+ *
+ * @param regionIds 需要删除的区域ID
+ * @return 结果
+ */
+ public int deleteRegionByIds(Long[] regionIds);
+
+ /**
+ * 根据ISO两位码做upsert(存在则更新,不存在则新增)
+ *
+ * @param region 区域信息
+ * @return 结果
+ */
+ public int upsertByCode2(BmsRegion region);
+}
diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BmsRegionSyncLogMapper.java b/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BmsRegionSyncLogMapper.java
new file mode 100644
index 0000000..625e723
--- /dev/null
+++ b/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BmsRegionSyncLogMapper.java
@@ -0,0 +1,52 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.BmsRegionSyncLog;
+
+/**
+ * 区域数据同步日志 数据层
+ *
+ * @author ruoyi
+ */
+public interface BmsRegionSyncLogMapper
+{
+ /**
+ * 查询同步日志
+ *
+ * @param logId 日志ID
+ * @return 同步日志
+ */
+ public BmsRegionSyncLog selectSyncLogById(Long logId);
+
+ /**
+ * 查询同步日志列表
+ *
+ * @param syncLog 同步日志
+ * @return 同步日志集合
+ */
+ public List selectSyncLogList(BmsRegionSyncLog syncLog);
+
+ /**
+ * 新增同步日志
+ *
+ * @param syncLog 同步日志
+ * @return 结果
+ */
+ public int insertSyncLog(BmsRegionSyncLog syncLog);
+
+ /**
+ * 修改同步日志
+ *
+ * @param syncLog 同步日志
+ * @return 结果
+ */
+ public int updateSyncLog(BmsRegionSyncLog syncLog);
+
+ /**
+ * 批量删除同步日志
+ *
+ * @param logIds 需要删除的日志ID
+ * @return 结果
+ */
+ public int deleteSyncLogByIds(Long[] logIds);
+}
diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/IBmsRegionService.java b/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/IBmsRegionService.java
new file mode 100644
index 0000000..05390d7
--- /dev/null
+++ b/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/IBmsRegionService.java
@@ -0,0 +1,60 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.system.domain.BmsRegion;
+
+/**
+ * 国家/区域 服务层
+ *
+ * @author ruoyi
+ */
+public interface IBmsRegionService
+{
+ /**
+ * 查询区域信息
+ *
+ * @param regionId 区域ID
+ * @return 区域信息
+ */
+ public BmsRegion selectRegionById(Long regionId);
+
+ /**
+ * 查询区域列表
+ *
+ * @param region 区域信息
+ * @return 区域集合
+ */
+ public List selectRegionList(BmsRegion region);
+
+ /**
+ * 新增区域
+ *
+ * @param region 区域信息
+ * @return 结果
+ */
+ public int insertRegion(BmsRegion region);
+
+ /**
+ * 修改区域
+ *
+ * @param region 区域信息
+ * @return 结果
+ */
+ public int updateRegion(BmsRegion region);
+
+ /**
+ * 批量删除区域
+ *
+ * @param regionIds 需要删除的区域ID
+ * @return 结果
+ */
+ public int deleteRegionByIds(Long[] regionIds);
+
+ /**
+ * 修改区域状态
+ *
+ * @param region 区域信息
+ * @return 结果
+ */
+ public int updateRegionStatus(BmsRegion region);
+}
diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/IBmsRegionSyncService.java b/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/IBmsRegionSyncService.java
new file mode 100644
index 0000000..ff9e5dc
--- /dev/null
+++ b/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/IBmsRegionSyncService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.system.service;
+
+/**
+ * 区域数据同步 服务层
+ *
+ * @author ruoyi
+ */
+public interface IBmsRegionSyncService
+{
+ /**
+ * 触发同步国家数据(异步)
+ *
+ * @return 日志ID
+ */
+ public Long syncRegion();
+}
diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BmsRegionServiceImpl.java b/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BmsRegionServiceImpl.java
new file mode 100644
index 0000000..aab5756
--- /dev/null
+++ b/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BmsRegionServiceImpl.java
@@ -0,0 +1,93 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.domain.BmsRegion;
+import com.ruoyi.system.mapper.BmsRegionMapper;
+import com.ruoyi.system.service.IBmsRegionService;
+
+/**
+ * 国家/区域 服务层实现
+ *
+ * @author ruoyi
+ */
+@Service
+public class BmsRegionServiceImpl implements IBmsRegionService
+{
+ @Autowired
+ private BmsRegionMapper regionMapper;
+
+ /**
+ * 查询区域信息
+ *
+ * @param regionId 区域ID
+ * @return 区域信息
+ */
+ @Override
+ public BmsRegion selectRegionById(Long regionId)
+ {
+ return regionMapper.selectRegionById(regionId);
+ }
+
+ /**
+ * 查询区域列表
+ *
+ * @param region 区域信息
+ * @return 区域集合
+ */
+ @Override
+ public List selectRegionList(BmsRegion region)
+ {
+ return regionMapper.selectRegionList(region);
+ }
+
+ /**
+ * 新增区域
+ *
+ * @param region 区域信息
+ * @return 结果
+ */
+ @Override
+ public int insertRegion(BmsRegion region)
+ {
+ return regionMapper.insertRegion(region);
+ }
+
+ /**
+ * 修改区域
+ *
+ * @param region 区域信息
+ * @return 结果
+ */
+ @Override
+ public int updateRegion(BmsRegion region)
+ {
+ return regionMapper.updateRegion(region);
+ }
+
+ /**
+ * 批量删除区域
+ *
+ * @param regionIds 需要删除的区域ID
+ * @return 结果
+ */
+ @Override
+ public int deleteRegionByIds(Long[] regionIds)
+ {
+ return regionMapper.deleteRegionByIds(regionIds);
+ }
+
+ /**
+ * 修改区域状态
+ *
+ * @param region 区域信息
+ * @return 结果
+ */
+ @Override
+ public int updateRegionStatus(BmsRegion region)
+ {
+ return regionMapper.updateRegion(region);
+ }
+}
diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BmsRegionSyncServiceImpl.java b/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BmsRegionSyncServiceImpl.java
new file mode 100644
index 0000000..79415cb
--- /dev/null
+++ b/bms-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BmsRegionSyncServiceImpl.java
@@ -0,0 +1,249 @@
+package com.ruoyi.system.service.impl;
+
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.domain.BmsRegion;
+import com.ruoyi.system.domain.BmsRegionSyncLog;
+import com.ruoyi.system.mapper.BmsRegionMapper;
+import com.ruoyi.system.mapper.BmsRegionSyncLogMapper;
+import com.ruoyi.system.service.IBmsRegionSyncService;
+
+/**
+ * 区域数据同步 服务层实现
+ * 从本地 countries.json 文件加载国家数据
+ *
+ * @author ruoyi
+ */
+@Service
+public class BmsRegionSyncServiceImpl implements IBmsRegionSyncService
+{
+ private static final Logger log = LoggerFactory.getLogger(BmsRegionSyncServiceImpl.class);
+
+ private static final String DATA_FILE = "countries.json";
+
+ @Autowired
+ private BmsRegionMapper regionMapper;
+
+ @Autowired
+ private BmsRegionSyncLogMapper syncLogMapper;
+
+ /**
+ * 触发同步国家数据(异步)
+ *
+ * @return 日志ID
+ */
+ @Override
+ public Long syncRegion()
+ {
+ // 创建同步日志记录
+ BmsRegionSyncLog syncLog = new BmsRegionSyncLog();
+ syncLog.setSyncType("ALL");
+ syncLog.setStatus("PROCESSING");
+ syncLog.setTotalCount(0);
+ syncLog.setInsertCount(0);
+ syncLog.setUpdateCount(0);
+ syncLog.setFailCount(0);
+ syncLog.setDurationMs(0L);
+ syncLogMapper.insertSyncLog(syncLog);
+
+ // 异步执行同步
+ asyncSync(syncLog.getLogId());
+
+ return syncLog.getLogId();
+ }
+
+ /**
+ * 异步同步国家数据
+ *
+ * @param logId 日志ID
+ */
+ @Async("threadPoolTaskExecutor")
+ @Transactional(rollbackFor = Exception.class)
+ public void asyncSync(Long logId)
+ {
+ long startTime = System.currentTimeMillis();
+ BmsRegionSyncLog syncLog = syncLogMapper.selectSyncLogById(logId);
+
+ try
+ {
+ log.info("开始同步国家数据,读取本地文件: {}", DATA_FILE);
+
+ // 从classpath读取国家数据文件
+ ClassPathResource resource = new ClassPathResource(DATA_FILE);
+ InputStream inputStream = resource.getInputStream();
+ byte[] bytes = inputStream.readAllBytes();
+ inputStream.close();
+ String jsonData = new String(bytes, StandardCharsets.UTF_8);
+
+ if (StringUtils.isEmpty(jsonData))
+ {
+ throw new RuntimeException("国家数据文件为空");
+ }
+
+ // 解析JSON
+ ObjectMapper objectMapper = new ObjectMapper();
+ List
-
-
-
- 技术选型
-
-
-
-
- 后端技术
-
- - SpringBoot
- - Spring Security
- - JWT
- - MyBatis
- - Druid
- - Fastjson
- - ...
-
-
-
- 前端技术
-
- - Vue
- - Vuex
- - Element-ui
- - Axios
- - Sass
- - Quill
- - ...
-
-
-
-
-
-
-
-
-
-
-
- 联系信息
-
-
-
-
- 官网:http://www.ruoyi.vip
-
-
- QQ群: 满937441 满887144332
- 满180251782 满104180207 满186866453 满201396349
- 满101456076 满101539465 满264312783 满167385320
- 满104748341 满160110482 满170801498 满108482800
- 满101046199 满136919097 满143961921 满174951577
- 满161281055 满138988063 满151450850 满224622315
- 满287842588 满187944233 满228578329 满191164766
- 满174569686 满127358632 113071109
-
-
- 微信:/ *若依
-
-
- 支付宝:/ *若依
-
-
-
-
-
-
-
-
- 更新日志
-
-
-
-
-
- - 新增锁定屏幕功能
- - 首页新增通知公告消息提醒
- - 添加持久化标签页开关功能
- - 菜单搜索支持文本高亮&数量提示
- - 添加菜单路由地址和名称的校验规则
- - 字典类型列表新增抽屉效果详细信息
- - 升级axios到最新版本0.30.3
- - 使用SpringDoc代替Swagger
- - 升级spring-boot到最新版本4.0.3
- - 升级yauaa到最新版本8.1.0
- - 升级oshi到最新版本6.10.0
- - 升级druid到最新版本1.2.28
- - 升级fastjson到最新版2.0.61
- - 升级pagehelper到最新版2.1.1
- - 优化操作日志详细页面
- - 更新在线IP地址查询url
- - 部门管理支持批量保存排序
- - 菜单管理支持批量保存排序
- - 菜单管理列表新增类型显示
- - 代码生成模板支持TypeScript版本
- - 优化菜单主题风格显示
- - 优化topbar顶部菜单样式
- - 优化点击任务名称查看详细
- - 优化字典类型属性提醒说明
- - 优化防重提交间隔时间可自定义
- - 优化页签功能&支持全屏按钮操作
- - 优化RightToolbar搜索栏切换动画
- - 修复Excel自定义格式样式污染问题
- - 优化isAdmin方法统一到SecurityUtils
- - 优化定时任务详情页展示&补充执行时间字段
- - 其他细节优化
-
-
-
-
- - 支持防盗链功能
- - 菜单导航设置支持纯顶部
- - 使用yauaa代替bitwalker
- - 用户头像更换后移除旧头像文件
- - 支持Excel导出对象的多个子列表
- - 升级oshi到最新版本6.9.1
- - 升级druid到最新版本1.2.27
- - 升级fastjson到最新版2.0.60
- - 升级spring-security到5.7.14
- - 升级tomcat到最新版本9.0.112
- - 升级commons.io到最新版本2.21.0
- - 用户导入添加验证提示
- - 显示列信息支持对象格式
- - 忽略用户密码字段的JSON序列化
- - 网页标题设置新增SET_TITLE方法
- - 自动识别json对象白名单配置范围缩小
- - 登录/注册页面底部版权信息修改为读取配置
- - 修复用户归属部门无法修改为空问题
- - 修复固定头部时出现的导航栏偏移问题
- - 修复v3时间控件between选择后清空报错问题
- - 修复comboReadDict属性下多个sheet出现的报错
- - 修复表单构建移除所有控件后切换路由回来空白问题
- - 优化布局设置显示
- - 优化字典组件值宽松匹配
- - 优化获取字典类型值的方法
- - 优化生成代码下载的zip文件名
- - 优化日志记录参数拼装提升效率
- - 优化导入文件检查标题行不能为空
- - 优化表单构建关闭页签销毁复制插件
- - 优化Excel统计行数值的单元格样式显示
- - 优化数据权限控制逻辑,放开permission限制
- - 其他细节优化
-
-
-
-
- - 优化菜单搜索查询页
- - 导航栏显示昵称&设置
- - 菜单管理新增路由名称
- - 添加底部版权信息&开关
- - 分配角色禁用不允许勾选
- - Excel导入导出支持多图片
- - 添加页签图标显示开关功能
- - 上传组件新增拖动排序属性
- - 显隐列组件支持全选/全不选
- - 初始密码支持自定义修改策略
- - 账号密码支持自定义更新周期
- - 代码生成列表支持按时间排序
- - 支持富文本复制粘贴图片上传至url
- - 支持文件&图片组件自定义地址&参数
- - 升级tomcat到最新版本9.0.105
- - 升级oshi到最新版本6.8.1
- - 升级fastjson到最新版2.0.57
- - 升级commons.io到最新版本2.19.0
- - package.json移除runjs依赖
- - package.json移除eslint依赖
- - package.json移除vue-meta依赖
- - 修复代码生成主子表校验必填失效问题
- - 优化前端树结构性能问题
- - 优化前端处理路由函数代码
- - 优化文件上传组件新增类型
- - 优化顶部菜单搜索栏为多层级显示
- - 优化文件&图片上传组件新增disabled属性
- - 优化空指针异常时无法获取错误信息问题
- - 优化定时任务字符包含多个括号导致数据错误
- - 优化登录&注册页表头使用VUE_APP_TITLE配置值
- - 优化导出Excel日期格式双击离开后与设定的格式不一致问题
- - 其他细节优化
-
-
-
-
- - 用户管理支持分栏拖动
- - 修改主题样式本地读取
- - 用户头像http(s)链接支持
- - 用户管理过滤掉已禁用部门
- - 支持自定义显示Excel属性列
- - 操作日志记录DELETE请求参数
- - 白名单支持对通配符路径匹配
- - 校检文件名是否包含特殊字符
- - 代码生成创建表屏蔽违规的字符
- - 菜单面包屑导航支持多层级显示
- - Excel注解支持wrapText是否允许内容换行
- - 代码生成新增配置是否允许文件覆盖到本地
- - 修复角色禁用权限不失效问题
- - 修复代码生成上级菜单显示问题
- - 修复导出子列表对象只能在最后的问题
- - 修复TopNav无法正确获取active的问题
- - 修复默认关闭Tags-Views内链页面打不开
- - 升级oshi到最新版本6.6.5
- - 升级tomcat到最新版本9.0.96
- - 升级fastjson到最新版2.0.53
- - 升级logback到最新版本1.2.13
- - 升级spring-framework到最新版本5.3.39
- - 升级quill到最新版本2.0.2
- - 升级axios到最新版本0.28.1
- - 优化身份证脱敏正则
- - 优化权限更新后同步缓存
- - 优化查询时间范围日期格式
- - 优化参数键值更换为多行文本
- - 优化导入带标题文件关闭清理
- - 优化上传图片带域名不增加前缀
- - 优化特殊字符密码修改失败问题
- - 优化无用户编号不校验数据权限
- - 优化TopNav内链菜单点击没有高亮
- - 优化菜单管理切换Mini布局错乱问题
- - 其他细节优化
-
-
-
-
- - 菜单管理新增路由名称
- - 新增数据脱敏过滤注解
- - 用户密码新增非法字符验证
- - 限制用户操作数据权限范围
- - 代码生成新增创建表结构功能
- - 定时任务白名单配置范围缩小
- - 优化代码生成主子表关联查询方式
- - Excel注解新增属性comboReadDict
- - Excel注解ColumnType类型新增文本
- - 新增国际化资源文件配置
- - 升级oshi到最新版本6.6.1
- - 升级druid到最新版本1.2.23
- - 升级core-js到最新版本3.37.1
- - 更新HttpUtils中的User-Agent
- - 更新compressionPlugin到6.1.2以兼容node18+
- - 升级spring-security到安全版本,防止漏洞风险
- - 升级spring-framework到安全版本,防止漏洞风险
- - 优化自定义XSS注解匹配方式
- - 优化缓存监控键名列表排序显示
- - 优化定时任务日志默认按时间排序
- - 优化默认文件大小超过2G无效的问题
- - 优化查表特殊字符使用反斜杠进行转义
- - 优化定时任务cron表达式小时配置显示错误问题
- - 优化多个自定数据权限使用in查询,避免多次拼接
- - 优化导入Excel时设置dictType属性重复查缓存问题
- - 其他细节优化
-
-
-
-
- - 操作日志记录部门名称
- - 全局数据存储用户编号
- - 新增编程式判断资源访问权限
- - 操作日志列表新增IP地址查询
- - 定时任务新增页去除状态选项
- - 代码生成支持选择前端模板类型
- - 显隐列组件支持复选框弹出类型
- - 通用排序属性orderBy参数限制长度
- - Excel自定义数据处理器增加单元格/工作簿对象
- - 升级oshi到最新版本6.4.8
- - 升级druid到最新版本1.2.20
- - 升级fastjson到最新版2.0.43
- - 升级pagehelper到最新版1.4.7
- - 升级commons.io到最新版本2.13.0
- - 升级element-ui到最新版本2.15.14
- - 修复五级路由缓存无效问题
- - 修复外链带端口出现的异常
- - 修复树模板父级编码变量错误
- - 修复字典表详情页面搜索问题
- - 修复内链iframe没有传递参数问题
- - 修复自定义字典样式不生效的问题
- - 修复字典缓存删除方法参数错误问题
- - 修复Excel导入数据临时文件无法删除问题
- - 修复未登录带参数访问成功后参数丢失问题
- - 修复HeaderSearch组件跳转query参数丢失问题
- - 修复代码生成导入后必填项与数据库不匹配问题
- - 修复Excels导入时无法获取到dictType字典值问题
- - 优化下载zip方法新增遮罩层
- - 优化头像上传参数新增文件名称
- - 优化字典标签支持自定义分隔符
- - 优化菜单管理类型为按钮状态可选
- - 优化前端防重复提交数据大小限制
- - 优化TopNav菜单没有图标svg不显示
- - 优化数字金额大写转换精度丢失问题
- - 优化富文本Editor组件检验图片格式
- - 优化页签在Firefox浏览器被遮挡的问题
- - 优化个人中心/基本资料修改时数据显示问题
- - 优化缓存监控图表支持跟随屏幕大小自适应调整
- - 其他细节优化
-
-
-
-
- - 支持登录IP黑名单限制
- - 新增监控页面图标显示
- - 操作日志新增消耗时间属性
- - 屏蔽定时任务bean违规的字符
- - 日志管理使用索引提升查询性能
- - 日志注解支持排除指定的请求参数
- - 支持自定义隐藏属性列过滤子对象
- - 升级oshi到最新版本6.4.3
- - 升级druid到最新版本1.2.16
- - 升级fastjson到最新版2.0.34
- - 升级spring-boot到最新版本2.5.15
- - 升级element-ui到最新版本2.15.13
- - 移除apache/commons-fileupload依赖
- - 修复页面切换时布局错乱的问题
- - 修复匿名注解Anonymous空指针问题
- - 修复路由跳转被阻止时内部产生报错信息问题
- - 修复isMatchedIp的参数判断产生空指针的问题
- - 修复用户多角色数据权限可能出现权限抬升的情况
- - 修复开启TopNav后一级菜单路由参数设置无效问题
- - 修复DictTag组件value没有匹配的值时则展示value
- - 优化文件下载出现的异常
- - 优化选择图标组件高亮回显
- - 优化弹窗后导航栏偏移的问题
- - 优化修改密码日志存储明文问题
- - 优化页签栏关闭其他出现的异常问题
- - 优化页签关闭左侧选项排除首页选项
- - 优化关闭当前tab页跳转最右侧tab页
- - 优化缓存列表清除操作提示不变的问题
- - 优化字符未使用下划线不进行驼峰式处理
- - 优化用户导入更新时需获取用户编号问题
- - 优化侧边栏的平台标题与VUE_APP_TITLE保持同步
- - 优化导出Excel时设置dictType属性重复查缓存问题
- - 连接池Druid支持新的配置connectTimeout和socketTimeout
- - 其他细节优化
-
-
-
-
- - 定时任务违规的字符
- - 重置时取消部门选中
- - 新增返回警告消息提示
- - 忽略不必要的属性数据返回
- - 修改参数键名时移除前缓存配置
- - 导入更新用户数据前校验数据权限
- - 兼容Excel下拉框内容过多无法显示的问题
- - 升级echarts到最新版本5.4.0
- - 升级core-js到最新版本3.25.3
- - 升级oshi到最新版本6.4.0
- - 升级kaptcha到最新版2.3.3
- - 升级druid到最新版本1.2.15
- - 升级fastjson到最新版2.0.20
- - 升级pagehelper到最新版1.4.6
- - 优化弹窗内容过多展示不全问题
- - 优化swagger-ui静态资源使用缓存
- - 开启TopNav没有子菜单隐藏侧边栏
- - 删除fuse无效选项maxPatternLength
- - 优化导出对象的子列表为空会出现[]问题
- - 优化编辑头像时透明部分会变成黑色问题
- - 优化小屏幕上修改头像界面布局错位的问题
- - 修复代码生成勾选属性无效问题
- - 修复文件上传组件格式验证问题
- - 修复回显数据字典数组异常问题
- - 修复sheet超出最大行数异常问题
- - 修复Log注解GET请求记录不到参数问题
- - 修复调度日志点击多次数据不变化的问题
- - 修复主题颜色在Drawer组件不会加载问题
- - 修复文件名包含特殊字符的文件无法下载问题
- - 修复table中更多按钮切换主题色未生效修复问题
- - 修复某些特性的环境生成代码变乱码TXT文件问题
- - 修复代码生成图片/文件/单选时选择必填无法校验问题
- - 修复某些特性的情况用户编辑对话框中角色和部门无法修改问题
- - 其他细节优化
-
-
-
-
- - 数据逻辑删除不进行唯一验证
- - Excel注解支持导出对象的子列表方法
- - Excel注解支持自定义隐藏属性列
- - Excel注解支持backgroundColor属性设置背景色
- - 支持配置密码最大错误次数/锁定时间
- - 登录日志新增解锁账户功能
- - 通用下载方法新增config配置选项
- - 支持多权限字符匹配角色数据权限
- - 页面内嵌iframe切换tab不刷新数据
- - 操作日志记录支持排除敏感属性字段
- - 修复多文件上传报错出现的异常问题
- - 修复图片预览组件src属性为null值控制台报错问题
- - 升级oshi到最新版本6.2.2
- - 升级fastjson到最新版2.0.14
- - 升级pagehelper到最新版1.4.3
- - 升级core-js到最新版本3.25.2
- - 升级element-ui到最新版本2.15.10
- - 优化任务过期不执行调度
- - 优化字典数据使用store存取
- - 优化修改资料头像被覆盖的问题
- - 优化修改用户登录账号重复验证
- - 优化代码生成同步后值NULL问题
- - 优化定时任务支持执行父类方法
- - 优化用户个人信息接口防止修改部门
- - 优化布局设置使用el-drawer抽屉显示
- - 优化没有权限的用户编辑部门缺少数据
- - 优化日志注解记录限制请求地址的长度
- - 优化excel/scale属性导出单元格数值类型
- - 优化日志操作中重置按钮时重复查询的问题
- - 优化多个相同角色数据导致权限SQL重复问题
- - 优化表格上右侧工具条(搜索按钮显隐&右侧样式凸出)
- - 其他细节优化
-
-
-
-
- - 新增缓存列表菜单功能
- - 代码生成树表新增(展开/折叠)
- - Excel注解支持color字体颜色
- - 新增Anonymous匿名访问不鉴权注解
- - 用户头像上传限制只能为图片格式
- - 接口使用泛型使其看到响应属性字段
- - 检查定时任务bean所在包名是否为白名单配置
- - 添加页签openPage支持传递参数
- - 用户缓存信息添加部门ancestors祖级列表
- - 升级element-ui到最新版本2.15.8
- - 升级oshi到最新版本6.1.6
- - 升级druid到最新版本1.2.11
- - 升级fastjson到最新版2.0.8
- - 升级spring-boot到最新版本2.5.14
- - 降级jsencrypt版本兼容IE浏览器
- - 删除多余的salt字段
- - 新增获取不带后缀文件名称方法
- - 新增获取配置文件中的属性值方法
- - 新增内容编码/解码方便插件集成使用
- - 字典类型必须以字母开头,且只能为(小写字母,数字,下滑线)
- - 优化设置分页参数默认值
- - 优化对空字符串参数处理的过滤
- - 优化显示顺序orderNum类型为整型
- - 优化表单构建按钮不显示正则校验
- - 优化字典数据回显样式下拉框显示值
- - 优化R响应成功状态码与全局保持一致
- - 优化druid开启wall过滤器出现的异常问题
- - 优化用户管理左侧树型组件增加选中高亮保持
- - 优化新增用户与角色信息&用户与岗位信息逻辑
- - 优化默认不启用压缩文件缓存防止node_modules过大
- - 修复字典数据显示不全问题
- - 修复操作日志查询类型条件为0时会查到所有数据
- - 修复Excel注解prompt/combo同时使用不生效问题
- - 其他细节优化
-
-
-
-
- - 前端支持设置是否需要防止数据重复提交
- - 开启TopNav没有子菜单情况隐藏侧边栏
- - 侧边栏菜单名称过长悬停显示标题
- - 用户访问控制时校验数据权限,防止越权
- - 导出Excel时屏蔽公式,防止CSV注入风险
- - 组件ImagePreview支持多图预览显示
- - 组件ImageUpload支持多图同时选择上传
- - 组件FileUpload支持多文件同时选择上传
- - 服务监控新增运行参数信息显示
- - 定时任务目标字符串过滤特殊字符
- - 定时任务目标字符串验证包名白名单
- - 代码生成列表图片支持预览
- - 代码生成编辑修改打开新页签
- - 代码生成新增Java类型Boolean
- - 代码生成子表支持日期/字典配置
- - 代码生成同步保留必填/类型选项
- - 升级oshi到最新版本6.1.2
- - 升级fastjson到最新版1.2.80
- - 升级pagehelper到最新版1.4.1
- - 升级spring-boot到最新版本2.5.11
- - 升级spring-boot-mybatis到最新版2.2.2
- - 添加遗漏的分页参数合理化属性
- - 修改npm即将过期的注册源地址
- - 修复分页组件请求两次问题
- - 修复通用文件下载接口跨域问题
- - 修复Xss注解字段值为空时的异常问题
- - 修复选项卡点击右键刷新丢失参数问题
- - 修复表单清除元素位置未垂直居中问题
- - 修复服务监控中运行参数显示条件错误
- - 修复导入Excel时字典字段类型为Long转义为空问题
- - 修复登录超时刷新页面跳转登录页面还提示重新登录问题
- - 优化加载字典缓存数据
- - 优化IP地址获取到多个的问题
- - 优化任务队列满时任务拒绝策略
- - 优化文件上传兼容Weblogic环境
- - 优化定时任务默认保存到内存中执行
- - 优化部门修改缩放后出现的错位问题
- - 优化Excel格式化不同类型的日期对象
- - 优化菜单表关键字导致的插件报错问题
- - 优化Oracle用户头像列为空时不显示问题
- - 优化页面若未匹配到字典标签则返回原字典值
- - 优化修复登录失效后多次请求提示多次弹窗问题
- - 其他细节优化
-
-
-
-
- - 新增Vue3前端代码生成模板
- - 新增图片预览组件
- - 新增压缩插件实现打包Gzip
- - 自定义xss校验注解实现
- - 自定义文字复制剪贴指令
- - 代码生成预览支持复制内容
- - 路由支持单独配置菜单或角色权限
- - 用户管理部门查询选择节点后分页参数初始
- - 修复用户分配角色属性错误
- - 修复打包后字体图标偶现的乱码问题
- - 修复菜单管理重置表单出现的错误
- - 修复版本差异导致的懒加载报错问题
- - 修复Cron组件中周回显问题
- - 修复定时任务多参数逗号分隔的问题
- - 修复根据ID查询列表可能出现的主键溢出问题
- - 修复tomcat配置参数已过期问题
- - 升级clipboard到最新版本2.0.8
- - 升级oshi到最新版本v5.8.6
- - 升级fastjson到最新版1.2.79
- - 升级spring-boot到最新版本2.5.8
- - 升级log4j2到2.17.1,防止漏洞风险
- - 优化下载解析blob异常提示
- - 优化代码生成字典组重复问题
- - 优化查询用户的角色组&岗位组代码
- - 优化定时任务cron表达式小时设置24
- - 优化用户导入提示溢出则显示滚动条
- - 优化防重复提交标识组合为(key+url+header)
- - 优化分页方法设置成通用方便灵活调用
- - 其他细节优化
-
-
-
-
- - 新增配套并同步的Vue3前端版本
- - 新增通用方法简化模态/缓存/下载/权限/页签使用
- - 优化导出数据/使用通用下载方法
- - Excel注解支持自定义数据处理器
- - Excel注解支持导入导出标题信息
- - Excel导入支持@Excels注解
- - 新增组件data-dict,简化数据字典使用
- - 新增Jaxb依赖,防止jdk8以上出现的兼容错误
- - 生产环境使用路由懒加载提升页面响应速度
- - 修复五级以上菜单出现的404问题
- - 防重提交注解支持配置间隔时间/提示消息
- - 日志注解新增是否保存响应参数
- - 任务屏蔽违规字符&参数忽略双引号中的逗号
- - 升级SpringBoot到最新版本2.5.6
- - 升级pagehelper到最新版1.4.0
- - 升级spring-boot-mybatis到最新版2.2.0
- - 升级oshi到最新版本v5.8.2
- - 升级druid到最新版1.2.8
- - 升级velocity到最新版本2.3
- - 升级fastjson到最新版1.2.78
- - 升级axios到最新版本0.24.0
- - 升级dart-sass到版本1.32.13
- - 升级core-js到最新版本3.19.1
- - 升级jsencrypt到最新版本3.2.1
- - 升级js-cookie到最新版本3.0.1
- - 升级file-saver到最新版本2.0.5
- - 升级sass-loader到最新版本10.1.1
- - 升级element-ui到最新版本2.15.6
- - 新增sendGet无参请求方法
- - 禁用el-tag组件的渐变动画
- - 代码生成点击预览重置激活tab
- - AjaxResult重写put方法,以方便链式调用
- - 优化登录/验证码请求headers不设置token
- - 优化用户个人信息接口防止修改用户名
- - 优化Cron表达式生成器关闭时销毁避免缓存
- - 优化注册成功提示消息类型success
- - 优化aop语法,使用spring自动注入注解
- - 优化记录登录信息,移除不必要的修改
- - 优化mybatis全局默认的执行器
- - 优化Excel导入图片可能出现的异常
- - 修复代码生成模板主子表删除缺少事务
- - 修复日志记录可能出现的转换异常
- - 修复代码生成复选框字典遗漏问题
- - 修复关闭xss功能导致可重复读RepeatableFilter失效
- - 修复字符串无法被反转义问题
- - 修复后端主子表代码模板方法名生成错误问题
- - 修复xss过滤后格式出现的异常
- - 修复swagger没有指定dataTypeClass导致启动出现warn日志
- - 其他细节优化
-
-
-
-
- - 参数管理支持配置验证码开关
- - 新增是否开启用户注册功能
- - 定时任务支持在线生成cron表达式
- - 菜单管理支持配置路由参数
- - 支持自定义注解实现接口限流
- - Excel注解支持Image图片导入
- - 自定义弹层溢出滚动样式
- - 自定义可拖动弹窗宽度指令
- - 自定义可拖动弹窗高度指令
- - 修复任意账户越权问题
- - 修改时检查用户数据权限范围
- - 修复保存配置主题颜色失效问题
- - 新增暗色菜单风格主题
- - 菜单&部门新增展开/折叠功能
- - 页签新增关闭左侧&添加图标
- - 顶部菜单排除隐藏的默认路由
- - 顶部菜单同步系统主题样式
- - 跳转路由高亮相对应的菜单栏
- - 代码生成主子表多选行数据
- - 日期范围支持添加多组
- - 升级element-ui到最新版本2.15.5
- - 升级oshi到最新版本v5.8.0
- - 升级commons.io到最新版本v2.11.0
- - 定时任务屏蔽ldap远程调用
- - 定时任务屏蔽http(s)远程调用
- - 补充定时任务表字段注释
- - 定时任务对检查异常进行事务回滚
- - 启用父部门状态排除顶级节点
- - 富文本新增上传文件大小限制
- - 默认首页使用keep-alive缓存
- - 修改代码生成字典回显样式
- - 自定义分页合理化传入参数
- - 修复字典组件值为整形不显示问题
- - 修复定时任务日志执行状态显示
- - 角色&菜单新增字段属性提示信息
- - 修复角色分配用户页面参数类型错误提醒
- - 优化布局设置动画特效
- - 优化异常处理信息
- - 优化错误token导致的解析异常
- - 密码框新增显示切换密码图标
- - 定时任务新增更多操作
- - 更多操作按钮添加权限控制
- - 导入用户样式优化
- - 提取通用方法到基类控制器
- - 优化使用权限工具获取用户信息
- - 优化用户不能删除自己
- - 优化XSS跨站脚本过滤
- - 优化代码生成模板
- - 验证码默认20s超时
- - BLOB下载时清除URL对象引用
- - 代码生成导入表按创建时间排序
- - 修复代码生成页面数据编辑保存之后总是跳转第一页的问题
- - 修复带safari浏览器无法格式化utc日期格式yyyy-MM-dd'T'HH:mm:ss.SSS问题
- - 多图上传组件移除多余的api地址&验证失败导致图片删除问题&无法删除相应图片修复
- - 其他细节优化
-
-
-
-
- - 角色管理新增分配用户功能
- - 用户管理新增分配角色功能
- - 日志列表支持排序操作
- - 优化参数&字典缓存操作
- - 系统布局配置支持动态标题开关
- - 菜单路由配置支持内链访问
- - 默认访问后端首页新增提示语
- - 富文本默认上传返回url类型
- - 新增自定义弹窗拖拽指令
- - 全局注册常用通用组件
- - 全局挂载字典标签组件
- - ImageUpload组件支持多图片上传
- - FileUpload组件支持多文件上传
- - 文件上传组件添加数量限制属性
- - 富文本编辑组件添加类型属性
- - 富文本组件工具栏配置视频
- - 封装通用iframe组件
- - 限制超级管理员不允许操作
- - 用户信息长度校验限制
- - 分页组件新增pagerCount属性
- - 添加bat脚本执行应用
- - 升级oshi到最新版本v5.7.4
- - 升级element-ui到最新版本2.15.2
- - 升级pagehelper到最新版1.3.1
- - 升级commons.io到最新版本v2.10.0
- - 升级commons.fileupload到最新版本v1.4
- - 升级swagger到最新版本v3.0.0
- - 修复关闭confirm提示框控制台报错问题
- - 修复存在的SQL注入漏洞问题
- - 定时任务屏蔽rmi远程调用
- - 修复用户搜索分页变量错误
- - 修复导出角色数据范围翻译缺少仅本人
- - 修复表单构建选择下拉选择控制台报错问题
- - 优化图片工具类读取文件
- - 其他细节优化
-
-
-
-
- - 新增菜单导航显示风格TopNav(false为左侧导航菜单,true为顶部导航菜单)
- - 布局设置支持保存&重置配置
- - 修复树表数据显示不全&加载慢问题
- - 新增IE浏览器版本过低提示页面
- - 用户登录后记录最后登录IP&时间
- - 页面导出按钮点击之后添加遮罩
- - 富文本编辑器支持自定义上传地址
- - 富文本编辑组件新增readOnly属性
- - 页签TagsView新增关闭右侧功能
- - 显隐列组件加载初始默认隐藏列
- - 关闭头像上传窗口还原默认图片
- - 个人信息添加手机&邮箱重复验证
- - 代码生成模板导出按钮点击后添加遮罩
- - 代码生成模板树表操作列添加新增按钮
- - 代码生成模板修复主子表字段重名问题
- - 升级fastjson到最新版1.2.76
- - 升级druid到最新版本v1.2.6
- - 升级mybatis到最新版3.5.6 阻止远程代码执行漏洞
- - 升级oshi到最新版本v5.6.0
- - velocity剔除commons-collections版本,防止3.2.1版本的反序列化漏洞
- - 数据监控页默认账户密码防止越权访问
- - 修复firefox下表单构建拖拽会新打卡一个选项卡
- - 修正后端导入表权限标识
- - 修正前端操作日志&登录日志权限标识
- - 设置Redis配置HashKey序列化
- - 删除操作日志记录信息
- - 上传媒体类型添加视频格式
- - 修复请求形参未传值记录日志异常问题
- - 优化xss校验json请求条件
- - 树级结构更新子节点使用replaceFirst
- - 优化ExcelUtil空值处理
- - 日志记录过滤BindingResult对象,防止异常
- - 修改主题后mini类型按钮无效问题
- - 优化通用下载完成后删除节点
- - 通用Controller添加响应返回消息
- - 其他细节优化
-
-
-
-
- - 代码生成模板支持主子表
- - 表格右侧工具栏组件支持显隐列
- - 图片组件添加预览&移除功能
- - Excel注解支持Image图片导出
- - 操作按钮组调整为朴素按钮样式
- - 代码生成支持文件上传组件
- - 代码生成日期控件区分范围
- - 代码生成数据库文本类型生成表单文本域
- - 用户手机邮箱&菜单组件修改允许空字符串
- - 升级SpringBoot到最新版本2.2.13 提升启动速度
- - 升级druid到最新版本v1.2.4
- - 升级fastjson到最新版1.2.75
- - 升级element-ui到最新版本2.15.0
- - 修复IE11浏览器报错问题
- - 优化多级菜单之间切换无法缓存的问题
- - 修复四级菜单无法显示问题
- - 修正侧边栏静态路由丢失问题
- - 修复角色管理-编辑角色-功能权限显示异常
- - 配置文件新增redis数据库索引属性
- - 权限工具类增加admin判断
- - 角色非自定义权限范围清空选择值
- - 修复导入数据为负浮点数时丢失精度问题
- - 移除path-to-regexp正则匹配插件
- - 修复生成树表代码异常
- - 修改ip字段长度防止ipv6地址长度不够
- - 防止get请求参数值为false或0等特殊值会导致无法正确的传参
- - 登录后push添加catch防止出现检查错误
- - 其他细节优化
-
-
-
-
- - 新增缓存监控功能
- - 支持主题风格配置
- - 修复多级菜单之间切换无法缓存的问题
- - 多级菜单自动配置组件
- - 代码生成预览支持高亮显示
- - 支持Get请求映射Params参数
- - 删除用户和角色解绑关联
- - 去除用户手机邮箱部门必填验证
- - Excel支持注解align对齐方式
- - Excel支持导入Boolean型数据
- - 优化头像样式,鼠标移入悬停遮罩
- - 代码生成预览提供滚动机制
- - 代码生成删除多余的数字float类型
- - 修正转换字符串的目标字符集属性
- - 回显数据字典防止空值报错
- - 日志记录增加过滤多文件场景
- - 修改缓存Set方法可能导致嵌套的问题
- - 移除前端一些多余的依赖
- - 防止安全扫描YUI出现的风险提示
- - 修改node-sass为dart-sass
- - 升级SpringBoot到最新版本2.1.18
- - 升级poi到最新版本4.1.2
- - 升级oshi到最新版本v5.3.6
- - 升级bitwalker到最新版本1.21
- - 升级axios到最新版本0.21.0
- - 升级element-ui到最新版本2.14.1
- - 升级vue到最新版本2.6.12
- - 升级vuex到最新版本3.6.0
- - 升级vue-cli到版本4.5.9
- - 升级vue-router到最新版本3.4.9
- - 升级vue-cli到最新版本4.4.6
- - 升级vue-cropper到最新版本0.5.5
- - 升级clipboard到最新版本2.0.6
- - 升级core-js到最新版本3.8.1
- - 升级echarts到最新版本4.9.0
- - 升级file-saver到最新版本2.0.4
- - 升级fuse.js到最新版本6.4.3
- - 升级js-beautify到最新版本1.13.0
- - 升级js-cookie到最新版本2.2.1
- - 升级path-to-regexp到最新版本6.2.0
- - 升级quill到最新版本1.3.7
- - 升级screenfull到最新版本5.0.2
- - 升级sortablejs到最新版本1.10.2
- - 升级vuedraggable到最新版本2.24.3
- - 升级chalk到最新版本4.1.0
- - 升级eslint到最新版本7.15.0
- - 升级eslint-plugin-vue到最新版本7.2.0
- - 升级lint-staged到最新版本10.5.3
- - 升级runjs到最新版本4.4.2
- - 升级sass-loader到最新版本10.1.0
- - 升级script-ext-html-webpack-plugin到最新版本2.1.5
- - 升级svg-sprite-loader到最新版本5.1.1
- - 升级vue-template-compiler到最新版本2.6.12
- - 其他细节优化
-
-
-
-
- - 阻止任意文件下载漏洞
- - 代码生成支持上传控件
- - 新增图片上传组件
- - 调整默认首页
- - 升级druid到最新版本v1.2.2
- - mapperLocations配置支持分隔符
- - 权限信息调整
- - 调整sql默认时间
- - 解决代码生成没有bit类型的问题
- - 升级pagehelper到最新版1.3.0
-
-
-
-
- - 升级springboot版本到2.1.17 提升安全性
- - 升级oshi到最新版本v5.2.5
- - 升级druid到最新版本v1.2.1
- - 升级jjwt到版本0.9.1
- - 升级fastjson到最新版1.2.74
- - 修改sass为node-sass,避免el-icon图标乱码
- - 代码生成支持同步数据库
- - 代码生成支持富文本控件
- - 代码生成页面时不忽略remark属性
- - 代码生成添加select必填选项
- - Excel导出类型NUMERIC支持精度浮点类型
- - Excel导出targetAttr优化获取值,防止get方法不规范
- - Excel注解支持自动统计数据总和
- - Excel注解支持设置BigDecimal精度&舍入规则
- - 菜单&数据权限新增(展开/折叠 全选/全不选 父子联动)
- - 允许用户分配到部门父节点
- - 菜单新增是否缓存keep-alive
- - 表格操作列间距调整
- - 限制系统内置参数不允许删除
- - 富文本组件优化,支持自定义高度&图片冲突问题
- - 富文本工具栏样式对齐
- - 导入excel整形值校验优化
- - 修复页签关闭所有时固定标签路由不刷新问题
- - 表单构建布局型组件新增按钮
- - 左侧菜单文字过长显示省略号
- - 修正根节点为子部门时,树状结构显示问题
- - 修正调用目标字符串最大长度
- - 修正菜单提示信息错误
- - 修正定时任务执行一次权限标识
- - 修正数据库字符串类型nvarchar
- - 优化递归子节点
- - 优化数据权限判断
- - 其他细节优化
-
-
-
-
-
- - 表格工具栏右侧添加刷新&显隐查询组件
- - 后端支持CORS跨域请求
- - 代码生成支持选择上级菜单
- - 代码生成支持自定义路径
- - 代码生成支持复选框
- - Excel导出导入支持dictType字典类型
- - Excel支持分割字符串组内容
- - 验证码类型支持(数组计算、字符验证)
- - 升级vue-cli版本到4.4.4
- - 修改 node-sass 为 dart-sass
- - 表单类型为Integer/Long设置整形默认值
- - 代码生成器默认mapper路径与默认mapperScan路径不一致
- - 优化防重复提交拦截器
- - 优化上级菜单不能选择自己
- - 修复角色的权限分配后,未实时生效问题
- - 修复在线用户日志记录类型
- - 修复富文本空格和缩进保存后不生效问题
- - 修复在线用户判断逻辑
- - 唯一限制条件只返回单条数据
- - 添加获取当前的环境配置方法
- - 超时登录后页面跳转到首页
- - 全局异常状态汉化拦截处理
- - HTML过滤器改为将html转义
- - 检查字符支持小数点&降级改成异常提醒
- - 其他细节优化
-
-
-
-
-
- - 单应用调整为多模块项目
- - 升级element-ui版本到2.13.2
- - 删除babel,提高编译速度。
- - 新增菜单默认主类目
- - 编码文件名修改为uuid方式
- - 定时任务cron表达式验证
- - 角色权限修改时已有权限未自动勾选异常修复
- - 防止切换权限用户后登录出现404
- - Excel支持sort导出排序
- - 创建用户不允许选择超级管理员角色
- - 修复代码生成导入表结构出现异常页面不提醒问题
- - 修复代码生成点击多次表修改数据不变化的问题
- - 修复头像上传成功二次打开无法改变裁剪框大小和位置问题
- - 修复布局为small者mini用户表单显示错位问题
- - 修复热部署导致的强换异常问题
- - 修改用户管理复选框宽度,防止部分浏览器出现省略号
- - IpUtils工具,清除Xss特殊字符,防止Xff注入攻击
- - 生成domain 如果是浮点型 统一用BigDecimal
- - 定时任务调整label-width,防止部署出现错位
- - 调整表头固定列默认样式
- - 代码生成模板调整,字段为String并且必填则加空串条件
- - 代码生成字典Integer/Long使用parseInt
- -
- 修复dict_sort不可update为0的问题&查询返回增加dict_sort升序排序
-
- - 修正岗位导出权限注解
- - 禁止加密密文返回前端
- - 修复代码生成页面中的查询条件创建时间未生效的问题
- - 修复首页搜索菜单外链无法点击跳转问题
- - 修复菜单管理选择图标,backspace删除时不过滤数据
- - 用户管理部门分支节点不可检查&显示计数
- - 数据范围过滤属性调整
- - 其他细节优化
-
-
-
-
-
- - 升级fastjson到最新版1.2.70 修复高危安全漏洞
- - dev启动默认打开浏览器
- - vue-cli使用默认source-map
- - slidebar eslint报错优化
- - 当tags-view滚动关闭右键菜单
- - 字典管理添加缓存读取
- - 参数管理支持缓存操作
- - 支持一级菜单(和主页同级)在main区域显示
- - 限制外链地址必须以http(s)开头
- - tagview & sidebar 主题颜色与element ui(全局)同步
- - 修改数据源类型优先级,先根据方法,再根据类
- - 支持是否需要设置token属性,自定义返回码消息。
- - swagger请求前缀加入配置。
- - 登录地点设置内容过长则隐藏显示
- - 修复定时任务执行一次按钮后不提示消息问题
- - 修改上级部门(选择项排除本身和下级)
- - 通用http发送方法增加参数 contentType 编码类型
- - 更换IP地址查询接口
- - 修复页签变量undefined
- - 添加校验部门包含未停用的子部门
- - 修改定时任务详情下次执行时间日期显示错误
- - 角色管理查询设置默认排序字段
- - swagger添加enable参数控制是否启用
- - 只对json类型请求构建可重复读取inputStream的request
- - 修改代码生成字典字段int类型没有自动选中问题
- - vuex用户名取值修正
- - 表格树模板去掉多余的)
- - 代码生成序号修正
- - 全屏情况下不调整上外边距
- - 代码生成Date字段添加默认格式
- - 用户管理角色选择权限控制
- - 修复路由懒加载报错问题
- - 模板sql.vm添加菜单状态
- - 设置用户名称不能修改
- - dialog添加append-to-body属性,防止ie遮罩
- - 菜单区分状态和显示隐藏功能
- - 升级fastjson到最新版1.2.68 修复安全加固
- - 修复代码生成如果选择字典类型缺失逗号问题
- - 登录请求params更换为data,防止暴露url
- - 日志返回时间格式处理
- - 添加handle控制允许拖动的元素
- - 布局设置点击扩大范围
- - 代码生成列属性排序查询
- - 代码生成列支持拖动排序
- - 修复时间格式不支持ios问题
- - 表单构建添加父级class,防止冲突
- - 定时任务并发属性修正
- - 角色禁用&菜单隐藏不查询权限
- - 其他细节优化
-
-
-
-
-
- - 系统监控新增定时任务功能
- - 添加一个打包Web工程bat
- - 修复页签鼠标滚轮按下的时候,可以关闭不可关闭的tag
- - 修复点击退出登录有时会无提示问题
- - 修复防重复提交注解无效问题
- - 修复通知公告批量删除异常问题
- - 添加菜单时路由地址必填限制
- - 代码生成字段描述可编辑
- - 修复用户修改个人信息导致缓存不过期问题
- - 个人信息创建时间获取正确属性值
- - 操作日志详细显示正确类型
- - 导入表单击行数据时选中对应的复选框
- - 批量替换表前缀逻辑调整
- - 固定重定向路径表达式
- - 升级element-ui版本到2.13.0
- - 操作日志排序调整
- - 修复charts切换侧边栏或者缩放窗口显示bug
- - 其他细节优化
-
-
-
-
-
- - 新增表单构建
- - 代码生成支持树表结构
- - 新增用户导入
- - 修复动态加载路由页面刷新问题
- - 修复地址开关无效问题
- - 汉化错误提示页面
- - 代码生成已知问题修改
- - 修复多数据源下配置关闭出现异常处理
- - 添加HTML过滤器,用于去除XSS漏洞隐患
- - 修复上传头像控制台出现异常
- - 修改用户管理分页不正确的问题
- - 修复验证码记录提示错误
- - 修复request.js缺少Message引用
- - 修复表格时间为空出现的异常
- - 添加Jackson日期反序列化时区配置
- - 调整根据用户权限加载菜单数据树形结构
- - 调整成功登录不恢复按钮,防止多次点击
- - 修改用户个人资料同步缓存信息
- - 修复页面同时出现el-upload和Editor不显示处理
- - 修复在角色管理页修改菜单权限偶尔未选中问题
- - 配置文件新增redis密码属性
- - 设置mybatis全局的配置文件
- - 其他细节优化
-
-
-
-
-
- - 新增代码生成
- - 新增@RepeatSubmit注解,防止重复提交
- - 新增菜单主目录添加/删除操作
- - 日志记录过滤特殊对象,防止转换异常
- - 修改代码生成路由脚本错误
- - 用户上传头像实时同步缓存,无需重新登录
- - 调整切换页签后不重新加载数据
- - 添加jsencrypt实现参数的前端加密
- - 系统退出删除用户缓存记录
- - 其他细节优化
-
-
-
-
- - 新增在线用户管理
- - 新增按钮组功能实现(批量删除、导出、清空)
- - 新增查询条件重置按钮
- - 新增Swagger全局Token配置
- - 新增后端参数校验
- - 修复字典管理页面的日期查询异常
- - 修改时间函数命名防止冲突
- - 去除菜单上级校验,默认为顶级
- - 修复用户密码无法修改问题
- - 修复菜单类型为按钮时不显示权限标识
- - 其他细节优化
-
-
-
-
- - 若依前后端分离系统正式发布
-
-
-
-
-
-
-
-
-
- 捐赠支持
-
-
-
-

-
你可以请作者喝杯咖啡表示鼓励
-
-
-
diff --git a/bms-front/src/views/system/role/index.vue b/bms-front/src/views/system/role/index.vue
index f7f3317..d83c5e6 100644
--- a/bms-front/src/views/system/role/index.vue
+++ b/bms-front/src/views/system/role/index.vue
@@ -179,6 +179,7 @@