style

src/components/Header/components/User/index.less

@@ -6,22 +6,32 @@
   border-radius: 34px;
   cursor: pointer;
 }
-.currentMenu{
+.currentMenu {
   width: 120px;
   text-align: center;
   padding: 0;
-  [class~='currentName']{
+  [class~='currentName'] {
     padding: 0 8px;
     overflow: hidden;
     white-space: nowrap;
     text-overflow: ellipsis;
     display: block;
   }
-  li{
+  li {
+    height: 40px;
+    line-height: 30px;
+    font-size: 14px;
+    color: #333;
+    padding: 5px 8px;
+    a {
+      color: #333;
+    }
+  }
+  li:first-child {
     border-bottom: 1px solid #eee;
-  } 
-  li:last-child{
-    border-top: none;
+  }
+  li:last-child {
+    border-top: 1px solid #eee;
   }
 }
 .rightMenu {

src/components/Header/index.tsx

@@ -250,7 +250,7 @@ const HeaderComponents: FC<PageProps> = ({
               }
               {
                 globalSetting.setting?.nav_logo_url &&
-                <a style={{marginLeft:"78px"}} href={globalSetting.setting?.common?.main_site_url}><img src={ globalSetting.setting?.common?.main_site_url +'/'+ globalSetting.setting?.nav_logo_url} className="mr50"/></a>
+                <a style={{marginLeft:"78px"}} href={globalSetting.setting?.common?.main_site_url}><img width="155px" src={ENV.FORGE_SERVER+'/'+ globalSetting.setting?.nav_logo_url} className="mr50"/></a>
               }
               {!checkIsClientExam() && globalSetting.setting &&
                 globalSetting.setting.navbar.map(function (
@@ -310,7 +310,7 @@ const HeaderComponents: FC<PageProps> = ({
                   <SearchInput />
                   {!isLogin && !!user?.userInfo?.login && <Join />}
                   {
-                    !!user?.userInfo?.login && <a className="iconfont icon-xiaoxilingdang c-white ml15 mr15 font18 relative" href ={`${globalSetting?.setting?.common?.main_site_url}/settings/notice`}>{user?.userInfo?.message_unread_total && <span className={styles.newslight}>{user?.userInfo?.message_unread_total}</span>}</a>
+                    !!user?.userInfo?.login && <a className="iconfont icon-xiaoxilingdang c-white ml15 mr15 font18 relative" href ={`${ENV.FORGE_SERVER}/settings/notice`}>{user?.userInfo?.message_unread_total && <span className={styles.newslight}></span>}</a>
                   }
                 </>
               }

src/utils/env.ts

@@ -109,13 +109,13 @@ export const GlobalConfig: ConfigProps = {
     FORGE_SERVER:"https://testforgeplus.trustie.net"
   },
   preBuild: {
-    API_SERVER: 'https://data.educoder.net',
+    API_SERVER: 'https://pre-data.educoder.net',
     IMG_SERVER: 'https://preali-cdn.educoder.net',
     REPORT_SERVER: "http://192.168.1.57:3001",
     FORGE: "https://forge.educoder.net/",
     SSH_SERVER: "wss://pre-webssh.educoder.net",
     QQLoginCB: encodeURIComponent("https://test-newweb.educoder.net"),
-    FORGE_SERVER:"https://pre.gitlink.org.cn"
+    FORGE_SERVER:"https://pre.gitlink.org.cn",
   },
   newWeb: {
     API_SERVER: 'https://test-newweb.educoder.net',

src/utils/fetch.ts

@@ -246,8 +246,8 @@ export default function request(url: string, option: any, flag?: boolean) {
 
   let prefixUrl = ENV.API_SERVER;
   if (window.ENV === 'dev') prefixUrl = '';
-  return fetch(prefixUrl + url, newOptions)
-    .then((response: any) => checkStatus(response, { url: ENV.API_SERVER + url, ...newOptions }))
+  return fetch(url.indexOf("https") > -1 ? url : prefixUrl + url, newOptions)
+    .then((response: any) => checkStatus(response, { url: url.indexOf("https") > -1 ? url : ENV.API_SERVER + url, ...newOptions }))
     .then((response: any) => cachedSave(response, hashcode))
     .then(async (response: any) => {
       if (response.status === 204) {