ISSUE alibaba#12221

HMYDK · Jul 4, 2024 · 1961af1 · 1961af1
1 parent edf26a5
commit 1961af1
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 7 deletions.
diff --git a/config/src/main/java/com/alibaba/nacos/config/server/service/ConfigOperationService.java b/config/src/main/java/com/alibaba/nacos/config/server/service/ConfigOperationService.java
@@ -101,6 +101,7 @@ public Boolean publishConfig(ConfigForm configForm, ConfigRequestInfo configRequ
  if (StringUtils.isBlank(configRequestInfo.getBetaIps())) {
  if (StringUtils.isBlank(configForm.getTag())) {
  if (StringUtils.isNotBlank(configRequestInfo.getCasMd5())) {
+ //在数据库config_info中新增/修改数据，同时记录修改前的配置到his_config_info表中
  configOperateResult = configInfoPersistService.insertOrUpdateCas(configRequestInfo.getSrcIp(),
  configForm.getSrcUser(), configInfo, configAdvanceInfo);
  if (!configOperateResult.isSuccess()) {
@@ -114,6 +115,7 @@ public Boolean publishConfig(ConfigForm configForm, ConfigRequestInfo configRequ
  configOperateResult = configInfoPersistService.insertOrUpdate(configRequestInfo.getSrcIp(),
  configForm.getSrcUser(), configInfo, configAdvanceInfo);
  }
+ //发布通知事件
  ConfigChangePublisher.notifyConfigChange(
  new ConfigDataChangeEvent(false, configForm.getDataId(), configForm.getGroup(),
  configForm.getNamespaceId(), configOperateResult.getLastModified()));

diff --git a/...nacos/config/server/service/repository/embedded/EmbeddedConfigInfoPersistServiceImpl.java b/...nacos/config/server/service/repository/embedded/EmbeddedConfigInfoPersistServiceImpl.java
@@ -553,7 +553,7 @@ public ConfigOperateResult updateConfigInfoCas(final ConfigInfo configInfo, fina
  if (configInfo.getAppName() == null) {
  configInfo.setAppName(appNameTmp);
  }
-
+ //更新数据
  updateConfigInfoAtomicCas(configInfo, srcIp, srcUser, configAdvanceInfo);
 
  String configTags = configAdvanceInfo == null ? null : (String) configAdvanceInfo.get("config_tags");
@@ -565,6 +565,7 @@ public ConfigOperateResult updateConfigInfoCas(final ConfigInfo configInfo, fina
  }
  Timestamp time = new Timestamp(System.currentTimeMillis());
 
+ //记录历史信息
  historyConfigInfoPersistService.insertConfigHistoryAtomic(oldConfigInfo.getId(), oldConfigInfo, srcIp,
  srcUser, time, "U");
 

diff --git a/...onfig/server/service/repository/embedded/EmbeddedHistoryConfigInfoPersistServiceImpl.java b/...onfig/server/service/repository/embedded/EmbeddedHistoryConfigInfoPersistServiceImpl.java
@@ -88,6 +88,14 @@ public <E> PaginationHelper<E> createPaginationHelper() {
  return new EmbeddedPaginationHelperImpl<>(databaseOperate);
  }
 
+ /**
+ * @param configHistoryId id 781406224614797312
+ * @param configInfo config info:ConfigInfo{id=781406224614797312, dataId='example', group='DEFAULT_GROUP', tenant='', appName='', content='name: 张三', md5='1ec1f2c1584d460d76f8339e214a7d93'}
+ * @param srcIp ip：192.168.31.27
+ * @param srcUser user：nacos
+ * @param time time：2024-06-30 17:13:25.0
+ * @param ops ops type：U
+ */
  @Override
  public void insertConfigHistoryAtomic(long configHistoryId, ConfigInfo configInfo, String srcIp, String srcUser,
  final Timestamp time, String ops) {

diff --git a/console-ui/src/globalLib.js b/console-ui/src/globalLib.js
@@ -517,6 +517,7 @@ const request = (function(_global) {
 
  const _LOGINPAGE_ENABLED = localStorage.getItem(LOGINPAGE_ENABLED);
 
+ let accessTokenInHeader = '';
  if (_LOGINPAGE_ENABLED !== 'false') {
  let token = {};
  try {
@@ -526,7 +527,8 @@ const request = (function(_global) {
  goLogin();
  }
  const { accessToken = '' } = token;
- params.push(`accessToken=${accessToken}`);
+ // params.push(`accessToken=${accessToken}`);
+ accessTokenInHeader = accessToken;
  }
 
  return $.ajax(
@@ -540,6 +542,7 @@ const request = (function(_global) {
  },
  headers: {
  Authorization: localStorage.getItem('token'),
+ AccessToken: accessTokenInHeader,
  },
  })
  ).then(

diff --git a/...e-ui/src/pages/ConfigurationManagement/ConfigurationManagement/ConfigurationManagement.js b/...e-ui/src/pages/ConfigurationManagement/ConfigurationManagement/ConfigurationManagement.js
@@ -294,6 +294,7 @@ class ConfigurationManagement extends React.Component {
  }
  props = this.props.getConfigsV2(params);
  } else {
+ console.log(params);
  props = this.props.getConfigs(params);
  }
  props

diff --git a/console-ui/src/utils/request.js b/console-ui/src/utils/request.js
@@ -49,7 +49,7 @@ const request = () => {
  goLogin();
  }
  const { accessToken = '', username = '' } = token;
- config.params.accessToken = accessToken;
+ // config.params.accessToken = accessToken;
  // support #3548 and fix #5835
  if (!url.includes('auth')) {
  config.params.username = username;

diff --git a/console/src/main/resources/static/index.html b/console/src/main/resources/static/index.html
@@ -35,7 +35,7 @@
  <link rel="stylesheet" type="text/css" href="console-ui/public/css/icon.css">
  <link rel="stylesheet" type="text/css" href="console-ui/public/css/font-awesome.css">
  <!-- 第三方css结束 -->
-<link href="./css/main.css?50300f41fe7e73539edb" rel="stylesheet"></head>
+<link href="./css/main.css?29b43ab04bb005264560" rel="stylesheet"></head>
 
 <body>
  <div id="root" style="overflow:hidden"></div>
@@ -56,6 +56,6 @@
  <script src="console-ui/public/js/merge.js"></script>
  <script src="console-ui/public/js/loader.js"></script>
  <!-- 第三方js结束 -->
-<script type="text/javascript" src="./js/main.js?50300f41fe7e73539edb"></script></body>
+<script type="text/javascript" src="./js/main.js?29b43ab04bb005264560"></script></body>
 
 </html>
diff --git a/console/src/main/resources/static/js/main.js b/console/src/main/resources/static/js/main.js