From 3fdc93f16983c5275b715d83b597f922a4802dbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E5=BF=83=E5=AE=87?= <xyhuang29@outlook.com>
Date: Wed, 3 Apr 2024 09:26:43 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=88=86=E4=BA=ABtest?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                               |  2 +-
 public/index.html                          |  1 +
 src/AppConfig.js                           |  2 +-
 src/common/util/ShareUtil.js               | 22 ++++++++++++++++------
 src/forge/Information/Pages/newsDetail.jsx |  3 ++-
 src/forge/Information/index.jsx            |  2 ++
 6 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index 420fac00..a6fe1124 100644
--- a/package.json
+++ b/package.json
@@ -177,7 +177,7 @@
   "eslintConfig": {
     "extends": "react-app"
   },
-  "proxy": "http://172.20.32.202:4000",
+  "proxy": "https://testforgeplus.trustie.net",
   "port": "3007",
   "devDependencies": {
     "@babel/runtime": "7.0.0-beta.51",
diff --git a/public/index.html b/public/index.html
index 06d38434..7508cce5 100755
--- a/public/index.html
+++ b/public/index.html
@@ -50,6 +50,7 @@
   <script src="%PUBLIC_URL%js/codemirror/merge/merge.js"></script>
   <script src="%PUBLIC_URL%js/alex/moment.js"></script>
   <script src="https://gw.alipayobjects.com/os/lib/alipay/alex/2.0.19/bundle/alex.all.global.min.js"></script>
+  <script src="http://res.wx.qq.com/open/js/jweixin-1.6.0.js"></script>
   <meta name="viewport" content="">
   <%= htmlWebpackPlugin.tags.bodyTags %>
   <script>
diff --git a/src/AppConfig.js b/src/AppConfig.js
index 8e58ebaf..95d42f9d 100644
--- a/src/AppConfig.js
+++ b/src/AppConfig.js
@@ -32,7 +32,7 @@ export function initAxiosInterceptors(props) {
   // 判断网络是否连接
   initOnlineOfflineListener();
 
-  var proxy = "http://172.20.32.202:4000";
+  var proxy = "https://testforgeplus.trustie.net";
 
 
   //响应前的设置
diff --git a/src/common/util/ShareUtil.js b/src/common/util/ShareUtil.js
index 39c03140..8e00d7da 100644
--- a/src/common/util/ShareUtil.js
+++ b/src/common/util/ShareUtil.js
@@ -1,6 +1,15 @@
 import axios from 'axios'
 const host = window.location.protocol + '//' + window.location.host
 const wx = window.wx
+
+let settings = localStorage.chromesetting&&JSON.parse(localStorage.chromesetting);
+let actionUrl = settings && settings.common.zone +'/api';
+
+const service = axios.create({
+    baseURL: actionUrl,
+    timeout: 1800000, // 请求超时时间
+});
+
 function share(shareData) {
     try {
         wx.onMenuShareAppMessage(shareData);//分享给好友
@@ -21,17 +30,18 @@ function requestForSignatrue (callback) {
             callback && callback()
         } else {
             const wx = window.wx
-            const url = '/wechats/js_sdk_signature.json'
+            const url = '/cms/doc/open/wechatSignature'
             urlDoneMap[currentUrl] = true
             // window.encodeURIComponent()
-            axios.post(url, {
-                url: window.__testUrl || currentUrl,
+            service.post(url, {
+                url: 'https://www.gitlink.org.cn' || currentUrl,
             }).then((response) => {
                 console.log('got res')
-                const data = response.data;
+                const data = response.data && response.data.data;
+
                 wx.config({
-                    debug: false,
-                    appId: data.appid,
+                    debug: true,
+                    appId: 'wxf8debe756b4a0309', // data.appid,
                     timestamp: data.timestamp,
                     nonceStr: data.noncestr,
                     signature: data.signature,
diff --git a/src/forge/Information/Pages/newsDetail.jsx b/src/forge/Information/Pages/newsDetail.jsx
index 64c386fa..6ad2c4aa 100644
--- a/src/forge/Information/Pages/newsDetail.jsx
+++ b/src/forge/Information/Pages/newsDetail.jsx
@@ -7,7 +7,7 @@ import { getNewsDetail } from '../api';
 import { isPhone } from 'educoder';
 import { tempConfig } from '../tempInfo';
 import Acce from '../Component/mobile/accessory';
-import { addMeta, setSeoMeta } from 'educoder';
+import { addMeta, setSeoMeta, configShareForCustom } from 'educoder';
 import CommentList from '../Component/comments/list'
 
 
@@ -28,6 +28,7 @@ function NewsDetail(props){
       const { name, cmsDir, summary} = detail;
       document.title = `${ name }/${ cmsDir.name }`;
       addMeta('Keywords', `${ name },${ cmsDir.name },${ summary }`);
+      configShareForCustom(detail.name, detail.summary, detail.headImg)
     }
     if(isPhone() && zonedetail){
       setTimeout(()=>{
diff --git a/src/forge/Information/index.jsx b/src/forge/Information/index.jsx
index c68756bd..6c0e5986 100644
--- a/src/forge/Information/index.jsx
+++ b/src/forge/Information/index.jsx
@@ -17,6 +17,7 @@ import "slick-carousel/slick/slick-theme.css";
 import { tempEnum } from "./tempInfo";
 import { ImageLayerOfCommentHOC } from "../../modules/page/layers/ImageLayerOfCommentHOC";
 import { setSeoMeta } from 'educoder';
+import { configShareForCustom } from 'educoder';
 
 
 const SourceDetail = Loadable({
@@ -134,6 +135,7 @@ function Index(props){
           getAdminUrl(data.id);
           getRole(data.id)
         }
+        configShareForCustom(data.mainTitle, data.subTitle)
         // 存储deptId，所有专区接口header带上
         sessionStorage.setItem('deptId', data.deptId)
         setSeoMeta(`${data.name},`, data.name, data.subTitle, `/zone/${deptId}`)

From e35506a6421af7012f55e46e8769342b42f8bf26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E5=BF=83=E5=AE=87?= <xyhuang29@outlook.com>
Date: Mon, 22 Apr 2024 15:37:09 +0800
Subject: [PATCH 2/3] =?UTF-8?q?commit=E9=9A=90=E8=97=8F=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Main/CoderRootFileDetail.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/forge/Main/CoderRootFileDetail.js b/src/forge/Main/CoderRootFileDetail.js
index 372af720..072ab931 100644
--- a/src/forge/Main/CoderRootFileDetail.js
+++ b/src/forge/Main/CoderRootFileDetail.js
@@ -54,6 +54,11 @@ class CoderRootFileDetail extends Component {
     }
   }
 
+  isCommit = () => {
+    const {detail, branch} = this.props;
+    return detail && detail.commit && detail.commit.sha.includes(branch)
+  }
+
   // 更新网页标题
   updateDocumentTitle(){
     const {projectDetail, treeValuePath, location} = this.props;
@@ -300,7 +305,7 @@ class CoderRootFileDetail extends Component {
             </span>
           </div>
           <p className="text-right">
-              {flag && platform && (
+              {flag && platform && !this.isCommit() && (
                 <div>
                   {readOnly ? (
                     <span>

From b5756f17a9c94f1a5beb4c6a96519a5c0ac6897b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E5=BF=83=E5=AE=87?= <xyhuang29@outlook.com>
Date: Mon, 22 Apr 2024 15:44:47 +0800
Subject: [PATCH 3/3] =?UTF-8?q?Revert=20"=E5=BE=AE=E4=BF=A1=E5=88=86?=
 =?UTF-8?q?=E4=BA=ABtest"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3fdc93f16983c5275b715d83b597f922a4802dbe.
---
 package.json                               |  2 +-
 public/index.html                          |  1 -
 src/common/util/ShareUtil.js               | 22 ++++++----------------
 src/forge/Information/Pages/newsDetail.jsx |  3 +--
 src/forge/Information/index.jsx            |  2 --
 5 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/package.json b/package.json
index a6fe1124..420fac00 100644
--- a/package.json
+++ b/package.json
@@ -177,7 +177,7 @@
   "eslintConfig": {
     "extends": "react-app"
   },
-  "proxy": "https://testforgeplus.trustie.net",
+  "proxy": "http://172.20.32.202:4000",
   "port": "3007",
   "devDependencies": {
     "@babel/runtime": "7.0.0-beta.51",
diff --git a/public/index.html b/public/index.html
index 7508cce5..06d38434 100755
--- a/public/index.html
+++ b/public/index.html
@@ -50,7 +50,6 @@
   <script src="%PUBLIC_URL%js/codemirror/merge/merge.js"></script>
   <script src="%PUBLIC_URL%js/alex/moment.js"></script>
   <script src="https://gw.alipayobjects.com/os/lib/alipay/alex/2.0.19/bundle/alex.all.global.min.js"></script>
-  <script src="http://res.wx.qq.com/open/js/jweixin-1.6.0.js"></script>
   <meta name="viewport" content="">
   <%= htmlWebpackPlugin.tags.bodyTags %>
   <script>
diff --git a/src/common/util/ShareUtil.js b/src/common/util/ShareUtil.js
index 8e00d7da..39c03140 100644
--- a/src/common/util/ShareUtil.js
+++ b/src/common/util/ShareUtil.js
@@ -1,15 +1,6 @@
 import axios from 'axios'
 const host = window.location.protocol + '//' + window.location.host
 const wx = window.wx
-
-let settings = localStorage.chromesetting&&JSON.parse(localStorage.chromesetting);
-let actionUrl = settings && settings.common.zone +'/api';
-
-const service = axios.create({
-    baseURL: actionUrl,
-    timeout: 1800000, // 请求超时时间
-});
-
 function share(shareData) {
     try {
         wx.onMenuShareAppMessage(shareData);//分享给好友
@@ -30,18 +21,17 @@ function requestForSignatrue (callback) {
             callback && callback()
         } else {
             const wx = window.wx
-            const url = '/cms/doc/open/wechatSignature'
+            const url = '/wechats/js_sdk_signature.json'
             urlDoneMap[currentUrl] = true
             // window.encodeURIComponent()
-            service.post(url, {
-                url: 'https://www.gitlink.org.cn' || currentUrl,
+            axios.post(url, {
+                url: window.__testUrl || currentUrl,
             }).then((response) => {
                 console.log('got res')
-                const data = response.data && response.data.data;
-
+                const data = response.data;
                 wx.config({
-                    debug: true,
-                    appId: 'wxf8debe756b4a0309', // data.appid,
+                    debug: false,
+                    appId: data.appid,
                     timestamp: data.timestamp,
                     nonceStr: data.noncestr,
                     signature: data.signature,
diff --git a/src/forge/Information/Pages/newsDetail.jsx b/src/forge/Information/Pages/newsDetail.jsx
index 6ad2c4aa..64c386fa 100644
--- a/src/forge/Information/Pages/newsDetail.jsx
+++ b/src/forge/Information/Pages/newsDetail.jsx
@@ -7,7 +7,7 @@ import { getNewsDetail } from '../api';
 import { isPhone } from 'educoder';
 import { tempConfig } from '../tempInfo';
 import Acce from '../Component/mobile/accessory';
-import { addMeta, setSeoMeta, configShareForCustom } from 'educoder';
+import { addMeta, setSeoMeta } from 'educoder';
 import CommentList from '../Component/comments/list'
 
 
@@ -28,7 +28,6 @@ function NewsDetail(props){
       const { name, cmsDir, summary} = detail;
       document.title = `${ name }/${ cmsDir.name }`;
       addMeta('Keywords', `${ name },${ cmsDir.name },${ summary }`);
-      configShareForCustom(detail.name, detail.summary, detail.headImg)
     }
     if(isPhone() && zonedetail){
       setTimeout(()=>{
diff --git a/src/forge/Information/index.jsx b/src/forge/Information/index.jsx
index efde330f..2d9b9939 100644
--- a/src/forge/Information/index.jsx
+++ b/src/forge/Information/index.jsx
@@ -17,7 +17,6 @@ import "slick-carousel/slick/slick-theme.css";
 import { tempEnum } from "./tempInfo";
 import { ImageLayerOfCommentHOC } from "../../modules/page/layers/ImageLayerOfCommentHOC";
 import { setSeoMeta } from 'educoder';
-import { configShareForCustom } from 'educoder';
 
 
 const SourceDetail = Loadable({
@@ -143,7 +142,6 @@ function Index(props){
           getAdminUrl(data.id);
           getRole(data.id)
         }
-        configShareForCustom(data.mainTitle, data.subTitle)
         // 存储deptId，所有专区接口header带上
         sessionStorage.setItem('deptId', data.deptId)
         setSeoMeta(`${data.name},`, data.name, data.subTitle, `/zone/${deptId}`)