删除火花字样，部署说明更新

README.MD

@@ -40,14 +40,35 @@
 > 点击 Run options 右边的文件夹图标，打开 Modify options。<br>
 > 勾选 Environment variables。<br>
 > 在 Environment variables 输入框中，点击右侧的图标，添加服务器的数据库配置：<br>
-> DB_URL = jdbc:mysql://dalian-nft-network:3306/dalian-nft-api<br>
-> DB_USER = root<br>
-> DB_PASSWORD = your_server_db_password<br>
-> DEV_MODE = 1 或 0<br>
+
+> 其它:<br>
+DEV_MODE=0<br>
+> 站点:<br>
+UPLOAD_BASE_PATH=/app/uploads<br>
+URL_BASE=https://dlsh-nft.com.cn<br>
+URL_BASE_ADMIN=https://ad.dlsh-nft.com.cn<br>
+> DB：<br>
+DB_USER=root<br>
+DB_PASSWORD=<br>
+DB_URL=jdbc:mysql://mysql-container:3306/dalian-nft-db<br>
+> BSN:<br>
+BSN_API_TOKEN=<br>
+BSN_OWNER=<br>
+> 京东：<br>
+JD_TEMPLATE_ID=<br>
+JD_SECRET_KEY=<br>
+JD_SIGN_ID=<br>
+JD_ACCESS_KEY=<br>
+> 慧用工：<br>
+HYG_AES_KEY=<br>
+HYG_COOPERATOR_ID=<br>
+HYG_RSA_PRIVATE_KEY=<br>
+HYG_DOMAIN=https://oapi.hvyogo.com<br>
+
 
 > 关键：配置端口映射<br>
 > 勾选 Bind ports。<br>
-> 添加一个映射，将服务器的端口（Host port）映射到容器的端口（Container port），例如 8080:8080。<br>
+> 添加一个映射，将服务器的端口（Host port）映射到容器的端口（Container port），例如 8888:8888。<br>
 > 
 > Modify - Run Options
 > 在这个新的输入框中输入：--network dalian-nft-network -v /app/jfinal_uploads:/app/uploads

src/main/java/common/model/base/BaseNftt.java

@@ -35,7 +35,7 @@ public abstract class BaseNftt<M extends BaseNftt<M>> extends Model<M> implement
 		return getStr("name");
 	}
 	/**
-	 * 售价(火花)
+	 * 售价()
 
 	 */
 	public void setPrice(java.lang.Integer price) {
@@ -43,7 +43,7 @@ public abstract class BaseNftt<M extends BaseNftt<M>> extends Model<M> implement
 	}
 	
 	/**
-	 * 售价(火花)
+	 * 售价()
 
 	 */
 	public java.lang.Integer getPrice() {

src/main/java/common/model/base/BaseUser.java

@@ -100,14 +100,14 @@ public abstract class BaseUser<M extends BaseUser<M>> extends Model<M> implement
 		return getInt("integral");
 	}
 	/**
-	 * 余额，火花
+	 * 余额，
 	 */
 	public void setBalance(java.lang.Float balance) {
 		set("balance", balance);
 	}
 	
 	/**
-	 * 余额，火花
+	 * 余额，
 	 */
 	public java.lang.Float getBalance() {
 		return getFloat("balance");

src/main/java/common/model/base/BaseWithdraw.java

@@ -22,14 +22,14 @@ public abstract class BaseWithdraw<M extends BaseWithdraw<M>> extends Model<M> i
 		return getStr("withdraw_sn");
 	}
 	/**
-	 * 提现单位，1=1火花/分
+	 * 提现单位，1=1/分
 	 */
 	public void setAmount(java.lang.Float amount) {
 		set("amount", amount);
 	}
 	
 	/**
-	 * 提现单位，1=1火花/分
+	 * 提现单位，1=1/分
 	 */
 	public java.lang.Float getAmount() {
 		return getFloat("amount");

src/main/java/modules/order/OrderController.java

@@ -51,12 +51,13 @@ public class OrderController extends MyController {
             return;
         }
         
-        // 先判断实名认证过没过
         User user = userService.findUserByMobileNumber(getSessionAttr("mobile_number"));
-        if (StrKit.isBlank(user.getHygWorkerId())) {
-            renderJson(MyRet.fail("请先进行实名认证").setCode(MyRet.CODE_NO_AUTH));
-            return;
-        }
+        
+        // 先判断实名认证过没过
+        // if (StrKit.isBlank(user.getHygWorkerId())) {
+        //     renderJson(MyRet.fail("请先进行实名认证").setCode(MyRet.CODE_NO_AUTH));
+        //     return;
+        // }
         
         // 获取nftt
         Nftt nftt = Nftt.dao.findById(nfttId);

src/main/java/modules/order/OrderService.java

@@ -48,7 +48,7 @@ public class OrderService {
                 // 判断用户余额并预扣
                 User user = User.dao.findById(userId);
                 if (user.getBalance() < totalPrice) {
-                    throw new RuntimeException("火花余额不足，请充值。需要: " + totalPrice + "，你有：" + user.getBalance());
+                    throw new RuntimeException("余额不足，请充值。需要: " + totalPrice + "，你有：" + user.getBalance());
                 }
                 user.setBalance(user.getBalance() - totalPrice);
                 if (!user.update()) {
@@ -166,13 +166,13 @@ public class OrderService {
                     throw new RuntimeException("订单日志创建失败"); // 抛出异常触发回滚
                 }
                 
-                // 5. 火花还给人家
+                // 5. 还给人家
                 User user = User.dao.findById(userId);
                 user.setBalance(user.getBalance() + order.getTotalPrice());
                 if (!user.update()) {
-                    throw new RuntimeException("火花归还失败"); // 抛出异常触发回滚
+                    throw new RuntimeException("归还失败"); // 抛出异常触发回滚
                 }
-                // 6. 火花归还记录
+                // 6. 归还记录
                 BalanceLog l = new BalanceLog();
                 l.set("create_time", System.currentTimeMillis());
                 l.set("is_deleted", 0);

src/main/java/modules/withdraw/WithdrawController.java

@@ -37,7 +37,7 @@ public class WithdrawController extends MyController {
             amount = Long.parseLong(amountStr);
 
             if (amount < 1100) {
-                renderJson(MyRet.fail("至少要提现1100火花！"));
+                renderJson(MyRet.fail("至少要提现1100！"));
                 return;
             }
         } catch (Exception e) {

src/main/java/modules/withdraw/WithdrawService.java

@@ -71,7 +71,7 @@ public class WithdrawService {
 
             float amountCNY = (float)amountWithoutFee / (float)100;
             float feePercent = (float)WITHDRAW_FEE / (float)100;
-            return MyRet.ok(String.format("提现%s火花，实际到账%.2f(元)，手续费%s%%，申请已提交", amount, amountCNY, feePercent)).setData(findByWithdrawSn(orderSn));
+            return MyRet.ok(String.format("提现%s，实际到账%.2f(元)，手续费%s%%，申请已提交", amount, amountCNY, feePercent)).setData(findByWithdrawSn(orderSn));
         } catch (Exception e) {
             return MyRet.fail("提现申请失败: " + e.getMessage());
         }

src/test/rest/UserControllerTest.http

@@ -88,7 +88,7 @@ POST {{ baseUrl }}/user/getUserInfo
 Content-Type: application/json
 dl-token: {{dl_token_var}}
 
-### 获取账户火花余额
+### 获取账户余额
 POST {{ baseUrl }}/user/getBalance
 Content-Type: application/json
 dl-token: {{dl_token_var}}